Bump to reth 1.6.0 and add isthmus migration

Author: 0xalex88

Cargo.lock

@@ -19,64 +19,64 @@ fraxtal-node = { path = "crates/node" }
 fraxtal-evm = { path = "crates/evm" }
 fraxtal-op-evm = { path = "crates/op-evm" }
 
-reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
-reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
 
 # eth
-alloy-chains = { version = "0.2.0", default-features = false }
-alloy-consensus = { version = "1.0.13", default-features = false }
-alloy-eips = { version = "1.0.13", default-features = false }
-alloy-evm = { version = "0.12", default-features = false }
-alloy-primitives = { version = "1.2.0", default-features = false, features = ["map-foldhash"] }
+alloy-chains = { version = "0.2.5", default-features = false }
+alloy-consensus = { version = "1.0.23", default-features = false }
+alloy-eips = { version = "1.0.23", default-features = false }
+alloy-evm = { version = "0.15", default-features = false }
+alloy-primitives = { version = "1.3.0", default-features = false, features = ["map-foldhash"] }
 alloy-rlp = { version = "0.3.10", default-features = false, features = ["core-net"] }
-alloy-rpc-types-debug = { version = "1.0.13", default-features = false }
-alloy-rpc-types-eth = { version = "1.0.13", default-features = false }
-alloy-rpc-types-engine = { version = "1.0.13", default-features = false }
+alloy-rpc-types-debug = { version = "1.0.23", default-features = false }
+alloy-rpc-types-eth = { version = "1.0.23", default-features = false }
+alloy-rpc-types-engine = { version = "1.0.23", default-features = false }
 
 # op
-alloy-op-evm = { version = "0.12", default-features = false }
+alloy-op-evm = { version = "0.15", default-features = false }
 alloy-op-hardforks = "0.2.2"
-op-alloy-consensus = { version = "0.18.7", default-features = false }
-op-alloy-rpc-types = { version = "0.18.7", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.18.7", default-features = false }
+op-alloy-consensus = { version = "0.18.12", default-features = false }
+op-alloy-rpc-types = { version = "0.18.12", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.18.12", default-features = false }
 
 # revm
-revm = { version = "26.0.1", default-features = false }
+revm = { version = "27.0.3", default-features = false }
 revm-primitives = { version = "20.0.0", default-features = false }
-op-revm = { version = "7.0.1", default-features = false }
+op-revm = { version = "8.0.3", default-features = false }
 
 # misc
-serde_json = { version = "1.0", default-features = false, features = [
-    "alloc",
-] }
+serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 auto_impl = "1"
 clap = { version = "4", features = ["derive", "env"] }
 tracing = { version = "0.1.0", default-features = false }

Cargo.toml

@@ -12,7 +12,6 @@ use op_revm::{OpSpecId, OpTransaction};
 use reth_chainspec::EthChainSpec;
 use reth_evm::{ConfigureEvm, EvmEnv};
 use reth_optimism_chainspec::OpChainSpec;
-use reth_optimism_consensus::next_block_base_fee;
 use reth_optimism_evm::{
     revm_spec, revm_spec_by_timestamp_after_bedrock, OpBlockAssembler, OpNextBlockEnvAttributes,
     OpRethReceiptBuilder,
@@ -81,7 +80,7 @@ impl<ChainSpec: OpHardforks, N: NodePrimitives, R> FraxtalEvmConfig<ChainSpec, N
 
 impl<ChainSpec, N, R> ConfigureEvm for FraxtalEvmConfig<ChainSpec, N, R>
 where
-    ChainSpec: EthChainSpec + OpHardforks,
+    ChainSpec: EthChainSpec<Header = Header> + OpHardforks,
     N: NodePrimitives<
         Receipt = R::Receipt,
         SignedTx = R::Transaction,
@@ -106,7 +105,6 @@ where
     fn block_assembler(&self) -> &Self::BlockAssembler {
         &self.block_assembler
     }
-
     fn evm_env(&self, header: &Header) -> EvmEnv<OpSpecId> {
         let spec = revm_spec(self.chain_spec(), header);
 
@@ -119,7 +117,7 @@ where
             .is_enabled_in(SpecId::CANCUN)
             .then_some(BlobExcessGasAndPrice {
                 excess_blob_gas: 0,
-                blob_gasprice: 0,
+                blob_gasprice: 1,
             });
 
         let block_env = BlockEnv {
@@ -165,7 +163,7 @@ where
             .is_enabled_in(SpecId::CANCUN)
             .then_some(BlobExcessGasAndPrice {
                 excess_blob_gas: 0,
-                blob_gasprice: 0,
+                blob_gasprice: 1,
             });
 
         let block_env = BlockEnv {
@@ -176,7 +174,10 @@ where
             prevrandao: Some(attributes.prev_randao),
             gas_limit: attributes.gas_limit,
             // calculate basefee based on parent block's gas usage
-            basefee: next_block_base_fee(self.chain_spec(), parent, attributes.timestamp)?,
+            basefee: self
+                .chain_spec()
+                .next_block_base_fee(parent, attributes.timestamp)
+                .unwrap_or_default(),
             // calculate excess gas based on parent block's blob gas usage
             blob_excess_gas_and_price,
         };

crates/evm/src/lib.rs

@@ -15,6 +15,7 @@ reth-basic-payload-builder.workspace = true
 reth-evm.workspace = true
 reth-node-api.workspace = true
 reth-chainspec.workspace = true
+reth-engine-local.workspace = true
 reth-optimism-evm.workspace = true
 reth-optimism-forks.workspace = true
 reth-optimism-node.workspace = true
@@ -25,6 +26,7 @@ reth-optimism-primitives.workspace = true
 reth-optimism-rpc.workspace = true
 reth-payload-builder.workspace = true
 reth-provider.workspace = true
+reth-rpc-api.workspace = true
 reth-node-builder.workspace = true
 reth-transaction-pool.workspace = true
 reth-trie-db.workspace = true

crates/node/Cargo.toml

@@ -1,7 +1,12 @@
+use std::sync::Arc;
+
 use fraxtal_evm::FraxtalEvmConfig;
 use reth_chainspec::ChainSpecProvider;
+use reth_engine_local::LocalPayloadAttributesBuilder;
 use reth_evm::ConfigureEvm;
-use reth_node_api::{FullNodeComponents, PayloadTypes, PrimitivesTy, TxTy};
+use reth_node_api::{
+    FullNodeComponents, PayloadAttributesBuilder, PayloadTypes, PrimitivesTy, TxTy,
+};
 use reth_node_builder::{
     components::{
         BasicPayloadServiceBuilder, ComponentsBuilder, ExecutorBuilder, PayloadBuilderBuilder,
@@ -19,7 +24,8 @@ use reth_optimism_node::{
         OpPoolBuilder,
     },
     txpool::OpPooledTx,
-    OpEngineApiBuilder, OpEngineTypes, OpFullNodeTypes, OpPayloadAttributes, OpStorage,
+    OpAddOnsBuilder, OpEngineApiBuilder, OpEngineTypes, OpFullNodeTypes, OpPayloadAttributes,
+    OpStorage,
 };
 use reth_optimism_payload_builder::{
     builder::OpPayloadTransactions,
@@ -29,6 +35,7 @@ use reth_optimism_payload_builder::{
 use reth_optimism_primitives::OpPrimitives;
 use reth_optimism_rpc::eth::OpEthApiBuilder;
 use reth_provider::providers::ProviderFactoryBuilder;
+use reth_rpc_api::eth::RpcTypes;
 use reth_transaction_pool::TransactionPool;
 use reth_trie_db::MerklePatriciaTrie;
 
@@ -102,6 +109,17 @@ impl FraxtalNode {
             .consensus(OpConsensusBuilder::default())
     }
 
+    /// Returns [`OpAddOnsBuilder`] with configured arguments.
+    pub fn add_ons_builder<NetworkT: RpcTypes>(&self) -> OpAddOnsBuilder<NetworkT> {
+        OpAddOnsBuilder::default()
+            .with_sequencer(self.args.sequencer.clone())
+            .with_sequencer_headers(self.args.sequencer_headers.clone())
+            .with_da_config(self.da_config.clone())
+            .with_enable_tx_conditional(self.args.enable_tx_conditional)
+            .with_min_suggested_priority_fee(self.args.min_suggested_priority_fee)
+            .with_historical_rpc(self.args.historical_rpc.clone())
+    }
+
     /// Instantiates the [`ProviderFactoryBuilder`] for an opstack node.
     ///
     /// # Open a Providerfactory in read-only mode from a datadir
@@ -162,14 +180,7 @@ where
     }
 
     fn add_ons(&self) -> Self::AddOns {
-        Self::AddOns::builder()
-            .with_sequencer(self.args.sequencer.clone())
-            .with_sequencer_headers(self.args.sequencer_headers.clone())
-            .with_da_config(self.da_config.clone())
-            .with_enable_tx_conditional(self.args.enable_tx_conditional)
-            .with_min_suggested_priority_fee(self.args.min_suggested_priority_fee)
-            .with_historical_rpc(self.args.historical_rpc.clone())
-            .build()
+        self.add_ons_builder().build()
     }
 }
 
@@ -182,6 +193,12 @@ where
     fn rpc_to_primitive_block(rpc_block: Self::RpcBlock) -> reth_node_api::BlockTy<Self> {
         rpc_block.into_consensus()
     }
+
+    fn local_payload_attributes_builder(
+        chain_spec: &Self::ChainSpec,
+    ) -> impl PayloadAttributesBuilder<<Self::Payload as PayloadTypes>::PayloadAttributes> {
+        LocalPayloadAttributesBuilder::new(Arc::new(chain_spec.clone()))
+    }
 }
 
 impl NodeTypes for FraxtalNode {

crates/node/src/node.rs

@@ -28,7 +28,7 @@ where
     if chain_spec.is_holocene_active_at_timestamp(timestamp)
         && !chain_spec.is_holocene_active_at_timestamp(timestamp.saturating_sub(2))
     {
-        info!(target: "evm", "Forcing frax upgrades on Holocne transition");
+        info!(target: "evm", "Forcing frax upgrades on Holocene transition");
 
         let (proxy_migrations, bytecode_migrations, storage_migrations) =
             match chain_spec.chain().id() {

crates/op-evm/src/block/holocene/mod.rs

@@ -0,0 +1,13 @@
+use alloy_primitives::{address, b256, Address, B256};
+
+pub(super) const MAINNET_ORACLES_ADDRESSES: &[Address] = &[
+    address!("0xf750636e1df115e3b334ed06e5b45c375107fc60"),
+    address!("0x1B680F4385f24420D264D78cab7C58365ED3F1FF"),
+];
+
+pub(super) const PROXY_ADDR: Address = address!("fc0000000000000000000000000000000000000a");
+pub(super) const PROXY_ADMIN_ADDR: Address = address!("fc0000000000000000000000000000000000000a");
+pub(super) const PROXY_ADMIN_SLOT: B256 =
+    b256!("b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103");
+pub(super) const PROXY_IMPLEMENTATION_SLOT: B256 =
+    b256!("360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc");