remove ROM bootstrap generator2, as we're not making this transition

2023-07-02 12:36:33 +02:00
5 changed files with 0 additions and 38 deletions
--- a/chia/wallet/puzzles/deployed_puzzle_hashes.json
+++ b/chia/wallet/puzzles/deployed_puzzle_hashes.json
@ -42,7 +42,6 @@
    "pool_member_innerpuz": "a8490702e333ddd831a3ac9c22d0fa26d2bfeaf2d33608deb22f0e0123eb0494",
    "pool_waitingroom_innerpuz": "a317541a765bf8375e1c6e7c13503d0d2cbf56cacad5182befe947e78e2c0307",
    "rom_bootstrap_generator": "161bade1f822dcd62ab712ebaf30f3922a301e48a639e4295c5685f8bece7bd9",
-    "rom_bootstrap_generator2": "fae4b90d1f0a18bf9b7e5771da787dcc288e4ab5113d526841f54d32a5777db9",
    "settlement_payments": "cfbfdeed5c4ca2de3d0bf520b9cb4bb7743a359bd2e6a188d19ce7dffc21d3e7",
    "settlement_payments_old": "bae24162efbd568f89bc7a340798a6118df0189eb9e3f8697bcea27af99f8f79",
    "sha256tree_module": "eb4ead6576048c9d730b5ced00646c7fdd390649cfdf48a00de1590cdd8ee18f",
--- a/chia/wallet/puzzles/rom_bootstrap_generator.py
+++ b/chia/wallet/puzzles/rom_bootstrap_generator.py
@ -5,4 +5,3 @@ from chia.types.blockchain_format.serialized_program import SerializedProgram
 from .load_clvm import load_serialized_clvm_maybe_recompile

 GENERATOR_MOD: SerializedProgram = load_serialized_clvm_maybe_recompile("rom_bootstrap_generator.clsp")
-GENERATOR2_MOD: SerializedProgram = load_serialized_clvm_maybe_recompile("rom_bootstrap_generator2.clsp")
--- a/chia/wallet/puzzles/rom_bootstrap_generator2.clsp
+++ b/chia/wallet/puzzles/rom_bootstrap_generator2.clsp
@ -1,34 +0,0 @@
-; This is a new generator ROM that does not pass in the CLVM parser program as
-; the first argument to the generator program, but instead passes NULL.
-; It is intended to be used once the 2.0 hard fork activates, in an attempt to
-; simplify the consensus rules
-(mod (block_decompresser_program (historical_blocks_tree))
-
-  (defconstant null ()
-  )
-
-  (defun sha256tree
-    (TREE)
-    (if (l TREE)
-        (sha256 2 (sha256tree (f TREE)) (sha256tree (r TREE)))
-        (sha256 1 TREE)
-    )
-  )
-
-  (defun process_coin_spend ((parent puzzle amount solution . spend_level_extras))
-    (c parent (c (sha256tree puzzle) (c amount (c (a puzzle solution) spend_level_extras))))
-  )
-
-  (defun recurse (coin_spends)
-    (if coin_spends
-        (c (process_coin_spend (f coin_spends)) (recurse (r coin_spends)))
-        0
-    )
-  )
-
-  (defun process-decompressor ((coin_spends . block-level-extras))
-    (c (recurse coin_spends) block-level-extras)
-  )
-
-(process-decompressor (a block_decompresser_program (list null historical_blocks_tree))))
-)
--- a/chia/wallet/puzzles/rom_bootstrap_generator2.clsp.hex
+++ b/chia/wallet/puzzles/rom_bootstrap_generator2.clsp.hex
@ -1 +0,0 @@
-ff02ffff01ff02ff0cffff04ff02ffff04ffff02ff05ffff04ff08ffff04ff13ff80808080ff80808080ffff04ffff01ffff80ff04ffff02ff16ffff04ff02ffff04ff09ff80808080ff0d80ffff04ff09ffff04ffff02ff1effff04ff02ffff04ff15ff80808080ffff04ff2dffff04ffff02ff15ff5d80ff7d80808080ffff02ffff03ff05ffff01ff04ffff02ff0affff04ff02ffff04ff09ff80808080ffff02ff16ffff04ff02ffff04ff0dff8080808080ff8080ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff1effff04ff02ffff04ff09ff80808080ffff02ff1effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
--- a/chia/wallet/puzzles/rom_bootstrap_generator2.clsp.hex.sha256tree
+++ b/chia/wallet/puzzles/rom_bootstrap_generator2.clsp.hex.sha256tree
@ -1 +0,0 @@
-fae4b90d1f0a18bf9b7e5771da787dcc288e4ab5113d526841f54d32a5777db9
				`@ -1 +0,0 @@`
				ff02ffff01ff02ff0cffff04ff02ffff04ffff02ff05ffff04ff08ffff04ff13ff80808080ff80808080ffff04ffff01ffff80ff04ffff02ff16ffff04ff02ffff04ff09ff80808080ff0d80ffff04ff09ffff04ffff02ff1effff04ff02ffff04ff15ff80808080ffff04ff2dffff04ffff02ff15ff5d80ff7d80808080ffff02ffff03ff05ffff01ff04ffff02ff0affff04ff02ffff04ff09ff80808080ffff02ff16ffff04ff02ffff04ff0dff8080808080ff8080ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff1effff04ff02ffff04ff09ff80808080ffff02ff1effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
				`@ -1 +0,0 @@`
				`fae4b90d1f0a18bf9b7e5771da787dcc288e4ab5113d526841f54d32a5777db9`