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

fix: add missing depositReceiptVersion field (#6607)

Browse Source
This commit is contained in:
0xZerohero
2024-02-14 18:10:35 +02:00
committed by GitHub
parent 99764b8963
commit 7c93d8efa6
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@ -173,7 +173,7 @@ dependencies = [
[[package]]
name = "alloy-eips"
version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy?rev=a4453d4#a4453d42ffb755a46bace2ceca3baa454e0cd807"
source = "git+https://github.com/alloy-rs/alloy?rev=b9dd518#b9dd518b12efd27ab706ae6ffa9ad6b05df451c7"
dependencies = [
"alloy-primitives",
"alloy-rlp",
@ -183,7 +183,7 @@ dependencies = [
[[package]]
name = "alloy-genesis"
version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy?rev=a4453d4#a4453d42ffb755a46bace2ceca3baa454e0cd807"
source = "git+https://github.com/alloy-rs/alloy?rev=b9dd518#b9dd518b12efd27ab706ae6ffa9ad6b05df451c7"
dependencies = [
"alloy-primitives",
"alloy-rpc-types",
@ -205,7 +205,7 @@ dependencies = [
[[package]]
name = "alloy-node-bindings"
version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy?rev=a4453d4#a4453d42ffb755a46bace2ceca3baa454e0cd807"
source = "git+https://github.com/alloy-rs/alloy?rev=b9dd518#b9dd518b12efd27ab706ae6ffa9ad6b05df451c7"
dependencies = [
"alloy-genesis",
"alloy-primitives",
@ -266,7 +266,7 @@ dependencies = [
[[package]]
name = "alloy-rpc-engine-types"
version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy?rev=a4453d4#a4453d42ffb755a46bace2ceca3baa454e0cd807"
source = "git+https://github.com/alloy-rs/alloy?rev=b9dd518#b9dd518b12efd27ab706ae6ffa9ad6b05df451c7"
dependencies = [
"alloy-primitives",
"alloy-rlp",
@ -281,7 +281,7 @@ dependencies = [
[[package]]
name = "alloy-rpc-trace-types"
version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy?rev=a4453d4#a4453d42ffb755a46bace2ceca3baa454e0cd807"
source = "git+https://github.com/alloy-rs/alloy?rev=b9dd518#b9dd518b12efd27ab706ae6ffa9ad6b05df451c7"
dependencies = [
"alloy-primitives",
"alloy-rpc-types",
@ -292,7 +292,7 @@ dependencies = [
[[package]]
name = "alloy-rpc-types"
version = "0.1.0"
source = "git+https://github.com/alloy-rs/alloy?rev=a4453d4#a4453d42ffb755a46bace2ceca3baa454e0cd807"
source = "git+https://github.com/alloy-rs/alloy?rev=b9dd518#b9dd518b12efd27ab706ae6ffa9ad6b05df451c7"
dependencies = [
"alloy-primitives",
"alloy-rlp",
@ -7035,7 +7035,7 @@ dependencies = [
[[package]]
name = "revm-inspectors"
version = "0.1.0"
source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=b63ec73#b63ec734f89424dc4872a7cc18173c035889df80"
source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=8f17f34#8f17f34da5fec043378e689bb9e4169453371c38"
dependencies = [
"alloy-primitives",
"alloy-rpc-trace-types",

14
Cargo.toml
View File

@ -172,7 +172,7 @@ reth-trie = { path = "crates/trie" }
# revm
revm = { version = "5.0", features = ["std", "secp256k1"], default-features = false }
revm-primitives = { version = "2.0", features = ["std"], default-features = false }
revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "b63ec73" }
revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "8f17f34" }
# eth
alloy-chains = { version = "0.1", feature = ["serde", "rlp", "arbitrary"] }
@ -181,12 +181,12 @@ alloy-dyn-abi = "0.6"
alloy-sol-types = "0.6"
alloy-rlp = "0.3"
alloy-trie = "0.2"
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "a4453d4" }
alloy-rpc-trace-types = { git = "https://github.com/alloy-rs/alloy", rev = "a4453d4" }
alloy-rpc-engine-types = { git = "https://github.com/alloy-rs/alloy", rev = "a4453d4" }
alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "a4453d4" }
alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "a4453d4" }
alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "a4453d4" }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "b9dd518" }
alloy-rpc-trace-types = { git = "https://github.com/alloy-rs/alloy", rev = "b9dd518" }
alloy-rpc-engine-types = { git = "https://github.com/alloy-rs/alloy", rev = "b9dd518" }
alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "b9dd518" }
alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "b9dd518" }
alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "b9dd518" }
ethers-core = { version = "2.0", default-features = false }
ethers-providers = { version = "2.0", default-features = false }
ethers-signers = { version = "2.0", default-features = false }

26
crates/rpc/rpc/src/eth/api/transactions.rs
View File

@ -1359,21 +1359,19 @@ pub(crate) fn build_transaction_receipt_with_block_receipts(
#[cfg(feature = "optimism")]
{
let mut op_fields = OptimismTransactionReceiptFields {
deposit_nonce: receipt.deposit_nonce.map(U64::from),
..Default::default()
};
let mut op_fields = OptimismTransactionReceiptFields::default();
if let Some(l1_block_info) = optimism_tx_meta.l1_block_info {
if !transaction.is_deposit() {
op_fields.l1_fee = optimism_tx_meta.l1_fee;
op_fields.l1_gas_used = optimism_tx_meta
.l1_data_gas
.map(|dg| dg + l1_block_info.l1_fee_overhead.unwrap_or_default());
op_fields.l1_fee_scalar =
Some(f64::from(l1_block_info.l1_base_fee_scalar) / 1_000_000.0);
op_fields.l1_gas_price = Some(l1_block_info.l1_base_fee);
}
if transaction.is_deposit() {
op_fields.deposit_nonce = receipt.deposit_nonce.map(U64::from);
op_fields.deposit_receipt_version = receipt.deposit_receipt_version.map(U64::from);
} else if let Some(l1_block_info) = optimism_tx_meta.l1_block_info {
op_fields.l1_fee = optimism_tx_meta.l1_fee;
op_fields.l1_gas_used = optimism_tx_meta
.l1_data_gas
.map(|dg| dg + l1_block_info.l1_fee_overhead.unwrap_or_default());
op_fields.l1_fee_scalar =
Some(f64::from(l1_block_info.l1_base_fee_scalar) / 1_000_000.0);
op_fields.l1_gas_price = Some(l1_block_info.l1_base_fee);
}
res_receipt.other = op_fields.into();