Step 5, play on chain and off chain distribute rewards, allowing the framework to actually be used

clsp/calpoker_generate.clinc

@@ -37,7 +37,7 @@
             pokerb_hash
             image
             16
-            0
+            (/ amount 2)
             (curry calpoker_alice_driver_b preimage image)
             0
         )
@@ -52,10 +52,22 @@
             (curry calpoker_alice_driver_c PREIMAGE move) PREIMAGE)
 )
 
+(defun single-byte (raw-indices)
+    (if raw-indices
+        (assign
+            indices-len (strlen raw-indices)
+            (substr raw-indices (- indices-len 1) indices-len)
+        )
+        0x00
+    )
+)
+
 (defun bitify (mylist)
-    (if (not mylist)
-        0
-        (logior (f mylist) (lsh (bitify (r mylist)) 1))
+    (single-byte 
+        (if (not mylist)
+            0
+            (logior (f mylist) (lsh (bitify (r mylist)) 1))
+        )
     )
 )
 
@@ -73,7 +85,7 @@
             pokerd_hash
             (list cards new_commit)
             1
-            0
+            (/ amount 2)
             (curry calpoker_alice_driver_d salt my_picks)
             0
         )
@@ -84,13 +96,13 @@
     (if (not mylist)
         0
         (= (f mylist) index)
-        (logior 1 (* 2 (indices_to_bitfield_inner (r mylist) (+ index 1))))
-        (* 2 (indices_to_bitfield_inner mylist (+ index 1)))
+        (logior 1 (lsh (indices_to_bitfield_inner (r mylist) (+ index 1)) 1))
+        (lsh (indices_to_bitfield_inner mylist (+ index 1)) 1)
     )
 )
 
 (defun indices_to_bitfield (mylist)
-    (indices_to_bitfield_inner mylist 0)
+    (single-byte (indices_to_bitfield_inner mylist 0))
 )
 
 ; We have composed cards as sublists but need them as pairs.
@@ -108,14 +120,16 @@
         bob_all_cards (map make_card (append bob_cards_bob my_cards_bob))
         (my_hand_value my_picks) (handcalc (map card_list_to_pair my_all_cards))
         (bob_hand_value bob_picks) (handcalc (map card_list_to_pair bob_all_cards))
+        ;; win_result is 1 if my_hand_value is greater than bob_hand_value
         win_result (list_compare my_hand_value bob_hand_value)
+        ;; split is captured in a their turn handler below so it's the opposite of what
+        ;; this turn would specify.
         split (if (= win_result 1) 0 (= win_result 0) (lsh amount -1) amount)
         (list MAKE_MOVE
             (list move (indices_to_bitfield my_picks) (indices_to_bitfield bob_picks)
                 my_hand_value bob_hand_value win_result)
-            (lambda ((& MY_SALT MY_PICKS split)) (list (concat MY_SALT MY_PICKS) 0 0 0 0 split 0 0)
+            (lambda ((& MY_SALT MY_PICKS my_picks split amount)) (list (concat MY_SALT MY_PICKS (single-byte (indices_to_bitfield my_picks))) 0 0 0 0 split 0 0))
             0
-            )
         )
     )
 )
@@ -137,7 +151,7 @@
             pokerc_hash
             (list ALICE_COMMIT seed)
             48
-            0
+            (/ amount 2)
             (curry calpoker_bob_driver_c seed)
             parse_message
         )
@@ -192,8 +206,8 @@
             pokere
             pokere_hash
             (list my_move (list ALICE_CARDS BOB_CARDS) ALICE_COMMIT_2)
-            17
-            0
+            18
+            (/ amount 2)
             calpoker_bob_driver_e
             0
         )
@@ -206,19 +220,21 @@
 (defun calpoker_bob_driver_e (amount (@ state (bob_selects (alice_cards bob_cards) alice_commit_2)) move
         validation_program_hash max_move_size split)
     (assign
-        alice_selects (substr move 16 (strlen move))
-        (alice_cards_alice alice_cards_bob) (split_cards alice_selects alice_cards)
+        alice_my_picks (substr move 16 17)
+        alice_selects (substr move 17 (strlen move))
+        (alice_cards_alice alice_cards_bob) (split_cards alice_my_picks alice_cards)
         (bob_cards_bob bob_cards_alice) (split_cards bob_selects bob_cards)
         alice_all_cards (map make_card (append alice_cards_alice bob_cards_alice))
         bob_all_cards (map make_card (append bob_cards_bob alice_cards_bob))
         (alice_hand_value alice_picks) (handcalc (map card_list_to_pair alice_all_cards))
         (bob_hand_value bob_picks) (handcalc (map card_list_to_pair bob_all_cards))
         win_result (list_compare alice_hand_value bob_hand_value)
+        ;; win_result 1 means alice wins.
         correct_split (if (= win_result 1) 0 (= win_result 0) (lsh amount -1) amount)
         (if (!= split correct_split)
             (list SLASH (indices_to_bitfield bob_picks))
             (list MAKE_MOVE
-                (list alice_selects (indices_to_bitfield bob_picks) (indices_to_bitfield alice_picks)
+                (list alice_my_picks (indices_to_bitfield bob_picks) (indices_to_bitfield alice_picks)
                     bob_hand_value alice_hand_value split)
             )
         )

clsp/calpoker_include.clsp

@@ -66,7 +66,7 @@
        (max-move-size-of-template template)
 
        ;; Initial mover share
-       amount
+       (/ amount 2)
        )
       )
 
@@ -103,7 +103,7 @@
        (max-move-size-of-template template)
 
        ;; Initial mover share
-       ()
+       (/ amount 2)       
        )
       )
      )

clsp/calpoker_include_calpoker_factory_hash.hex

@@ -1 +1 @@
-a024e6d61c722329f072f49807b92a92137007a48efa8990a8a8e892a07302a60c
+a0f093ebbb30e63030a4f582d99b87160a3e5b0996eacb3d4e79da782a1f99cd73

clsp/calpoker_include_calpoker_template_hash.hex

@@ -1 +1 @@
-a0a67bd98df995843ce7455e32c980b1313f06f9095c4ebd3d93ee2225aed3b480
+a08a51b40fc76cb43b94c5cb1bea47088727f4954ea9360f9afb9e78e9265fc957

clsp/onchain/calpoker/a.clsp

@@ -9,6 +9,7 @@
 ; state is empty
 ; move is alice commit to a salted word
 ; evidence is empty
+; ME below is the object whose hash is mod_hash
 (export (mod_hash (move new_validation_hash max_move_size mover_share previous_validation_hash 
     mover_puzzle_hash waiter_puzzle_hash amount timeout max_move_size referee_hash) 
     state me mover_puzzle solution evidence)

clsp/onchain/calpoker/a.hex

@@ -1 +1 @@
-ff02ffff03ffff02ffff03ffff09ff15ffff0bffff01a017bebec00518a344e6689c1eb49da0fed674d08685e408a99cd1e070972fb6f4ffff0bffff0101ff09808080ffff01ff02ffff01ff02ffff03ffff09ffff0dff0980ffff012080ffff01ff02ffff01ff09ff2dffff011080ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff01ff02ffff01ff0880ff0180ffff01ff02ffff01ff0180ff018080ff0180
+ff02ffff03ffff02ffff03ffff09ff15ffff0bffff01a0d0ae87434a55a2af35392fb6563e06d617b0925d536ace533c72e512c2284a40ffff0bffff0101ff09808080ffff01ff02ffff01ff02ffff03ffff09ffff0dff0980ffff012080ffff01ff02ffff01ff09ff2dffff011080ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff01ff02ffff01ff0880ff0180ffff01ff02ffff01ff0180ff018080ff0180

clsp/onchain/calpoker/b.hex

@@ -1 +1 @@
-ff02ffff01ff02ffff03ffff02ffff03ffff09ff2bffff0bffff01a0d76b54b465224694d5b6f7f3165668b705fc87c0d6c5dd039041b1c164d479b8ffff02ff02ffff04ff02ffff04ffff04ff17ffff04ff13ffff01808080ff808080808080ffff01ff02ffff01ff02ffff03ffff09ffff0dff1380ffff011080ffff01ff02ffff01ff09ff5bffff013080ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff01ff02ffff01ff0880ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff04ffff01ff02ffff03ffff07ff0580ffff01ff02ffff01ff0bffff0102ffff02ff02ffff04ff02ffff04ffff05ff0580ff80808080ffff02ff02ffff04ff02ffff04ffff06ff0580ff8080808080ff0180ffff01ff02ffff01ff0bffff0101ff0580ff018080ff0180ff018080
+ff02ffff01ff02ffff03ffff02ffff03ffff09ff2bffff0bffff01a0142453e408bc4d8782fa52ab4f692f3bca82a781a90d6466baaee38a48a1c386ffff02ff02ffff04ff02ffff04ffff04ff17ffff04ff13ffff01808080ff808080808080ffff01ff02ffff01ff02ffff03ffff09ffff0dff1380ffff011080ffff01ff02ffff01ff09ff5bffff013080ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff01ff02ffff01ff0880ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff04ffff01ff02ffff03ffff07ff0580ffff01ff02ffff01ff0bffff0102ffff02ff02ffff04ff02ffff04ffff05ff0580ff80808080ffff02ff02ffff04ff02ffff04ffff06ff0580ff8080808080ff0180ffff01ff02ffff01ff0bffff0101ff0580ff018080ff0180ff018080

clsp/onchain/calpoker/c.clsp

@@ -12,17 +12,16 @@
 ; state is alice's commit and bob's seed
 ; move is alice's reveal of her card generating seed and her commit to which cards she's picking
 ; evidence is empty
-(export (mod_hash (move new_validation_hash max_move_size mover_share previous_validation_hash 
-    mover_puzzle_hash waiter_puzzle_hash amount timeout max_move_size referee_hash) 
-    (alice_commit bob_seed) me mover_puzzle solution evidence)
+(export (@ all_args (mod_hash (move new_validation_hash mover_share previous_validation_hash
+    mover_puzzle_hash waiter_puzzle_hash amount timeout max_move_size referee_hash)
+    (alice_commit bob_seed) me mover_puzzle solution evidence))
     (if_any_fail
         (= (strlen move) 48)
         (= (sha256 (substr move 0 16)) alice_commit)
-        (= new_validation_hash (sha256 dhash (shatree (list (make_cards 
+        (= new_validation_hash (sha256 dhash (shatree (list (make_cards
             (sha256 (substr move 0 16) bob_seed amount)) (substr move 16 48)))))
         (= max_move_size 1)
         0
         (x)
     )
 )
-

clsp/onchain/calpoker/c.hex

@@ -1 +1 @@
-ff02ffff01ff02ffff03ffff02ffff03ffff09ffff0dff1380ffff013080ffff01ff02ffff01ff02ffff03ffff09ffff0bffff0cff13ffff0180ffff01108080ff2780ffff01ff02ffff01ff02ffff03ffff09ff2bffff0bffff01a0a26f665f62b95611287a458c9e63ed131d9a364355e336c991857dfd1e8da690ffff02ff3effff04ff02ffff04ffff04ffff02ff3cffff04ff02ffff04ffff0bffff0cff13ffff0180ffff011080ff57ff820bfb80ff80808080ffff04ffff0cff13ffff0110ffff013080ffff01808080ff808080808080ffff01ff02ffff01ff09ff5bffff010180ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff01ff02ffff01ff0880ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff04ffff01ffffffff02ffff03ffff09ff0bffff010180ffff01ff02ffff01ff02ff28ffff04ff02ffff04ffff06ff0180ffff04ffff14ff17ff0580ff8080808080ff0180ffff01ff02ffff01ff02ff38ffff04ff02ffff04ffff06ff0180ffff04ffff17ff0bffff0181ff80ff8080808080ff018080ff0180ffff04ffff04ff1bff8080ffff04ff13ff808080ff02ff14ffff04ff02ffff04ff03ffff04ffff02ff10ffff04ff02ffff04ff09ffff04ff0bffff04ff2dff808080808080ff8080808080ffff02ff2cffff04ff02ffff04ff03ffff04ffff02ff10ffff04ff02ffff04ffff11ff11ff1580ffff04ffff11ff29ff1580ffff04ff2bff808080808080ff8080808080ffff04ffff02ff3affff04ff02ffff04ff25ffff04ff13ffff01ff808080808080ffff04ff2bff808080ff02ff12ffff04ff02ffff04ff03ffff04ffff02ff10ffff04ff02ffff04ffff0134ffff04ffff0108ffff04ff05ff808080808080ff8080808080ffffff02ff2affff04ff02ffff04ff03ffff04ffff02ff10ffff04ff02ffff04ffff012cffff04ffff0108ffff04ff2bff808080808080ff8080808080ffff04ff25ffff04ffff02ff36ffff04ff02ffff04ff25ffff04ff13ffff01ff808080808080ff808080ff02ffff03ff0bffff01ff02ffff01ff02ff26ffff04ff02ffff04ffff06ff0180ffff04ffff10ffff05ff0b80ff1780ff8080808080ff0180ffff01ff02ffff0105ff018080ff0180ffffff02ffff03ff09ffff01ff02ffff01ff02ffff03ffff20ffff15ffff05ff0980ff0b8080ffff01ff02ffff01ff04ffff05ff0980ffff02ff3affff04ff02ffff04ffff06ff0980ffff04ff15ffff04ffff10ff2dffff010180ff80808080808080ff0180ffff01ff02ffff01ff04ff0bffff02ff3affff04ff02ffff04ff09ffff04ffff06ff1580ffff04ff2dff80808080808080ff018080ff0180ff0180ffff01ff02ffff01ff04ff0bffff02ff3affff04ff02ffff04ffff0180ffff04ffff06ff1580ffff04ff2dff80808080808080ff018080ff0180ff02ffff03ff0bffff01ff02ffff01ff02ff2effff04ff02ffff04ffff06ff0180ffff04ffff10ffff05ff0b80ff1780ff8080808080ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff02ffff03ff09ffff01ff02ffff01ff02ffff03ffff20ffff15ffff05ff0980ff0b8080ffff01ff02ffff01ff02ff36ffff04ff02ffff04ffff06ff0980ffff04ff15ffff04ffff10ff2dffff010180ff808080808080ff0180ffff01ff02ffff01ff04ff0bffff02ff36ffff04ff02ffff04ff09ffff04ffff06ff1580ffff04ff2dff80808080808080ff018080ff0180ff0180ffff01ff02ffff01ff04ff0bffff02ff36ffff04ff02ffff04ffff0180ffff04ffff06ff1580ffff04ff2dff80808080808080ff018080ff0180ff02ffff03ffff07ff0580ffff01ff02ffff01ff0bffff0102ffff02ff3effff04ff02ffff04ffff05ff0580ff80808080ffff02ff3effff04ff02ffff04ffff06ff0580ff8080808080ff0180ffff01ff02ffff01ff0bffff0101ff0580ff018080ff0180ff018080
+ff02ffff01ff02ffff03ffff02ffff03ffff09ffff0dff1380ffff013080ffff01ff02ffff01ff02ffff03ffff09ffff0bffff0cff13ffff0180ffff01108080ff2780ffff01ff02ffff01ff02ffff03ffff09ff2bffff0bffff01a0dac9b3641c1ff33d6b7bb565ad5055b5fb24d503774af3c5b978207e24dd5cedffff02ff3effff04ff02ffff04ffff04ffff02ff3cffff04ff02ffff04ffff0bffff0cff13ffff0180ffff011080ff57ff8205fb80ff80808080ffff04ffff0cff13ffff0110ffff013080ffff01808080ff808080808080ffff01ff02ffff01ff09ff8217fbffff010180ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff01ff02ffff01ff0880ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff04ffff01ffffffff02ffff03ffff09ff0bffff010180ffff01ff02ffff01ff02ff28ffff04ff02ffff04ffff06ff0180ffff04ffff14ff17ff0580ff8080808080ff0180ffff01ff02ffff01ff02ff38ffff04ff02ffff04ffff06ff0180ffff04ffff17ff0bffff0181ff80ff8080808080ff018080ff0180ffff04ffff04ff1bff8080ffff04ff13ff808080ff02ff14ffff04ff02ffff04ff03ffff04ffff02ff10ffff04ff02ffff04ff09ffff04ff0bffff04ff2dff808080808080ff8080808080ffff02ff2cffff04ff02ffff04ff03ffff04ffff02ff10ffff04ff02ffff04ffff11ff11ff1580ffff04ffff11ff29ff1580ffff04ff2bff808080808080ff8080808080ffff04ffff02ff3affff04ff02ffff04ff25ffff04ff13ffff01ff808080808080ffff04ff2bff808080ff02ff12ffff04ff02ffff04ff03ffff04ffff02ff10ffff04ff02ffff04ffff0134ffff04ffff0108ffff04ff05ff808080808080ff8080808080ffffff02ff2affff04ff02ffff04ff03ffff04ffff02ff10ffff04ff02ffff04ffff012cffff04ffff0108ffff04ff2bff808080808080ff8080808080ffff04ff25ffff04ffff02ff36ffff04ff02ffff04ff25ffff04ff13ffff01ff808080808080ff808080ff02ffff03ff0bffff01ff02ffff01ff02ff26ffff04ff02ffff04ffff06ff0180ffff04ffff10ffff05ff0b80ff1780ff8080808080ff0180ffff01ff02ffff0105ff018080ff0180ffffff02ffff03ff09ffff01ff02ffff01ff02ffff03ffff20ffff15ffff05ff0980ff0b8080ffff01ff02ffff01ff04ffff05ff0980ffff02ff3affff04ff02ffff04ffff06ff0980ffff04ff15ffff04ffff10ff2dffff010180ff80808080808080ff0180ffff01ff02ffff01ff04ff0bffff02ff3affff04ff02ffff04ff09ffff04ffff06ff1580ffff04ff2dff80808080808080ff018080ff0180ff0180ffff01ff02ffff01ff04ff0bffff02ff3affff04ff02ffff04ffff0180ffff04ffff06ff1580ffff04ff2dff80808080808080ff018080ff0180ff02ffff03ff0bffff01ff02ffff01ff02ff2effff04ff02ffff04ffff06ff0180ffff04ffff10ffff05ff0b80ff1780ff8080808080ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff02ffff03ff09ffff01ff02ffff01ff02ffff03ffff20ffff15ffff05ff0980ff0b8080ffff01ff02ffff01ff02ff36ffff04ff02ffff04ffff06ff0980ffff04ff15ffff04ffff10ff2dffff010180ff808080808080ff0180ffff01ff02ffff01ff04ff0bffff02ff36ffff04ff02ffff04ff09ffff04ffff06ff1580ffff04ff2dff80808080808080ff018080ff0180ff0180ffff01ff02ffff01ff04ff0bffff02ff36ffff04ff02ffff04ffff0180ffff04ffff06ff1580ffff04ff2dff80808080808080ff018080ff0180ff02ffff03ffff07ff0580ffff01ff02ffff01ff0bffff0102ffff02ff3effff04ff02ffff04ffff05ff0580ff80808080ffff02ff3effff04ff02ffff04ffff06ff0580ff8080808080ff0180ffff01ff02ffff01ff0bffff0101ff0580ff018080ff0180ff018080

clsp/onchain/calpoker/d.clsp

@@ -11,7 +11,7 @@
 ; state is the cards for both players and alice's card pick commitment
 ; move is Bob's picks
 ; evidence is empty
-(export (mod_hash (bob_picks new_validation_hash max_move_size mover_share previous_validation_hash 
+(export (mod_hash (bob_picks new_validation_hash mover_share previous_validation_hash 
     mover_puzzle_hash waiter_puzzle_hash amount timeout max_move_size referee_hash) 
     (cards alice_commit) me mover_puzzle solution evidence)
     (if_any_fail

clsp/onchain/calpoker/d.hex

@@ -1 +1 @@
-ff02ffff01ff02ffff03ffff02ffff03ffff09ffff0dff1380ffff010180ffff01ff02ffff01ff02ffff03ffff09ffff02ff04ffff04ff02ffff04ff13ff80808080ffff010480ffff01ff02ffff01ff02ffff03ffff09ff2bffff0bffff01a005403605dcfa6a8cd8ba4d79c173a9ebe72a0727a980db1dd3d97b37cc56f53cffff02ff06ffff04ff02ffff04ffff04ff13ffff04ff27ffff04ff57ffff0180808080ff808080808080ffff01ff02ffff01ff09ff5bffff011280ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff01ff02ffff01ff0880ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff04ffff01ffff02ffff03ff05ffff01ff02ffff01ff10ffff18ff05ffff010180ffff02ff04ffff04ff02ffff04ffff17ff05ffff0181ff80ff8080808080ff0180ffff01ff02ffff01ff0180ff018080ff0180ff02ffff03ffff07ff0580ffff01ff02ffff01ff0bffff0102ffff02ff06ffff04ff02ffff04ffff05ff0580ff80808080ffff02ff06ffff04ff02ffff04ffff06ff0580ff8080808080ff0180ffff01ff02ffff01ff0bffff0101ff0580ff018080ff0180ff018080
+ff02ffff01ff02ffff03ffff02ffff03ffff09ffff0dff1380ffff010180ffff01ff02ffff01ff02ffff03ffff09ffff02ff04ffff04ff02ffff04ff13ff80808080ffff010480ffff01ff02ffff01ff02ffff03ffff09ff2bffff0bffff01a08d85de470a5bff6cdab35d73f9b40ee01c64ee70237af68a4d5e41d43a1eda37ffff02ff06ffff04ff02ffff04ffff04ff13ffff04ff27ffff04ff57ffff0180808080ff808080808080ffff01ff02ffff01ff09ff8217fbffff011280ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff01ff02ffff01ff0880ff0180ffff01ff02ffff01ff0180ff018080ff0180ffff04ffff01ffff02ffff03ff05ffff01ff02ffff01ff10ffff18ff05ffff010180ffff02ff04ffff04ff02ffff04ffff17ff05ffff0181ff80ff8080808080ff0180ffff01ff02ffff01ff0180ff018080ff0180ff02ffff03ffff07ff0580ffff01ff02ffff01ff0bffff0102ffff02ff06ffff04ff02ffff04ffff05ff0580ff80808080ffff02ff06ffff04ff02ffff04ffff06ff0580ff8080808080ff0180ffff01ff02ffff01ff0bffff0101ff0580ff018080ff0180ff018080

clsp/onchain/calpoker/e.clsp

@@ -18,7 +18,7 @@
     mover_puzzle_hash waiter_puzzle_hash amount timeout max_move_size referee_hash) 
     (bob_picks (alice_cards bob_cards) alice_commit) me mover_puzzle solution bob_card_selections)
     (if_any_fail
-        (= (strlen move) 18)
+        (list "poker e" move) (= (strlen move) 18)
         (assign
             alice_salted_picks (substr move 0 17)
             alice_picks (substr move 16 17)