Merge remote-tracking branch 'origin/main' into joshie/headerext

paradigmxyz · Sep 25, 2024 · 9def147 · 9def147
2 parents 70837bc + 1e0a35e
commit 9def147
Show file tree

Hide file tree

Showing 157 changed files with 1,709 additions and 1,090 deletions.
diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml
@@ -264,3 +264,9 @@ jobs:
         with:
           webhook-url: ${{ secrets.RETH_ALERTS_WEBHOOK }}
           content: "Failed run: https://github.com/paradigmxyz/reth/actions/runs/${{ github.run_id }}"
+      - name: Slack Webhook Action
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_COLOR: ${{ job.status }}
+          SLACK_MESSAGE: "Failed run: https://github.com/paradigmxyz/reth/actions/runs/${{ github.run_id }}"
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
@@ -68,6 +68,7 @@ reth-prune.workspace = true
 # crypto
 alloy-rlp.workspace = true
 alloy-rpc-types = { workspace = true, features = ["engine"] }
+alloy-consensus.workspace = true
 
 # tracing
 tracing.workspace = true

diff --git a/bin/reth/src/commands/debug_cmd/build_block.rs b/bin/reth/src/commands/debug_cmd/build_block.rs
@@ -1,4 +1,5 @@
 //! Command for debugging block building.
+use alloy_consensus::TxEip4844;
 use alloy_rlp::Decodable;
 use alloy_rpc_types::engine::{BlobsBundleV1, PayloadAttributes};
 use clap::Parser;
@@ -25,7 +26,7 @@ use reth_payload_builder::database::CachedReads;
 use reth_primitives::{
     revm_primitives::KzgSettings, Address, BlobTransaction, BlobTransactionSidecar, Bytes,
     PooledTransactionsElement, SealedBlock, SealedBlockWithSenders, Transaction, TransactionSigned,
-    TxEip4844, B256, U256,
+    B256, U256,
 };
 use reth_provider::{
     providers::BlockchainProvider, BlockHashReader, BlockReader, BlockWriter, ChainSpecProvider,
@@ -226,7 +227,6 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
                 best_block.hash(),
                 payload_attrs,
             )?,
-            provider_factory.chain_spec(),
         );
 
         let args = BuildArguments::new(

diff --git a/bin/reth/src/commands/debug_cmd/replay_engine.rs b/bin/reth/src/commands/debug_cmd/replay_engine.rs
@@ -122,7 +122,6 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
             NoopTransactionPool::default(),
             ctx.task_executor.clone(),
             BasicPayloadJobGeneratorConfig::default(),
-            provider_factory.chain_spec(),
             payload_builder,
         );
 

diff --git a/book/run/sync-op-mainnet.md b/book/run/sync-op-mainnet.md
@@ -2,10 +2,10 @@
 
 To sync OP mainnet, bedrock state needs to be imported as a starting point. There are currently two ways:
 
-* Minimal bootstrap: only state snapshot at Bedrock block is imported without any OVM historical data.
-* Full bootstrap: state, blocks and receipts are imported.
+* Minimal bootstrap **(recommended)**: only state snapshot at Bedrock block is imported without any OVM historical data.
+* Full bootstrap **(not recommended)**: state, blocks and receipts are imported. *Not recommended for now: [storage consistency issue](https://github.com/paradigmxyz/reth/pull/11099) tldr: sudden crash may break the node
 
-## Minimal bootstrap
+## Minimal bootstrap (recommended)
 
 **The state snapshot at Bedrock block is required.** It can be exported from [op-geth](https://github.com/testinprod-io/op-erigon/blob/pcw109550/bedrock-db-migration/bedrock-migration.md#export-state) (**.jsonl**) or downloaded directly from [here](https://mega.nz/file/GdZ1xbAT#a9cBv3AqzsTGXYgX7nZc_3fl--tcBmOAIwIA5ND6kwc).
 
@@ -16,7 +16,9 @@ $ op-reth node --chain optimism --datadir op-mainnet --debug.tip 0x098f87b75c8b8
 ```
 
 
-## Full bootstrap
+## Full bootstrap (not recommended)
+
+**Not recommended for now**: [storage consistency issue](https://github.com/paradigmxyz/reth/pull/11099) tldr: sudden crash may break the node.
 
 ### Import state 
 

diff --git a/crates/blockchain-tree-api/src/error.rs b/crates/blockchain-tree-api/src/error.rs
@@ -333,6 +333,9 @@ pub enum InsertBlockErrorKindTwo {
     /// Provider error.
     #[error(transparent)]
     Provider(#[from] ProviderError),
+    /// Other errors.
+    #[error(transparent)]
+    Other(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
 }
 
 impl InsertBlockErrorKindTwo {
@@ -365,6 +368,7 @@ impl InsertBlockErrorKindTwo {
                 }
             }
             Self::Provider(err) => Err(InsertBlockFatalError::Provider(err)),
+            Self::Other(err) => Err(InternalBlockExecutionError::Other(err).into()),
         }
     }
 }

diff --git a/crates/blockchain-tree/Cargo.toml b/crates/blockchain-tree/Cargo.toml
@@ -59,6 +59,7 @@ reth-evm-ethereum.workspace = true
 parking_lot.workspace = true
 assert_matches.workspace = true
 alloy-genesis.workspace = true
+alloy-consensus.workspace = true
 
 [features]
 test-utils = []

diff --git a/crates/blockchain-tree/src/blockchain_tree.rs b/crates/blockchain-tree/src/blockchain_tree.rs
@@ -1375,6 +1375,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
+    use alloy_consensus::TxEip1559;
     use alloy_genesis::{Genesis, GenesisAccount};
     use alloy_primitives::{keccak256, Address, Sealable, B256};
     use assert_matches::assert_matches;
@@ -1390,7 +1391,7 @@ mod tests {
         proofs::{calculate_receipt_root, calculate_transaction_root},
         revm_primitives::AccountInfo,
         Account, BlockBody, Header, Signature, Transaction, TransactionSigned,
-        TransactionSignedEcRecovered, TxEip1559, Withdrawals,
+        TransactionSignedEcRecovered, Withdrawals,
     };
     use reth_provider::{
         test_utils::{