@layr-labs/ecloud-cli 0.4.0 → 0.4.1

package/dist/commands/compute/app/upgrade.js

@@ -312,7 +312,7 @@ function listApps(environment) {
 
 // src/utils/version.ts
 function getCliVersion() {
-  return true ? "0.4.0" : "0.0.0";
+  return true ? "0.4.1" : "0.0.0";
 }
 function getClientId() {
   return `ecloud-cli/v${getCliVersion()}`;
@@ -1276,6 +1276,7 @@ async function getEnvironmentInteractive(environment) {
 var MAX_IMAGE_SIZE = 4 * 1024 * 1024;
 
 // src/flags.ts
+import { formatEther, parseGwei } from "viem";
 var commonFlags = {
   environment: Flags.string({
     required: false,
@@ -1297,8 +1298,60 @@ var commonFlags = {
     required: false,
     description: "Enable verbose logging (default: false)",
     default: false
+  }),
+  "max-fee-per-gas": Flags.string({
+    required: false,
+    description: "Override max fee per gas in gwei (e.g., 50)",
+    env: "ECLOUD_MAX_FEE_PER_GAS"
+  }),
+  "max-priority-fee": Flags.string({
+    required: false,
+    description: "Override max priority fee per gas in gwei (e.g., 5)",
+    env: "ECLOUD_MAX_PRIORITY_FEE"
+  }),
+  nonce: Flags.string({
+    required: false,
+    description: 'Override transaction nonce (integer or "latest" to replace a stuck transaction)'
   })
 };
+async function applyTxOverrides(estimate, flags, opts) {
+  const maxFeeStr = flags["max-fee-per-gas"];
+  const priorityFeeStr = flags["max-priority-fee"];
+  const nonceStr = flags.nonce;
+  if (!maxFeeStr && !priorityFeeStr && nonceStr == null) return estimate;
+  let { gasLimit, maxFeePerGas, maxPriorityFeePerGas } = estimate;
+  if (maxFeeStr) {
+    maxFeePerGas = parseGwei(maxFeeStr);
+  }
+  if (priorityFeeStr) {
+    maxPriorityFeePerGas = parseGwei(priorityFeeStr);
+  }
+  if (maxFeePerGas < maxPriorityFeePerGas) {
+    maxFeePerGas = maxPriorityFeePerGas;
+  }
+  const maxCostWei = gasLimit * maxFeePerGas;
+  const eth = Number(formatEther(maxCostWei));
+  const maxCostEth = eth.toFixed(6).replace(/\.?0+$/, "") || "<0.000001";
+  let nonce;
+  if (nonceStr != null) {
+    if (nonceStr === "latest") {
+      if (!opts?.publicClient || !opts?.address) {
+        throw new Error("--nonce latest requires a public client and address");
+      }
+      nonce = await opts.publicClient.getTransactionCount({
+        address: opts.address,
+        blockTag: "latest"
+      });
+    } else {
+      const parsed = Number(nonceStr);
+      if (!Number.isInteger(parsed) || parsed < 0) {
+        throw new Error(`Invalid nonce: "${nonceStr}". Must be a non-negative integer or "latest".`);
+      }
+      nonce = parsed;
+    }
+  }
+  return { gasLimit, maxFeePerGas, maxPriorityFeePerGas, maxCostWei, maxCostEth, nonce };
+}
 async function validateCommonFlags(flags, options) {
   flags["environment"] = await getEnvironmentInteractive(flags["environment"]);
   if (options?.requirePrivateKey !== false) {
@@ -1756,13 +1809,13 @@ var AppUpgrade = class _AppUpgrade extends Command {
       const buildFromDockerfile = dockerfilePath !== "";
       const imageRef = verifiableImageUrl ? verifiableImageUrl : await getImageReferenceInteractive(flags["image-ref"], buildFromDockerfile);
       envFilePath = envFilePath ?? await getEnvFileInteractive(flags["env-file"]);
+      const { publicClient, walletClient, address } = createViemClients({
+        privateKey,
+        rpcUrl,
+        environment
+      });
       let currentInstanceType = "";
       try {
-        const { publicClient, walletClient } = createViemClients({
-          privateKey,
-          rpcUrl,
-          environment
-        });
         const userApiClient = new UserApiClient3(
           environmentConfig,
           walletClient,
@@ -1808,8 +1861,16 @@ var AppUpgrade = class _AppUpgrade extends Command {
         logVisibility,
         resourceUsageMonitoring
       });
+      const finalTx = await applyTxOverrides(gasEstimate, flags, { publicClient, address });
+      if (flags["max-fee-per-gas"] || flags["max-priority-fee"]) {
+        this.log(chalk2.yellow(`
+Gas override active \u2014 max fee: ${flags["max-fee-per-gas"] || "estimated"} gwei, priority fee: ${flags["max-priority-fee"] || "estimated"} gwei`));
+      }
+      if (finalTx.nonce != null) {
+        this.log(chalk2.yellow(`Nonce override active \u2014 nonce: ${finalTx.nonce}`));
+      }
       this.log(`
-Estimated transaction cost: ${chalk2.cyan(gasEstimate.maxCostEth)} ETH`);
+Estimated transaction cost: ${chalk2.cyan(finalTx.maxCostEth)} ETH`);
       if (isMainnet(environmentConfig)) {
         const confirmed = await confirm(`Continue with upgrade?`);
         if (!confirmed) {
@@ -1818,7 +1879,7 @@ ${chalk2.gray(`Upgrade cancelled`)}`);
           return;
         }
       }
-      const res = await compute.app.executeUpgrade(prepared, gasEstimate);
+      const res = await compute.app.executeUpgrade(prepared, finalTx);
       await compute.app.watchUpgrade(res.appId);
       try {
         const cwd = process.env.INIT_CWD || process.cwd();