@pushchain/core 5.1.4-alpha.8 → 5.1.4-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushchain/core",
-  "version": "5.1.4-alpha.8",
+  "version": "5.1.4-alpha.9",
   "homepage": "https://push.org",
   "keywords": [
     "pushchain",

package/src/lib/orchestrator/internals/route-handlers.js

@@ -283,19 +283,22 @@ function executeUoaToCea(ctx, params, executeFn) {
         // pool's slot0, computes the true cost, and adds a 2x buffer.
         // This matches the SVM path (executeUoaToCeaSvm) which already uses this.
         // Excess msg.value is refunded by the contract's swapAndBurnGas.
+        const EVM_NATIVE_VALUE_TARGET = BigInt(200e18); // 200 UPC
+        const EVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for tx overhead
         if (universalCoreAddress && gasFee > BigInt(0)) {
-            const estimated = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, ueaBalance);
+            // When UEA balance is 0, pass EVM_NATIVE_VALUE_TARGET as the balance hint
+            // so the pool estimate isn't capped/fallback'd to zero.
+            const balanceHint = ueaBalance > BigInt(0) ? ueaBalance : EVM_NATIVE_VALUE_TARGET;
+            const estimated = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, balanceHint);
             if (estimated > nativeValueForGas) {
                 (0, context_1.printLog)(ctx, `executeUoaToCea — pool-price estimate: ${estimated.toString()} ` +
                     `(was ${nativeValueForGas.toString()}), UEA balance: ${ueaBalance.toString()}`);
                 nativeValueForGas = estimated;
             }
         }
-        // Balance-aware cap: avoid draining the entire UEA balance for gas.
+        // Balance-aware adjustment: avoid draining the entire UEA balance for gas.
         // The contract's swapAndBurnGas does exactOutputSingle and refunds excess PC,
         // so overshooting within balance is safe.
-        const EVM_NATIVE_VALUE_TARGET = BigInt(200e18); // 200 UPC
-        const EVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for tx overhead
         const currentBalance = ueaBalance;
         let adjustedValue;
         if (currentBalance > EVM_NATIVE_VALUE_TARGET + EVM_GAS_RESERVE) {
@@ -309,10 +312,21 @@ function executeUoaToCea(ctx, params, executeFn) {
             const available = currentBalance - EVM_GAS_RESERVE;
             adjustedValue = nativeValueForGas < available ? nativeValueForGas : available;
         }
+        else if (!isUEADeployed) {
+            // Fresh wallet: UEA not deployed, fee-locking WILL run and deposit funds.
+            // Use EVM_NATIVE_VALUE_TARGET (200 UPC) — fee-locking auto-covers this
+            // because requiredFunds includes nativeValueForGas, and lockFee converts
+            // the UPC amount to USD and deposits the equivalent ETH.
+            // The contract's swapAndBurnGas refunds any excess.
+            // If pool estimate produced a usable value, prefer it (capped at 200 UPC).
+            adjustedValue = nativeValueForGas > EVM_NATIVE_VALUE_TARGET
+                ? EVM_NATIVE_VALUE_TARGET
+                : nativeValueForGas > BigInt(0) ? nativeValueForGas : EVM_NATIVE_VALUE_TARGET;
+            (0, context_1.printLog)(ctx, `executeUoaToCea — fresh wallet (UEA not deployed): using ${adjustedValue.toString()} for nativeValueForGas`);
+        }
         else {
-            // Very low/zero balance (fresh wallet). The pool-price estimate (now in
-            // nativeValueForGas) is accurate. Fee-locking will deposit enough UPC
-            // because requiredFunds includes this value, and lockFee floors at $1.
+            // Deployed UEA with near-zero balance: best-effort with pool/1M estimate.
+            // User may need to add funds to UEA manually.
             adjustedValue = nativeValueForGas;
         }
         if (adjustedValue !== nativeValueForGas) {