From 7dd14a7eba7d0c62d3e5a357e25ab91f48dae710 Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Mon, 11 Sep 2023 16:25:35 +0200
Subject: [PATCH] chore: pin git dependencies to specific revs (#4552)

---
 Cargo.lock                             | 80 ++++++++++++++++----------
 Cargo.toml                             | 37 ++++++++----
 crates/net/discv4/Cargo.toml           |  2 +-
 crates/net/nat/Cargo.toml              |  2 +-
 crates/revm/revm-inspectors/Cargo.toml |  6 +-
 deny.toml                              |  9 ++-
 6 files changed, 87 insertions(+), 49 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b40f61ea3..529f0e040 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -141,12 +141,6 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
-[[package]]
-name = "allocator-api2"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
-
 [[package]]
 name = "alloy-rlp"
 version = "0.3.2"
@@ -726,7 +720,8 @@ dependencies = [
 [[package]]
 name = "boa_ast"
 version = "0.17.0"
-source = "git+https://github.com/boa-dev/boa#306709177bf742425a61d0205d6f25e7811f6ebf"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c261398db3b2f9ba05f76872721d6a8a142d10ae6c0a58d3ddc5c2853cc02d"
 dependencies = [
  "bitflags 2.4.0",
  "boa_interner",
@@ -739,7 +734,8 @@ dependencies = [
 [[package]]
 name = "boa_engine"
 version = "0.17.0"
-source = "git+https://github.com/boa-dev/boa#306709177bf742425a61d0205d6f25e7811f6ebf"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31e7a37b855625f1615a07414fb341361475950e57bb9396afe1389bbc2ccdc"
 dependencies = [
  "bitflags 2.4.0",
  "boa_ast",
@@ -758,7 +754,7 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
- "num_enum",
+ "num_enum 0.6.1",
  "once_cell",
  "pollster",
  "rand 0.8.5",
@@ -777,18 +773,19 @@ dependencies = [
 [[package]]
 name = "boa_gc"
 version = "0.17.0"
-source = "git+https://github.com/boa-dev/boa#306709177bf742425a61d0205d6f25e7811f6ebf"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2346f8ac7b736236de0608a7c75a9a32bac0a1137b98574cfebde6343e4ff6b7"
 dependencies = [
  "boa_macros",
  "boa_profiler",
- "hashbrown 0.14.0",
  "thin-vec",
 ]
 
 [[package]]
 name = "boa_icu_provider"
 version = "0.17.0"
-source = "git+https://github.com/boa-dev/boa#306709177bf742425a61d0205d6f25e7811f6ebf"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07652c6f1ca97bbe16bd2ab1ebc39313ac81568d2671aeb24a4a45964d2291a4"
 dependencies = [
  "icu_collections",
  "icu_normalizer",
@@ -801,7 +798,8 @@ dependencies = [
 [[package]]
 name = "boa_interner"
 version = "0.17.0"
-source = "git+https://github.com/boa-dev/boa#306709177bf742425a61d0205d6f25e7811f6ebf"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b968bd467737cace9723a5d01a3d32fe95471526d36db9654a1779c4b766fb6"
 dependencies = [
  "boa_gc",
  "boa_macros",
@@ -816,7 +814,8 @@ dependencies = [
 [[package]]
 name = "boa_macros"
 version = "0.17.0"
-source = "git+https://github.com/boa-dev/boa#306709177bf742425a61d0205d6f25e7811f6ebf"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3de43b7806061fccfba716fef51eea462d636de36803b62d10f902608ffef4"
 dependencies = [
  "proc-macro2 1.0.66",
  "quote 1.0.33",
@@ -827,7 +826,8 @@ dependencies = [
 [[package]]
 name = "boa_parser"
 version = "0.17.0"
-source = "git+https://github.com/boa-dev/boa#306709177bf742425a61d0205d6f25e7811f6ebf"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ff1108bda6d573049191b6452490844c5ba4b12f7bdcc512a33e5c3f5037196"
 dependencies = [
  "bitflags 2.4.0",
  "boa_ast",
@@ -847,7 +847,8 @@ dependencies = [
 [[package]]
 name = "boa_profiler"
 version = "0.17.0"
-source = "git+https://github.com/boa-dev/boa#306709177bf742425a61d0205d6f25e7811f6ebf"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a24f6aa1ecc56e797506437b1f9a172e4a5f207894e74196c682cb656d2c2d60"
 
 [[package]]
 name = "boyer-moore-magiclen"
@@ -936,7 +937,7 @@ dependencies = [
 [[package]]
 name = "c-kzg"
 version = "0.1.0"
-source = "git+https://github.com/ethereum/c-kzg-4844#f5f6f863d475847876a2bd5ee252058d37c3a15d"
+source = "git+https://github.com/ethereum/c-kzg-4844?rev=f5f6f863d475847876a2bd5ee252058d37c3a15d#f5f6f863d475847876a2bd5ee252058d37c3a15d"
 dependencies = [
  "bindgen 0.66.1",
  "blst",
@@ -1841,7 +1842,7 @@ dependencies = [
 [[package]]
 name = "discv5"
 version = "0.3.1"
-source = "git+https://github.com/sigp/discv5#d2e30e04ee62418b9e57278cee907c02b99d5bd1"
+source = "git+https://github.com/sigp/discv5?rev=d2e30e04ee62418b9e57278cee907c02b99d5bd1#d2e30e04ee62418b9e57278cee907c02b99d5bd1"
 dependencies = [
  "aes 0.7.5",
  "aes-gcm",
@@ -2272,7 +2273,7 @@ dependencies = [
  "ethabi",
  "generic-array",
  "k256",
- "num_enum",
+ "num_enum 0.7.0",
  "once_cell",
  "open-fastrlp",
  "rand 0.8.5",
@@ -2860,10 +2861,6 @@ name = "hashbrown"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
-dependencies = [
- "ahash 0.8.3",
- "allocator-api2",
-]
 
 [[package]]
 name = "hashers"
@@ -3241,7 +3238,7 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
 [[package]]
 name = "igd"
 version = "0.12.0"
-source = "git+https://github.com/stevefan1999-personal/rust-igd#c2d1f83eb1612a462962453cb0703bc93258b173"
+source = "git+https://github.com/stevefan1999-personal/rust-igd?rev=c2d1f83eb1612a462962453cb0703bc93258b173#c2d1f83eb1612a462962453cb0703bc93258b173"
 dependencies = [
  "attohttpc",
  "bytes",
@@ -4210,13 +4207,34 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+dependencies = [
+ "num_enum_derive 0.6.1",
+]
+
 [[package]]
 name = "num_enum"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb"
 dependencies = [
- "num_enum_derive",
+ "num_enum_derive 0.7.0",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2 1.0.66",
+ "quote 1.0.33",
+ "syn 2.0.31",
 ]
 
 [[package]]
@@ -5117,9 +5135,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "regress"
-version = "0.7.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ed9969cad8051328011596bf549629f1b800cf1731e7964b1eef8dfc480d2c2"
+checksum = "82a9ecfa0cb04d0b04dddb99b8ccf4f66bc8dfd23df694b398570bd8ae3a50fb"
 dependencies = [
  "hashbrown 0.13.2",
  "memchr",
@@ -6190,7 +6208,7 @@ dependencies = [
 [[package]]
 name = "revm"
 version = "3.3.0"
-source = "git+https://github.com/bluealloy/revm/?branch=release/v25#6084e0fa2d457931cd8c9d29934bca0812b5b8d6"
+source = "git+https://github.com/bluealloy/revm?branch=release/v25#6084e0fa2d457931cd8c9d29934bca0812b5b8d6"
 dependencies = [
  "auto_impl",
  "revm-interpreter",
@@ -6200,7 +6218,7 @@ dependencies = [
 [[package]]
 name = "revm-interpreter"
 version = "1.1.2"
-source = "git+https://github.com/bluealloy/revm/?branch=release/v25#6084e0fa2d457931cd8c9d29934bca0812b5b8d6"
+source = "git+https://github.com/bluealloy/revm?branch=release/v25#6084e0fa2d457931cd8c9d29934bca0812b5b8d6"
 dependencies = [
  "derive_more",
  "enumn",
@@ -6211,7 +6229,7 @@ dependencies = [
 [[package]]
 name = "revm-precompile"
 version = "2.0.3"
-source = "git+https://github.com/bluealloy/revm/?branch=release/v25#6084e0fa2d457931cd8c9d29934bca0812b5b8d6"
+source = "git+https://github.com/bluealloy/revm?branch=release/v25#6084e0fa2d457931cd8c9d29934bca0812b5b8d6"
 dependencies = [
  "k256",
  "num",
@@ -6227,7 +6245,7 @@ dependencies = [
 [[package]]
 name = "revm-primitives"
 version = "1.1.2"
-source = "git+https://github.com/bluealloy/revm/?branch=release/v25#6084e0fa2d457931cd8c9d29934bca0812b5b8d6"
+source = "git+https://github.com/bluealloy/revm?branch=release/v25#6084e0fa2d457931cd8c9d29934bca0812b5b8d6"
 dependencies = [
  "arbitrary",
  "auto_impl",
diff --git a/Cargo.toml b/Cargo.toml
index efacf44b4..20188dddb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -63,9 +63,7 @@ rust-version = "1.70" # Remember to update .clippy.toml and README.md
 license = "MIT OR Apache-2.0"
 homepage = "https://paradigmxyz.github.io/reth"
 repository = "https://github.com/paradigmxyz/reth"
-exclude = [
-    ".github/",
-]
+exclude = [".github/"]
 
 # Like release, but with full debug symbols. Useful for e.g. `perf`.
 [profile.debug-fast]
@@ -78,14 +76,8 @@ lto = "fat"
 codegen-units = 1
 incremental = false
 
-[patch.crates-io]
-revm = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" }
-revm-primitives = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" }
-
 [workspace.dependencies]
 ## reth
-revm = { version = "3" }
-revm-primitives = "1.1"
 reth = { path = "./bin/reth" }
 reth-primitives = { path = "./crates/primitives" }
 reth-interfaces = { path = "./crates/interfaces" }
@@ -103,8 +95,12 @@ reth-transaction-pool = { path = "./crates/transaction-pool" }
 reth-tasks = { path = "./crates/tasks" }
 reth-network = { path = "./crates/net/network" }
 reth-network-api = { path = "./crates/net/network-api" }
-reth-rpc-types-compat = { path = "./crates/rpc/rpc-types-compat"}
+reth-rpc-types-compat = { path = "./crates/rpc/rpc-types-compat" }
 
+revm = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
+revm-interpreter = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
+revm-precompile = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
+revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
 
 ## eth
 ethers-core = { version = "2.0", default-features = false }
@@ -112,6 +108,13 @@ ethers-providers = { version = "2.0", default-features = false }
 ethers-signers = { version = "2.0", default-features = false }
 ethers-middleware = { version = "2.0", default-features = false }
 
+discv5 = { git = "https://github.com/sigp/discv5", rev = "d2e30e04ee62418b9e57278cee907c02b99d5bd1" }
+igd = { git = "https://github.com/stevefan1999-personal/rust-igd", rev = "c2d1f83eb1612a462962453cb0703bc93258b173" }
+
+## js
+boa_engine = "0.17"
+boa_gc = "0.17"
+
 ## misc
 aquamarine = "0.3"
 bytes = "1.4"
@@ -149,10 +152,14 @@ jsonrpsee-core = { version = "0.20" }
 jsonrpsee-types = { version = "0.20" }
 
 ## crypto
-secp256k1 = { version = "0.27.0", default-features = false, features = ["global-context", "rand-std", "recovery"] }
+secp256k1 = { version = "0.27.0", default-features = false, features = [
+    "global-context",
+    "rand-std",
+    "recovery",
+] }
 enr = { version = "0.9", default-features = false, features = ["k256"] }
 # for eip-4844
-c-kzg = { git = "https://github.com/ethereum/c-kzg-4844" }
+c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", rev = "f5f6f863d475847876a2bd5ee252058d37c3a15d" }
 
 ## config
 confy = "0.5"
@@ -162,3 +169,9 @@ toml = "0.7"
 proptest = "1.0"
 arbitrary = "1.1"
 assert_matches = "1.5.0"
+
+[patch.crates-io]
+revm = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
+revm-interpreter = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
+revm-precompile = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
+revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "release/v25" }
diff --git a/crates/net/discv4/Cargo.toml b/crates/net/discv4/Cargo.toml
index 310da6c8a..2f3c2293e 100644
--- a/crates/net/discv4/Cargo.toml
+++ b/crates/net/discv4/Cargo.toml
@@ -19,7 +19,7 @@ reth-net-common = { path = "../common" }
 reth-net-nat = { path = "../nat" }
 
 # ethereum
-discv5 = { git = "https://github.com/sigp/discv5" }
+discv5.workspace = true
 secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery", "serde"] }
 enr = { workspace = true, default-features = false, features = ["rust-secp256k1"] }
 
diff --git a/crates/net/nat/Cargo.toml b/crates/net/nat/Cargo.toml
index ee127ea40..3ee7893c8 100644
--- a/crates/net/nat/Cargo.toml
+++ b/crates/net/nat/Cargo.toml
@@ -15,7 +15,7 @@ Helpers for working around NAT
 # nat
 public-ip = "0.2"
 ## fork of rust-igd with ipv6 support: https://github.com/sbstp/rust-igd/issues/47
-igd = { git = "https://github.com/stevefan1999-personal/rust-igd", features = ["aio", "tokio1"] }
+igd = { workspace = true, features = ["aio", "tokio1"] }
 
 # misc
 tracing.workspace = true
diff --git a/crates/revm/revm-inspectors/Cargo.toml b/crates/revm/revm-inspectors/Cargo.toml
index 3627a8265..b5e18ffcb 100644
--- a/crates/revm/revm-inspectors/Cargo.toml
+++ b/crates/revm/revm-inspectors/Cargo.toml
@@ -22,10 +22,10 @@ thiserror = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
 
 # js-tracing-inspector
-boa_engine = { git = "https://github.com/boa-dev/boa", optional = true }
-boa_gc = { git = "https://github.com/boa-dev/boa", optional = true }
+boa_engine = { workspace = true, optional = true }
+boa_gc = { workspace = true, optional = true }
 tokio = { version = "1", features = ["sync"], optional = true }
 
 [features]
 default = ["js-tracer"]
-js-tracer = ["boa_engine", "boa_gc", "tokio","thiserror", "serde_json"]
+js-tracer = ["boa_engine", "boa_gc", "tokio", "thiserror", "serde_json"]
diff --git a/deny.toml b/deny.toml
index c76bbe889..73c18ff3e 100644
--- a/deny.toml
+++ b/deny.toml
@@ -93,4 +93,11 @@ license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
 unknown-registry = "warn"
 # Lint level for what to happen when a crate from a git repository that is not
 # in the allow list is encountered
-unknown-git = "allow"
+unknown-git = "deny"
+allow-git = [
+    "https://github.com/bluealloy/revm",
+    "https://github.com/boa-dev/boa",
+    "https://github.com/ethereum/c-kzg-4844",
+    "https://github.com/sigp/discv5",
+    "https://github.com/stevefan1999-personal/rust-igd",
+]