Refactor to remove native task wrapper (#3780)

* init

* remove submit native task

* init

* update

* remove redundant

* update

* some more refactoring

Author: Kailai-Wang

tee-worker/omni-executor/Cargo.lock

@@ -20,7 +20,6 @@ members = [
     "intent/executors/solana",
     "intent/token-query",
     "mock-server",
-    "native-task-handler",
     "oauth-providers",
     "omni-cli",
     "pumpx",
@@ -118,7 +117,6 @@ hyperliquid = { path = "hyperliquid" }
 intent-asset-lock = { path = "intent/asset-lock" }
 intent-token-query = { path = "intent/token-query" }
 mock-server = { path = "mock-server" }
-native-task-handler = { path = "native-task-handler" }
 oauth-providers = { path = "oauth-providers" }
 pumpx = { path = "pumpx" }
 rpc-server = { path = "rpc-server" }

tee-worker/omni-executor/Cargo.toml

@@ -1,4 +1,4 @@
-use executor_core::key_store::KeyStore;
+use crate::key_store::KeyStore;
 use executor_crypto::aes256::Aes256Key;
 use rand::Rng;
 

tee-worker/omni-executor/native-task-handler/src/aes256_key_store.rs renamed to tee-worker/omni-executor/executor-core/src/aes256_key_store.rs

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Litentry.  If not, see <https://www.gnu.org/licenses/>.
 
+pub mod aes256_key_store;
 pub mod ecdsa_key_store;
 pub mod ed25519_key_store;
 pub mod event_handler;
@@ -26,3 +27,5 @@ pub mod shielding_key_store;
 pub mod sync_checkpoint_repository;
 pub mod types;
 pub mod wallet_metrics;
+
+pub use aes256_key_store::Aes256KeyStore;

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

@@ -29,7 +29,6 @@ accounting-contract-client = { workspace = true }
 binance-api = { workspace = true }
 config-loader = { 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 }
@@ -38,12 +37,10 @@ executor-storage = { workspace = true }
 heima-identity-verification = { workspace = true }
 intent-asset-lock = { workspace = true }
 mock-server = { workspace = true }
-native-task-handler = { workspace = true }
 pumpx = { workspace = true }
 rpc-server = { workspace = true }
 signer-client = { workspace = true }
 solana = { workspace = true }
-solana-intent-executor = { workspace = true }
 wildmeta-api = { workspace = true }
 
 [features]

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

@@ -26,7 +26,6 @@ use clap::Parser;
 use cli::{Cli, Commands, ExportBundlerKeyArgs};
 use config_loader::ConfigLoader;
 use cross_chain_intent_executor::{Chain, CrossChainIntentExecutor, RpcEndpointRegistry};
-use ethereum_intent_executor::EthereumIntentExecutor;
 use ethereum_rpc::client::EthereumRpcClient;
 use executor_core::ecdsa_key_store::EcdsaKeyStore;
 use executor_core::ed25519_key_store::Ed25519KeyStore;
@@ -36,18 +35,17 @@ use executor_core::wallet_metrics::Wallet;
 use executor_core::wallet_metrics::{
 	start_wallet_metrics, WalletBalanceFetcher, WalletId, WalletMetrics, WalletNetworkType,
 };
+use executor_core::Aes256KeyStore;
 use executor_crypto::{ecdsa, ed25519, PairTrait};
 use executor_storage::init_storage;
 use intent_asset_lock::precise::PreciseAssetsLock;
 use intent_asset_lock::AccountAssetLocks;
 use metrics_exporter_prometheus::PrometheusBuilder;
-use native_task_handler::Aes256KeyStore;
 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;
 use std::net::SocketAddr;
 use std::path::Path;
@@ -178,12 +176,6 @@ async fn main() -> Result<(), ()> {
 					pumpx_signer_pair,
 				)));
 
-			let ethereum_intent_executor = EthereumIntentExecutor::new(
-				&config_loader.ethereum_url,
-				&args.delegation_contract_address,
-			)?;
-			let solana_intent_executor = SolanaIntentExecutor::new(&config_loader.solana_url)?;
-
 			let mut rpc_endpoint_registry = RpcEndpointRegistry::new();
 			rpc_endpoint_registry.insert(Chain::Solana, config_loader.solana_url.to_string());
 			rpc_endpoint_registry.insert(Chain::Ethereum(56), config_loader.bsc_url.to_string());
@@ -531,8 +523,6 @@ async fn main() -> Result<(), ()> {
 				wildmeta_backend_ecdsa_pubkey,
 				evm_accounting_ecdsa_signer_key,
 				bundler_key_export_authorized_pubkey,
-				Arc::new(ethereum_intent_executor),
-				Arc::new(solana_intent_executor),
 				Arc::new(cross_chain_intent_executor),
 				aes256_key,
 				entry_point_clients,