Merge pull request #2 from Yakuhito/dig

Imma dream reward distributors

Author: Yakuhito

puzzles/actions/dig/commit_incentives.clsp

@@ -40,7 +40,11 @@
     )
 
     (defun initialize_empty_slots (REWARD_SLOT_1ST_CURRY_HASH EPOCH_SECONDS start_epoch_time end_epoch_time)
-        (if (> end_epoch_time start_epoch_time)
+        (if (= start_epoch_time end_epoch_time)
+            ; optimization: if adding EPOCH_SECONDS to start_epoch_time will not get to end_epoch_time,
+            ;   this thing will run infinitely (good luck getting that into the mempool)
+            ()
+            ; else
             (c
                 (create_slot REWARD_SLOT_1ST_CURRY_HASH
                     (get_epoch_reward_slot_data_hash start_epoch_time (+ start_epoch_time EPOCH_SECONDS) 0)
@@ -52,14 +56,11 @@
                     end_epoch_time
                 )
             )
-            ; else
-            ; optimization - if this is not true, the output condition list won't be valid
-            (not (= start_epoch_time (- end_epoch_time EPOCH_SECONDS)))
         )
     )
 
     (if (all 
-        (not (> epoch_end slot_epoch_time))
+        (not (> epoch_end epoch_start)) ; we're adding incentives to a future epoch
         (> rewards_to_add 0)
     )
         (c

puzzles/actions/dig/commit_incentives.clsp.hex

@@ -1 +1 @@
-ff02ffff01ff02ffff03ffff22ffff20ffff15ff8206efff819f8080ffff15ff820fdfff808080ffff01ff04ffff04ffff10ff4fff820fdf80ffff04ff81afffff04ff82016fffff04ffff04ff8204efff8206ef80ff8080808080ffff02ff12ffff04ff02ffff04ff0bffff04ffff0bffff0102ffff0bffff0101ff8205df80ffff0bffff0102ffff0bffff0101ff820bdf80ffff0bffff0101ff820fdf808080ffff04ffff04ffff02ff3effff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff819fffff04ff82015fffff04ff8202dfff808080808080ff8080808080ffff02ffff03ffff09ff8205dfff819f80ffff01ff04ffff02ff2affff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff819fffff04ff82015fffff04ffff10ff8202dfff820fdf80ff808080808080ff8080808080ff8080ffff01ff02ffff03ffff09ff82015fff8080ffff01ff04ffff02ff2affff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff819fffff04ffff10ff819fff1780ffff04ff8202dfff808080808080ff8080808080ffff04ffff02ff2affff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff8205dfffff04ff80ffff04ff820fdfff808080808080ff8080808080ffff02ff2effff04ff02ffff04ff05ffff04ff17ffff04ffff10ff819fff1780ffff04ff8205dfff808080808080808080ffff01ff088080ff018080ff018080ff80808080808080ffff01ff088080ff0180ffff04ffff01ffffff33ff3e42ff02ffff02ffff03ff05ffff01ff0bff81fcffff02ff36ffff04ff02ffff04ff09ffff04ffff02ff2cffff04ff02ffff04ff0dff80808080ff808080808080ffff0181dc80ff0180ffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c5ffffff04ffff04ff28ffff04ffff0effff0163ff0b80ff808080ffff04ffff02ff2affff04ff02ffff04ff05ffff04ff0bff8080808080ff178080ffff04ff10ffff04ffff02ff3affff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ffff04ff80ffff04ffff04ff05ff8080ff8080808080ff0bff81bcffff02ff36ffff04ff02ffff04ff05ffff04ffff02ff2cffff04ff02ffff04ff07ff80808080ff808080808080ffffff0bffff0102ffff0bffff0101ff0580ffff0bffff0102ffff0bffff0101ff0b80ffff0bffff0101ff17808080ff0bff14ffff0bff14ff81dcff0580ffff0bff14ff0bff819c8080ffff02ffff03ffff15ff2fff1780ffff01ff04ffff02ff2affff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff17ffff04ffff10ff17ff0b80ffff01ff808080808080ff8080808080ffff02ff2effff04ff02ffff04ff05ffff04ff0bffff04ffff10ff17ff0b80ffff04ff2fff8080808080808080ffff01ff20ffff09ff17ffff11ff2fff0b80808080ff0180ff04ff38ffff04ffff0112ffff04ff80ffff04ffff02ff3affff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ff8080808080ff018080
+ff02ffff01ff02ffff03ffff22ffff20ffff15ff8206efff8205df8080ffff15ff820fdfff808080ffff01ff04ffff04ffff10ff4fff820fdf80ffff04ff81afffff04ff82016fffff04ffff04ff8204efff8206ef80ff8080808080ffff02ff12ffff04ff02ffff04ff0bffff04ffff0bffff0102ffff0bffff0101ff8205df80ffff0bffff0102ffff0bffff0101ff820bdf80ffff0bffff0101ff820fdf808080ffff04ffff04ffff02ff3effff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff819fffff04ff82015fffff04ff8202dfff808080808080ff8080808080ffff02ffff03ffff09ff8205dfff819f80ffff01ff04ffff02ff2affff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff819fffff04ff82015fffff04ffff10ff8202dfff820fdf80ff808080808080ff8080808080ff8080ffff01ff02ffff03ffff09ff82015fff8080ffff01ff04ffff02ff2affff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff819fffff04ffff10ff819fff1780ffff04ff8202dfff808080808080ff8080808080ffff04ffff02ff2affff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff8205dfffff04ff80ffff04ff820fdfff808080808080ff8080808080ffff02ff2effff04ff02ffff04ff05ffff04ff17ffff04ffff10ff819fff1780ffff04ff8205dfff808080808080808080ffff01ff088080ff018080ff018080ff80808080808080ffff01ff088080ff0180ffff04ffff01ffffff33ff3e42ff02ffff02ffff03ff05ffff01ff0bff81fcffff02ff36ffff04ff02ffff04ff09ffff04ffff02ff2cffff04ff02ffff04ff0dff80808080ff808080808080ffff0181dc80ff0180ffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c5ffffff04ffff04ff28ffff04ffff0effff0163ff0b80ff808080ffff04ffff02ff2affff04ff02ffff04ff05ffff04ff0bff8080808080ff178080ffff04ff10ffff04ffff02ff3affff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ffff04ff80ffff04ffff04ff05ff8080ff8080808080ff0bff81bcffff02ff36ffff04ff02ffff04ff05ffff04ffff02ff2cffff04ff02ffff04ff07ff80808080ff808080808080ffffff0bffff0102ffff0bffff0101ff0580ffff0bffff0102ffff0bffff0101ff0b80ffff0bffff0101ff17808080ff0bff14ffff0bff14ff81dcff0580ffff0bff14ff0bff819c8080ffff02ffff03ffff09ff17ff2f80ff80ffff01ff04ffff02ff2affff04ff02ffff04ff05ffff04ffff02ff26ffff04ff02ffff04ff17ffff04ffff10ff17ff0b80ffff01ff808080808080ff8080808080ffff02ff2effff04ff02ffff04ff05ffff04ff0bffff04ffff10ff17ff0b80ffff04ff2fff808080808080808080ff0180ff04ff38ffff04ffff0112ffff04ff80ffff04ffff02ff3affff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ff8080808080ff018080

puzzles/actions/dig/initiate_payout.clsp

@@ -53,6 +53,21 @@
                 (get_slot_data_hash mirror_payout_puzzle_hash (f reward_info) mirror_shares)
             )
 
+            (list CREATE_PUZZLE_ANNOUNCEMENT
+                (concat 'p'
+                    (sha256 2
+                        (sha256 2
+                            (sha256 1 mirror_payout_puzzle_hash)
+                            (sha256 1 mirror_shares)
+                        )
+                        (sha256 2
+                            (sha256 1 mirror_initial_cumulative_payout)
+                            (sha256 1 (f reward_info))
+                        )
+                    ) ; (sha256tree ((mirror_payout_puzzle_hash . mirror_shares) . (mirror_initial_cumulative_payout new_mirror_initial_cumulative_payout)))
+                ) 
+            )
+
             ; leading -42 -> condition will be returned by the reserve
             (list -42
                 CREATE_COIN

puzzles/actions/dig/initiate_payout.clsp.hex

@@ -1 +1 @@
-ff02ffff01ff04ffff04ffff11ff819fffff12ffff11ff8204dfff8202bf80ff8203bf8080ffff04ff82015fffff04ff8202dfffff04ff8205dfff8080808080ffff04ffff02ff3effff04ff02ffff04ff17ffff04ffff02ff3affff04ff02ffff04ff82013fffff04ff8202bfffff04ff8203bfff808080808080ff8080808080ffff04ffff02ff12ffff04ff02ffff04ff17ffff04ffff02ff3affff04ff02ffff04ff82013fffff04ff8204dfffff04ff8203bfff808080808080ff8080808080ffff04ffff04ffff0181d6ffff04ff10ffff04ff82013fffff04ffff02ff2effff04ff02ffff04ffff12ffff11ff8204dfff8202bf80ff8203bf80ffff04ff2fff8080808080ffff04ffff04ff82013fff8080ff808080808080ff8080808080ffff04ffff01ffffff3342ff02ffff02ffff03ff05ffff01ff0bff81fcffff02ff16ffff04ff02ffff04ff09ffff04ffff02ff2cffff04ff02ffff04ff0dff80808080ff808080808080ffff0181dc80ff0180ffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c5ffffff04ff10ffff04ffff02ff2affff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ffff04ff80ffff04ffff04ff05ff8080ff8080808080ffff0bff81bcffff02ff16ffff04ff02ffff04ff05ffff04ffff02ff2cffff04ff02ffff04ff07ff80808080ff808080808080ff0bffff0102ffff0bffff0101ff0580ffff0bffff0102ffff0bffff0101ff0b80ffff0bffff0101ff17808080ffff0bff14ffff0bff14ff81dcff0580ffff0bff14ff0bff819c8080ffff02ffff03ffff15ff05ff0b80ffff0105ffff01ff088080ff0180ff04ff18ffff04ffff0112ffff04ff80ffff04ffff02ff2affff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ff8080808080ff018080
+ff02ffff01ff04ffff04ffff11ff819fffff12ffff11ff8204dfff8202bf80ff8203bf8080ffff04ff82015fffff04ff8202dfffff04ff8205dfff8080808080ffff04ffff02ff3effff04ff02ffff04ff17ffff04ffff02ff3affff04ff02ffff04ff82013fffff04ff8202bfffff04ff8203bfff808080808080ff8080808080ffff04ffff02ff12ffff04ff02ffff04ff17ffff04ffff02ff3affff04ff02ffff04ff82013fffff04ff8204dfffff04ff8203bfff808080808080ff8080808080ffff04ffff04ff28ffff04ffff0effff0170ffff0bffff0102ffff0bffff0102ffff0bffff0101ff82013f80ffff0bffff0101ff8203bf8080ffff0bffff0102ffff0bffff0101ff8202bf80ffff0bffff0101ff8204df80808080ff808080ffff04ffff04ffff0181d6ffff04ff10ffff04ff82013fffff04ffff02ff2effff04ff02ffff04ffff12ffff11ff8204dfff8202bf80ff8203bf80ffff04ff2fff8080808080ffff04ffff04ff82013fff8080ff808080808080ff808080808080ffff04ffff01ffffff33ff3e42ff02ffff02ffff03ff05ffff01ff0bff81fcffff02ff16ffff04ff02ffff04ff09ffff04ffff02ff2cffff04ff02ffff04ff0dff80808080ff808080808080ffff0181dc80ff0180ffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c5ffffff04ff10ffff04ffff02ff2affff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ffff04ff80ffff04ffff04ff05ff8080ff8080808080ffff0bff81bcffff02ff16ffff04ff02ffff04ff05ffff04ffff02ff2cffff04ff02ffff04ff07ff80808080ff808080808080ff0bffff0102ffff0bffff0101ff0580ffff0bffff0102ffff0bffff0101ff0b80ffff0bffff0101ff17808080ffff0bff14ffff0bff14ff81dcff0580ffff0bff14ff0bff819c8080ffff02ffff03ffff15ff05ff0b80ffff0105ffff01ff088080ff0180ff04ff38ffff04ffff0112ffff04ff80ffff04ffff02ff2affff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ff8080808080ff018080

puzzles/actions/dig/new_epoch.clsp

@@ -50,21 +50,23 @@
                         (sha256 1 epoch_end) ; (sha256tree epoch_end)
                     ) 
                 )
-                (slot_oracle REWARD_SLOT_1ST_CURRY_HASH
-                    (sha256 2
-                        (sha256 1 slot_epoch_time)
+                (c
+                    ; condition prepended with -42 -> condition will be returned by the reserve
+                    (list -42
+                        CREATE_COIN
+                        VALIDATOR_PAYOUT_PUZZLE_HASH
+                        validator_fee
+                        (list VALIDATOR_PAYOUT_PUZZLE_HASH)
+                    )
+                    (slot_oracle REWARD_SLOT_1ST_CURRY_HASH
                         (sha256 2
-                            (sha256 1 slot_next_epoch_time)
-                            (sha256 1 epoch_total_rewards)
-                        )
-                    ) ; (sha256tree (epoch_time next_epoch_time . total_rewards))
-                )
-                ; condition prepended with -42 -> condition will be returned by the reserve
-                (list -42
-                    CREATE_COIN
-                    VALIDATOR_PAYOUT_PUZZLE_HASH
-                    validator_fee
-                    (list VALIDATOR_PAYOUT_PUZZLE_HASH)
+                            (sha256 1 slot_epoch_time)
+                            (sha256 2
+                                (sha256 1 slot_next_epoch_time)
+                                (sha256 1 epoch_total_rewards)
+                            )
+                        ) ; (sha256tree (epoch_time next_epoch_time . total_rewards))
+                    )
                 )
             ) ; conditions
         )

puzzles/actions/dig/new_epoch.clsp.hex

@@ -1 +1 @@
-ff02ffff01ff02ffff03ffff22ffff09ff8209dfff820ddf80ffff09ffff05ffff14ffff12ff820bbfff1780ffff018227108080ff820fbf80ffff21ffff22ffff09ff82013fff820ddf80ffff09ff820bbfff8205bf8080ffff22ffff15ff820ddfff82013f80ffff09ff8202bfff8080ffff09ff820bbfff8080808080ffff01ff04ffff04ffff11ff819fff820fbf80ffff04ff82015fffff04ffff04ff8204dfffff10ff8206dfffff11ff820bbfff820fbf808080ffff04ffff04ff820ddfffff10ff820ddfff2f8080ff8080808080ffff04ffff04ff18ffff04ffff0effff0165ffff0bffff0101ff820ddf8080ff808080ffff04ffff02ff3effff04ff02ffff04ff05ffff04ffff0bffff0102ffff0bffff0101ff82013f80ffff0bffff0102ffff0bffff0101ff8202bf80ffff0bffff0101ff820bbf808080ff8080808080ffff04ffff02ff1affff04ff02ffff04ff05ffff04ffff0bffff0102ffff0bffff0101ff82013f80ffff0bffff0102ffff0bffff0101ff8202bf80ffff0bffff0101ff820bbf808080ff8080808080ff808080ffff04ffff0181d6ffff04ff10ffff04ff0bffff04ff820fbfffff04ffff04ff0bff8080ff8080808080808080ffff01ff088080ff0180ffff04ffff01ffffff333eff42ff02ff02ffff03ff05ffff01ff0bff72ffff02ff2effff04ff02ffff04ff09ffff04ffff02ff3cffff04ff02ffff04ff0dff80808080ff808080808080ffff016280ff0180ffffffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c5ff04ff10ffff04ffff02ff16ffff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ffff04ff80ffff04ffff04ff05ff8080ff8080808080ffff0bff52ffff02ff2effff04ff02ffff04ff05ffff04ffff02ff3cffff04ff02ffff04ff07ff80808080ff808080808080ffff0bff2cffff0bff2cff62ff0580ffff0bff2cff0bff428080ff04ff14ffff04ffff0112ffff04ff80ffff04ffff02ff16ffff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ff8080808080ff018080
+ff02ffff01ff02ffff03ffff22ffff09ff8209dfff820ddf80ffff09ffff05ffff14ffff12ff820bbfff1780ffff018227108080ff820fbf80ffff21ffff22ffff09ff82013fff820ddf80ffff09ff820bbfff8205bf8080ffff22ffff15ff820ddfff82013f80ffff09ff8202bfff8080ffff09ff820bbfff8080808080ffff01ff04ffff04ffff11ff819fff820fbf80ffff04ff82015fffff04ffff04ff8204dfffff10ff8206dfffff11ff820bbfff820fbf808080ffff04ffff04ff820ddfffff10ff820ddfff2f8080ff8080808080ffff04ffff04ff18ffff04ffff0effff0165ffff0bffff0101ff820ddf8080ff808080ffff04ffff04ffff0181d6ffff04ff10ffff04ff0bffff04ff820fbfffff04ffff04ff0bff8080ff808080808080ffff04ffff02ff3effff04ff02ffff04ff05ffff04ffff0bffff0102ffff0bffff0101ff82013f80ffff0bffff0102ffff0bffff0101ff8202bf80ffff0bffff0101ff820bbf808080ff8080808080ffff04ffff02ff1affff04ff02ffff04ff05ffff04ffff0bffff0102ffff0bffff0101ff82013f80ffff0bffff0102ffff0bffff0101ff8202bf80ffff0bffff0101ff820bbf808080ff8080808080ff808080808080ffff01ff088080ff0180ffff04ffff01ffffff333eff42ff02ff02ffff03ff05ffff01ff0bff72ffff02ff2effff04ff02ffff04ff09ffff04ffff02ff3cffff04ff02ffff04ff0dff80808080ff808080808080ffff016280ff0180ffffffffa04bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459aa09dcf97a184f32623d11a73124ceb99a5709b083721e878a16d78f596718ba7b2ffa102a12871fee210fb8619291eaea194581cbd2531e4b23759d225f6806923f63222a102a8d5dd63fba471ebcb1f3e8f7c1e1879b7152a6e7298a91ce119a63400ade7c5ff04ff10ffff04ffff02ff16ffff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ffff04ff80ffff04ffff04ff05ff8080ff8080808080ffff0bff52ffff02ff2effff04ff02ffff04ff05ffff04ffff02ff3cffff04ff02ffff04ff07ff80808080ff808080808080ffff0bff2cffff0bff2cff62ff0580ffff0bff2cff0bff428080ff04ff14ffff04ffff0112ffff04ff80ffff04ffff02ff16ffff04ff02ffff04ff05ffff04ffff0bffff0101ff0b80ff8080808080ff8080808080ff018080

puzzles/actions/dig/withdraw_incentives.clsp

@@ -8,7 +8,7 @@
     (total_reserves active_shares reward_info current_round_info) ; Current_State
     (
         reward_slot_epoch_time
-        reward_slot_next_epoch_time_hash
+        reward_slot_next_epoch_time
         reward_slot_total_rewards
         clawback_ph
         committed_value .
@@ -19,11 +19,11 @@
     (include curry.clib)
     (include slots.clib)
 
-    (defun get_slot_data_hash (first second_hash third)
+    (defun get_slot_data_hash (first second third)
         (sha256 2
             (sha256 1 first)
             (sha256 2
-                second_hash
+                (sha256 1 second)
                 (sha256 1 third)
             )
         ) ; e.g., (sha256tree (epoch_time next_epoch_time . total_rewards))
@@ -44,20 +44,20 @@
 
             ; update epoch reward (lower total rewards)
             (spend_slot REWARD_SLOT_1ST_CURRY_HASH
-                (get_slot_data_hash reward_slot_epoch_time reward_slot_next_epoch_time_hash reward_slot_total_rewards)
+                (get_slot_data_hash reward_slot_epoch_time reward_slot_next_epoch_time reward_slot_total_rewards)
             )
 
             (create_slot REWARD_SLOT_1ST_CURRY_HASH
                 (get_slot_data_hash
                     reward_slot_epoch_time
-                    reward_slot_next_epoch_time_hash
+                    reward_slot_next_epoch_time
                     (- reward_slot_total_rewards withdrawal_share)
                 )
             )
 
             ; spend commitment slot, which functions as a ticket
             (spend_slot COMMITMENT_SLOT_1ST_CURRY_HASH
-                (get_slot_data_hash reward_slot_epoch_time (sha256 1 clawback_ph) committed_value)
+                (get_slot_data_hash reward_slot_epoch_time clawback_ph committed_value)
             )
 
             ; make sure the clawback owner wants to go ahead