begin_tx adjust rw offset when curie

scroll-tech · May 29, 2024 · 0941e1e · 0941e1e
1 parent 38c8978
commit 0941e1e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/bus-mapping/src/circuit_input_builder/transaction.rs b/bus-mapping/src/circuit_input_builder/transaction.rs
@@ -516,12 +516,14 @@ impl TxL1Fee {
                 (tx_l1_fee % TX_L1_FEE_PRECISION as u128) as u64,
             )
         }
-        
+
         #[cfg(feature = "l1_fee_curie")]
         {
             // "commitScalar * l1BaseFee + blobScalar * _data.length * l1BlobBaseFee",
             let tx_l1_fee = self.commit_scalar as u128 * self.base_fee as u128
-                + self.blob_scalar as u128 * tx_rlp_signed_len as u128 * self.l1_blob_basefee as u128;
+                + self.blob_scalar as u128
+                    * tx_rlp_signed_len as u128
+                    * self.l1_blob_basefee as u128;
             (
                 (tx_l1_fee / TX_L1_FEE_PRECISION as u128) as u64,
                 (tx_l1_fee % TX_L1_FEE_PRECISION as u128) as u64,

diff --git a/zkevm-circuits/src/evm_circuit/execution/begin_tx.rs b/zkevm-circuits/src/evm_circuit/execution/begin_tx.rs
@@ -917,10 +917,16 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
         rws.offset_add(TxAccessListGadget::<F>::rw_delta_value(tx) as usize);
 
         let rw = rws.next();
-        debug_assert_eq!(rw.tag(), RwTableTag::CallContext);
-        debug_assert_eq!(rw.field_tag(), Some(CallContextFieldTag::L1Fee as u64));
 
-        rws.offset_add(3);
+        #[cfg(not(feature = "l1_fee_curie"))]
+        {
+            debug_assert_eq!(rw.tag(), RwTableTag::CallContext);
+            debug_assert_eq!(rw.field_tag(), Some(CallContextFieldTag::L1Fee as u64));
+            rws.offset_add(3);
+        }
+
+        #[cfg(feature = "l1_fee_curie")]
+        rws.offset_add(6);
 
         let rw = rws.next();
         debug_assert_eq!(rw.tag(), RwTableTag::Account);