Bundle the curried arguments for clarity

Author: prozacchiwawa

resources/debug_game_handler.clsp

@@ -1,10 +1,36 @@
 ;; Debug game handler
+;;
+;; The validation info hash result is the sha256 of the concatenation of two
+;; hashes.
+;;
+;; 1 - A program which aborts if the move is a cheat.
+;; 2 - The sha256tree of the program state.
+;;
+;; In the debug game, the whole state is described by the readable move data.
+
+;; Curried = MOD_HASH PUZZLE AMOUNT MY_TURN SLASH_INFO
+
 (include *standard-cl-23*)
 
 (import std.curry)
 (import std.map)
 (import std.shatree)
 
+(defun-inline curried_mod_hash (CURRIED) (f CURRIED))
+(defun-inline curried_puzzle (CURRIED) (f (r CURRIED)))
+(defun-inline curried_amount (CURRIED) (f (r (r CURRIED))))
+(defun-inline curried_my_turn (CURRIED) (f (r (r (r CURRIED)))))
+(defun-inline curried_slash_info (CURRIED) (f (r (r (r (r CURRIED))))))
+(defun-inline curried_other_turn (CURRIED)
+  (list
+    (curried_mod_hash CURRIED)
+    (curried_puzzle CURRIED)
+    (curried_amount CURRIED)
+    (not (curried_my_turn CURRIED))
+    (curried_slash_info CURRIED)
+    )
+  )
+
 (defun get-validation-move
     (MOVER_PUZZLE_HASH
      WAITER_PUZZLE_HASH
@@ -27,54 +53,73 @@
 
 (defun validation_program (validation-data)
   (assign
-   cheated (substr (get-validation-move validation-data) 0 1)
+   cheated (logand (get-validation-move validation-data) 1)
    (if cheated
        (x "validation program cheating" validation-data)
        ()
        )
    )
   )
 
-(defun do_my_turn (MOD_HASH PUZZLE AMOUNT MY_TURN SLASH_INFO readable_new_move amount state entropy)
+(defun do_my_turn (CURRIED readable_new_move amount state entropy)
   (assign
 
+   ;; Readable move is a clvm structure that describes the move
+   ;; uncompressed.
    (set_share . set_cheated) readable_new_move
 
-   new_validation_program_hash (shatree state "this is not right") ;; XXX just anything
+   ;; Validation info
+   validation_info readable_new_move
+
+   state_hash (shatree state)
+   other_turn (curried_other_turn CURRIED)
+
+   program-hash
+     (curry_unhashed_args
+        (curried_mod_hash other_turn)
+        other_turn
+        )
+
+   new_state
+     (logior (logand 1 set_cheated) (ash set_share 1))
+
+   new_validation_program_hash
+     (sha256 program-hash (shatree new_state))
 
    (list
-    (logior (logand 1 set_cheated) (ash set_share 1))
+    new_state
     validation_program
     new_validation_program_hash
     (c set_share set_cheated)
     100
     set_share
-    (curry PUZZLE MOD_HASH PUZZLE AMOUNT (not MY_TURN) SLASH_INFO)
+    (curry (curried_puzzle CURRIED) other_turn)
     ()
     )
    )
   )
 
-(defun do_their_turn (MOD_HASH PUZZLE AMOUNT MY_TURN SLASH_INFO amount last_state new_move new_validation_info_hash new_max_move_size new_mover_share)
+(defun do_their_turn (CURRIED amount last_state new_move new_validation_info_hash new_max_move_size new_mover_share)
   (assign
    set_cheated (logand new_move 1)
+   other_turn (curried_other_turn CURRIED)
 
    (if set_cheated
-       (c 2 SLASH_INFO)
+       (c 2 (curried_slash_info CURRIED))
        (list
         0
         (c set_cheated (get-move-share new_move)) ;; readable move
-        (curry PUZZLE MOD_HASH PUZZLE AMOUNT (not MY_TURN) SLASH_INFO)
+        (curry (curried_puzzle CURRIED) other_turn)
         "message data"
         )
        )
    )
   )
 
 (export
- (MOD_HASH PUZZLE AMOUNT MY_TURN SLASH_INFO . args)
- (if MY_TURN
-     (do_my_turn MOD_HASH PUZZLE AMOUNT MY_TURN SLASH_INFO &rest args)
-     (do_their_turn MOD_HASH PUZZLE AMOUNT MY_TURN SLASH_INFO &rest args)
+ (CURRIED . args)
+ (if (curried_my_turn CURRIED)
+     (do_my_turn CURRIED &rest args)
+     (do_their_turn CURRIED &rest args)
      )
  )

resources/debug_game_handler.hex

@@ -1 +1 @@
-ff02ffff01ff02ffff03ff2fffff01ff02ff10ffff04ff02ffff04ff05ffff04ff0bffff04ff17ffff04ff2fffff04ff5fff7f80808080808080ffff01ff02ff14ffff04ff02ffff04ff05ffff04ff0bffff04ff17ffff04ff2fffff04ff5fff7f8080808080808080ff0180ffff04ffff01ffffffff02ff18ffff04ff02ffff04ff03ffff04ff8200bfffff04ffff02ff2effff04ff02ffff04ff8202ffffff04ffff019174686973206973206e6f74207269676874ff8080808080ff808080808080ff04ffff19ffff18ffff0101ff1b80ffff16ff13ffff01018080ffff04ffff04ffff0102ffff04ffff04ffff0101ff3e80ffff04ffff04ffff0104ffff04ffff04ffff0101ff0280ffff04ffff0101ff80808080ff80808080ffff04ff17ffff04ffff04ff13ff1b80ffff04ffff0164ffff04ff13ffff04ffff02ff16ffff04ff02ffff04ff15ffff04ff09ffff04ff15ffff04ff2dffff04ffff20ff5d80ffff04ff8200bdff808080808080808080ffff04ff80ff808080808080808080ffff02ff2cffff04ff02ffff04ff03ffff04ffff18ff8202ffffff010180ff8080808080ffff02ffff03ff0bffff01ff04ffff0102ff8200bd80ffff01ff04ff80ffff04ffff04ff0bffff02ff3cffff04ff02ffff04ff8205fdff8080808080ffff04ffff02ff16ffff04ff02ffff04ff15ffff04ff09ffff04ff15ffff04ff2dffff04ffff20ff5d80ffff04ff8200bdff808080808080808080ffff04ffff018c6d6573736167652064617461ff808080808080ff0180ff16ff05ffff0181ff80ffff82017fff02ffff03ff05ffff01ff04ffff0104ffff04ffff04ffff0101ff0980ffff04ffff02ff1affff04ff02ffff04ff0dff80808080ff80808080ffff01ff010180ff0180ffff04ffff0102ffff04ffff04ffff0101ff0580ffff04ffff02ff1affff04ff02ffff04ff07ff80808080ff80808080ffff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff2effff04ff02ffff04ff09ff80808080ffff02ff2effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff02ffff03ffff0cffff02ff12ffff04ff02ffff04ff05ff80808080ff80ffff010180ffff01ff08ffff019b76616c69646174696f6e2070726f6772616d206368656174696e67ff0580ffff01ff018080ff0180ff018080
+ff02ffff01ff02ffff03ff5dffff01ff02ff10ffff04ff02ffff04ff05ff07808080ffff01ff02ff14ffff04ff02ffff04ff05ff0780808080ff0180ffff04ffff01ffffffff02ff28ffff04ff02ffff04ff03ffff04ff0bffff04ff0bffff04ffff02ff2effff04ff02ffff04ff2fff80808080ffff04ffff04ff09ffff04ff15ffff04ff2dffff04ffff20ff5d80ffff04ff8200bdff808080808080ff8080808080808080ffff02ff38ffff04ff02ffff04ff03ffff04ffff02ff26ffff04ff02ffff04ff82009fffff04ffff02ff2effff04ff02ffff04ff5fff80808080ff8080808080ffff04ffff19ffff18ffff0101ff1b80ffff16ff13ffff01018080ff808080808080ff04ff17ffff04ffff04ffff0102ffff04ffff04ffff0101ff3e80ffff04ffff04ffff0104ffff04ffff04ffff0101ff0280ffff04ffff0101ff80808080ff80808080ffff04ffff0bff0bffff02ff2effff04ff02ffff04ff17ff8080808080ffff04ffff04ff25ff3580ffff04ffff0164ffff04ff25ffff04ffff02ff3affff04ff02ffff04ff51ffff04ff8200bdff8080808080ffff04ff80ff808080808080808080ffff02ffff03ffff18ff2fffff010180ffff01ff04ffff0102ff8200bd80ffff01ff04ff80ffff04ffff04ffff18ff2fffff010180ffff02ff2cffff04ff02ffff04ff2fff8080808080ffff04ffff02ff3affff04ff02ffff04ff15ffff04ffff04ff09ffff04ff15ffff04ff2dffff04ffff20ff5d80ffff04ff8200bdff808080808080ff8080808080ffff04ffff018c6d6573736167652064617461ff808080808080ff0180ffff16ff05ffff0181ff8082017fffffff02ffff03ff05ffff01ff04ffff0104ffff04ffff04ffff0101ff0980ffff04ffff02ff12ffff04ff02ffff04ff0dff80808080ff80808080ffff01ff010180ff0180ffff02ffff03ff05ffff01ff0bffff06ffff06ffff01ffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c58080ffff02ff36ffff04ff02ffff04ff09ffff04ffff02ff2affff04ff02ffff04ff0dff80808080ff808080808080ffff01ff06ffff05ffff01ffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c5808080ff0180ff04ffff0102ffff04ffff04ffff0101ff0580ffff04ffff02ff12ffff04ff02ffff04ff07ff80808080ff80808080ffffff0bffff05ffff06ffff01ffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c58080ffff02ff36ffff04ff02ffff04ff05ffff04ffff02ff2affff04ff02ffff04ff07ff80808080ff808080808080ff0bffff0102ffff0bffff0102ffff06ffff05ffff01ffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c58080ff0580ffff0bffff0102ff0bffff05ffff05ffff01ffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c580808080ffff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff2effff04ff02ffff04ff09ff80808080ffff02ff2effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff02ffff03ffff18ffff02ff3cffff04ff02ffff04ff05ff80808080ffff010180ffff01ff08ffff019b76616c69646174696f6e2070726f6772616d206368656174696e67ff0580ffff01ff018080ff0180ff018080

src/channel_handler/game_handler.rs

@@ -148,6 +148,7 @@ fn run_code(
         .map(|r| r.1)
 }
 
+#[derive(Debug, Clone)]
 pub enum TheirTurnResult {
     MakeMove(GameHandler, NodePtr, Vec<u8>),
     Slash(NodePtr, Aggsig),

src/referee/mod.rs

@@ -22,14 +22,19 @@ use crate::common::types::{
 
 pub const REM_CONDITION_FIELDS: usize = 4;
 
+#[derive(Debug, Clone)]
 pub struct RefereeMakerMoveResult {
     pub puzzle_hash_for_unroll: PuzzleHash,
     pub move_made: Vec<u8>,
+    /// sha256 of the concatenation of two hashes:
+    /// 1 - The next game handler program
+    /// 2 - The game state.
     pub validation_info_hash: Hash,
     pub max_move_size: usize,
     pub mover_share: Amount,
 }
 
+#[derive(Debug, Clone)]
 pub struct TheirTurnMoveResult {
     pub puzzle_hash_for_unroll: PuzzleHash,
     pub readable_move: NodePtr,

src/tests/referee.rs

@@ -22,11 +22,15 @@ fn make_debug_game_handler(allocator: &mut AllocEncoder, amount: &Amount) -> Gam
     let curried_game_handler = CurriedProgram {
         program: debug_game_handler.clone(),
         args: clvm_curried_args!(
-            game_handler_mod_hash,
-            debug_game_handler,
-            amount.clone(),
-            true,
-            ((), (aggsig, ())) // slash info
+            (game_handler_mod_hash,
+             (debug_game_handler,
+              (amount.clone(),
+               (true,
+                (((), (aggsig, ())), ()) // slash info
+               )
+              )
+             )
+            )
         ),
     };
     GameHandler::my_driver_from_nodeptr(
@@ -70,6 +74,7 @@ fn test_referee_smoke() {
         1,
     )
     .expect("should construct");
+    referee.enable_debug_run(true);
     let readable_move = assemble(allocator.allocator(), "(0 . 0)").expect("should assemble");
     let my_move_result = referee
         .my_turn_make_move(
@@ -87,6 +92,7 @@ fn test_referee_smoke() {
         100,
         &Amount::default(),
     );
+    eprintln!("their move result {their_move_result:?}");
     if let Err(Error::StrErr(s)) = their_move_result {
         assert!(s.contains("slash"));
         assert!(s.contains("off chain"));