Bump to 1.11.3

Author: 0xalex88

Cargo.lock

@@ -9,7 +9,7 @@ default-members = ["bin/fraxtal-op-reth"]
 resolver = "2"
 
 [workspace.package]
-version = "1.11.2-frax-1.3.0"
+version = "1.11.3-frax-1.3.0"
 edition = "2024"
 rust-version = "1.88"
 
@@ -19,41 +19,41 @@ 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.11.2" }
-reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-storage-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
-reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.2" }
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-storage-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
 
 # reth-optimism crates — from ethereum-optimism/optimism monorepo
-reth-optimism-chainspec = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-reth-optimism-cli = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-reth-optimism-consensus = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-reth-optimism-evm = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-reth-optimism-forks = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-reth-optimism-node = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-reth-optimism-payload-builder = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-reth-optimism-primitives = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-reth-optimism-rpc = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
+reth-optimism-chainspec = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+reth-optimism-cli = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+reth-optimism-consensus = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+reth-optimism-evm = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+reth-optimism-forks = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+reth-optimism-node = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+reth-optimism-payload-builder = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+reth-optimism-primitives = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+reth-optimism-rpc = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
 
 # eth
 alloy-chains = { version = "0.2.30", default-features = false }
@@ -68,11 +68,11 @@ alloy-rpc-types-eth = { version = "1.6.3", default-features = false }
 alloy-rpc-types-engine = { version = "1.6.3", default-features = false }
 
 # op — from ethereum-optimism/optimism monorepo (path deps bundled there)
-alloy-op-evm = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f", default-features = false }
-alloy-op-hardforks = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-op-alloy-consensus = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f", default-features = false }
-op-alloy-rpc-types = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f", default-features = false }
-op-alloy-rpc-types-engine = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f", default-features = false }
+alloy-op-evm = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df", default-features = false }
+alloy-op-hardforks = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+op-alloy-consensus = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df", default-features = false }
+op-alloy-rpc-types = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df", default-features = false }
+op-alloy-rpc-types-engine = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df", default-features = false }
 
 # revm
 revm = { version = "34.0.0", default-features = false }
@@ -90,11 +90,11 @@ derive_more = { version = "2", default-features = false, features = ["full"] }
 
 # Patch crates-io for deps that the optimism repo bundles locally
 [patch.crates-io]
-op-alloy-consensus = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-op-alloy-rpc-types = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-op-alloy-rpc-types-engine = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-alloy-op-evm = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
-alloy-op-hardforks = { git = "https://github.com/ethereum-optimism/optimism", rev = "f67fd6c6930180012e33878c6054f008ed7b548f" }
+op-alloy-consensus = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+op-alloy-rpc-types = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+op-alloy-rpc-types-engine = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+alloy-op-evm = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
+alloy-op-hardforks = { git = "https://github.com/ethereum-optimism/optimism", rev = "7149381de9a8a462609d650834ef18e2d69f74df" }
 
 [profile.dev]
 # https://davidlattimore.github.io/posts/2024/02/04/speeding-up-the-rust-edit-build-run-cycle.html

Cargo.toml

@@ -1,6 +1,6 @@
 use fraxtal::FRAXTAL_MAINNET;
 use fraxtal_hoodi_testnet::FRAXTAL_HOODI_TESTNET;
-use reth_cli::chainspec::{parse_genesis, ChainSpecParser};
+use reth_cli::chainspec::{ChainSpecParser, parse_genesis};
 use reth_optimism_chainspec::OpChainSpec;
 use std::sync::Arc;
 

crates/chainspec/src/lib.rs

@@ -9,29 +9,29 @@ use reth_node_api::{
     PrimitivesTy, TxTy,
 };
 use reth_node_builder::{
+    BuilderContext, DebugNode, Node, NodeAdapter, NodeComponentsBuilder,
     components::{
         BasicPayloadServiceBuilder, ComponentsBuilder, ExecutorBuilder, PayloadBuilderBuilder,
     },
     node::{FullNodeTypes, NodeTypes},
     rpc::BasicEngineValidatorBuilder,
-    BuilderContext, DebugNode, Node, NodeAdapter, NodeComponentsBuilder,
 };
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_evm::OpRethReceiptBuilder;
 use reth_optimism_forks::OpHardforks;
 use reth_optimism_node::{
+    OpAddOnsBuilder, OpEngineApiBuilder, OpEngineTypes, OpFullNodeTypes, OpStorage,
     args::RollupArgs,
     node::{
         OpAddOns, OpConsensusBuilder, OpEngineValidatorBuilder, OpNetworkBuilder, OpNodeTypes,
         OpPoolBuilder,
     },
     txpool::OpPooledTx,
-    OpAddOnsBuilder, OpEngineApiBuilder, OpEngineTypes, OpFullNodeTypes, OpStorage,
 };
 use reth_optimism_payload_builder::{
+    OpAttributes, OpBuiltPayload, OpPayloadPrimitives,
     builder::OpPayloadTransactions,
     config::{OpBuilderConfig, OpDAConfig, OpGasLimitConfig},
-    OpAttributes, OpBuiltPayload, OpPayloadPrimitives,
 };
 use reth_optimism_primitives::OpPrimitives;
 use reth_optimism_rpc::eth::OpEthApiBuilder;
@@ -315,15 +315,15 @@ impl<Node, Pool, Txs, Evm, Attrs> PayloadBuilderBuilder<Node, Pool, Evm>
     for FraxtalPayloadBuilder<Txs>
 where
     Node: FullNodeTypes<
-        Provider: ChainSpecProvider<ChainSpec: OpHardforks>,
-        Types: NodeTypes<
-            Primitives: OpPayloadPrimitives,
-            Payload: PayloadTypes<
-                BuiltPayload = OpBuiltPayload<PrimitivesTy<Node::Types>>,
-                PayloadBuilderAttributes = Attrs,
+            Provider: ChainSpecProvider<ChainSpec: OpHardforks>,
+            Types: NodeTypes<
+                Primitives: OpPayloadPrimitives,
+                Payload: PayloadTypes<
+                    BuiltPayload = OpBuiltPayload<PrimitivesTy<Node::Types>>,
+                    PayloadBuilderAttributes = Attrs,
+                >,
             >,
         >,
-    >,
     Evm: ConfigureEvm<
             Primitives = PrimitivesTy<Node::Types>,
             NextBlockEnvCtx: BuildNextEnv<

crates/node/src/node.rs

@@ -1,6 +1,6 @@
 use alloy_evm::Database;
 use alloy_op_hardforks::OpHardforks;
-use alloy_primitives::{address, b256, hex, Address, Bytes, B256};
+use alloy_primitives::{Address, B256, Bytes, address, b256, hex};
 use revm::{DatabaseCommit, primitives::HashMap, state::Bytecode};
 
 /// The address of the create2 deployer
@@ -11,7 +11,9 @@ const CREATE_2_DEPLOYER_CODEHASH: B256 =
     b256!("0xb0550b5b431e30d38000efb7107aaa0ade03d48a7198a140edda9d27134468b2");
 
 /// The raw bytecode of the create2 deployer contract.
-const CREATE_2_DEPLOYER_BYTECODE: [u8; 1584] = hex!("6080604052600436106100435760003560e01c8063076c37b21461004f578063481286e61461007157806356299481146100ba57806366cfa057146100da57600080fd5b3661004a57005b600080fd5b34801561005b57600080fd5b5061006f61006a366004610327565b6100fa565b005b34801561007d57600080fd5b5061009161008c366004610327565b61014a565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b3480156100c657600080fd5b506100916100d5366004610349565b61015d565b3480156100e657600080fd5b5061006f6100f53660046103ca565b610172565b61014582826040518060200161010f9061031a565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe082820381018352601f90910116604052610183565b505050565b600061015683836102e7565b9392505050565b600061016a8484846102f0565b949350505050565b61017d838383610183565b50505050565b6000834710156101f4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f437265617465323a20696e73756666696369656e742062616c616e636500000060448201526064015b60405180910390fd5b815160000361025f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f437265617465323a2062797465636f6465206c656e677468206973207a65726f60448201526064016101eb565b8282516020840186f5905073ffffffffffffffffffffffffffffffffffffffff8116610156576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601960248201527f437265617465323a204661696c6564206f6e206465706c6f790000000000000060448201526064016101eb565b60006101568383305b6000604051836040820152846020820152828152600b8101905060ff815360559020949350505050565b61014e806104ad83390190565b6000806040838503121561033a57600080fd5b50508035926020909101359150565b60008060006060848603121561035e57600080fd5b8335925060208401359150604084013573ffffffffffffffffffffffffffffffffffffffff8116811461039057600080fd5b809150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000806000606084860312156103df57600080fd5b8335925060208401359150604084013567ffffffffffffffff8082111561040557600080fd5b818601915086601f83011261041957600080fd5b81358181111561042b5761042b61039b565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156104715761047161039b565b8160405282815289602084870101111561048a57600080fd5b826020860160208301376000602084830101528095505050505050925092509256fe608060405234801561001057600080fd5b5061012e806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063249cb3fa14602d575b600080fd5b603c603836600460b1565b604e565b60405190815260200160405180910390f35b60008281526020818152604080832073ffffffffffffffffffffffffffffffffffffffff8516845290915281205460ff16608857600060aa565b7fa2ef4600d742022d532d4747cb3547474667d6f13804902513b2ec01c848f4b45b9392505050565b6000806040838503121560c357600080fd5b82359150602083013573ffffffffffffffffffffffffffffffffffffffff8116811460ed57600080fd5b80915050925092905056fea26469706673582212205ffd4e6cede7d06a5daf93d48d0541fc68189eeb16608c1999a82063b666eb1164736f6c63430008130033a2646970667358221220fdc4a0fe96e3b21c108ca155438d37c9143fb01278a3c1d274948bad89c564ba64736f6c63430008130033");
+const CREATE_2_DEPLOYER_BYTECODE: [u8; 1584] = hex!(
+    "6080604052600436106100435760003560e01c8063076c37b21461004f578063481286e61461007157806356299481146100ba57806366cfa057146100da57600080fd5b3661004a57005b600080fd5b34801561005b57600080fd5b5061006f61006a366004610327565b6100fa565b005b34801561007d57600080fd5b5061009161008c366004610327565b61014a565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b3480156100c657600080fd5b506100916100d5366004610349565b61015d565b3480156100e657600080fd5b5061006f6100f53660046103ca565b610172565b61014582826040518060200161010f9061031a565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe082820381018352601f90910116604052610183565b505050565b600061015683836102e7565b9392505050565b600061016a8484846102f0565b949350505050565b61017d838383610183565b50505050565b6000834710156101f4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f437265617465323a20696e73756666696369656e742062616c616e636500000060448201526064015b60405180910390fd5b815160000361025f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f437265617465323a2062797465636f6465206c656e677468206973207a65726f60448201526064016101eb565b8282516020840186f5905073ffffffffffffffffffffffffffffffffffffffff8116610156576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601960248201527f437265617465323a204661696c6564206f6e206465706c6f790000000000000060448201526064016101eb565b60006101568383305b6000604051836040820152846020820152828152600b8101905060ff815360559020949350505050565b61014e806104ad83390190565b6000806040838503121561033a57600080fd5b50508035926020909101359150565b60008060006060848603121561035e57600080fd5b8335925060208401359150604084013573ffffffffffffffffffffffffffffffffffffffff8116811461039057600080fd5b809150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000806000606084860312156103df57600080fd5b8335925060208401359150604084013567ffffffffffffffff8082111561040557600080fd5b818601915086601f83011261041957600080fd5b81358181111561042b5761042b61039b565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156104715761047161039b565b8160405282815289602084870101111561048a57600080fd5b826020860160208301376000602084830101528095505050505050925092509256fe608060405234801561001057600080fd5b5061012e806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063249cb3fa14602d575b600080fd5b603c603836600460b1565b604e565b60405190815260200160405180910390f35b60008281526020818152604080832073ffffffffffffffffffffffffffffffffffffffff8516845290915281205460ff16608857600060aa565b7fa2ef4600d742022d532d4747cb3547474667d6f13804902513b2ec01c848f4b45b9392505050565b6000806040838503121560c357600080fd5b82359150602083013573ffffffffffffffffffffffffffffffffffffffff8116811460ed57600080fd5b80915050925092905056fea26469706673582212205ffd4e6cede7d06a5daf93d48d0541fc68189eeb16608c1999a82063b666eb1164736f6c63430008130033a2646970667358221220fdc4a0fe96e3b21c108ca155438d37c9143fb01278a3c1d274948bad89c564ba64736f6c63430008130033"
+);
 
 /// The Canyon hardfork issues an irregular state transition that force-deploys the create2
 /// deployer contract. This is done by directly setting the code of the create2 deployer account