fix returndatacopy len (#724)

* fix returndatacopy len

* lint

Author: lispc

bus-mapping/src/circuit_input_builder.rs

@@ -525,7 +525,7 @@ impl<'a> CircuitInputBuilder {
                 state_ref.call().map(|c| c.call_id).unwrap_or(0),
                 state_ref.call_ctx()?.memory.len(),
                 if geth_step.op.is_push_with_data() {
-                    format!("{:?}", geth_trace.struct_logs[index + 1].stack.last())
+                    format!("{:?}", geth_trace.struct_logs.get(index + 1).map(|step| step.stack.last()))
                 } else if geth_step.op.is_call_without_value() {
                     format!(
                         "{:?} {:40x} {:?} {:?} {:?} {:?}",
@@ -577,7 +577,13 @@ impl<'a> CircuitInputBuilder {
                         geth_step.stack.nth_last(0),
                         geth_step.stack.nth_last(1),
                     )
-                } else {
+                } else if matches!(geth_step.op, OpcodeId::RETURN) {
+		    format!(
+                        "{:?} {:?}",
+                        geth_step.stack.nth_last(0),
+                        geth_step.stack.nth_last(1),
+                    )
+		} else {
                     "".to_string()
                 }
             );

bus-mapping/src/circuit_input_builder/input_state_ref.rs

@@ -1316,10 +1316,17 @@ impl<'a> CircuitInputStateRef<'a> {
             } else {
                 0
             };
-            geth_step.gas.0 - memory_expansion_gas_cost - code_deposit_cost
+            geth_step.gas.0
+                - memory_expansion_gas_cost
+                - code_deposit_cost
+                - if geth_step.op == OpcodeId::SELFDESTRUCT {
+                    GasCost::SELFDESTRUCT.as_u64()
+                } else {
+                    0
+                }
         };
 
-        let caller_gas_left = geth_step_next.gas.0 - gas_refund;
+        let caller_gas_left = geth_step_next.gas.0.checked_sub(gas_refund).unwrap_or_else(|| panic!("caller_gas_left underflow geth_step_next.gas {:?}, gas_refund {:?}, exec_step {:?}, geth_step {:?}", geth_step_next.gas.0, gas_refund, exec_step, geth_step));
 
         for (field, value) in [
             (CallContextField::IsRoot, (caller.is_root as u64).into()),

bus-mapping/src/evm/opcodes.rs

@@ -1090,6 +1090,6 @@ fn dummy_gen_selfdestruct_ops(
         state.sdb.destruct_account(sender);
     }
 
-    state.handle_return(&mut exec_step, geth_steps, false)?;
+    state.handle_return(&mut exec_step, geth_steps, true)?;
     Ok(vec![exec_step])
 }

bus-mapping/src/evm/opcodes/returndatacopy.rs

@@ -63,7 +63,11 @@ fn gen_returndatacopy_step(
         (CallContextField::LastCalleeId, last_callee_id.into()),
         (
             CallContextField::LastCalleeReturnDataOffset,
-            last_callee_return_data_offset.into(),
+            if return_data_len == 0 {
+                0.into()
+            } else {
+                last_callee_return_data_offset.into()
+            },
         ),
         (
             CallContextField::LastCalleeReturnDataLength,

integration-tests/tests/mainnet.rs

@@ -93,6 +93,9 @@ fn test_with<C: SubCircuit<Fr> + Circuit<Fr>>(block: &witness::Block<Fr>) -> Moc
     MockProver::<Fr>::run(k, &circuit, circuit.instance()).unwrap()
 }
 fn test_witness_block(block: &witness::Block<Fr>) -> Vec<VerifyFailure> {
+    if *CIRCUIT == "none" {
+        return Vec::new();
+    }
     let prover = if *CIRCUIT == "evm" {
         test_with::<EvmCircuit<Fr>>(block)
     } else if *CIRCUIT == "copy" {
@@ -153,7 +156,7 @@ async fn test_circuit_all_block() {
             return;
         }
 
-        let block = block_convert(&builder.block, &builder.code_db).unwrap();
+        let block = block_convert::<Fr>(&builder.block, &builder.code_db).unwrap();
         let errs = test_witness_block(&block);
         log::info!(
             "test {} circuit, block number: {} err num {:?}",