@pushchain/core 6.0.3 → 6.0.5

package/package.json

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

package/src/lib/orchestrator/data-utils.d.ts

@@ -0,0 +1,5 @@
+import type { ExecuteParams } from './orchestrator.types';
+type PayloadData = ExecuteParams['data'];
+export declare function hasExecutablePayloadData(data: PayloadData): boolean;
+export declare function isEmptyPayloadData(data: PayloadData): boolean;
+export {};

package/src/lib/orchestrator/data-utils.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasExecutablePayloadData = hasExecutablePayloadData;
+exports.isEmptyPayloadData = isEmptyPayloadData;
+function hasExecutablePayloadData(data) {
+    return !(data === undefined ||
+        data === '0x' ||
+        (Array.isArray(data) && data.length === 0));
+}
+function isEmptyPayloadData(data) {
+    return !hasExecutablePayloadData(data);
+}
+//# sourceMappingURL=data-utils.js.map

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

@@ -23,6 +23,7 @@ const selectors_1 = require("../../constants/selectors");
 const route_detector_1 = require("../route-detector");
 const cea_utils_1 = require("../cea-utils");
 const payload_builders_1 = require("../payload-builders");
+const data_utils_1 = require("../data-utils");
 const push_chain_1 = require("../../push-chain/push-chain");
 const context_1 = require("./context");
 const helpers_1 = require("./helpers");
@@ -122,7 +123,7 @@ function prepareTransaction(ctx, params, callbacks) {
 // ============================================================================
 function buildHopDescriptor(ctx, params, route, ueaAddress) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         // Pass 0 when user omits gasLimit so the contract uses the per-chain base,
         // except EVM Route 3 where a CEA deploy + sendUniversalTxToUEA needs more
         // than the generic 500k source-chain base.
@@ -258,7 +259,8 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                 }
                 // Build CEA multicalls
                 const ceaMulticalls = [];
-                if (params.data) {
+                const hasData = (0, data_utils_1.hasExecutablePayloadData)(params.data);
+                if (hasData) {
                     if (Array.isArray(params.data)) {
                         ceaMulticalls.push(...params.data);
                     }
@@ -291,42 +293,39 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         });
                     }
                 }
-                else if (params.value) {
-                    // Skip multicall when sending native value to own CEA — gateway deposits directly.
-                    // Self-call with value would revert (CEA._handleMulticall rejects it).
-                    if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
+                else {
+                    const token = ((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount)
+                        ? params.funds.token
+                        : undefined;
+                    if (((_l = params.funds) === null || _l === void 0 ? void 0 : _l.amount) && token && token.mechanism !== 'native') {
+                        const erc20Transfer = (0, viem_1.encodeFunctionData)({
+                            abi: erc20_evm_1.ERC20_EVM,
+                            functionName: 'transfer',
+                            args: [target.address, params.funds.amount],
+                        });
                         ceaMulticalls.push({
-                            to: target.address,
-                            value: params.value,
-                            data: '0x',
+                            to: token.address,
+                            value: BigInt(0),
+                            data: erc20Transfer,
                         });
                     }
-                }
-                else if ((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount) {
-                    // Funds-only transfer (no data, no value). Without this branch the
-                    // CEA multicall is empty and relayed funds stay in the CEA instead
-                    // of reaching the caller's recipient.
-                    const token = params.funds.token;
-                    if (token) {
-                        if (token.mechanism === 'native') {
-                            if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
-                                ceaMulticalls.push({
-                                    to: target.address,
-                                    value: params.funds.amount,
-                                    data: '0x',
-                                });
-                            }
-                        }
-                        else {
-                            const erc20Transfer = (0, viem_1.encodeFunctionData)({
-                                abi: erc20_evm_1.ERC20_EVM,
-                                functionName: 'transfer',
-                                args: [target.address, params.funds.amount],
+                    if (params.value) {
+                        // Skip multicall when sending native value to own CEA — gateway deposits directly.
+                        // Self-call with value would revert (CEA._handleMulticall rejects it).
+                        if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
+                            ceaMulticalls.push({
+                                to: target.address,
+                                value: params.value,
+                                data: '0x',
                             });
+                        }
+                    }
+                    else if (((_m = params.funds) === null || _m === void 0 ? void 0 : _m.amount) && (token === null || token === void 0 ? void 0 : token.mechanism) === 'native') {
+                        if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
                             ceaMulticalls.push({
-                                to: token.address,
-                                value: BigInt(0),
-                                data: erc20Transfer,
+                                to: target.address,
+                                value: params.funds.amount,
+                                data: '0x',
                             });
                         }
                     }
@@ -334,7 +333,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                 // Determine PRC-20 token and burn amount
                 let prc20Token = selectors_1.ZERO_ADDRESS;
                 let burnAmount = BigInt(0);
-                if ((_l = params.funds) === null || _l === void 0 ? void 0 : _l.amount) {
+                if ((_o = params.funds) === null || _o === void 0 ? void 0 : _o.amount) {
                     const token = params.funds.token;
                     if (token) {
                         prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
@@ -345,7 +344,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
                     burnAmount = params.value;
                 }
-                else if (params.data) {
+                else if ((0, data_utils_1.hasExecutablePayloadData)(params.data)) {
                     // PAYLOAD-only (no value transfer): still need native PRC-20 token for
                     // chain namespace lookup + gas fees, but burn amount must be zero.
                     // Matches the direct executeUoaToCea path (route-handlers.ts).
@@ -379,7 +378,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
             case route_detector_1.TransactionRoute.CEA_TO_PUSH: {
                 // Route 3: Build CEA multicalls for sendUniversalTxFromCEA
                 const sourceChain = params.from.chain;
-                const seedAmount = (_m = params.value) !== null && _m !== void 0 ? _m : BigInt(0);
+                const seedAmount = (_p = params.value) !== null && _p !== void 0 ? _p : BigInt(0);
                 if (isValueOnlyNativeSeedToOwnUea(params, ueaAddress)) {
                     return Object.assign(Object.assign({}, baseDescriptor), { sourceChain, burnAmount: BigInt(0), gasToken: selectors_1.ZERO_ADDRESS, gasFee: BigInt(0), nativeSeedOnly: true, nativeSeedAmount: seedAmount });
                 }
@@ -399,7 +398,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         Buffer.from(ceaPda.toBytes()).toString('hex'));
                     let amount = BigInt(0);
                     let prc20Token;
-                    if (((_o = params.funds) === null || _o === void 0 ? void 0 : _o.amount) && params.funds.amount > BigInt(0)) {
+                    if (((_q = params.funds) === null || _q === void 0 ? void 0 : _q.amount) && params.funds.amount > BigInt(0)) {
                         amount = params.funds.amount;
                         const token = params.funds.token;
                         if (token && token.address) {
@@ -447,14 +446,14 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         gasFee,
                         gasPrice, gasLimit: effectiveGasLimit, sizing });
                 }
-                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_p = ctx.rpcUrls[sourceChain]) === null || _p === void 0 ? void 0 : _p[0]);
+                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_r = ctx.rpcUrls[sourceChain]) === null || _r === void 0 ? void 0 : _r[0]);
                 // CEA auto-deploys on-chain: Vault.finalizeUniversalTx calls CEAFactory.deployCEA()
                 // if CEA doesn't exist yet. No SDK-side blocking needed.
                 // Determine token/amount for the inbound
                 let tokenAddress = selectors_1.ZERO_ADDRESS;
                 let amount = BigInt(0);
                 let nativeValue = BigInt(0);
-                if ((_q = params.funds) === null || _q === void 0 ? void 0 : _q.amount) {
+                if ((_s = params.funds) === null || _s === void 0 ? void 0 : _s.amount) {
                     const token = params.funds.token;
                     if (token) {
                         if (token.mechanism === 'native') {
@@ -644,16 +643,11 @@ 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 isEmptyPayloadData(data) {
-    return (data === undefined ||
-        data === '0x' ||
-        (Array.isArray(data) && data.length === 0));
-}
 function isValueOnlyNativeSeedToOwnUea(params, ueaAddress) {
     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) &&
-        isEmptyPayloadData(params.data) &&
+        (0, data_utils_1.isEmptyPayloadData)(params.data) &&
         typeof params.to === 'string' &&
         params.to.toLowerCase() === ueaAddress.toLowerCase());
 }
@@ -1058,7 +1052,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                     // UEA multicall so no nested outbound is needed.
                     const mergedHopMulticalls = [];
                     for (const h of segment.hops) {
-                        if (((_j = h === null || h === void 0 ? void 0 : h.params) === null || _j === void 0 ? void 0 : _j.data) || ((_k = h === null || h === void 0 ? void 0 : h.params) === null || _k === void 0 ? void 0 : _k.value)) {
+                        if ((0, data_utils_1.hasExecutablePayloadData)((_j = h === null || h === void 0 ? void 0 : h.params) === null || _j === void 0 ? void 0 : _j.data) || ((_k = h === null || h === void 0 ? void 0 : h.params) === null || _k === void 0 ? void 0 : _k.value)) {
                             const hopCalls = (0, payload_builders_1.buildExecuteMulticall)({
                                 execute: {
                                     to: h.params.to,
@@ -1066,6 +1060,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                                     data: h.params.data,
                                 },
                                 ueaAddress,
+                                allowSelfValueCall: true,
                             });
                             mergedHopMulticalls.push(...hopCalls);
                         }
@@ -1270,6 +1265,31 @@ function composeCascade(ctx, segments, ueaAddress, ueaBalance, ueaNonce) {
 // ============================================================================
 // createCascadedBuilder
 // ============================================================================
+function txHashFromProgressEvent(event) {
+    var _a, _b, _c, _d;
+    const response = event.response;
+    return (_d = (_a = response === null || response === void 0 ? void 0 : response.txHash) !== null && _a !== void 0 ? _a : (_c = (_b = response === null || response === void 0 ? void 0 : response.response) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.hash) !== null && _d !== void 0 ? _d : '';
+}
+function withMultihopRootProgressMapping(ctx, run) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const originalHook = ctx.progressHook;
+        if (!originalHook)
+            return run();
+        ctx.progressHook = (event) => {
+            if (event.id === progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_01) {
+                originalHook(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99](txHashFromProgressEvent(event)));
+                return;
+            }
+            originalHook(event);
+        };
+        try {
+            return yield run();
+        }
+        finally {
+            ctx.progressHook = originalHook;
+        }
+    });
+}
 function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
     return {
         send: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -1298,6 +1318,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                         },
                     ],
                     hopCount: 1,
+                    finalTxHash: response.hash,
                     waitForAll: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                         return ({
                             success: true,
@@ -1310,6 +1331,8 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     txHash: response.hash,
                                 },
                             ],
+                            finalTxHash: response.hash,
+                            finalTxResponse: singleRoute1Result,
                         });
                     }),
                     wait: (opts) => tslib_1.__awaiter(this, void 0, void 0, function* () { return singleRoute1Result.waitForAll(opts); }),
@@ -1333,6 +1356,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                         },
                     ],
                     hopCount: 1,
+                    finalTxHash: response.hash,
                     waitForAll: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                         return ({
                             success: true,
@@ -1345,6 +1369,8 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     txHash: response.hash,
                                 },
                             ],
+                            finalTxHash: response.hash,
+                            finalTxResponse: singleRoute2Result,
                         });
                     }),
                     wait: (opts) => tslib_1.__awaiter(this, void 0, void 0, function* () { return singleRoute2Result.waitForAll(opts); }),
@@ -1385,7 +1411,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                 value: cascadeRequiredNativeValue,
                 data: composedMulticalls,
             };
-            const response = yield callbacks.executeFn(executeParams);
+            const response = yield withMultihopRootProgressMapping(ctx, () => callbacks.executeFn(executeParams));
             // Build hop info for tracking
             const hopInfos = hops.map((hop, index) => ({
                 hopIndex: index,
@@ -1463,6 +1489,34 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                             return;
                         emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_999_03](failedIdx0 + 1, totalHops));
                     };
+                    const emitRouteIntermediateComplete = (hop, txHash) => {
+                        var _a;
+                        if (!isMulti)
+                            return;
+                        const n = hop.hopIndex + 1;
+                        if (n >= totalHops)
+                            return; // final terminal is 999-01
+                        const resolvedTxHash = (_a = txHash !== null && txHash !== void 0 ? txHash : hop.txHash) !== null && _a !== void 0 ? _a : response.hash;
+                        if (hop.route === 'UOA_TO_PUSH') {
+                            emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99](resolvedTxHash));
+                            return;
+                        }
+                        if (hop.route === 'UOA_TO_CEA') {
+                            emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_299_99](hop.executionChain, resolvedTxHash));
+                            return;
+                        }
+                        if (hop.route === 'CEA_TO_PUSH') {
+                            emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_99](hop.executionChain, resolvedTxHash));
+                        }
+                    };
+                    const buildCompletionResult = (success, failedAt) => {
+                        var _a, _b;
+                        const finalTxHash = (_b = (_a = [...hopInfos]
+                            .reverse()
+                            .find((hop) => hop.status === 'confirmed' && hop.txHash)) === null || _a === void 0 ? void 0 : _a.txHash) !== null && _b !== void 0 ? _b : response.hash;
+                        cascadeResponse.finalTxHash = finalTxHash;
+                        return Object.assign({ success, hops: hopInfos, finalTxHash, finalTxResponse: cascadeResponse }, (failedAt !== undefined ? { failedAt } : {}));
+                    };
                     if (isMulti) {
                         emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_001](totalHops, chainLabels));
                     }
@@ -1505,11 +1559,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     });
                                     emitHopEvent(hopHooks.timeout(hop.executionChain, Date.now() - startTime));
                                     emitCascadeTimeout(hop.hopIndex);
-                                    return {
-                                        success: false,
-                                        hops: hopInfos,
-                                        failedAt: hop.hopIndex,
-                                    };
+                                    return buildCompletionResult(false, hop.hopIndex);
                                 }
                                 emitHopStart(hop.hopIndex);
                                 emitHopEvent(hopHooks.awaiting(hop.executionChain));
@@ -1550,7 +1600,12 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     hop.status = 'confirmed';
                                     hop.txHash = displayTxHash;
                                     hop.outboundDetails = userFacingOutboundDetails;
-                                    emitHopEvent(hopHooks.success(userFacingOutboundDetails));
+                                    if (isMulti) {
+                                        emitRouteIntermediateComplete(hop, displayTxHash);
+                                    }
+                                    else {
+                                        emitHopEvent(hopHooks.success(userFacingOutboundDetails));
+                                    }
                                     emitHopComplete(hop.hopIndex);
                                     cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
                                         hopIndex: hop.hopIndex,
@@ -1581,11 +1636,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                         status: 'failed',
                                         elapsed: Date.now() - startTime,
                                     });
-                                    return {
-                                        success: false,
-                                        hops: hopInfos,
-                                        failedAt: hop.hopIndex,
-                                    };
+                                    return buildCompletionResult(false, hop.hopIndex);
                                 }
                             }
                             else {
@@ -1627,7 +1678,12 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                             // guard above, so we only reach here with full details.
                                             if (matchedHop === null || matchedHop === void 0 ? void 0 : matchedHop.outboundDetails) {
                                                 confirmedHops.add(event.hopIndex);
-                                                emitHopEvent(eventHooks.success(matchedHop.outboundDetails));
+                                                if (isMulti) {
+                                                    emitRouteIntermediateComplete(matchedHop, event.txHash);
+                                                }
+                                                else {
+                                                    emitHopEvent(eventHooks.success(matchedHop.outboundDetails));
+                                                }
                                                 emitHopComplete(event.hopIndex);
                                             }
                                         }
@@ -1641,11 +1697,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                         : `Outbound cascade failed at hop ${failedIdx}`;
                                     emitHopEvent((0, progress_route_hooks_1.pickWaitHooks)(failedHop === null || failedHop === void 0 ? void 0 : failedHop.route).failed((_d = failedHop === null || failedHop === void 0 ? void 0 : failedHop.executionChain) !== null && _d !== void 0 ? _d : '', failMsg));
                                     emitCascadeFailed(failedIdx, failMsg);
-                                    return {
-                                        success: false,
-                                        hops: hopInfos,
-                                        failedAt: failedIdx,
-                                    };
+                                    return buildCompletionResult(false, failedIdx);
                                 }
                             }
                             return null;
@@ -1700,11 +1752,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                 inboundHop.status = 'failed';
                                 emitHopEvent(hopHooks.timeout(inboundHop.executionChain, Date.now() - startTime));
                                 emitCascadeTimeout(inboundHop.hopIndex);
-                                return {
-                                    success: false,
-                                    hops: hopInfos,
-                                    failedAt: inboundHop.hopIndex,
-                                };
+                                return buildCompletionResult(false, inboundHop.hopIndex);
                             }
                             emitHopStart(inboundHop.hopIndex);
                             emitHopEvent(hopHooks.awaiting(inboundHop.executionChain));
@@ -1763,11 +1811,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     txHash: failedDisplayTxHash,
                                     elapsed: Date.now() - startTime,
                                 });
-                                return {
-                                    success: false,
-                                    hops: hopInfos,
-                                    failedAt: inboundHop.hopIndex,
-                                };
+                                return buildCompletionResult(false, inboundHop.hopIndex);
                             }
                             const displayExternalTxHash = (_f = (0, helpers_1.toExternalTxHashDisplay)(sourceOutboundDetails.destinationChain, sourceOutboundDetails.externalTxHash)) !== null && _f !== void 0 ? _f : sourceOutboundDetails.externalTxHash;
                             inboundHop.outboundDetails = Object.assign(Object.assign({}, sourceOutboundDetails), { externalTxHash: displayExternalTxHash });
@@ -1808,11 +1852,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     status: 'failed',
                                     elapsed: Date.now() - startTime,
                                 });
-                                return {
-                                    success: false,
-                                    hops: hopInfos,
-                                    failedAt: inboundHop.hopIndex,
-                                };
+                                return buildCompletionResult(false, inboundHop.hopIndex);
                             }
                             if (childInbound.status !== 'confirmed') {
                                 const failMsg = (_h = childInbound.errorMessage) !== null && _h !== void 0 ? _h : 'inbound execution failed on Push Chain';
@@ -1829,16 +1869,17 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     txHash: inboundHop.txHash,
                                     elapsed: Date.now() - startTime,
                                 });
-                                return {
-                                    success: false,
-                                    hops: hopInfos,
-                                    failedAt: inboundHop.hopIndex,
-                                };
+                                return buildCompletionResult(false, inboundHop.hopIndex);
                             }
                             inboundHop.status = 'confirmed';
                             inboundHop.txHash =
                                 childInbound.pushTxHash || displayExternalTxHash;
-                            emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_01](inboundHop.executionChain, childInbound.pushTxHash));
+                            if (isMulti) {
+                                emitRouteIntermediateComplete(inboundHop, inboundHop.txHash);
+                            }
+                            else {
+                                emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_01](inboundHop.executionChain, childInbound.pushTxHash));
+                            }
                             emitHopComplete(inboundHop.hopIndex);
                             cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
                                 hopIndex: inboundHop.hopIndex,
@@ -1864,6 +1905,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                         txHash: childInbound.pushTxHash,
                                         elapsed: Date.now() - startTime,
                                     });
+                                    emitRouteIntermediateComplete(hop, childInbound.pushTxHash);
                                     emitHopComplete(hop.hopIndex);
                                 }
                             }
@@ -1873,7 +1915,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                 return childOutboundFailure;
                         }
                         emitCascadeSuccess();
-                        return { success: true, hops: hopInfos };
+                        return buildCompletionResult(true);
                     }
                     catch (err) {
                         const failedIdx = hopInfos.findIndex((h) => h.status !== 'confirmed');
@@ -1886,11 +1928,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                         else {
                             emitCascadeFailed(failedAt, errMsg);
                         }
-                        return {
-                            success: false,
-                            hops: hopInfos,
-                            failedAt,
-                        };
+                        return buildCompletionResult(false, failedAt);
                     }
                 }),
                 wait: (opts) => tslib_1.__awaiter(this, void 0, void 0, function* () { return cascadeResponse.waitForAll(opts); }),

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

@@ -48,9 +48,8 @@ function printLog(ctx, msg) {
  * Exceptions kept in the stream regardless of route:
  *   - All UEA migration hooks.
  *
- * Separately, the intermediate Push-success markers 199-99-99 (R3) and
- * 299-99 (R2) are suppressed at `fanOut` in response-builder.ts — they're
- * internal transition signals, not consumer-facing spec events.
+ * Multihop-only intermediate success markers (199-99 / 299-99 / 399-99)
+ * are emitted by cascade tracking, not by the single-route wait path.
  */
 const R1_SUPPRESSED_IN_NON_R1 = new Set([
     progress_hook_types_1.PROGRESS_HOOK.SEND_TX_101,

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

@@ -69,7 +69,7 @@ function executeFundsOnly(ctx, execute, eventBuffer, getResponseCallbacks) {
 // ============================================================================
 function executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, lockerContract, bridgeAmount, symbol) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const evmClient = (0, context_1.getOriginEvmClient)(ctx);
         const gatewayAddress = lockerContract;
         const tokenAddr = execute.funds.token.address;
@@ -96,8 +96,28 @@ function executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcU
             nonce: nonce.toString(), deployed,
         }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
         const ueaBalanceForGas = yield ctx.pushClient.getBalance(ueaAddress);
-        const nativeAmount = yield (0, gas_calculator_1.calculateNativeAmountForDeposit)(ctx, chain, BigInt(0), ueaBalanceForGas);
-        (0, context_2.printLog)(ctx, `sendFunds — nativeAmount: ${nativeAmount.toString()}, ueaBalanceForGas: ${ueaBalanceForGas.toString()}`);
+        const gasEstimate = execute.gasLimit || BigInt(1e7);
+        const gasPrice = yield ctx.pushClient.getGasPrice();
+        const requiredGasFee = gasEstimate * gasPrice;
+        const requiredFunds = requiredGasFee + ((_c = execute.value) !== null && _c !== void 0 ? _c : BigInt(0));
+        let nativeAmount = yield (0, gas_calculator_1.calculateNativeAmountForDeposit)(ctx, chain, requiredFunds, ueaBalanceForGas);
+        // For EVM fee-locking, fixed-rate PC→USD sizing can underfund when the
+        // live WPC/native pool prices PC above the SDK's fallback price. Size the
+        // native deposit against the same Push Chain pool used by the gateway.
+        if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.EVM && requiredFunds > ueaBalanceForGas) {
+            const deficit = requiredFunds - ueaBalanceForGas;
+            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 > nativeAmount) {
+                (0, context_2.printLog)(ctx, `sendFunds — pool-based deposit sizing overrides fixed-rate estimate: fixedNative=${nativeAmount.toString()}, ` +
+                    `poolNative=${poolNativeAmount.toString()}, requiredFunds=${requiredFunds.toString()}, ` +
+                    `ueaBalance=${ueaBalanceForGas.toString()}`);
+                nativeAmount = poolNativeAmount;
+            }
+        }
+        (0, context_2.printLog)(ctx, `sendFunds — nativeAmount: ${nativeAmount.toString()}, ueaBalanceForGas: ${ueaBalanceForGas.toString()}, ` +
+            `requiredFunds: ${requiredFunds.toString()}`);
         (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_01);
         (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_02, ueaAddress, deployed);
         (0, context_2.printLog)(ctx, `UEA resolved: ${ueaAddress}, deployed: ${deployed}`);

package/src/lib/orchestrator/internals/preflight.d.ts

@@ -13,8 +13,9 @@
  *   - emits `SEND-TX-203-03` (INFO, sufficient) and lets the caller proceed;
  *   - emits `SEND-TX-203-03` (WARNING, insufficient) and proceeds when
  *     enforceGasCheck is false/omitted; or
- *   - emits `SEND-TX-203-03` (ERROR, insufficient) + `SEND-TX-203-04` and
- *     throws `InsufficientUEABalanceError` when enforceGasCheck is true.
+ *   - emits `SEND-TX-203-03` (WARNING, insufficient) + `SEND-TX-203-04`
+ *     (ERROR, terminal shortfall) and throws `InsufficientUEABalanceError`
+ *     when enforceGasCheck is true.
  *
  * The helper is intentionally not "pure" — it emits hooks and may throw.
  * Callers fetch all balances (so the helper itself does no I/O).

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

@@ -14,8 +14,9 @@
  *   - emits `SEND-TX-203-03` (INFO, sufficient) and lets the caller proceed;
  *   - emits `SEND-TX-203-03` (WARNING, insufficient) and proceeds when
  *     enforceGasCheck is false/omitted; or
- *   - emits `SEND-TX-203-03` (ERROR, insufficient) + `SEND-TX-203-04` and
- *     throws `InsufficientUEABalanceError` when enforceGasCheck is true.
+ *   - emits `SEND-TX-203-03` (WARNING, insufficient) + `SEND-TX-203-04`
+ *     (ERROR, terminal shortfall) and throws `InsufficientUEABalanceError`
+ *     when enforceGasCheck is true.
  *
  * The helper is intentionally not "pure" — it emits hooks and may throw.
  * Callers fetch all balances (so the helper itself does no I/O).

package/src/lib/orchestrator/internals/progress-route-hooks.d.ts

@@ -10,7 +10,6 @@ import type { OutboundTxDetails } from '../orchestrator.types';
 import type { ProgressEvent } from '../../progress-hook/progress-hook.types';
 import { TransactionRoute } from '../route-detector';
 export type WaitHookSet = {
-    intermediatePushOk?: (chain: string, pushTxHash: string) => ProgressEvent;
     awaiting: (chain: string) => ProgressEvent;
     polling: (chain: string, elapsedMs: number) => ProgressEvent;
     success: (details: OutboundTxDetails) => ProgressEvent;

package/src/lib/orchestrator/internals/progress-route-hooks.js

@@ -17,7 +17,6 @@ const route_detector_1 = require("../route-detector");
 function pickWaitHooks(route) {
     if (route === route_detector_1.TransactionRoute.UOA_TO_CEA) {
         return {
-            intermediatePushOk: (chain, txHash) => progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_299_99](chain, txHash),
             awaiting: (chain) => progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_209_01](chain),
             polling: (chain, elapsed) => progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_209_02](chain, elapsed),
             success: (details) => progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_299_01](details),
@@ -27,7 +26,6 @@ function pickWaitHooks(route) {
     }
     if (route === route_detector_1.TransactionRoute.CEA_TO_PUSH) {
         return {
-            intermediatePushOk: (_chain, txHash) => progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99_99](txHash),
             awaiting: (chain) => progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_309_01](chain),
             polling: (chain, elapsed) => progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_309_02](chain, elapsed),
             // For R3, the outbound-poll "success" is the source-chain CEA executing