feat: last redesign of gas bumping

Author: joshstevens19

TODO.md

@@ -3,19 +3,15 @@
 ## TODO List
 
 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
+  - max_gas_price_multiplier: 4
 - Get CI builds / releases working
-- Testing
-    - loading up ALL supported gas providers so it works
-    - Testing handling custom gas with http call
-- Release—20:00 UK time
 
 # AFTER
 
-- Create CI to run E2E tests on push
-- Write go and python SDK (create issues)
-- cron job to hit a contract call with parameters every n minutes
-- send tx on event firing using rindexer
+- Testing
+  - loading up ALL supported gas providers so it works
+  - Testing handling custom gas with http call
+  - Create CI to run E2E tests on push

crates/cli/src/commands/network.rs

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

crates/cli/src/commands/new.rs

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

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

@@ -52,12 +52,14 @@ 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();
+    let network_config =
+        state.network_configs.iter().find(|config| config.chain_id == relayer.chain_id);
+
+    let gas_bump_config =
+        network_config.map(|config| config.gas_bump_blocks_every.clone()).unwrap_or_default();
+
+    let max_gas_price_multiplier =
+        network_config.map(|config| config.max_gas_price_multiplier).unwrap_or(2);
 
     state
         .transactions_queues
@@ -73,6 +75,7 @@ pub async fn clone_relayer(
                 Default::default(),
                 state.safe_proxy_manager.clone(),
                 gas_bump_config,
+                max_gas_price_multiplier,
             ),
             state.transactions_queues.clone(),
         )

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

@@ -56,12 +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();
+    let network_config = state.network_configs.iter().find(|config| config.chain_id == chain_id);
+
+    let gas_bump_config =
+        network_config.map(|config| config.gas_bump_blocks_every.clone()).unwrap_or_default();
+
+    let max_gas_price_multiplier =
+        network_config.map(|config| config.max_gas_price_multiplier).unwrap_or(2);
 
     state
         .transactions_queues
@@ -77,6 +78,7 @@ pub async fn create_relayer(
                 Default::default(),
                 state.safe_proxy_manager.clone(),
                 gas_bump_config,
+                max_gas_price_multiplier,
             ),
             state.transactions_queues.clone(),
         )

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

@@ -389,12 +389,16 @@ 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)
+                let network_config =
+                    network_configs.iter().find(|config| config.chain_id == relayer.chain_id);
+
+                let gas_bump_config = network_config
                     .map(|config| config.gas_bump_blocks_every.clone())
                     .unwrap_or_default();
 
+                let max_gas_price_multiplier =
+                    network_config.map(|config| config.max_gas_price_multiplier).unwrap_or(2);
+
                 transaction_relayer_setups.push(TransactionRelayerSetup::new(
                     relayer,
                     evm_provider,
@@ -410,6 +414,7 @@ pub async fn startup_transactions_queues(
                         .map(|transaction| (transaction.id, transaction))
                         .collect(),
                     gas_bump_config,
+                    max_gas_price_multiplier,
                 ));
             }
         }