Implement cross chain swaps

tee-worker/omni-executor/Cargo.toml

@@ -25,6 +25,7 @@ members = [
     "parentchain/signer",
     "pumpx",
     "rpc-server",
+    "solana",
 ]
 
 resolver = "2"
@@ -59,6 +60,7 @@ regex = "1.7"
 reqwest = { version = "0.12", features = ["json"] }
 ring = "0.16.20"
 rsa = "0.9.7"
+rust_decimal = "1.37.1"
 scale-encode = "0.10.0"
 scale-info = "2.11.6"
 secp256k1 = "=0.29.1"
@@ -71,6 +73,7 @@ solana-client = "2.1.5"
 solana-sdk = "2.1.5"
 sp-core = "35.0.0"
 sp-state-machine = { version = "0.44.0", features = ["std"] }
+spl-associated-token-account = "6.0.0"
 spl-token = "7.0.0"
 subxt = "0.38.0"
 subxt-core = "0.38.0"
@@ -105,6 +108,7 @@ parentchain-rpc-client = { path = "parentchain/rpc-client" }
 parentchain-signer = { path = "parentchain/signer" }
 pumpx = { path = "pumpx" }
 rpc-server = { path = "rpc-server" }
+solana = { path = "solana" }
 solana-intent-executor = { path = "intent/executors/solana" }
 
 [workspace.lints.clippy]

tee-worker/omni-executor/binance-api/src/lib.rs

@@ -1,8 +1,9 @@
 mod convert_api;
 mod error;
-mod spot_trading_api;
+pub mod spot_trading_api;
 mod traits;
 mod types;
+mod wallet_api;
 
 use convert_api::ConvertApi;
 use error::Error;
@@ -16,6 +17,7 @@ use std::{
 	time::{SystemTime, UNIX_EPOCH},
 };
 use url::Url;
+use wallet_api::WalletApi;
 
 const MAX_RECV_WINDOW: u32 = 60000;
 
@@ -47,6 +49,11 @@ impl BinanceApi {
 		SpotTradingApi::new(self)
 	}
 
+	/// Create a new WalletApi instance
+	pub fn wallet(&self) -> WalletApi {
+		WalletApi::new(self)
+	}
+
 	/// Create HMAC SHA256 signature for request parameters
 	pub fn sign_request(&self, query_string: &str) -> String {
 		let mut mac = Hmac::<Sha256>::new_from_slice(self.api_secret.as_bytes())

tee-worker/omni-executor/binance-api/src/spot_trading_api/mod.rs

@@ -1,4 +1,4 @@
-mod types;
+pub mod types;
 
 use crate::{error::Error, traits::TryIntoParams, BinanceApi, Method};
 use std::collections::HashMap;

tee-worker/omni-executor/binance-api/src/wallet_api/mod.rs

@@ -0,0 +1,38 @@
+mod types;
+
+use types::{CoinInfo, DepositAddress};
+
+use crate::{error::Error, BinanceApi, Method};
+use std::collections::HashMap;
+
+/// https://developers.binance.com/docs/wallet/Introduction
+const WALLET_API: &str = "/sapi/v1";
+
+pub struct WalletApi<'a> {
+	base_api: &'a BinanceApi,
+}
+
+impl<'a> WalletApi<'a> {
+	pub fn new(binance_api: &BinanceApi) -> WalletApi {
+		WalletApi { base_api: binance_api }
+	}
+
+	/// Get information of coins (available for deposit and withdraw).
+	pub async fn get_all_coins_info(&self) -> Result<Vec<CoinInfo>, Error> {
+		let endpoint = format!("{}/capital/config/getall", WALLET_API);
+		self.base_api.make_signed_request(&endpoint, Method::GET, None, None).await
+	}
+
+	/// Get deposit address with network
+	pub async fn get_deposit_address(&self, coin: &str, network: &str) -> Result<String, Error> {
+		let endpoint = format!("{}/capital/deposit/address", WALLET_API);
+		let mut params = HashMap::new();
+		params.insert("coin".to_string(), coin.to_string());
+		params.insert("network".to_string(), network.to_string());
+		let response: DepositAddress = self
+			.base_api
+			.make_signed_request(&endpoint, Method::GET, Some(params), None)
+			.await?;
+		Ok(response.address)
+	}
+}

tee-worker/omni-executor/binance-api/src/wallet_api/types.rs

@@ -0,0 +1,62 @@
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+#[allow(dead_code)]
+pub struct DepositAddress {
+	pub address: String,
+	pub coin: String,
+	pub tag: String,
+	pub url: String,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CoinInfo {
+	pub coin: String,
+	pub deposit_all_enable: bool,
+	pub free: String,
+	pub freeze: String,
+	pub ipoable: String,
+	pub ipoing: String,
+	pub is_legal_money: bool,
+	pub locked: String,
+	pub name: String,
+	pub network_list: Vec<NetworkInfo>,
+	pub storage: Option<String>,
+	pub trading: Option<bool>,
+	pub withdraw_all_enable: Option<bool>,
+	pub withdrawing: Option<String>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct NetworkInfo {
+	pub address_regex: String,
+	pub coin: String,
+	// Optional fields that are only present under certain conditions
+	pub deposit_desc: Option<String>,
+	pub deposit_enable: bool,
+	pub is_default: bool,
+	pub memo_regex: String,
+	pub min_confirm: u32,
+	pub name: String,
+	pub network: String,
+	pub special_tips: String,
+	pub special_withdraw_tips: Option<String>,
+	pub un_lock_confirm: u32,
+	pub withdraw_desc: Option<String>,
+	pub withdraw_enable: bool,
+	pub withdraw_fee: String,
+	pub withdraw_integer_multiple: String,
+	pub withdraw_max: String,
+	pub withdraw_min: String,
+	pub withdraw_internal_min: Option<String>,
+	pub same_address: bool,
+	pub estimated_arrival_time: u32,
+	pub busy: bool,
+	pub contract_address_url: String,
+	pub contract_address: String,
+	pub reset_address_status: Option<bool>,
+	pub deposit_dust: Option<String>,
+	pub denomination: Option<u64>,
+}

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

@@ -25,8 +25,8 @@ pub use auth::*;
 pub mod signature;
 pub mod utils;
 pub use heima_primitives::{
-	omni::*, teebag::DcapQuote, AccountId, BlockNumber, ChainAsset, Hash, Identity, MrEnclave,
-	Nonce, ShardIdentifier, Web2IdentityType,
+	identity::Address32, omni::*, teebag::DcapQuote, AccountId, BlockNumber, ChainAsset, Hash,
+	Identity, MrEnclave, Nonce, ShardIdentifier, Web2IdentityType,
 };
 use std::fmt::Debug;
 

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

@@ -15,8 +15,11 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
 url = { workspace = true }
 
 # Local dependencies
+accounting-contract-client = { workspace = true }
+binance-api = { workspace = true }
 cross-chain-intent-executor = { workspace = true }
 ethereum-intent-executor = { workspace = true }
+ethereum-rpc = { workspace = true }
 executor-core = { workspace = true }
 executor-crypto = { workspace = true }
 executor-primitives = { workspace = true }
@@ -29,6 +32,7 @@ parentchain-rpc-client = { workspace = true }
 parentchain-signer = { workspace = true }
 pumpx = { workspace = true }
 rpc-server = { workspace = true }
+solana = { workspace = true }
 solana-intent-executor = { workspace = true }
 
 [lints]

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

@@ -15,6 +15,8 @@
 // along with Litentry.  If not, see <https://www.gnu.org/licenses/>.
 
 use crate::cli::Cli;
+use accounting_contract_client::AccountingContractClient;
+use binance_api::BinanceApi;
 use clap::Parser;
 use cli::*;
 use cross_chain_intent_executor::{Chain, CrossChainIntentExecutor, RpcEndpointRegistry};
@@ -38,8 +40,10 @@ use parentchain_rpc_client::{
 	ToPrimitiveType,
 };
 use parentchain_signer::{key_store::SubstrateKeyStore, TxSigner};
+use pumpx::signer_client::SignerClient;
 use pumpx::PumpxApi;
 use rpc_server::{start_server as start_rpc_server, AuthTokenKeyStore};
+use solana::SolanaClient;
 use solana_intent_executor::SolanaIntentExecutor;
 use std::env;
 use std::io::Write;
@@ -72,7 +76,6 @@ async fn main() -> Result<(), ()> {
 
 	match cli.cmd {
 		Commands::Run(args) => {
-			let _binance_api_key = env::var("OE_BINANCE_API_KEY").unwrap_or("".to_string());
 			let auth_token_key_store =
 				AuthTokenKeyStore::new(args.auth_token_key_store_path.clone());
 			let jwt_rsa_private_key = auth_token_key_store.read().expect("Could not read jwt key");
@@ -116,10 +119,11 @@ async fn main() -> Result<(), ()> {
 			let aes256_key_store = Aes256KeyStore::new(args.aes256_key_store_path.clone());
 			let aes256_key = aes256_key_store.read().expect("Could not read aes256 key");
 
-			let pumpx_signer_client = Arc::new(pumpx::signer_client::SignerClient::new(
-				args.pumpx_signer_url.clone(),
-				pumpx_signer_pair,
-			));
+			let pumpx_signer_client: Arc<Box<dyn SignerClient>> =
+				Arc::new(Box::new(pumpx::signer_client::PumpxSignerClient::new(
+					args.pumpx_signer_url.clone(),
+					pumpx_signer_pair,
+				)));
 
 			let ethereum_intent_executor =
 				EthereumIntentExecutor::new(&args.ethereum_url, &args.delegation_contract_address)?;
@@ -139,13 +143,34 @@ async fn main() -> Result<(), ()> {
 			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 binance_api_key = env::var("OE_BINANCE_API_KEY").unwrap_or("".to_string());
+			let binance_api_secret = env::var("OE_BINANCE_API_SECRET").unwrap_or("".to_string());
+			let binance_api_base_url = env::var("OE_BINANCE_API_BASE_URL").ok();
+			let binance_api = Arc::new(BinanceApi::new(
+				binance_api_key,
+				binance_api_secret,
+				binance_api_base_url,
+			));
+
+			let solana_client = Arc::new(SolanaClient::new(&args.solana_url));
+
+			let ethereum_rpc_provider = ethereum_rpc::AlloyRpcProvider::new(&args.ethereum_url);
+			let accounting_contract_client = AccountingContractClient::new(
+				ethereum_rpc_provider,
+				//todo: from CLI
+				"0xb0830ef478a215ed393c20a0c97aa69869a0beea".parse().unwrap(),
+			);
+
 			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(),
+				binance_api,
+				solana_client,
+				Arc::new(accounting_contract_client),
 			)?;
 
 			let intent_id_store: Arc<Box<dyn IntentIdStore>> =

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

@@ -9,8 +9,15 @@ async-trait = { workspace = true }
 hex = { workspace = true }
 log = { workspace = true }
 parity-scale-codec = { workspace = true }
+rust_decimal = { workspace = true }
+tokio = { workspace = true }
 
 # Local dependencies
+accounting-contract-client = { workspace = true }
+alloy = { workspace = true }
+base58 = { workspace = true }
+binance-api = { workspace = true }
+ethereum-rpc = { workspace = true }
 executor-core = { workspace = true }
 executor-primitives = { workspace = true }
 executor-storage = { workspace = true }
@@ -21,6 +28,7 @@ parentchain-api-interface = { workspace = true }
 parentchain-rpc-client = { workspace = true }
 parentchain-signer = { workspace = true }
 pumpx = { workspace = true }
+solana = { workspace = true }
 
 [lints]
 workspace = true