From 08b1dd31351329cf9f6c3001eb6d43798aef7218 Mon Sep 17 00:00:00 2001
From: Richard Kiss <him@richardkiss.com>
Date: Sun, 18 Apr 2021 22:37:41 -0700
Subject: [PATCH] Improve format of `COIN_SPEND` output from ROM.

---
 chia/full_node/mempool_check_conditions.py                | 8 ++++----
 chia/wallet/puzzles/rom_bootstrap_generator.clvm          | 2 +-
 chia/wallet/puzzles/rom_bootstrap_generator.clvm.hex      | 2 +-
 .../puzzles/rom_bootstrap_generator.clvm.hex.sha256tree   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chia/full_node/mempool_check_conditions.py b/chia/full_node/mempool_check_conditions.py
index d2e701cdf3..124379432a 100644
--- a/chia/full_node/mempool_check_conditions.py
+++ b/chia/full_node/mempool_check_conditions.py
@@ -147,12 +147,12 @@ def get_name_puzzle_conditions(generator: BlockGenerator, max_cost: int, safe_mo
         for res in result.as_iter():
             conditions_list: List[ConditionWithArgs] = []
 
-            spent_coin_parent_id: bytes32 = res.first().first().as_atom()
-            spent_coin_puzzle_hash: bytes32 = res.first().rest().first().as_atom()
-            spent_coin_amount: uint64 = uint64(res.first().rest().rest().first().as_int())
+            spent_coin_parent_id: bytes32 = res.first().as_atom()
+            spent_coin_puzzle_hash: bytes32 = res.rest().first().as_atom()
+            spent_coin_amount: uint64 = uint64(res.rest().rest().first().as_int())
             spent_coin: Coin = Coin(spent_coin_parent_id, spent_coin_puzzle_hash, spent_coin_amount)
 
-            for cond in res.rest().first().as_iter():
+            for cond in res.rest().rest().rest().first().as_iter():
                 if cond.first().as_atom() in opcodes:
                     opcode: ConditionOpcode = ConditionOpcode(cond.first().as_atom())
                 elif not safe_mode:
diff --git a/chia/wallet/puzzles/rom_bootstrap_generator.clvm b/chia/wallet/puzzles/rom_bootstrap_generator.clvm
index 799447abd4..44929783fc 100644
--- a/chia/wallet/puzzles/rom_bootstrap_generator.clvm
+++ b/chia/wallet/puzzles/rom_bootstrap_generator.clvm
@@ -19,7 +19,7 @@
     )
 
     (defun process_coin_solution ((parent puzzle amount solution . *spend_level_extras*))
-        (list (list parent (sha256tree puzzle) amount) (a puzzle solution))
+        (list parent (sha256tree puzzle) amount (a puzzle solution))
     )
 
     (defun recurse (coin_solutions)
diff --git a/chia/wallet/puzzles/rom_bootstrap_generator.clvm.hex b/chia/wallet/puzzles/rom_bootstrap_generator.clvm.hex
index 7a99c61052..ae99fa67e4 100644
--- a/chia/wallet/puzzles/rom_bootstrap_generator.clvm.hex
+++ b/chia/wallet/puzzles/rom_bootstrap_generator.clvm.hex
@@ -1 +1 @@
-ff02ffff01ff02ff0affff04ff02ffff04ffff02ff05ffff04ff08ffff04ff13ff80808080ff80808080ffff04ffff01ffffff02ffff01ff05ffff02ff3effff04ff02ffff04ff05ff8080808080ffff04ffff01ffffff81ff7fff81df81bfffffff02ffff03ffff09ff0bffff01818080ffff01ff04ff80ffff04ff05ff808080ffff01ff02ffff03ffff0aff0bff1880ffff01ff02ff1affff04ff02ffff04ffff02ffff03ffff0aff0bff1c80ffff01ff02ffff03ffff0aff0bff1480ffff01ff0880ffff01ff04ffff0effff18ffff011fff0b80ffff0cff05ff80ffff01018080ffff04ffff0cff05ffff010180ff80808080ff0180ffff01ff04ffff18ffff013fff0b80ffff04ff05ff80808080ff0180ff80808080ffff01ff04ff0bffff04ff05ff80808080ff018080ff0180ff04ffff0cff15ff80ff0980ffff04ffff0cff15ff0980ff808080ffff04ffff04ff05ff1380ffff04ff2bff808080ffff02ff16ffff04ff02ffff04ff09ffff04ffff02ff3effff04ff02ffff04ff15ff80808080ff8080808080ff02ffff03ffff09ffff0cff05ff80ffff010180ff1080ffff01ff02ff2effff04ff02ffff04ffff02ff3effff04ff02ffff04ffff0cff05ffff010180ff80808080ff80808080ffff01ff02ff12ffff04ff02ffff04ffff0cff05ffff010180ffff04ffff0cff05ff80ffff010180ff808080808080ff0180ff018080ff04ffff04ff09ffff04ffff02ff0effff04ff02ffff04ff15ff80808080ffff04ff2dff80808080ffff04ffff02ff15ff5d80ff808080ffff02ffff03ff05ffff01ff04ffff02ff0cffff04ff02ffff04ff09ff80808080ffff02ff0affff04ff02ffff04ff0dff8080808080ff8080ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff0effff04ff02ffff04ff09ff80808080ffff02ff0effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
\ No newline at end of file
+ff02ffff01ff02ff0affff04ff02ffff04ffff02ff05ffff04ff08ffff04ff13ff80808080ff80808080ffff04ffff01ffffff02ffff01ff05ffff02ff3effff04ff02ffff04ff05ff8080808080ffff04ffff01ffffff81ff7fff81df81bfffffff02ffff03ffff09ff0bffff01818080ffff01ff04ff80ffff04ff05ff808080ffff01ff02ffff03ffff0aff0bff1880ffff01ff02ff1affff04ff02ffff04ffff02ffff03ffff0aff0bff1c80ffff01ff02ffff03ffff0aff0bff1480ffff01ff0880ffff01ff04ffff0effff18ffff011fff0b80ffff0cff05ff80ffff01018080ffff04ffff0cff05ffff010180ff80808080ff0180ffff01ff04ffff18ffff013fff0b80ffff04ff05ff80808080ff0180ff80808080ffff01ff04ff0bffff04ff05ff80808080ff018080ff0180ff04ffff0cff15ff80ff0980ffff04ffff0cff15ff0980ff808080ffff04ffff04ff05ff1380ffff04ff2bff808080ffff02ff16ffff04ff02ffff04ff09ffff04ffff02ff3effff04ff02ffff04ff15ff80808080ff8080808080ff02ffff03ffff09ffff0cff05ff80ffff010180ff1080ffff01ff02ff2effff04ff02ffff04ffff02ff3effff04ff02ffff04ffff0cff05ffff010180ff80808080ff80808080ffff01ff02ff12ffff04ff02ffff04ffff0cff05ffff010180ffff04ffff0cff05ff80ffff010180ff808080808080ff0180ff018080ff04ff09ffff04ffff02ff0effff04ff02ffff04ff15ff80808080ffff04ff2dffff04ffff02ff15ff5d80ff8080808080ffff02ffff03ff05ffff01ff04ffff02ff0cffff04ff02ffff04ff09ff80808080ffff02ff0affff04ff02ffff04ff0dff8080808080ff8080ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff0effff04ff02ffff04ff09ff80808080ffff02ff0effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080
\ No newline at end of file
diff --git a/chia/wallet/puzzles/rom_bootstrap_generator.clvm.hex.sha256tree b/chia/wallet/puzzles/rom_bootstrap_generator.clvm.hex.sha256tree
index f43f67248a..11a6587df1 100644
--- a/chia/wallet/puzzles/rom_bootstrap_generator.clvm.hex.sha256tree
+++ b/chia/wallet/puzzles/rom_bootstrap_generator.clvm.hex.sha256tree
@@ -1 +1 @@
-cd6cb71a93dd12c6966fd28a3a601c0872bf02b4d93dcdc5ab0ff7151b39c862
+495f4953806c73e52436af804b3a16a6e8df21f7cbe7028ead5e519d80095ce2