Merge branch 'main' into wasm-support

privacy-scaling-explorations · Jan 17, 2024 · c2058c6 · c2058c6
2 parents a5cfcd8 + 05b2b17
commit c2058c6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "zkevm-circuits",
     "bus-mapping",

diff --git a/bus-mapping/src/operation.rs b/bus-mapping/src/operation.rs
@@ -91,6 +91,7 @@ impl RWCounter {
 }
 
 /// Enum used to differenciate between EVM Stack, Memory and Storage operations.
+/// This is also used as the RwTableTag for the RwTable.
 #[derive(Debug, Clone, PartialEq, Eq, Copy, EnumIter, Hash)]
 pub enum Target {
     /// Start is a padding operation.

diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -40,7 +40,7 @@ mock_prover = []
 
 [build-dependencies]
 env = "0.0.0"
-ethers = "=2.0.10"
+ethers = { version = "=2.0.10", features = ["ethers-solc"] }
 ethers-contract-abigen = "=2.0.10"
 glob = "0.3.1"
 log = "0.4.14"

diff --git a/light-client-poc/Cargo.toml b/light-client-poc/Cargo.toml
@@ -2,7 +2,6 @@
 name = "light-client-poc"
 version = "0.1.0"
 edition = "2021"
-resolver = "2"
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
@@ -28,4 +27,4 @@ ahash = "=0.8.6"
 ctor = "0.1.22"
 
 [features]
-disable-keccak = []
+disable-keccak = []
diff --git a/zkevm-circuits/src/evm_circuit/table.rs b/zkevm-circuits/src/evm_circuit/table.rs
@@ -280,7 +280,7 @@ pub(crate) enum Lookup<F> {
         /// A boolean value to specify if the access record is a read or write.
         is_write: Expression<F>,
         /// Tag to specify which read-write data to access, see RwTableTag for
-        /// all tags.
+        /// all tags. RwTableTag is bus_mapping::operation::Target (PR#1406)
         tag: Expression<F>,
         /// Values corresponding to the tag.
         values: RwValues<F>,

diff --git a/zkevm-circuits/src/table/rw_table.rs b/zkevm-circuits/src/table/rw_table.rs
@@ -8,7 +8,7 @@ pub struct RwTable {
     pub rw_counter: Column<Advice>,
     /// Is Write
     pub is_write: Column<Advice>,
-    /// Tag
+    /// Tag (bus_mapping::operation::Target)
     pub tag: Column<Advice>,
     /// Key1 (Id)
     pub id: Column<Advice>,