starred/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2026-08-24 10:05:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bump clvm versions and replace ((c P A)) with (a P A)."

Browse Source 
This reverts commit d0a08d2a93.
This commit is contained in:
Richard Kiss
2021-03-01 17:14:13 -08:00
committed by Gene Hoffman
parent 52a8976393
commit a8a7af9ebc
39 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup.py
+3 -3
View File
@@ -7,9 +7,9 @@ dependencies = [
"chiavdf==0.15.0", # timelord and vdf verification
"chiabip158==0.19", # bip158-style wallet filters
"chiapos==0.12.45", # proof of space
"clvm==0.9.3",
"clvm_rs==0.1.4",
"clvm_tools==0.4.3",
"clvm==0.9.0",
"clvm_rs==0.1.3", # noqa
"clvm_tools==0.4.1", # noqa
"aiohttp==3.7.4", # HTTP server for full node rpc
"aiosqlite==0.17.0", # asyncio wrapper for sqlite, to store blocks
"bitstring==3.1.7", # Binary data management library
src/wallet/puzzles/calculate_synthetic_public_key.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff1dff02ffff1effff0bff02ff05808080
ff1dff02ffff1effff0bff02ff05808080
src/wallet/puzzles/cc.clvm
+3 -3
View File
@@ -291,8 +291,8 @@
(if
(f lineage-proof)
(is-parent-cc lineage-proof-parameters my-coin-info (r lineage-proof))
(a (genesis-coin-checker-for-lpp lineage-proof-parameters)
(list lineage-proof-parameters my-coin-info (r lineage-proof)))
((c (genesis-coin-checker-for-lpp lineage-proof-parameters)
(list lineage-proof-parameters my-coin-info (r lineage-proof))))
)
)
@@ -333,7 +333,7 @@
(main
;; cache some stuff: output conditions, and lineage-proof-parameters
(list mod-hash (sha256tree1 mod-hash) genesis-coin-checker (sha256tree1 genesis-coin-checker))
(a inner-puzzle inner-puzzle-solution)
((c inner-puzzle inner-puzzle-solution))
prev-coin-bundle
my-coin-bundle
next-coin-bundle
src/wallet/puzzles/cc.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff02ff7affff04ff02ffff04ffff04ff05ffff04ffff02ff2effff04ff02ffff04ff05ff80808080ffff04ff0bffff04ffff02ff2effff04ff02ffff04ff0bff80808080ff8080808080ffff04ffff02ff17ff2f80ffff04ff5fffff04ff81bfffff04ff82017fffff04ff8202ffff808080808080808080ffff04ffff01ffffffff3536ff3433ffffff02ff5effff04ff02ffff04ffff02ff2cffff04ff02ffff04ff09ffff04ff15ffff04ff5dffff04ff0bff80808080808080ffff04ff09ffff04ff15ffff04ff5dffff04ff0bff8080808080808080ff0bff09ff15ff2d80ffff02ff5cffff04ff02ffff04ff05ffff04ff07ff8080808080ffff04ffff0102ffff04ffff04ffff0101ff0580ffff04ffff02ff7cffff04ff02ffff04ff0bffff01ff0180808080ff80808080ff02ffff03ff05ffff01ff04ffff0104ffff04ffff04ffff0101ff0980ffff04ffff02ff7cffff04ff02ffff04ff0dffff04ff0bff8080808080ff80808080ffff010b80ff0180ffffff2dff02ffff03ff15ffff01ff02ff5affff04ff02ffff04ff0bffff04ff09ffff04ff1dff808080808080ffff01ff02ffff02ff22ffff04ff02ffff04ff0bff80808080ffff04ff0bffff04ff09ffff04ff1dff808080808080ff0180ffff02ffff03ff0bffff01ff02ffff03ffff09ff05ff1380ffff01ff0101ffff01ff02ff2affff04ff02ffff04ff05ffff04ff1bff808080808080ff0180ff8080ff0180ffff09ff13ffff0bff27ffff02ff24ffff04ff02ffff04ff05ffff04ff57ff8080808080ff81b78080ff02ffff03ffff02ff32ffff04ff02ffff04ff17ffff04ff05ff8080808080ffff01ff02ffff03ffff02ff32ffff04ff02ffff04ff2fffff04ff05ff8080808080ffff01ff02ffff03ffff02ff32ffff04ff02ffff04ff5fffff04ff05ff8080808080ffff01ff04ffff04ff30ffff04ffff02ff34ffff04ff02ffff04ff4fff80808080ff808080ffff04ffff04ff28ffff04ffff02ff2effff04ff02ffff04ff27ffff04ff81bfff8080808080ff808080ffff04ffff04ff20ffff04ffff0bffff02ff34ffff04ff02ffff04ff819fff80808080ffff02ff2effff04ff02ffff04ff4fffff04ffff10ff81bfffff11ff8202cfffff02ff36ffff04ff02ffff04ff0bff808080808080ff808080808080ff808080ffff02ff26ffff04ff02ffff04ff0bffff04ff05ff8080808080808080ffff01ff088080ff0180ffff01ff088080ff0180ffff01ff088080ff0180ffffff02ffff03ff05ffff01ff04ffff02ffff03ffff09ff11ff3880ffff01ff04ff38ffff04ffff02ff24ffff04ff02ffff04ff0bffff04ff29ff8080808080ffff04ff59ff80808080ffff010980ff0180ffff02ff26ffff04ff02ffff04ff0dffff04ff0bff808080808080ff8080ff0180ff02ffff03ff05ffff01ff10ffff02ffff03ffff09ff11ff3880ffff0159ff8080ff0180ffff02ff36ffff04ff02ffff04ff0dff8080808080ff8080ff0180ffff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff2effff04ff02ffff04ff09ff80808080ffff02ff2effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ffff02ff7effff04ff02ffff04ff05ffff04ff07ff8080808080ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff7effff04ff02ffff04ff09ffff04ff0bff8080808080ffff02ff7effff04ff02ffff04ff0dffff04ff0bff808080808080ffff01ff02ffff03ffff02ff2affff04ff02ffff04ff05ffff04ff0bff8080808080ffff0105ffff01ff0bffff0101ff058080ff018080ff0180ff018080
ffff04ffff01ffff04ff7affff04ff02ffff04ffff04ff05ffff04ffffff04ff2effff04ff02ffff04ff05ffff018080808080ffff04ff0bffff04ffffff04ff2effff04ff02ffff04ff0bffff018080808080ffff018080808080ffff04ffffff04ff17ff2f8080ffff04ff5fffff04ff81bfffff04ff82017fffff04ff8202ffffff0180808080808080808080ffff04ffff01ffffffff3536ff3433ffffffff04ff5effff04ff02ffff04ffffff04ff2cffff04ff02ffff04ff09ffff04ff15ffff04ff5dffff04ff0bffff018080808080808080ffff04ff09ffff04ff15ffff04ff5dffff04ff0bffff01808080808080808080ff0bff09ff15ff2d80ffffff04ff5cffff04ff02ffff04ff05ffff04ff07ffff01808080808080ffff04ffff0102ffff04ffff04ffff0101ff0580ffff04ffffff04ff7cffff04ff02ffff04ff0bffff01ff018080808080ffff0180808080ffff04ffff03ff05ffff01ff04ffff0104ffff04ffff04ffff0101ff0980ffff04ffffff04ff7cffff04ff02ffff04ff0dffff04ff0bffff01808080808080ffff0180808080ffff010b80ff018080ffffff2dffff04ffff03ff15ffff01ffff04ff5affff04ff02ffff04ff0bffff04ff09ffff04ff1dffff0180808080808080ffff01ffff04ffffff04ff22ffff04ff02ffff04ff0bffff018080808080ffff04ff0bffff04ff09ffff04ff1dffff0180808080808080ff018080ffffff04ffff03ff0bffff01ffff04ffff03ffff09ff05ff1380ffff01ff0101ffff01ffff04ff2affff04ff02ffff04ff05ffff04ff1bffff0180808080808080ff018080ffff01ff018080ff018080ffff09ff13ffff0bff27ffffff04ff24ffff04ff02ffff04ff05ffff04ff57ffff01808080808080ff81b78080ffff04ffff03ffffff04ff32ffff04ff02ffff04ff17ffff04ff05ffff01808080808080ffff01ffff04ffff03ffffff04ff32ffff04ff02ffff04ff2fffff04ff05ffff01808080808080ffff01ffff04ffff03ffffff04ff32ffff04ff02ffff04ff5fffff04ff05ffff01808080808080ffff01ff04ffff04ff30ffff04ffffff04ff34ffff04ff02ffff04ff4fffff018080808080ffff01808080ffff04ffff04ff28ffff04ffffff04ff2effff04ff02ffff04ff27ffff04ff81bfffff01808080808080ffff01808080ffff04ffff04ff20ffff04ffff0bffffff04ff34ffff04ff02ffff04ff819fffff018080808080ffffff04ff2effff04ff02ffff04ff4fffff04ffff10ff81bfffff11ff8202cfffffff04ff36ffff04ff02ffff04ff0bffff0180808080808080ffff0180808080808080ffff01808080ffffff04ff26ffff04ff02ffff04ff0bffff04ff05ffff01808080808080808080ffff01ff088080ff018080ffff01ff088080ff018080ffff01ff088080ff018080ffffffff04ffff03ff05ffff01ff04ffffff04ffff03ffff09ff11ff3880ffff01ff04ff38ffff04ffffff04ff24ffff04ff02ffff04ff0bffff04ff29ffff01808080808080ffff04ff59ffff0180808080ffff010980ff018080ffffff04ff26ffff04ff02ffff04ff0dffff04ff0bffff0180808080808080ffff01ff018080ff018080ffff04ffff03ff05ffff01ff10ffffff04ffff03ffff09ff11ff3880ffff0159ffff01ff018080ff018080ffffff04ff36ffff04ff02ffff04ff0dffff01808080808080ffff01ff018080ff018080ffffff04ffff03ffff07ff0580ffff01ff0bffff0102ffffff04ff2effff04ff02ffff04ff09ffff018080808080ffffff04ff2effff04ff02ffff04ff0dffff01808080808080ffff01ff0bffff0101ff058080ff018080ffffff04ff7effff04ff02ffff04ff05ffff04ff07ffff01808080808080ffff04ffff03ffff07ff0580ffff01ff0bffff0102ffffff04ff7effff04ff02ffff04ff09ffff04ff0bffff01808080808080ffffff04ff7effff04ff02ffff04ff0dffff04ff0bffff0180808080808080ffff01ffff04ffff03ffffff04ff2affff04ff02ffff04ff05ffff04ff0bffff01808080808080ffff0105ffff01ff0bffff0101ff058080ff01808080ff018080ff01808080
src/wallet/puzzles/cc.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
e2d5d4a86e1dd254012f0fff0a7f0870ed5dbd038a280453b349b5a7f96b3704
b72ca4bd8877287046cd3f9a58206ed7803eba14ea12af54e608a057c1fc82c0
src/wallet/puzzles/generator.clvm
+2 -2
View File
@@ -25,7 +25,7 @@
(defun npc_list_for_coinsolution (coin_solution)
; The pattern (= (r (r foo)) ()) checks that foo is a list of length 2
(if (and (= (r (r coin_solution)) ()) (= (r (r (f (r coin_solution)))) ()) (= (strlen (f coin_solution)) 32))
(list (f coin_solution) (sha256tree1 (f (f (r coin_solution)))) (a (f (f (r coin_solution))) (f (r (f (r coin_solution))))))
(list (f coin_solution) (sha256tree1 (f (f (r coin_solution)))) ((c (f (f (r coin_solution))) (f (r (f (r coin_solution)))))))
(x)
)
)
@@ -38,5 +38,5 @@
)
; main
(generate_npc_pair_list (a block_program (q . ())) ())
(generate_npc_pair_list ((c block_program (q . ()))) ())
)
src/wallet/puzzles/generator.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff02ff04ffff04ff02ffff04ffff02ff03ff8080ffff01ff8080808080ffff04ffff01ffff02ffff03ff05ffff01ff02ff04ffff04ff02ffff04ff0dffff04ffff04ffff02ff0affff04ff02ffff04ff09ff80808080ff0b80ff8080808080ffff010b80ff0180ffff02ffff03ffff02ffff03ffff09ff1dff8080ffff01ff02ffff03ffff09ff75ff8080ffff01ff02ffff03ffff09ffff0dff0980ffff012080ffff01ff0101ff8080ff0180ff8080ff0180ff8080ff0180ffff01ff04ff09ffff04ffff02ff0effff04ff02ffff04ff25ff80808080ffff04ffff02ff25ff5580ff80808080ffff01ff088080ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff0effff04ff02ffff04ff09ff80808080ffff02ff0effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
ffff04ffff01ffff04ff04ffff04ff02ffff04ffffff04ff03ffff01808080ffff01ff808080808080ffff04ffff01ffffff04ffff03ff05ffff01ffff04ff04ffff04ff02ffff04ff0dffff04ffff04ffffff04ff0affff04ff02ffff04ff09ffff018080808080ff0b80ffff01808080808080ffff010b80ff018080ffffff04ffff03ffffff04ffff03ffff09ff1dffff018080ffff01ffff04ffff03ffff09ff75ffff018080ffff01ffff04ffff03ffff09ffff0dff0980ffff012080ffff01ff0101ffff01ff018080ff018080ffff01ff018080ff018080ffff01ff018080ff018080ffff01ff04ff09ffff04ffffff04ff0effff04ff02ffff04ff25ffff018080808080ffff04ffffff04ff25ff558080ffff0180808080ffff01ff088080ff018080ffff04ffff03ffff07ff0580ffff01ff0bffff0102ffffff04ff0effff04ff02ffff04ff09ffff018080808080ffffff04ff0effff04ff02ffff04ff0dffff01808080808080ffff01ff0bffff0101ff058080ff018080ff01808080
src/wallet/puzzles/generator.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
406b967077bf21dd9529f19959916e7529c2ed3b360c256d4ebdd9bdc9f57fab
00767b4cc15f9836532083b97f52a96e9fe5f99fe3af655ac58f19f780943e68
src/wallet/puzzles/generator_for_single_coin.clvm
+1 -1
View File
@@ -11,5 +11,5 @@
)
; main
(check_for_coinname (a block_program (q . ())) coinname)
(check_for_coinname ((c block_program (q . ()))) coinname)
)
src/wallet/puzzles/generator_for_single_coin.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff02ff02ffff04ff02ffff04ffff02ff05ff8080ffff04ff0bff8080808080ffff04ffff01ff02ffff03ff05ffff01ff02ffff03ffff09ff11ff0b80ffff01ff04ff49ffff04ff81a9ff808080ffff01ff02ff02ffff04ff02ffff04ff0dffff04ff0bff808080808080ff0180ffff01ff088080ff0180ff018080
ffff04ffff01ffff04ff02ffff04ff02ffff04ffffff04ff05ffff01808080ffff04ff0bffff01808080808080ffff04ffff01ffff04ffff03ff05ffff01ffff04ffff03ffff09ff11ff0b80ffff01ff04ff49ffff04ff81a9ffff01808080ffff01ffff04ff02ffff04ff02ffff04ff0dffff04ff0bffff0180808080808080ff018080ffff01ff088080ff018080ff01808080
src/wallet/puzzles/generator_for_single_coin.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
7971f791117fa1cd4e034977460f23efa56863ea0b859162833167a7154e2b0d
950b29009cb17a28b5db48b7913791091acaf009e9344813f10e31a7558c3bea
src/wallet/puzzles/genesis-by-coin-id-with-0.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff03ffff09ff5bff8080ffff01ff0101ffff01ff02ffff03ffff09ff13ff0280ffff01ff0101ff8080ff018080ff0180
ffff04ffff03ffff09ff5bffff018080ffff01ff0101ffff01ffff04ffff03ffff09ff13ff0280ffff01ff0101ffff01ff018080ff01808080ff018080
src/wallet/puzzles/genesis-by-coin-id-with-0.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
258008f81f21c270f4b58488b108a46a35e5df43ca5b0313ac83e900a5e44a5f
213b7f3d076a54d0d7e0fe371534c35ce1154edd5b9b53e014cf3257cd1da4e1
src/wallet/puzzles/genesis-by-puzzle-hash-with-0.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff03ffff09ff5bff8080ffff01ff0101ffff01ff02ffff03ffff02ffff03ffff09ffff0bff47ff81a7ff82016780ff1380ffff01ff02ffff03ffff09ff81a7ff0280ffff01ff0101ff8080ff0180ff8080ff0180ffff01ff0101ff8080ff018080ff0180
ffff04ffff03ffff09ff5bffff018080ffff01ff0101ffff01ffff04ffff03ffffff04ffff03ffff09ffff0bff47ff81a7ff82016780ff1380ffff01ffff04ffff03ffff09ff81a7ff0280ffff01ff0101ffff01ff018080ff018080ffff01ff018080ff018080ffff01ff0101ffff01ff018080ff01808080ff018080
src/wallet/puzzles/genesis-by-puzzle-hash-with-0.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
795964e0324fbc08e8383d67659194a70455956ad1ebd2329ccf20008da00936
bbabca6897685a731470810f2d4b54a8a64c4d24d9496dcc18f4a5675e2b7187
src/wallet/puzzles/lock.inner.puzzle.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff01ff8080
ff01ff8080
src/wallet/puzzles/p2_conditions.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff04ffff0101ff0280
ff04ffff0101ff0280
src/wallet/puzzles/p2_delegated_conditions.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff04ffff04ff04ffff04ff05ffff04ffff02ff06ffff04ff02ffff04ff0bff80808080ff80808080ff0b80ffff04ffff01ff31ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff06ffff04ff02ffff04ff09ff80808080ffff02ff06ffff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
ffff04ffff01ff04ffff04ff04ffff04ff05ffff04ffffff04ff06ffff04ff02ffff04ff0bffff018080808080ffff0180808080ff0b80ffff04ffff01ff31ffff04ffff03ffff07ff0580ffff01ff0bffff0102ffffff04ff06ffff04ff02ffff04ff09ffff018080808080ffffff04ff06ffff04ff02ffff04ff0dffff01808080808080ffff01ff0bffff0101ff058080ff018080ff01808080
src/wallet/puzzles/p2_delegated_conditions.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
b11d23f3534638ef255337871cedca9e6fc60d4ed42bdb627c16323b659772c1
76f18c9df26a18d87e9fe22e17fa1e36d031c1b73752649659c9a86e2efcf471
src/wallet/puzzles/p2_delegated_puzzle.clvm
+1 -1
View File
@@ -15,5 +15,5 @@
)
(c (list AGG_SIG_ME public_key (sha256tree1 delegated_puzzle))
(a delegated_puzzle delegated_puzzle_solution))
((c delegated_puzzle delegated_puzzle_solution)))
)
src/wallet/puzzles/p2_delegated_puzzle.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff04ffff04ff04ffff04ff05ffff04ffff02ff06ffff04ff02ffff04ff0bff80808080ff80808080ffff02ff0bff178080ffff04ffff01ff32ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff06ffff04ff02ffff04ff09ff80808080ffff02ff06ffff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
ffff04ffff01ff04ffff04ff04ffff04ff05ffff04ffffff04ff06ffff04ff02ffff04ff0bffff018080808080ffff0180808080ffffff04ff0bff17808080ffff04ffff01ff32ffff04ffff03ffff07ff0580ffff01ff0bffff0102ffffff04ff06ffff04ff02ffff04ff09ffff018080808080ffffff04ff06ffff04ff02ffff04ff0dffff01808080808080ffff01ff0bffff0101ff058080ff018080ff01808080
src/wallet/puzzles/p2_delegated_puzzle.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
542cde70d1102cd1b763220990873efc8ab15625ded7eae22cc11e21ef2e2f7c
2f838019ea6cea4a118f9ca0df78bfc270ecebf591d12cf239feafa63c16e83b
src/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.clvm → src/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.clvm.MANUALLY_COMPILED
+9 -1
View File
@@ -87,5 +87,13 @@
(possibly_prepend_aggsig
synthetic_public_key original_public_key delegated_puzzle
(a delegated_puzzle solution))
((c delegated_puzzle solution)))
)
; the hex file disassembles to:
;
; (a (q #a (i 11 (q a (i (= 5 (point_add 11 (pubkey_for_exp (sha256 11 (a 6 (c 2 (c 23 0))))))) (q a 23 47) (q 8)) 1) (q 4 (c 4 (c 5 (c (a 6 (c 2 (c 23 0))) 0))) (a 23 47))) 1) (c (q 50 a (i (l 5) (q 11 (q . 2) (a 6 (c 2 (c 9 0))) (a 6 (c 2 (c 13 0)))) (q 11 (q . 1) 5)) 1) 1))
;
; This file may *not* yet compile to that. The output has been hand-tweaked to include some extra optimiziations.
; Eventually, the compiler should produce the output above.
src/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff02ffff03ff0bffff01ff02ffff03ffff09ff05ffff1dff0bffff1effff0bff0bffff02ff06ffff04ff02ffff04ff17ff8080808080808080ffff01ff02ff17ff2f80ffff01ff088080ff0180ffff01ff04ffff04ff04ffff04ff05ffff04ffff02ff06ffff04ff02ffff04ff17ff80808080ff80808080ffff02ff17ff2f808080ff0180ffff04ffff01ff32ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff06ffff04ff02ffff04ff09ff80808080ffff02ff06ffff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
ff02ffff01ff02ffff03ff0bffff01ff02ffff03ffff09ff05ffff1dff0bffff1effff0bff0bffff02ff06ffff04ff02ffff04ff17ff8080808080808080ffff01ff02ff17ff2f80ffff01ff088080ff0180ffff01ff04ffff04ff04ffff04ff05ffff04ffff02ff06ffff04ff02ffff04ff17ff80808080ff80808080ffff02ff17ff2f808080ff0180ffff04ffff01ff32ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff06ffff04ff02ffff04ff09ff80808080ffff02ff06ffff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
src/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
e9aaa49f45bad5c889b86ee3341550c155cfdd10c3a6757de618d20612fffd52
a9e0569909bb3944e1b15d86c837691b90a58201908eef041eeeb308b8f58f71
src/wallet/puzzles/p2_m_of_n_delegate_direct.clvm
+1 -1
View File
@@ -57,7 +57,7 @@
(c (list AGG_SIG (f public_key_list) hash)
(add_aggsig (r public_key_list) hash delegated_puzzle solution)
)
(a delegated_puzzle solution)
((c delegated_puzzle solution))
)
)
src/wallet/puzzles/p2_m_of_n_delegate_direct.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff02ffff03ffff09ff05ffff02ff16ffff04ff02ffff04ff17ff8080808080ffff01ff02ff0cffff04ff02ffff04ffff02ff0affff04ff02ffff04ff17ffff04ff0bff8080808080ffff04ffff02ff1effff04ff02ffff04ff2fff80808080ffff04ff2fffff04ff5fff80808080808080ffff01ff088080ff0180ffff04ffff01ffff31ff02ffff03ff05ffff01ff04ffff04ff08ffff04ff09ffff04ff0bff80808080ffff02ff0cffff04ff02ffff04ff0dffff04ff0bffff04ff17ffff04ff2fff8080808080808080ffff01ff02ff17ff2f8080ff0180ffff02ffff03ff05ffff01ff02ffff03ff09ffff01ff04ff13ffff02ff0affff04ff02ffff04ff0dffff04ff1bff808080808080ffff01ff02ff0affff04ff02ffff04ff0dffff04ff1bff808080808080ff0180ff8080ff0180ffff02ffff03ff05ffff01ff10ffff02ff16ffff04ff02ffff04ff0dff80808080ffff02ffff03ff09ffff01ff0101ff8080ff018080ff8080ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff1effff04ff02ffff04ff09ff80808080ffff02ff1effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
ffff04ffff01ffff04ffff03ffff09ff05ffffff04ff16ffff04ff02ffff04ff17ffff01808080808080ffff01ffff04ff0cffff04ff02ffff04ffffff04ff0affff04ff02ffff04ff17ffff04ff0bffff01808080808080ffff04ffffff04ff1effff04ff02ffff04ff2fffff018080808080ffff04ff2fffff04ff5fffff018080808080808080ffff01ff088080ff018080ffff04ffff01ffff31ffff04ffff03ff05ffff01ff04ffff04ff08ffff04ff09ffff04ff0bffff0180808080ffffff04ff0cffff04ff02ffff04ff0dffff04ff0bffff04ff17ffff04ff2fffff01808080808080808080ffff01ffff04ff17ff2f808080ff018080ffffff04ffff03ff05ffff01ffff04ffff03ff09ffff01ff04ff13ffffff04ff0affff04ff02ffff04ff0dffff04ff1bffff0180808080808080ffff01ffff04ff0affff04ff02ffff04ff0dffff04ff1bffff0180808080808080ff018080ffff01ff018080ff018080ffffff04ffff03ff05ffff01ff10ffffff04ff16ffff04ff02ffff04ff0dffff018080808080ffffff04ffff03ff09ffff01ff0101ffff01ff018080ff01808080ffff01ff018080ff018080ffff04ffff03ffff07ff0580ffff01ff0bffff0102ffffff04ff1effff04ff02ffff04ff09ffff018080808080ffffff04ff1effff04ff02ffff04ff0dffff01808080808080ffff01ff0bffff0101ff058080ff018080ff01808080
src/wallet/puzzles/p2_m_of_n_delegate_direct.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
0f199d5263ac1a62b077c159404a71abd3f9691cc57520bf1d4c5cb501504457
f75ae2b89708433b67835a129085cabc8e6701ffacd472340cdf2b532489d744
src/wallet/puzzles/p2_puzzle_hash.clvm
+1 -1
View File
@@ -12,7 +12,7 @@
)
(if (= inner_puzzle_hash (sha256tree1 inner_puzzle))
(a inner_puzzle inner_puzzle_solution)
((c inner_puzzle inner_puzzle_solution))
(x)
)
)
src/wallet/puzzles/p2_puzzle_hash.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff02ffff03ffff09ff05ffff02ff02ffff04ff02ffff04ff0bff8080808080ffff01ff02ff0bff1780ffff01ff088080ff0180ffff04ffff01ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff02ffff04ff02ffff04ff09ff80808080ffff02ff02ffff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
ffff04ffff01ffff04ffff03ffff09ff05ffffff04ff02ffff04ff02ffff04ff0bffff01808080808080ffff01ffff04ff0bff178080ffff01ff088080ff018080ffff04ffff01ffff04ffff03ffff07ff0580ffff01ff0bffff0102ffffff04ff02ffff04ff02ffff04ff09ffff018080808080ffffff04ff02ffff04ff02ffff04ff0dffff01808080808080ffff01ff0bffff0101ff058080ff018080ff01808080
src/wallet/puzzles/p2_puzzle_hash.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
13e29a62b42cd2ef72a79e4bacdc59733ca6310d65af83d349360d36ec622363
280c4117ee8214d4aab8554f0fbc8ee6fdde2258e35baf4a1b0b17a0a457e44c
src/wallet/puzzles/recompile-all.sh
+1 -8
View File
@@ -9,16 +9,9 @@ echo "$FILES"
INCLUDE_DIR=$(pwd)
for FILE in $FILES
do
echo "run -d -i $INCLUDE_DIR $FILE > $FILE.hex"
# run -d -i $INCLUDE_DIR $FILE > $FILE.hex
done
for FILE in $FILES
do
echo "opd -H $FILE.hex | head -1 > $FILE.hex.sha256tree"
done
echo
echo "Copy & paste the above to the shell to recompile"
src/wallet/puzzles/rl.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff02ffff03ffff09ff81bfff2480ffff01ff04ffff04ff30ffff04ff5fffff04ffff02ff3effff04ff02ffff04ffff04ff81bfff81ff80ff80808080ff80808080ff81ff80ffff01ff04ffff04ff30ffff04ff05ffff04ffff02ff3effff04ff02ffff04ffff04ff81bfff81ff80ff80808080ff80808080ffff02ffff03ffff09ff81bfff3c80ffff01ff02ff2effff04ff02ffff04ff0bffff04ff17ffff04ff2fffff04ff81ffff80808080808080ffff01ff02ff22ffff04ff02ffff04ff2fffff04ff81ffff808080808080ff01808080ff0180ffff04ffff01ffffffffff02ffff03ffff15ff05ff0b80ffff01ff0101ffff01ff02ffff03ffff09ff05ff0b80ffff01ff0101ff8080ff018080ff018031ff3936ffff0334ff3301ffffffff02ffff03ffff02ffff03ffff09ffff0bff820bfbff13ff8205fb80ff82017b80ffff01ff0101ffff01ff02ffff03ffff09ff05ff82017b80ffff01ff0101ff8080ff018080ff0180ffff01ff04ffff02ff26ffff04ff02ffff04ff82017bffff04ff13ffff04ff8202fbff808080808080ffff04ffff02ff2affff04ff02ffff04ff2bffff04ff5bffff04ff81bbff808080808080ffff04ffff02ff3affff04ff02ffff04ff13ffff04ffff10ff81bbff8202fb80ff8080808080ff80808080ffff01ffff08808080ff0180ff04ff2cffff04ff05ffff04ffff11ff0bffff10ff17ff2f8080ff80808080ffff04ff34ffff04ffff0bff05ff0bff1780ff808080ff04ff2cffff04ff05ffff04ff0bff80808080ffffff04ff38ffff04ffff0bff05ff0bff1780ff808080ff02ffff03ffff02ff20ffff04ff02ffff04ffff12ff05ff1780ffff04ffff12ff0bff2f80ff8080808080ffff01ff04ff28ffff04ff05ff808080ffff01ffff08808080ff0180ffff02ffff03ffff02ffff03ffff09ffff0bff8217efff81afff822fef80ff4f80ffff01ff0101ffff01ff02ffff03ffff09ff17ff4f80ffff01ff0101ff8080ff018080ff0180ffff01ff04ffff02ff36ffff04ff02ffff04ff820befffff04ff8205efffff04ff05ffff04ff0bff80808080808080ffff04ffff02ff32ffff04ff02ffff04ff81afffff04ff82016fffff04ff8205efffff04ff825fefff80808080808080ffff04ffff02ff26ffff04ff02ffff04ff4fffff04ff81afffff04ff82016fff808080808080ffff04ffff02ff3affff04ff02ffff04ff8202efffff04ff8205efff8080808080ff8080808080ffff01ffff08808080ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff3effff04ff02ffff04ff09ff80808080ffff02ff3effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
ffff04ffff01ffff04ffff03ffff09ff81bfff2480ffff01ff04ffff04ff30ffff04ff5fffff04ffffff04ff3effff04ff02ffff04ffff04ff81bfff81ff80ffff018080808080ffff0180808080ff81ff80ffff01ff04ffff04ff30ffff04ff05ffff04ffffff04ff3effff04ff02ffff04ffff04ff81bfff81ff80ffff018080808080ffff0180808080ffffff04ffff03ffff09ff81bfff3c80ffff01ffff04ff2effff04ff02ffff04ff0bffff04ff17ffff04ff2fffff04ff81ffffff018080808080808080ffff01ffff04ff22ffff04ff02ffff04ff2fffff04ff81ffffff0180808080808080ff0180808080ff018080ffff04ffff01ffffffffffff04ffff03ffff15ff05ff0b80ffff01ff0101ffff01ffff04ffff03ffff09ff05ff0b80ffff01ff0101ffff01ff018080ff01808080ff01808031ff3936ffff0334ff3301ffffffffff04ffff03ffffff04ffff03ffff09ffff0bff820bfbff13ff8205fb80ff82017b80ffff01ff0101ffff01ffff04ffff03ffff09ff05ff82017b80ffff01ff0101ffff01ff018080ff01808080ff018080ffff01ff04ffffff04ff26ffff04ff02ffff04ff82017bffff04ff13ffff04ff8202fbffff0180808080808080ffff04ffffff04ff2affff04ff02ffff04ff2bffff04ff5bffff04ff81bbffff0180808080808080ffff04ffffff04ff3affff04ff02ffff04ff13ffff04ffff10ff81bbff8202fb80ffff01808080808080ffff0180808080ffff01ffff08808080ff018080ff04ff2cffff04ff05ffff04ffff11ff0bffff10ff17ff2f8080ffff0180808080ffff04ff34ffff04ffff0bff05ff0bff1780ffff01808080ff04ff2cffff04ff05ffff04ff0bffff0180808080ffffff04ff38ffff04ffff0bff05ff0bff1780ffff01808080ffff04ffff03ffffff04ff20ffff04ff02ffff04ffff12ff05ff1780ffff04ffff12ff0bff2f80ffff01808080808080ffff01ff04ff28ffff04ff05ffff01808080ffff01ffff08808080ff018080ffffff04ffff03ffffff04ffff03ffff09ffff0bff8217efff81afff822fef80ff4f80ffff01ff0101ffff01ffff04ffff03ffff09ff17ff4f80ffff01ff0101ffff01ff018080ff01808080ff018080ffff01ff04ffffff04ff36ffff04ff02ffff04ff820befffff04ff8205efffff04ff05ffff04ff0bffff018080808080808080ffff04ffffff04ff32ffff04ff02ffff04ff81afffff04ff82016fffff04ff8205efffff04ff825fefffff018080808080808080ffff04ffffff04ff26ffff04ff02ffff04ff4fffff04ff81afffff04ff82016fffff0180808080808080ffff04ffffff04ff3affff04ff02ffff04ff8202efffff04ff8205efffff01808080808080ffff018080808080ffff01ffff08808080ff018080ffff04ffff03ffff07ff0580ffff01ff0bffff0102ffffff04ff3effff04ff02ffff04ff09ffff018080808080ffffff04ff3effff04ff02ffff04ff0dffff01808080808080ffff01ff0bffff0101ff058080ff018080ff01808080
src/wallet/puzzles/rl.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
3e82031f5d1fc19362dbf91cd5aa2bf627393e4f9d0c436c1f3ca8dceb6a9eae
273279ae2dc430ff0abc2271bb247dfb2313ed387747e2f809e04755fec23e9f
src/wallet/puzzles/rl_aggregation.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff04ffff04ff06ffff04ff0bff808080ffff04ffff04ff04ffff04ffff0bffff0bff17ff05ff2f80ff0b80ff808080ff808080ffff04ffff01ff3536ff018080
ffff04ffff01ff04ffff04ff06ffff04ff0bffff01808080ffff04ffff04ff04ffff04ffff0bffff0bff17ff05ff2f80ff0b80ffff01808080ffff01808080ffff04ffff01ff3536ff01808080
src/wallet/puzzles/rl_aggregation.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
99683fa71cd40cc72bb16308f248400dd0e42d915c454daec42400a23c192a8b
80a3a5e97194e1204798ff83b08d891293ffa930e3146de565b2c796f3f30766
src/wallet/puzzles/sha256tree_module.clvm.hex
+1 -1
View File
@@ -1 +1 @@
ff02ffff01ff02ff02ffff04ff02ffff04ff05ff80808080ffff04ffff01ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff02ffff04ff02ffff04ff09ff80808080ffff02ff02ffff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
ffff04ffff01ffff04ff02ffff04ff02ffff04ff05ffff018080808080ffff04ffff01ffff04ffff03ffff07ff0580ffff01ff0bffff0102ffffff04ff02ffff04ff02ffff04ff09ffff018080808080ffffff04ff02ffff04ff02ffff04ff0dffff01808080808080ffff01ff0bffff0101ff058080ff018080ff01808080
src/wallet/puzzles/sha256tree_module.clvm.hex.sha256tree
+1 -1
View File
@@ -1 +1 @@
eb4ead6576048c9d730b5ced00646c7fdd390649cfdf48a00de1590cdd8ee18f
07f65519f39b9fbebe018de2152f6051febebb16b740b414ebaab560631cbb5e
tests/clvm/test_clvm_compilation.py
+1 -1
View File
@@ -17,7 +17,7 @@ wallet_program_files = set(
"src/wallet/puzzles/p2_conditions.clvm",
"src/wallet/puzzles/p2_delegated_conditions.clvm",
"src/wallet/puzzles/p2_delegated_puzzle.clvm",
"src/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.clvm",
# "src/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.clvm", This puzzle is currently being hand-compiled
"src/wallet/puzzles/p2_m_of_n_delegate_direct.clvm",
"src/wallet/puzzles/p2_puzzle_hash.clvm",
"src/wallet/puzzles/rl_aggregation.clvm",