feat: Remove duplicate txn bytestring in parsing (#477)

0xPolygonZero · Aug 15, 2024 · a53a34c · a53a34c
1 parent cdd0824
commit a53a34c
Show file tree

Hide file tree

Showing 9 changed files with 21,226 additions and 2,220 deletions.
diff --git a/trace_decoder/benches/block_input.json b/trace_decoder/benches/block_input.json
diff --git a/trace_decoder/src/lib.rs b/trace_decoder/src/lib.rs
@@ -193,16 +193,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!

diff --git a/trace_decoder/tests/data/witnesses/zero_jerigon/b19807080_main.json b/trace_decoder/tests/data/witnesses/zero_jerigon/b19807080_main.json
diff --git a/trace_decoder/tests/data/witnesses/zero_jerigon/b20240052_main.json b/trace_decoder/tests/data/witnesses/zero_jerigon/b20240052_main.json
diff --git a/trace_decoder/tests/data/witnesses/zero_jerigon/b20240058_main.json b/trace_decoder/tests/data/witnesses/zero_jerigon/b20240058_main.json
diff --git a/trace_decoder/tests/data/witnesses/zero_jerigon/b4_dev.json b/trace_decoder/tests/data/witnesses/zero_jerigon/b4_dev.json
diff --git a/zero_bin/rpc/src/native/txn.rs b/zero_bin/rpc/src/native/txn.rs
@@ -70,7 +70,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,
     };

diff --git a/zero_bin/tools/artifacts/witness_b19807080.json b/zero_bin/tools/artifacts/witness_b19807080.json
diff --git a/zero_bin/tools/artifacts/witness_b3_b6.json b/zero_bin/tools/artifacts/witness_b3_b6.json
@@ -317,7 +317,6 @@
           },
           "meta": {
             "byte_code": "0xf8891584693d4ca88254de948943545177806ed17b9f23f0a21ee5948ecaa77680a3646174613a2c7b226d7367223a2246696e697368656420636f6d6d6f6e202d2031227d8360306ca0d9cec3b90279e705e556df1e81d112122dffc624c62f1db63b68df60f197d876a07ca0bc46178062fa88c2c040a8cd5c20617edec09ab1d5148a60eeb0b660f902",
-            "new_txn_trie_node_byte": "0xf8891584693d4ca88254de948943545177806ed17b9f23f0a21ee5948ecaa77680a3646174613a2c7b226d7367223a2246696e697368656420636f6d6d6f6e202d2031227d8360306ca0d9cec3b90279e705e556df1e81d112122dffc624c62f1db63b68df60f197d876a07ca0bc46178062fa88c2c040a8cd5c20617edec09ab1d5148a60eeb0b660f902",
             "new_receipt_trie_node_byte": "0xf9010801825438b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
             "gas_used": 21560
           }
@@ -633,7 +632,6 @@
           },
           "meta": {
             "byte_code": "0xf88916845ecdefb98254de948943545177806ed17b9f23f0a21ee5948ecaa77680a3646174613a2c7b226d7367223a2246696e697368656420636f6d6d6f6e202d2032227d8360306ca00798b214fc83c700c32f77f88883450fc113756160353084300b6ddfe55b5d25a043f37de26b0018318c792b0e4333ef5c1e0ff6949502f447095503e46d91da6f",
-            "new_txn_trie_node_byte": "0xf88916845ecdefb98254de948943545177806ed17b9f23f0a21ee5948ecaa77680a3646174613a2c7b226d7367223a2246696e697368656420636f6d6d6f6e202d2032227d8360306ca00798b214fc83c700c32f77f88883450fc113756160353084300b6ddfe55b5d25a043f37de26b0018318c792b0e4333ef5c1e0ff6949502f447095503e46d91da6f",
             "new_receipt_trie_node_byte": "0xf9010801825438b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
             "gas_used": 21560
           }
@@ -955,7 +953,6 @@
           },
           "meta": {
             "byte_code": "0xf87217845a697a6e82e3998080a06014600c60003960146000f360005b60010180405060405a11630000000257008360306ba0e89268b221aafe24e18f58fb0e672e7fccfd0934555c351ada818a56b3c31ef6a06c70c501108099507aed5f93ab6157a05c4009a5e2c1193aa6f2ca1288bc60f2",
-            "new_txn_trie_node_byte": "0xf87217845a697a6e82e3998080a06014600c60003960146000f360005b60010180405060405a11630000000257008360306ba0e89268b221aafe24e18f58fb0e672e7fccfd0934555c351ada818a56b3c31ef6a06c70c501108099507aed5f93ab6157a05c4009a5e2c1193aa6f2ca1288bc60f2",
             "new_receipt_trie_node_byte": "0xf901080182e06eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
             "gas_used": 57454
           }
@@ -974,7 +971,6 @@
           },
           "meta": {
             "byte_code": "0xf86718845a697a6e830186a0942a3365c575a5fc8fd2842b82d29f8035e7f71cec80808360306ca0c8dc3eed1dd3970a23d77e794820bd9453d5d59693cf39ca567c2ce1f371d83aa07d332a975c4de8ea6be24d42b555b18924b95d9689f0ad1aa00cff44828a509f",
-            "new_txn_trie_node_byte": "0xf86718845a697a6e830186a0942a3365c575a5fc8fd2842b82d29f8035e7f71cec80808360306ca0c8dc3eed1dd3970a23d77e794820bd9453d5d59693cf39ca567c2ce1f371d83aa07d332a975c4de8ea6be24d42b555b18924b95d9689f0ad1aa00cff44828a509f",
             "new_receipt_trie_node_byte": "0xf9010901830266f3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
             "gas_used": 99973
           }
@@ -993,7 +989,6 @@
           },
           "meta": {
             "byte_code": "0xf86719845a697a6e830186a0942a3365c575a5fc8fd2842b82d29f8035e7f71cec80808360306ca079739a2467e1939f39cfd6f1294a52bfd2072751abc398fdcfbb65154fcb78baa05bdc0e65c3135382b59df16fa87c856501749b2a1677170115dbb8f0d6c6d8ea",
-            "new_txn_trie_node_byte": "0xf86719845a697a6e830186a0942a3365c575a5fc8fd2842b82d29f8035e7f71cec80808360306ca079739a2467e1939f39cfd6f1294a52bfd2072751abc398fdcfbb65154fcb78baa05bdc0e65c3135382b59df16fa87c856501749b2a1677170115dbb8f0d6c6d8ea",
             "new_receipt_trie_node_byte": "0xf90109018303ed78b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
             "gas_used": 99973
           }
@@ -1292,4 +1287,4 @@
       "checkpoint_state_trie_root": "0xfa446f2a9bf579b0ea805b88e3ee2acf601573f6ff48baaa8880915613aec508"
     }
   }
-]
+]