Skip to content

Commit 33c2521

Browse files
authored
P-1527 Do not send nativeTask over the channel (#3642)
* fix: remove native task handling * refactor: cargo fmt * refactor: fmt and clippy * refactor: remove commented code * fix: build * fix: unit tests * refactor: remove empty file --------- Signed-off-by: Faisal Ahmed <42486737+felixfaisal@users.noreply.github.com>
1 parent 481e8bf commit 33c2521

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1296
-503
lines changed

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

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ use executor_storage::{init_storage, StorageDB};
4343
use intent_asset_lock::precise::PreciseAssetsLock;
4444
use intent_asset_lock::AccountAssetLocks;
4545
use metrics_exporter_prometheus::PrometheusBuilder;
46-
use native_task_handler::{
47-
run_native_task_handler, Aes256KeyStore, TaskHandlerContext, MAX_CONCURRENT_TASKS,
48-
};
46+
use native_task_handler::Aes256KeyStore;
4947
use parentchain_attestation::perform_attestation;
5048
use parentchain_rpc_client::metadata::SubxtMetadataProvider;
5149
use parentchain_rpc_client::{
@@ -486,23 +484,6 @@ async fn main() -> Result<(), ()> {
486484

487485
let entry_point_clients = Arc::new(entry_point_clients);
488486

489-
let task_handler_context = TaskHandlerContext::new(
490-
parentchain_rpc_client_factory.clone(),
491-
tx_signer.clone(),
492-
storage_db.clone(),
493-
jwt_rsa_private_key.clone(),
494-
aes256_key,
495-
Arc::new(ethereum_intent_executor),
496-
Arc::new(solana_intent_executor),
497-
Arc::new(cross_chain_intent_executor),
498-
pumpx_api.clone(),
499-
pumpx_signer_client.clone(),
500-
entry_point_clients,
501-
);
502-
// TODO: make buffer size configurable
503-
let native_task_sender =
504-
run_native_task_handler(MAX_CONCURRENT_TASKS, Arc::new(task_handler_context)).await;
505-
506487
let worker_url =
507488
url::Url::parse(&config_loader.pumpx_worker_url).expect("Invalid worker url");
508489

@@ -523,7 +504,7 @@ async fn main() -> Result<(), ()> {
523504
.expect("Could not serialize shielding public key");
524505

525506
let _ = perform_attestation(
526-
parentchain_rpc_client_factory,
507+
parentchain_rpc_client_factory.clone(),
527508
parentchain_signer,
528509
tx_signer.clone(),
529510
worker_url.as_str(),
@@ -544,14 +525,20 @@ async fn main() -> Result<(), ()> {
544525
start_rpc_server(
545526
worker_url.port().expect("Missing worker port"),
546527
shielding_key,
547-
Arc::new(native_task_sender),
548528
pumpx_api,
549529
storage_db.clone(),
550530
jwt_rsa_private_key,
551531
&config_loader,
552532
pumpx_signer_client,
553533
wildmeta_api,
554534
wildmeta_timestamp_storage,
535+
Arc::new(ethereum_intent_executor),
536+
Arc::new(solana_intent_executor),
537+
Arc::new(cross_chain_intent_executor),
538+
parentchain_rpc_client_factory.clone(),
539+
aes256_key,
540+
tx_signer,
541+
entry_point_clients,
555542
)
556543
.await
557544
.map_err(|e| {

0 commit comments

Comments
 (0)