Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Remove duplicate new_txn_trie_node_byte #477

Merged
merged 1 commit into from
Aug 15, 2024
Merged

feat: Remove duplicate new_txn_trie_node_byte #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 1 addition & 202 deletions trace_decoder/benches/block_input.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 3 additions & 7 deletions trace_decoder/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,12 @@ pub struct TxnInfo {
/// Structure holding metadata for one transaction.
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct TxnMeta {
/// Txn byte code.
/// Txn byte code. This is also the raw RLP bytestring inserted into the txn
/// trie by this txn. Note that the key is not included and this is only
/// the rlped value of the node!
#[serde(with = "crate::hex")]
pub byte_code: Vec<u8>,

/// Rlped bytes of the new txn value inserted into the txn trie by
/// this txn. Note that the key is not included and this is only the rlped
/// value of the node!
#[serde(with = "crate::hex")]
pub new_txn_trie_node_byte: Vec<u8>,

/// Rlped bytes of the new receipt value inserted into the receipt trie by
/// this txn. Note that the key is not included and this is only the rlped
/// value of the node!
Expand Down
1,938 changes: 965 additions & 973 deletions trace_decoder/tests/data/witnesses/zero_jerigon/b19807080_main.json
View file
Open in desktop

Large diffs are not rendered by default.

9,200 changes: 9,199 additions & 1 deletion trace_decoder/tests/data/witnesses/zero_jerigon/b20240052_main.json
View file
Open in desktop

Large diffs are not rendered by default.

10,048 changes: 10,047 additions & 1 deletion trace_decoder/tests/data/witnesses/zero_jerigon/b20240058_main.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions trace_decoder/tests/data/witnesses/zero_jerigon/b4_dev.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion zero_bin/rpc/src/native/txn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ where

let tx_meta = TxnMeta {
byte_code: <Ethereum as Network>::TxEnvelope::try_from(tx.clone())?.encoded_2718(),
new_txn_trie_node_byte: vec![],
new_receipt_trie_node_byte: alloy::rlp::encode(tx_receipt.inner),
gas_used: tx_receipt.gas_used as u64,
};
Expand Down
2,029 changes: 1,010 additions & 1,019 deletions zero_bin/tools/artifacts/witness_b19807080.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 1 addition & 6 deletions zero_bin/tools/artifacts/witness_b3_b6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@
},
"meta": {
"byte_code": "0xf8891584693d4ca88254de948943545177806ed17b9f23f0a21ee5948ecaa77680a3646174613a2c7b226d7367223a2246696e697368656420636f6d6d6f6e202d2031227d8360306ca0d9cec3b90279e705e556df1e81d112122dffc624c62f1db63b68df60f197d876a07ca0bc46178062fa88c2c040a8cd5c20617edec09ab1d5148a60eeb0b660f902",
"new_txn_trie_node_byte": "0xf8891584693d4ca88254de948943545177806ed17b9f23f0a21ee5948ecaa77680a3646174613a2c7b226d7367223a2246696e697368656420636f6d6d6f6e202d2031227d8360306ca0d9cec3b90279e705e556df1e81d112122dffc624c62f1db63b68df60f197d876a07ca0bc46178062fa88c2c040a8cd5c20617edec09ab1d5148a60eeb0b660f902",
"new_receipt_trie_node_byte": "0xf9010801825438b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
"gas_used": 21560
}
Expand Down Expand Up @@ -633,7 +632,6 @@
},
"meta": {
"byte_code": "0xf88916845ecdefb98254de948943545177806ed17b9f23f0a21ee5948ecaa77680a3646174613a2c7b226d7367223a2246696e697368656420636f6d6d6f6e202d2032227d8360306ca00798b214fc83c700c32f77f88883450fc113756160353084300b6ddfe55b5d25a043f37de26b0018318c792b0e4333ef5c1e0ff6949502f447095503e46d91da6f",
"new_txn_trie_node_byte": "0xf88916845ecdefb98254de948943545177806ed17b9f23f0a21ee5948ecaa77680a3646174613a2c7b226d7367223a2246696e697368656420636f6d6d6f6e202d2032227d8360306ca00798b214fc83c700c32f77f88883450fc113756160353084300b6ddfe55b5d25a043f37de26b0018318c792b0e4333ef5c1e0ff6949502f447095503e46d91da6f",
"new_receipt_trie_node_byte": "0xf9010801825438b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
"gas_used": 21560
}
Expand Down Expand Up @@ -955,7 +953,6 @@
},
"meta": {
"byte_code": "0xf87217845a697a6e82e3998080a06014600c60003960146000f360005b60010180405060405a11630000000257008360306ba0e89268b221aafe24e18f58fb0e672e7fccfd0934555c351ada818a56b3c31ef6a06c70c501108099507aed5f93ab6157a05c4009a5e2c1193aa6f2ca1288bc60f2",
"new_txn_trie_node_byte": "0xf87217845a697a6e82e3998080a06014600c60003960146000f360005b60010180405060405a11630000000257008360306ba0e89268b221aafe24e18f58fb0e672e7fccfd0934555c351ada818a56b3c31ef6a06c70c501108099507aed5f93ab6157a05c4009a5e2c1193aa6f2ca1288bc60f2",
"new_receipt_trie_node_byte": "0xf901080182e06eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
"gas_used": 57454
}
Expand All @@ -974,7 +971,6 @@
},
"meta": {
"byte_code": "0xf86718845a697a6e830186a0942a3365c575a5fc8fd2842b82d29f8035e7f71cec80808360306ca0c8dc3eed1dd3970a23d77e794820bd9453d5d59693cf39ca567c2ce1f371d83aa07d332a975c4de8ea6be24d42b555b18924b95d9689f0ad1aa00cff44828a509f",
"new_txn_trie_node_byte": "0xf86718845a697a6e830186a0942a3365c575a5fc8fd2842b82d29f8035e7f71cec80808360306ca0c8dc3eed1dd3970a23d77e794820bd9453d5d59693cf39ca567c2ce1f371d83aa07d332a975c4de8ea6be24d42b555b18924b95d9689f0ad1aa00cff44828a509f",
"new_receipt_trie_node_byte": "0xf9010901830266f3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
"gas_used": 99973
}
Expand All @@ -993,7 +989,6 @@
},
"meta": {
"byte_code": "0xf86719845a697a6e830186a0942a3365c575a5fc8fd2842b82d29f8035e7f71cec80808360306ca079739a2467e1939f39cfd6f1294a52bfd2072751abc398fdcfbb65154fcb78baa05bdc0e65c3135382b59df16fa87c856501749b2a1677170115dbb8f0d6c6d8ea",
"new_txn_trie_node_byte": "0xf86719845a697a6e830186a0942a3365c575a5fc8fd2842b82d29f8035e7f71cec80808360306ca079739a2467e1939f39cfd6f1294a52bfd2072751abc398fdcfbb65154fcb78baa05bdc0e65c3135382b59df16fa87c856501749b2a1677170115dbb8f0d6c6d8ea",
"new_receipt_trie_node_byte": "0xf90109018303ed78b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
"gas_used": 99973
}
Expand Down Expand Up @@ -1292,4 +1287,4 @@
"checkpoint_state_trie_root": "0xfa446f2a9bf579b0ea805b88e3ee2acf601573f6ff48baaa8880915613aec508"
}
}
]
]
Loading