feat: alias addresses

Author: prestwich

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.11.4"
+version = "0.12.4"
 edition = "2024"
 rust-version = "1.88"
 authors = ["init4"]
@@ -34,34 +34,34 @@ debug = false
 incremental = false
 
 [workspace.dependencies]
-signet-blobber = { version = "0.11", path = "crates/blobber" }
-signet-block-processor = { version = "0.11", path = "crates/block-processor" }
-signet-db = { version = "0.11", path = "crates/db" }
-signet-genesis = { version = "0.11", path = "crates/genesis" }
-signet-node = { version = "0.11", path = "crates/node" }
-signet-node-config = { version = "0.11", path = "crates/node-config" }
-signet-node-tests = { version = "0.11", path = "crates/node-tests" }
-signet-node-types = { version = "0.11", path = "crates/node-types" }
-signet-rpc = { version = "0.11", path = "crates/rpc" }
-
+signet-blobber = { version = "0.12", path = "crates/blobber" }
+signet-block-processor = { version = "0.12", path = "crates/block-processor" }
+signet-db = { version = "0.12", path = "crates/db" }
+signet-genesis = { version = "0.12", path = "crates/genesis" }
+signet-node = { version = "0.12", path = "crates/node" }
+signet-node-config = { version = "0.12", path = "crates/node-config" }
+signet-node-tests = { version = "0.12", path = "crates/node-tests" }
+signet-node-types = { version = "0.12", path = "crates/node-types" }
+signet-rpc = { version = "0.12", path = "crates/rpc" }
 
 init4-bin-base = { version = "0.13.1", features = ["alloy"] }
 
-signet-bundle = "0.11.1"
-signet-constants = "0.11.1"
-signet-evm = "0.11.1"
-signet-extract = "0.11.1"
-signet-test-utils = "0.11.1"
-signet-tx-cache = "0.11.1"
-signet-types = "0.11.1"
-signet-zenith = "0.11.1"
-signet-journal = "0.11.1"
+signet-bundle = "0.12"
+signet-constants = "0.12"
+signet-evm = "0.12"
+signet-extract = "0.12"
+signet-test-utils = "0.12"
+signet-tx-cache = "0.12"
+signet-types = "0.12"
+signet-zenith = "0.12"
+signet-journal = "0.12"
 
 # ajj
 ajj = { version = "0.3.4" }
 
 # trevm
 trevm = { version = "0.29.0", features = ["full_env_cfg"] }
+revm-inspectors = "0.30.0" # should be 1 more than trevm version, usually
 
 # Alloy periphery crates
 alloy = { version = "1.0.35", features = [
@@ -74,22 +74,22 @@ alloy = { version = "1.0.35", features = [
 alloy-contract = { version = "1.0.35", features = ["pubsub"] }
 
 # Reth
-reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" }
+reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
 
 # Foundry periphery
 foundry-blob-explorers = "0.17"
@@ -127,14 +127,15 @@ uuid = "1.16.0"
 alloy-rlp = "0.3.11"
 tempfile = "3.17.0"
 
-# [patch.crates-io]
-# signet-bundle = { path = "../sdk/crates/bundle"}
-# signet-constants = { path = "../sdk/crates/constants"}
-# signet-evm = { path = "../sdk/crates/evm"}
-# signet-extract = { path = "../sdk/crates/extract"}
-# signet-test-utils = { path = "../sdk/crates/test-utils"}
-# signet-tx-cache = { path = "../sdk/crates/tx-cache"}
-# signet-types = { path = "../sdk/crates/types"}
-# signet-zenith = { path = "../sdk/crates/zenith"}
+[patch.crates-io]
+signet-bundle = { path = "../sdk/crates/bundle"}
+signet-constants = { path = "../sdk/crates/constants"}
+signet-evm = { path = "../sdk/crates/evm"}
+signet-extract = { path = "../sdk/crates/extract"}
+signet-journal = { path = "../sdk/crates/journal"}
+signet-test-utils = { path = "../sdk/crates/test-utils"}
+signet-tx-cache = { path = "../sdk/crates/tx-cache"}
+signet-types = { path = "../sdk/crates/types"}
+signet-zenith = { path = "../sdk/crates/zenith"}
 
 # init4-bin-base = { path = "../shared" }

crates/block-processor/src/v1/processor.rs

@@ -1,10 +1,17 @@
 use crate::{Chain, metrics};
-use alloy::{consensus::BlockHeader, primitives::B256};
+use alloy::{
+    consensus::BlockHeader,
+    primitives::{Address, B256, map::HashSet},
+};
+use core::fmt;
 use eyre::ContextCompat;
 use init4_bin_base::utils::calc::SlotCalculator;
 use reth::{
     primitives::EthPrimitives,
-    providers::{BlockNumReader, BlockReader, ExecutionOutcome, HeaderProvider, ProviderFactory},
+    providers::{
+        BlockNumReader, BlockReader, ExecutionOutcome, HeaderProvider, ProviderFactory,
+        StateProviderFactory,
+    },
     revm::{database::StateProviderDatabase, db::StateBuilder},
 };
 use reth_chainspec::{ChainSpec, EthereumHardforks};
@@ -16,14 +23,12 @@ use signet_evm::{BlockResult, EvmNeedsCfg, SignetDriver};
 use signet_extract::{Extractor, Extracts};
 use signet_journal::HostJournal;
 use signet_node_types::{NodeTypesDbTrait, SignetNodeTypes};
-use std::collections::VecDeque;
-use std::sync::Arc;
+use std::{collections::VecDeque, sync::Arc};
 use tracing::{Instrument, debug, error, info, info_span, instrument};
 use trevm::revm::primitives::hardfork::SpecId;
 
 /// A block processor that listens to host chain commits and processes
 /// Signet blocks accordingly.
-#[derive(Debug)]
 pub struct SignetBlockProcessor<Db>
 where
     Db: NodeTypesDbTrait,
@@ -37,13 +42,25 @@ where
     /// A [`ProviderFactory`] instance to allow RU database access.
     ru_provider: ProviderFactory<SignetNodeTypes<Db>>,
 
+    /// A [`ProviderFactory`] instance to allow Host database access.
+    host_provider: Box<dyn StateProviderFactory>,
+
     /// The slot calculator.
     slot_calculator: SlotCalculator,
 
     /// A handle to the blob cacher.
     blob_cacher: CacheHandle,
 }
 
+impl<Db> fmt::Debug for SignetBlockProcessor<Db>
+where
+    Db: NodeTypesDbTrait,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SignetBlockProcessor").finish()
+    }
+}
+
 impl<Db> SignetBlockProcessor<Db>
 where
     Db: NodeTypesDbTrait,
@@ -53,10 +70,11 @@ where
         constants: SignetSystemConstants,
         chain_spec: Arc<ChainSpec>,
         ru_provider: ProviderFactory<SignetNodeTypes<Db>>,
+        host_provider: Box<dyn StateProviderFactory>,
         slot_calculator: SlotCalculator,
         blob_cacher: CacheHandle,
     ) -> Self {
-        Self { constants, chain_spec, ru_provider, slot_calculator, blob_cacher }
+        Self { constants, chain_spec, ru_provider, host_provider, slot_calculator, blob_cacher }
     }
 
     /// Get the active spec id at the given timestamp.
@@ -92,6 +110,12 @@ where
         Ok(trevm)
     }
 
+    /// Check if the given address should be aliased.
+    fn should_alias(&self, host_height: u64, address: Address) -> eyre::Result<bool> {
+        let state = self.host_provider.history_by_block_number(host_height)?;
+        state.account_code(&address).map(|code| code.is_some()).map_err(Into::into)
+    }
+
     /// Called when the host chain has committed a block or set of blocks.
     #[instrument(skip_all, fields(count = chain.len(), first = chain.first().number(), tip = chain.tip().number()))]
     pub async fn on_host_commit<Host>(&self, chain: &Chain<Host>) -> eyre::Result<Option<RuChain>>
@@ -239,8 +263,17 @@ where
             None => VecDeque::new(),
         };
 
+        let mut to_alias: HashSet<Address> = Default::default();
+        for transact in block_extracts.transacts() {
+            let addr = transact.host_sender();
+            if self.should_alias(host_height, addr)? {
+                to_alias.insert(addr);
+            }
+        }
+
         let mut driver = SignetDriver::new(
             block_extracts,
+            to_alias,
             txns,
             parent_header.convert(),
             self.constants.clone(),

crates/node/src/node.rs

@@ -177,6 +177,7 @@ where
             constants.clone(),
             config.chain_spec().clone(),
             factory.clone(),
+            Box::new(ctx.provider().clone()),
             config.slot_calculator(),
             blob_cacher,
         );

crates/rpc/Cargo.toml

@@ -10,6 +10,7 @@ repository.workspace = true
 
 [dependencies]
 signet-node-types.workspace = true
+signet-db.workspace = true
 
 signet-bundle.workspace = true
 signet-evm.workspace = true
@@ -20,6 +21,8 @@ ajj.workspace = true
 trevm.workspace = true
 
 alloy.workspace = true
+revm-inspectors.workspace = true
+
 reth.workspace = true
 reth-chainspec.workspace = true
 reth-db.workspace = true
@@ -42,8 +45,6 @@ tracing.workspace = true
 serde_json.workspace = true
 futures-util = "0.3.31"
 itertools.workspace = true
-revm-inspectors = "0.30.0"
-signet-db.workspace = true
 
 [dev-dependencies]
 signet-zenith.workspace = true