feat: simplify configuration of Signed Orders and Fills before signing

Author: anna-carroll

crates/types/src/signing/error.rs

@@ -19,17 +19,9 @@ pub enum SignedPermitError {
 pub enum SigningError {
     /// Missing chain config.
     #[error(
-        "Target chain id is missing. Populate it by calling with_chain before attempting to sign"
+        "Signet System constants are missing. Must call with_constants before attempting to sign"
     )]
-    MissingChainId,
-    /// Missing rollup chain id for a Fill.
-    #[error(
-        "Rollup chain id is missing. Populate it by calling with_ru_chain_id before attempting to sign"
-    )]
-    MissingRollupChainId,
-    /// Missing chain config for a specific chain.
-    #[error("Target Order contract address is missing for chain id {0}. Populate it by calling with_chain before attempting to sign")]
-    MissingOrderContract(u64),
+    MissingConstants,
     /// Error signing the order hash.
     #[error(transparent)]
     Signer(#[from] alloy::signers::Error),

crates/types/src/signing/fill.rs

@@ -214,19 +214,12 @@ impl<'a> UnsignedFill<'a> {
         Self { deadline: Some(deadline), ..self }
     }
 
-    /// Add the rollup chain id to the UnsignedFill.
-    /// This is the rollup chain id from which the Orders originated,
-    /// to which the Fill should be credited.
-    /// MUST call this before signing, cannot be inferred.
-    pub fn with_ru_chain_id(self, ru_chain_id: u64) -> Self {
-        Self { ru_chain_id: Some(ru_chain_id), ..self }
-    }
-
     /// Add the chain id and Order contract address to the UnsignedFill.
-    pub fn with_chain(mut self, constants: SignetSystemConstants) -> Self {
+    /// MUST call before `sign` or `sign_for`.
+    pub fn with_constants(mut self, constants: SignetSystemConstants) -> Self {
         self.target_chains.insert(constants.ru_chain_id(), constants.ru_orders());
         self.target_chains.insert(constants.host_chain_id(), constants.host_orders());
-        self
+        Self { ru_chain_id: Some(constants.ru_chain_id()), ..self }
     }
 
     /// Sign the UnsignedFill, generating a SignedFill for each target chain.
@@ -264,13 +257,11 @@ impl<'a> UnsignedFill<'a> {
         let deadline = self.deadline.unwrap_or(now.timestamp() as u64 + 12);
 
         // get the target order address
-        let target_order_address = self
-            .target_chains
-            .get(&target_chain_id)
-            .ok_or(SigningError::MissingOrderContract(target_chain_id))?;
+        let target_order_address =
+            self.target_chains.get(&target_chain_id).ok_or(SigningError::MissingConstants)?;
 
         // get the rollup chain id, or throw an error if not set
-        let ru_chain_id = self.ru_chain_id.ok_or(SigningError::MissingRollupChainId)?;
+        let ru_chain_id = self.ru_chain_id.ok_or(SigningError::MissingConstants)?;
 
         // get the outputs for the target chain from the AggregateOrders
         let outputs = self.orders.outputs_for(target_chain_id, ru_chain_id);

crates/types/src/signing/order.rs

@@ -192,7 +192,7 @@ impl<'a> UnsignedOrder<'a> {
     }
 
     /// Add the chain id  and Order contract address to the UnsignedOrder.
-    pub fn with_chain(self, constants: &SignetSystemConstants) -> Self {
+    pub fn with_constants(self, constants: &SignetSystemConstants) -> Self {
         Self {
             rollup_chain_id: Some(constants.ru_chain_id()),
             rollup_order_address: Some(constants.ru_orders()),
@@ -217,9 +217,9 @@ impl<'a> UnsignedOrder<'a> {
         let nonce = self.nonce.unwrap_or(Utc::now().timestamp_micros() as u64);
 
         // get chain id and order contract address
-        let rollup_chain_id = self.rollup_chain_id.ok_or(SigningError::MissingChainId)?;
+        let rollup_chain_id = self.rollup_chain_id.ok_or(SigningError::MissingConstants)?;
         let rollup_order_contract =
-            self.rollup_order_address.ok_or(SigningError::MissingOrderContract(rollup_chain_id))?;
+            self.rollup_order_address.ok_or(SigningError::MissingConstants)?;
 
         // get the outputs for the Order
         let outputs = self.order.outputs().to_vec();