Cross chain swap instant payout (#3443)

* instant payout

Author: kziemianek

tee-worker/omni-executor/Cargo.lock

@@ -64,6 +64,7 @@ regex = "1.7"
 reqwest = { version = "0.12", features = ["json"] }
 ring = "0.16.20"
 rsa = "0.9.7"
+ruint = "1.13.1"
 rust_decimal = "1.37.1"
 scale-encode = "0.10.0"
 scale-info = "2.11.6"
@@ -83,12 +84,14 @@ subxt = "0.40.0"
 subxt-core = "0.40.0"
 subxt-signer = { version = "0.40.0", features = ["subxt"] }
 tempfile = "3.19.1"
+test-log = { version = "0.2.17", features = ["trace"] }
 tokio = "1.43.0"
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
 url = "2.5.4"
 uuid = "1.16.0"
 
+
 # Local dependencies
 accounting-contract = { path = "accounting-contract/solana/programs/accounting-contract", features = ["no-entrypoint"] }
 accounting-contract-client = { path = "accounting-contract-client" }

tee-worker/omni-executor/Cargo.toml

@@ -29,6 +29,10 @@ pub trait AccountingContractApi: Send + Sync {
 	async fn get_nonce(&self, user: Address) -> Result<U256, ()>;
 
 	async fn get_balance(&self) -> Result<U256, ()>;
+
+	async fn get_address(&self) -> Address;
+
+	async fn get_signer_address(&self) -> Address;
 }
 
 pub struct AccountingContractClient<P: RpcProvider<Transaction = TransactionRequest> + Send + Sync>
@@ -93,6 +97,14 @@ impl<P: RpcProvider<Transaction = TransactionRequest> + Send + Sync> AccountingC
 			Ok(balance)
 		})
 	}
+
+	async fn get_address(&self) -> Address {
+		self.contract_address
+	}
+
+	async fn get_signer_address(&self) -> Address {
+		self.provider.get_wallet_address().await.expect("No signer address")
+	}
 }
 
 #[cfg(feature = "mocks")]
@@ -120,6 +132,14 @@ pub mod mocks {
 			async fn get_nonce(&self, user: Address) -> Result<U256, ()>;
 
 			async fn get_balance(&self) -> Result<U256, ()>;
+
+			async fn get_address(&self) -> Address {
+				Address::default();
+			}
+
+			async fn get_signer_address(&self) -> Address {
+				Address::default();
+			}
 		}
 	}
 }

tee-worker/omni-executor/accounting-contract-client/src/lib.rs

@@ -19,7 +19,9 @@ pub mod signer;
 
 use std::str::FromStr;
 
+use alloy::network::Ethereum;
 use alloy::network::EthereumWallet;
+use alloy::network::NetworkWallet;
 use alloy::primitives::Address;
 use alloy::primitives::U256;
 use alloy::providers::Provider;
@@ -65,6 +67,7 @@ pub trait RpcProvider: Send + Sync {
 	async fn estimate_gas(&self, tx: Self::Transaction) -> Result<u64, ()>;
 	async fn get_gas_price(&self) -> Result<u128, ()>;
 	async fn call(&self, tx: Self::Transaction) -> Result<Vec<u8>, ()>;
+	async fn get_wallet_address(&self) -> Result<Address, ()>;
 }
 
 pub struct AlloyRpcProvider {
@@ -180,6 +183,14 @@ impl RpcProvider for AlloyRpcProvider {
 
 		Ok(result.to_vec())
 	}
+
+	async fn get_wallet_address(&self) -> Result<Address, ()> {
+		if let Some(ref wallet) = self.wallet {
+			Ok(<EthereumWallet as NetworkWallet<Ethereum>>::default_signer_address(wallet))
+		} else {
+			Err(())
+		}
+	}
 }
 
 #[async_trait]
@@ -227,6 +238,7 @@ pub mod mocks {
 			async fn estimate_gas(&self, tx: TransactionRequest) -> Result<u64, ()>;
 			async fn get_gas_price(&self) -> Result<u128, ()>;
 			async fn call(&self, tx: TransactionRequest) -> Result<Vec<u8>, ()>;
+			async fn get_wallet_address(&self) -> Result<Address, ()>;
 		}
 
 

tee-worker/omni-executor/ethereum-rpc/src/lib.rs

@@ -0,0 +1,34 @@
+use crate::Storage;
+use executor_primitives::AccountId;
+use executor_primitives::ChainAsset;
+use parity_scale_codec::Encode;
+use rocksdb::DB;
+use std::sync::Arc;
+
+const STORAGE_NAME: &str = "asset_lock_storage";
+
+#[derive(Encode)]
+pub struct Key {
+	pub account_id: AccountId,
+	pub asset_id: ChainAsset,
+}
+
+pub struct AssetLockStorage {
+	db: Arc<DB>,
+}
+
+impl AssetLockStorage {
+	pub fn new(db: Arc<DB>) -> Self {
+		Self { db }
+	}
+}
+
+impl Storage<Key, Vec<u8>> for AssetLockStorage {
+	fn db(&self) -> Arc<crate::StorageDB> {
+		self.db.clone()
+	}
+
+	fn name(&self) -> &'static str {
+		STORAGE_NAME
+	}
+}

tee-worker/omni-executor/executor-storage/src/asset_lock.rs

@@ -24,6 +24,9 @@ mod pumpx_jwt;
 pub use pumpx_jwt::PumpxJwtStorage;
 mod intent_id;
 pub use intent_id::IntentIdStorage;
+mod asset_lock;
+pub use asset_lock::AssetLockStorage;
+pub use asset_lock::Key as AssetLockStorageKey;
 use tracing::error;
 
 const STORAGE_DB_PATH: &str = "storage_db";

tee-worker/omni-executor/executor-storage/src/lib.rs

@@ -9,6 +9,7 @@ alloy = { workspace = true, features = ["signer-local"] }
 clap = { workspace = true, features = ["derive"] }
 hex = { workspace = true }
 metrics-exporter-prometheus = { workspace = true }
+rust_decimal = { workspace = true }
 scale-encode = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
@@ -26,6 +27,7 @@ executor-core = { workspace = true }
 executor-crypto = { workspace = true }
 executor-primitives = { workspace = true }
 executor-storage = { workspace = true }
+intent-asset-lock = { workspace = true }
 native-task-handler = { workspace = true }
 parentchain-attestation = { workspace = true }
 parentchain-listener = { workspace = true }

tee-worker/omni-executor/executor-worker/Cargo.toml

@@ -39,6 +39,8 @@ use executor_crypto::rsa::{traits::PublicKeyParts, Rsa3072PubKey};
 use executor_crypto::{ecdsa, ed25519, PairTrait};
 use executor_primitives::AccountId;
 use executor_storage::{init_storage, StorageDB};
+use intent_asset_lock::precise::PreciseAssetsLock;
+use intent_asset_lock::AccountAssetLocks;
 use metrics_exporter_prometheus::PrometheusBuilder;
 use native_task_handler::{
 	run_native_task_handler, Aes256KeyStore, TaskHandlerContext, MAX_CONCURRENT_TASKS,
@@ -53,6 +55,7 @@ use parentchain_signer::{key_store::SubstrateKeyStore, TxSigner};
 use pumpx::{pubkey_to_evm_address, pubkey_to_solana_address};
 use pumpx::{PumpxApi, PumpxApiClient};
 use rpc_server::{start_server as start_rpc_server, AuthTokenKeyStore};
+use rust_decimal::Decimal;
 use solana::SolanaRpcClient;
 use solana_intent_executor::SolanaIntentExecutor;
 use std::collections::HashMap;
@@ -286,7 +289,11 @@ async fn main() -> Result<(), ()> {
 			let join = start_wallet_metrics(Handle::current(), wallet_metrics);
 			// wallet monitoring setup end
 
+			let account_assets_lock: Arc<AccountAssetLocks<PreciseAssetsLock>> =
+				Arc::new(AccountAssetLocks::new(storage_db.clone()));
+
 			let cross_chain_intent_executor = CrossChainIntentExecutor::new(
+				account_assets_lock,
 				rpc_endpoint_registry,
 				pumpx_signer_client.clone(),
 				pumpx_api.clone(),
@@ -296,6 +303,7 @@ async fn main() -> Result<(), ()> {
 				solana_client,
 				Arc::new(Box::new(evm_accounting_contract_client)),
 				Arc::new(Box::new(solana_accounting_contract_client)),
+				Decimal::from_str("200").unwrap(),
 			)?;
 
 			let task_handler_context = TaskHandlerContext::new(

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

@@ -5,12 +5,19 @@ authors = ['Trust Computing GmbH <info@litentry.com>']
 edition.workspace = true
 
 [dependencies]
-ruint = "1.13.1"
+parity-scale-codec = { workspace = true }
+ruint = { workspace = true, features = ["parity-scale-codec"] }
+tracing = { workspace = true }
 
 # Local dependencies
 executor-core = { workspace = true }
 executor-primitives = { workspace = true }
+executor-storage = { workspace = true }
 heima-primitives = { workspace = true }
 
+
+[dev-dependencies]
+tempfile = { workspace = true }
+
 [lints]
 workspace = true