chore: remove host fills (#133)

* chore: remove host fills

* test: fix bundle tests

* chore: clippy and version

Author: prestwich

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 rust-version = "1.85"
 authors = ["init4"]
@@ -34,18 +34,18 @@ debug = false
 incremental = false
 
 [workspace.dependencies]
-signet-bundle = { version = "0.12", path = "crates/bundle" }
-signet-constants = { version = "0.12", path = "crates/constants" }
-signet-evm = { version = "0.12", path = "crates/evm" }
-signet-extract = { version = "0.12", path = "crates/extract" }
-signet-journal = { version = "0.12", path = "crates/journal" }
-signet-node = { version = "0.12", path = "crates/node" }
-signet-sim = { version = "0.12", path = "crates/sim" }
-signet-types = { version = "0.12", path = "crates/types" }
-signet-tx-cache = { version = "0.12", path = "crates/tx-cache" }
-signet-zenith = { version = "0.12", path = "crates/zenith" }
+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-test-utils = { version = "0.12", path = "crates/test-utils" }
+signet-test-utils = { version = "0.13", path = "crates/test-utils" }
 
 # trevm
 trevm = { version = "0.30.0", features = ["full_env_cfg"] }

crates/bundle/Cargo.toml

@@ -14,7 +14,6 @@ signet-types.workspace = true
 signet-evm.workspace = true
 
 trevm.workspace = true
-signet-zenith.workspace = true
 
 alloy.workspace = true
 

crates/bundle/src/send/bundle.rs

@@ -1,17 +1,12 @@
 //! Signet bundle types.
-use crate::send::SignetEthBundleError;
 use alloy::{
     consensus::TxEnvelope,
     eips::Decodable2718,
-    network::Network,
     primitives::{Bytes, B256},
-    providers::Provider,
     rlp::Buf,
     rpc::types::mev::EthSendBundle,
 };
 use serde::{Deserialize, Serialize};
-use signet_types::{SignedFill, SignedPermitError};
-use signet_zenith::HostOrders::HostOrdersInstance;
 use trevm::{
     inspectors::{Layered, TimeLimit},
     revm::{inspector::NoOpInspector, Database},
@@ -26,7 +21,7 @@ pub type BundleInspector<I = NoOpInspector> = Layered<TimeLimit, I>;
 /// The Signet bundle contains the following:
 ///
 /// - A standard [`EthSendBundle`] with the transactions to simulate.
-/// - A signed permit2 fill to be applied on the Host chain with the bundle.
+/// - Host transactions to be included in the host bundle.
 ///
 /// This is based on the flashbots `eth_sendBundle` bundle. See [their docs].
 ///
@@ -37,10 +32,6 @@ pub struct SignetEthBundle {
     /// The bundle of transactions to simulate. Same structure as a Flashbots [`EthSendBundle`] bundle.
     #[serde(flatten)]
     pub bundle: EthSendBundle,
-    /// Host fills to be applied with the bundle, represented as a signed
-    /// permit2 fill.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub host_fills: Option<SignedFill>,
 
     /// Host transactions to be included in the host bundle.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
@@ -110,36 +101,19 @@ impl SignetEthBundle {
         Ok(txs)
     }
 
-    /// Check that this can be syntactically used as a fill.
-    pub fn validate_fills_offchain(&self, timestamp: u64) -> Result<(), SignedPermitError> {
-        if let Some(host_fills) = &self.host_fills {
-            host_fills.validate(timestamp)
-        } else {
-            Ok(())
-        }
-    }
-
-    /// Check that this fill is valid on-chain as of the current block. This
-    /// checks that the tokens can actually be transferred.
-    ///
-    /// # WARNING:
-    ///
-    /// This function will send an RPC request to the provider containing the
-    /// fills. It MUST NOT be used with an untrusted provider.
-    pub async fn alloy_validate_fills_onchain<Db, P, N>(
+    /// Decode and validate the host transactions in the bundle.
+    pub fn decode_and_validate_host_txs<Db: Database>(
         &self,
-        orders: HostOrdersInstance<P, N>,
-    ) -> Result<(), SignetEthBundleError<Db>>
-    where
-        Db: Database,
-        P: Provider<N>,
-        N: Network,
-    {
-        if let Some(host_fills) = self.host_fills.clone() {
-            orders.try_fill(host_fills.outputs, host_fills.permit).await.map_err(Into::into)
-        } else {
-            Ok(())
-        }
+    ) -> Result<Vec<TxEnvelope>, BundleError<Db>> {
+        // Decode and validate the host transactions in the bundle
+        let txs = self
+            .host_txs
+            .iter()
+            .map(|tx| TxEnvelope::decode_2718(&mut tx.chunk()))
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(|err| BundleError::TransactionDecodingError(err))?;
+
+        Ok(txs)
     }
 }
 
@@ -161,10 +135,6 @@ pub struct SignetEthBundleResponse {
 #[cfg(test)]
 mod test {
     use super::*;
-    use alloy::primitives::{Address, U256};
-    use signet_zenith::HostOrders::{
-        Output, Permit2Batch, PermitBatchTransferFrom, TokenPermissions,
-    };
 
     #[test]
     fn send_bundle_ser_roundtrip() {
@@ -178,26 +148,6 @@ mod test {
                 replacement_uuid: Some("uuid".to_owned()),
                 ..Default::default()
             },
-            host_fills: Some(SignedFill {
-                permit: Permit2Batch {
-                    permit: PermitBatchTransferFrom {
-                        permitted: vec![TokenPermissions {
-                            token: Address::repeat_byte(66),
-                            amount: U256::from(17),
-                        }],
-                        nonce: U256::from(18),
-                        deadline: U256::from(19),
-                    },
-                    owner: Address::repeat_byte(77),
-                    signature: Bytes::from(b"abcd"),
-                },
-                outputs: vec![Output {
-                    token: Address::repeat_byte(88),
-                    amount: U256::from(20),
-                    recipient: Address::repeat_byte(99),
-                    chainId: 100,
-                }],
-            }),
             host_txs: vec![b"host_tx1".into(), b"host_tx2".into()],
         };
 
@@ -219,7 +169,6 @@ mod test {
                 replacement_uuid: Some("uuid".to_owned()),
                 ..Default::default()
             },
-            host_fills: None,
             host_txs: vec![],
         };
 
@@ -236,7 +185,6 @@ mod test {
 
         let deserialized: SignetEthBundle = serde_json::from_str(json).unwrap();
 
-        assert!(deserialized.host_fills.is_none());
         assert!(deserialized.host_txs.is_empty());
     }
 

crates/bundle/src/send/driver.rs

@@ -78,16 +78,19 @@ pub struct SignetEthBundleDriver<'a> {
 impl<'a> SignetEthBundleDriver<'a> {
     /// Creates a new [`SignetEthBundleDriver`] with the given bundle and
     /// response.
-    pub fn new(
+    pub fn new(bundle: &'a SignetEthBundle, deadline: std::time::Instant) -> Self {
+        Self::new_with_agg_fills(bundle, deadline, Default::default())
+    }
+
+    /// Creates a new [`SignetEthBundleDriver`] with the given bundle,
+    /// response, and aggregate fills.
+    ///
+    /// This is useful for testing, and for combined host-rollup simulation.
+    pub const fn new_with_agg_fills(
         bundle: &'a SignetEthBundle,
-        host_chain_id: u64,
         deadline: std::time::Instant,
+        agg_fills: AggregateFills,
     ) -> Self {
-        let mut agg_fills = AggregateFills::default();
-        if let Some(host_fills) = &bundle.host_fills {
-            agg_fills.add_signed_fill(host_chain_id, host_fills);
-        }
-
         Self {
             bundle,
             deadline,
@@ -125,6 +128,14 @@ impl<'a> SignetEthBundleDriver<'a> {
         &self.agg_fills
     }
 
+    /// Get a mutable reference to the aggregate fills for this driver.
+    ///
+    /// Accessing this is not recommended outside of testing or advanced
+    /// usage.
+    pub const fn agg_fills_mut(&mut self) -> &mut AggregateFills {
+        &mut self.agg_fills
+    }
+
     /// Check the [`AggregateFills`], discard if invalid, otherwise accumulate
     /// payable gas and call [`Self::accept_tx`].
     ///
@@ -191,11 +202,6 @@ where
             BundleError::TimestampOutOfRange.into()
         );
 
-        // Check that the `SignedFill` is valid at the timestamp.
-        if self.bundle().validate_fills_offchain(timestamp.to()).is_err() {
-            return Err(trevm.errored(BundleError::BundleReverted.into()));
-        }
-
         // Decode and validate the transactions in the bundle
         let txs = trevm_try!(self.bundle.decode_and_validate_txs(), trevm);
 

crates/sim/src/built.rs

@@ -138,10 +138,6 @@ impl BuiltBlock {
             // As this builder does not provide bundles landing "top of block", its fine to just extend.
             self.transactions.extend(txs);
             self.host_txns.extend(bundle.host_txs);
-
-            if let Some(host_fills) = bundle.host_fills {
-                self.host_fills.push(host_fills);
-            }
         } else {
             error!("failed to decode bundle. dropping");
         }

crates/sim/src/cache.rs

@@ -306,7 +306,6 @@ mod test {
                 replacement_uuid: Some(replacement_uuid),
                 ..Default::default()
             },
-            host_fills: None,
             host_txs: vec![],
         }
     }

crates/sim/src/env/sim_env.rs

@@ -190,8 +190,7 @@ where
     where
         RuInsp: Inspector<Ctx<SimDb<RuDb>>> + Default + Sync,
     {
-        let mut driver =
-            SignetEthBundleDriver::new(bundle, self.constants().host_chain_id(), self.finish_by);
+        let mut driver = SignetEthBundleDriver::new(bundle, self.finish_by);
         let trevm = self.rollup_evm();
 
         // Run the bundle

crates/test-utils/src/specs/mod.rs

@@ -18,7 +18,6 @@ use alloy::{
     sol_types::SolCall,
 };
 use signet_bundle::SignetEthBundle;
-use signet_types::SignedFill;
 
 /// Sign a transaction with a wallet.
 pub fn sign_tx_with_key_pair(wallet: &PrivateKeySigner, tx: TypedTransaction) -> TxEnvelope {
@@ -72,12 +71,13 @@ where
 }
 
 /// Create a simple bundle from a list of transactions.
-pub fn simple_bundle<'a>(
-    txs: impl IntoIterator<Item = &'a TxEnvelope>,
-    host_fills: Option<SignedFill>,
+pub fn simple_bundle(
+    txs: Vec<TxEnvelope>,
+    host_txs: Vec<TxEnvelope>,
     block_number: u64,
 ) -> SignetEthBundle {
     let txs = txs.into_iter().map(|tx| tx.encoded_2718().into()).collect();
+    let host_txs = host_txs.into_iter().map(|tx| tx.encoded_2718().into()).collect();
 
     SignetEthBundle {
         bundle: EthSendBundle {
@@ -93,7 +93,6 @@ pub fn simple_bundle<'a>(
             refund_tx_hashes: vec![],
             extra_fields: Default::default(),
         },
-        host_fills,
-        host_txs: vec![],
+        host_txs,
     }
 }