Merge pull request #518 from fuzzland/fix-onchain-unwrap

fix empty onchain
fuzzland · Jun 21, 2024 · 906fcfc · 906fcfc
2 parents 9ab8f5c + bc11fb1
commit 906fcfc
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/src/evm/contract_utils.rs b/src/evm/contract_utils.rs
@@ -1246,18 +1246,14 @@ impl ContractLoader {
             }
         }
 
-        evm_executor.host.env.block.number = EVMU256::from(
-            u64::from_str_radix(
-                &onchain_middleware
-                    .as_ref()
-                    .unwrap()
-                    .endpoint
-                    .block_number
-                    .trim_start_matches("0x"),
-                16,
-            )
-            .unwrap(),
-        );
+        match &onchain_middleware {
+            Some(onchain) => {
+                evm_executor.host.env.block.number = EVMU256::from(
+                    u64::from_str_radix(onchain.endpoint.block_number.trim_start_matches("0x"), 16).unwrap(),
+                );
+            }
+            None => {}
+        }
 
         SetupData {
             evmstate: new_vm_state,