From 7179baa237178f3904f20ffb07f35f86d9dd862e Mon Sep 17 00:00:00 2001 From: xiaodino Date: Sat, 10 Jun 2023 22:30:00 -0700 Subject: [PATCH] Rename mul_gas_fee_by_gas to gas_fee --- zkevm-circuits/src/evm_circuit/execution/begin_tx.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zkevm-circuits/src/evm_circuit/execution/begin_tx.rs b/zkevm-circuits/src/evm_circuit/execution/begin_tx.rs index 05523c69c8..3e459a2970 100644 --- a/zkevm-circuits/src/evm_circuit/execution/begin_tx.rs +++ b/zkevm-circuits/src/evm_circuit/execution/begin_tx.rs @@ -35,7 +35,7 @@ pub(crate) struct BeginTxGadget { tx_nonce: Cell, tx_gas: Cell, tx_gas_price: Word, - mul_gas_fee_by_gas: MulWordByU64Gadget, + gas_fee: MulWordByU64Gadget, tx_caller_address: Cell, tx_caller_address_is_zero: IsZeroGadget, tx_callee_address: Cell, @@ -156,7 +156,7 @@ impl ExecutionGadget for BeginTxGadget { // TODO: Implement EIP 1559 (currently it only supports legacy // transaction format) // Calculate transaction gas fee - let mul_gas_fee_by_gas = + let gas_fee = MulWordByU64Gadget::construct(cb, tx_gas_price.clone(), tx_gas.expr()); // TODO: Take gas cost of access list (EIP 2930) into consideration. @@ -442,7 +442,7 @@ impl ExecutionGadget for BeginTxGadget { tx_nonce, tx_gas, tx_gas_price, - mul_gas_fee_by_gas, + gas_fee, tx_caller_address, tx_caller_address_is_zero, tx_callee_address, @@ -517,7 +517,7 @@ impl ExecutionGadget for BeginTxGadget { .assign(region, offset, Value::known(F::from(tx.gas)))?; self.tx_gas_price .assign(region, offset, Some(tx.gas_price.to_le_bytes()))?; - self.mul_gas_fee_by_gas + self.gas_fee .assign(region, offset, tx.gas_price, tx.gas, gas_fee)?; let caller_address = tx .caller_address