Merge pull request #18 from kroma-network/feat/enable-access-list

feat: enable access list
kroma-network · Aug 10, 2023 · dd718eb · dd718eb
2 parents dc065e9 + fd05501
commit dd718eb
Show file tree

Hide file tree

Showing 6 changed files with 46,011 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/prover-server/src/server_main.rs b/prover-server/src/server_main.rs
@@ -76,7 +76,7 @@ impl Rpc for MockRpcImpl {
     /// Regardless of the received trace, it returns a zero proof.
     fn prove(&self, _trace: String, _proof_type: i32) -> Result<ProofResult> {
         kroma_info("return zero proof");
-        Ok(ProofResult::new(vec![0; 128], Some(vec![0; 4640])))
+        Ok(ProofResult::new(vec![0; 4640], Some(vec![0; 128])))
     }
 }
 

diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.3.0"
 edition = "2021"
 
 [dependencies]
-eth-types = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "9f9b59a", feature = ["kroma"]}
+eth-types = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "7da6a81", feature = ["kroma"]}
 base64 = "0.13.0"
 blake2 = "0.10.3"
 ethers-core = "0.17.0"

diff --git a/types/src/eth.rs b/types/src/eth.rs
@@ -1,6 +1,6 @@
 use eth_types::evm_types::{Gas, GasCost, OpcodeId, ProgramCounter, Stack, Storage};
 use eth_types::geth_types::DEPOSIT_TX_TYPE;
-use eth_types::{Block, GethExecStep, GethExecTrace, Hash, Transaction, Word, H256};
+use eth_types::{AccessList, Block, GethExecStep, GethExecTrace, Hash, Transaction, Word, H256};
 use ethers_core::types::{Address, Bytes, U256, U64};
 use serde::{Deserialize, Deserializer, Serialize};
 use std::collections::HashMap;
@@ -76,6 +76,8 @@ pub struct TransactionTrace {
     pub mint: Option<U256>,
     #[serde(rename = "sourceHash")]
     pub source_hash: Option<H256>,
+    #[serde(rename = "accessList")]
+    pub access_list: Option<AccessList>,
 }
 
 impl TransactionTrace {
@@ -101,7 +103,7 @@ impl TransactionTrace {
             r: self.r,
             s: self.s,
             transaction_type: Some(U64::from(self.type_)),
-            access_list: None,
+            access_list: self.access_list.clone(),
             max_priority_fee_per_gas: None,
             max_fee_per_gas: None,
             chain_id: Some(self.chain_id),

diff --git a/zkevm/Cargo.toml b/zkevm/Cargo.toml
@@ -12,11 +12,11 @@ halo2-snark-aggregator-api = { git = "https://github.com/kroma-network/halo2-sna
 
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 
-bus-mapping = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "9f9b59a", feature = ["kroma"] }
-eth-types = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "9f9b59a", feature = ["kroma"] }
+bus-mapping = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "7da6a81", feature = ["kroma"] }
+eth-types = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "7da6a81", feature = ["kroma"] }
 # TODO: enable zktrie feature
-zkevm-circuits = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "9f9b59a", default-features = false, features = ["test","enable-sign-verify", "kroma"] }
-mpt-zktrie = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "9f9b59a" }
+zkevm-circuits = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "7da6a81", default-features = false, features = ["test","enable-sign-verify", "kroma"] }
+mpt-zktrie = { git = "https://github.com/kroma-network/zkevm-circuits.git", rev = "7da6a81" }
 
 rand = "0.8"
 rand_xorshift = "0.3"