use default branch

crates/forge/bin/cmd/script/broadcast.rs

@@ -67,18 +67,14 @@ impl ScriptArgs {
             // Make a one-time gas price estimation
             let (gas_price, eip1559_fees) = {
                 match deployment_sequence.transactions.front().unwrap().typed_tx() {
-                    TypedTransaction::Legacy(_) |
-                    TypedTransaction::Eip2930(_) |
-                    TypedTransaction::DepositTransaction(_) => {
-                        (provider.get_gas_price().await.ok(), None)
-                    }
                     TypedTransaction::Eip1559(_) => {
                         let fees = estimate_eip1559_fees(&provider, Some(chain))
                             .await
                             .wrap_err("Failed to estimate EIP1559 fees. This chain might not support EIP1559, try adding --legacy to your command.")?;
 
                         (None, Some(fees))
                     }
+                    _ => (provider.get_gas_price().await.ok(), None),
                 }
             };
 
@@ -104,11 +100,6 @@ impl ScriptArgs {
                     } else {
                         // fill gas price
                         match tx {
-                            TypedTransaction::Eip2930(_) |
-                            TypedTransaction::Legacy(_) |
-                            TypedTransaction::DepositTransaction(_) => {
-                                tx.set_gas_price(gas_price.expect("Could not get gas_price."));
-                            }
                             TypedTransaction::Eip1559(ref mut inner) => {
                                 let eip1559_fees =
                                     eip1559_fees.expect("Could not get eip1559 fee estimation.");
@@ -120,6 +111,9 @@ impl ScriptArgs {
                                 }
                                 inner.max_fee_per_gas = Some(eip1559_fees.0);
                             }
+                            _ => {
+                                tx.set_gas_price(gas_price.expect("Could not get gas_price."));
+                            }
                         }
                     }