fix(anchor): calldata with fixed 32B

taikoxyz · Jul 6, 2023 · 20de536 · 20de536
1 parent 0a6299f
commit 20de536
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/circuit-benchmarks/src/super_circuit.rs b/circuit-benchmarks/src/super_circuit.rs
@@ -160,7 +160,7 @@ fn gen_application_snark(
         max_keccak_rows: 0,
     };
     let protocol_instance = ProtocolInstance {
-        anchor_gas_cost: 150000,
+        anchor_gas_limit: 150000,
         ..Default::default()
     };
     let (_, super_circuit, _, _) = SuperCircuit::<_>::build(

diff --git a/zkevm-circuits/src/anchor_tx_circuit.rs b/zkevm-circuits/src/anchor_tx_circuit.rs
@@ -215,7 +215,7 @@ impl<F: Field> AnchorTxCircuitConfig<F> {
         for (tag, value) in [
             (
                 TxFieldTag::Gas,
-                Value::known(F::from(protocol_instance.anchor_gas_cost)),
+                Value::known(F::from(protocol_instance.anchor_gas_limit)),
             ),
             (
                 TxFieldTag::GasPrice,

diff --git a/zkevm-circuits/src/anchor_tx_circuit/test.rs b/zkevm-circuits/src/anchor_tx_circuit/test.rs
@@ -144,7 +144,7 @@ pub(crate) fn add_anchor_tx<const NACC: usize, FTx>(
     FTx: FnOnce(Vec<&mut MockTransaction>, [MockAccount; NACC]),
 {
     txs[0]
-        .gas(protocol_instance.anchor_gas_cost.to_word())
+        .gas(protocol_instance.anchor_gas_limit.to_word())
         .gas_price(ANCHOR_TX_GAS_PRICE.to_word())
         .from(*GOLDEN_TOUCH_ADDRESS)
         .to(protocol_instance.l2_contract)
@@ -237,7 +237,7 @@ fn anchor_tx_circuit_unusable_rows() {
 #[test]
 fn anchor_test() {
     let protocol_instance = ProtocolInstance {
-        anchor_gas_cost: 150000,
+        anchor_gas_limit: 150000,
         ..Default::default()
     };
     let block = gen_block::<1>(2, 200, protocol_instance, sign_tx);
@@ -247,7 +247,7 @@ fn anchor_test() {
 #[test]
 fn anchor_test_when_sign_r_is_gx2() {
     let protocol_instance = ProtocolInstance {
-        anchor_gas_cost: 150000,
+        anchor_gas_limit: 150000,
         ..Default::default()
     };
     let msg_hash = *N - *GX1_MUL_PRIVATEKEY;

diff --git a/zkevm-circuits/src/taiko_super_circuit/test.rs b/zkevm-circuits/src/taiko_super_circuit/test.rs
@@ -166,7 +166,7 @@ fn block_2tx(protocol_instance: &ProtocolInstance) -> GethData {
 #[test]
 fn serial_test_super_circuit_1tx_1max_tx() {
     let protocol_instance = ProtocolInstance {
-        anchor_gas_cost: 150000,
+        anchor_gas_limit: 150000,
         ..Default::default()
     };
     let block = block_1tx(&protocol_instance);
@@ -186,7 +186,7 @@ fn serial_test_super_circuit_1tx_1max_tx() {
 #[test]
 fn taiko_serial_test_super_circuit_1tx_3max_tx() {
     let protocol_instance = ProtocolInstance {
-        anchor_gas_cost: 150000,
+        anchor_gas_limit: 150000,
         ..Default::default()
     };
     let block = block_1tx(&protocol_instance);
@@ -206,7 +206,7 @@ fn taiko_serial_test_super_circuit_1tx_3max_tx() {
 #[test]
 fn taiko_serial_test_super_circuit_2tx_3max_tx() {
     let protocol_instance = ProtocolInstance {
-        anchor_gas_cost: 150000,
+        anchor_gas_limit: 150000,
         ..Default::default()
     };
     let block = block_2tx(&protocol_instance);

diff --git a/zkevm-circuits/src/witness/protocol_instance.rs b/zkevm-circuits/src/witness/protocol_instance.rs
@@ -42,8 +42,8 @@ pub struct ProtocolInstance {
     /// maxBytesPerTxList
     pub max_bytes_per_tx_list: u64,
 
-    /// anchor gas cost
-    pub anchor_gas_cost: u64,
+    /// anchor gas limit
+    pub anchor_gas_limit: u64,
 }
 
 /// l1 meta hash
@@ -151,11 +151,17 @@ impl ProtocolInstance {
             ],
             [
                 Value::known(F::from(PiFieldTag::L1Height as u64)),
-                Value::known(F::from(self.meta_hash.l1_height)),
+                rlc_be_bytes(
+                    &self.meta_hash.l1_height.to_word().to_be_bytes(),
+                    randomness,
+                ),
             ],
             [
                 Value::known(F::from(PiFieldTag::ParentGasUsed as u64)),
-                Value::known(F::from(self.parent_gas_used as u64)),
+                rlc_be_bytes(
+                    &(self.parent_gas_used as u64).to_word().to_be_bytes(),
+                    randomness,
+                ),
             ],
         ]
     }