rename end_offset (#747)

naure · Aurélien Nicolas · web-flow · commit 3a8f950c82b4 · 2023-08-09T16:09:53.000+02:00
Co-authored-by: Aurélien Nicolas &lt;info@nau.re&gt;
diff --git a/zkevm-circuits/src/evm_circuit/execution/calldatacopy.rs b/zkevm-circuits/src/evm_circuit/execution/calldatacopy.rs
@@ -97,7 +97,7 @@ impl<F: Field> ExecutionGadget<F> for CallDataCopyGadget<F> {
         // Calculate the next memory size and the gas cost for this memory
         // access
         let memory_address = MemoryAddressGadget::construct(cb, memory_offset, length);
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.end_offset()]);
         let memory_copier_gas = MemoryCopierGasGadget::construct(
             cb,
             memory_address.length(),
diff --git a/zkevm-circuits/src/evm_circuit/execution/codecopy.rs b/zkevm-circuits/src/evm_circuit/execution/codecopy.rs
@@ -77,7 +77,7 @@ impl<F: Field> ExecutionGadget<F> for CodeCopyGadget<F> {
         // Calculate the next memory size and the gas cost for this memory
         // access. This also accounts for the dynamic gas required to copy bytes to
         // memory.
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [dst_memory_addr.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [dst_memory_addr.end_offset()]);
         let memory_copier_gas = MemoryCopierGasGadget::construct(
             cb,
             dst_memory_addr.length(),
diff --git a/zkevm-circuits/src/evm_circuit/execution/create.rs b/zkevm-circuits/src/evm_circuit/execution/create.rs
@@ -160,7 +160,7 @@ impl<F: Field, const IS_CREATE2: bool, const S: ExecutionState> ExecutionGadget<
                 create.code_hash_word_rlc(),
                 CopyDataType::Bytecode.expr(),
                 init_code.offset(),
-                init_code.address(),
+                init_code.end_offset(),
                 0.expr(),
                 init_code.length(),
                 init_code_rlc.expr(),
@@ -333,7 +333,7 @@ impl<F: Field, const IS_CREATE2: bool, const S: ExecutionState> ExecutionGadget<
             },
         );
 
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [init_code.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [init_code.end_offset()]);
 
         let init_code_word_size = ConstantDivisionGadget::construct(
             cb,
diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_create.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_create.rs
@@ -72,7 +72,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGCreateGadget<F> {
             LtGadget::construct(cb, MAX_INIT_CODE_SIZE.expr(), memory_address.length());
 
         let minimum_word_size = MemoryWordSizeGadget::construct(cb, memory_address.length());
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.end_offset()]);
 
         let keccak_gas_cost = minimum_word_size.expr()
             * select::expr(
diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_dynamic_memory.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_dynamic_memory.rs
@@ -47,7 +47,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGDynamicMemoryGadget<F> {
         cb.stack_pop(memory_address.offset_rlc());
         cb.stack_pop(memory_address.length_rlc());
 
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.end_offset()]);
 
         let insufficient_gas = LtGadget::construct(
             cb,
diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_log.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_log.rs
@@ -64,7 +64,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGLogGadget<F> {
 
         // Calculate the next memory size and the gas cost for this memory
         // access
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.end_offset()]);
 
         let gas_cost = GasCost::LOG.as_u64().expr()
             + GasCost::LOG.as_u64().expr() * topic_count
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
@@ -93,7 +93,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGMemoryCopyGadget<F> {
         cb.stack_pop(src_offset.expr());
         cb.stack_pop(dst_memory_addr.length_rlc());
 
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [dst_memory_addr.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [dst_memory_addr.end_offset()]);
         let memory_copier_gas = MemoryCopierGasGadget::construct(
             cb,
             dst_memory_addr.length(),
diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_sha3.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_sha3.rs
@@ -52,7 +52,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGSha3Gadget<F> {
         cb.stack_pop(memory_address.offset_rlc());
         cb.stack_pop(memory_address.length_rlc());
 
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.end_offset()]);
         let memory_copier_gas = MemoryCopierGasGadget::construct(
             cb,
             memory_address.length(),
diff --git a/zkevm-circuits/src/evm_circuit/execution/error_oog_static_memory.rs b/zkevm-circuits/src/evm_circuit/execution/error_oog_static_memory.rs
@@ -73,7 +73,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGStaticMemoryGadget<F> {
         );
 
         // Get the next memory size and the gas cost for this memory access
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.end_offset()]);
 
         // Check if the amount of gas available is less than the amount of gas
         // required
diff --git a/zkevm-circuits/src/evm_circuit/execution/extcodecopy.rs b/zkevm-circuits/src/evm_circuit/execution/extcodecopy.rs
@@ -89,7 +89,7 @@ impl<F: Field> ExecutionGadget<F> for ExtcodecopyGadget<F> {
         cb.bytecode_length(code_hash.expr(), code_size.expr());
 
         let memory_address = MemoryAddressGadget::construct(cb, memory_offset, memory_length);
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.end_offset()]);
         let memory_copier_gas = MemoryCopierGasGadget::construct(
             cb,
             memory_address.length(),
diff --git a/zkevm-circuits/src/evm_circuit/execution/logs.rs b/zkevm-circuits/src/evm_circuit/execution/logs.rs
@@ -135,7 +135,7 @@ impl<F: Field> ExecutionGadget<F> for LogGadget<F> {
 
         // Calculate the next memory size and the gas cost for this memory
         // access
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.end_offset()]);
 
         let copy_rwc_inc = cb.query_cell();
         let dst_addr = build_tx_log_expression(
@@ -151,7 +151,7 @@ impl<F: Field> ExecutionGadget<F> for LogGadget<F> {
                 tx_id.expr(),
                 CopyDataType::TxLog.expr(),
                 memory_address.offset(),
-                memory_address.address(),
+                memory_address.end_offset(),
                 dst_addr,
                 memory_address.length(),
                 0.expr(), // for LOGN, rlc_acc is 0
diff --git a/zkevm-circuits/src/evm_circuit/execution/return_revert.rs b/zkevm-circuits/src/evm_circuit/execution/return_revert.rs
@@ -90,7 +90,7 @@ impl<F: Field> ExecutionGadget<F> for ReturnRevertGadget<F> {
         let copy_rw_increase = cb.query_cell();
         let copy_rw_increase_is_zero = IsZeroGadget::construct(cb, "", copy_rw_increase.expr());
 
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [range.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [range.end_offset()]);
 
         // Case A in the specs.
         // not work for memory word rw counter increase now.
@@ -133,7 +133,7 @@ impl<F: Field> ExecutionGadget<F> for ReturnRevertGadget<F> {
                 code_hash.expr(),
                 CopyDataType::Bytecode.expr(),
                 range.offset(),
-                range.address(),
+                range.end_offset(),
                 0.expr(),
                 range.length(),
                 deployed_bytecode_rlc.expr(),
@@ -280,7 +280,7 @@ impl<F: Field> ExecutionGadget<F> for ReturnRevertGadget<F> {
                     cb.next.state.call_id.expr(),
                     CopyDataType::Memory.expr(),
                     range.offset(),
-                    range.address(),
+                    range.end_offset(),
                     return_data_offset.expr(),
                     copy_length.min(),
                     0.expr(),
diff --git a/zkevm-circuits/src/evm_circuit/execution/returndatacopy.rs b/zkevm-circuits/src/evm_circuit/execution/returndatacopy.rs
@@ -110,7 +110,7 @@ impl<F: Field> ExecutionGadget<F> for ReturnDataCopyGadget<F> {
         // Calculate the next memory size and the gas cost for this memory
         // access. This also accounts for the dynamic gas required to copy bytes to
         // memory.
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [dst_memory_addr.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [dst_memory_addr.end_offset()]);
         let memory_copier_gas = MemoryCopierGasGadget::construct(
             cb,
             dst_memory_addr.length(),
diff --git a/zkevm-circuits/src/evm_circuit/execution/sha3.rs b/zkevm-circuits/src/evm_circuit/execution/sha3.rs
@@ -61,7 +61,7 @@ impl<F: Field> ExecutionGadget<F> for Sha3Gadget<F> {
                 cb.curr.state.call_id.expr(),
                 CopyDataType::RlcAcc.expr(),
                 memory_address.offset(),
-                memory_address.address(),
+                memory_address.end_offset(),
                 0.expr(), // dst_addr for CopyDataType::RlcAcc is 0.
                 memory_address.length(),
                 rlc_acc.expr(),
@@ -75,7 +75,7 @@ impl<F: Field> ExecutionGadget<F> for Sha3Gadget<F> {
         });
         cb.keccak_table_lookup(rlc_acc.expr(), memory_address.length(), sha3_rlc.expr());
 
-        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(cb, [memory_address.end_offset()]);
         let memory_copier_gas = MemoryCopierGasGadget::construct(
             cb,
             memory_address.length(),
diff --git a/zkevm-circuits/src/evm_circuit/util/common_gadget.rs b/zkevm-circuits/src/evm_circuit/util/common_gadget.rs
@@ -716,8 +716,10 @@ impl<F: Field, MemAddrGadget: CommonMemoryAddressGadget<F>, const IS_SUCCESS_CAL
 
         // Recomposition of random linear combination to integer
         let gas_is_u64 = IsZeroGadget::construct(cb, "", sum::expr(&gas_word.cells[N_BYTES_GAS..]));
-        let memory_expansion =
-            MemoryExpansionGadget::construct(cb, [cd_address.address(), rd_address.address()]);
+        let memory_expansion = MemoryExpansionGadget::construct(
+            cb,
+            [cd_address.end_offset(), rd_address.end_offset()],
+        );
 
         // construct common gadget
         let value_is_zero = IsZeroGadget::construct(cb, "", sum::expr(&value.cells));
diff --git a/zkevm-circuits/src/evm_circuit/util/memory_gadget.rs b/zkevm-circuits/src/evm_circuit/util/memory_gadget.rs
@@ -92,7 +92,7 @@ pub(crate) trait CommonMemoryAddressGadget<F: FieldExt> {
     fn length(&self) -> Expression<F>;
 
     /// Return valid memory offset plus length.
-    fn address(&self) -> Expression<F>;
+    fn end_offset(&self) -> Expression<F>;
 }
 
 /// Convert the dynamic memory offset and length from random linear combination
@@ -170,7 +170,7 @@ impl<F: Field> CommonMemoryAddressGadget<F> for MemoryAddressGadget<F> {
         from_bytes::expr(&self.memory_length.cells)
     }
 
-    fn address(&self) -> Expression<F> {
+    fn end_offset(&self) -> Expression<F> {
         self.offset() + self.length()
     }
 }
@@ -320,7 +320,7 @@ impl<F: Field> CommonMemoryAddressGadget<F> for MemoryExpandedAddressGadget<F> {
     }
 
     /// Return expanded address if within range, otherwise return 0.
-    fn address(&self) -> Expression<F> {
+    fn end_offset(&self) -> Expression<F> {
         select::expr(
             self.length_is_zero.expr(),
             0.expr(),
