@pushchain/core 6.0.15 → 6.0.17

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

@@ -19,6 +19,7 @@ const web3_js_1 = require("@solana/web3.js");
 const viem_1 = require("viem");
 const erc20_evm_1 = require("../../constants/abi/erc20.evm");
 const chain_1 = require("../../constants/chain");
+const enums_1 = require("../../constants/enums");
 const selectors_1 = require("../../constants/selectors");
 const route_detector_1 = require("../route-detector");
 const cea_utils_1 = require("../cea-utils");
@@ -170,6 +171,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         to: target,
                         senderUea: ueaAddress,
                     });
+                    (0, payload_builders_1.assertSvmPayloadWithinRelayLimit)(svmPayload, `Route 2 SVM ${targetChain}`);
                     let prc20Token = selectors_1.ZERO_ADDRESS;
                     let burnAmount = BigInt(0);
                     if ((_e = params.funds) === null || _e === void 0 ? void 0 : _e.amount) {
@@ -301,7 +303,9 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     }
                 }
                 else {
-                    if (((_m = params.funds) === null || _m === void 0 ? void 0 : _m.amount) && fundsToken && fundsToken.mechanism !== 'native') {
+                    if (((_m = params.funds) === null || _m === void 0 ? void 0 : _m.amount) &&
+                        fundsToken &&
+                        fundsToken.mechanism !== 'native') {
                         const erc20Transfer = (0, viem_1.encodeFunctionData)({
                             abi: erc20_evm_1.ERC20_EVM,
                             functionName: 'transfer',
@@ -675,7 +679,8 @@ function getRootFundsDeposit(hops) {
         const sameToken = currentToken === nextToken ||
             (!!currentToken &&
                 !!nextToken &&
-                currentToken.address.toLowerCase() === nextToken.address.toLowerCase() &&
+                currentToken.address.toLowerCase() ===
+                    nextToken.address.toLowerCase() &&
                 currentToken.symbol === nextToken.symbol &&
                 currentToken.mechanism === nextToken.mechanism);
         if (!sameToken) {
@@ -783,7 +788,7 @@ function getInboundFundingForBurnToken(segments, beforeSegmentIndex, burnToken,
 }
 function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce, options) {
     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, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         let accumulatedPushMulticalls = [];
         let requiredNativeValue = BigInt(0);
         const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
@@ -823,27 +828,38 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
             perOutboundNativeValue =
                 (effectiveUeaBalance - CASCADE_GAS_RESERVE) / BigInt(numOutbounds);
         }
+        let universalCoreAddressForSwap;
+        const getUniversalCoreAddressForSwap = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (!universalCoreAddressForSwap) {
+                universalCoreAddressForSwap =
+                    yield ctx.pushClient.readContract({
+                        address: gatewayPcAddress,
+                        abi: abi_1.UNIVERSAL_GATEWAY_PC,
+                        functionName: 'universalCore',
+                        args: [],
+                    });
+            }
+            return universalCoreAddressForSwap;
+        });
         // Pool-price-based native-value override for SVM outbounds.
         // The flat split above works for EVM gas tokens (pBNB/pETH — cheap per unit),
-        // but pSOL has a much higher WPC/pSOL pool price, so the flat 1 PC split is
-        // insufficient to swap for gasFee wei of pSOL and Uniswap reverts "STF".
-        // Mirror executeUoaToCeaSvm's pool-price read (route-handlers.ts) per SVM segment.
+        // but pSOL has a much higher WPC/pSOL pool price, so a flat balance split can
+        // underfund the gas swap and make Uniswap revert with "STF". Mirror the
+        // direct SVM route handlers' pool-price read for every SVM outbound-bearing
+        // segment, including Route 3 SVM inbound round trips.
         const svmSegments = segments.filter((s) => {
             var _a;
-            return s.type === 'OUTBOUND_TO_CEA' &&
-                ((_a = s.hops[0]) === null || _a === void 0 ? void 0 : _a.isSvmTarget) === true &&
+            return ((s.type === 'OUTBOUND_TO_CEA' && ((_a = s.hops[0]) === null || _a === void 0 ? void 0 : _a.isSvmTarget) === true) ||
+                (s.type === 'INBOUND_FROM_CEA' &&
+                    !isNativeSeedOnlySegment(s) &&
+                    (0, payload_builders_1.isSvmChain)(s.sourceChain))) &&
                 s.gasToken &&
                 s.gasFee &&
                 s.gasFee > BigInt(0);
         });
         const svmNativeValueBySegment = new Map();
         if (svmSegments.length > 0 && effectiveUeaBalance > CASCADE_GAS_RESERVE) {
-            const universalCoreAddress = yield ctx.pushClient.readContract({
-                address: gatewayPcAddress,
-                abi: abi_1.UNIVERSAL_GATEWAY_PC,
-                functionName: 'universalCore',
-                args: [],
-            });
+            const universalCoreAddress = yield getUniversalCoreAddressForSwap();
             // Compute per-SVM budget = ueaBalance − (PC needed for EVM outbounds) − 1 PC safety
             // (outer-tx gas + refund headroom). Pass a huge accountBalance to the estimator so
             // its internal cap is effectively disabled; we cap externally to the per-SVM budget.
@@ -869,7 +885,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                 if (perSvmCap > BigInt(0) && value > perSvmCap) {
                     const cappedValue = perSvmCap >= estimated ? perSvmCap : estimated;
                     if (cappedValue !== perSvmCap) {
-                        (0, context_1.printLog)(ctx, `composeCascade — SVM outbound to ${(_a = seg.hops[0]) === null || _a === void 0 ? void 0 : _a.targetChain}: perSvmCap=${perSvmCap} is below live pool quote=${estimated}; using quote to avoid underfunded gas swap`);
+                        (0, context_1.printLog)(ctx, `composeCascade — SVM outbound to ${(_a = seg.targetChain) !== null && _a !== void 0 ? _a : seg.sourceChain}: perSvmCap=${perSvmCap} is below live pool quote=${estimated}; using quote to avoid underfunded gas swap`);
                     }
                     value = cappedValue;
                 }
@@ -887,10 +903,10 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                     ? estimated * BigInt(5)
                     : UPWARD_BASE_CEILING_CASCADE_SVM;
                 if (value > upwardCeilingCascadeSvm) {
-                    (0, context_1.printLog)(ctx, `composeCascade — SVM outbound to ${(_b = seg.hops[0]) === null || _b === void 0 ? void 0 : _b.targetChain}: capping value from ${value} to upwardCeiling=${upwardCeilingCascadeSvm} (pool quote=${estimated})`);
+                    (0, context_1.printLog)(ctx, `composeCascade — SVM outbound to ${(_b = seg.targetChain) !== null && _b !== void 0 ? _b : seg.sourceChain}: capping value from ${value} to upwardCeiling=${upwardCeilingCascadeSvm} (pool quote=${estimated})`);
                     value = upwardCeilingCascadeSvm;
                 }
-                (0, context_1.printLog)(ctx, `composeCascade — SVM outbound to ${(_c = seg.hops[0]) === null || _c === void 0 ? void 0 : _c.targetChain}: gasFee=${seg.gasFee}, estimatedWpc=${estimated}, flat=${flat}, perSvmCap=${perSvmCap}, upwardCeiling=${upwardCeilingCascadeSvm}, chosen=${value}`);
+                (0, context_1.printLog)(ctx, `composeCascade — SVM outbound to ${(_c = seg.targetChain) !== null && _c !== void 0 ? _c : seg.sourceChain}: gasFee=${seg.gasFee}, estimatedWpc=${estimated}, flat=${flat}, perSvmCap=${perSvmCap}, upwardCeiling=${upwardCeilingCascadeSvm}, chosen=${value}`);
                 // Per-segment minimum-viable-swap check: if the chosen `value` is below
                 // the live pool quote (`estimated`), the cap squeezed the budget below
                 // what the swap actually needs and the segment will revert inside
@@ -923,22 +939,54 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                 svmNativeValueBySegment.set(seg, value);
             }
         }
+        // EVM cascade outbounds should follow the direct R2 path: use the live
+        // WPC/gasToken quote instead of blindly spending the flat balance split.
+        // Over-allocating into thin pETH/pBNB pools can revert with Uniswap "STF"
+        // before the gateway has a chance to refund unused PC.
+        const evmSegments = segments.filter((s) => {
+            var _a;
+            return s.type === 'OUTBOUND_TO_CEA' &&
+                ((_a = s.hops[0]) === null || _a === void 0 ? void 0 : _a.isSvmTarget) !== true &&
+                s.gasToken &&
+                s.gasFee &&
+                s.gasFee > BigInt(0);
+        });
+        const evmNativeValueBySegment = new Map();
+        if (evmSegments.length > 0 && effectiveUeaBalance > CASCADE_GAS_RESERVE) {
+            const universalCoreAddress = yield getUniversalCoreAddressForSwap();
+            const ONE_PC = BigInt('1000000000000000000');
+            const EVM_NATIVE_VALUE_SAFETY_CAP_CASCADE = BigInt(200) * ONE_PC;
+            const UNCAPPED_BALANCE = BigInt('1000000000000000000000000000000');
+            for (const seg of evmSegments) {
+                let value = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, seg.gasToken, seg.gasFee, UNCAPPED_BALANCE);
+                if (value > EVM_NATIVE_VALUE_SAFETY_CAP_CASCADE) {
+                    (0, context_1.printLog)(ctx, `composeCascade — EVM outbound to ${seg.targetChain}: capping nativeValueForGas at 200 PC ceiling (was ${value.toString()})`);
+                    value = EVM_NATIVE_VALUE_SAFETY_CAP_CASCADE;
+                }
+                (0, context_1.printLog)(ctx, `composeCascade — EVM outbound to ${seg.targetChain}: gasFee=${seg.gasFee}, quotedNativeValue=${value}, flat=${perOutboundNativeValue !== null && perOutboundNativeValue !== void 0 ? perOutboundNativeValue : BigInt(0)}`);
+                evmNativeValueBySegment.set(seg, value);
+            }
+        }
         for (let segIdxLoop = segments.length - 1; segIdxLoop >= 0; segIdxLoop--) {
             const segment = segments[segIdxLoop];
             const gasPriceForOutboundRequest = (chainForLog) => {
                 var _a;
                 const quotedGasPrice = (_a = segment.gasPrice) !== null && _a !== void 0 ? _a : BigInt(0);
+                const isInboundFromCea = segment.type === 'INBOUND_FROM_CEA';
                 // If this outbound is being accumulated into an earlier Route 3
                 // inbound payload, it may execute minutes after the quote. Keep
                 // immediate outbounds pinned to the quote, but let delayed nested
-                // outbounds resolve the live base gas price at execution time.
+                // outbounds resolve the live base gas price at execution time. Route 3
+                // source-chain outbounds have the same quote-staleness risk because the
+                // source CEA leg can execute after the Push Chain gateway quote changes.
                 const executesAfterInbound = segments
                     .slice(0, segIdxLoop)
                     .some((s) => s.type === 'INBOUND_FROM_CEA');
-                if (executesAfterInbound && quotedGasPrice > BigInt(0)) {
-                    (0, context_1.printLog)(ctx, `composeCascade — delayed outbound to ${chainForLog !== null && chainForLog !== void 0 ? chainForLog : 'unknown chain'}: using gasPrice=0 instead of quoted ${quotedGasPrice} so UGPC resolves the live base price at execution time`);
+                const shouldUseLiveGasPrice = isInboundFromCea || executesAfterInbound;
+                if (shouldUseLiveGasPrice && quotedGasPrice > BigInt(0)) {
+                    (0, context_1.printLog)(ctx, `composeCascade — ${isInboundFromCea ? 'Route 3' : 'delayed'} outbound to ${chainForLog !== null && chainForLog !== void 0 ? chainForLog : 'unknown chain'}: using gasPrice=0 instead of quoted ${quotedGasPrice} so UGPC resolves the live base price at execution time`);
                 }
-                return executesAfterInbound ? BigInt(0) : quotedGasPrice;
+                return shouldUseLiveGasPrice ? BigInt(0) : quotedGasPrice;
             };
             switch (segment.type) {
                 case 'PUSH_EXECUTION': {
@@ -976,9 +1024,10 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         // EVM: build CEA payload from merged multicalls
                         outboundPayload = (0, payload_builders_1.buildCeaMulticallPayload)(segment.mergedCeaMulticalls || []);
                         // Get CEA address from the first hop
-                        targetForOutbound = outboundPayload === '0x'
-                            ? selectors_1.ZERO_ADDRESS
-                            : (firstHop === null || firstHop === void 0 ? void 0 : firstHop.ceaAddress) || ueaAddress;
+                        targetForOutbound =
+                            outboundPayload === '0x'
+                                ? selectors_1.ZERO_ADDRESS
+                                : (firstHop === null || firstHop === void 0 ? void 0 : firstHop.ceaAddress) || ueaAddress;
                         (0, payload_builders_1.assertCeaFundsParkingInvariant)(targetForOutbound, outboundPayload);
                     }
                     // Per-segment PRC-20 burn-balance pre-check. Fires whenever
@@ -1058,7 +1107,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                     else {
                         evmFallbackValue = segGasFee * BigInt(1000000);
                     }
-                    let nativeValueForGas = (_g = svmOverride !== null && svmOverride !== void 0 ? svmOverride : perOutboundNativeValue) !== null && _g !== void 0 ? _g : evmFallbackValue;
+                    let nativeValueForGas = (_h = (_g = svmOverride !== null && svmOverride !== void 0 ? svmOverride : evmNativeValueBySegment.get(segment)) !== null && _g !== void 0 ? _g : perOutboundNativeValue) !== null && _h !== void 0 ? _h : evmFallbackValue;
                     // SDK 5.2 Case C: when the segment's sizing is category C, compose
                     // R2/OUTBOUND_TO_CEA segments no longer apply Case A/B/C sizing
                     // (scoped to R1 + R3 only). segment.sizing may still be populated
@@ -1099,7 +1148,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 ((0, data_utils_1.hasExecutablePayloadData)((_h = h === null || h === void 0 ? void 0 : h.params) === null || _h === void 0 ? void 0 : _h.data) || ((_j = h === null || h === void 0 ? void 0 : h.params) === null || _j === void 0 ? void 0 : _j.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,
@@ -1144,7 +1193,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         let drainAmount = BigInt(0);
                         let tokenMintHex;
                         const params = hop.params;
-                        if (((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount) && params.funds.amount > BigInt(0)) {
+                        if (((_l = params.funds) === null || _l === void 0 ? void 0 : _l.amount) && params.funds.amount > BigInt(0)) {
                             drainAmount = params.funds.amount;
                             const token = params.funds.token;
                             if (token && token.address) {
@@ -1171,9 +1220,10 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                                 ? new Uint8Array(Buffer.from(intermediatePayload.slice(2), 'hex'))
                                 : undefined,
                         });
+                        (0, payload_builders_1.assertSvmPayloadWithinRelayLimit)(svmPayload, `Route 3 SVM cascade ${sourceChain}`);
                         const svmBurnAmount = segment.totalBurnAmount || BigInt(0);
                         const outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, segment.prc20Token ||
-                            (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), svmBurnAmount, (_l = segment.gasLimit) !== null && _l !== void 0 ? _l : BigInt(0), svmPayload, ueaAddress, (_m = segment.maxPCForGas) !== null && _m !== void 0 ? _m : BigInt(0), gasPriceForOutboundRequest(sourceChain));
+                            (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), svmBurnAmount, (_m = segment.gasLimit) !== null && _m !== void 0 ? _m : BigInt(0), svmPayload, ueaAddress, (_o = segment.maxPCForGas) !== null && _o !== void 0 ? _o : BigInt(0), gasPriceForOutboundRequest(sourceChain));
                         const inboundGasFee = segment.gasFee || BigInt(0);
                         let svmInboundFallback;
                         if (effectiveUeaBalance > BigInt(0)) {
@@ -1183,11 +1233,11 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         else {
                             svmInboundFallback = inboundGasFee * BigInt(1000000);
                         }
-                        let svmInboundNativeValue = perOutboundNativeValue !== null && perOutboundNativeValue !== void 0 ? perOutboundNativeValue : svmInboundFallback;
+                        let svmInboundNativeValue = (_q = (_p = svmNativeValueBySegment.get(segment)) !== null && _p !== void 0 ? _p : perOutboundNativeValue) !== null && _q !== void 0 ? _q : svmInboundFallback;
                         // SDK 5.2 R3-style Case C bump: when the inbound segment's sizing
                         // is C, top up the swap budget by the overflow. No bridge-swap —
                         // R3 has no destination funds delivery.
-                        if (((_o = segment.sizing) === null || _o === void 0 ? void 0 : _o.category) === 'C' &&
+                        if (((_r = segment.sizing) === null || _r === void 0 ? void 0 : _r.category) === 'C' &&
                             segment.sizing.overflowNativePc > BigInt(0)) {
                             const bumped = svmInboundNativeValue + segment.sizing.overflowNativePc;
                             (0, context_1.printLog)(ctx, `composeCascade — INBOUND_FROM_CEA (SVM) Case C: bumping nativeValueForGas from ${svmInboundNativeValue} to ${bumped} (overflow=${segment.sizing.overflowNativePc})`);
@@ -1224,7 +1274,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                     let amount = BigInt(0);
                     for (const mergedHop of segment.hops) {
                         const hParams = mergedHop.params;
-                        if ((_p = hParams.funds) === null || _p === void 0 ? void 0 : _p.amount) {
+                        if ((_s = hParams.funds) === null || _s === void 0 ? void 0 : _s.amount) {
                             const token = hParams.funds.token;
                             if (token) {
                                 if (token.mechanism === 'native') {
@@ -1260,7 +1310,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         ? segment.gasLimit
                         : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
                     const outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, segment.prc20Token ||
-                        (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), segment.totalBurnAmount || BigInt(0), effectiveGasLimit, ceaPayload, ueaAddress, (_q = segment.maxPCForGas) !== null && _q !== void 0 ? _q : BigInt(0), gasPriceForOutboundRequest(sourceChain));
+                        (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), segment.totalBurnAmount || BigInt(0), effectiveGasLimit, ceaPayload, ueaAddress, (_t = segment.maxPCForGas) !== null && _t !== void 0 ? _t : BigInt(0), gasPriceForOutboundRequest(sourceChain));
                     const inboundGasFee = segment.gasFee || BigInt(0);
                     let evmInboundFallback;
                     if (effectiveUeaBalance > BigInt(0)) {
@@ -1274,7 +1324,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                     // SDK 5.2 R3-style Case C bump: when the inbound segment's sizing
                     // is C, top up the swap budget by the overflow. No bridge-swap —
                     // R3 has no destination funds delivery.
-                    if (((_r = segment.sizing) === null || _r === void 0 ? void 0 : _r.category) === 'C' &&
+                    if (((_u = segment.sizing) === null || _u === void 0 ? void 0 : _u.category) === 'C' &&
                         segment.sizing.overflowNativePc > BigInt(0)) {
                         const bumped = evmInboundNativeValue + segment.sizing.overflowNativePc;
                         (0, context_1.printLog)(ctx, `composeCascade — INBOUND_FROM_CEA (EVM) Case C: bumping nativeValueForGas from ${evmInboundNativeValue} to ${bumped} (overflow=${segment.sizing.overflowNativePc})`);
@@ -1337,14 +1387,15 @@ function withMultihopRootProgressMapping(ctx, run) {
         }
     });
 }
-function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
+function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, options) {
     return {
         send: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a;
             const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
             // Extract HopDescriptors
             const hops = preparedTxs.map((tx) => tx._hop);
-            const enforceGasCheck = hops.some((hop) => { var _a; return ((_a = hop.params.options) === null || _a === void 0 ? void 0 : _a.enforceGasCheck) === true; });
+            const enforceGasCheck = (options === null || options === void 0 ? void 0 : options.enforceGasCheck) === true ||
+                hops.some((hop) => { var _a; return ((_a = hop.params.options) === null || _a === void 0 ? void 0 : _a.enforceGasCheck) === true; });
             const withCascadeOptions = (params) => enforceGasCheck
                 ? Object.assign(Object.assign({}, params), { options: Object.assign(Object.assign({}, params.options), { enforceGasCheck: true }) }) : params;
             // Classify into segments
@@ -1483,7 +1534,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                 hops: hopInfos,
                 hopCount: hops.length,
                 waitForAll: (opts) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    var _a, _b, _c, _d, _e, _f, _g, _h;
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                     const { pollingIntervalMs = 10000, timeout = 300000, progressHook: cascadeProgressHook, eventHook = defaultEventHook, } = opts || {};
                     const startTime = Date.now();
                     // Per-hop progress emission. Fans out cascade markers to BOTH the
@@ -1591,10 +1642,12 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                         const ceaToPushIndex = hopInfos.findIndex((h, index) => h.route === 'CEA_TO_PUSH' && !isNativeSeedOnlyHop(hops[index]));
                         const isAfterCeaToPush = (index) => ceaToPushIndex >= 0 && index > ceaToPushIndex;
                         const rootOutboundIndexByHop = buildRootOutboundIndexByHop(segments, hops);
-                        const trackOutboundHops = (outboundHops, pushTxHash, resolvedSubTxId, outboundIndexByHop) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        const trackOutboundHops = (outboundHops, pushTxHash, resolvedSubTxId, outboundIndexByHop, trackingOptions) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                             var _a, _b, _c, _d;
                             if (outboundHops.length === 0)
                                 return null;
+                            const shouldDeferHopCompletion = (hop) => (trackingOptions === null || trackingOptions === void 0 ? void 0 : trackingOptions.deferCeaToPushCompletion) === true &&
+                                (hop === null || hop === void 0 ? void 0 : hop.route) === 'CEA_TO_PUSH';
                             if (outboundHops.length === 1) {
                                 const hop = outboundHops[0];
                                 const hopHooks = (0, progress_route_hooks_1.pickWaitHooks)(hop.route);
@@ -1648,21 +1701,24 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     // consumers can paste it straight into a Solana explorer.
                                     const displayTxHash = (_b = (0, helpers_1.toExternalTxHashDisplay)(outboundDetails.destinationChain, outboundDetails.externalTxHash)) !== null && _b !== void 0 ? _b : outboundDetails.externalTxHash;
                                     const userFacingOutboundDetails = Object.assign(Object.assign({}, outboundDetails), { externalTxHash: displayTxHash });
-                                    hop.status = 'confirmed';
+                                    const deferHopCompletion = shouldDeferHopCompletion(hop);
+                                    hop.status = deferHopCompletion ? 'pending' : 'confirmed';
                                     hop.txHash = displayTxHash;
                                     hop.outboundDetails = userFacingOutboundDetails;
-                                    if (isMulti) {
-                                        emitRouteIntermediateComplete(hop, displayTxHash);
-                                    }
-                                    else {
-                                        emitHopEvent(hopHooks.success(userFacingOutboundDetails));
+                                    if (!deferHopCompletion) {
+                                        if (isMulti) {
+                                            emitRouteIntermediateComplete(hop, displayTxHash);
+                                        }
+                                        else {
+                                            emitHopEvent(hopHooks.success(userFacingOutboundDetails));
+                                        }
+                                        emitHopComplete(hop.hopIndex);
                                     }
-                                    emitHopComplete(hop.hopIndex);
                                     cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
                                         hopIndex: hop.hopIndex,
                                         route: hop.route,
                                         chain: hop.executionChain,
-                                        status: 'confirmed',
+                                        status: deferHopCompletion ? 'found' : 'confirmed',
                                         txHash: displayTxHash,
                                         elapsed: Date.now() - startTime,
                                     });
@@ -1697,23 +1753,24 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                 }
                                 const perHopLastStatus = new Map();
                                 const confirmedHops = new Set();
-                                const allOutboundDetails = yield callbacks.waitForAllOutboundTxsFn(pushTxHash, outboundHops, {
-                                    initialWaitMs: Math.min(60000, timeout - (Date.now() - startTime)),
-                                    pollingIntervalMs,
-                                    timeout: timeout - (Date.now() - startTime),
-                                    _resolvedSubTxId: resolvedSubTxId,
-                                    progressHook: (event) => {
+                                const allOutboundDetails = yield callbacks.waitForAllOutboundTxsFn(pushTxHash, outboundHops, Object.assign(Object.assign({ initialWaitMs: Math.min(60000, timeout - (Date.now() - startTime)), pollingIntervalMs, timeout: timeout - (Date.now() - startTime), _resolvedSubTxId: resolvedSubTxId }, (outboundIndexByHop
+                                    ? { _outboundIndexByHop: outboundIndexByHop }
+                                    : {})), { progressHook: (event) => {
                                         var _a, _b;
+                                        const matchedHop = outboundHops.find((h) => h.hopIndex === event.hopIndex);
+                                        const eventHooks = (0, progress_route_hooks_1.pickWaitHooks)(matchedHop === null || matchedHop === void 0 ? void 0 : matchedHop.route);
+                                        const deferHopCompletion = shouldDeferHopCompletion(matchedHop);
+                                        const progressStatus = deferHopCompletion && event.status === 'confirmed'
+                                            ? 'found'
+                                            : event.status;
                                         cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
                                             hopIndex: event.hopIndex,
                                             route: event.route,
                                             chain: event.chain,
-                                            status: event.status,
+                                            status: progressStatus,
                                             txHash: event.txHash,
                                             elapsed: Date.now() - startTime,
                                         });
-                                        const matchedHop = outboundHops.find((h) => h.hopIndex === event.hopIndex);
-                                        const eventHooks = (0, progress_route_hooks_1.pickWaitHooks)(matchedHop === null || matchedHop === void 0 ? void 0 : matchedHop.route);
                                         const prev = perHopLastStatus.get(event.hopIndex);
                                         if (event.status === 'polling' && prev !== 'polling') {
                                             perHopLastStatus.set(event.hopIndex, 'polling');
@@ -1729,17 +1786,18 @@ 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);
-                                                if (isMulti) {
-                                                    emitRouteIntermediateComplete(matchedHop, event.txHash);
-                                                }
-                                                else {
-                                                    emitHopEvent(eventHooks.success(matchedHop.outboundDetails));
+                                                if (!deferHopCompletion) {
+                                                    if (isMulti) {
+                                                        emitRouteIntermediateComplete(matchedHop, event.txHash);
+                                                    }
+                                                    else {
+                                                        emitHopEvent(eventHooks.success(matchedHop.outboundDetails));
+                                                    }
+                                                    emitHopComplete(event.hopIndex);
                                                 }
-                                                emitHopComplete(event.hopIndex);
                                             }
                                         }
-                                    },
-                                });
+                                    } }));
                                 if (!allOutboundDetails.success) {
                                     const failedIdx = (_c = allOutboundDetails.failedAt) !== null && _c !== void 0 ? _c : 0;
                                     const failedHop = outboundHops.find((h) => h.hopIndex === failedIdx);
@@ -1750,6 +1808,14 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     emitCascadeFailed(failedIdx, failMsg);
                                     return buildCompletionResult(false, failedIdx);
                                 }
+                                if (trackingOptions === null || trackingOptions === void 0 ? void 0 : trackingOptions.deferCeaToPushCompletion) {
+                                    for (const outHop of outboundHops) {
+                                        if (shouldDeferHopCompletion(outHop) &&
+                                            outHop.outboundDetails) {
+                                            outHop.status = 'pending';
+                                        }
+                                    }
+                                }
                             }
                             return null;
                         });
@@ -1774,7 +1840,8 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                             }
                         }
                         for (const hop of hopInfos) {
-                            if (hop.route === 'UOA_TO_PUSH' && !isAfterCeaToPush(hop.hopIndex)) {
+                            if (hop.route === 'UOA_TO_PUSH' &&
+                                !isAfterCeaToPush(hop.hopIndex)) {
                                 hop.status = 'confirmed';
                                 hop.txHash = response.hash;
                                 cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
@@ -1790,8 +1857,14 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                         }
                         // 2. Track direct outbound hops (Route 2: UOA_TO_CEA) that belong
                         // to the root Push UTX.
-                        const rootOutboundHops = hopInfos.filter((h) => h.route === 'UOA_TO_CEA' && !isAfterCeaToPush(h.hopIndex));
-                        const rootOutboundFailure = yield trackOutboundHops(rootOutboundHops, response.hash, undefined, rootOutboundIndexByHop);
+                        const rootOutboundHops = hopInfos.filter((h) => {
+                            var _a;
+                            return (h.route === 'UOA_TO_CEA' && !isAfterCeaToPush(h.hopIndex)) ||
+                                (h.hopIndex === ceaToPushIndex &&
+                                    h.route === 'CEA_TO_PUSH' &&
+                                    ((_a = chain_1.CHAIN_INFO[h.executionChain]) === null || _a === void 0 ? void 0 : _a.vm) === enums_1.VM.EVM);
+                        });
+                        const rootOutboundFailure = yield trackOutboundHops(rootOutboundHops, response.hash, undefined, rootOutboundIndexByHop, { deferCeaToPushCompletion: true });
                         if (rootOutboundFailure)
                             return rootOutboundFailure;
                         let childInbound;
@@ -1805,39 +1878,50 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                 emitCascadeTimeout(inboundHop.hopIndex);
                                 return buildCompletionResult(false, inboundHop.hopIndex);
                             }
-                            emitHopStart(inboundHop.hopIndex);
-                            emitHopEvent(hopHooks.awaiting(inboundHop.executionChain));
+                            const hasTrackedSourceOutbound = Boolean(inboundHop.outboundDetails) &&
+                                ((_d = chain_1.CHAIN_INFO[inboundHop.executionChain]) === null || _d === void 0 ? void 0 : _d.vm) === enums_1.VM.EVM;
+                            if (!hasTrackedSourceOutbound) {
+                                emitHopStart(inboundHop.hopIndex);
+                                emitHopEvent(hopHooks.awaiting(inboundHop.executionChain));
+                            }
                             cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
                                 hopIndex: inboundHop.hopIndex,
                                 route: inboundHop.route,
                                 chain: inboundHop.executionChain,
                                 status: 'polling',
+                                txHash: inboundHop.txHash,
                                 elapsed: Date.now() - startTime,
                             });
                             let outboundLastStatus;
                             let sourceOutboundDetails;
                             try {
-                                sourceOutboundDetails = yield callbacks.waitForOutboundTxFn(response.hash, {
-                                    initialWaitMs: Math.min(60000, remainingTimeout),
-                                    pollingIntervalMs,
-                                    timeout: remainingTimeout,
-                                    _expectedDestinationChain: inboundHop.executionChain,
-                                    _outboundIndex: (_d = rootOutboundIndexByHop.get(inboundHop.hopIndex)) !== null && _d !== void 0 ? _d : 0,
-                                    progressHook: (event) => {
-                                        cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
-                                            hopIndex: inboundHop.hopIndex,
-                                            route: inboundHop.route,
-                                            chain: inboundHop.executionChain,
-                                            status: event.status,
-                                            elapsed: Date.now() - startTime,
-                                        });
-                                        if (event.status === 'polling' &&
-                                            outboundLastStatus !== 'polling') {
-                                            outboundLastStatus = 'polling';
-                                            emitHopEvent(hopHooks.polling(inboundHop.executionChain, event.elapsed));
-                                        }
-                                    },
-                                });
+                                if (hasTrackedSourceOutbound) {
+                                    sourceOutboundDetails =
+                                        inboundHop.outboundDetails;
+                                }
+                                else {
+                                    sourceOutboundDetails = yield callbacks.waitForOutboundTxFn(response.hash, {
+                                        initialWaitMs: Math.min(60000, remainingTimeout),
+                                        pollingIntervalMs,
+                                        timeout: remainingTimeout,
+                                        _expectedDestinationChain: inboundHop.executionChain,
+                                        _outboundIndex: (_e = rootOutboundIndexByHop.get(inboundHop.hopIndex)) !== null && _e !== void 0 ? _e : 0,
+                                        progressHook: (event) => {
+                                            cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                                hopIndex: inboundHop.hopIndex,
+                                                route: inboundHop.route,
+                                                chain: inboundHop.executionChain,
+                                                status: event.status,
+                                                elapsed: Date.now() - startTime,
+                                            });
+                                            if (event.status === 'polling' &&
+                                                outboundLastStatus !== 'polling') {
+                                                outboundLastStatus = 'polling';
+                                                emitHopEvent(hopHooks.polling(inboundHop.executionChain, event.elapsed));
+                                            }
+                                        },
+                                    });
+                                }
                             }
                             catch (err) {
                                 const errMsg = err instanceof Error ? err.message : String(err);
@@ -1851,7 +1935,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     emitCascadeFailed(inboundHop.hopIndex, errMsg);
                                 inboundHop.status = 'failed';
                                 const failedExternalTxHash = err === null || err === void 0 ? void 0 : err.externalTxHash;
-                                const failedDisplayTxHash = (_e = (0, helpers_1.toExternalTxHashDisplay)(inboundHop.executionChain, failedExternalTxHash)) !== null && _e !== void 0 ? _e : failedExternalTxHash;
+                                const failedDisplayTxHash = (_f = (0, helpers_1.toExternalTxHashDisplay)(inboundHop.executionChain, failedExternalTxHash)) !== null && _f !== void 0 ? _f : failedExternalTxHash;
                                 if (failedDisplayTxHash)
                                     inboundHop.txHash = failedDisplayTxHash;
                                 cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
@@ -1864,7 +1948,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                 });
                                 return buildCompletionResult(false, inboundHop.hopIndex);
                             }
-                            const displayExternalTxHash = (_f = (0, helpers_1.toExternalTxHashDisplay)(sourceOutboundDetails.destinationChain, sourceOutboundDetails.externalTxHash)) !== null && _f !== void 0 ? _f : sourceOutboundDetails.externalTxHash;
+                            const displayExternalTxHash = (_g = (0, helpers_1.toExternalTxHashDisplay)(sourceOutboundDetails.destinationChain, sourceOutboundDetails.externalTxHash)) !== null && _g !== void 0 ? _g : sourceOutboundDetails.externalTxHash;
                             inboundHop.outboundDetails = Object.assign(Object.assign({}, sourceOutboundDetails), { externalTxHash: displayExternalTxHash });
                             inboundHop.txHash = displayExternalTxHash;
                             emitHopEvent(hopHooks.success(inboundHop.outboundDetails));
@@ -1872,7 +1956,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                             let inboundLastStatus;
                             const inboundRemainingTimeout = timeout - (Date.now() - startTime);
                             try {
-                                childInbound = yield ((_g = callbacks.waitForInboundPushTxFn) !== null && _g !== void 0 ? _g : ((externalTxHash, sourceChain, opts) => (0, inbound_tracker_1.waitForInboundPushTx)(ctx, externalTxHash, sourceChain, opts)))(sourceOutboundDetails.externalTxHash, inboundHop.executionChain, {
+                                childInbound = yield ((_h = callbacks.waitForInboundPushTxFn) !== null && _h !== void 0 ? _h : ((externalTxHash, sourceChain, opts) => (0, inbound_tracker_1.waitForInboundPushTx)(ctx, externalTxHash, sourceChain, opts)))(sourceOutboundDetails.externalTxHash, inboundHop.executionChain, {
                                     initialWaitMs: Math.min(60000, inboundRemainingTimeout),
                                     pollingIntervalMs,
                                     timeout: inboundRemainingTimeout,
@@ -1906,7 +1990,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                 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';
+                                const failMsg = (_j = childInbound.errorMessage) !== null && _j !== void 0 ? _j : 'inbound execution failed on Push Chain';
                                 inboundHop.status = 'failed';
                                 inboundHop.txHash =
                                     childInbound.pushTxHash || displayExternalTxHash;

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

@@ -15,6 +15,39 @@ const enums_1 = require("../../constants/enums");
 const progress_hook_types_1 = require("../../progress-hook/progress-hook.types");
 const svm_client_1 = require("../../vm-client/svm-client");
 const context_2 = require("./context");
+const EVM_RECEIPT_POLL_MS = 3000;
+const EVM_RECEIPT_NOT_FOUND_RE = /not found|TransactionNotFound|TransactionReceiptNotFound|could not be found|No transaction found/i;
+function getErrorMessage(err) {
+    var _a, _b;
+    if (err instanceof Error)
+        return err.message;
+    if (typeof err === 'object' && err !== null) {
+        const maybe = err;
+        return String((_b = (_a = maybe.shortMessage) !== null && _a !== void 0 ? _a : maybe.message) !== null && _b !== void 0 ? _b : err);
+    }
+    return String(err);
+}
+function waitForEvmReceipt(evmClient, txHash, timeoutMs) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const start = Date.now();
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            try {
+                return yield evmClient.publicClient.getTransactionReceipt({
+                    hash: txHash,
+                });
+            }
+            catch (err) {
+                const msg = getErrorMessage(err);
+                const retryable = EVM_RECEIPT_NOT_FOUND_RE.test(msg);
+                if (!retryable || Date.now() - start > timeoutMs) {
+                    throw err;
+                }
+                yield new Promise((r) => setTimeout(r, EVM_RECEIPT_POLL_MS));
+            }
+        }
+    });
+}
 function waitForEvmConfirmationsWithCountdown(ctx, evmClient, txHash, confirmations, timeoutMs) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (confirmations <= 0) {
@@ -23,9 +56,7 @@ function waitForEvmConfirmationsWithCountdown(ctx, evmClient, txHash, confirmati
         }
         (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03, confirmations);
         const start = Date.now();
-        const receipt = yield evmClient.publicClient.waitForTransactionReceipt({
-            hash: txHash,
-        });
+        const receipt = yield waitForEvmReceipt(evmClient, txHash, timeoutMs);
         const targetBlock = receipt.blockNumber + BigInt(confirmations);
         let lastEmitted = 0;
         // eslint-disable-next-line no-constant-condition
@@ -112,9 +143,7 @@ function waitForLockerFeeConfirmation(ctx, txHashBytes) {
             case enums_1.VM.EVM: {
                 const evmClient = (0, context_1.getOriginEvmClient)(ctx);
                 const txHash = (0, viem_1.bytesToHex)(txHashBytes);
-                const receipt = yield evmClient.publicClient.waitForTransactionReceipt({
-                    hash: txHash,
-                });
+                const receipt = yield waitForEvmReceipt(evmClient, txHash, timeout);
                 if (fastConfirmations <= 1)
                     return;
                 const targetBlock = receipt.blockNumber + BigInt(fastConfirmations);