From a89add094f26431e6cf4516332aa0bb9c57f5c3e Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Sat, 13 Apr 2024 08:33:21 +0200 Subject: [PATCH] chore(deps): bump alloy+evm inspectors (#7616) --- Cargo.lock | 34 +++++++++++----------- Cargo.toml | 24 +++++++-------- crates/rpc/rpc/src/eth/api/transactions.rs | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55deaa145f..60f43e84da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,7 +146,7 @@ dependencies = [ [[package]] name = "alloy-consensus" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-eips", "alloy-primitives", @@ -178,7 +178,7 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -196,7 +196,7 @@ dependencies = [ [[package]] name = "alloy-genesis" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-primitives", "alloy-serde", @@ -218,7 +218,7 @@ dependencies = [ [[package]] name = "alloy-json-rpc" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-primitives", "serde", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "alloy-network" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-consensus", "alloy-eips", @@ -246,7 +246,7 @@ dependencies = [ [[package]] name = "alloy-node-bindings" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -288,7 +288,7 @@ dependencies = [ [[package]] name = "alloy-provider" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-eips", "alloy-json-rpc", @@ -338,7 +338,7 @@ dependencies = [ [[package]] name = "alloy-rpc-client" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -358,7 +358,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-consensus", "alloy-eips", @@ -380,7 +380,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-consensus", "alloy-eips", @@ -398,7 +398,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "alloy-serde" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-primitives", "serde", @@ -420,7 +420,7 @@ dependencies = [ [[package]] name = "alloy-signer" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-primitives", "async-trait", @@ -433,7 +433,7 @@ dependencies = [ [[package]] name = "alloy-signer-wallet" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-consensus", "alloy-network", @@ -508,7 +508,7 @@ dependencies = [ [[package]] name = "alloy-transport" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-json-rpc", "base64 0.22.0", @@ -526,7 +526,7 @@ dependencies = [ [[package]] name = "alloy-transport-http" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=7629f79#7629f79e3ffb6abd0be901a06deed2ab9f695e4e" +source = "git+https://github.com/alloy-rs/alloy?rev=8cb0307#8cb0307b9bdb6cef9058d2d1a2219c8d212a7421" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -7537,7 +7537,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=413b892#413b892dd936d117c52d47ba07d195b09a7f1216" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=f604dc4#f604dc4d4cd1f013c8bd488b2f28356a77fa2094" dependencies = [ "alloy-primitives", "alloy-rpc-types", diff --git a/Cargo.toml b/Cargo.toml index cc9fbe489c..e096084155 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -267,7 +267,7 @@ revm = { version = "8.0.0", features = [ revm-primitives = { version = "3.1.0", features = [ "std", ], default-features = false } -revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "413b892" } +revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "f604dc4" } # eth alloy-chains = "0.1.15" @@ -276,19 +276,19 @@ alloy-dyn-abi = "0.7.0" alloy-sol-types = "0.7.0" alloy-rlp = "0.3.4" alloy-trie = "0.3.1" -alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } -alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } -alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } -alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } -alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } -alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79", default-features = false, features = [ +alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } +alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } +alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } +alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } +alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } +alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307", default-features = false, features = [ "reqwest", ] } -alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } -alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } -alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } -alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } -alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "7629f79" } +alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } +alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } +alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } +alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } +alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "8cb0307" } # misc aquamarine = "0.5" diff --git a/crates/rpc/rpc/src/eth/api/transactions.rs b/crates/rpc/rpc/src/eth/api/transactions.rs index 9860191c2b..95bf152821 100644 --- a/crates/rpc/rpc/src/eth/api/transactions.rs +++ b/crates/rpc/rpc/src/eth/api/transactions.rs @@ -1732,7 +1732,7 @@ pub(crate) fn build_transaction_receipt_with_block_receipts( r#type: transaction.transaction.tx_type().into(), }, transaction_hash: meta.tx_hash, - transaction_index: meta.index, + transaction_index: Some(meta.index), block_hash: Some(meta.block_hash), block_number: Some(meta.block_number), from,