Merge pull request #318 from Chainscore/fix/m1

Fix/m1

Author: harsh-csl

jam/cli.py

@@ -192,7 +192,8 @@ def main():
                 args.theme,
                 False,
                 True,
-                args.no_rpc
+                args.no_rpc,
+                None
             )
         )
     except KeyboardInterrupt:

jam/execution/invocations/functions/accumulate_fns.py

@@ -435,12 +435,13 @@ def solicit(
     ):
         preimage_hash_addr, preimage_len = registers[7], registers[8]
 
+        if not memory.is_accessible(preimage_hash_addr, 32):
+            raise PvmError(PANIC)
+
         if preimage_len >= 2**32:
             registers[7] = HostStatus.FULL.value
             return ExecutionStatus.CONTINUE, gas, registers, memory, context
 
-        if not memory.is_accessible(preimage_hash_addr, 32):
-            raise PvmError(PANIC)
         preimage_hash = Bytes[32](memory.read(preimage_hash_addr, 32))
 
         # from jam.state.state import state

jam/fuzzer/target.py

@@ -73,7 +73,7 @@ def run_fuzzer_target_loop(sock: socket.socket, db_path: str, record_path: Optio
             block_count = 0
 
             # Initialize state
-            from jam.state.state import state as _state
+            from jam.state.state import state as _state, State
             state = _state
 
             while True:
@@ -98,7 +98,7 @@ def run_fuzzer_target_loop(sock: socket.socket, db_path: str, record_path: Optio
                             json_data["blocks"].append(block.to_json())
                         valid_block = state._force_transition(block, True, True)
                         if valid_block:
-                            post_state = state.load(block.header.hash())
+                            post_state = State.load(block.header.hash())
                             send_message(conn, TAG_STATE_ROOT, post_state.root)
 
                             record_index += 1