jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump igd dep (#6197)

Browse Source
This commit is contained in:
Dan Cline
2024-01-24 13:41:32 -05:00
committed by GitHub
parent 575b5d3f53
commit d2cafa80a4
6 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
Cargo.lock generated
View File

@ -173,7 +173,7 @@ dependencies = [
[[package]] [[package]]
name = "alloy-genesis" name = "alloy-genesis"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy#42778ba44fbf9fdcfd44de81436f65d73e70ede2" source = "git+https://github.com/alloy-rs/alloy#d68e1103bda0a0b95e1928c56091dc48e64c95de"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rpc-types", "alloy-rpc-types",
@ -195,7 +195,7 @@ dependencies = [
[[package]] [[package]]
name = "alloy-node-bindings" name = "alloy-node-bindings"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy#42778ba44fbf9fdcfd44de81436f65d73e70ede2" source = "git+https://github.com/alloy-rs/alloy#d68e1103bda0a0b95e1928c56091dc48e64c95de"
dependencies = [ dependencies = [
"alloy-genesis", "alloy-genesis",
"alloy-primitives", "alloy-primitives",
@ -256,7 +256,7 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-engine-types" name = "alloy-rpc-engine-types"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy#42778ba44fbf9fdcfd44de81436f65d73e70ede2" source = "git+https://github.com/alloy-rs/alloy#d68e1103bda0a0b95e1928c56091dc48e64c95de"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rlp", "alloy-rlp",
@ -271,7 +271,7 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-trace-types" name = "alloy-rpc-trace-types"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy#42778ba44fbf9fdcfd44de81436f65d73e70ede2" source = "git+https://github.com/alloy-rs/alloy#d68e1103bda0a0b95e1928c56091dc48e64c95de"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rpc-types", "alloy-rpc-types",
@ -282,7 +282,7 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types" name = "alloy-rpc-types"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy#42778ba44fbf9fdcfd44de81436f65d73e70ede2" source = "git+https://github.com/alloy-rs/alloy#d68e1103bda0a0b95e1928c56091dc48e64c95de"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rlp", "alloy-rlp",
@ -339,15 +339,16 @@ dependencies = [
[[package]] [[package]]
name = "alloy-trie" name = "alloy-trie"
version = "0.2.0" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677fd3c62d77b0550288d63723d331dbd88adcf3578e1f58daa123f0b599e383" checksum = "59974c3c7778ebbcd73356a430fd4608aaf0630b1fdb4f5337bfd70f40b66618"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rlp", "alloy-rlp",
"arbitrary", "arbitrary",
"derive_arbitrary", "derive_arbitrary",
"derive_more", "derive_more",
"hashbrown 0.14.3",
"nybbles", "nybbles",
"proptest", "proptest",
"proptest-derive", "proptest-derive",
@ -686,14 +687,13 @@ dependencies = [
[[package]] [[package]]
name = "attohttpc" name = "attohttpc"
version = "0.16.3" version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2"
dependencies = [ dependencies = [
"http", "http",
"log", "log",
"url", "url",
"wildmatch",
] ]
[[package]] [[package]]
@ -1292,9 +1292,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.31" version = "0.4.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a"
dependencies = [ dependencies = [
"android-tzdata", "android-tzdata",
"iana-time-zone", "iana-time-zone",
@ -1302,14 +1302,14 @@ dependencies = [
"num-traits", "num-traits",
"serde", "serde",
"wasm-bindgen", "wasm-bindgen",
"windows-targets 0.48.5", "windows-targets 0.52.0",
] ]
[[package]] [[package]]
name = "ciborium" name = "ciborium"
version = "0.2.1" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
dependencies = [ dependencies = [
"ciborium-io", "ciborium-io",
"ciborium-ll", "ciborium-ll",
@ -1318,15 +1318,15 @@ dependencies = [
[[package]] [[package]]
name = "ciborium-io" name = "ciborium-io"
version = "0.2.1" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
[[package]] [[package]]
name = "ciborium-ll" name = "ciborium-ll"
version = "0.2.1" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
dependencies = [ dependencies = [
"ciborium-io", "ciborium-io",
"half", "half",
@ -3141,9 +3141,13 @@ dependencies = [
[[package]] [[package]]
name = "half" name = "half"
version = "1.8.2" version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
dependencies = [
"cfg-if",
"crunchy",
]
[[package]] [[package]]
name = "hash-db" name = "hash-db"
@ -3595,10 +3599,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
[[package]] [[package]]
name = "igd" name = "igd-next"
version = "0.12.0" version = "0.14.3"
source = "git+https://github.com/stevefan1999-personal/rust-igd?rev=c2d1f83eb1612a462962453cb0703bc93258b173#c2d1f83eb1612a462962453cb0703bc93258b173" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4"
dependencies = [ dependencies = [
"async-trait",
"attohttpc", "attohttpc",
"bytes", "bytes",
"futures", "futures",
@ -5300,9 +5306,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.76" version = "1.0.78"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -5600,13 +5606,13 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.10.2" version = "1.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
dependencies = [ dependencies = [
"aho-corasick 1.1.2", "aho-corasick 1.1.2",
"memchr", "memchr",
"regex-automata 0.4.3", "regex-automata 0.4.4",
"regex-syntax 0.8.2", "regex-syntax 0.8.2",
] ]
@ -5621,9 +5627,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-automata" name = "regex-automata"
version = "0.4.3" version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
dependencies = [ dependencies = [
"aho-corasick 1.1.2", "aho-corasick 1.1.2",
"memchr", "memchr",
@ -6258,7 +6264,7 @@ dependencies = [
name = "reth-net-nat" name = "reth-net-nat"
version = "0.1.0-alpha.16" version = "0.1.0-alpha.16"
dependencies = [ dependencies = [
"igd", "igd-next",
"pin-project-lite", "pin-project-lite",
"public-ip", "public-ip",
"reth-tracing", "reth-tracing",
@ -7577,9 +7583,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "3.5.0" version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f58c3a1b3e418f61c25b2aeb43fc6c95eaa252b8cecdda67f401943e9e08d33f" checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"chrono", "chrono",
@ -7594,9 +7600,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with_macros" name = "serde_with_macros"
version = "3.5.0" version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2068b437a31fc68f25dd7edc296b078f04b45145c199d8eed9866e45f1ff274" checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298"
dependencies = [ dependencies = [
"darling 0.20.3", "darling 0.20.3",
"proc-macro2", "proc-macro2",
@ -9171,12 +9177,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
[[package]]
name = "wildmatch"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a"
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.3.9" version = "0.3.9"

5
Cargo.toml
View File

@ -167,7 +167,7 @@ revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "reth_fr
revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors"} revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors"}
# eth # eth
alloy-chains = {version = "0.1", feature = ["serde", "rlp", "arbitrary"] } alloy-chains = { version = "0.1", feature = ["serde", "rlp", "arbitrary"] }
alloy-primitives = "0.6" alloy-primitives = "0.6"
alloy-dyn-abi = "0.6" alloy-dyn-abi = "0.6"
alloy-sol-types = "0.6" alloy-sol-types = "0.6"
@ -184,7 +184,8 @@ ethers-signers = { version = "2.0", default-features = false }
ethers-middleware = { version = "2.0", default-features = false } ethers-middleware = { version = "2.0", default-features = false }
discv5 = { git = "https://github.com/sigp/discv5", rev = "f289bbd4c57d499bb1bdb393af3c249600a1c662" } discv5 = { git = "https://github.com/sigp/discv5", rev = "f289bbd4c57d499bb1bdb393af3c249600a1c662" }
igd = { git = "https://github.com/stevefan1999-personal/rust-igd", rev = "c2d1f83eb1612a462962453cb0703bc93258b173" } # Fork of rust-igd with ipv6 support
igd-next = "0.14.3"
# js # js
boa_engine = "0.17" boa_engine = "0.17"

4
crates/net/nat/Cargo.toml
View File

@ -12,11 +12,9 @@ description = "Helpers for working around NAT"
workspace = true workspace = true
[dependencies] [dependencies]
# nat # nat
public-ip = "0.2" public-ip = "0.2"
## fork of rust-igd with ipv6 support: https://github.com/sbstp/rust-igd/issues/47 igd-next = { workspace = true, features = ["aio_tokio"] }
igd = { workspace = true, features = ["aio", "tokio1"] }
# misc # misc
tracing.workspace = true tracing.workspace = true

2
crates/net/nat/src/lib.rs
View File

@ -11,7 +11,7 @@
)] )]
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
use igd::aio::search_gateway; use igd_next::aio::tokio::search_gateway;
use pin_project_lite::pin_project; use pin_project_lite::pin_project;
use std::{ use std::{
fmt, fmt,

4
crates/rpc/rpc-types-compat/src/transaction/mod.rs
View File

@ -5,6 +5,8 @@ use reth_primitives::{
BlockNumber, Transaction as PrimitiveTransaction, TransactionKind as PrimitiveTransactionKind, BlockNumber, Transaction as PrimitiveTransaction, TransactionKind as PrimitiveTransactionKind,
TransactionSignedEcRecovered, TxType, B256, U128, U256, U64, TransactionSignedEcRecovered, TxType, B256, U128, U256, U64,
}; };
#[cfg(feature = "optimism")]
use reth_rpc_types::optimism::OptimismTransactionFields;
use reth_rpc_types::{AccessListItem, CallInput, CallRequest, Transaction}; use reth_rpc_types::{AccessListItem, CallInput, CallRequest, Transaction};
use signature::from_primitive_signature; use signature::from_primitive_signature;
pub use typed::*; pub use typed::*;
@ -138,7 +140,7 @@ fn fill(
blob_versioned_hashes, blob_versioned_hashes,
// Optimism fields // Optimism fields
#[cfg(feature = "optimism")] #[cfg(feature = "optimism")]
other: reth_rpc_types::OptimismTransactionFields { other: OptimismTransactionFields {
source_hash: signed_tx.source_hash(), source_hash: signed_tx.source_hash(),
mint: signed_tx.mint().map(U128::from), mint: signed_tx.mint().map(U128::from),
is_system_tx: signed_tx.is_deposit().then_some(signed_tx.is_system_transaction()), is_system_tx: signed_tx.is_deposit().then_some(signed_tx.is_system_transaction()),

1
deny.toml
View File

@ -97,5 +97,4 @@ allow-git = [
"https://github.com/alloy-rs/alloy", "https://github.com/alloy-rs/alloy",
"https://github.com/paradigmxyz/evm-inspectors", "https://github.com/paradigmxyz/evm-inspectors",
"https://github.com/sigp/discv5", "https://github.com/sigp/discv5",
"https://github.com/stevefan1999-personal/rust-igd",
] ]