fix(protocol-ops): keep execute_one_bundle's signature for downstream crates

zksync-os-integration-tests links protocol_ops and calls the four-argument
execute_one_bundle; the gas floor now lives on execute_one_bundle_with_gas_floor.

Author: bxpana

protocol-ops/src/commands/dev/execute_manifest.rs

@@ -6,7 +6,7 @@ use alloy::signers::local::PrivateKeySigner;
 use anyhow::{bail, Context, Result};
 use clap::Parser;
 
-use crate::commands::dev::execute_safe::{execute_one_bundle, parse_gwei};
+use crate::commands::dev::execute_safe::{execute_one_bundle_with_gas_floor, parse_gwei};
 use crate::common::{anvil::set_balance, logger, preflight::is_local_rpc, PrivateKey};
 
 /// Apply every bundle listed in a `manifest.json` file, routing each one to the
@@ -179,7 +179,8 @@ pub async fn apply_manifest_from(
             })?;
         }
 
-        execute_one_bundle(&bundle_path, l1_rpc_url, key, None, gas_price_floor_wei).await?;
+        execute_one_bundle_with_gas_floor(&bundle_path, l1_rpc_url, key, None, gas_price_floor_wei)
+            .await?;
     }
 
     logger::success("All bundles applied.");

protocol-ops/src/commands/dev/execute_safe.rs

@@ -150,7 +150,7 @@ pub struct DevExecuteSafeArgs {
 }
 
 pub async fn run(args: DevExecuteSafeArgs) -> anyhow::Result<()> {
-    execute_one_bundle(
+    execute_one_bundle_with_gas_floor(
         &args.safe_file,
         &args.l1_rpc_url,
         args.private_key.expose(),
@@ -171,6 +171,25 @@ pub async fn execute_one_bundle(
     l1_rpc_url: &str,
     private_key: &str,
     out_path: Option<&Path>,
+) -> anyhow::Result<()> {
+    execute_one_bundle_with_gas_floor(
+        safe_file,
+        l1_rpc_url,
+        private_key,
+        out_path,
+        GAS_PRICE_FLOOR_WEI,
+    )
+    .await
+}
+
+/// [`execute_one_bundle`] with an explicit gas price floor (wei). The
+/// four-argument form keeps the default so external crates that link
+/// `protocol_ops` (zksync-os-integration-tests' `zk-deployer`) keep compiling.
+pub async fn execute_one_bundle_with_gas_floor(
+    safe_file: &Path,
+    l1_rpc_url: &str,
+    private_key: &str,
+    out_path: Option<&Path>,
     gas_price_floor_wei: u128,
 ) -> anyhow::Result<()> {
     logger::step(format!("Execute Safe file: {}", safe_file.display()));

protocol-ops/src/commands/ecosystem/broadcast.rs

@@ -24,7 +24,7 @@ use clap::Parser;
 use serde::Deserialize;
 
 use crate::commands::dev::execute_safe::{
-    execute_one_bundle, execute_one_bundle_unlocked, parse_gwei,
+    execute_one_bundle_unlocked, execute_one_bundle_with_gas_floor, parse_gwei,
 };
 use crate::common::logger;
 
@@ -168,7 +168,7 @@ pub async fn run(args: UpgradeBroadcastArgs) -> anyhow::Result<()> {
                 .with_context(|| format!("bundle #{} ({})", bundle.index, bundle.file))?;
         } else {
             let key = &key_map[&bundle.target];
-            execute_one_bundle(
+            execute_one_bundle_with_gas_floor(
                 &bundle_path,
                 &args.l1_rpc_url,
                 key,