Unifying type 2 and type 1.

Cargo.toml

@@ -40,7 +40,7 @@ anyhow = "1.0.86"
 async-stream = "0.3.5"
 axum = "0.7.5"
 bitflags = "2.5.0"
-bitvec = "1.0.1"
+bitvec = { version = "1.0.1", features = ["serde"] }
 bytes = "1.6.0"
 ciborium = "0.2.2"
 ciborium-io = "0.2.2"
@@ -49,7 +49,7 @@ alloy-compat = "0.1.0"
 copyvec = "0.2.0"
 criterion = "0.5.1"
 dotenvy = "0.15.7"
-either = "1.12.0"
+either = { version = "1.12.0", features = ["serde"] }
 enum-as-inner = "0.6.0"
 env_logger = "0.11.3"
 eth_trie = "0.4.0"

evm_arithmetization/Cargo.toml

@@ -18,8 +18,11 @@ keywords.workspace = true
 alloy.workspace = true
 alloy-compat.workspace = true
 anyhow.workspace = true
+bitflags.workspace = true
 bitvec.workspace = true
 bytes.workspace = true
+ciborium.workspace = true
+ciborium-io.workspace = true
 copyvec.workspace = true
 either.workspace = true
 env_logger.workspace = true
@@ -34,6 +37,7 @@ log.workspace = true
 mpt_trie.workspace = true
 num.workspace = true
 num-bigint.workspace = true
+nunny.workspace = true
 once_cell.workspace = true
 pest.workspace = true
 pest_derive.workspace = true
@@ -48,7 +52,8 @@ serde = { workspace = true, features = ["derive"] }
 serde-big-array.workspace = true
 serde_json.workspace = true
 sha2.workspace = true
-smt_trie = { workspace = true }
+smt_trie.workspace = true
+stackstack = "0.3.0"
 starky = { workspace = true, features = ["parallel"] }
 static_assertions.workspace = true
 thiserror.workspace = true
@@ -58,6 +63,7 @@ tower-lsp = "0.20.0"
 tracing.workspace = true
 u4.workspace = true
 url.workspace = true
+winnow.workspace = true
 zk_evm_common.workspace = true
 zk_evm_proc_macro.workspace = true