@pushchain/core 6.0.6 → 6.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushchain/core",
-  "version": "6.0.6",
+  "version": "6.0.7",
   "homepage": "https://push.org",
   "keywords": [
     "pushchain",

package/src/lib/orchestrator/internals/cascade.js

@@ -146,7 +146,9 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
             case route_detector_1.TransactionRoute.UOA_TO_PUSH: {
                 // Route 1: Build Push Chain multicalls
                 const seedAmount = (_d = params.value) !== null && _d !== void 0 ? _d : BigInt(0);
-                if (isValueOnlyNativeSeedToOwnUea(params, ueaAddress)) {
+                if (isValueOnlyNativeSeedToOwnUea(params, ueaAddress, {
+                    allowFunds: true,
+                })) {
                     return Object.assign(Object.assign({}, baseDescriptor), { pushMulticalls: [], nativeSeedOnly: true, nativeSeedAmount: seedAmount });
                 }
                 const executeParams = (0, helpers_1.toExecuteParams)(params);
@@ -643,14 +645,44 @@ function getSegmentType(route) {
 function sumMulticallNativeValue(multicalls) {
     return (multicalls !== null && multicalls !== void 0 ? multicalls : []).reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
 }
-function isValueOnlyNativeSeedToOwnUea(params, ueaAddress) {
+function isValueOnlyNativeSeedToOwnUea(params, ueaAddress, options) {
     var _a, _b;
     return (((_a = params.value) !== null && _a !== void 0 ? _a : BigInt(0)) > BigInt(0) &&
-        !((_b = params.funds) === null || _b === void 0 ? void 0 : _b.amount) &&
+        ((options === null || options === void 0 ? void 0 : options.allowFunds) === true || !((_b = params.funds) === null || _b === void 0 ? void 0 : _b.amount)) &&
         (0, data_utils_1.isEmptyPayloadData)(params.data) &&
         typeof params.to === 'string' &&
         params.to.toLowerCase() === ueaAddress.toLowerCase());
 }
+function getRootFundsDeposit(hops) {
+    let rootFunds;
+    for (const hop of hops) {
+        // Only the leading Push execution segment is submitted through the root
+        // source-chain gateway tx. Later UOA_TO_PUSH hops may be nested inside a
+        // Route 3 child inbound and must not attach origin-chain funds to root.
+        if (hop.route !== 'UOA_TO_PUSH')
+            break;
+        const funds = hop.params.funds;
+        if (!(funds === null || funds === void 0 ? void 0 : funds.amount) || funds.amount <= BigInt(0))
+            continue;
+        if (!rootFunds) {
+            rootFunds = Object.assign({}, funds);
+            continue;
+        }
+        const currentToken = rootFunds.token;
+        const nextToken = funds.token;
+        const sameToken = currentToken === nextToken ||
+            (!!currentToken &&
+                !!nextToken &&
+                currentToken.address.toLowerCase() === nextToken.address.toLowerCase() &&
+                currentToken.symbol === nextToken.symbol &&
+                currentToken.mechanism === nextToken.mechanism);
+        if (!sameToken) {
+            throw new Error('Cascade can only bridge one origin token in root Push execution hops. Split mixed-token deposits into separate transactions.');
+        }
+        rootFunds = Object.assign(Object.assign({}, rootFunds), { amount: rootFunds.amount + funds.amount });
+    }
+    return rootFunds;
+}
 function isNativeSeedOnlyHop(hop) {
     return (hop === null || hop === void 0 ? void 0 : hop.nativeSeedOnly) === true;
 }
@@ -1411,6 +1443,10 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                 value: cascadeRequiredNativeValue,
                 data: composedMulticalls,
             };
+            const rootFundsDeposit = getRootFundsDeposit(hops);
+            if (rootFundsDeposit) {
+                executeParams.funds = rootFundsDeposit;
+            }
             const response = yield withMultihopRootProgressMapping(ctx, () => callbacks.executeFn(executeParams));
             // Build hop info for tracking
             const hopInfos = hops.map((hop, index) => ({

package/src/lib/orchestrator/internals/execute-funds-payload.js

@@ -33,6 +33,7 @@ const svm_bridge_1 = require("./svm-bridge");
 const signing_1 = require("./signing");
 const quote_1 = require("./quote");
 const formatters_1 = require("../../formatters");
+const helpers_1 = require("./helpers");
 function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -111,6 +112,25 @@ function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks
         // Apply sizer floor: Case A pads to $1, Cases B/C pass-through.
         if (depositUsd < r1Sizing.paddedDepositUsd)
             depositUsd = r1Sizing.paddedDepositUsd;
+        // Match funds-only and standard fee-lock sizing: fixed PC→USD conversion can
+        // underfund large PC deposits when the live pETH/WPC pool has meaningful
+        // slippage. Quote the native amount required for the target WPC output and
+        // raise the USD deposit before converting back to source-chain native value.
+        if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.EVM && requiredFunds > ueaBalance) {
+            const deficit = requiredFunds - ueaBalance;
+            const targetWpc = (deficit * BigInt(12)) / BigInt(10);
+            const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(chain, ctx.pushNetwork);
+            const poolNativeAmount = yield (0, gas_calculator_1.estimateNativeForDesiredDeposit)(ctx, targetWpc, originPrc20);
+            if (poolNativeAmount > BigInt(0)) {
+                const poolBasedUsd = (poolNativeAmount * nativeTokenUsdPrice) / oneNativeUnit;
+                if (poolBasedUsd > depositUsd) {
+                    (0, context_1.printLog)(ctx, `sendFundsWithPayload — pool-based deposit sizing overrides fixed-rate estimate: ` +
+                        `fixedUsd=${depositUsd.toString()}, poolBasedUsd=${poolBasedUsd.toString()}, ` +
+                        `requiredFunds=${requiredFunds.toString()}, ueaBalance=${ueaBalance.toString()}`);
+                    depositUsd = poolBasedUsd;
+                }
+            }
+        }
         // If SVM, clamp depositUsd to on-chain Config caps
         if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM) {
             const svmClient = new svm_client_1.SvmClient({