From 23de7b089d57a3bcfcb0ec1b2e3143e01be64757 Mon Sep 17 00:00:00 2001
From: Robin Salen <salenrobin@gmail.com>
Date: Thu, 11 Jan 2024 18:21:56 +0100
Subject: [PATCH 1/4] Bump with latest plonky2

---
 Cargo.lock                 | 10 +++++-----
 common/Cargo.toml          |  2 +-
 eth_test_parser/Cargo.toml |  2 +-
 evm_test_runner/Cargo.toml |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f960d90..9b633bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1527,7 +1527,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 [[package]]
 name = "plonky2"
 version = "0.1.4"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=536cd1c89c7d5fc546ed4f1b8c9dd653300878ae#536cd1c89c7d5fc546ed4f1b8c9dd653300878ae"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
 dependencies = [
  "ahash",
  "anyhow",
@@ -1551,7 +1551,7 @@ dependencies = [
 [[package]]
 name = "plonky2_evm"
 version = "0.1.1"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=536cd1c89c7d5fc546ed4f1b8c9dd653300878ae#536cd1c89c7d5fc546ed4f1b8c9dd653300878ae"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
 dependencies = [
  "anyhow",
  "bytes",
@@ -1585,7 +1585,7 @@ dependencies = [
 [[package]]
 name = "plonky2_field"
 version = "0.1.1"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=536cd1c89c7d5fc546ed4f1b8c9dd653300878ae#536cd1c89c7d5fc546ed4f1b8c9dd653300878ae"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
 dependencies = [
  "anyhow",
  "itertools",
@@ -1600,7 +1600,7 @@ dependencies = [
 [[package]]
 name = "plonky2_maybe_rayon"
 version = "0.1.1"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=536cd1c89c7d5fc546ed4f1b8c9dd653300878ae#536cd1c89c7d5fc546ed4f1b8c9dd653300878ae"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
 dependencies = [
  "rayon",
 ]
@@ -1608,7 +1608,7 @@ dependencies = [
 [[package]]
 name = "plonky2_util"
 version = "0.1.1"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=536cd1c89c7d5fc546ed4f1b8c9dd653300878ae#536cd1c89c7d5fc546ed4f1b8c9dd653300878ae"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
 
 [[package]]
 name = "portable-atomic"
diff --git a/common/Cargo.toml b/common/Cargo.toml
index be8beb5..d2f702e 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -12,5 +12,5 @@ anyhow = { version = "1.0.71", features = ["backtrace"] }
 ethereum-types = "0.14.1"
 eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" }
 flexi_logger = { version = "0.25.4", features = ["async"] }
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "536cd1c89c7d5fc546ed4f1b8c9dd653300878ae" }
+plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "f80ebe77f38ecbf94ce3c357fcc5332344561b6d" }
 serde = {version = "1.0.163", features = ["derive"] }
diff --git a/eth_test_parser/Cargo.toml b/eth_test_parser/Cargo.toml
index 7c3c553..c5d2b59 100644
--- a/eth_test_parser/Cargo.toml
+++ b/eth_test_parser/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 common = { path = "../common" }
 eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" }
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "536cd1c89c7d5fc546ed4f1b8c9dd653300878ae" }
+plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "f80ebe77f38ecbf94ce3c357fcc5332344561b6d" }
 
 anyhow = { version = "1.0.71", features = ["backtrace"] }
 bytes = "1.4.0"
diff --git a/evm_test_runner/Cargo.toml b/evm_test_runner/Cargo.toml
index 15e4b35..590b21b 100644
--- a/evm_test_runner/Cargo.toml
+++ b/evm_test_runner/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 
 [dependencies]
 common = { path = "../common" }
-plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "536cd1c89c7d5fc546ed4f1b8c9dd653300878ae" }
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "536cd1c89c7d5fc546ed4f1b8c9dd653300878ae" }
+plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "f80ebe77f38ecbf94ce3c357fcc5332344561b6d" }
+plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "f80ebe77f38ecbf94ce3c357fcc5332344561b6d" }
 
 anyhow = { version = "1.0", features = ["backtrace"] }
 askama = "0.12.0"

From 3f4cdcd38adb313a13eb47edcded4362efbc242c Mon Sep 17 00:00:00 2001
From: Robin Salen <salenrobin@gmail.com>
Date: Thu, 11 Jan 2024 22:12:51 +0100
Subject: [PATCH 2/4] Bump

---
 Cargo.lock                 | 35 +++++++++++++++++++++++++++--------
 common/Cargo.toml          |  2 +-
 eth_test_parser/Cargo.toml |  2 +-
 evm_test_runner/Cargo.toml |  4 ++--
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9b633bb..0dcdbad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -320,7 +320,7 @@ name = "common"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "eth_trie_utils",
+ "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5)",
  "ethereum-types",
  "flexi_logger",
  "plonky2_evm",
@@ -636,7 +636,7 @@ dependencies = [
  "bytes",
  "clap",
  "common",
- "eth_trie_utils",
+ "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5)",
  "ethereum-types",
  "flexi_logger",
  "futures",
@@ -653,6 +653,25 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "eth_trie_utils"
+version = "0.6.0"
+source = "git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76#7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76"
+dependencies = [
+ "bytes",
+ "enum-as-inner",
+ "ethereum-types",
+ "hex",
+ "keccak-hash 0.10.0",
+ "log",
+ "num-traits",
+ "parking_lot",
+ "rlp",
+ "serde",
+ "thiserror",
+ "uint",
+]
+
 [[package]]
 name = "eth_trie_utils"
 version = "0.6.0"
@@ -1527,7 +1546,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 [[package]]
 name = "plonky2"
 version = "0.1.4"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=b119e96f7f8dee57ebdbc6738e96891d2e628520#b119e96f7f8dee57ebdbc6738e96891d2e628520"
 dependencies = [
  "ahash",
  "anyhow",
@@ -1551,12 +1570,12 @@ dependencies = [
 [[package]]
 name = "plonky2_evm"
 version = "0.1.1"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=b119e96f7f8dee57ebdbc6738e96891d2e628520#b119e96f7f8dee57ebdbc6738e96891d2e628520"
 dependencies = [
  "anyhow",
  "bytes",
  "env_logger",
- "eth_trie_utils",
+ "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76)",
  "ethereum-types",
  "hashbrown 0.14.0",
  "hex-literal",
@@ -1585,7 +1604,7 @@ dependencies = [
 [[package]]
 name = "plonky2_field"
 version = "0.1.1"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=b119e96f7f8dee57ebdbc6738e96891d2e628520#b119e96f7f8dee57ebdbc6738e96891d2e628520"
 dependencies = [
  "anyhow",
  "itertools",
@@ -1600,7 +1619,7 @@ dependencies = [
 [[package]]
 name = "plonky2_maybe_rayon"
 version = "0.1.1"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=b119e96f7f8dee57ebdbc6738e96891d2e628520#b119e96f7f8dee57ebdbc6738e96891d2e628520"
 dependencies = [
  "rayon",
 ]
@@ -1608,7 +1627,7 @@ dependencies = [
 [[package]]
 name = "plonky2_util"
 version = "0.1.1"
-source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=f80ebe77f38ecbf94ce3c357fcc5332344561b6d#f80ebe77f38ecbf94ce3c357fcc5332344561b6d"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=b119e96f7f8dee57ebdbc6738e96891d2e628520#b119e96f7f8dee57ebdbc6738e96891d2e628520"
 
 [[package]]
 name = "portable-atomic"
diff --git a/common/Cargo.toml b/common/Cargo.toml
index d2f702e..5507434 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -12,5 +12,5 @@ anyhow = { version = "1.0.71", features = ["backtrace"] }
 ethereum-types = "0.14.1"
 eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" }
 flexi_logger = { version = "0.25.4", features = ["async"] }
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "f80ebe77f38ecbf94ce3c357fcc5332344561b6d" }
+plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" }
 serde = {version = "1.0.163", features = ["derive"] }
diff --git a/eth_test_parser/Cargo.toml b/eth_test_parser/Cargo.toml
index c5d2b59..099593d 100644
--- a/eth_test_parser/Cargo.toml
+++ b/eth_test_parser/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 common = { path = "../common" }
 eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" }
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "f80ebe77f38ecbf94ce3c357fcc5332344561b6d" }
+plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" }
 
 anyhow = { version = "1.0.71", features = ["backtrace"] }
 bytes = "1.4.0"
diff --git a/evm_test_runner/Cargo.toml b/evm_test_runner/Cargo.toml
index 590b21b..5fb13d2 100644
--- a/evm_test_runner/Cargo.toml
+++ b/evm_test_runner/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 
 [dependencies]
 common = { path = "../common" }
-plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "f80ebe77f38ecbf94ce3c357fcc5332344561b6d" }
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "f80ebe77f38ecbf94ce3c357fcc5332344561b6d" }
+plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" }
+plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" }
 
 anyhow = { version = "1.0", features = ["backtrace"] }
 askama = "0.12.0"

From 2b04e27255d5681a9b22c7d9a4c5e49cc81059a4 Mon Sep 17 00:00:00 2001
From: Robin Salen <salenrobin@gmail.com>
Date: Thu, 11 Jan 2024 22:15:45 +0100
Subject: [PATCH 3/4] Bumped eth-trie-utils

---
 Cargo.lock                 | 6 +++---
 common/Cargo.toml          | 2 +-
 eth_test_parser/Cargo.toml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0dcdbad..6a0d676 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -320,7 +320,7 @@ name = "common"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5)",
+ "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76)",
  "ethereum-types",
  "flexi_logger",
  "plonky2_evm",
@@ -636,7 +636,7 @@ dependencies = [
  "bytes",
  "clap",
  "common",
- "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5)",
+ "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76)",
  "ethereum-types",
  "flexi_logger",
  "futures",
@@ -675,7 +675,7 @@ dependencies = [
 [[package]]
 name = "eth_trie_utils"
 version = "0.6.0"
-source = "git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5#e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5"
+source = "git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76#7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76"
 dependencies = [
  "bytes",
  "enum-as-inner",
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 5507434..6150101 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 anyhow = { version = "1.0.71", features = ["backtrace"] }
 ethereum-types = "0.14.1"
-eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" }
+eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76" }
 flexi_logger = { version = "0.25.4", features = ["async"] }
 plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" }
 serde = {version = "1.0.163", features = ["derive"] }
diff --git a/eth_test_parser/Cargo.toml b/eth_test_parser/Cargo.toml
index 099593d..8a7ca78 100644
--- a/eth_test_parser/Cargo.toml
+++ b/eth_test_parser/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 common = { path = "../common" }
-eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" }
+eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76" }
 plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" }
 
 anyhow = { version = "1.0.71", features = ["backtrace"] }

From 042125aded3fd932c0131835b594e21072892fec Mon Sep 17 00:00:00 2001
From: Robin Salen <salenrobin@gmail.com>
Date: Thu, 11 Jan 2024 22:17:21 +0100
Subject: [PATCH 4/4] Fix lock

---
 Cargo.lock | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a0d676..7d4b0dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -320,7 +320,7 @@ name = "common"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76)",
+ "eth_trie_utils",
  "ethereum-types",
  "flexi_logger",
  "plonky2_evm",
@@ -636,7 +636,7 @@ dependencies = [
  "bytes",
  "clap",
  "common",
- "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76)",
+ "eth_trie_utils",
  "ethereum-types",
  "flexi_logger",
  "futures",
@@ -672,25 +672,6 @@ dependencies = [
  "uint",
 ]
 
-[[package]]
-name = "eth_trie_utils"
-version = "0.6.0"
-source = "git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76#7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76"
-dependencies = [
- "bytes",
- "enum-as-inner",
- "ethereum-types",
- "hex",
- "keccak-hash 0.10.0",
- "log",
- "num-traits",
- "parking_lot",
- "rlp",
- "serde",
- "thiserror",
- "uint",
-]
-
 [[package]]
 name = "ethbloom"
 version = "0.13.0"
@@ -1575,7 +1556,7 @@ dependencies = [
  "anyhow",
  "bytes",
  "env_logger",
- "eth_trie_utils 0.6.0 (git+https://github.com/0xPolygonZero/eth_trie_utils.git?rev=7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76)",
+ "eth_trie_utils",
  "ethereum-types",
  "hashbrown 0.14.0",
  "hex-literal",