From 22d904ecde9fbe26d528a973ee409e082f28b4b3 Mon Sep 17 00:00:00 2001
From: Raul Jordan <raul@prysmaticlabs.com>
Date: Thu, 15 Aug 2024 18:16:35 -0500
Subject: [PATCH 1/3] pin alloy versions

---
 Cargo.toml       | 8 ++++----
 check/Cargo.toml | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 640811d..1303b67 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,10 +11,10 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/OffchainLabs/cargo-stylus"
 
 [workspace.dependencies]
-alloy-primitives = "0.7.6"
-alloy-json-abi = "0.7.6"
-alloy-sol-macro = "0.7.6"
-alloy-sol-types = "0.7.6"
+alloy-primitives = "=0.7.6"
+alloy-json-abi = "=0.7.6"
+alloy-sol-macro = "=0.7.6"
+alloy-sol-types = "=0.7.6"
 alloy-ethers-typecast = "0.2.0"
 clap = { version = "4.5.4", features = [ "derive", "color" ] }
 ethers = "2.0.10"
diff --git a/check/Cargo.toml b/check/Cargo.toml
index d94052f..41d8ef0 100644
--- a/check/Cargo.toml
+++ b/check/Cargo.toml
@@ -38,3 +38,11 @@ wasm-encoder = "0.213.0"
 wasm-gen = "0.1.4"
 toml = "0.8.14"
 sys-info = "0.9.1"
+<<<<<<< Updated upstream
+=======
+alloy-contract = "=0.2.1"
+alloy-provider = "=0.2.1"
+alloy-signer-local = { version = "0.2.1", features = ["keystore"] }
+alloy-signer = "=0.2.1"
+alloy-transport = "=0.2.1"
+>>>>>>> Stashed changes

From f9c99f5fc3c05053c467541a75ebdfd7a7498611 Mon Sep 17 00:00:00 2001
From: Raul Jordan <raul@prysmaticlabs.com>
Date: Thu, 15 Aug 2024 18:17:24 -0500
Subject: [PATCH 2/3] edit

---
 Cargo.lock       | 25 ++++++++++++-------------
 check/Cargo.toml |  8 --------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2fdf91d..184c063 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -82,11 +82,11 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-abi"
-version = "0.7.7"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372"
+checksum = "aaeaccd50238126e3a0ff9387c7c568837726ad4f4e399b528ca88104d6c25ef"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-primitives 0.7.6",
  "alloy-sol-type-parser",
  "serde",
  "serde_json",
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "0.7.7"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4"
+checksum = "f783611babedbbe90db3478c120fb5f5daacceffc210b39adc0af4fe0da70bad"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro"
-version = "0.7.7"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09"
+checksum = "4bad41a7c19498e3f6079f7744656328699f8ea3e783bdd10d85788cd439f572"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
@@ -199,17 +199,16 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98"
 dependencies = [
- "serde",
  "winnow 0.6.16",
 ]
 
 [[package]]
 name = "alloy-sol-types"
-version = "0.7.7"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7"
+checksum = "a49042c6d3b66a9fe6b2b5a8bf0d39fc2ae1ee0310a2a26ffedd79fb097878dd"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-primitives 0.7.6",
  "alloy-sol-macro",
  "const-hex",
  "serde",
@@ -691,7 +690,7 @@ version = "0.4.2"
 dependencies = [
  "alloy-ethers-typecast",
  "alloy-json-abi",
- "alloy-primitives 0.7.7",
+ "alloy-primitives 0.7.6",
  "alloy-sol-macro",
  "alloy-sol-types",
  "brotli2",
@@ -729,7 +728,7 @@ dependencies = [
 name = "cargo-stylus-replay"
 version = "0.4.2"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-primitives 0.7.6",
  "cargo-stylus-util",
  "clap",
  "ethers",
diff --git a/check/Cargo.toml b/check/Cargo.toml
index 41d8ef0..d94052f 100644
--- a/check/Cargo.toml
+++ b/check/Cargo.toml
@@ -38,11 +38,3 @@ wasm-encoder = "0.213.0"
 wasm-gen = "0.1.4"
 toml = "0.8.14"
 sys-info = "0.9.1"
-<<<<<<< Updated upstream
-=======
-alloy-contract = "=0.2.1"
-alloy-provider = "=0.2.1"
-alloy-signer-local = { version = "0.2.1", features = ["keystore"] }
-alloy-signer = "=0.2.1"
-alloy-transport = "=0.2.1"
->>>>>>> Stashed changes

From 6036b5d41f6bedde34f36ffd091ebff7811bc701 Mon Sep 17 00:00:00 2001
From: Raul Jordan <raul@prysmaticlabs.com>
Date: Thu, 15 Aug 2024 18:23:07 -0500
Subject: [PATCH 3/3] pin

---
 Cargo.lock | 25 +++++++++++++------------
 Cargo.toml |  8 ++++----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 184c063..2fdf91d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -82,11 +82,11 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-abi"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaeaccd50238126e3a0ff9387c7c568837726ad4f4e399b528ca88104d6c25ef"
+checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372"
 dependencies = [
- "alloy-primitives 0.7.6",
+ "alloy-primitives 0.7.7",
  "alloy-sol-type-parser",
  "serde",
  "serde_json",
@@ -116,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f783611babedbbe90db3478c120fb5f5daacceffc210b39adc0af4fe0da70bad"
+checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bad41a7c19498e3f6079f7744656328699f8ea3e783bdd10d85788cd439f572"
+checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
@@ -199,16 +199,17 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98"
 dependencies = [
+ "serde",
  "winnow 0.6.16",
 ]
 
 [[package]]
 name = "alloy-sol-types"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a49042c6d3b66a9fe6b2b5a8bf0d39fc2ae1ee0310a2a26ffedd79fb097878dd"
+checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7"
 dependencies = [
- "alloy-primitives 0.7.6",
+ "alloy-primitives 0.7.7",
  "alloy-sol-macro",
  "const-hex",
  "serde",
@@ -690,7 +691,7 @@ version = "0.4.2"
 dependencies = [
  "alloy-ethers-typecast",
  "alloy-json-abi",
- "alloy-primitives 0.7.6",
+ "alloy-primitives 0.7.7",
  "alloy-sol-macro",
  "alloy-sol-types",
  "brotli2",
@@ -728,7 +729,7 @@ dependencies = [
 name = "cargo-stylus-replay"
 version = "0.4.2"
 dependencies = [
- "alloy-primitives 0.7.6",
+ "alloy-primitives 0.7.7",
  "cargo-stylus-util",
  "clap",
  "ethers",
diff --git a/Cargo.toml b/Cargo.toml
index 1303b67..4a557f7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,10 +11,10 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/OffchainLabs/cargo-stylus"
 
 [workspace.dependencies]
-alloy-primitives = "=0.7.6"
-alloy-json-abi = "=0.7.6"
-alloy-sol-macro = "=0.7.6"
-alloy-sol-types = "=0.7.6"
+alloy-primitives = "=0.7.7"
+alloy-json-abi = "=0.7.7"
+alloy-sol-macro = "=0.7.7"
+alloy-sol-types = "=0.7.7"
 alloy-ethers-typecast = "0.2.0"
 clap = { version = "4.5.4", features = [ "derive", "color" ] }
 ethers = "2.0.10"