Update tonpy version, allow to boc dump

Author: tvorogme

requirements.txt

@@ -1,4 +1,4 @@
-tonpy==0.0.0.1.4a0
+tonpy==0.0.0.1.4b0
 deepdiff
 cytoolz
 requests

src/tonemuso/diff.py

@@ -30,13 +30,16 @@ def make_json_dumpable(obj):
             return str(obj)
 
 
-def convert_any_to_hash(x):
+def convert_any_to_hash(x, to_boc=False):
     for i in x:
         if isinstance(x[i], dict):
-            updated = convert_any_to_hash(x[i])
+            updated = convert_any_to_hash(x[i], to_boc=to_boc)
             x[i] = updated
         elif isinstance(x[i], (Cell, CellSlice, CellBuilder)):
-            x[i] = x[i].get_hash()
+            if to_boc:
+                x[i] = x[i].to_boc()
+            else:
+                x[i] = x[i].get_hash()
 
     return x
 
@@ -57,15 +60,15 @@ def get_path(self):
         return self.path
 
 
-def get_diff(tx1, tx2):
+def get_diff(tx1, tx2, to_boc: bool = False):
     tx1_tlb = Transaction()
     tx1_tlb = tx1_tlb.cell_unpack(tx1, True).dump()
 
     tx2_tlb = Transaction()
     tx2_tlb = tx2_tlb.cell_unpack(tx2, True).dump()
 
-    diff = DeepDiff(convert_any_to_hash(tx1_tlb),
-                    convert_any_to_hash(tx2_tlb))
+    diff = DeepDiff(convert_any_to_hash(tx1_tlb, to_boc=to_boc),
+                    convert_any_to_hash(tx2_tlb, to_boc=to_boc))
 
     address = tx1_tlb['account_addr']
     del tx1_tlb

src/tonemuso/emitted_processor.py

@@ -50,7 +50,7 @@ def _emulate_buffer_txs(self, block_key: BlockKey, txs: List[TxRecord], account_
             # Run stepper (no out msgs extraction) using current state
             step_b = TxStepEmulator(block=self.r.blocks[block_key], loglevel=self.r.loglevel,
                                     color_schema=self.r.color_schema, em=em, account_state_em1=st, em2=em2,
-                                    account_state_em2=st)
+                                    account_state_em2=st, use_boc_for_diff=self.r.use_boc_for_diff)
             _out_b, new_st1, _new_st2, _ = step_b.emulate(bt, extract_out_msgs=False)
             st = new_st1
             cnt += 1
@@ -232,7 +232,7 @@ def process_emitted_children_with_override(self,
                 # Emulate with override message via unified stepper (always compare/color)
                 step_gc = TxStepEmulator(block=self.r.blocks[gc_block_key], loglevel=self.r.loglevel,
                                          color_schema=self.r.color_schema, em=emu, account_state_em1=gc_state,
-                                         em2=emu2, account_state_em2=gc_state)
+                                         em2=emu2, account_state_em2=gc_state, use_boc_for_diff=self.r.use_boc_for_diff)
                 tmp_out3, new_state_gc, _ns, gc_out_msgs = step_gc.emulate(
                     gc_tx,
                     override_in_msg=cand.emu_msg.cell,

src/tonemuso/emulation.py

@@ -111,7 +111,8 @@ def __init__(self,
                  em: EmulatorExtern,
                  account_state_em1: Cell,
                  em2: EmulatorExtern,
-                 account_state_em2: Cell) -> None:
+                 account_state_em2: Cell,
+                 use_boc_for_diff: bool = False) -> None:
         self.block = block
         self.loglevel = loglevel
         self.color_schema = color_schema
@@ -120,6 +121,8 @@ def __init__(self,
         self.em2: EmulatorExtern = em2
         self.state1: Cell = account_state_em1
         self.state2: Cell = account_state_em2
+        # Diff behavior flag: when True, compare BOCs instead of hashes
+        self.use_boc_for_diff: bool = bool(use_boc_for_diff)
 
     # ---- Small helpers to keep emulate() readable ----
     def _prepare_in_msg(self, tx: Dict[str, Any], override_in_msg: Optional[Cell]) -> Tuple[
@@ -178,7 +181,7 @@ def _compare_and_color(self, tx: Dict[str, Any]) -> Tuple[bool, List[Dict[str, A
             return go_as_success, out
 
         if self.em.transaction.get_hash() != tx['tx'].get_hash():
-            diff, address = get_diff(tx['tx'], self.em.transaction.to_cell())
+            diff, address = get_diff(tx['tx'], self.em.transaction.to_cell(), to_boc=self.use_boc_for_diff)
 
             unchanged_emulator_tx_hash = self.em2.transaction.get_hash()
             sa_diff = get_shard_account_diff(self.em2.account.to_cell(), self.em.account.to_cell())

src/tonemuso/modes/single_trace.py

@@ -198,7 +198,8 @@ def run(cfg: Config):
                                 toncenter_trace=trace,
                                 lcparams=lcparams,
                                 emulator_path=cfg.emulator_path,
-                                emulator_unchanged_path=cfg.emulator_unchanged_path)
+                                emulator_unchanged_path=cfg.emulator_unchanged_path,
+                                use_boc_for_diff=True)
     runner.run(TX_ORDER_LIST or [])
 
     # Pretty print the emulated tree with emulation_order annotations

src/tonemuso/trace_runner.py

@@ -48,7 +48,8 @@ def __init__(self,
                  preindexed: Optional[Dict[str, Any]] = None,
                  emulator_path: Optional[str] = None,
                  emulator_unchanged_path: Optional[str] = None,
-                 toncenter_trace: "TonTrace" = None):
+                 toncenter_trace: "TonTrace" = None,
+                 use_boc_for_diff: bool = False):
         # Indices and caches
         self.tx_index: Dict[TxHashHex, Tuple[BlockKey, Dict[str, Any]]] = OrderedDict()
         self.blocks: Dict[BlockKey, Dict[str, Any]] = OrderedDict()
@@ -68,6 +69,9 @@ def __init__(self,
         self.emulator_path = emulator_path
         self.emulator_unchanged_path = emulator_unchanged_path
 
+        # Diff behavior flag for transaction comparison
+        self.use_boc_for_diff: bool = bool(use_boc_for_diff)
+
         # Results and global state overrides
         self.failed_traces: List[Dict[str, Any]] = []
         self.global_overrides: Dict[Address, Cell] = OrderedDict()
@@ -325,7 +329,8 @@ def _process_tx(self, transaction_hash: TxHashHex,
 
         # Emulate root tx via unified stepper
         step = TxStepEmulator(block=self.blocks[block_key], loglevel=self.loglevel, color_schema=self.color_schema,
-                              em=em, account_state_em1=state1, em2=em2, account_state_em2=state1)
+                              em=em, account_state_em1=state1, em2=em2, account_state_em2=state1,
+                              use_boc_for_diff=self.use_boc_for_diff)
         tmp_out, new_state1, _new_state2, out_msgs = step.emulate(
             tx,
             extract_out_msgs=True