feat: address aliasing (#137)

* feat: util functions for aliasing

* feat: aliasing

* fix: version

* chore: 0.14

Author: prestwich

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.13.0"
+version = "0.14.0"
 edition = "2021"
 rust-version = "1.85"
 authors = ["init4"]
@@ -34,21 +34,21 @@ debug = false
 incremental = false
 
 [workspace.dependencies]
-signet-bundle = { version = "0.13", path = "crates/bundle" }
-signet-constants = { version = "0.13", path = "crates/constants" }
-signet-evm = { version = "0.13", path = "crates/evm" }
-signet-extract = { version = "0.13", path = "crates/extract" }
-signet-journal = { version = "0.13", path = "crates/journal" }
-signet-node = { version = "0.13", path = "crates/node" }
-signet-sim = { version = "0.13", path = "crates/sim" }
-signet-types = { version = "0.13", path = "crates/types" }
-signet-tx-cache = { version = "0.13", path = "crates/tx-cache" }
-signet-zenith = { version = "0.13", path = "crates/zenith" }
+signet-bundle = { version = "0.14", path = "crates/bundle" }
+signet-constants = { version = "0.14", path = "crates/constants" }
+signet-evm = { version = "0.14", path = "crates/evm" }
+signet-extract = { version = "0.14", path = "crates/extract" }
+signet-journal = { version = "0.14", path = "crates/journal" }
+signet-node = { version = "0.14", path = "crates/node" }
+signet-sim = { version = "0.14", path = "crates/sim" }
+signet-types = { version = "0.14", path = "crates/types" }
+signet-tx-cache = { version = "0.14", path = "crates/tx-cache" }
+signet-zenith = { version = "0.14", path = "crates/zenith" }
 
-signet-test-utils = { version = "0.13", path = "crates/test-utils" }
+signet-test-utils = { version = "0.14", path = "crates/test-utils" }
 
 # trevm
-trevm = { version = "0.29.0", features = ["full_env_cfg"] }
+trevm = { version = "0.31.0", features = ["full_env_cfg"] }
 
 # Alloy periphery crates
 alloy-core = "1.4"

crates/evm/src/driver.rs

@@ -8,7 +8,7 @@ use alloy::{
         TxType,
     },
     eips::eip1559::{BaseFeeParams, INITIAL_BASE_FEE as EIP1559_INITIAL_BASE_FEE},
-    primitives::{Address, Bloom, U256},
+    primitives::{map::HashSet, Address, Bloom, U256},
 };
 use signet_extract::{Extractable, Extracts};
 use signet_types::{
@@ -195,6 +195,10 @@ pub struct SignetDriver<'a, 'b, C: Extractable> {
     /// The block extracts.
     pub(crate) extracts: &'a Extracts<'b, C>,
 
+    /// Set of addresses that generated transact events and should be aliased
+    /// because they contain code.
+    pub(crate) to_alias: HashSet<Address>,
+
     /// Parent rollup block.
     parent: SealedHeader,
 
@@ -222,6 +226,7 @@ impl<'a, 'b, C: Extractable> SignetDriver<'a, 'b, C> {
     /// Create a new driver.
     pub fn new(
         extracts: &'a Extracts<'b, C>,
+        to_alias: HashSet<Address>,
         to_process: VecDeque<TransactionSigned>,
         parent: SealedHeader,
         constants: SignetSystemConstants,
@@ -232,6 +237,7 @@ impl<'a, 'b, C: Extractable> SignetDriver<'a, 'b, C> {
             + extracts.enter_tokens.len();
         Self {
             extracts,
+            to_alias,
             parent,
             constants,
             working_context: extracts.aggregate_fills(),

crates/evm/src/lib.rs

@@ -15,8 +15,8 @@
 #[macro_use]
 mod macros;
 
-mod aliases;
-pub use aliases::*;
+mod types;
+pub use types::*;
 
 mod driver;
 pub use driver::SignetDriver;
@@ -54,25 +54,23 @@ pub fn signet_evm<Db: Database + DatabaseCommit>(
         .with_insp(Layered::new(NoOpInspector, OrderDetector::for_rollup(constants)))
         .with_precompiles(signet_precompiles())
         .build_trevm()
-        .expect("db set")
 }
 
 /// Create a new EVM with the given database and inspector.
 pub fn signet_evm_with_inspector<Db, I>(
     db: Db,
-    inner: I,
+    outer: I,
     constants: SignetSystemConstants,
 ) -> EvmNeedsCfg<Db, I>
 where
     I: Inspector<Ctx<Db>>,
     Db: Database + DatabaseCommit,
 {
-    let inspector = SignetLayered::new(inner, OrderDetector::for_rollup(constants));
+    let inspector = SignetLayered::new(outer, OrderDetector::for_rollup(constants));
 
     TrevmBuilder::new()
         .with_db(db)
         .with_insp(inspector)
         .with_precompiles(signet_precompiles())
         .build_trevm()
-        .expect("db set")
 }

crates/evm/src/sys/driver.rs

@@ -397,7 +397,12 @@ impl<'a, 'b, C: Extractable> SignetDriver<'a, 'b, C> {
             count = self.extracts.transacts.len()
         )
         .entered();
-        let transacts = self.extracts.transacts.iter().map(TransactSysTx::new);
+        let transacts: Vec<_> = self
+            .extracts
+            .transacts
+            .iter()
+            .map(|t| TransactSysTx::new(t, self.to_alias.contains(&t.event.sender)))
+            .collect();
         self.apply_metered_sys_transactions(trevm, transacts)
     }
 

crates/evm/src/sys/transact.rs

@@ -6,13 +6,14 @@ use alloy::{
 };
 use core::fmt;
 use signet_extract::ExtractedEvent;
-use signet_types::{primitives::TransactionSigned, MagicSig};
+use signet_types::{primitives::TransactionSigned, MagicSig, MagicSigInfo};
 use signet_zenith::Transactor;
 use trevm::{revm::context::TxEnv, Tx};
 
 /// Shim to impl [`Tx`] for [`Transactor::Transact`].
 #[derive(PartialEq, Eq)]
 pub struct TransactSysTx {
+    /// The transact transaction.
     tx: TransactionSigned,
 
     /// The nonce of the transaction.
@@ -23,20 +24,23 @@ pub struct TransactSysTx {
     magic_sig: MagicSig,
 }
 
-impl<'a, R> From<&ExtractedEvent<'a, R, Transactor::Transact>> for TransactSysTx {
-    fn from(transact: &ExtractedEvent<'a, R, Transactor::Transact>) -> Self {
-        Self::new(transact)
-    }
-}
-
 impl TransactSysTx {
     /// Instantiate a new [`TransactSysTx`].
-    pub fn new<R>(transact: &ExtractedEvent<'_, R, Transactor::Transact>) -> Self {
-        let magic_sig = transact.magic_sig();
-        let tx = transact.make_transaction(0);
+    pub fn new<R>(transact: &ExtractedEvent<'_, R, Transactor::Transact>, aliased: bool) -> Self {
+        let magic_sig = transact.magic_sig(aliased);
+        let tx = transact.make_transaction(0, aliased);
         Self { tx, nonce: None, magic_sig }
     }
 
+    /// Check if the sender was aliased (i.e. the sender is a smart contract on
+    /// the host chain).
+    pub fn is_aliased(&self) -> bool {
+        match self.magic_sig.ty {
+            MagicSigInfo::Transact { aliased, .. } => aliased,
+            _ => unreachable!(),
+        }
+    }
+
     /// Create a [`TransactSysLog`] from the filler.
     fn make_sys_log(&self) -> TransactSysLog {
         TransactSysLog {
@@ -71,7 +75,7 @@ impl Clone for TransactSysTx {
 impl Tx for TransactSysTx {
     fn fill_tx_env(&self, tx_env: &mut TxEnv) {
         self.tx.as_eip1559().unwrap().fill_tx_env(tx_env);
-        tx_env.caller = self.magic_sig.sender();
+        tx_env.caller = self.magic_sig.rollup_sender();
     }
 }
 
@@ -81,9 +85,11 @@ impl SysBase for TransactSysTx {
     }
 
     fn description(&self) -> String {
+        let is_aliased = if self.is_aliased() { " (aliased)" } else { "" };
+
         format!(
-            "Transact from {} to {} with value {} and {} bytes of input data: `0x{}{}`",
-            self.magic_sig.sender(),
+            "Transact from {}{is_aliased} to {} with value {} and {} bytes of input data: `0x{}{}`",
+            self.magic_sig.rollup_sender(),
             self.tx.to().expect("creates not allowed"),
             format_ether(self.tx.value()),
             self.tx.input().len(),
@@ -116,7 +122,7 @@ impl SysBase for TransactSysTx {
     }
 
     fn evm_sender(&self) -> Address {
-        self.magic_sig.sender()
+        self.magic_sig.rollup_sender()
     }
 }
 

crates/evm/src/aliases.rs renamed to crates/evm/src/types.rs

@@ -224,22 +224,22 @@ impl<'a, R> ExtractedEvent<'a, R, Events> {
 impl<R> ExtractedEvent<'_, R, Transactor::Transact> {
     /// Create a magic signature for the transact event, containing sender
     /// information.
-    pub fn magic_sig(&self) -> MagicSig {
+    pub fn magic_sig(&self, aliased: bool) -> MagicSig {
         MagicSig {
-            ty: MagicSigInfo::Transact { sender: self.event.host_sender() },
+            ty: MagicSigInfo::Transact { sender: self.event.host_sender(), aliased },
             txid: self.tx_hash(),
             event_idx: self.log_index,
         }
     }
 
     /// Create the signature for the transact event.
-    fn signature(&self) -> alloy::primitives::Signature {
-        self.magic_sig().into()
+    fn signature(&self, aliased: bool) -> alloy::primitives::Signature {
+        self.magic_sig(aliased).into()
     }
 
     /// Make the transaction that corresponds to this transact event,
     /// using the provided nonce.
-    pub fn make_transaction(&self, nonce: u64) -> TransactionSigned {
+    pub fn make_transaction(&self, nonce: u64, aliased: bool) -> TransactionSigned {
         TransactionSigned::new_unhashed(
             Transaction::Eip1559(TxEip1559 {
                 chain_id: self.rollup_chain_id(),
@@ -252,7 +252,7 @@ impl<R> ExtractedEvent<'_, R, Transactor::Transact> {
                 access_list: Default::default(),
                 input: self.data.clone(),
             }),
-            self.signature(),
+            self.signature(aliased),
         )
     }
 }

crates/extract/src/extracted.rs

@@ -122,7 +122,6 @@ where
             .with_insp(inspector)
             .with_precompiles(signet_precompiles())
             .build_trevm()
-            .expect("db set")
             .fill_cfg(&self.cfg)
             .fill_block(&self.block)
     }

crates/sim/src/env/host.rs

@@ -135,7 +135,7 @@ where
                 let reason = trevm.result().output().cloned().map(hex::encode);
                 let halted = trevm.result().is_halt();
                 let halt_reason = if let ExecutionResult::Halt { reason, .. } = trevm.result() {
-                    Some(*reason)
+                    Some(reason.clone())
                 } else {
                     None
                 };

crates/sim/src/env/sim_env.rs

@@ -46,6 +46,7 @@ impl TestEnv {
         let header = Header { gas_limit: 30_000_000, ..Default::default() };
         SignetDriver::new(
             extracts,
+            Default::default(),
             txns.into(),
             SealedHeader::new(header),
             SignetSystemConstants::test(),
@@ -345,7 +346,7 @@ fn test_a_transact() {
         MintNative::new(&extracts.enter_tokens[2], USDC_RECORD.decimals()).with_nonce(3);
     let expected_tx_3 = expected_sys_3.produce_transaction();
 
-    let expected_tx_4 = extracts.transacts[0].make_transaction(0);
+    let expected_tx_4 = extracts.transacts[0].make_transaction(0, false);
 
     assert_eq!(
         sealed_block.senders,