From 036e36653ba286fadd1645a37d0a6ebf95141290 Mon Sep 17 00:00:00 2001 From: chad Date: Mon, 25 Mar 2024 11:02:45 -0500 Subject: [PATCH] lint: code cleanup --- .../src/evm_circuit/execution/error_oog_call.rs | 9 --------- .../src/evm_circuit/execution/error_oog_memory_copy.rs | 2 -- zkevm-circuits/src/evm_circuit/execution/extcodehash.rs | 1 - zkevm-circuits/src/evm_circuit/execution/sload.rs | 2 -- 4 files changed, 14 deletions(-) diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_call.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_call.rs index 0e00faed82..dafd542d5a 100644 --- a/zkevm-circuits/src/evm_circuit/execution/error_oog_call.rs +++ b/zkevm-circuits/src/evm_circuit/execution/error_oog_call.rs @@ -132,7 +132,6 @@ impl ExecutionGadget for ErrorOOGCallGadget { let tx_id = rws.next().call_context_value(); let is_static = rws.next().call_context_value(); - let gas = rws.next().stack_value(); let callee_address = rws.next().stack_value(); @@ -142,12 +141,6 @@ impl ExecutionGadget for ErrorOOGCallGadget { U256::zero() }; - if is_call_or_callcode == 1 { - rws.offset_sub(1); - } - - rws.offset_add(is_call_or_callcode); - let cd_offset = rws.next().stack_value(); let cd_length = rws.next().stack_value(); let rd_offset = rws.next().stack_value(); @@ -156,9 +149,7 @@ impl ExecutionGadget for ErrorOOGCallGadget { rws.offset_add(1); let callee_code_hash = rws.next().account_codehash_pair().0; - let callee_exists = !callee_code_hash.is_zero(); - let (is_warm, is_warm_prev) = rws.next().tx_access_list_value_pair(); let memory_expansion_gas_cost = self.call.assign( diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_memory_copy.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_memory_copy.rs index 44b438f8de..e4d9b57ccc 100644 --- a/zkevm-circuits/src/evm_circuit/execution/error_oog_memory_copy.rs +++ b/zkevm-circuits/src/evm_circuit/execution/error_oog_memory_copy.rs @@ -181,9 +181,7 @@ impl ExecutionGadget for ErrorOOGMemoryCopyGadget { }; let dst_offset = rws.next().stack_value(); - let src_offset = rws.next().stack_value(); - let copy_size = rws.next().stack_value(); self.opcode diff --git a/zkevm-circuits/src/evm_circuit/execution/extcodehash.rs b/zkevm-circuits/src/evm_circuit/execution/extcodehash.rs index 9af6b00ada..e7c90402ce 100644 --- a/zkevm-circuits/src/evm_circuit/execution/extcodehash.rs +++ b/zkevm-circuits/src/evm_circuit/execution/extcodehash.rs @@ -110,7 +110,6 @@ impl ExecutionGadget for ExtcodehashGadget { let mut rws = StepRws::new(block, step); let address = rws.next().stack_value(); - self.address_word.assign_u256(region, offset, address)?; self.tx_id diff --git a/zkevm-circuits/src/evm_circuit/execution/sload.rs b/zkevm-circuits/src/evm_circuit/execution/sload.rs index 9de3ebaf37..5b3c7ced0b 100644 --- a/zkevm-circuits/src/evm_circuit/execution/sload.rs +++ b/zkevm-circuits/src/evm_circuit/execution/sload.rs @@ -126,9 +126,7 @@ impl ExecutionGadget for SloadGadget { rws.offset_add(4); let key = rws.next().stack_value(); - let (_, committed_value) = rws.next().aux_pair(); - let value = rws.next().stack_value(); self.key.assign_u256(region, offset, key)?;