@pushchain/core 5.1.4-alpha.10 → 5.1.4-alpha.11

package/package.json

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

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

@@ -757,9 +757,43 @@ function executeCeaToPush(ctx, params, executeFn) {
         const currentBalance = ueaBalance;
         // Cosmos-EVM tx overhead costs ~1 PC per operation; 3 PC covers approve(s) + buffer.
         const OUTBOUND_GAS_RESERVE_R3 = BigInt(3e18);
-        if (currentBalance > OUTBOUND_GAS_RESERVE_R3 && currentBalance - OUTBOUND_GAS_RESERVE_R3 > nativeValueForGas) {
-            const adjustedValue = currentBalance - OUTBOUND_GAS_RESERVE_R3;
-            (0, context_1.printLog)(ctx, `executeCeaToPush — adjusting nativeValueForGas from ${nativeValueForGas.toString()} to ${adjustedValue.toString()} (UEA balance: ${currentBalance.toString()})`);
+        const ROUTE3_MINIMUM_DEPOSIT_USD = utils_1.Utils.helpers.parseUnits('10', 8); // $10
+        // For fresh wallets: predict post-fee-locking UPC balance using the same
+        // Uniswap V3 quoter the chain uses (pETH → WPC swap), matching Route 2 logic.
+        let effectiveBalance = currentBalance;
+        if (!isUEADeployed && effectiveBalance <= OUTBOUND_GAS_RESERVE_R3) {
+            const signerChain = ctx.universalSigner.account.chain;
+            const ethPrice = yield new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(signerChain);
+            const nativeAmountETH = ethPrice > BigInt(0)
+                ? (ROUTE3_MINIMUM_DEPOSIT_USD * BigInt(1e18) + (ethPrice - BigInt(1))) / ethPrice + BigInt(1)
+                : BigInt(0);
+            if (nativeAmountETH > BigInt(0)) {
+                const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(signerChain, ctx.pushNetwork);
+                const predictedUPC = yield (0, gas_calculator_1.estimateDepositFromLockedNative)(ctx, nativeAmountETH, originPrc20);
+                if (predictedUPC > BigInt(0)) {
+                    effectiveBalance = (predictedUPC * BigInt(90)) / BigInt(100);
+                    (0, context_1.printLog)(ctx, `executeCeaToPush — fresh wallet: Uniswap quote predicts ${predictedUPC.toString()} UPC ` +
+                        `from ${nativeAmountETH.toString()} wei pETH, using ${effectiveBalance.toString()} (90%)`);
+                }
+            }
+        }
+        // Balance-aware adjustment matching Route 2 logic:
+        // - If balance exceeds target + reserve: use target (200 UPC)
+        // - If balance exceeds reserve: use balance - reserve (maximize within budget)
+        // - Otherwise: keep original nativeValueForGas (fallback)
+        const EVM_NATIVE_VALUE_TARGET_R3 = BigInt(200e18); // 200 UPC
+        let adjustedValue;
+        if (effectiveBalance > EVM_NATIVE_VALUE_TARGET_R3 + OUTBOUND_GAS_RESERVE_R3) {
+            adjustedValue = EVM_NATIVE_VALUE_TARGET_R3;
+        }
+        else if (effectiveBalance > OUTBOUND_GAS_RESERVE_R3) {
+            adjustedValue = effectiveBalance - OUTBOUND_GAS_RESERVE_R3;
+        }
+        else {
+            adjustedValue = nativeValueForGas;
+        }
+        if (adjustedValue !== nativeValueForGas) {
+            (0, context_1.printLog)(ctx, `executeCeaToPush — adjusting nativeValueForGas from ${nativeValueForGas.toString()} to ${adjustedValue.toString()} (effective balance: ${effectiveBalance.toString()})`);
             nativeValueForGas = adjustedValue;
         }
         // 12. Build Push Chain multicalls (approvals + sendUniversalTxOutbound)
@@ -776,17 +810,11 @@ function executeCeaToPush(ctx, params, executeFn) {
         // Sum native values from multicall entries for proper fee calculation
         const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
         // 13. Execute through the normal execute() flow
-        const executeParams = {
-            to: ueaAddress,
-            value: multicallNativeValue, // ensures correct requiredFunds calculation
-            data: pushChainMulticalls,
-            _ueaStatus: {
+        const executeParams = Object.assign({ to: ueaAddress, value: multicallNativeValue, data: pushChainMulticalls, _ueaStatus: {
                 isDeployed: isUEADeployed,
                 nonce: ueaNonce,
                 balance: ueaBalance,
-            },
-            _skipFeeLocking: true, // outbound executes on Push Chain, no external fee locking
-        };
+            }, _skipFeeLocking: isUEADeployed }, (!isUEADeployed ? { _minimumDepositUsd: ROUTE3_MINIMUM_DEPOSIT_USD } : {}));
         const response = yield executeFn(executeParams);
         // Add Route 3 context to response
         response.chain = sourceChain;
@@ -920,17 +948,11 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         // Sum native values from multicall entries for proper fee calculation
         const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
         // Execute through the normal execute() flow
-        const executeParams = {
-            to: ueaAddress,
-            value: multicallNativeValue, // ensures correct requiredFunds calculation
-            data: pushChainMulticalls,
-            _ueaStatus: {
+        const executeParams = Object.assign({ to: ueaAddress, value: multicallNativeValue, data: pushChainMulticalls, _ueaStatus: {
                 isDeployed: isUEADeployed,
                 nonce: ueaNonce,
                 balance: ueaBalance,
-            },
-            _skipFeeLocking: true, // outbound executes on Push Chain, no external fee locking
-        };
+            }, _skipFeeLocking: isUEADeployed }, (!isUEADeployed ? { _minimumDepositUsd: utils_1.Utils.helpers.parseUnits('10', 8) } : {}));
         const response = yield executeFn(executeParams);
         // Add Route 3 SVM context to response
         response.chain = sourceChain;