Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: paradigmxyz/reth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 79261b4c7facf7e5d5560d6a605ef630e96314f1
Choose a base ref
..
head repository: paradigmxyz/reth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a1560e08b89615782101461cd2e907a5d8568c23
Choose a head ref
Showing with 3,154 additions and 3,243 deletions.
  1. +45 −20 Cargo.lock
  2. +5 −5 Cargo.toml
  3. +1 −1 bin/reth-bench/src/bench/new_payload_fcu.rs
  4. +1 −1 bin/reth-bench/src/bench/new_payload_only.rs
  5. +6 −10 bin/reth/src/commands/debug_cmd/build_block.rs
  6. +2 −2 book/cli/reth/node.md
  7. +6 −31 crates/blockchain-tree-api/src/error.rs
  8. +3 −7 crates/blockchain-tree/src/blockchain_tree.rs
  9. +1 −1 crates/blockchain-tree/src/state.rs
  10. +1 −1 crates/chain-state/src/in_memory.rs
  11. +2 −0 crates/chain-state/src/lib.rs
  12. +29 −0 crates/chain-state/src/noop.rs
  13. +13 −1 crates/chainspec/src/spec.rs
  14. +1 −1 crates/consensus/beacon/src/engine/mod.rs
  15. +1 −1 crates/consensus/common/src/validation.rs
  16. +6 −7 crates/engine/local/src/miner.rs
  17. +1 −0 crates/engine/tree/Cargo.toml
  18. +5 −5 crates/engine/tree/src/tree/mod.rs
  19. +226 −69 crates/engine/tree/src/tree/root.rs
  20. +4 −4 crates/ethereum/consensus/src/lib.rs
  21. +2 −2 crates/ethereum/evm/src/execute.rs
  22. +1 −1 crates/ethereum/evm/src/lib.rs
  23. +1 −2 crates/ethereum/node/Cargo.toml
  24. +11 −30 crates/ethereum/node/src/node.rs
  25. +2 −1 crates/ethereum/payload/Cargo.toml
  26. +26 −1 crates/ethereum/payload/src/config.rs
  27. +16 −35 crates/ethereum/payload/src/lib.rs
  28. +24 −5 crates/ethereum/primitives/Cargo.toml
  29. +3 −0 crates/ethereum/primitives/src/lib.rs
  30. +574 −0 crates/ethereum/primitives/src/transaction.rs
  31. +3 −0 crates/evm/Cargo.toml
  32. +7 −4 crates/evm/execution-types/src/chain.rs
  33. +2 −0 crates/evm/src/lib.rs
  34. +2 −8 crates/evm/src/system_calls/mod.rs
  35. +20 −3 crates/evm/src/test_utils.rs
  36. +1 −1 crates/exex/exex/src/backfill/job.rs
  37. +5 −1 crates/net/eth-wire-types/src/message.rs
  38. +6 −8 crates/net/eth-wire-types/src/primitives.rs
  39. +16 −16 crates/net/eth-wire-types/src/transactions.rs
  40. +3 −3 crates/net/eth-wire/tests/pooled_transactions.rs
  41. +1 −1 crates/net/network-api/src/events.rs
  42. +12 −1 crates/net/network/src/config.rs
  43. +7 −10 crates/net/network/src/eth_requests.rs
  44. +25 −1 crates/net/network/src/manager.rs
  45. +2 −2 crates/net/network/src/message.rs
  46. +4 −13 crates/net/network/src/test_utils/testnet.rs
  47. +7 −7 crates/net/network/src/transactions/fetcher.rs
  48. +1 −1 crates/net/network/src/transactions/validation.rs
  49. +4 −10 crates/node/builder/src/builder/mod.rs
  50. +3 −3 crates/node/builder/src/rpc.rs
  51. +7 −7 crates/node/core/src/args/payload_builder.rs
  52. +3 −3 crates/node/core/src/args/txpool.rs
  53. +2 −2 crates/node/core/src/cli/config.rs
  54. +4 −2 crates/optimism/bin/src/main.rs
  55. +1 −0 crates/optimism/chainspec/Cargo.toml
  56. +6 −41 crates/optimism/chainspec/src/lib.rs
  57. +1 −1 crates/optimism/cli/src/ovm_file_codec.rs
  58. +19 −6 crates/optimism/evm/src/l1.rs
  59. +4 −3 crates/optimism/evm/src/lib.rs
  60. +21 −19 crates/optimism/node/Cargo.toml
  61. +37 −23 crates/optimism/node/src/node.rs
  62. +29 −15 crates/optimism/node/src/txpool.rs
  63. +3 −2 crates/optimism/node/tests/it/builder.rs
  64. +1 −0 crates/optimism/payload/src/builder.rs
  65. +2 −2 crates/optimism/payload/src/payload.rs
  66. +8 −3 crates/optimism/primitives/Cargo.toml
  67. +4 −1 crates/optimism/primitives/src/lib.rs
  68. +299 −0 crates/optimism/primitives/src/receipt.rs
  69. +1 −198 crates/optimism/primitives/src/transaction/mod.rs
  70. +25 −40 crates/optimism/primitives/src/transaction/signed.rs
  71. +1 −1 crates/optimism/rpc/src/eth/pending_block.rs
  72. +3 −3 crates/payload/basic/Cargo.toml
  73. +1 −13 crates/payload/basic/src/lib.rs
  74. +4 −4 crates/payload/primitives/src/traits.rs
  75. +20 −2 crates/primitives-traits/Cargo.toml
  76. +2 −3 crates/primitives-traits/src/block/body.rs
  77. +3 −0 crates/primitives-traits/src/constants/mod.rs
  78. +251 −0 crates/primitives-traits/src/crypto.rs
  79. +8 −0 crates/primitives-traits/src/header/sealed.rs
  80. +20 −1 crates/primitives-traits/src/lib.rs
  81. +4 −7 crates/primitives-traits/src/node.rs
  82. +58 −2 crates/primitives-traits/src/size.rs
  83. +1 −0 crates/primitives-traits/src/transaction/mod.rs
  84. +4 −0 crates/primitives-traits/src/transaction/signature.rs
  85. +46 −3 crates/primitives-traits/src/transaction/signed.rs
  86. +16 −9 crates/primitives/Cargo.toml
  87. +71 −55 crates/primitives/src/block.rs
  88. +3 −5 crates/primitives/src/lib.rs
  89. +1 −1 crates/primitives/src/proofs.rs
  90. +0 −1 crates/primitives/src/receipt.rs
  91. +105 −93 crates/primitives/src/transaction/mod.rs
  92. +20 −685 crates/primitives/src/transaction/pooled.rs
  93. +0 −247 crates/primitives/src/transaction/sidecar.rs
  94. +3 −70 crates/primitives/src/transaction/signature.rs
  95. +1 −199 crates/primitives/src/transaction/util.rs
  96. +9 −9 crates/rpc/rpc-builder/src/lib.rs
  97. +2 −1 crates/rpc/rpc-engine-api/tests/it/payload.rs
  98. +1 −13 crates/rpc/rpc-eth-api/src/helpers/block.rs
  99. +2 −7 crates/rpc/rpc-eth-api/src/helpers/call.rs
  100. +1 −0 crates/rpc/rpc-eth-api/src/helpers/pending_block.rs
  101. +2 −3 crates/rpc/rpc-eth-types/src/simulate.rs
  102. +3 −11 crates/rpc/rpc-types-compat/src/block.rs
  103. +41 −59 crates/rpc/rpc-types-compat/src/engine/payload.rs
  104. +0 −1 crates/rpc/rpc/Cargo.toml
  105. +6 −15 crates/rpc/rpc/src/eth/bundle.rs
  106. +3 −4 crates/rpc/rpc/src/eth/helpers/transaction.rs
  107. +1 −2 crates/rpc/rpc/src/validation.rs
  108. +1 −1 crates/stages/stages/src/stages/execution.rs
  109. +3 −2 crates/stages/stages/src/stages/mod.rs
  110. +2 −2 crates/stages/stages/src/stages/sender_recovery.rs
  111. +2 −1 crates/stages/stages/src/stages/tx_lookup.rs
  112. +10 −10 crates/stages/types/Cargo.toml
  113. +8 −0 crates/static-file/types/src/segment.rs
  114. +3 −1 crates/storage/codecs/derive/src/compact/flags.rs
  115. +12 −4 crates/storage/codecs/derive/src/compact/generator.rs
  116. +14 −10 crates/storage/codecs/derive/src/compact/mod.rs
  117. +3 −2 crates/storage/codecs/derive/src/compact/structs.rs
  118. +58 −2 crates/storage/codecs/src/alloy/transaction/optimism.rs
  119. +30 −1 crates/storage/codecs/src/lib.rs
  120. +31 −26 crates/storage/provider/src/providers/blockchain_provider.rs
  121. +54 −49 crates/storage/provider/src/providers/consistent.rs
  122. +18 −13 crates/storage/provider/src/providers/database/mod.rs
  123. +32 −26 crates/storage/provider/src/providers/database/provider.rs
  124. +16 −12 crates/storage/provider/src/providers/mod.rs
  125. +15 −11 crates/storage/provider/src/providers/static_file/manager.rs
  126. +25 −12 crates/storage/provider/src/providers/static_file/mod.rs
  127. +14 −10 crates/storage/provider/src/test_utils/mock.rs
  128. +7 −565 crates/storage/provider/src/test_utils/noop.rs
  129. +1 −1 crates/storage/storage-api/src/account.rs
  130. +4 −25 crates/storage/storage-api/src/block.rs
  131. +11 −0 crates/storage/storage-api/src/block_indices.rs
  132. +1 −1 crates/storage/storage-api/src/chain_info.rs
  133. +1 −2 crates/storage/storage-api/src/header.rs
  134. +1 −1 crates/storage/storage-api/src/history.rs
  135. +6 −0 crates/storage/storage-api/src/lib.rs
  136. +18 −65 crates/storage/storage-api/src/noop.rs
  137. +23 −0 crates/storage/storage-api/src/ommers.rs
  138. +1 −1 crates/storage/storage-api/src/primitives.rs
  139. +1 −1 crates/storage/storage-api/src/state.rs
  140. +1 −1 crates/storage/storage-api/src/storage.rs
  141. +3 −3 crates/tracing/src/layers.rs
  142. +28 −18 crates/transaction-pool/src/maintain.rs
  143. +37 −1 crates/transaction-pool/src/pool/txpool.rs
  144. +159 −31 crates/transaction-pool/src/test_utils/mock.rs
  145. +21 −16 crates/transaction-pool/src/traits.rs
  146. +29 −15 crates/transaction-pool/src/validate/eth.rs
  147. +12 −2 crates/transaction-pool/src/validate/mod.rs
  148. +6 −1 crates/transaction-pool/src/validate/task.rs
  149. +5 −8 crates/trie/db/src/proof.rs
  150. +34 −17 crates/trie/parallel/src/proof.rs
  151. +3 −2 crates/trie/sparse/src/state.rs
  152. +3 −2 crates/trie/trie/src/proof/mod.rs
  153. +3 −3 crates/trie/trie/src/witness.rs
  154. +35 −25 examples/beacon-api-sidecar-fetcher/src/mined_sidecar.rs
  155. +2 −0 examples/bsc-p2p/src/main.rs
  156. +1 −2 examples/custom-engine-types/src/main.rs
  157. +0 −1 examples/custom-payload-builder/Cargo.toml
  158. +2 −4 examples/custom-payload-builder/src/main.rs
65 changes: 45 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -477,11 +477,11 @@ alloy-transport-ipc = { version = "0.8.0", default-features = false }
alloy-transport-ws = { version = "0.8.0", default-features = false }

# op
op-alloy-rpc-types = "0.8.0"
op-alloy-rpc-types-engine = "0.8.0"
op-alloy-rpc-jsonrpsee = "0.8.0"
op-alloy-network = "0.8.0"
op-alloy-consensus = "0.8.0"
op-alloy-rpc-types = "0.8.2"
op-alloy-rpc-types-engine = "0.8.2"
op-alloy-rpc-jsonrpsee = "0.8.2"
op-alloy-network = "0.8.2"
op-alloy-consensus = "0.8.2"

# misc
aquamarine = "0.6"
2 changes: 1 addition & 1 deletion bin/reth-bench/src/bench/new_payload_fcu.rs
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ impl Command {
let block_number = block.header.number;

let versioned_hashes: Vec<B256> =
block.body.blob_versioned_hashes().into_iter().copied().collect();
block.body.blob_versioned_hashes_iter().copied().collect();
let parent_beacon_block_root = block.parent_beacon_block_root;
let payload = block_to_payload(block);

2 changes: 1 addition & 1 deletion bin/reth-bench/src/bench/new_payload_only.rs
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ impl Command {
let gas_used = block.gas_used;

let versioned_hashes: Vec<B256> =
block.body.blob_versioned_hashes().into_iter().copied().collect();
block.body.blob_versioned_hashes_iter().copied().collect();
let parent_beacon_block_root = block.parent_beacon_block_root;
let payload = block_to_payload(block);

16 changes: 6 additions & 10 deletions bin/reth/src/commands/debug_cmd/build_block.rs
Original file line number Diff line number Diff line change
@@ -29,8 +29,7 @@ use reth_fs_util as fs;
use reth_node_api::{BlockTy, EngineApiMessageVersion, PayloadBuilderAttributes};
use reth_node_ethereum::{EthEvmConfig, EthExecutorProvider};
use reth_primitives::{
BlobTransaction, BlockExt, PooledTransactionsElement, SealedBlockFor, SealedBlockWithSenders,
SealedHeader, Transaction, TransactionSigned,
BlockExt, SealedBlockFor, SealedBlockWithSenders, SealedHeader, Transaction, TransactionSigned,
};
use reth_provider::{
providers::{BlockchainProvider, ProviderNodeTypes},
@@ -190,14 +189,11 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
let sidecar: BlobTransactionSidecar =
blobs_bundle.pop_sidecar(blob_versioned_hashes.len());

// first construct the tx, calculating the length of the tx with sidecar before
// insertion
let tx = BlobTransaction::try_from_signed(
transaction.as_ref().clone(),
sidecar.clone(),
)
.expect("should not fail to convert blob tx if it is already eip4844");
let pooled = PooledTransactionsElement::BlobTransaction(tx);
let pooled = transaction
.clone()
.into_signed()
.try_into_pooled_eip4844(sidecar.clone())
.expect("should not fail to convert blob tx if it is already eip4844");
let encoded_length = pooled.encode_2718_len();

// insert the blob into the store
4 changes: 2 additions & 2 deletions book/cli/reth/node.md
Original file line number Diff line number Diff line change
@@ -458,7 +458,7 @@ TxPool:
[default: 7]
--txpool.gas-limit <GAS_LIMIT>
--txpool.gas-limit <ENFORCED_GAS_LIMIT>
The default enforced gas limit for transactions entering the pool
[default: 30000000]
@@ -514,7 +514,7 @@ Builder:
[default: reth/<VERSION>/<OS>]
--builder.gaslimit <GAS_LIMIT>
Target gas ceiling for built blocks
Target gas limit for built blocks
[default: 30000000]
Loading