feat: allow gas bumps to be config in the network config

Author: joshstevens19

TODO.md

@@ -4,12 +4,13 @@
 
 31st September plan:
 - Last change for the gas bumping + price in bump_every config
+- Look into authentication to login and then use it outside rrelayer.yaml
 - Reread documentation 
+  - TransactionSpeed code snippets tag default
 - Get CI builds / releases working
 - Testing
     - loading up ALL supported gas providers so it works
     - Testing handling custom gas with http call
-- Look into authentication to login and then use it outside rrelayer.yaml
 - Release—20:00 UK time
 
 # AFTER

crates/cli/src/commands/network.rs

@@ -108,6 +108,7 @@ async fn handle_add(project_path: &ProjectLocation) -> Result<(), NetworkError>
         permissions: None,
         api_keys: None,
         enable_sending_blobs: Some(true),
+        gas_bump_blocks_every: Default::default(),
     });
 
     project_path.overwrite_setup_config(setup_config)?;

crates/cli/src/commands/new.rs

@@ -72,6 +72,7 @@ pub async fn handle_init(path: &Path) -> Result<(), InitError> {
             permissions: None,
             api_keys: None,
             enable_sending_blobs: Some(true),
+            gas_bump_blocks_every: Default::default(),
         }],
         gas_providers: None,
         api_config: ApiConfig {

crates/core/src/relayer/api/clone_relayer.rs

@@ -52,6 +52,13 @@ pub async fn clone_relayer(
     let id = relayer.id;
     let address = relayer.address;
 
+    let gas_bump_config = state
+        .network_configs
+        .iter()
+        .find(|config| config.chain_id == relayer.chain_id)
+        .map(|config| config.gas_bump_blocks_every.clone())
+        .unwrap_or_default();
+
     state
         .transactions_queues
         .lock()
@@ -65,6 +72,7 @@ pub async fn clone_relayer(
                 Default::default(),
                 Default::default(),
                 state.safe_proxy_manager.clone(),
+                gas_bump_config,
             ),
             state.transactions_queues.clone(),
         )

crates/core/src/relayer/api/create_relayer.rs

@@ -56,6 +56,13 @@ pub async fn create_relayer(
     let id = relayer.id;
     let address = relayer.address;
 
+    let gas_bump_config = state
+        .network_configs
+        .iter()
+        .find(|config| config.chain_id == chain_id)
+        .map(|config| config.gas_bump_blocks_every.clone())
+        .unwrap_or_default();
+
     state
         .transactions_queues
         .lock()
@@ -69,6 +76,7 @@ pub async fn create_relayer(
                 Default::default(),
                 Default::default(),
                 state.safe_proxy_manager.clone(),
+                gas_bump_config,
             ),
             state.transactions_queues.clone(),
         )

crates/core/src/startup.rs

@@ -346,6 +346,7 @@ pub async fn start(project_path: &Path) -> Result<(), StartError> {
         cache.clone(),
         webhook_manager.clone(),
         safe_proxy_manager.clone(),
+        Arc::new(config.networks.clone()),
     )
     .await?;
 

crates/core/src/transaction/queue_system/start.rs

@@ -359,6 +359,7 @@ pub async fn startup_transactions_queues(
     cache: Arc<Cache>,
     webhook_manager: Option<Arc<Mutex<WebhookManager>>>,
     safe_proxy_manager: Arc<SafeProxyManager>,
+    network_configs: Arc<Vec<crate::yaml::NetworkSetupConfig>>,
 ) -> Result<Arc<Mutex<TransactionsQueues>>, StartTransactionsQueuesError> {
     let postgres = PostgresClient::new()
         .await
@@ -388,6 +389,12 @@ pub async fn startup_transactions_queues(
                     repopulate_transaction_queue(&postgres, &relayer_id, &TransactionStatus::MINED)
                         .await?;
 
+                let gas_bump_config = network_configs
+                    .iter()
+                    .find(|config| config.chain_id == relayer.chain_id)
+                    .map(|config| config.gas_bump_blocks_every.clone())
+                    .unwrap_or_default();
+
                 transaction_relayer_setups.push(TransactionRelayerSetup::new(
                     relayer,
                     evm_provider,
@@ -402,6 +409,7 @@ pub async fn startup_transactions_queues(
                         .into_iter()
                         .map(|transaction| (transaction.id, transaction))
                         .collect(),
+                    gas_bump_config,
                 ));
             }
         }

crates/core/src/transaction/queue_system/transactions_queue.rs

@@ -26,6 +26,7 @@ use crate::{
         nonce_manager::NonceManager,
         types::{Transaction, TransactionHash, TransactionId, TransactionSpeed, TransactionStatus},
     },
+    yaml::GasBumpBlockConfig,
     WalletError,
 };
 use alloy::network::{AnyTransactionReceipt, ReceiptResponse};
@@ -50,6 +51,7 @@ pub struct TransactionsQueue {
     blob_oracle_cache: Arc<Mutex<BlobGasOracleCache>>,
     confirmations: u64,
     safe_proxy_manager: Arc<SafeProxyManager>,
+    gas_bump_config: GasBumpBlockConfig,
 }
 
 impl TransactionsQueue {
@@ -74,16 +76,12 @@ impl TransactionsQueue {
             blob_oracle_cache,
             confirmations,
             safe_proxy_manager: setup.safe_proxy_manager,
+            gas_bump_config: setup.gas_bump_config,
         }
     }
 
     fn blocks_to_wait_before_bump(&self, speed: &TransactionSpeed) -> u64 {
-        match speed {
-            TransactionSpeed::SLOW => 10,
-            TransactionSpeed::MEDIUM => 5,
-            TransactionSpeed::FAST => 4,
-            TransactionSpeed::SUPER => 2,
-        }
+        self.gas_bump_config.blocks_to_wait_before_bump(speed)
     }
 
     pub fn should_bump_gas(&self, ms_between_times: u64, speed: &TransactionSpeed) -> bool {

crates/core/src/transaction/queue_system/transactions_queues.rs

@@ -94,6 +94,7 @@ impl TransactionsQueues {
                         setup.inmempool_transactions,
                         setup.mined_transactions,
                         safe_proxy_manager.clone(),
+                        setup.gas_bump_config,
                     ),
                     gas_oracle_cache.clone(),
                     blob_gas_oracle_cache.clone(),
@@ -182,6 +183,7 @@ impl TransactionsQueues {
                     VecDeque::new(),
                     HashMap::new(),
                     self.safe_proxy_manager.clone(),
+                    setup.gas_bump_config,
                 ),
                 self.gas_oracle_cache.clone(),
                 self.blob_gas_oracle_cache.clone(),

crates/core/src/transaction/queue_system/types/transaction_relayer_setup.rs

@@ -5,6 +5,7 @@ use crate::{
     provider::EvmProvider,
     relayer::Relayer,
     transaction::types::{Transaction, TransactionId},
+    yaml::GasBumpBlockConfig,
 };
 
 pub struct TransactionRelayerSetup {
@@ -13,6 +14,7 @@ pub struct TransactionRelayerSetup {
     pub pending_transactions: VecDeque<Transaction>,
     pub inmempool_transactions: VecDeque<CompetitiveTransaction>,
     pub mined_transactions: HashMap<TransactionId, Transaction>,
+    pub gas_bump_config: GasBumpBlockConfig,
 }
 
 impl TransactionRelayerSetup {
@@ -22,13 +24,15 @@ impl TransactionRelayerSetup {
         pending_transactions: VecDeque<Transaction>,
         inmempool_transactions: VecDeque<CompetitiveTransaction>,
         mined_transactions: HashMap<TransactionId, Transaction>,
+        gas_bump_config: GasBumpBlockConfig,
     ) -> Self {
         TransactionRelayerSetup {
             relayer,
             evm_provider,
             pending_transactions,
             inmempool_transactions,
             mined_transactions,
+            gas_bump_config,
         }
     }
 }