fix: avoid executing run_with_custom_intervals at the same time using mutex

Author: gilcu3

src/config.rs

@@ -65,7 +65,7 @@ pub struct Opts {
     #[clap(env, short, long, value_parser = humantime::parse_duration, default_value = "15m")]
     pub period: std::time::Duration,
     /// Time delay between each intervalgroup of transactions
-    #[clap(env, short, long, value_parser = humantime::parse_duration, default_value = "10s")]
+    #[clap(env, short, long, value_parser = humantime::parse_duration, default_value = "6s")]
     pub group_delay: std::time::Duration,
     /// Override intervals for specific transaction types (JSON format: {"MpcSignEcdsa": "5m", "Swap": "10m"})
     #[clap(env, long, value_parser = parse_interval_overwrite)]

src/transaction/engine.rs

@@ -4,6 +4,7 @@ use near_jsonrpc_primitives::types::query::QueryResponseKind;
 use near_primitives::hash::CryptoHash;
 use near_primitives::types::{BlockReference, Nonce};
 use std::{collections::HashMap, sync::Arc};
+use tokio::sync::Mutex;
 
 use tracing::{error, info, warn};
 
@@ -148,21 +149,16 @@ impl Engine {
                 .or_default()
                 .extend(default_transactions);
         }
+        let run_account_transactions_once_mutex = Arc::new(Mutex::new(()));
 
         // Spawn a task for each interval group
-        for (task_id, (interval_duration, transaction_kinds)) in
-            interval_groups.into_iter().enumerate()
-        {
+        for (interval_duration, transaction_kinds) in interval_groups.into_iter() {
             let opts_clone = opts.clone();
             let metrics_clone = metrics.clone();
             let transactions_clone = transactions.clone();
 
+            let mutex_clone = Arc::clone(&run_account_transactions_once_mutex);
             tasks.spawn(async move {
-                // Add 3 second delay between each interval group start
-                if task_id > 0 {
-                    tokio::time::sleep(group_delay).await;
-                }
-
                 let mut interval = interval(interval_duration);
                 loop {
                     interval.tick().await;
@@ -181,6 +177,8 @@ impl Engine {
                         .map(|(kind, tx)| (kind.clone(), tx.clone()))
                         .collect();
 
+                    let _lock = mutex_clone.lock().await;
+
                     run_account_transactions_once(
                         filtered_transactions,
                         opts_clone.clone(),