Merge pull request 0xPolygonZero#34 from topos-protocol/bump

Bump versions and fix broken compilation

Cargo.toml

@@ -8,14 +8,3 @@ members = [
 [profile.release]
 lto = "fat"
 codegen-units = 1
-
-# TODO: Remove once `plonky_evm` gets a version on `crates.io`...
-# Since we can only use `plonky2_evm` using a git revision (which also causes us to use `plonky2` with
-# a reivison), any deps that also use `plonky2`/`plonky2_evm` are very often going to be using imcompatable
-# revisions. We can solve this for now by using a `[patch]` section to force all deps to use a specific version,
-[patch."https://github.com/mir-protocol/plonky2.git"]
-plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git?rev=c0abefdaf55f45fe820502688e442a5b958d1929" }
-plonky2 = { git = "https://github.com/mir-protocol/plonky2.git?rev=c0abefdaf55f45fe820502688e442a5b958d1929" }
-
-[patch.crates-io]
-plonky2 = { git = "https://github.com/mir-protocol/plonky2.git?rev=c0abefdaf55f45fe820502688e442a5b958d1929" }

common/Cargo.toml

@@ -12,7 +12,7 @@ anyhow = { version = "1.0.71", features = ["backtrace"] }
 ethereum-types = "0.14.1"
 eth_trie_utils = "0.6.0"
 flexi_logger = { version = "0.25.4", features = ["async"] }
-plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "c0abefdaf55f45fe820502688e442a5b958d1929" }
+plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "6f98fd762885e9b5343af5f0e3f0c9c90e8cf3ab" }
 serde = {version = "1.0.163", features = ["derive"] }
 revm = { version = "3.3.0", features = ["serde"] }
 ruint = { version = "1.8.0", features = ["primitive-types"] }

eth_test_parser/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 common = { path = "../common" }
 eth_trie_utils = "0.6.0"
-plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "c0abefdaf55f45fe820502688e442a5b958d1929" }
+plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "6f98fd762885e9b5343af5f0e3f0c9c90e8cf3ab" }
 
 anyhow = { version = "1.0.71", features = ["backtrace"] }
 clap = {version = "4.2.7", features = ["derive"] }

evm_test_runner/Cargo.toml

@@ -9,8 +9,8 @@ edition = "2021"
 
 [dependencies]
 common = { path = "../common" }
-plonky2 = { git = "https://github.com/mir-protocol/plonky2.git", rev = "c0abefdaf55f45fe820502688e442a5b958d1929" }
-plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "c0abefdaf55f45fe820502688e442a5b958d1929" }
+plonky2 = "0.1.4" # NOTE: Make sure that this version matches the one used by plonky2_evm when bumping to newer versions.
+plonky2_evm = { git = "https://github.com/mir-protocol/plonky2.git", rev = "6f98fd762885e9b5343af5f0e3f0c9c90e8cf3ab" }
 
 anyhow = { version = "1.0", features = ["backtrace"] }
 askama = "0.12.0"