diff --git a/Cargo.lock b/Cargo.lock index 62e25f7dac..6560717115 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=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" 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=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" 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=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" 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=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" 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=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" 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=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" 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=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" 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=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" 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=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" dependencies = [ "alloy-consensus", "alloy-eips", @@ -380,7 +380,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" dependencies = [ "alloy-primitives", "alloy-serde", @@ -390,7 +390,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" dependencies = [ "alloy-consensus", "alloy-eips", @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -420,7 +420,7 @@ dependencies = [ [[package]] name = "alloy-serde" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" dependencies = [ "alloy-primitives", "serde", @@ -430,7 +430,7 @@ dependencies = [ [[package]] name = "alloy-signer" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" dependencies = [ "alloy-primitives", "async-trait", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "alloy-signer-wallet" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" dependencies = [ "alloy-consensus", "alloy-network", @@ -518,7 +518,7 @@ dependencies = [ [[package]] name = "alloy-transport" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" dependencies = [ "alloy-json-rpc", "base64 0.22.0", @@ -536,7 +536,7 @@ dependencies = [ [[package]] name = "alloy-transport-http" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=a32e6f7#a32e6f7f84cc1f2a1b244cc79a20057b0a3d4cba" +source = "git+https://github.com/alloy-rs/alloy?rev=188c4f8#188c4f8f6080d4beaaea653c57261cb3b53a95b3" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -7560,7 +7560,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=67f9968#67f9968fe56e5968ada322d084a98dd6a405ccdb" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=735f67c#735f67cd450fe952625eb777b86d0e48df3ef28c" dependencies = [ "alloy-primitives", "alloy-rpc-types", diff --git a/Cargo.toml b/Cargo.toml index 6ed1ab9adc..2c4e3f020b 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 = "67f9968" } +revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "735f67c" } # eth alloy-chains = "0.1.15" @@ -276,20 +276,20 @@ 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 = "a32e6f7" } -alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } -alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } -alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } -alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } -alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } -alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7", default-features = false, features = [ +alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8", default-features = false, features = [ "reqwest", ] } -alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } -alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } -alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } -alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } -alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "a32e6f7" } +alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } +alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "188c4f8" } # misc aquamarine = "0.5" diff --git a/crates/rpc/rpc/src/eth/revm_utils.rs b/crates/rpc/rpc/src/eth/revm_utils.rs index 374918d399..4b00d4662c 100644 --- a/crates/rpc/rpc/src/eth/revm_utils.rs +++ b/crates/rpc/rpc/src/eth/revm_utils.rs @@ -217,7 +217,7 @@ pub(crate) fn create_txn_env( request: TransactionRequest, ) -> EthResult { // Ensure that if versioned hashes are set, they're not empty - if request.has_empty_blob_hashes() { + if request.blob_versioned_hashes.as_ref().map_or(false, |hashes| hashes.is_empty()) { return Err(RpcInvalidTransactionError::BlobTransactionMissingBlobHashes.into()) }