@pushchain/core 6.0.5 → 6.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushchain/core",
-  "version": "6.0.5",
+  "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({

package/src/lib/progress-hook/progress-hook.js

@@ -35,6 +35,7 @@ function preflightSuffix(sufficient, pathTag, enforceGasCheck) {
         ? `INSUFFICIENT (${pathTag}); warning only, proceeding`
         : `INSUFFICIENT (${pathTag})`;
 }
+const displayPathTag = (pathTag) => pathTag === 'CASCADE' ? 'MULTICHAIN' : pathTag;
 /**
  * Classify a sign-time error as either a true wallet user-decline
  * (viem `UserRejectedRequestError`, ethers `ACTION_REJECTED`, EIP-1193 4001,
@@ -275,14 +276,14 @@ const RAW_HOOKS_R1 = {
     },
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_03]: (targetChain, elapsedMs) => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_03,
-        title: `Syncing State with ${friendlyChain(targetChain)} Timeout`,
-        message: `Timed out waiting for UGPC relay to ${targetChain}`,
+        title: 'Syncing State with Push Chain Timeout',
+        message: 'Timed out waiting for relay to Push Chain',
         response: { error: 'relay timeout', chain: targetChain, elapsedMs },
         level: 'ERROR',
     }),
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99]: (txHash) => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99,
-        title: 'Push Chain Tx Completed',
+        title: 'Intermediate Push Chain Tx Completed',
         message: `Intermediate Push Chain tx confirmed: ${txHash}, progressing to next phase`,
         response: { txHash },
         level: 'INFO',
@@ -340,7 +341,7 @@ const RAW_HOOKS_R2 = {
         const enforceGasCheck = extra === null || extra === void 0 ? void 0 : extra.enforceGasCheck;
         return {
             id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_203_03,
-            title: 'Pre-flight Balance Check',
+            title: 'Checking Balance Requirements',
             message: `UEA balance: ${availableStr}; required: ${requiredStr}; ` +
                 preflightSuffix(sufficient, pathTag, enforceGasCheck),
             response: {
@@ -471,7 +472,7 @@ const RAW_HOOKS_R2 = {
     }),
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_299_99]: (targetChain, txHash) => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_299_99,
-        title: `${friendlyChain(targetChain)} Tx Completed`,
+        title: `Intermediate ${friendlyChain(targetChain)} Tx Completed`,
         message: `Intermediate ${friendlyChain(targetChain)} tx confirmed: ${txHash}, progressing to next phase`,
         response: { chain: targetChain, txHash },
         level: 'INFO',
@@ -551,7 +552,7 @@ const RAW_HOOKS_R3 = {
         const enforceGasCheck = extra === null || extra === void 0 ? void 0 : extra.enforceGasCheck;
         return {
             id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_04,
-            title: 'Pre-flight Balance Check',
+            title: 'Checking Balance Requirements',
             message: `UEA balance: ${availableStr}; required: ${requiredStr}; ` +
                 preflightSuffix(sufficient, pathTag, enforceGasCheck),
             response: {
@@ -712,11 +713,7 @@ const RAW_HOOKS_R3 = {
     },
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_03]: (sourceChain, elapsedMs, phase = 'inbound') => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_03,
-        title: phase === 'outbound'
-            ? `Syncing State with ${friendlyChain(sourceChain)} Timeout`
-            : phase === 'push'
-                ? 'Push Chain Tx Timeout'
-                : 'Push Chain Inbound Timeout',
+        title: 'Push Chain Inbound Tx Timeout',
         message: phase === 'outbound'
             ? `Timed out waiting for ${friendlyChain(sourceChain)} relay`
             : phase === 'push'
@@ -736,8 +733,8 @@ const RAW_HOOKS_R3 = {
     }),
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_99]: (sourceChain, txHash) => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_99,
-        title: `${friendlyChain(sourceChain)} Tx Completed`,
-        message: `Intermediate ${friendlyChain(sourceChain)} tx confirmed: ${txHash}, progressing to next phase`,
+        title: `Intermediate ${friendlyChain(sourceChain)} to Push Tx Completed`,
+        message: `Intermediate ${friendlyChain(sourceChain)} to Push tx confirmed: ${txHash}, progressing to next phase`,
         response: { chain: sourceChain, txHash },
         level: 'INFO',
     }),
@@ -824,11 +821,12 @@ const RAW_HOOKS_MULTICHAIN = {
         const availableStr = kind === 'PRC20' ? `${available} units` : (0, formatters_1.formatPc)(available, 4);
         const requiredStr = kind === 'PRC20' ? `${required} units` : (0, formatters_1.formatPc)(required, 4);
         const enforceGasCheck = extra === null || extra === void 0 ? void 0 : extra.enforceGasCheck;
+        const visiblePathTag = displayPathTag(pathTag);
         return {
             id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_03,
-            title: 'Cascade Pre-flight Balance Check',
+            title: 'Checking Balance Requirements',
             message: `UEA balance: ${availableStr}; required: ${requiredStr}; ` +
-                preflightSuffix(sufficient, pathTag, enforceGasCheck),
+                preflightSuffix(sufficient, visiblePathTag, enforceGasCheck),
             response: {
                 required,
                 available,
@@ -849,13 +847,14 @@ const RAW_HOOKS_MULTICHAIN = {
         var _a, _b, _c, _d;
         const kind = (_a = extra === null || extra === void 0 ? void 0 : extra.kind) !== null && _a !== void 0 ? _a : 'NATIVE';
         const shortfallStr = kind === 'PRC20' ? `${shortfall} units` : (0, formatters_1.formatPc)(shortfall, 4);
+        const visiblePathTag = displayPathTag(pathTag);
         const remediation = kind === 'PRC20'
             ? `Bridge the burn token (${(_b = extra === null || extra === void 0 ? void 0 : extra.burnToken) !== null && _b !== void 0 ? _b : 'PRC-20'}) to UEA ${ueaAddress} before retrying.`
             : `Bridge >=${shortfallStr} to UEA ${ueaAddress} before retrying.`;
         return {
             id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_04,
-            title: 'Cascade Insufficient UEA Balance',
-            message: `Shortfall ${shortfallStr} on ${pathTag}. ${remediation}`,
+            title: 'Multichain Insufficient UEA Balance',
+            message: `Shortfall ${shortfallStr} on ${visiblePathTag}. ${remediation}`,
             response: {
                 required,
                 available,
@@ -871,9 +870,9 @@ const RAW_HOOKS_MULTICHAIN = {
     },
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_05]: (quoted, threshold, gasToken, pathTag) => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_05,
-        title: 'Cascade SVM Native-Value Warn Threshold',
+        title: 'Multichain SVM Native-Value Warn Threshold',
         message: `Buffered pool quote ${(0, formatters_1.formatPc)(quoted, 4)} exceeds warn threshold ${(0, formatters_1.formatPc)(threshold, 4)} ` +
-            `for ${gasToken} (${pathTag}). Pool may be skewed or quote is unusually large. ` +
+            `for ${gasToken} (${displayPathTag(pathTag)}). Pool may be skewed or quote is unusually large. ` +
             `No action taken — pre-flight will determine if balance covers it.`,
         response: { quoted, threshold, gasToken, pathTag },
         level: 'INFO',
@@ -888,15 +887,15 @@ const RAW_HOOKS_MULTICHAIN = {
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_999_02]: (failedAt, total, errorMessage) => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_999_02,
         title: 'Multichain Transactions Failed',
-        message: `Cascade failed at hop ${failedAt} of ${total}: ${errorMessage}`,
+        message: `Multichain failed at hop ${failedAt} of ${total}: ${errorMessage}`,
         response: { failedAt, total, error: errorMessage },
         level: 'ERROR',
     }),
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_999_03]: (failedAt, total) => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_999_03,
         title: 'Multichain Transactions Timeout',
-        message: `Cascade timed out at hop ${failedAt} of ${total}`,
-        response: { failedAt, total, error: 'cascade timeout' },
+        message: `Multichain timed out at hop ${failedAt} of ${total}`,
+        response: { failedAt, total, error: 'multichain timeout' },
         level: 'ERROR',
     }),
 };