From c1f771c666c3d313b693b2cf4f59d75394110dbd Mon Sep 17 00:00:00 2001 From: Mateusz Mielewczyk Date: Wed, 27 Mar 2024 14:12:35 +0000 Subject: [PATCH 1/2] Fix wasm32 build --- zkevm-circuits/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zkevm-circuits/src/lib.rs b/zkevm-circuits/src/lib.rs index 9dd67c3c..389e4d05 100644 --- a/zkevm-circuits/src/lib.rs +++ b/zkevm-circuits/src/lib.rs @@ -21,7 +21,7 @@ #![deny(clippy::debug_assert_with_mut_call)] // We have too many cast between `usize` and `u64`, // we'd better ensure usize is 64-bit on target arch. -#[cfg(not(target_pointer_width = "64"))] +#[cfg(all(not(target_pointer_width = "64"), not(target_arch = "wasm32")))] compile_error!("This program requires a 64-bit target architecture."); pub mod bytecode_circuit; From dc98db19ab28bff260e42384bb70a678e1d87769 Mon Sep 17 00:00:00 2001 From: Mateusz Mielewczyk Date: Wed, 27 Mar 2024 15:11:07 +0000 Subject: [PATCH 2/2] Change branch for zktrie dep --- zktrie/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zktrie/Cargo.toml b/zktrie/Cargo.toml index 91f4ec26..84a42f15 100644 --- a/zktrie/Cargo.toml +++ b/zktrie/Cargo.toml @@ -9,7 +9,7 @@ license.workspace = true [dependencies] halo2_proofs.workspace = true mpt-circuits = { package = "halo2-mpt-circuits", git = "https://github.com/scroll-tech/mpt-circuit.git", tag = "v0.7.0" } -zktrie = { git = "https://github.com/polybase/zktrie/", branch = "bypass-builds-on-android-and-ios"} +zktrie = { git = "https://github.com/polybase/zktrie/", branch = "develop-polybase"} hash-circuit.workspace = true eth-types = { path = "../eth-types" } lazy_static.workspace = true