104 quote intent generation (#136)

Author: nahimterrazas

Cargo.lock

@@ -21,7 +21,7 @@ hex = "0.4"
 reqwest = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-solver-types = { path = "../solver-types" }
+solver-types = { path = "../solver-types", features = ["oif-interfaces"] }
 thiserror = "1.0"
 tokio = { version = "1.0", features = ["sync", "rt-multi-thread"] }
 toml = { workspace = true }

crates/solver-discovery/Cargo.toml

@@ -44,7 +44,7 @@
 use crate::{DiscoveryError, DiscoveryInterface};
 use alloy_primitives::{Address, Bytes, U256};
 use alloy_provider::RootProvider;
-use alloy_sol_types::sol;
+use alloy_sol_types::SolType;
 use alloy_transport_http::Http;
 use async_trait::async_trait;
 use axum::{
@@ -59,7 +59,10 @@ use serde::{Deserialize, Serialize};
 use serde_json;
 use solver_types::{
 	bytes32_to_address, current_timestamp, normalize_bytes32_address,
-	standards::eip7683::{GasLimitOverrides, LockType, MandateOutput},
+	standards::eip7683::{
+		interfaces::{IInputSettlerCompact, IInputSettlerEscrow, SolMandateOutput, StandardOrder},
+		GasLimitOverrides, LockType, MandateOutput,
+	},
 	with_0x_prefix, ConfigSchema, Eip7683OrderData, Field, FieldType, ImplementationRegistry,
 	Intent, IntentMetadata, NetworksConfig, Schema,
 };
@@ -70,44 +73,6 @@ use std::sync::Arc;
 use tokio::sync::{mpsc, Mutex};
 use tower_http::cors::CorsLayer;
 
-// Import the Solidity types for the OIF contracts
-sol! {
-	#[sol(rpc)]
-	interface IInputSettlerEscrow {
-		function orderIdentifier(bytes calldata order) external view returns (bytes32);
-		function openFor(bytes calldata order, address sponsor, bytes calldata signature) external;
-	}
-
-	#[sol(rpc)]
-	interface IInputSettlerCompact {
-		function orderIdentifier(StandardOrder calldata order) external view returns (bytes32);
-	}
-
-	#[derive(Debug)]
-	struct StandardOrder {
-		address user;
-		uint256 nonce;
-		uint256 originChainId;
-		uint32 expires;
-		uint32 fillDeadline;
-		address inputOracle;
-		uint256[2][] inputs;
-		SolMandateOutput[] outputs;
-	}
-
-	#[derive(Debug)]
-	struct SolMandateOutput {
-		bytes32 oracle;
-		bytes32 settler;
-		uint256 chainId;
-		bytes32 token;
-		uint256 amount;
-		bytes32 recipient;
-		bytes call;
-		bytes context;
-	}
-}
-
 /// API representation of StandardOrder for JSON deserialization.
 ///
 /// This struct represents the order format for the OIF contracts.
@@ -471,10 +436,8 @@ impl Eip7683OffchainDiscovery {
 	///
 	/// Returns `DiscoveryError::ParseError` if the order data cannot be decoded.
 	fn parse_standard_order(order_bytes: &Bytes) -> Result<StandardOrder, DiscoveryError> {
-		use alloy_sol_types::SolValue;
-
 		// Decode the StandardOrder struct from the order data
-		let order = StandardOrder::abi_decode(order_bytes, true).map_err(|e| {
+		let order = <StandardOrder as SolType>::abi_decode(order_bytes, true).map_err(|e| {
 			DiscoveryError::ParseError(format!("Failed to decode StandardOrder: {}", e))
 		})?;
 
@@ -707,14 +670,13 @@ impl Eip7683OffchainDiscovery {
 		settler_address: Address,
 		lock_type: LockType,
 	) -> Result<[u8; 32], DiscoveryError> {
-		use alloy_sol_types::SolValue;
-
 		match lock_type {
 			LockType::ResourceLock => {
 				// Resource Lock (TheCompact) - use IInputSettlerCompact
-				let std_order = StandardOrder::abi_decode(order_bytes, true).map_err(|e| {
-					DiscoveryError::ParseError(format!("Failed to decode StandardOrder: {}", e))
-				})?;
+				let std_order =
+					<StandardOrder as SolType>::abi_decode(order_bytes, true).map_err(|e| {
+						DiscoveryError::ParseError(format!("Failed to decode StandardOrder: {}", e))
+					})?;
 				let compact = IInputSettlerCompact::new(settler_address, provider);
 				let resp = compact
 					.orderIdentifier(std_order)
@@ -806,7 +768,6 @@ impl Eip7683OffchainDiscovery {
 		Ok(())
 	}
 }
-
 /// Handles intent submission requests.
 ///
 /// This is the main request handler for the POST /intent endpoint.

crates/solver-discovery/src/implementations/offchain/_7683.rs

@@ -394,6 +394,7 @@ impl OrderInterface for Eip7683OrderImpl {
 		if matches!(order_data.lock_type, Some(LockType::ResourceLock)) {
 			return Ok(None);
 		}
+
 		let raw_order_data = order_data.raw_order_data.as_ref().ok_or_else(|| {
 			OrderError::ValidationFailed("Missing raw order data for off-chain order".to_string())
 		})?;
@@ -405,7 +406,6 @@ impl OrderInterface for Eip7683OrderImpl {
 		let signature = order_data.signature.as_ref().ok_or_else(|| {
 			OrderError::ValidationFailed("Missing signature for off-chain order".to_string())
 		})?;
-
 		// For the OIF contracts, we need to use the StandardOrder openFor
 		// The raw_order_data contains the encoded StandardOrder
 		// We just need to pass the order bytes, sponsor, and signature

crates/solver-order/src/implementations/standards/_7683.rs

@@ -9,13 +9,15 @@ name = "solver"
 path = "src/main.rs"
 
 [dependencies]
+alloy-sol-types = "0.8"
 alloy-primitives = { version = "0.8", features = ["std", "serde"] }
 async-trait = "0.1"
 axum = "0.8"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.5", features = ["derive"] }
 env_logger = "0.11"
 futures = "0.3"
+hex = "0.4"
 jsonwebtoken = "9.3"
 once_cell = "1.20"
 reqwest = "0.12"
@@ -31,7 +33,7 @@ solver-order = { path = "../solver-order" }
 solver-pricing = { path = "../solver-pricing" }
 solver-settlement = { path = "../solver-settlement" }
 solver-storage = { path = "../solver-storage" }
-solver-types = { path = "../solver-types" }
+solver-types = { path = "../solver-types", features = ["oif-interfaces"] }
 thiserror = "1.0"
 tokio = { version = "1.0", features = ["full"] }
 toml = { workspace = true }
@@ -46,4 +48,4 @@ mockall = "0.13"
 solver-settlement = { path = "../solver-settlement", features = ["testing"] }
 solver-storage = { path = "../solver-storage", features = ["testing"] }
 tempfile = { workspace = true }
-tokio = { workspace = true }
+tokio = { workspace = true }

crates/solver-service/Cargo.toml

@@ -122,6 +122,13 @@ impl QuoteGenerator {
 			available_inputs: request.available_inputs.clone(),
 		};
 		let eta = self.calculate_eta(&request.preference);
+		let lock_type = match custody_decision {
+			CustodyDecision::ResourceLock { .. } => "resource_lock".to_string(),
+			CustodyDecision::Escrow { kind } => match kind {
+				EscrowKind::Permit2 => "permit2_escrow".to_string(),
+				EscrowKind::Erc3009 => "erc3009_escrow".to_string(),
+			},
+		};
 		let validity_seconds = self.get_quote_validity_seconds(config);
 		Ok(Quote {
 			orders: vec![order],
@@ -131,6 +138,7 @@ impl QuoteGenerator {
 			quote_id,
 			provider: "oif-solver".to_string(),
 			cost: None,
+			lock_type,
 		})
 	}
 
@@ -330,7 +338,7 @@ impl QuoteGenerator {
 			.as_ref()
 			.and_then(|api| api.quote.as_ref())
 			.map(|quote| quote.validity_seconds)
-			.unwrap_or_default()
+			.unwrap_or_default() // Default QuoteConfig validity_seconds
 	}
 }
 
@@ -662,6 +670,7 @@ mod tests {
 				quote_id: "quote1".to_string(),
 				provider: "test".to_string(),
 				cost: None,
+				lock_type: "permit2_escrow".to_string(),
 			},
 			Quote {
 				orders: vec![],
@@ -674,6 +683,7 @@ mod tests {
 				quote_id: "quote2".to_string(),
 				provider: "test".to_string(),
 				cost: None,
+				lock_type: "permit2_escrow".to_string(),
 			},
 			Quote {
 				orders: vec![],
@@ -686,6 +696,7 @@ mod tests {
 				quote_id: "quote3".to_string(),
 				provider: "test".to_string(),
 				cost: None,
+				lock_type: "permit2_escrow".to_string(),
 			},
 		];
 
@@ -714,6 +725,7 @@ mod tests {
 				quote_id: "quote1".to_string(),
 				provider: "test".to_string(),
 				cost: None,
+				lock_type: "permit2_escrow".to_string(),
 			},
 			Quote {
 				orders: vec![],
@@ -726,6 +738,7 @@ mod tests {
 				quote_id: "quote2".to_string(),
 				provider: "test".to_string(),
 				cost: None,
+				lock_type: "permit2_escrow".to_string(),
 			},
 		];
 
@@ -763,7 +776,7 @@ mod tests {
 		let mut config_no_api = ConfigBuilder::new().build();
 		config_no_api.api = None;
 		let validity_default = generator.get_quote_validity_seconds(&config_no_api);
-		assert_eq!(validity_default, 20); // Default QuoteConfig has validity_seconds: 20
+		assert_eq!(validity_default, 0); // if API none, use default 0
 	}
 
 	#[test]