Implement swap intent for pumpx

common/primitives/core/src/omni/chain.rs

@@ -35,3 +35,13 @@ pub enum ChainAsset {
     Ethereum(u32, EthereumToken), // with chain id
     Solana(SolanaToken),
 }
+
+impl ChainAsset {
+    pub fn is_same_chain(&self, other: &Self) -> bool {
+        match (self, other) {
+            (ChainAsset::Ethereum(id1, _), ChainAsset::Ethereum(id2, _)) => id1 == id2,
+            (ChainAsset::Solana(_), ChainAsset::Solana(_)) => true,
+            _ => false,
+        }
+    }
+}

common/primitives/core/src/omni/intent.rs

@@ -8,6 +8,7 @@ use sp_runtime::traits::ConstU32;
 pub type CallEthereumInputLen = ConstU32<{ 10 * 1024 }>;
 pub type RemarkLen = ConstU32<{ u32::max_value() }>;
 pub type IntentStringLen = ConstU32<128>;
+pub type AmountLen = ConstU32<32>;
 
 pub type IntentId = u32;
 
@@ -67,7 +68,7 @@ pub enum HeimaMultiAddress {
 #[derive(Encode, Decode, Debug, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
 pub struct SwapOrder {
     pub from_asset: ChainAsset,
-    pub from_amount: u64,
+    pub from_amount: BoundedVec<u8, AmountLen>,
     pub to_asset: ChainAsset,
     pub to_address: Option<HeimaMultiAddress>,
 }
@@ -105,6 +106,7 @@ pub struct PumpxConfig {
     // below is only relevant to limit order, thus `Option<>`
     pub token_cap: Option<BoundedVec<u8, IntentStringLen>>,
     pub price_usd: Option<BoundedVec<u8, IntentStringLen>>,
+    pub usd_worth: BoundedVec<u8, IntentStringLen>,
     pub trailing_percent: Option<u32>,
 }
 

tee-worker/omni-executor/executor-core/src/intent_executor.rs

@@ -29,7 +29,7 @@ pub trait IntentExecutor: Send {
 		account_id: &AccountId,
 		intent_id: IntentId,
 		intent: Intent,
-	) -> Result<(), ()>;
+	) -> Result<Option<Vec<u8>>, ()>;
 }
 
 pub struct MockedIntentExecutor {
@@ -50,7 +50,7 @@ impl IntentExecutor for MockedIntentExecutor {
 		_account_id: &AccountId,
 		_intent_id: IntentId,
 		_intent: Intent,
-	) -> Result<(), ()> {
-		self.sender.send(()).map_err(|_| ())
+	) -> Result<Option<Vec<u8>>, ()> {
+		self.sender.send(()).map(|_| None).map_err(|_| ())
 	}
 }

tee-worker/omni-executor/executor-worker/src/main.rs

@@ -133,16 +133,18 @@ async fn main() -> Result<(), ()> {
 				rpc_endpoint_registry.insert(Chain::Ethereum(97), bsc_testnet_url.to_owned());
 			}
 
+			let pumpx_api_base_url = std::env::var("OE_PUMPX_API_BASE_URL").ok();
+			let pumpx_api = Arc::new(PumpxApi::new(pumpx_api_base_url));
+
 			let cross_chain_intent_executor = CrossChainIntentExecutor::new(
 				parentchain_rpc_client_factory.clone(),
 				tx_signer.clone(),
 				rpc_endpoint_registry,
 				pumpx_signer_client.clone(),
+				pumpx_api.clone(),
+				storage_db.clone(),
 			)?;
 
-			let pumpx_api_base_url = std::env::var("OE_PUMPX_API_BASE_URL").ok();
-			let pumpx_api = Arc::new(PumpxApi::new(pumpx_api_base_url));
-
 			let intent_id_store: Arc<Box<dyn IntentIdStore>> =
 				Arc::new(Box::new(StorageDbIntentIdStore::new(storage_db.clone())));
 

tee-worker/omni-executor/intent/executors/cross-chain/Cargo.toml

@@ -6,11 +6,15 @@ edition.workspace = true
 
 [dependencies]
 async-trait = { workspace = true }
+hex = { workspace = true }
 log = { workspace = true }
+parity-scale-codec = { workspace = true }
 
 # Local dependencies
 executor-core = { workspace = true }
 executor-primitives = { workspace = true }
+executor-storage = { workspace = true }
+heima-authentication = { workspace = true }
 intent-asset-lock = { workspace = true }
 intent-token-query = { workspace = true }
 parentchain-api-interface = { workspace = true }