refactore: improve ensureBalances with warnOnlyRlc option for RLC balance

- Add warnOnlyRlc parameter to ensureBalances function
- Always check native assets (required for transaction fees)
- Allow RLC balance warnings instead of blocking deployment
- Maintain strict RLC checking for app execution
- Improve error messages with better separation of concerns
- Use warnOnlyRlc: true in deploy.ts for flexible deployment

Author: abbesBenayache

cli/src/cli-helpers/ensureBalances.ts

@@ -8,11 +8,13 @@ export async function ensureBalances({
   iexec,
   nRlcMin,
   weiMin,
+  warnOnlyRlc = false,
 }: {
   spinner: Spinner;
   iexec: IExec;
   nRlcMin?: BN;
   weiMin?: BN;
+  warnOnlyRlc?: boolean;
 }): Promise<{
   wei: BN;
   nRLC: BN;
@@ -34,45 +36,72 @@ export async function ensureBalances({
     (chainId !== 134 && totalRlc.isZero()) ||
     (!!nRlcMin && totalRlc.lt(nRlcMin));
 
-  if (!missingNative && !missingRlc) {
-    return {
-      wei,
-      nRLC,
-      stake,
-    };
-  }
-
-  const helpers = [];
+  // Always check native assets - they're required for transaction fees
   if (missingNative) {
     const msg = wei.isZero()
       ? ' - Native balance is empty'
       : ' - Native balance is insufficient';
     const requirement = weiMin
       ? ` (requires ${utils.formatEth(weiMin as BN)} ether)`
       : '';
-    helpers.push(`${msg}${requirement}`);
+
+    spinner.log(
+      warnBox(`Current chain requires native asset to pay transaction fees!
+ 
+Your wallet balance is insufficient:
+${msg}${requirement}
+        
+You can either:
+ - Fund your wallet ${emphasis(address)}
+ - Import another wallet (run ${command('iapp wallet import')})
+ - Select an imported wallet (run ${command('iapp wallet select')})
+ - Use another chain (use option ${command('--chain <name>')})`)
+    );
+    throw Error(`Native balance is insufficient`);
   }
+
+  // For RLC, either warn only or block based on warnOnlyRlc option
   if (missingRlc) {
-    const msg = totalRlc.isZero()
-      ? ' - RLC balance is empty'
-      : ' - RLC balance is insufficient';
-    const requirement = nRlcMin
-      ? ` (requires ${utils.formatRLC(nRlcMin as BN)} RLC)`
-      : '';
-    helpers.push(`${msg}${requirement}`);
-  }
+    if (warnOnlyRlc) {
+      // Just warn for RLC, don't block
+      const msg = totalRlc.isZero()
+        ? ' - RLC balance is empty'
+        : ' - RLC balance is insufficient';
+      const requirement = nRlcMin
+        ? ` (requires ${utils.formatRLC(nRlcMin as BN)} RLC)`
+        : '';
+
+      spinner.warn(
+        `⚠️  Warning: Your wallet has insufficient RLC balance:${msg}${requirement}. You'll need RLC to run your iApp later. Consider funding your wallet ${emphasis(address)} or importing another wallet.`
+      );
+    } else {
+      // Block for RLC (original behavior)
+      const msg = totalRlc.isZero()
+        ? ' - RLC balance is empty'
+        : ' - RLC balance is insufficient';
+      const requirement = nRlcMin
+        ? ` (requires ${utils.formatRLC(nRlcMin as BN)} RLC)`
+        : '';
 
-  spinner.log(
-    warnBox(`Current chain requires ${chainId !== 134 ? 'native asset to pay transaction fees and ' : ''}RLC to pay iApp runs!
+      spinner.log(
+        warnBox(`Current chain requires RLC to pay iApp runs!
  
 Your wallet balance is insufficient:
-${helpers.join('\n')}
+${msg}${requirement}
         
 You can either:
  - Fund your wallet ${emphasis(address)}
  - Import another wallet (run ${command('iapp wallet import')})
  - Select an imported wallet (run ${command('iapp wallet select')})
  - Use another chain (use option ${command('--chain <name>')})`)
-  );
-  throw Error(`Balance is insufficient`);
+      );
+      throw Error(`RLC balance is insufficient`);
+    }
+  }
+
+  return {
+    wei,
+    nRLC,
+    stake,
+  };
 }

cli/src/cmd/deploy.ts

@@ -22,6 +22,7 @@ import { hintBox } from '../cli-helpers/box.js';
 import { addDeploymentData } from '../utils/cacheExecutions.js';
 import { deployTdxApp, getIExecTdx } from '../utils/tdx-poc.js';
 import { useTdx } from '../utils/featureFlags.js';
+import { ensureBalances } from '../cli-helpers/ensureBalances.js';
 import { warnBeforeTxFees } from '../cli-helpers/warnBeforeTxFees.js';
 
 export async function deploy({ chain }: { chain?: string }) {
@@ -45,21 +46,8 @@ export async function deploy({ chain }: { chain?: string }) {
       iexec = getIExec({ ...chainConfig, signer });
     }
 
-    // Check balance and show warning if no RLC
-    const chainId = await iexec.config.resolveChainId();
-    const address = await iexec.wallet.getAddress();
-    const [{ nRLC }, { stake }] = await Promise.all([
-      iexec.wallet.checkBalances(address),
-      iexec.account.checkBalance(address),
-    ]);
-
-    const totalRlc = stake.add(nRLC);
-
-    if (totalRlc.isZero() && chainId !== 134) {
-      spinner.warn(
-        `⚠️  Warning: Your wallet has no RLC balance. You'll need RLC to run your iApp later. Consider funding your wallet ${address} or importing another wallet.`
-      );
-    }
+    // Check balances: always verify native assets for transaction fees, but only warn for RLC
+    await ensureBalances({ spinner, iexec, warnOnlyRlc: true });
 
     const dockerhubUsername = await askForDockerhubUsername({ spinner });
     const dockerhubAccessToken = await askForDockerhubAccessToken({ spinner });