change the way we replace innerpuzzlehash

Author: Yostra

src/wallet/cc_wallet/cc_wallet.py

@@ -51,9 +51,8 @@ class CCWallet:
     cc_coin_record: WalletCoinRecord
     cc_info: CCInfo
     standard_wallet: Wallet
-    base_puzzle_program: Optional[Program]
+    base_puzzle_program: Optional[bytes]
     base_inner_puzzle_hash: Optional[bytes32]
-    sexp_cache: Optional[Dict[str, SExp]]
 
     @staticmethod
     async def create_new_cc(
@@ -62,7 +61,6 @@ async def create_new_cc(
         self = CCWallet()
         self.base_puzzle_program = None
         self.base_inner_puzzle_hash = None
-        self.sexp_cache = None
         self.standard_wallet = wallet
         if name:
             self.log = logging.getLogger(name)
@@ -143,7 +141,6 @@ async def create_wallet_for_cc(
         self = CCWallet()
         self.base_puzzle_program = None
         self.base_inner_puzzle_hash = None
-        self.sexp_cache = None
         self.standard_wallet = wallet
         if name:
             self.log = logging.getLogger(name)
@@ -183,7 +180,6 @@ async def create(
         self.cc_info = CCInfo.from_bytes(hexstr_to_bytes(self.wallet_info.data))
         self.base_puzzle_program = None
         self.base_inner_puzzle_hash = None
-        self.sexp_cache = None
         return self
 
     async def get_confirmed_balance(self) -> uint64:
@@ -382,49 +378,16 @@ def do_replace(self, sexp, magic, magic_replacement):
             return sexp.to(magic_replacement)
         return sexp
 
-    def specific_replace(self, sexp, magic, magic_replacement):
+    def specific_replace(self, old, magic, magic_replacement):
         """binutil.assemble is slow, using this hack to swap inner_puzzle_hash. """
-        if self.sexp_cache is None:
-            self.sexp_cache = {}
-            n1 = sexp.first()
-            n2 = sexp.rest().rest()
-            n3 = sexp.rest().first().first()
-            n4 = sexp.rest().first().rest().first().first()
-            sexp_to_replace = sexp.rest().first().rest().first().rest().first()
-            n5 = sexp.rest().first().rest().first().rest().rest()
-            n6 = sexp.rest().first().rest().rest()
-            self.sexp_cache["n1"] = n1
-            self.sexp_cache["n2"] = n2
-            self.sexp_cache["n3"] = n3
-            self.sexp_cache["n4"] = n4
-            self.sexp_cache["sexp_to_replace"] = sexp_to_replace
-            self.sexp_cache["n5"] = n5
-            self.sexp_cache["n6"] = n6
-        else:
-            n1 = self.sexp_cache["n1"]
-            n2 = self.sexp_cache["n2"]
-            n3 = self.sexp_cache["n3"]
-            n4 = self.sexp_cache["n4"]
-            sexp_to_replace = self.sexp_cache["sexp_to_replace"]
-            n5 = self.sexp_cache["n5"]
-            n6 = self.sexp_cache["n6"]
-
-        replaced = sexp_to_replace.to(magic_replacement)
-
-        step0 = replaced.cons(n5)
-        step1 = n4.cons(step0)
-        step2 = step1.cons(n6)
-        step3 = n3.cons(step2)
-        step5 = step3.cons(n2)
-        result = n1.cons(step5)
-
-        return result
+        new = old.replace(magic, magic_replacement)
+        return new
 
     def fast_cc_puzzle(self, inner_puzzle_hash) -> Program:
         new_sexp = self.specific_replace(
             self.base_puzzle_program, self.base_inner_puzzle_hash, inner_puzzle_hash
         )
-        program = Program(new_sexp)
+        program = Program.from_bytes(new_sexp)
         return program
 
     def puzzle_for_pk(self, pubkey) -> Program:
@@ -435,7 +398,7 @@ def puzzle_for_pk(self, pubkey) -> Program:
             cc_puzzle: Program = cc_wallet_puzzles.cc_make_puzzle(
                 inner_puzzle_hash, self.cc_info.my_core
             )
-            self.base_puzzle_program = cc_puzzle
+            self.base_puzzle_program = bytes(cc_puzzle)
             self.base_inner_puzzle_hash = inner_puzzle_hash
         else:
             cc_puzzle = self.fast_cc_puzzle(inner_puzzle_hash)

src/wallet/trade_manager.py

@@ -99,7 +99,6 @@ async def create_offer_for_ids(
                     new_spend_bundle = await wallet.create_spend_bundle_relative_chia(
                         amount, to_exclude
                     )
-                    self.log.info("1")
                 else:
                     return False, None
                 if new_spend_bundle.removals() == [] or new_spend_bundle is None: