@@ -43,9 +43,7 @@ use executor_storage::{init_storage, StorageDB};
43
43
use intent_asset_lock:: precise:: PreciseAssetsLock ;
44
44
use intent_asset_lock:: AccountAssetLocks ;
45
45
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 ;
49
47
use parentchain_attestation:: perform_attestation;
50
48
use parentchain_rpc_client:: metadata:: SubxtMetadataProvider ;
51
49
use parentchain_rpc_client:: {
@@ -486,23 +484,6 @@ async fn main() -> Result<(), ()> {
486
484
487
485
let entry_point_clients = Arc :: new ( entry_point_clients) ;
488
486
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
-
506
487
let worker_url =
507
488
url:: Url :: parse ( & config_loader. pumpx_worker_url ) . expect ( "Invalid worker url" ) ;
508
489
@@ -523,7 +504,7 @@ async fn main() -> Result<(), ()> {
523
504
. expect ( "Could not serialize shielding public key" ) ;
524
505
525
506
let _ = perform_attestation (
526
- parentchain_rpc_client_factory,
507
+ parentchain_rpc_client_factory. clone ( ) ,
527
508
parentchain_signer,
528
509
tx_signer. clone ( ) ,
529
510
worker_url. as_str ( ) ,
@@ -544,14 +525,20 @@ async fn main() -> Result<(), ()> {
544
525
start_rpc_server (
545
526
worker_url. port ( ) . expect ( "Missing worker port" ) ,
546
527
shielding_key,
547
- Arc :: new ( native_task_sender) ,
548
528
pumpx_api,
549
529
storage_db. clone ( ) ,
550
530
jwt_rsa_private_key,
551
531
& config_loader,
552
532
pumpx_signer_client,
553
533
wildmeta_api,
554
534
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,
555
542
)
556
543
. await
557
544
. map_err ( |e| {
0 commit comments