diff --git a/Cargo.lock b/Cargo.lock index eefc2f59a1b2..87025555faec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db66918860ff33920fb9e6d648d1e8cee275321406ea255ac9320f6562e26fec" +checksum = "d802a6d579d924a2926d181bce43231aaab4699a7c206197e88fbc6b9dda846f" dependencies = [ "alloy-eips", "alloy-primitives", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff00ab4dd371f53e648d65bd5af01057bdad8aaae8b3cd7cee75445575995c1" +checksum = "8e56bc4dc06ab205dc4106348c44b92e0d979148f8db751994c11caabf5ebbef" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -222,9 +222,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56518f46b074d562ac345238343e2231b672a13aca18142d285f95cc055980b" +checksum = "938bc1cf2ec42579e187834efc254e76dd3fa19f526b57872713e6b95f411305" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -243,9 +243,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf200fd4c28435995e47b26d4761a4cf6e1011a13b81f9a9afaf16a93d9fd09" +checksum = "b648eac186485ead3da160985b929e610a45eb39903f750da9b35f58a91eef52" dependencies = [ "alloy-eips", "alloy-primitives", @@ -268,9 +268,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17c5ada5faf0f9d2921e8b20971eced68abbc92a272b0502cac8b1d00f56777" +checksum = "a1a38b4b49667a84ecad7cdaf431b8bd3f14ca496e5a021df1c26d5c4595dca6" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -282,9 +282,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f3117647e3262f6db9e18b371bf67c5810270c0cf915786c30fad3b1739561" +checksum = "4fb5dc326960e88eec6b5e9add221a071f15cb8fa93b9e88ee9c76cd0e4e1009" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -320,9 +320,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf741e871fb62c80e0007041e8bc1e81978abfd98aafea8354472f06bfd4d309" +checksum = "5af000a8d9aa22694c92a5c6ebd9113495d2eb78fb3579d02a715569b973cc26" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -369,9 +369,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfa2db03d4221b5ca14bff7dbed4712689cb87a3e826af522468783ff05ec5d" +checksum = "a9a9d6ef38d75e4b0dce6737463099698f9b839d1c3f7c8883bfdfce8954374b" dependencies = [ "alloy-chains", "alloy-consensus", @@ -410,9 +410,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eace70e43b073d4bfc1de915c45993a50facd6526fd8da80204e0f83a9e233a" +checksum = "1be3b30bab565198a1bda090915dd165ca9211154eb0b37d046a22829418dcc0" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -451,9 +451,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ec6963b08f1c6ef8eacc01dbba20f2c6a1533550403f6b52dbbe0da0360834" +checksum = "f5ed1e9957edfc8d155e2610e2ff3e10b059b89a6103de9f01579f40d8926d47" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -476,9 +476,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138ef78340b47f16ca4d04a4d75fe2ccdb3f1a4f748d5f3b2fbebc43581fd02e" +checksum = "206749723862bd27d5468270e30fc987c5b4376240aefee728d7e64282c9d146" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -489,9 +489,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de3dafd26452207c9d5caa19d74295704fda6c2656c74081ce5609eb7975c1b" +checksum = "d28cffc71031a68519d302efca15ada5657fed9ca5f504c19a3112c7b2168252" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -501,9 +501,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbe94a1fcd071f19b313e4506d1affee0bd0b4a1cfbfd18a2541fda8e5487cf" +checksum = "4ac98a9d17ec4d851ea38e556c27b92e1ff8c97664cf1feb77aec38dcba34579" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -524,9 +524,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf233da6e246eb792a9ce0aec3317cf5fa085ef4c800d1733d12a12aabdc2df" +checksum = "e59d76349c11aa7fac9aadeceb65cf31d3f3430b407159b172b39d36ccb0671a" dependencies = [ "alloy-eips", "alloy-primitives", @@ -540,9 +540,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb36f68cc0c83120ecfbf0b1862b35f846da8e0cb95be3d10a3a08bfa711248" +checksum = "3d72085173d210806a27892eb72770a663f5b0c17598e37f18c6bb24f7583c3c" dependencies = [ "alloy-primitives", "serde", @@ -550,9 +550,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d87e5622ed4d471f1eefb99a400cd7e362a1889baa9bb4417742260ca43a8" +checksum = "ee96e9793d3ec528ead6e8580f24e9acc71f5c2bc35feefba24465044bb77d76" dependencies = [ "alloy-consensus", "alloy-eips", @@ -571,9 +571,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc1892a1ac0d2a49c063f0791aa6bde342f020c5d37aaaec14832b661802cb4" +checksum = "319a0ca31863bd6fb9aafeaa16425d0a2f1228da44bc24fd2f997ba50afe7e18" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -593,9 +593,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a86c2e9433b6dbc531fd1f09dd07198cd2127f5567528140d70ee8f8091f08" +checksum = "06fb874d3c1bd11f34acbf508c38409693a443ec5e18afd6bc34a7ee9a606e88" dependencies = [ "alloy-eips", "alloy-primitives", @@ -607,9 +607,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25a5e0a7ae0127f20077b23319c8d4a416187c204bf3329ab28a0309ed45535" +checksum = "af2769894024f65ba252618e06a0ca22fc025377ade6d60d7f47a83ac9559680" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -621,9 +621,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64952ac1199868bcd05b3aae2d5e988e6bd171e42ae71580abe6718263061b27" +checksum = "69bfa0d7934827098cd386965a796e7765485dc86c6ae03cda262ad9ccb30e01" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -633,9 +633,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17939f6bef49268e4494158fce1ab8913cd6164ec3f9a4ada2c677b9b5a77f2f" +checksum = "81537867986734e5867a9131145bdc56301f5b37ef9c9fb4654d7f7691a4015d" dependencies = [ "alloy-primitives", "arbitrary", @@ -645,9 +645,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d1f0762a44338f0e05987103bd5919df52170d949080bfebfeb6aaaa867c39" +checksum = "0fdcbfe7079c877b3cb6ec43017e94f66432480f1c1779f736c064e6a8d422cc" dependencies = [ "alloy-primitives", "async-trait", @@ -659,9 +659,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59dd2f16055f532f83a8f8e3c13cf1e3b5ff78afdef82edb613946156e542272" +checksum = "3f5175bd063463e25f1ffc6daaa223db15baf4b18e3d83d0d31fb95756aab6cc" dependencies = [ "alloy-consensus", "alloy-network", @@ -747,9 +747,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3827275a4eed3431ce876a59c76fd19effc2a8c09566b2603e3a3376d38af0" +checksum = "6121c7a8791d7984bd3e1a487aae55c62358b0bd94330126db41d795d942e24e" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -767,9 +767,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958417ddf333c55b0627cb7fbee7c6666895061dee79f50404dd6dbdd8e9eba0" +checksum = "15487cd2d7f2bfd8546e851d80db470603c2a1de82f7c39403078356b20d9a21" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -782,9 +782,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168abcf4337c3fbc0bf9030e62bbaca8b9a0fddf687ecc6585e2e6515dde8b0d" +checksum = "a74511d4703f571c2b4da85458b5634855d97e10a94407c05d97b2052ed5450b" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -801,9 +801,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf327f8d3e938272c2eace672094d3800e069e3f34137358e563faaa314f8a" +checksum = "f812a1f1ae7955964727d3040bf240955ca324d80383b9dd0ab21a6de3007386" dependencies = [ "alloy-pubsub", "alloy-transport", diff --git a/Cargo.toml b/Cargo.toml index 2c390fed6354..05cd7ee96cc8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -441,40 +441,40 @@ alloy-rlp = { version = "0.3.10", default-features = false } alloy-sol-types = "0.8.15" alloy-trie = { version = "0.7", default-features = false } -alloy-consensus = { version = "0.9.0", default-features = false } -alloy-contract = { version = "0.9.0", default-features = false } -alloy-eips = { version = "0.9.0", default-features = false } -alloy-genesis = { version = "0.9.0", default-features = false } -alloy-json-rpc = { version = "0.9.0", default-features = false } -alloy-network = { version = "0.9.0", default-features = false } -alloy-network-primitives = { version = "0.9.0", default-features = false } -alloy-node-bindings = { version = "0.9.0", default-features = false } -alloy-provider = { version = "0.9.0", features = [ +alloy-consensus = { version = "0.9.1", default-features = false } +alloy-contract = { version = "0.9.1", default-features = false } +alloy-eips = { version = "0.9.1", default-features = false } +alloy-genesis = { version = "0.9.1", default-features = false } +alloy-json-rpc = { version = "0.9.1", default-features = false } +alloy-network = { version = "0.9.1", default-features = false } +alloy-network-primitives = { version = "0.9.1", default-features = false } +alloy-node-bindings = { version = "0.9.1", default-features = false } +alloy-provider = { version = "0.9.1", features = [ "reqwest", ], default-features = false } -alloy-pubsub = { version = "0.9.0", default-features = false } -alloy-rpc-client = { version = "0.9.0", default-features = false } -alloy-rpc-types = { version = "0.9.0", features = [ +alloy-pubsub = { version = "0.9.1", default-features = false } +alloy-rpc-client = { version = "0.9.1", default-features = false } +alloy-rpc-types = { version = "0.9.1", features = [ "eth", ], default-features = false } -alloy-rpc-types-admin = { version = "0.9.0", default-features = false } -alloy-rpc-types-anvil = { version = "0.9.0", default-features = false } -alloy-rpc-types-beacon = { version = "0.9.0", default-features = false } -alloy-rpc-types-debug = { version = "0.9.0", default-features = false } -alloy-rpc-types-engine = { version = "0.9.0", default-features = false } -alloy-rpc-types-eth = { version = "0.9.0", default-features = false } -alloy-rpc-types-mev = { version = "0.9.0", default-features = false } -alloy-rpc-types-trace = { version = "0.9.0", default-features = false } -alloy-rpc-types-txpool = { version = "0.9.0", default-features = false } -alloy-serde = { version = "0.9.0", default-features = false } -alloy-signer = { version = "0.9.0", default-features = false } -alloy-signer-local = { version = "0.9.0", default-features = false } -alloy-transport = { version = "0.9.0" } -alloy-transport-http = { version = "0.9.0", features = [ +alloy-rpc-types-admin = { version = "0.9.1", default-features = false } +alloy-rpc-types-anvil = { version = "0.9.1", default-features = false } +alloy-rpc-types-beacon = { version = "0.9.1", default-features = false } +alloy-rpc-types-debug = { version = "0.9.1", default-features = false } +alloy-rpc-types-engine = { version = "0.9.1", default-features = false } +alloy-rpc-types-eth = { version = "0.9.1", default-features = false } +alloy-rpc-types-mev = { version = "0.9.1", default-features = false } +alloy-rpc-types-trace = { version = "0.9.1", default-features = false } +alloy-rpc-types-txpool = { version = "0.9.1", default-features = false } +alloy-serde = { version = "0.9.1", default-features = false } +alloy-signer = { version = "0.9.1", default-features = false } +alloy-signer-local = { version = "0.9.1", default-features = false } +alloy-transport = { version = "0.9.1" } +alloy-transport-http = { version = "0.9.1", features = [ "reqwest-rustls-tls", ], default-features = false } -alloy-transport-ipc = { version = "0.9.0", default-features = false } -alloy-transport-ws = { version = "0.9.0", default-features = false } +alloy-transport-ipc = { version = "0.9.1", default-features = false } +alloy-transport-ws = { version = "0.9.1", default-features = false } # op op-alloy-rpc-types = { version = "0.9.0", default-features = false } diff --git a/crates/rpc/rpc-eth-types/src/error/mod.rs b/crates/rpc/rpc-eth-types/src/error/mod.rs index b6c62f137488..e93a566e26c1 100644 --- a/crates/rpc/rpc-eth-types/src/error/mod.rs +++ b/crates/rpc/rpc-eth-types/src/error/mod.rs @@ -787,7 +787,7 @@ mod tests { assert_eq!(err.message(), "block not found: canonical hash 0x1a15e3c30cf094a99826869517b16d185d45831d3a494f01030b0001a9d3ebb9"); let err: jsonrpsee_types::error::ErrorObject<'static> = EthApiError::HeaderNotFound(BlockId::number(100000)).into(); - assert_eq!(err.message(), "block not found: number 0x186a0"); + assert_eq!(err.message(), "block not found: 0x186a0"); let err: jsonrpsee_types::error::ErrorObject<'static> = EthApiError::HeaderNotFound(BlockId::latest()).into(); assert_eq!(err.message(), "block not found: latest"); diff --git a/crates/rpc/rpc/src/txpool.rs b/crates/rpc/rpc/src/txpool.rs index 54001620786a..a8d783406773 100644 --- a/crates/rpc/rpc/src/txpool.rs +++ b/crates/rpc/rpc/src/txpool.rs @@ -103,15 +103,7 @@ where ) { let entry = inspect.entry(tx.sender()).or_default(); let tx = tx.clone_into_consensus(); - entry.insert( - tx.nonce().to_string(), - TxpoolInspectSummary { - to: tx.to(), - value: tx.value(), - gas: tx.gas_limit(), - gas_price: tx.max_fee_per_gas(), - }, - ); + entry.insert(tx.nonce().to_string(), tx.into_signed().into()); } let AllPoolTransactions { pending, queued } = self.pool.all_transactions();