@pushchain/core 5.1.18 → 6.0.1

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

@@ -137,13 +137,14 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
             params,
             route: routeStr,
             gasLimit,
+            maxPCForGas: (_c = params.maxPCForGas) !== null && _c !== void 0 ? _c : BigInt(0),
             ueaAddress,
             revertRecipient: ueaAddress,
         };
         switch (route) {
             case route_detector_1.TransactionRoute.UOA_TO_PUSH: {
                 // Route 1: Build Push Chain multicalls
-                const seedAmount = (_c = params.value) !== null && _c !== void 0 ? _c : BigInt(0);
+                const seedAmount = (_d = params.value) !== null && _d !== void 0 ? _d : BigInt(0);
                 if (isValueOnlyNativeSeedToOwnUea(params, ueaAddress)) {
                     return Object.assign(Object.assign({}, baseDescriptor), { pushMulticalls: [], nativeSeedOnly: true, nativeSeedAmount: seedAmount });
                 }
@@ -168,7 +169,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     });
                     let prc20Token = selectors_1.ZERO_ADDRESS;
                     let burnAmount = BigInt(0);
-                    if ((_d = params.funds) === null || _d === void 0 ? void 0 : _d.amount) {
+                    if ((_e = params.funds) === null || _e === void 0 ? void 0 : _e.amount) {
                         const token = params.funds.token;
                         if (token) {
                             prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
@@ -190,35 +191,46 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     }
                     let gasToken = selectors_1.ZERO_ADDRESS;
                     let gasFee = BigInt(0);
+                    let gasPrice = BigInt(0);
                     let sizing;
-                    // Conditional CEA-ATA rent bump (SPL-only). Mirrors single-route
-                    // executeUoaToCeaSvm path. See svm-rent.ts for rationale.
-                    const splMintBase58 = burnAmount > BigInt(0)
-                        ? (_f = (_e = params.funds) === null || _e === void 0 ? void 0 : _e.token) === null || _f === void 0 ? void 0 : _f.address
+                    // SVM finalize budget: compare the quoted gasFee in lamports against
+                    // the gateway finalize minimum, then re-query with a bumped gasLimit
+                    // if the default quote is too low.
+                    const svmFundsToken = burnAmount > BigInt(0)
+                        ? (_f = params.funds) === null || _f === void 0 ? void 0 : _f.token
                         : undefined;
-                    let effectiveGasLimit = yield (0, svm_rent_1.maybeBumpForCeaAtaRent)({
-                        ctx,
-                        ueaAddress,
-                        targetChain,
-                        splMintBase58,
-                        burnAmount,
-                        effectiveGasLimit: gasLimit,
-                    });
+                    const splMintBase58 = (svmFundsToken === null || svmFundsToken === void 0 ? void 0 : svmFundsToken.mechanism) === 'approve'
+                        ? svmFundsToken.address
+                        : undefined;
+                    let effectiveGasLimit = gasLimit;
                     if (prc20Token !== selectors_1.ZERO_ADDRESS) {
-                        const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, effectiveGasLimit, targetChain);
+                        let result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, effectiveGasLimit, targetChain);
+                        result = yield (0, svm_rent_1.ensureSvmFinalizeGasBudgetQuote)({
+                            ctx,
+                            ueaAddress,
+                            targetChain,
+                            prc20Token,
+                            quote: result,
+                            splMintBase58,
+                            burnAmount,
+                            pathTag: 'buildHopDescriptor',
+                        });
                         gasToken = result.gasToken;
                         gasFee = result.gasFee;
+                        gasPrice = result.gasPrice;
                         sizing = result.sizing;
-                        if (!params.gasLimit && result.gasPrice > BigInt(0)) {
-                            effectiveGasLimit = result.gasFee / result.gasPrice;
-                            (0, context_1.printLog)(ctx, `buildHopDescriptor — SVM derived effectiveGasLimit: ${effectiveGasLimit} (gasFee=${result.gasFee} / gasPrice=${result.gasPrice})`);
+                        effectiveGasLimit = result.gasLimitUsed;
+                        if (!params.gasLimit) {
+                            (0, context_1.printLog)(ctx, `buildHopDescriptor — SVM resolved effectiveGasLimit: ${effectiveGasLimit} ` +
+                                `(gasFee=${result.gasFee}, gasPrice=${result.gasPrice})`);
                         }
                     }
                     return Object.assign(Object.assign({}, baseDescriptor), { targetChain, isSvmTarget: true, svmPayload,
                         prc20Token,
                         burnAmount,
                         gasToken,
-                        gasFee, gasLimit: effectiveGasLimit, sizing });
+                        gasFee,
+                        gasPrice, gasLimit: effectiveGasLimit, sizing });
                 }
                 // EVM path: Resolve CEA address + build CEA multicalls
                 const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, targetChain, (_g = ctx.rpcUrls[targetChain]) === null || _g === void 0 ? void 0 : _g[0]);
@@ -228,18 +240,21 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     const burnAmount = BigInt(0); // Migration is logic-only — no funds. CEA rejects msg.value != 0.
                     let gasToken = selectors_1.ZERO_ADDRESS;
                     let gasFee = BigInt(0);
+                    let gasPrice = BigInt(0);
                     let sizing;
                     if (prc20Token !== selectors_1.ZERO_ADDRESS) {
                         const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit, targetChain);
                         gasToken = result.gasToken;
                         gasFee = result.gasFee;
+                        gasPrice = result.gasPrice;
                         sizing = result.sizing;
                     }
                     return Object.assign(Object.assign({}, baseDescriptor), { targetChain,
                         ceaAddress, ceaMulticalls: [], prc20Token,
                         burnAmount,
                         gasToken,
-                        gasFee, isMigration: true, sizing });
+                        gasFee,
+                        gasPrice, isMigration: true, sizing });
                 }
                 // Build CEA multicalls
                 const ceaMulticalls = [];
@@ -342,11 +357,13 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                 // Query gas fee
                 let gasToken = selectors_1.ZERO_ADDRESS;
                 let gasFee = BigInt(0);
+                let gasPrice = BigInt(0);
                 let sizing;
                 if (prc20Token !== selectors_1.ZERO_ADDRESS) {
                     const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit, targetChain);
                     gasToken = result.gasToken;
                     gasFee = result.gasFee;
+                    gasPrice = result.gasPrice;
                     sizing = result.sizing;
                 }
                 return Object.assign(Object.assign({}, baseDescriptor), { targetChain,
@@ -356,6 +373,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     burnAmount,
                     gasToken,
                     gasFee,
+                    gasPrice,
                     sizing });
             }
             case route_detector_1.TransactionRoute.CEA_TO_PUSH: {
@@ -401,19 +419,33 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     }
                     let gasToken = selectors_1.ZERO_ADDRESS;
                     let gasFee = BigInt(0);
+                    let gasPrice = BigInt(0);
                     let sizing;
+                    let effectiveGasLimit = gasLimit;
                     if (prc20Token !== selectors_1.ZERO_ADDRESS) {
-                        const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit, sourceChain);
+                        let result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, effectiveGasLimit, sourceChain);
+                        result = yield (0, svm_rent_1.ensureSvmFinalizeGasBudgetQuote)({
+                            ctx,
+                            ueaAddress,
+                            targetChain: sourceChain,
+                            prc20Token,
+                            quote: result,
+                            splMintBase58: undefined,
+                            burnAmount: BigInt(0),
+                            pathTag: 'buildHopDescriptor',
+                        });
                         gasToken = result.gasToken;
                         gasFee = result.gasFee;
+                        gasPrice = result.gasPrice;
                         sizing = result.sizing;
+                        effectiveGasLimit = result.gasLimitUsed;
                     }
                     return Object.assign(Object.assign({}, baseDescriptor), { sourceChain, ceaAddress: ceaPdaHex, isSvmTarget: true, prc20Token, 
                         // Route 3 is payload-only on Push: the drain amount lives inside the
                         // SVM payload. Burning here would require the UEA to pre-hold pSOL.
                         burnAmount: BigInt(0), gasToken,
                         gasFee,
-                        sizing });
+                        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]);
                 // CEA auto-deploys on-chain: Vault.finalizeUniversalTx calls CEAFactory.deployCEA()
@@ -443,11 +475,13 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                 const prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
                 let gasToken = selectors_1.ZERO_ADDRESS;
                 let gasFee = BigInt(0);
+                let gasPrice = BigInt(0);
                 let sizing;
                 if (prc20Token !== selectors_1.ZERO_ADDRESS) {
                     const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit, sourceChain);
                     gasToken = result.gasToken;
                     gasFee = result.gasFee;
+                    gasPrice = result.gasPrice;
                     sizing = result.sizing;
                 }
                 return Object.assign(Object.assign({}, baseDescriptor), { sourceChain,
@@ -458,6 +492,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     // token it is trying to receive from the external CEA.
                     burnAmount: BigInt(0), gasToken,
                     gasFee,
+                    gasPrice,
                     sizing });
             }
             default:
@@ -512,6 +547,8 @@ function classifyIntoSegments(hops) {
                 // Accumulate gas fees
                 currentSegment.gasFee =
                     (currentSegment.gasFee || BigInt(0)) + (hop.gasFee || BigInt(0));
+                currentSegment.gasPrice = mergeGasPrice(currentSegment.gasPrice, hop.gasPrice);
+                currentSegment.maxPCForGas = mergeMaxPCForGas(currentSegment.maxPCForGas, hop.maxPCForGas);
             }
             else if (segType === 'INBOUND_FROM_CEA') {
                 // Sum burn amounts so the single sendUniversalTxToUEA carries the
@@ -524,6 +561,8 @@ function classifyIntoSegments(hops) {
                 }
                 currentSegment.gasFee =
                     (currentSegment.gasFee || BigInt(0)) + (hop.gasFee || BigInt(0));
+                currentSegment.gasPrice = mergeGasPrice(currentSegment.gasPrice, hop.gasPrice);
+                currentSegment.maxPCForGas = mergeMaxPCForGas(currentSegment.maxPCForGas, hop.maxPCForGas);
             }
             else if (segType === 'PUSH_EXECUTION') {
                 currentSegment.mergedPushMulticalls = [
@@ -561,7 +600,9 @@ function classifyIntoSegments(hops) {
                 prc20Token: hop.prc20Token,
                 gasToken: hop.gasToken,
                 gasFee: hop.gasFee,
+                gasPrice: hop.gasPrice,
                 gasLimit: hop.gasLimit,
+                maxPCForGas: hop.maxPCForGas,
                 sizing: hop.sizing,
             };
             segments.push(currentSegment);
@@ -573,6 +614,18 @@ function classifyIntoSegments(hops) {
 function categoryRank(c) {
     return c === 'C' ? 2 : c === 'B' ? 1 : 0;
 }
+function mergeMaxPCForGas(current, next) {
+    const a = current !== null && current !== void 0 ? current : BigInt(0);
+    const b = next !== null && next !== void 0 ? next : BigInt(0);
+    if (a === BigInt(0) || b === BigInt(0))
+        return BigInt(0);
+    return a + b;
+}
+function mergeGasPrice(current, next) {
+    const a = current !== null && current !== void 0 ? current : BigInt(0);
+    const b = next !== null && next !== void 0 ? next : BigInt(0);
+    return a > b ? a : b;
+}
 // ============================================================================
 // getSegmentType
 // ============================================================================
@@ -615,6 +668,34 @@ function isNativeSeedOnlySegment(segment) {
 function segmentNeedsOutboundGas(segment) {
     return segment.type !== 'PUSH_EXECUTION' && !isNativeSeedOnlySegment(segment);
 }
+function buildRootOutboundIndexByHop(segments, hops) {
+    var _a;
+    const hopIndexByDescriptor = new Map();
+    hops.forEach((hop, index) => hopIndexByDescriptor.set(hop, index));
+    const nextIndexByChain = new Map();
+    const result = new Map();
+    for (const segment of segments) {
+        let chain;
+        if (segment.type === 'OUTBOUND_TO_CEA') {
+            chain = segment.targetChain;
+        }
+        else if (segment.type === 'INBOUND_FROM_CEA' &&
+            !isNativeSeedOnlySegment(segment)) {
+            chain = segment.sourceChain;
+        }
+        if (!chain)
+            continue;
+        const outboundIndex = (_a = nextIndexByChain.get(chain)) !== null && _a !== void 0 ? _a : 0;
+        for (const hop of segment.hops) {
+            const hopIndex = hopIndexByDescriptor.get(hop);
+            if (hopIndex !== undefined) {
+                result.set(hopIndex, outboundIndex);
+            }
+        }
+        nextIndexByChain.set(chain, outboundIndex + 1);
+    }
+    return result;
+}
 function sumNativeSeedAmount(hops) {
     return hops.reduce((sum, hop) => { var _a; return sum + ((_a = hop.nativeSeedAmount) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
 }
@@ -672,15 +753,17 @@ function getInboundFundingForBurnToken(segments, beforeSegmentIndex, burnToken,
     }
     return total;
 }
-function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce) {
+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;
+        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)();
         const currentUeaBalance = ueaBalance !== null && ueaBalance !== void 0 ? ueaBalance : BigInt(0);
         const cascadeNativeSeed = getCascadeNativeSeed(segments);
         const effectiveUeaBalance = currentUeaBalance + cascadeNativeSeed;
+        const enforceGasCheck = (options === null || options === void 0 ? void 0 : options.enforceGasCheck) === true ||
+            segments.some((segment) => segment.hops.some((hop) => { var _a; return ((_a = hop.params.options) === null || _a === void 0 ? void 0 : _a.enforceGasCheck) === true; }));
         if (cascadeNativeSeed > BigInt(0)) {
             (0, context_1.printLog)(ctx, `composeCascade — counting cascade native seed ${cascadeNativeSeed.toString()} for cascade sizing (current UEA balance ${currentUeaBalance.toString()})`);
         }
@@ -692,8 +775,8 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
         // Cascade pre-flight: catches the zero-balance silent-segment-zero failure
         // mode. When `ueaBalance <= CASCADE_GAS_RESERVE`, `perOutboundNativeValue`
         // is left undefined and downstream segments silently allocate value=0,
-        // producing under-funded swaps that revert inside Uniswap. Throw early
-        // with a structured error so the caller knows which path / hop failed.
+        // producing under-funded swaps that revert inside Uniswap. Warn by default
+        // and throw only when enforceGasCheck=true.
         if (numOutbounds > 0) {
             (0, preflight_1.runPreflight)({
                 ctx,
@@ -704,6 +787,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                 requiredValue: BigInt(1),
                 gasReserve: CASCADE_GAS_RESERVE,
                 pathTag: 'CASCADE',
+                enforceGasCheck,
             });
         }
         let perOutboundNativeValue;
@@ -729,7 +813,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
             const universalCoreAddress = yield ctx.pushClient.readContract({
                 address: gatewayPcAddress,
                 abi: abi_1.UNIVERSAL_GATEWAY_PC,
-                functionName: 'UNIVERSAL_CORE',
+                functionName: 'universalCore',
                 args: [],
             });
             // Compute per-SVM budget = ueaBalance − (PC needed for EVM outbounds) − 1 PC safety
@@ -786,6 +870,17 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                 // knows which hop's pool is misbehaving.
                 if (estimated > BigInt(0) && value < estimated) {
                     const shortfall = estimated - value;
+                    (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_03, estimated, value, false, ueaAddress, 'CASCADE', {
+                        kind: 'NATIVE',
+                        segmentIndex: cascadeIdx,
+                        enforceGasCheck,
+                        shortfall,
+                    });
+                    if (!enforceGasCheck) {
+                        (0, context_1.printLog)(ctx, `composeCascade — SVM outbound segment ${cascadeIdx} has native shortfall ${shortfall.toString()}; proceeding because enforceGasCheck=false`);
+                        svmNativeValueBySegment.set(seg, value);
+                        continue;
+                    }
                     (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_04, estimated, value, shortfall, ueaAddress, 'CASCADE', { kind: 'NATIVE', segmentIndex: cascadeIdx });
                     throw new errors_1.InsufficientUEABalanceError({
                         required: estimated,
@@ -838,7 +933,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 = (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 (cascade R2-style segments
                     // only — INBOUND_FROM_CEA segments are payload-only with totalBurnAmount=0
@@ -856,7 +954,13 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                             args: [ueaAddress],
                         });
                         const sufficient = onHand >= segBurnAmount;
-                        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_03, segBurnAmount, onHand, sufficient, ueaAddress, 'CASCADE', { kind: 'PRC20', burnToken: segBurnToken, segmentIndex: segIdxLoop });
+                        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_03, segBurnAmount, onHand, sufficient, ueaAddress, 'CASCADE', {
+                            kind: 'PRC20',
+                            burnToken: segBurnToken,
+                            segmentIndex: segIdxLoop,
+                            enforceGasCheck,
+                            shortfall: sufficient ? BigInt(0) : segBurnAmount - onHand,
+                        });
                         const priorPushExecutionMayFundBurn = segments
                             .slice(0, segIdxLoop)
                             .some((s) => s.type === 'PUSH_EXECUTION');
@@ -867,21 +971,26 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                             !priorInboundMayFundBurn) {
                             const projectedOnHand = onHand + priorInboundFundingForBurn;
                             const shortfall = segBurnAmount - projectedOnHand;
-                            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_04, segBurnAmount, projectedOnHand, shortfall, ueaAddress, 'CASCADE', {
-                                kind: 'PRC20',
-                                burnToken: segBurnToken,
-                                segmentIndex: segIdxLoop,
-                            });
-                            throw new errors_1.InsufficientUEABalanceError({
-                                required: segBurnAmount,
-                                available: projectedOnHand,
-                                shortfall,
-                                ueaAddress,
-                                pathTag: 'CASCADE',
-                                reason: 'PRC20',
-                                burnToken: segBurnToken,
-                                segmentIndex: segIdxLoop,
-                            });
+                            if (!enforceGasCheck) {
+                                (0, context_1.printLog)(ctx, `composeCascade — PRC-20 shortfall ${shortfall.toString()} for segment ${segIdxLoop}; proceeding because enforceGasCheck=false`);
+                            }
+                            else {
+                                (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_04, segBurnAmount, projectedOnHand, shortfall, ueaAddress, 'CASCADE', {
+                                    kind: 'PRC20',
+                                    burnToken: segBurnToken,
+                                    segmentIndex: segIdxLoop,
+                                });
+                                throw new errors_1.InsufficientUEABalanceError({
+                                    required: segBurnAmount,
+                                    available: projectedOnHand,
+                                    shortfall,
+                                    ueaAddress,
+                                    pathTag: 'CASCADE',
+                                    reason: 'PRC20',
+                                    burnToken: segBurnToken,
+                                    segmentIndex: segIdxLoop,
+                                });
+                            }
                         }
                         else if (!sufficient && priorPushExecutionMayFundBurn) {
                             (0, context_1.printLog)(ctx, `composeCascade — skipping PRC-20 preflight failure for segment ${segIdxLoop}; earlier Push execution may fund ${segBurnToken} before this outbound runs`);
@@ -891,7 +1000,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                         }
                     }
                     // Build outbound request
-                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetForOutbound, segment.prc20Token || selectors_1.ZERO_ADDRESS, segment.totalBurnAmount || BigInt(0), (_e = segment.gasLimit) !== null && _e !== void 0 ? _e : BigInt(0), outboundPayload, ueaAddress);
+                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetForOutbound, segment.prc20Token || selectors_1.ZERO_ADDRESS, segment.totalBurnAmount || BigInt(0), (_e = segment.gasLimit) !== null && _e !== void 0 ? _e : BigInt(0), outboundPayload, ueaAddress, (_f = segment.maxPCForGas) !== null && _f !== void 0 ? _f : BigInt(0), (_g = segment.gasPrice) !== null && _g !== void 0 ? _g : BigInt(0));
                     // Build approval + outbound multicalls
                     const segGasFee = segment.gasFee || BigInt(0);
                     const svmOverride = svmNativeValueBySegment.get(segment);
@@ -908,7 +1017,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                     else {
                         evmFallbackValue = segGasFee * BigInt(1000000);
                     }
-                    let nativeValueForGas = (_f = svmOverride !== null && svmOverride !== void 0 ? svmOverride : perOutboundNativeValue) !== null && _f !== void 0 ? _f : evmFallbackValue;
+                    let nativeValueForGas = (_h = svmOverride !== null && svmOverride !== void 0 ? svmOverride : 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
@@ -949,7 +1058,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 (((_g = h === null || h === void 0 ? void 0 : h.params) === null || _g === void 0 ? void 0 : _g.data) || ((_h = h === null || h === void 0 ? void 0 : h.params) === null || _h === void 0 ? void 0 : _h.value)) {
+                        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)) {
                             const hopCalls = (0, payload_builders_1.buildExecuteMulticall)({
                                 execute: {
                                     to: h.params.to,
@@ -993,7 +1102,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                         let drainAmount = BigInt(0);
                         let tokenMintHex;
                         const params = hop.params;
-                        if (((_j = params.funds) === null || _j === void 0 ? void 0 : _j.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) {
@@ -1022,7 +1131,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                         });
                         const svmBurnAmount = segment.totalBurnAmount || BigInt(0);
                         const outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, segment.prc20Token ||
-                            (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), svmBurnAmount, (_k = segment.gasLimit) !== null && _k !== void 0 ? _k : BigInt(0), svmPayload, ueaAddress);
+                            (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), (_p = segment.gasPrice) !== null && _p !== void 0 ? _p : BigInt(0));
                         const inboundGasFee = segment.gasFee || BigInt(0);
                         let svmInboundFallback;
                         if (effectiveUeaBalance > BigInt(0)) {
@@ -1036,7 +1145,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 (((_l = segment.sizing) === null || _l === void 0 ? void 0 : _l.category) === 'C' &&
+                        if (((_q = segment.sizing) === null || _q === void 0 ? void 0 : _q.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})`);
@@ -1056,7 +1165,8 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                         accumulatedPushMulticalls = [...outboundMulticalls];
                         break;
                     }
-                    // EVM path: Build CEA multicall: [approve?, sendUniversalTxFromCEA(payload)]
+                    // EVM path: Build CEA multicall: sendUniversalTxToUEA(payload).
+                    // CEA handles ERC20 gateway approval internally.
                     const ceaMulticalls = [];
                     // Add primary hop's own CEA operations if any
                     // (e.g., approve + swap before bridging back)
@@ -1072,7 +1182,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                     let amount = BigInt(0);
                     for (const mergedHop of segment.hops) {
                         const hParams = mergedHop.params;
-                        if ((_m = hParams.funds) === null || _m === void 0 ? void 0 : _m.amount) {
+                        if ((_r = hParams.funds) === null || _r === void 0 ? void 0 : _r.amount) {
                             const token = hParams.funds.token;
                             if (token) {
                                 if (token.mechanism === 'native') {
@@ -1086,32 +1196,6 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce)
                                     }
                                     tokenAddress = addr;
                                     amount += hParams.funds.amount;
-                                    // CEA approves gateway once with the cumulative allowance.
-                                    const gatewayAddr = chain_1.UNIVERSAL_GATEWAY_ADDRESSES[sourceChain];
-                                    if (!gatewayAddr) {
-                                        throw new Error(`No UniversalGateway address configured for chain ${sourceChain}`);
-                                    }
-                                    // Reset allowance to 0 first for USDT-style tokens
-                                    const approveZeroData = (0, viem_1.encodeFunctionData)({
-                                        abi: erc20_evm_1.ERC20_EVM,
-                                        functionName: 'approve',
-                                        args: [gatewayAddr, BigInt(0)],
-                                    });
-                                    ceaMulticalls.push({
-                                        to: tokenAddress,
-                                        value: BigInt(0),
-                                        data: approveZeroData,
-                                    });
-                                    const approveData = (0, viem_1.encodeFunctionData)({
-                                        abi: erc20_evm_1.ERC20_EVM,
-                                        functionName: 'approve',
-                                        args: [gatewayAddr, hParams.funds.amount],
-                                    });
-                                    ceaMulticalls.push({
-                                        to: tokenAddress,
-                                        value: BigInt(0),
-                                        data: approveData,
-                                    });
                                 }
                             }
                         }
@@ -1134,7 +1218,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);
+                        (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), segment.totalBurnAmount || BigInt(0), effectiveGasLimit, ceaPayload, ueaAddress, (_s = segment.maxPCForGas) !== null && _s !== void 0 ? _s : BigInt(0), (_t = segment.gasPrice) !== null && _t !== void 0 ? _t : BigInt(0));
                     const inboundGasFee = segment.gasFee || BigInt(0);
                     let evmInboundFallback;
                     if (effectiveUeaBalance > BigInt(0)) {
@@ -1148,7 +1232,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 (((_o = segment.sizing) === null || _o === void 0 ? void 0 : _o.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})`);
@@ -1193,11 +1277,14 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
             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 withCascadeOptions = (params) => enforceGasCheck
+                ? Object.assign(Object.assign({}, params), { options: Object.assign(Object.assign({}, params.options), { enforceGasCheck: true }) }) : params;
             // Classify into segments
             const segments = classifyIntoSegments(hops);
             // Check if this is a single-hop Route 1 (no composition needed)
             if (preparedTxs.length === 1 && preparedTxs[0].route === 'UOA_TO_PUSH') {
-                const response = yield callbacks.executeFn(hops[0].params);
+                const response = yield callbacks.executeFn(withCascadeOptions(hops[0].params));
                 const singleRoute1Result = {
                     initialTxHash: response.hash,
                     initialTxResponse: response,
@@ -1231,7 +1318,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
             }
             // Check if single-hop Route 2 (just execute directly)
             if (preparedTxs.length === 1 && preparedTxs[0].route === 'UOA_TO_CEA') {
-                const response = yield callbacks.executeFn(hops[0].params);
+                const response = yield callbacks.executeFn(withCascadeOptions(hops[0].params));
                 const targetChain = hops[0].targetChain || (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
                 const singleRoute2Result = {
                     initialTxHash: response.hash,
@@ -1276,7 +1363,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
             let composedMulticalls;
             let cascadeRequiredNativeValue = BigInt(0);
             try {
-                const composed = yield composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonceCascade);
+                const composed = yield composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonceCascade, { enforceGasCheck });
                 composedMulticalls = composed.multicalls;
                 cascadeRequiredNativeValue = composed.requiredNativeValue;
             }
@@ -1319,7 +1406,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;
+                    var _a, _b, _c, _d, _e, _f, _g, _h;
                     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
@@ -1398,8 +1485,9 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                         yield response.wait();
                         const ceaToPushIndex = hopInfos.findIndex((h, index) => h.route === 'CEA_TO_PUSH' && !isNativeSeedOnlyHop(hops[index]));
                         const isAfterCeaToPush = (index) => ceaToPushIndex >= 0 && index > ceaToPushIndex;
-                        const trackOutboundHops = (outboundHops, pushTxHash, resolvedSubTxId) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                            var _a, _b, _c;
+                        const rootOutboundIndexByHop = buildRootOutboundIndexByHop(segments, hops);
+                        const trackOutboundHops = (outboundHops, pushTxHash, resolvedSubTxId, outboundIndexByHop) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            var _a, _b, _c, _d;
                             if (outboundHops.length === 0)
                                 return null;
                             if (outboundHops.length === 1) {
@@ -1434,13 +1522,11 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                 });
                                 let lastEmittedStatus;
                                 try {
-                                    const outboundDetails = yield callbacks.waitForOutboundTxFn(pushTxHash, {
-                                        initialWaitMs: Math.min(60000, remainingTimeout),
-                                        pollingIntervalMs,
-                                        timeout: remainingTimeout,
-                                        _resolvedSubTxId: resolvedSubTxId,
-                                        _expectedDestinationChain: hop.executionChain,
-                                        progressHook: (event) => {
+                                    const outboundDetails = yield callbacks.waitForOutboundTxFn(pushTxHash, Object.assign(Object.assign({ initialWaitMs: Math.min(60000, remainingTimeout), pollingIntervalMs, timeout: remainingTimeout, _resolvedSubTxId: resolvedSubTxId, _expectedDestinationChain: hop.executionChain }, (outboundIndexByHop
+                                        ? {
+                                            _outboundIndex: (_a = outboundIndexByHop.get(hop.hopIndex)) !== null && _a !== void 0 ? _a : 0,
+                                        }
+                                        : {})), { progressHook: (event) => {
                                             cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
                                                 hopIndex: hop.hopIndex,
                                                 route: hop.route,
@@ -1453,14 +1539,13 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                                 lastEmittedStatus = 'polling';
                                                 emitHopEvent(hopHooks.polling(hop.executionChain, event.elapsed));
                                             }
-                                        },
-                                    });
+                                        } }));
                                     // `outboundDetails.externalTxHash` from waitForOutboundTx
                                     // is the raw `0x`-hex form (internal canonical). For the
                                     // user-facing `hop.txHash`, `hop.outboundDetails`, and
                                     // cascade progress event, normalize to base58 for SVM so
                                     // consumers can paste it straight into a Solana explorer.
-                                    const displayTxHash = (_a = (0, helpers_1.toExternalTxHashDisplay)(outboundDetails.destinationChain, outboundDetails.externalTxHash)) !== null && _a !== void 0 ? _a : outboundDetails.externalTxHash;
+                                    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';
                                     hop.txHash = displayTxHash;
@@ -1549,12 +1634,12 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     },
                                 });
                                 if (!allOutboundDetails.success) {
-                                    const failedIdx = (_b = allOutboundDetails.failedAt) !== null && _b !== void 0 ? _b : 0;
+                                    const failedIdx = (_c = allOutboundDetails.failedAt) !== null && _c !== void 0 ? _c : 0;
                                     const failedHop = outboundHops.find((h) => h.hopIndex === failedIdx);
                                     const failMsg = failedHop
                                         ? `Outbound failed for hop ${failedIdx} on ${failedHop.executionChain}`
                                         : `Outbound cascade failed at hop ${failedIdx}`;
-                                    emitHopEvent((0, progress_route_hooks_1.pickWaitHooks)(failedHop === null || failedHop === void 0 ? void 0 : failedHop.route).failed((_c = failedHop === null || failedHop === void 0 ? void 0 : failedHop.executionChain) !== null && _c !== void 0 ? _c : '', failMsg));
+                                    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,
@@ -1603,7 +1688,7 @@ 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);
+                        const rootOutboundFailure = yield trackOutboundHops(rootOutboundHops, response.hash, undefined, rootOutboundIndexByHop);
                         if (rootOutboundFailure)
                             return rootOutboundFailure;
                         let childInbound;
@@ -1638,6 +1723,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     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,
@@ -1666,7 +1752,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 = (_d = (0, helpers_1.toExternalTxHashDisplay)(inboundHop.executionChain, failedExternalTxHash)) !== null && _d !== void 0 ? _d : failedExternalTxHash;
+                                const failedDisplayTxHash = (_e = (0, helpers_1.toExternalTxHashDisplay)(inboundHop.executionChain, failedExternalTxHash)) !== null && _e !== void 0 ? _e : failedExternalTxHash;
                                 if (failedDisplayTxHash)
                                     inboundHop.txHash = failedDisplayTxHash;
                                 cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
@@ -1683,7 +1769,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                     failedAt: inboundHop.hopIndex,
                                 };
                             }
-                            const displayExternalTxHash = (_e = (0, helpers_1.toExternalTxHashDisplay)(sourceOutboundDetails.destinationChain, sourceOutboundDetails.externalTxHash)) !== null && _e !== void 0 ? _e : sourceOutboundDetails.externalTxHash;
+                            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 });
                             inboundHop.txHash = displayExternalTxHash;
                             emitHopEvent(hopHooks.success(inboundHop.outboundDetails));
@@ -1691,7 +1777,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                             let inboundLastStatus;
                             const inboundRemainingTimeout = timeout - (Date.now() - startTime);
                             try {
-                                childInbound = yield ((_f = callbacks.waitForInboundPushTxFn) !== null && _f !== void 0 ? _f : ((externalTxHash, sourceChain, opts) => (0, inbound_tracker_1.waitForInboundPushTx)(ctx, externalTxHash, sourceChain, opts)))(sourceOutboundDetails.externalTxHash, inboundHop.executionChain, {
+                                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, {
                                     initialWaitMs: Math.min(60000, inboundRemainingTimeout),
                                     pollingIntervalMs,
                                     timeout: inboundRemainingTimeout,
@@ -1729,7 +1815,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook) {
                                 };
                             }
                             if (childInbound.status !== 'confirmed') {
-                                const failMsg = (_g = childInbound.errorMessage) !== null && _g !== void 0 ? _g : 'inbound execution failed on Push Chain';
+                                const failMsg = (_h = childInbound.errorMessage) !== null && _h !== void 0 ? _h : 'inbound execution failed on Push Chain';
                                 inboundHop.status = 'failed';
                                 inboundHop.txHash =
                                     childInbound.pushTxHash || displayExternalTxHash;