@pushchain/core 6.0.20 → 6.0.21

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

@@ -1,10 +1,4 @@
 "use strict";
-/**
- * Cascade composition functions extracted from Orchestrator.
- *
- * Covers: prepareTransaction, buildHopDescriptor, classifyIntoSegments,
- * getSegmentType, composeCascade, createCascadedBuilder, createChainedBuilder.
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dispatchCascadeProgressEvent = dispatchCascadeProgressEvent;
 exports.prepareTransaction = prepareTransaction;
@@ -15,11 +9,19 @@ exports.composeCascadeDetailed = composeCascadeDetailed;
 exports.composeCascade = composeCascade;
 exports.createCascadedBuilder = createCascadedBuilder;
 const tslib_1 = require("tslib");
+const gate_1 = require("./pc20/gate");
+/**
+ * Cascade composition functions extracted from Orchestrator.
+ *
+ * Covers: prepareTransaction, buildHopDescriptor, classifyIntoSegments,
+ * getSegmentType, composeCascade, createCascadedBuilder, createChainedBuilder.
+ */
 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 orchestrator_types_1 = require("../orchestrator.types");
 const selectors_1 = require("../../constants/selectors");
 const route_detector_1 = require("../route-detector");
 const cea_utils_1 = require("../cea-utils");
@@ -39,6 +41,7 @@ const progress_hook_types_1 = require("../../progress-hook/progress-hook.types")
 const build_payload_1 = require("../svm-idl/build-payload");
 const preflight_1 = require("./preflight");
 const svm_rent_1 = require("./svm-rent");
+const svm_1 = require("./pc20/svm");
 const errors_1 = require("./errors");
 const context_2 = require("./context");
 const inbound_tracker_1 = require("./inbound-tracker");
@@ -71,277 +74,122 @@ function dispatchCascadeProgressEvent(event, primary, secondary) {
 // ============================================================================
 // prepareTransaction
 // ============================================================================
-function prepareTransaction(ctx, params, callbacks) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        (0, route_detector_1.validateRouteParams)(params, {
-            clientChain: ctx.universalSigner.account.chain,
-        });
-        const route = (0, route_detector_1.detectRoute)(params);
-        // Push native EOA: block Route 1 — use sendTransaction() for direct Push calls
-        const signerChain = ctx.universalSigner.account.chain;
-        const isPushNativeEOA = (0, helpers_1.isPushChain)(signerChain);
-        if (isPushNativeEOA && route === route_detector_1.TransactionRoute.UOA_TO_PUSH) {
-            throw new Error('Push native accounts cannot use prepareTransaction for Push Chain transactions. ' +
-                'Use sendTransaction() instead for direct Push Chain calls.');
-        }
-        // Fetch UEA nonce (skip for Push native EOA — uses EVM nonce, not UEA contract nonce)
-        let nonce;
-        const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
-        if (isPushNativeEOA) {
-            nonce = BigInt(0);
+async function prepareTransaction(ctx, params, callbacks) {
+    (0, route_detector_1.validateRouteParams)(params, {
+        clientChain: ctx.universalSigner.account.chain,
+    });
+    const route = (0, route_detector_1.detectRoute)(params);
+    // Push native EOA: block Route 1 — use sendTransaction() for direct Push calls
+    const signerChain = ctx.universalSigner.account.chain;
+    const isPushNativeEOA = (0, helpers_1.isPushChain)(signerChain);
+    if (isPushNativeEOA && route === route_detector_1.TransactionRoute.UOA_TO_PUSH) {
+        throw new Error('Push native accounts cannot use prepareTransaction for Push Chain transactions. ' +
+            'Use sendTransaction() instead for direct Push Chain calls.');
+    }
+    // Fetch UEA nonce (skip for Push native EOA — uses EVM nonce, not UEA contract nonce)
+    let nonce;
+    const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+    if (isPushNativeEOA) {
+        nonce = BigInt(0);
+    }
+    else {
+        const deployedHintCascade = ctx.accountStatusCache?.uea?.deployed;
+        if (deployedHintCascade) {
+            nonce = await (0, uea_manager_1.getUEANonce)(ctx, ueaAddress);
         }
         else {
-            const deployedHintCascade = (_b = (_a = ctx.accountStatusCache) === null || _a === void 0 ? void 0 : _a.uea) === null || _b === void 0 ? void 0 : _b.deployed;
-            if (deployedHintCascade) {
-                nonce = yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress);
-            }
-            else {
-                const status = yield (0, uea_manager_1.getUeaStatusAndNonce)(ctx);
-                nonce = status.nonce;
-            }
+            const status = await (0, uea_manager_1.getUeaStatusAndNonce)(ctx);
+            nonce = status.nonce;
         }
-        // Build the payload based on route
-        const { payload, gatewayRequest } = yield (0, route_handlers_1.buildPayloadForRoute)(ctx, params, route, nonce);
-        const gasEstimate = params.gasLimit || selectors_1.DEFAULT_OUTBOUND_GAS_LIMIT;
-        const deadline = params.deadline || BigInt(Math.floor(Date.now() / 1000) + 3600);
-        // Build the HopDescriptor with all metadata needed for cascade nesting
-        const hop = yield buildHopDescriptor(ctx, params, route, ueaAddress);
-        const prepared = {
-            route,
-            payload,
-            gatewayRequest,
-            estimatedGas: gasEstimate,
-            nonce,
-            deadline,
-            _hop: hop,
-        };
-        return prepared;
-    });
+    }
+    // PC20 resolution for a prepared transaction.
+    //
+    // A prepared tx is signed now and sent later, so the registry state it was
+    // built against can move in between — most importantly, a first export can
+    // land and create a mapping that did not exist at prepare time. The
+    // descriptor is therefore resolved here to build the payload, and
+    // deliberately NOT cached as authoritative: `revalidatePreparedPC20` re-runs
+    // the critical reads at send time.
+    const preparedParams = (await (0, gate_1.gateFunds)(ctx, params));
+    // Build the payload based on route
+    const { payload, gatewayRequest } = await (0, route_handlers_1.buildPayloadForRoute)(ctx, preparedParams, route, nonce);
+    const gasEstimate = params.gasLimit || selectors_1.DEFAULT_OUTBOUND_GAS_LIMIT;
+    const deadline = params.deadline || BigInt(Math.floor(Date.now() / 1000) + 3600);
+    // Build the HopDescriptor with all metadata needed for cascade nesting
+    const hop = await buildHopDescriptor(ctx, preparedParams, route, ueaAddress);
+    const prepared = {
+        route,
+        payload,
+        gatewayRequest,
+        estimatedGas: gasEstimate,
+        nonce,
+        deadline,
+        _hop: hop,
+    };
+    return prepared;
 }
 // ============================================================================
 // buildHopDescriptor
 // ============================================================================
-function buildHopDescriptor(ctx, params, route, ueaAddress) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-        // Pass 0 when user omits gasLimit so the contract uses the per-chain base,
-        // except EVM Route 3 where a CEA deploy + sendUniversalTxToUEA needs more
-        // than the generic 500k source-chain base.
-        const defaultGasLimit = route === route_detector_1.TransactionRoute.CEA_TO_PUSH &&
-            ((_a = params.from) === null || _a === void 0 ? void 0 : _a.chain) &&
-            !(0, payload_builders_1.isSvmChain)(params.from.chain)
-            ? selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT
-            : BigInt(0);
-        const gasLimit = (_b = params.gasLimit) !== null && _b !== void 0 ? _b : defaultGasLimit;
-        const routeStr = route;
-        const baseDescriptor = {
-            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 = (_d = params.value) !== null && _d !== void 0 ? _d : BigInt(0);
-                if (isValueOnlyNativeSeedToOwnUea(params, ueaAddress, {
-                    allowFunds: true,
-                })) {
-                    return Object.assign(Object.assign({}, baseDescriptor), { pushMulticalls: [], nativeSeedOnly: true, nativeSeedAmount: seedAmount });
-                }
-                const executeParams = (0, helpers_1.toExecuteParams)(params);
-                const pushMulticalls = (0, payload_builders_1.buildExecuteMulticall)({
-                    execute: executeParams,
-                    ueaAddress,
-                });
-                return Object.assign(Object.assign({}, baseDescriptor), { pushMulticalls });
+async function buildHopDescriptor(ctx, params, route, ueaAddress) {
+    // Pass 0 when user omits gasLimit so the contract uses the per-chain base,
+    // except EVM Route 3 where a CEA deploy + sendUniversalTxToUEA needs more
+    // than the generic 500k source-chain base.
+    const defaultGasLimit = route === route_detector_1.TransactionRoute.CEA_TO_PUSH &&
+        params.from?.chain &&
+        !(0, payload_builders_1.isSvmChain)(params.from.chain)
+        ? selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT
+        : BigInt(0);
+    const gasLimit = params.gasLimit ?? defaultGasLimit;
+    const routeStr = route;
+    const baseDescriptor = {
+        params,
+        route: routeStr,
+        gasLimit,
+        maxPCForGas: params.maxPCForGas ?? BigInt(0),
+        ueaAddress,
+        revertRecipient: ueaAddress,
+    };
+    switch (route) {
+        case route_detector_1.TransactionRoute.UOA_TO_PUSH: {
+            // Route 1: Build Push Chain multicalls
+            const seedAmount = params.value ?? BigInt(0);
+            if (isValueOnlyNativeSeedToOwnUea(params, ueaAddress, {
+                allowFunds: true,
+            })) {
+                return {
+                    ...baseDescriptor,
+                    pushMulticalls: [],
+                    nativeSeedOnly: true,
+                    nativeSeedAmount: seedAmount,
+                };
             }
-            case route_detector_1.TransactionRoute.UOA_TO_CEA: {
-                // Route 2: Build outbound metadata
-                const target = params.to;
-                const targetChain = target.chain;
-                // Branch: SVM vs EVM
-                if ((0, payload_builders_1.isSvmChain)(targetChain)) {
-                    // SVM path: no CEA lookup, build SVM payload via IDL resolver
-                    const { svmPayload, hasExecute: hasSvmExecute } = (0, build_payload_1.buildSvmPayloadFromParams)({
-                        data: params.data,
-                        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) {
-                        const token = params.funds.token;
-                        if (token) {
-                            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
-                            burnAmount = params.funds.amount;
-                        }
-                    }
-                    else if (params.value && params.value > BigInt(0)) {
-                        prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
-                        burnAmount = params.value;
-                    }
-                    else if (hasSvmExecute) {
-                        // PAYLOAD-only SVM execute: still need native PRC-20 for chain namespace
-                        // + gas fees, but burn amount must be zero. Matches executeUoaToCeaSvm
-                        // (route-handlers.ts) and the EVM cascade branch below.
-                        // Using burnAmount=1 would trigger transferFrom on the PRC-20 token,
-                        // which reverts with InsufficientBalance when the UEA has no pSOL balance.
-                        prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
-                        burnAmount = BigInt(0);
-                    }
-                    let gasToken = selectors_1.ZERO_ADDRESS;
-                    let gasFee = BigInt(0);
-                    let gasPrice = BigInt(0);
-                    let sizing;
-                    // 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;
-                    const splMintBase58 = (svmFundsToken === null || svmFundsToken === void 0 ? void 0 : svmFundsToken.mechanism) === 'approve'
-                        ? svmFundsToken.address
-                        : undefined;
-                    let effectiveGasLimit = gasLimit;
-                    if (prc20Token !== selectors_1.ZERO_ADDRESS) {
-                        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;
-                        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,
-                        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]);
-                // Migration path: raw MIGRATION_SELECTOR payload, no multicall wrapping
-                if (params.migration) {
-                    const prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
-                    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,
-                        gasPrice, isMigration: true, sizing });
-                }
-                // Build CEA multicalls
-                const ceaMulticalls = [];
-                const hasData = (0, data_utils_1.hasExecutablePayloadData)(params.data);
-                const fundsToken = ((_h = params.funds) === null || _h === void 0 ? void 0 : _h.amount)
-                    ? (0, route_handlers_1.resolveR2DestinationFundsToken)(params.funds.token, targetChain, ctx.pushNetwork)
-                    : undefined;
-                const nativeFundsValue = ((_j = params.funds) === null || _j === void 0 ? void 0 : _j.amount) && (fundsToken === null || fundsToken === void 0 ? void 0 : fundsToken.mechanism) === 'native'
-                    ? params.funds.amount
-                    : BigInt(0);
-                if (hasData) {
-                    if (Array.isArray(params.data)) {
-                        ceaMulticalls.push(...params.data);
-                    }
-                    else {
-                        // When ERC-20 funds are provided with a single payload, auto-prepend a
-                        // transfer() call so the tokens minted to the CEA are forwarded to the
-                        // target address. This mirrors the Route 1 behavior in buildExecuteMulticall.
-                        if ((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount) {
-                            if (fundsToken && fundsToken.mechanism !== 'native') {
-                                const erc20Transfer = (0, viem_1.encodeFunctionData)({
-                                    abi: erc20_evm_1.ERC20_EVM,
-                                    functionName: 'transfer',
-                                    args: [target.address, params.funds.amount],
-                                });
-                                ceaMulticalls.push({
-                                    to: fundsToken.address,
-                                    value: BigInt(0),
-                                    data: erc20Transfer,
-                                });
-                            }
-                        }
-                        // Single call with data. Forward native value (if any) so the target
-                        // contract receives it alongside the payload call. The vault deposits
-                        // native value to the CEA, and the multicall forwards it to the target.
-                        ceaMulticalls.push({
-                            to: target.address,
-                            value: ((_l = params.value) !== null && _l !== void 0 ? _l : BigInt(0)) + nativeFundsValue,
-                            data: params.data,
-                        });
-                    }
-                }
-                else {
-                    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',
-                            args: [target.address, params.funds.amount],
-                        });
-                        ceaMulticalls.push({
-                            to: fundsToken.address,
-                            value: BigInt(0),
-                            data: erc20Transfer,
-                        });
-                    }
-                    if (params.value) {
-                        // Skip multicall when sending native value to own CEA — gateway deposits directly.
-                        // Self-call with value would revert (CEA._handleMulticall rejects it).
-                        if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
-                            ceaMulticalls.push({
-                                to: target.address,
-                                value: params.value,
-                                data: '0x',
-                            });
-                        }
-                    }
-                    else if (nativeFundsValue > BigInt(0)) {
-                        if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
-                            ceaMulticalls.push({
-                                to: target.address,
-                                value: nativeFundsValue,
-                                data: '0x',
-                            });
-                        }
-                    }
-                }
-                // Determine PRC-20 token and burn amount
+            const executeParams = (0, gate_1.assertLegacyFunds)((0, helpers_1.toExecuteParams)(params));
+            const pushMulticalls = (0, payload_builders_1.buildExecuteMulticall)({
+                execute: executeParams,
+                ueaAddress,
+            });
+            return {
+                ...baseDescriptor,
+                pushMulticalls,
+            };
+        }
+        case route_detector_1.TransactionRoute.UOA_TO_CEA: {
+            // Route 2: Build outbound metadata
+            const target = params.to;
+            const targetChain = target.chain;
+            // Branch: SVM vs EVM
+            if ((0, payload_builders_1.isSvmChain)(targetChain)) {
+                // SVM path: no CEA lookup, build SVM payload via IDL resolver
+                const { svmPayload, hasExecute: hasSvmExecute } = (0, build_payload_1.buildSvmPayloadFromParams)({
+                    data: params.data,
+                    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 ((_o = params.funds) === null || _o === void 0 ? void 0 : _o.amount) {
+                if (params.funds?.amount) {
                     const token = params.funds.token;
                     if (token) {
                         prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
@@ -352,160 +200,371 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
                     burnAmount = params.value;
                 }
-                else if ((0, data_utils_1.hasExecutablePayloadData)(params.data)) {
-                    // PAYLOAD-only (no value transfer): still need native PRC-20 token for
-                    // chain namespace lookup + gas fees, but burn amount must be zero.
-                    // Matches the direct executeUoaToCea path (route-handlers.ts).
+                else if (hasSvmExecute) {
+                    // PAYLOAD-only SVM execute: still need native PRC-20 for chain namespace
+                    // + gas fees, but burn amount must be zero. Matches executeUoaToCeaSvm
+                    // (route-handlers.ts) and the EVM cascade branch below.
                     // Using burnAmount=1 would trigger transferFrom on the PRC-20 token,
-                    // which reverts when the UEA has no PRC-20 balance for that chain.
+                    // which reverts with InsufficientBalance when the UEA has no pSOL balance.
                     prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
                     burnAmount = BigInt(0);
                 }
-                // Query gas fee
+                let gasToken = selectors_1.ZERO_ADDRESS;
+                let gasFee = BigInt(0);
+                let gasPrice = BigInt(0);
+                let sizing;
+                // 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)
+                    ? params.funds?.token
+                    : undefined;
+                const splMintBase58 = svmFundsToken?.mechanism === 'approve'
+                    ? svmFundsToken.address
+                    : undefined;
+                let effectiveGasLimit = gasLimit;
+                if (prc20Token !== selectors_1.ZERO_ADDRESS) {
+                    let result = await (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, effectiveGasLimit, targetChain);
+                    result = await (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;
+                    effectiveGasLimit = result.gasLimitUsed;
+                    if (!params.gasLimit) {
+                        (0, context_1.printLog)(ctx, `buildHopDescriptor — SVM resolved effectiveGasLimit: ${effectiveGasLimit} ` +
+                            `(gasFee=${result.gasFee}, gasPrice=${result.gasPrice})`);
+                    }
+                }
+                return {
+                    ...baseDescriptor,
+                    targetChain,
+                    isSvmTarget: true,
+                    svmPayload,
+                    prc20Token,
+                    burnAmount,
+                    gasToken,
+                    gasFee,
+                    gasPrice,
+                    gasLimit: effectiveGasLimit,
+                    sizing,
+                };
+            }
+            // EVM path: Resolve CEA address + build CEA multicalls
+            const { cea: ceaAddress } = await (0, cea_utils_1.getCEAAddress)(ueaAddress, targetChain, ctx.rpcUrls[targetChain]?.[0]);
+            // Migration path: raw MIGRATION_SELECTOR payload, no multicall wrapping
+            if (params.migration) {
+                const prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
+                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);
+                    const result = await (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,
+                return {
+                    ...baseDescriptor,
+                    targetChain,
                     ceaAddress,
-                    ceaMulticalls,
+                    ceaMulticalls: [],
                     prc20Token,
                     burnAmount,
                     gasToken,
                     gasFee,
                     gasPrice,
-                    sizing });
+                    isMigration: true,
+                    sizing,
+                };
             }
-            case route_detector_1.TransactionRoute.CEA_TO_PUSH: {
-                // Route 3: Build CEA multicalls for sendUniversalTxFromCEA
-                const sourceChain = params.from.chain;
-                const seedAmount = (_p = params.value) !== null && _p !== void 0 ? _p : BigInt(0);
-                if (isValueOnlyNativeSeedToOwnUea(params, ueaAddress)) {
-                    return Object.assign(Object.assign({}, baseDescriptor), { sourceChain, burnAmount: BigInt(0), gasToken: selectors_1.ZERO_ADDRESS, gasFee: BigInt(0), nativeSeedOnly: true, nativeSeedAmount: seedAmount });
+            // Build CEA multicalls
+            const ceaMulticalls = [];
+            const hasData = (0, data_utils_1.hasExecutablePayloadData)(params.data);
+            const fundsToken = params.funds?.amount
+                ? (0, route_handlers_1.resolveR2DestinationFundsToken)(params.funds.token, targetChain, ctx.pushNetwork)
+                : undefined;
+            const nativeFundsValue = params.funds?.amount && fundsToken?.mechanism === 'native'
+                ? params.funds.amount
+                : BigInt(0);
+            if (hasData) {
+                if (Array.isArray(params.data)) {
+                    ceaMulticalls.push(...params.data);
                 }
-                // SVM chains use PDA-based CEA, not factory-deployed CEA
-                if ((0, payload_builders_1.isSvmChain)(sourceChain)) {
-                    const lockerContract = chain_1.CHAIN_INFO[sourceChain].lockerContract;
-                    if (!lockerContract) {
-                        throw new Error(`No SVM gateway program configured for chain ${sourceChain}`);
-                    }
-                    const programPk = new web3_js_1.PublicKey(lockerContract);
-                    const gatewayProgramHex = ('0x' +
-                        Buffer.from(programPk.toBytes()).toString('hex'));
-                    // Derive CEA PDA
-                    const ueaBytes = Buffer.from(ueaAddress.slice(2), 'hex');
-                    const [ceaPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('push_identity'), ueaBytes], programPk);
-                    const ceaPdaHex = ('0x' +
-                        Buffer.from(ceaPda.toBytes()).toString('hex'));
-                    let amount = BigInt(0);
-                    let prc20Token;
-                    if (((_q = params.funds) === null || _q === void 0 ? void 0 : _q.amount) && params.funds.amount > BigInt(0)) {
-                        amount = params.funds.amount;
-                        const token = params.funds.token;
-                        if (token && token.address) {
-                            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
-                        }
-                        else {
-                            prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
+                else {
+                    // When ERC-20 funds are provided with a single payload, auto-prepend a
+                    // transfer() call so the tokens minted to the CEA are forwarded to the
+                    // target address. This mirrors the Route 1 behavior in buildExecuteMulticall.
+                    if (params.funds?.amount) {
+                        if (fundsToken && fundsToken.mechanism !== 'native') {
+                            const erc20Transfer = (0, viem_1.encodeFunctionData)({
+                                abi: erc20_evm_1.ERC20_EVM,
+                                functionName: 'transfer',
+                                args: [target.address, params.funds.amount],
+                            });
+                            ceaMulticalls.push({
+                                to: fundsToken.address,
+                                value: BigInt(0),
+                                data: erc20Transfer,
+                            });
                         }
                     }
-                    else if (params.value && params.value > BigInt(0)) {
-                        amount = params.value;
-                        prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
-                    }
-                    else {
-                        // Payload-only Route 3 SVM
-                        prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
+                    // Single call with data. Forward native value (if any) so the target
+                    // contract receives it alongside the payload call. The vault deposits
+                    // native value to the CEA, and the multicall forwards it to the target.
+                    ceaMulticalls.push({
+                        to: target.address,
+                        value: (params.value ?? BigInt(0)) + nativeFundsValue,
+                        data: params.data,
+                    });
+                }
+            }
+            else {
+                if (params.funds?.amount &&
+                    fundsToken &&
+                    fundsToken.mechanism !== 'native') {
+                    const erc20Transfer = (0, viem_1.encodeFunctionData)({
+                        abi: erc20_evm_1.ERC20_EVM,
+                        functionName: 'transfer',
+                        args: [target.address, params.funds.amount],
+                    });
+                    ceaMulticalls.push({
+                        to: fundsToken.address,
+                        value: BigInt(0),
+                        data: erc20Transfer,
+                    });
+                }
+                if (params.value) {
+                    // Skip multicall when sending native value to own CEA — gateway deposits directly.
+                    // Self-call with value would revert (CEA._handleMulticall rejects it).
+                    if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
+                        ceaMulticalls.push({
+                            to: target.address,
+                            value: params.value,
+                            data: '0x',
+                        });
                     }
-                    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) {
-                        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',
+                }
+                else if (nativeFundsValue > BigInt(0)) {
+                    if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
+                        ceaMulticalls.push({
+                            to: target.address,
+                            value: nativeFundsValue,
+                            data: '0x',
                         });
-                        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 drains pre-existing funds from the external CEA. The
-                        // Push-side outbound is a payload relay, so no PRC-20 is burned.
-                        burnAmount: BigInt(0), gasToken,
-                        gasFee,
-                        gasPrice, gasLimit: effectiveGasLimit, sizing });
                 }
-                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_r = ctx.rpcUrls[sourceChain]) === null || _r === void 0 ? void 0 : _r[0]);
-                // CEA auto-deploys on-chain: Vault.finalizeUniversalTx calls CEAFactory.deployCEA()
-                // if CEA doesn't exist yet. No SDK-side blocking needed.
-                // Determine token/amount for the inbound
-                let tokenAddress = selectors_1.ZERO_ADDRESS;
+            }
+            // Determine PRC-20 token and burn amount
+            let prc20Token = selectors_1.ZERO_ADDRESS;
+            let burnAmount = BigInt(0);
+            if (params.funds?.amount) {
+                const token = params.funds.token;
+                if (token) {
+                    prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
+                    burnAmount = params.funds.amount;
+                }
+            }
+            else if (params.value && params.value > BigInt(0)) {
+                prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
+                burnAmount = params.value;
+            }
+            else if ((0, data_utils_1.hasExecutablePayloadData)(params.data)) {
+                // PAYLOAD-only (no value transfer): still need native PRC-20 token for
+                // chain namespace lookup + gas fees, but burn amount must be zero.
+                // Matches the direct executeUoaToCea path (route-handlers.ts).
+                // Using burnAmount=1 would trigger transferFrom on the PRC-20 token,
+                // which reverts when the UEA has no PRC-20 balance for that chain.
+                prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
+                burnAmount = BigInt(0);
+            }
+            // 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 = await (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit, targetChain);
+                gasToken = result.gasToken;
+                gasFee = result.gasFee;
+                gasPrice = result.gasPrice;
+                sizing = result.sizing;
+            }
+            return {
+                ...baseDescriptor,
+                targetChain,
+                ceaAddress,
+                ceaMulticalls,
+                prc20Token,
+                burnAmount,
+                gasToken,
+                gasFee,
+                gasPrice,
+                sizing,
+            };
+        }
+        case route_detector_1.TransactionRoute.CEA_TO_PUSH: {
+            // Route 3: Build CEA multicalls for sendUniversalTxFromCEA
+            const sourceChain = params.from.chain;
+            const seedAmount = params.value ?? BigInt(0);
+            if (isValueOnlyNativeSeedToOwnUea(params, ueaAddress)) {
+                return {
+                    ...baseDescriptor,
+                    sourceChain,
+                    burnAmount: BigInt(0),
+                    gasToken: selectors_1.ZERO_ADDRESS,
+                    gasFee: BigInt(0),
+                    nativeSeedOnly: true,
+                    nativeSeedAmount: seedAmount,
+                };
+            }
+            // SVM chains use PDA-based CEA, not factory-deployed CEA
+            if ((0, payload_builders_1.isSvmChain)(sourceChain)) {
+                const lockerContract = chain_1.CHAIN_INFO[sourceChain].lockerContract;
+                if (!lockerContract) {
+                    throw new Error(`No SVM gateway program configured for chain ${sourceChain}`);
+                }
+                const programPk = new web3_js_1.PublicKey(lockerContract);
+                const gatewayProgramHex = ('0x' +
+                    Buffer.from(programPk.toBytes()).toString('hex'));
+                // Derive CEA PDA
+                const ueaBytes = Buffer.from(ueaAddress.slice(2), 'hex');
+                const [ceaPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('push_identity'), ueaBytes], programPk);
+                const ceaPdaHex = ('0x' +
+                    Buffer.from(ceaPda.toBytes()).toString('hex'));
                 let amount = BigInt(0);
-                let nativeValue = BigInt(0);
-                if ((_s = params.funds) === null || _s === void 0 ? void 0 : _s.amount) {
+                let prc20Token;
+                if (params.funds?.amount && params.funds.amount > BigInt(0)) {
+                    amount = params.funds.amount;
                     const token = params.funds.token;
-                    if (token) {
-                        if (token.mechanism === 'native') {
-                            amount = params.funds.amount;
-                            nativeValue = params.funds.amount;
-                        }
-                        else {
-                            tokenAddress = token.address;
-                            amount = params.funds.amount;
-                        }
+                    const pc20 = params._pc20;
+                    if (pc20?.direction === 'import') {
+                        // PC20 CEA burns use the native PRC-20 only for the outbound
+                        // relay's chain namespace and gas. The wrapper amount is carried
+                        // inside the Solana self-call and must not be burned on Push.
+                        prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
+                    }
+                    else if (token && token.address) {
+                        prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
+                    }
+                    else {
+                        prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
                     }
                 }
                 else if (params.value && params.value > BigInt(0)) {
                     amount = params.value;
-                    nativeValue = params.value;
+                    prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
+                }
+                else {
+                    // Payload-only Route 3 SVM
+                    prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
                 }
-                // The PRC-20 for the outbound wrapper (Route 2 to source chain)
-                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;
+                let effectiveGasLimit = gasLimit;
                 if (prc20Token !== selectors_1.ZERO_ADDRESS) {
-                    const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit, sourceChain);
+                    let result = await (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, effectiveGasLimit, sourceChain);
+                    result = await (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,
-                    prc20Token, 
-                    // Route 3 is payload-only on Push: the CEA-side sendUniversalTxToUEA
-                    // carries `amount`. Burning here would require the UEA to pre-hold the
-                    // token it is trying to receive from the external CEA.
-                    burnAmount: BigInt(0), gasToken,
+                return {
+                    ...baseDescriptor,
+                    sourceChain,
+                    ceaAddress: ceaPdaHex,
+                    isSvmTarget: true,
+                    prc20Token,
+                    // Route 3 drains pre-existing funds from the external CEA. The
+                    // Push-side outbound is a payload relay, so no PRC-20 is burned.
+                    burnAmount: BigInt(0),
+                    gasToken,
                     gasFee,
                     gasPrice,
-                    sizing });
+                    gasLimit: effectiveGasLimit,
+                    sizing,
+                };
+            }
+            const { cea: ceaAddress } = await (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, ctx.rpcUrls[sourceChain]?.[0]);
+            // CEA auto-deploys on-chain: Vault.finalizeUniversalTx calls CEAFactory.deployCEA()
+            // if CEA doesn't exist yet. No SDK-side blocking needed.
+            // Determine token/amount for the inbound
+            let tokenAddress = selectors_1.ZERO_ADDRESS;
+            let amount = BigInt(0);
+            let nativeValue = BigInt(0);
+            if (params.funds?.amount) {
+                const token = params.funds.token;
+                if (token) {
+                    if (token.mechanism === 'native') {
+                        amount = params.funds.amount;
+                        nativeValue = params.funds.amount;
+                    }
+                    else {
+                        tokenAddress = token.address;
+                        amount = params.funds.amount;
+                    }
+                }
+            }
+            else if (params.value && params.value > BigInt(0)) {
+                amount = params.value;
+                nativeValue = params.value;
             }
-            default:
-                return baseDescriptor;
+            // The PRC-20 for the outbound wrapper (Route 2 to source chain)
+            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 = await (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit, sourceChain);
+                gasToken = result.gasToken;
+                gasFee = result.gasFee;
+                gasPrice = result.gasPrice;
+                sizing = result.sizing;
+            }
+            return {
+                ...baseDescriptor,
+                sourceChain,
+                ceaAddress,
+                prc20Token,
+                // Route 3 is payload-only on Push: the CEA-side sendUniversalTxToUEA
+                // carries `amount`. Burning here would require the UEA to pre-hold the
+                // token it is trying to receive from the external CEA.
+                burnAmount: BigInt(0),
+                gasToken,
+                gasFee,
+                gasPrice,
+                sizing,
+            };
         }
-    });
+        default:
+            return baseDescriptor;
+    }
 }
 // ============================================================================
 // classifyIntoSegments
@@ -622,15 +681,15 @@ 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);
+    const a = current ?? BigInt(0);
+    const b = 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);
+    const a = current ?? BigInt(0);
+    const b = next ?? BigInt(0);
     return a > b ? a : b;
 }
 // ============================================================================
@@ -649,12 +708,11 @@ function getSegmentType(route) {
     }
 }
 function sumMulticallNativeValue(multicalls) {
-    return (multicalls !== null && multicalls !== void 0 ? multicalls : []).reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
+    return (multicalls ?? []).reduce((sum, mc) => sum + (mc.value ?? BigInt(0)), BigInt(0));
 }
 function isValueOnlyNativeSeedToOwnUea(params, ueaAddress, options) {
-    var _a, _b;
-    return (((_a = params.value) !== null && _a !== void 0 ? _a : BigInt(0)) > BigInt(0) &&
-        ((options === null || options === void 0 ? void 0 : options.allowFunds) === true || !((_b = params.funds) === null || _b === void 0 ? void 0 : _b.amount)) &&
+    return ((params.value ?? BigInt(0)) > BigInt(0) &&
+        (options?.allowFunds === true || !params.funds?.amount) &&
         (0, data_utils_1.isEmptyPayloadData)(params.data) &&
         typeof params.to === 'string' &&
         params.to.toLowerCase() === ueaAddress.toLowerCase());
@@ -668,30 +726,42 @@ function getRootFundsDeposit(hops) {
         if (hop.route !== 'UOA_TO_PUSH')
             break;
         const funds = hop.params.funds;
-        if (!(funds === null || funds === void 0 ? void 0 : funds.amount) || funds.amount <= BigInt(0))
+        if (!funds?.amount || funds.amount <= BigInt(0))
             continue;
         if (!rootFunds) {
-            rootFunds = Object.assign({}, funds);
+            rootFunds = { ...funds };
             continue;
         }
+        // Token identity across hops. Compared on the fields both union members
+        // share (address) plus, for MoveableTokens, symbol/mechanism. A PC20
+        // reference is identified by chain+address alone — it has no symbol or
+        // mechanism to compare, and its chain is what distinguishes two wrappers
+        // that happen to share an address on different chains.
         const currentToken = rootFunds.token;
         const nextToken = funds.token;
         const sameToken = currentToken === nextToken ||
             (!!currentToken &&
                 !!nextToken &&
-                currentToken.address.toLowerCase() ===
-                    nextToken.address.toLowerCase() &&
-                currentToken.symbol === nextToken.symbol &&
-                currentToken.mechanism === nextToken.mechanism);
+                currentToken.address.toLowerCase() === nextToken.address.toLowerCase() &&
+                (0, orchestrator_types_1.isPC20Reference)(currentToken) === (0, orchestrator_types_1.isPC20Reference)(nextToken) &&
+                ((0, orchestrator_types_1.isPC20Reference)(currentToken) && (0, orchestrator_types_1.isPC20Reference)(nextToken)
+                    ? currentToken.chain === nextToken.chain
+                    : currentToken.symbol ===
+                        nextToken.symbol &&
+                        currentToken.mechanism ===
+                            nextToken.mechanism));
         if (!sameToken) {
             throw new Error('Cascade can only bridge one origin token in root Push execution hops. Split mixed-token deposits into separate transactions.');
         }
-        rootFunds = Object.assign(Object.assign({}, rootFunds), { amount: rootFunds.amount + funds.amount });
+        rootFunds = {
+            ...rootFunds,
+            amount: rootFunds.amount + funds.amount,
+        };
     }
     return rootFunds;
 }
 function isNativeSeedOnlyHop(hop) {
-    return (hop === null || hop === void 0 ? void 0 : hop.nativeSeedOnly) === true;
+    return hop?.nativeSeedOnly === true;
 }
 function isNativeSeedOnlySegment(segment) {
     return (segment.type === 'INBOUND_FROM_CEA' &&
@@ -702,7 +772,6 @@ 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();
@@ -718,7 +787,7 @@ function buildRootOutboundIndexByHop(segments, hops) {
         }
         if (!chain)
             continue;
-        const outboundIndex = (_a = nextIndexByChain.get(chain)) !== null && _a !== void 0 ? _a : 0;
+        const outboundIndex = nextIndexByChain.get(chain) ?? 0;
         for (const hop of segment.hops) {
             const hopIndex = hopIndexByDescriptor.get(hop);
             if (hopIndex !== undefined) {
@@ -730,16 +799,15 @@ function buildRootOutboundIndexByHop(segments, hops) {
     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));
+    return hops.reduce((sum, hop) => sum + (hop.nativeSeedAmount ?? BigInt(0)), BigInt(0));
 }
 function getCascadeNativeSeed(segments) {
-    var _a, _b, _c;
     let total = BigInt(0);
     for (const segment of segments) {
         for (const hop of segment.hops) {
-            const value = (_a = hop.params.value) !== null && _a !== void 0 ? _a : BigInt(0);
+            const value = hop.params.value ?? BigInt(0);
             if (isNativeSeedOnlyHop(hop)) {
-                total += (_b = hop.nativeSeedAmount) !== null && _b !== void 0 ? _b : value;
+                total += hop.nativeSeedAmount ?? value;
                 continue;
             }
             // In a CEA->Push hop that also supplies `funds`, `value` is native PC
@@ -747,7 +815,7 @@ function getCascadeNativeSeed(segments) {
             // later Push-side cascade calls and must be counted for sizing fresh UEAs.
             if (segment.type === 'INBOUND_FROM_CEA' &&
                 value > BigInt(0) &&
-                ((_c = hop.params.funds) === null || _c === void 0 ? void 0 : _c.amount)) {
+                hop.params.funds?.amount) {
                 total += value;
             }
         }
@@ -755,7 +823,6 @@ function getCascadeNativeSeed(segments) {
     return total;
 }
 function getInboundFundingForBurnToken(segments, beforeSegmentIndex, burnToken, pushNetwork) {
-    var _a;
     let total = BigInt(0);
     const normalizedBurnToken = burnToken.toLowerCase();
     for (const segment of segments.slice(0, beforeSegmentIndex)) {
@@ -765,7 +832,7 @@ function getInboundFundingForBurnToken(segments, beforeSegmentIndex, burnToken,
             const params = hop.params;
             let fundedToken;
             let fundedAmount = BigInt(0);
-            if ((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) {
+            if (params.funds?.amount) {
                 const token = params.funds.token;
                 if (token) {
                     fundedToken = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
@@ -779,630 +846,673 @@ function getInboundFundingForBurnToken(segments, beforeSegmentIndex, burnToken,
                 fundedToken = (0, helpers_1.getNativePRC20ForChain)(hop.sourceChain, pushNetwork);
                 fundedAmount = params.value;
             }
-            if ((fundedToken === null || fundedToken === void 0 ? void 0 : fundedToken.toLowerCase()) === normalizedBurnToken) {
+            if (fundedToken?.toLowerCase() === normalizedBurnToken) {
                 total += fundedAmount;
             }
         }
     }
     return total;
 }
-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, _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()})`);
+async function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce, options) {
+    let accumulatedPushMulticalls = [];
+    let requiredNativeValue = BigInt(0);
+    const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+    const currentUeaBalance = ueaBalance ?? BigInt(0);
+    const cascadeNativeSeed = getCascadeNativeSeed(segments);
+    const effectiveUeaBalance = currentUeaBalance + cascadeNativeSeed;
+    const enforceGasCheck = options?.enforceGasCheck === true ||
+        segments.some((segment) => segment.hops.some((hop) => hop.params.options?.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()})`);
+    }
+    // Compute per-outbound nativeValueForGas from UEA balance
+    // Each outbound segment needs native value for the gas swap on the destination chain.
+    // The contract refunds excess, so over-allocating is safe.
+    const numOutbounds = segments.filter(segmentNeedsOutboundGas).length;
+    const CASCADE_GAS_RESERVE = BigInt(3e18); // 3 PC reserve for gas costs
+    // 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. Warn by default
+    // and throw only when enforceGasCheck=true.
+    if (numOutbounds > 0) {
+        (0, preflight_1.runPreflight)({
+            ctx,
+            ueaAddress,
+            ueaBalance: effectiveUeaBalance,
+            // Required = at least one wei of allocatable PC after reserve. The
+            // per-segment min-swap check below catches finer-grained shortfalls.
+            requiredValue: BigInt(1),
+            gasReserve: CASCADE_GAS_RESERVE,
+            pathTag: 'CASCADE',
+            enforceGasCheck,
+        });
+    }
+    let perOutboundNativeValue;
+    if (numOutbounds > 0 && effectiveUeaBalance > CASCADE_GAS_RESERVE) {
+        perOutboundNativeValue =
+            (effectiveUeaBalance - CASCADE_GAS_RESERVE) / BigInt(numOutbounds);
+    }
+    let universalCoreAddressForSwap;
+    const getUniversalCoreAddressForSwap = async () => {
+        if (!universalCoreAddressForSwap) {
+            universalCoreAddressForSwap =
+                await ctx.pushClient.readContract({
+                    address: gatewayPcAddress,
+                    abi: abi_1.UNIVERSAL_GATEWAY_PC,
+                    functionName: 'universalCore',
+                    args: [],
+                });
         }
-        // Compute per-outbound nativeValueForGas from UEA balance
-        // Each outbound segment needs native value for the gas swap on the destination chain.
-        // The contract refunds excess, so over-allocating is safe.
-        const numOutbounds = segments.filter(segmentNeedsOutboundGas).length;
-        const CASCADE_GAS_RESERVE = BigInt(3e18); // 3 PC reserve for gas costs
-        // 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. Warn by default
-        // and throw only when enforceGasCheck=true.
-        if (numOutbounds > 0) {
-            (0, preflight_1.runPreflight)({
-                ctx,
-                ueaAddress,
-                ueaBalance: effectiveUeaBalance,
-                // Required = at least one wei of allocatable PC after reserve. The
-                // per-segment min-swap check below catches finer-grained shortfalls.
-                requiredValue: BigInt(1),
-                gasReserve: CASCADE_GAS_RESERVE,
-                pathTag: 'CASCADE',
-                enforceGasCheck,
-            });
+        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 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) => ((s.type === 'OUTBOUND_TO_CEA' && s.hops[0]?.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 = await 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.
+        const numEvmOutbounds = numOutbounds - svmSegments.length;
+        const evmReservation = perOutboundNativeValue && numEvmOutbounds > 0
+            ? perOutboundNativeValue * BigInt(numEvmOutbounds)
+            : BigInt(0);
+        const outerSafety = BigInt(1e18); // 1 PC for outer-tx gas
+        const svmTotal = effectiveUeaBalance > evmReservation + outerSafety
+            ? effectiveUeaBalance - evmReservation - outerSafety
+            : BigInt(0);
+        const perSvmCap = svmTotal / BigInt(svmSegments.length);
+        const UNCAPPED_BALANCE = BigInt('1000000000000000000000000000000'); // effectively disable estimator's internal cap
+        for (const seg of svmSegments) {
+            // Cascade-level segment index (position in `segments`, not in `svmSegments`)
+            // so the error's `segmentIndex` lines up with what the caller sees.
+            const cascadeIdx = segments.indexOf(seg);
+            const estimated = await (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, seg.gasToken, seg.gasFee, UNCAPPED_BALANCE);
+            // SVM warn-threshold telemetry (no truncation — pre-flight handles drain protection).
+            (0, preflight_1.maybeFireSvmWarnThreshold)(ctx, estimated, seg.gasToken, 'CASCADE');
+            const flat = perOutboundNativeValue ?? BigInt(0);
+            let value = estimated > flat ? estimated : flat;
+            if (perSvmCap > BigInt(0) && value > perSvmCap) {
+                const cappedValue = perSvmCap >= estimated ? perSvmCap : estimated;
+                if (cappedValue !== perSvmCap) {
+                    (0, context_1.printLog)(ctx, `composeCascade — SVM outbound to ${seg.targetChain ?? seg.sourceChain}: perSvmCap=${perSvmCap} is below live pool quote=${estimated}; using quote to avoid underfunded gas swap`);
+                }
+                value = cappedValue;
+            }
+            // Upward-allocation ceiling (mirrors R3 SVM Fix #4 in route-handlers.ts:1690).
+            // When UEA balance is huge, the flat split or perSvmCap can produce a value
+            // far above what the swap actually needs. Submitting that into a Uniswap
+            // pool moves the price for other users. Cap at max(200 PC, 5×estimated):
+            //   - fair pool (estimated ≈ 100 PC): cap = 500 PC → caps voluntary excess
+            //   - skewed pool (estimated > 200 PC): cap = 5×estimated → still allows
+            //     pool-skew margin; min-swap check below still fires if value < estimated
+            // The contract still refunds excess via swapAndBurnGas, so this is purely
+            // a guard against submitting wasteful msg.value to fair-priced pools.
+            const UPWARD_BASE_CEILING_CASCADE_SVM = BigInt(200) * BigInt(1e18);
+            const upwardCeilingCascadeSvm = estimated * BigInt(5) > UPWARD_BASE_CEILING_CASCADE_SVM
+                ? estimated * BigInt(5)
+                : UPWARD_BASE_CEILING_CASCADE_SVM;
+            if (value > upwardCeilingCascadeSvm) {
+                (0, context_1.printLog)(ctx, `composeCascade — SVM outbound to ${seg.targetChain ?? seg.sourceChain}: capping value from ${value} to upwardCeiling=${upwardCeilingCascadeSvm} (pool quote=${estimated})`);
+                value = upwardCeilingCascadeSvm;
+            }
+            (0, context_1.printLog)(ctx, `composeCascade — SVM outbound to ${seg.targetChain ?? 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
+            // Uniswap with STF. Throw cleanly with `segmentIndex` so the caller
+            // 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,
+                    available: value,
+                    shortfall,
+                    ueaAddress,
+                    pathTag: 'CASCADE',
+                    reason: 'NATIVE',
+                    segmentIndex: cascadeIdx,
+                });
+            }
+            svmNativeValueBySegment.set(seg, value);
         }
-        let perOutboundNativeValue;
-        if (numOutbounds > 0 && effectiveUeaBalance > CASCADE_GAS_RESERVE) {
-            perOutboundNativeValue =
-                (effectiveUeaBalance - CASCADE_GAS_RESERVE) / BigInt(numOutbounds);
+    }
+    // Every EVM gas-bearing segment should follow the direct-route path: use the
+    // live WPC/gasToken quote instead of blindly spending the flat balance split.
+    // This includes Route 3 wrappers, which also call sendUniversalTxOutbound on
+    // Push Chain before the source CEA can return. A fixed ceiling below the live
+    // exact-output requirement deterministically reverts inside Uniswap with
+    // `STF`; the caller-facing maxPCForGas field is the explicit spend ceiling.
+    const evmSegments = segments.filter((s) => segmentNeedsOutboundGas(s) &&
+        ((s.type === 'OUTBOUND_TO_CEA' && s.hops[0]?.isSvmTarget !== true) ||
+            (s.type === 'INBOUND_FROM_CEA' &&
+                !(0, payload_builders_1.isSvmChain)(s.sourceChain))) &&
+        s.gasToken &&
+        s.gasFee &&
+        s.gasFee > BigInt(0));
+    const evmNativeValueBySegment = new Map();
+    if (evmSegments.length > 0 && effectiveUeaBalance > CASCADE_GAS_RESERVE) {
+        const universalCoreAddress = await getUniversalCoreAddressForSwap();
+        const UNCAPPED_BALANCE = BigInt('1000000000000000000000000000000');
+        for (const seg of evmSegments) {
+            const value = await (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, seg.gasToken, seg.gasFee, UNCAPPED_BALANCE);
+            (0, context_1.printLog)(ctx, `composeCascade — EVM outbound to ${seg.targetChain ?? seg.sourceChain}: gasFee=${seg.gasFee}, quotedNativeValue=${value}, flat=${perOutboundNativeValue ?? BigInt(0)}`);
+            evmNativeValueBySegment.set(seg, value);
         }
-        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: [],
-                    });
+    }
+    for (let segIdxLoop = segments.length - 1; segIdxLoop >= 0; segIdxLoop--) {
+        const segment = segments[segIdxLoop];
+        const gasPriceForOutboundRequest = (chainForLog) => {
+            const quotedGasPrice = segment.gasPrice ?? 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. 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');
+            const shouldUseLiveGasPrice = isInboundFromCea || executesAfterInbound;
+            if (shouldUseLiveGasPrice && quotedGasPrice > BigInt(0)) {
+                (0, context_1.printLog)(ctx, `composeCascade — ${isInboundFromCea ? 'Route 3' : 'delayed'} outbound to ${chainForLog ?? 'unknown chain'}: using gasPrice=0 instead of quoted ${quotedGasPrice} so UGPC resolves the live base price at execution time`);
             }
-            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 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) ||
-                (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 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.
-            const numEvmOutbounds = numOutbounds - svmSegments.length;
-            const evmReservation = perOutboundNativeValue && numEvmOutbounds > 0
-                ? perOutboundNativeValue * BigInt(numEvmOutbounds)
-                : BigInt(0);
-            const outerSafety = BigInt(1e18); // 1 PC for outer-tx gas
-            const svmTotal = effectiveUeaBalance > evmReservation + outerSafety
-                ? effectiveUeaBalance - evmReservation - outerSafety
-                : BigInt(0);
-            const perSvmCap = svmTotal / BigInt(svmSegments.length);
-            const UNCAPPED_BALANCE = BigInt('1000000000000000000000000000000'); // effectively disable estimator's internal cap
-            for (const seg of svmSegments) {
-                // Cascade-level segment index (position in `segments`, not in `svmSegments`)
-                // so the error's `segmentIndex` lines up with what the caller sees.
-                const cascadeIdx = segments.indexOf(seg);
-                const estimated = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, seg.gasToken, seg.gasFee, UNCAPPED_BALANCE);
-                // SVM warn-threshold telemetry (no truncation — pre-flight handles drain protection).
-                (0, preflight_1.maybeFireSvmWarnThreshold)(ctx, estimated, seg.gasToken, 'CASCADE');
-                const flat = perOutboundNativeValue !== null && perOutboundNativeValue !== void 0 ? perOutboundNativeValue : BigInt(0);
-                let value = estimated > flat ? estimated : flat;
-                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.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;
+            return shouldUseLiveGasPrice ? BigInt(0) : quotedGasPrice;
+        };
+        switch (segment.type) {
+            case 'PUSH_EXECUTION': {
+                // Prepend Push Chain multicalls to accumulated
+                const seedAmount = sumNativeSeedAmount(segment.hops);
+                if (seedAmount > requiredNativeValue) {
+                    requiredNativeValue = seedAmount;
+                }
+                requiredNativeValue += sumMulticallNativeValue(segment.mergedPushMulticalls);
+                accumulatedPushMulticalls = [
+                    ...(segment.mergedPushMulticalls || []),
+                    ...accumulatedPushMulticalls,
+                ];
+                break;
+            }
+            case 'OUTBOUND_TO_CEA': {
+                const firstHop = segment.hops[0];
+                const isSvmSegment = firstHop?.isSvmTarget === true;
+                let outboundPayload;
+                let targetForOutbound;
+                const isMigration = firstHop?.isMigration === true;
+                if (isSvmSegment) {
+                    // SVM: use the pre-built SVM payload from the hop descriptor
+                    outboundPayload = firstHop.svmPayload ?? '0x';
+                    // For SVM, to.address IS the target (program for execute, recipient for withdraw)
+                    const svmTarget = firstHop.params.to;
+                    targetForOutbound = svmTarget.address;
                 }
-                // Upward-allocation ceiling (mirrors R3 SVM Fix #4 in route-handlers.ts:1690).
-                // When UEA balance is huge, the flat split or perSvmCap can produce a value
-                // far above what the swap actually needs. Submitting that into a Uniswap
-                // pool moves the price for other users. Cap at max(200 PC, 5×estimated):
-                //   - fair pool (estimated ≈ 100 PC): cap = 500 PC → caps voluntary excess
-                //   - skewed pool (estimated > 200 PC): cap = 5×estimated → still allows
-                //     pool-skew margin; min-swap check below still fires if value < estimated
-                // The contract still refunds excess via swapAndBurnGas, so this is purely
-                // a guard against submitting wasteful msg.value to fair-priced pools.
-                const UPWARD_BASE_CEILING_CASCADE_SVM = BigInt(200) * BigInt(1e18);
-                const upwardCeilingCascadeSvm = estimated * BigInt(5) > UPWARD_BASE_CEILING_CASCADE_SVM
-                    ? estimated * BigInt(5)
-                    : UPWARD_BASE_CEILING_CASCADE_SVM;
-                if (value > upwardCeilingCascadeSvm) {
-                    (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;
+                else if (isMigration) {
+                    // Migration: use raw 4-byte MIGRATION_SELECTOR, no multicall wrapping
+                    outboundPayload = (0, payload_builders_1.buildMigrationPayload)();
+                    targetForOutbound = firstHop?.ceaAddress || ueaAddress;
                 }
-                (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
-                // Uniswap with STF. Throw cleanly with `segmentIndex` so the caller
-                // 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,
+                else {
+                    // 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?.ceaAddress || ueaAddress;
+                    (0, payload_builders_1.assertCeaFundsParkingInvariant)(targetForOutbound, outboundPayload);
+                }
+                // Per-segment PRC-20 burn-balance pre-check. Fires whenever
+                // burnAmount > 0 even when burn token equals gas token — the gateway's
+                // transferFrom happens BEFORE the gas swap, so user must pre-hold the
+                // burn amount.
+                const segBurnAmount = segment.totalBurnAmount || BigInt(0);
+                const segBurnToken = segment.prc20Token;
+                if (segBurnAmount > BigInt(0) && segBurnToken && !isMigration) {
+                    const onHand = await ctx.pushClient.readContract({
+                        address: segBurnToken,
+                        abi: erc20_evm_1.ERC20_EVM,
+                        functionName: 'balanceOf',
+                        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,
                         enforceGasCheck,
-                        shortfall,
+                        shortfall: sufficient ? BigInt(0) : segBurnAmount - onHand,
                     });
-                    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;
+                    const priorPushExecutionMayFundBurn = segments
+                        .slice(0, segIdxLoop)
+                        .some((s) => s.type === 'PUSH_EXECUTION');
+                    const priorInboundFundingForBurn = getInboundFundingForBurnToken(segments, segIdxLoop, segBurnToken, ctx.pushNetwork);
+                    const priorInboundMayFundBurn = onHand + priorInboundFundingForBurn >= segBurnAmount;
+                    if (!sufficient &&
+                        !priorPushExecutionMayFundBurn &&
+                        !priorInboundMayFundBurn) {
+                        const projectedOnHand = onHand + priorInboundFundingForBurn;
+                        const shortfall = segBurnAmount - projectedOnHand;
+                        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`);
+                    }
+                    else if (!sufficient && priorInboundMayFundBurn) {
+                        (0, context_1.printLog)(ctx, `composeCascade — skipping PRC-20 preflight failure for segment ${segIdxLoop}; earlier inbound funds ${priorInboundFundingForBurn.toString()} units of ${segBurnToken} before this outbound runs`);
                     }
-                    (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,
-                        available: value,
-                        shortfall,
-                        ueaAddress,
-                        pathTag: 'CASCADE',
-                        reason: 'NATIVE',
-                        segmentIndex: cascadeIdx,
-                    });
                 }
-                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;
+                // Build outbound request
+                const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetForOutbound, segment.prc20Token || selectors_1.ZERO_ADDRESS, segment.totalBurnAmount || BigInt(0), segment.gasLimit ?? BigInt(0), outboundPayload, ueaAddress, segment.maxPCForGas ?? BigInt(0), gasPriceForOutboundRequest(firstHop?.targetChain));
+                // Build approval + outbound multicalls
+                const segGasFee = segment.gasFee || BigInt(0);
+                const svmOverride = svmNativeValueBySegment.get(segment);
+                // When UEA balance < CASCADE_GAS_RESERVE, perOutboundNativeValue is
+                // undefined. Mirror the drained-UEA branch in executeUoaToCea
+                // (route-handlers.ts): send the entire available balance divided
+                // across outbound segments. The contract refunds excess via
+                // swapAndBurnGas, so overshooting is safe; undershooting causes STF.
+                let evmFallbackValue;
+                if (effectiveUeaBalance > BigInt(0)) {
+                    evmFallbackValue =
+                        effectiveUeaBalance / BigInt(Math.max(numOutbounds, 1));
                 }
-                (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. 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');
-                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`);
+                else {
+                    evmFallbackValue = segGasFee * BigInt(1000000);
                 }
-                return shouldUseLiveGasPrice ? BigInt(0) : quotedGasPrice;
-            };
-            switch (segment.type) {
-                case 'PUSH_EXECUTION': {
-                    // Prepend Push Chain multicalls to accumulated
+                const nativeValueForGas = svmOverride ??
+                    evmNativeValueBySegment.get(segment) ??
+                    perOutboundNativeValue ??
+                    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
+                // from the hop descriptor merge, but it is not consulted here —
+                // nativeValueForGas is driven by pool-quote on the single-hop path
+                // and by the cascade-level per-outbound allocation above.
+                const outboundMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
+                    prc20Token: segment.prc20Token || selectors_1.ZERO_ADDRESS,
+                    gasToken: segment.gasToken || selectors_1.ZERO_ADDRESS,
+                    burnAmount: segment.totalBurnAmount || BigInt(0),
+                    gasFee: segGasFee,
+                    nativeValueForGas,
+                    gatewayPcAddress,
+                    outboundRequest: outboundReq,
+                });
+                requiredNativeValue += sumMulticallNativeValue(outboundMulticalls);
+                // Prepend to accumulated
+                accumulatedPushMulticalls = [
+                    ...outboundMulticalls,
+                    ...accumulatedPushMulticalls,
+                ];
+                break;
+            }
+            case 'INBOUND_FROM_CEA': {
+                // The accumulated multicalls = what runs on Push Chain AFTER inbound arrives.
+                // Wrap in UniversalPayload struct with correct UEA nonce for the relay.
+                if (isNativeSeedOnlySegment(segment)) {
                     const seedAmount = sumNativeSeedAmount(segment.hops);
                     if (seedAmount > requiredNativeValue) {
                         requiredNativeValue = seedAmount;
                     }
-                    requiredNativeValue += sumMulticallNativeValue(segment.mergedPushMulticalls);
-                    accumulatedPushMulticalls = [
-                        ...(segment.mergedPushMulticalls || []),
-                        ...accumulatedPushMulticalls,
-                    ];
+                    (0, context_1.printLog)(ctx, `composeCascade — value-only CEA_TO_PUSH seed ${seedAmount.toString()} folded into root Push execution; no source-chain outbound needed`);
                     break;
                 }
-                case 'OUTBOUND_TO_CEA': {
-                    const firstHop = segment.hops[0];
-                    const isSvmSegment = (firstHop === null || firstHop === void 0 ? void 0 : firstHop.isSvmTarget) === true;
-                    let outboundPayload;
-                    let targetForOutbound;
-                    const isMigration = (firstHop === null || firstHop === void 0 ? void 0 : firstHop.isMigration) === true;
-                    if (isSvmSegment) {
-                        // SVM: use the pre-built SVM payload from the hop descriptor
-                        outboundPayload = (_d = firstHop.svmPayload) !== null && _d !== void 0 ? _d : '0x';
-                        // For SVM, to.address IS the target (program for execute, recipient for withdraw)
-                        const svmTarget = firstHop.params.to;
-                        targetForOutbound = svmTarget.address;
-                    }
-                    else if (isMigration) {
-                        // Migration: use raw 4-byte MIGRATION_SELECTOR, no multicall wrapping
-                        outboundPayload = (0, payload_builders_1.buildMigrationPayload)();
-                        targetForOutbound = (firstHop === null || firstHop === void 0 ? void 0 : firstHop.ceaAddress) || ueaAddress;
-                    }
-                    else {
-                        // 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;
-                        (0, payload_builders_1.assertCeaFundsParkingInvariant)(targetForOutbound, outboundPayload);
-                    }
-                    // Per-segment PRC-20 burn-balance pre-check. Fires whenever
-                    // burnAmount > 0 even when burn token equals gas token — the gateway's
-                    // transferFrom happens BEFORE the gas swap, so user must pre-hold the
-                    // burn amount.
-                    const segBurnAmount = segment.totalBurnAmount || BigInt(0);
-                    const segBurnToken = segment.prc20Token;
-                    if (segBurnAmount > BigInt(0) && segBurnToken && !isMigration) {
-                        const onHand = yield ctx.pushClient.readContract({
-                            address: segBurnToken,
-                            abi: erc20_evm_1.ERC20_EVM,
-                            functionName: 'balanceOf',
-                            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,
-                            enforceGasCheck,
-                            shortfall: sufficient ? BigInt(0) : segBurnAmount - onHand,
+                // Build push multicalls from EVERY merged hop's own data in original
+                // order (e.g. counter.increment() + value transfer). Multi-hop R3
+                // segments (same sourceChain) bundle all target ops into the single
+                // UEA multicall so no nested outbound is needed.
+                const mergedHopMulticalls = [];
+                for (const h of segment.hops) {
+                    const pc20Forward = (0, gate_1.isPC20ImportWithFunds)(h.params);
+                    if ((0, data_utils_1.hasExecutablePayloadData)(h?.params?.data) ||
+                        h?.params?.value ||
+                        pc20Forward) {
+                        const hopCalls = (0, payload_builders_1.buildExecuteMulticall)({
+                            execute: (pc20Forward
+                                ? (0, gate_1.assertLegacyFunds)((0, helpers_1.toExecuteParams)(h.params))
+                                : {
+                                    to: h.params.to,
+                                    value: h.params.value,
+                                    data: h.params.data,
+                                }),
+                            ueaAddress,
+                            allowSelfValueCall: true,
                         });
-                        const priorPushExecutionMayFundBurn = segments
-                            .slice(0, segIdxLoop)
-                            .some((s) => s.type === 'PUSH_EXECUTION');
-                        const priorInboundFundingForBurn = getInboundFundingForBurnToken(segments, segIdxLoop, segBurnToken, ctx.pushNetwork);
-                        const priorInboundMayFundBurn = onHand + priorInboundFundingForBurn >= segBurnAmount;
-                        if (!sufficient &&
-                            !priorPushExecutionMayFundBurn &&
-                            !priorInboundMayFundBurn) {
-                            const projectedOnHand = onHand + priorInboundFundingForBurn;
-                            const shortfall = segBurnAmount - projectedOnHand;
-                            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`);
-                        }
-                        else if (!sufficient && priorInboundMayFundBurn) {
-                            (0, context_1.printLog)(ctx, `composeCascade — skipping PRC-20 preflight failure for segment ${segIdxLoop}; earlier inbound funds ${priorInboundFundingForBurn.toString()} units of ${segBurnToken} before this outbound runs`);
-                        }
+                        mergedHopMulticalls.push(...hopCalls);
                     }
-                    // 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, (_f = segment.maxPCForGas) !== null && _f !== void 0 ? _f : BigInt(0), gasPriceForOutboundRequest(firstHop === null || firstHop === void 0 ? void 0 : firstHop.targetChain));
-                    // Build approval + outbound multicalls
-                    const segGasFee = segment.gasFee || BigInt(0);
-                    const svmOverride = svmNativeValueBySegment.get(segment);
-                    // When UEA balance < CASCADE_GAS_RESERVE, perOutboundNativeValue is
-                    // undefined. Mirror the drained-UEA branch in executeUoaToCea
-                    // (route-handlers.ts): send the entire available balance divided
-                    // across outbound segments. The contract refunds excess via
-                    // swapAndBurnGas, so overshooting is safe; undershooting causes STF.
-                    let evmFallbackValue;
-                    if (effectiveUeaBalance > BigInt(0)) {
-                        evmFallbackValue =
-                            effectiveUeaBalance / BigInt(Math.max(numOutbounds, 1));
-                    }
-                    else {
-                        evmFallbackValue = segGasFee * BigInt(1000000);
-                    }
-                    const 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
-                    // from the hop descriptor merge, but it is not consulted here —
-                    // nativeValueForGas is driven by pool-quote on the single-hop path
-                    // and by the cascade-level per-outbound allocation above.
-                    const outboundMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
-                        prc20Token: segment.prc20Token || selectors_1.ZERO_ADDRESS,
-                        gasToken: segment.gasToken || selectors_1.ZERO_ADDRESS,
-                        burnAmount: segment.totalBurnAmount || BigInt(0),
-                        gasFee: segGasFee,
-                        nativeValueForGas,
-                        gatewayPcAddress,
-                        outboundRequest: outboundReq,
-                    });
-                    requiredNativeValue += sumMulticallNativeValue(outboundMulticalls);
-                    // Prepend to accumulated
+                }
+                if (mergedHopMulticalls.length > 0) {
+                    requiredNativeValue += sumMulticallNativeValue(mergedHopMulticalls);
                     accumulatedPushMulticalls = [
-                        ...outboundMulticalls,
+                        ...mergedHopMulticalls,
                         ...accumulatedPushMulticalls,
                     ];
-                    break;
                 }
-                case 'INBOUND_FROM_CEA': {
-                    // The accumulated multicalls = what runs on Push Chain AFTER inbound arrives.
-                    // Wrap in UniversalPayload struct with correct UEA nonce for the relay.
-                    if (isNativeSeedOnlySegment(segment)) {
-                        const seedAmount = sumNativeSeedAmount(segment.hops);
-                        if (seedAmount > requiredNativeValue) {
-                            requiredNativeValue = seedAmount;
-                        }
-                        (0, context_1.printLog)(ctx, `composeCascade — value-only CEA_TO_PUSH seed ${seedAmount.toString()} folded into root Push execution; no source-chain outbound needed`);
-                        break;
+                // Primary hop carries the sourceChain / CEA address (shared across merged hops).
+                const hop = segment.hops[0];
+                const sourceChain = hop.sourceChain;
+                const ceaAddress = hop.ceaAddress || ueaAddress;
+                let intermediatePayload = '0x';
+                if (accumulatedPushMulticalls.length > 0) {
+                    const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, ueaAddress, accumulatedPushMulticalls);
+                    // +1: the outbound tx consumes one nonce via execute()
+                    const nonce = (ueaNonce ?? BigInt(0)) + BigInt(1);
+                    intermediatePayload = (0, payload_builders_1.isSvmChain)(sourceChain)
+                        ? (0, payload_builders_1.buildInboundUniversalPayloadSvm)(multicallPayload, { nonce })
+                        : (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, { nonce });
+                }
+                for (const segmentHop of segment.hops) {
+                    (0, gate_1.assertPC20ImportHasPayload)(segmentHop.params, intermediatePayload !== '0x', `Cascaded Route 3 ${sourceChain}`);
+                }
+                // SVM chains: build SVM CPI payload instead of EVM CEA multicall
+                if ((0, payload_builders_1.isSvmChain)(sourceChain)) {
+                    const lockerContract = chain_1.CHAIN_INFO[sourceChain].lockerContract;
+                    if (!lockerContract) {
+                        throw new Error(`No SVM gateway program configured for chain ${sourceChain}`);
                     }
-                    // Build push multicalls from EVERY merged hop's own data in original
-                    // order (e.g. counter.increment() + value transfer). Multi-hop R3
-                    // segments (same sourceChain) bundle all target ops into the single
-                    // UEA multicall so no nested outbound is needed.
-                    const mergedHopMulticalls = [];
-                    for (const h of segment.hops) {
-                        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,
-                                    value: h.params.value,
-                                    data: h.params.data,
-                                },
-                                ueaAddress,
-                                allowSelfValueCall: true,
-                            });
-                            mergedHopMulticalls.push(...hopCalls);
+                    const programPk = new web3_js_1.PublicKey(lockerContract);
+                    const gatewayProgramHex = ('0x' +
+                        Buffer.from(programPk.toBytes()).toString('hex'));
+                    let drainAmount = BigInt(0);
+                    let tokenMintHex;
+                    const params = hop.params;
+                    if (params.funds?.amount && params.funds.amount > BigInt(0)) {
+                        drainAmount = params.funds.amount;
+                        const token = params.funds.token;
+                        if (token && token.address) {
+                            const mintPk = new web3_js_1.PublicKey(token.address);
+                            tokenMintHex = ('0x' +
+                                Buffer.from(mintPk.toBytes()).toString('hex'));
                         }
                     }
-                    if (mergedHopMulticalls.length > 0) {
-                        requiredNativeValue += sumMulticallNativeValue(mergedHopMulticalls);
-                        accumulatedPushMulticalls = [
-                            ...mergedHopMulticalls,
-                            ...accumulatedPushMulticalls,
-                        ];
+                    else if (params.value && params.value > BigInt(0)) {
+                        drainAmount = params.value;
                     }
-                    // Primary hop carries the sourceChain / CEA address (shared across merged hops).
-                    const hop = segment.hops[0];
-                    const sourceChain = hop.sourceChain;
-                    const ceaAddress = hop.ceaAddress || ueaAddress;
-                    let intermediatePayload = '0x';
-                    if (accumulatedPushMulticalls.length > 0) {
-                        const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, ueaAddress, accumulatedPushMulticalls);
-                        // +1: the outbound tx consumes one nonce via execute()
-                        const nonce = (ueaNonce !== null && ueaNonce !== void 0 ? ueaNonce : BigInt(0)) + BigInt(1);
-                        intermediatePayload = (0, payload_builders_1.isSvmChain)(sourceChain)
-                            ? (0, payload_builders_1.buildInboundUniversalPayloadSvm)(multicallPayload, { nonce })
-                            : (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, { nonce });
+                    // Derive CEA PDA as revert recipient
+                    const ueaBytes = Buffer.from(ueaAddress.slice(2), 'hex');
+                    const [ceaPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('push_identity'), ueaBytes], programPk);
+                    const ceaPdaHex = ('0x' +
+                        Buffer.from(ceaPda.toBytes()).toString('hex'));
+                    // Build SVM payload with intermediate Push Chain payload embedded.
+                    // PC20 burns use the gateway's dedicated send_universal_tx shape;
+                    // SPL/native drains keep send_universal_tx_to_uea.
+                    const extraPayload = intermediatePayload !== '0x'
+                        ? new Uint8Array(Buffer.from(intermediatePayload.slice(2), 'hex'))
+                        : undefined;
+                    const pc20 = params._pc20;
+                    let svmPayload;
+                    if ((0, gate_1.isPC20ImportWithFunds)(params) && pc20) {
+                        const mintPk = new web3_js_1.PublicKey(pc20.originAddress);
+                        const fields = (0, svm_1.buildPC20SvmCeaBurnPayload)({
+                            gatewayProgram: programPk,
+                            mint: mintPk,
+                            ceaAuthority: ceaPda,
+                            ceaAta: (0, svm_rent_1.deriveAtaPubkey)(ceaPda, mintPk),
+                            ueaAddress,
+                            amount: drainAmount,
+                            pushPayload: extraPayload ?? new Uint8Array(0),
+                        });
+                        svmPayload = (0, payload_builders_1.encodeSvmExecutePayload)(fields);
                     }
-                    // SVM chains: build SVM CPI payload instead of EVM CEA multicall
-                    if ((0, payload_builders_1.isSvmChain)(sourceChain)) {
-                        const lockerContract = chain_1.CHAIN_INFO[sourceChain].lockerContract;
-                        if (!lockerContract) {
-                            throw new Error(`No SVM gateway program configured for chain ${sourceChain}`);
-                        }
-                        const programPk = new web3_js_1.PublicKey(lockerContract);
-                        const gatewayProgramHex = ('0x' +
-                            Buffer.from(programPk.toBytes()).toString('hex'));
-                        let drainAmount = BigInt(0);
-                        let tokenMintHex;
-                        const params = hop.params;
-                        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) {
-                                const mintPk = new web3_js_1.PublicKey(token.address);
-                                tokenMintHex = ('0x' +
-                                    Buffer.from(mintPk.toBytes()).toString('hex'));
-                            }
-                        }
-                        else if (params.value && params.value > BigInt(0)) {
-                            drainAmount = params.value;
-                        }
-                        // Derive CEA PDA as revert recipient
-                        const ueaBytes = Buffer.from(ueaAddress.slice(2), 'hex');
-                        const [ceaPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('push_identity'), ueaBytes], programPk);
-                        const ceaPdaHex = ('0x' +
-                            Buffer.from(ceaPda.toBytes()).toString('hex'));
-                        // Build SVM payload with intermediate Push Chain payload embedded
-                        const svmPayload = (0, payload_builders_1.encodeSvmCeaToUeaPayload)({
+                    else {
+                        svmPayload = (0, payload_builders_1.encodeSvmCeaToUeaPayload)({
                             gatewayProgramHex,
                             drainAmount,
                             tokenMintHex,
                             revertRecipientHex: ceaPdaHex,
-                            extraPayload: intermediatePayload !== '0x'
-                                ? new Uint8Array(Buffer.from(intermediatePayload.slice(2), 'hex'))
-                                : undefined,
+                            extraPayload,
                         });
-                        (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, (_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)) {
-                            svmInboundFallback =
-                                effectiveUeaBalance / BigInt(Math.max(numOutbounds, 1));
-                        }
-                        else {
-                            svmInboundFallback = inboundGasFee * BigInt(1000000);
-                        }
-                        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 (((_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})`);
-                            svmInboundNativeValue = bumped;
-                        }
-                        const outboundMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
-                            prc20Token: segment.prc20Token ||
-                                (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork),
-                            gasToken: segment.gasToken || selectors_1.ZERO_ADDRESS,
-                            burnAmount: svmBurnAmount,
-                            gasFee: inboundGasFee,
-                            nativeValueForGas: svmInboundNativeValue,
-                            gatewayPcAddress,
-                            outboundRequest: outboundReq,
-                        });
-                        requiredNativeValue += sumMulticallNativeValue(outboundMulticalls);
-                        accumulatedPushMulticalls = [...outboundMulticalls];
-                        break;
-                    }
-                    // 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)
-                    if (hop.ceaMulticalls && hop.ceaMulticalls.length > 0) {
-                        ceaMulticalls.push(...hop.ceaMulticalls);
-                    }
-                    // Aggregate token/amount across all merged hops so the single
-                    // sendUniversalTxToUEA call carries the combined forward amount.
-                    // For multi-hop R3 segments (same sourceChain), ERC20 funds across
-                    // hops must resolve to the same token — otherwise this path can't
-                    // express it in one call and the caller should split manually.
-                    let tokenAddress = selectors_1.ZERO_ADDRESS;
-                    let amount = BigInt(0);
-                    for (const mergedHop of segment.hops) {
-                        const hParams = mergedHop.params;
-                        if ((_s = hParams.funds) === null || _s === void 0 ? void 0 : _s.amount) {
-                            const token = hParams.funds.token;
-                            if (token) {
-                                if (token.mechanism === 'native') {
-                                    amount += hParams.funds.amount;
-                                }
-                                else {
-                                    const addr = token.address;
-                                    if (tokenAddress !== selectors_1.ZERO_ADDRESS &&
-                                        tokenAddress.toLowerCase() !== addr.toLowerCase()) {
-                                        throw new Error(`composeCascade: merged R3 hops target different ERC20 tokens (${tokenAddress} vs ${addr}); split into separate executeTransactions batches`);
-                                    }
-                                    tokenAddress = addr;
-                                    amount += hParams.funds.amount;
-                                }
-                            }
-                        }
-                        else if (hParams.value && hParams.value > BigInt(0)) {
-                            amount += hParams.value;
-                        }
                     }
-                    // Build sendUniversalTxToUEA self-call on CEA. CEA self-calls must
-                    // always use value=0; native funds are spent from the CEA balance.
-                    const sendCall = (0, payload_builders_1.buildSendUniversalTxToUEA)(ceaAddress, tokenAddress, amount, intermediatePayload, ceaAddress);
-                    ceaMulticalls.push(sendCall);
-                    // Wrap CEA multicall in outbound from Push Chain
-                    const ceaPayload = (0, payload_builders_1.buildCeaMulticallPayload)(ceaMulticalls);
-                    // The nested outbound back to the source chain needs a non-zero
-                    // gasLimit — UGPC.sendUniversalTxOutbound reverts with
-                    // "Missing or invalid parameters" on 0. When the hop didn't supply
-                    // one (typical for a pure-R3 leg composed inside a cascade), fall
-                    // back to the EVM Route 3 default.
-                    const effectiveGasLimit = segment.gasLimit && segment.gasLimit > BigInt(0)
-                        ? 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, (_t = segment.maxPCForGas) !== null && _t !== void 0 ? _t : BigInt(0), gasPriceForOutboundRequest(sourceChain));
+                    (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, segment.gasLimit ?? BigInt(0), svmPayload, ueaAddress, segment.maxPCForGas ?? BigInt(0), gasPriceForOutboundRequest(sourceChain));
                     const inboundGasFee = segment.gasFee || BigInt(0);
-                    let evmInboundFallback;
+                    let svmInboundFallback;
                     if (effectiveUeaBalance > BigInt(0)) {
-                        evmInboundFallback =
+                        svmInboundFallback =
                             effectiveUeaBalance / BigInt(Math.max(numOutbounds, 1));
                     }
                     else {
-                        evmInboundFallback = inboundGasFee * BigInt(1000000);
+                        svmInboundFallback = inboundGasFee * BigInt(1000000);
                     }
-                    let evmInboundNativeValue = perOutboundNativeValue !== null && perOutboundNativeValue !== void 0 ? perOutboundNativeValue : evmInboundFallback;
+                    let svmInboundNativeValue = svmNativeValueBySegment.get(segment) ??
+                        perOutboundNativeValue ??
+                        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 (((_u = segment.sizing) === null || _u === void 0 ? void 0 : _u.category) === 'C' &&
+                    if (segment.sizing?.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})`);
-                        evmInboundNativeValue = bumped;
+                        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})`);
+                        svmInboundNativeValue = bumped;
                     }
                     const outboundMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
                         prc20Token: segment.prc20Token ||
                             (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork),
                         gasToken: segment.gasToken || selectors_1.ZERO_ADDRESS,
-                        burnAmount: segment.totalBurnAmount || BigInt(0),
+                        burnAmount: svmBurnAmount,
                         gasFee: inboundGasFee,
-                        nativeValueForGas: evmInboundNativeValue,
+                        nativeValueForGas: svmInboundNativeValue,
                         gatewayPcAddress,
                         outboundRequest: outboundReq,
                     });
                     requiredNativeValue += sumMulticallNativeValue(outboundMulticalls);
-                    // Reset accumulated -- everything is now inside this outbound
                     accumulatedPushMulticalls = [...outboundMulticalls];
                     break;
                 }
+                // 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)
+                if (hop.ceaMulticalls && hop.ceaMulticalls.length > 0) {
+                    ceaMulticalls.push(...hop.ceaMulticalls);
+                }
+                // Aggregate token/amount across all merged hops so the single
+                // sendUniversalTxToUEA call carries the combined forward amount.
+                // For multi-hop R3 segments (same sourceChain), ERC20 funds across
+                // hops must resolve to the same token — otherwise this path can't
+                // express it in one call and the caller should split manually.
+                let tokenAddress = selectors_1.ZERO_ADDRESS;
+                let amount = BigInt(0);
+                for (const mergedHop of segment.hops) {
+                    const hParams = mergedHop.params;
+                    if (hParams.funds?.amount) {
+                        const token = hParams.funds.token;
+                        if (token) {
+                            if (token.mechanism === 'native') {
+                                amount += hParams.funds.amount;
+                            }
+                            else {
+                                const addr = token.address;
+                                if (tokenAddress !== selectors_1.ZERO_ADDRESS &&
+                                    tokenAddress.toLowerCase() !== addr.toLowerCase()) {
+                                    throw new Error(`composeCascade: merged R3 hops target different ERC20 tokens (${tokenAddress} vs ${addr}); split into separate executeTransactions batches`);
+                                }
+                                tokenAddress = addr;
+                                amount += hParams.funds.amount;
+                            }
+                        }
+                    }
+                    else if (hParams.value && hParams.value > BigInt(0)) {
+                        amount += hParams.value;
+                    }
+                }
+                // Build sendUniversalTxToUEA self-call on CEA. CEA self-calls must
+                // always use value=0; native funds are spent from the CEA balance.
+                const sendCall = (0, payload_builders_1.buildSendUniversalTxToUEA)(ceaAddress, tokenAddress, amount, intermediatePayload, ceaAddress);
+                ceaMulticalls.push(sendCall);
+                // Wrap CEA multicall in outbound from Push Chain
+                const ceaPayload = (0, payload_builders_1.buildCeaMulticallPayload)(ceaMulticalls);
+                // The nested outbound back to the source chain needs a non-zero
+                // gasLimit — UGPC.sendUniversalTxOutbound reverts with
+                // "Missing or invalid parameters" on 0. When the hop didn't supply
+                // one (typical for a pure-R3 leg composed inside a cascade), fall
+                // back to the EVM Route 3 default.
+                const effectiveGasLimit = segment.gasLimit && segment.gasLimit > BigInt(0)
+                    ? 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, segment.maxPCForGas ?? BigInt(0), gasPriceForOutboundRequest(sourceChain));
+                const inboundGasFee = segment.gasFee || BigInt(0);
+                let evmInboundFallback;
+                if (effectiveUeaBalance > BigInt(0)) {
+                    evmInboundFallback =
+                        effectiveUeaBalance / BigInt(Math.max(numOutbounds, 1));
+                }
+                else {
+                    evmInboundFallback = inboundGasFee * BigInt(1000000);
+                }
+                let evmInboundNativeValue = evmNativeValueBySegment.get(segment) ??
+                    perOutboundNativeValue ??
+                    evmInboundFallback;
+                // 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 (segment.sizing?.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})`);
+                    evmInboundNativeValue = bumped;
+                }
+                const outboundMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
+                    prc20Token: segment.prc20Token ||
+                        (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork),
+                    gasToken: segment.gasToken || selectors_1.ZERO_ADDRESS,
+                    burnAmount: segment.totalBurnAmount || BigInt(0),
+                    gasFee: inboundGasFee,
+                    nativeValueForGas: evmInboundNativeValue,
+                    gatewayPcAddress,
+                    outboundRequest: outboundReq,
+                });
+                requiredNativeValue += sumMulticallNativeValue(outboundMulticalls);
+                // Reset accumulated -- everything is now inside this outbound
+                accumulatedPushMulticalls = [...outboundMulticalls];
+                break;
             }
         }
-        return {
-            multicalls: accumulatedPushMulticalls,
-            requiredNativeValue,
-        };
-    });
+    }
+    if (requiredNativeValue > BigInt(0)) {
+        (0, preflight_1.runPreflight)({
+            ctx,
+            ueaAddress,
+            ueaBalance: effectiveUeaBalance,
+            requiredValue: requiredNativeValue,
+            gasReserve: CASCADE_GAS_RESERVE,
+            pathTag: 'CASCADE',
+            enforceGasCheck,
+        });
+    }
+    return {
+        multicalls: accumulatedPushMulticalls,
+        requiredNativeValue,
+    };
 }
-function composeCascade(ctx, segments, ueaAddress, ueaBalance, ueaNonce) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const result = yield composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce);
-        return result.multicalls;
-    });
+async function composeCascade(ctx, segments, ueaAddress, ueaBalance, ueaNonce) {
+    const result = await composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce);
+    return result.multicalls;
 }
 // ============================================================================
 // createCascadedBuilder
 // ============================================================================
 function txHashFromProgressEvent(event) {
-    var _a, _b, _c, _d, _e, _f;
     const response = event.response;
-    return ((_f = (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.txHash) !== null && _a !== void 0 ? _a : response === null || response === void 0 ? void 0 : response.pushTxHash) !== null && _b !== void 0 ? _b : response === null || response === void 0 ? void 0 : response.rootTxHash) !== null && _c !== void 0 ? _c : (_e = (_d = response === null || response === void 0 ? void 0 : response.response) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.hash) !== null && _f !== void 0 ? _f : '');
+    return (response?.txHash ??
+        response?.pushTxHash ??
+        response?.rootTxHash ??
+        response?.response?.[0]?.hash ??
+        '');
 }
-function withMultihopRootProgressMapping(ctx, run) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const originalHook = ctx.progressHook;
-        if (!originalHook)
-            return run();
-        ctx.progressHook = (event) => {
-            if (event.id === progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_01) {
-                originalHook(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99](txHashFromProgressEvent(event)));
-                return;
-            }
-            originalHook(event);
-        };
-        try {
-            return yield run();
+async function withMultihopRootProgressMapping(ctx, run) {
+    const originalHook = ctx.progressHook;
+    if (!originalHook)
+        return run();
+    ctx.progressHook = (event) => {
+        if (event.id === progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_01) {
+            originalHook(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99](txHashFromProgressEvent(event)));
+            return;
         }
-        finally {
-            ctx.progressHook = originalHook;
-        }
-    });
+        originalHook(event);
+    };
+    try {
+        return await run();
+    }
+    finally {
+        ctx.progressHook = originalHook;
+    }
 }
 function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, options) {
     return {
-        send: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a;
+        send: async () => {
             const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
             // Extract HopDescriptors
             const hops = preparedTxs.map((tx) => tx._hop);
-            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; });
+            // Prepared PC20 imports pin registry-derived identity into their
+            // payload. Re-check that binding immediately before any route is
+            // executed or composed; a stale descriptor must never reach broadcast.
+            await Promise.all(hops.map((hop) => (0, gate_1.revalidatePreparedPC20)(ctx, hop.params)));
+            const enforceGasCheck = options?.enforceGasCheck === true ||
+                hops.some((hop) => hop.params.options?.enforceGasCheck === true);
             const withCascadeOptions = (params) => enforceGasCheck
-                ? Object.assign(Object.assign({}, params), { options: Object.assign(Object.assign({}, params.options), { enforceGasCheck: true }) }) : params;
+                ? {
+                    ...params,
+                    options: {
+                        ...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(withCascadeOptions(hops[0].params));
+                const response = await callbacks.executeFn(withCascadeOptions(hops[0].params));
                 const singleRoute1Result = {
                     initialTxHash: response.hash,
                     initialTxResponse: response,
@@ -1417,29 +1527,27 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                     ],
                     hopCount: 1,
                     finalTxHash: response.hash,
-                    waitForAll: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        return ({
-                            success: true,
-                            hops: [
-                                {
-                                    hopIndex: 0,
-                                    route: hops[0].route,
-                                    executionChain: (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork),
-                                    status: 'confirmed',
-                                    txHash: response.hash,
-                                },
-                            ],
-                            finalTxHash: response.hash,
-                            finalTxResponse: singleRoute1Result,
-                        });
+                    waitForAll: async () => ({
+                        success: true,
+                        hops: [
+                            {
+                                hopIndex: 0,
+                                route: hops[0].route,
+                                executionChain: (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork),
+                                status: 'confirmed',
+                                txHash: response.hash,
+                            },
+                        ],
+                        finalTxHash: response.hash,
+                        finalTxResponse: singleRoute1Result,
                     }),
-                    wait: (opts) => tslib_1.__awaiter(this, void 0, void 0, function* () { return singleRoute1Result.waitForAll(opts); }),
+                    wait: async (opts) => singleRoute1Result.waitForAll(opts),
                 };
                 return singleRoute1Result;
             }
             // Check if single-hop Route 2 (just execute directly)
             if (preparedTxs.length === 1 && preparedTxs[0].route === 'UOA_TO_CEA') {
-                const response = yield callbacks.executeFn(withCascadeOptions(hops[0].params));
+                const response = await callbacks.executeFn(withCascadeOptions(hops[0].params));
                 const targetChain = hops[0].targetChain || (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
                 const singleRoute2Result = {
                     initialTxHash: response.hash,
@@ -1455,39 +1563,37 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                     ],
                     hopCount: 1,
                     finalTxHash: response.hash,
-                    waitForAll: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        return ({
-                            success: true,
-                            hops: [
-                                {
-                                    hopIndex: 0,
-                                    route: hops[0].route,
-                                    executionChain: targetChain,
-                                    status: 'confirmed',
-                                    txHash: response.hash,
-                                },
-                            ],
-                            finalTxHash: response.hash,
-                            finalTxResponse: singleRoute2Result,
-                        });
+                    waitForAll: async () => ({
+                        success: true,
+                        hops: [
+                            {
+                                hopIndex: 0,
+                                route: hops[0].route,
+                                executionChain: targetChain,
+                                status: 'confirmed',
+                                txHash: response.hash,
+                            },
+                        ],
+                        finalTxHash: response.hash,
+                        finalTxResponse: singleRoute2Result,
                     }),
-                    wait: (opts) => tslib_1.__awaiter(this, void 0, void 0, function* () { return singleRoute2Result.waitForAll(opts); }),
+                    wait: async (opts) => singleRoute2Result.waitForAll(opts),
                 };
                 return singleRoute2Result;
             }
             // Multi-hop: compose cascade bottom-to-top
             // Fetch UEA balance + nonce so composeCascade can allocate native value and build inbound payloads
-            const ueaBalance = yield ctx.pushClient.getBalance(ueaAddress);
-            const ueaCodeCascade = yield ctx.pushClient.publicClient.getCode({
+            const ueaBalance = await ctx.pushClient.getBalance(ueaAddress);
+            const ueaCodeCascade = await ctx.pushClient.publicClient.getCode({
                 address: ueaAddress,
             });
             const ueaNonceCascade = ueaCodeCascade !== undefined
-                ? yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress)
+                ? await (0, uea_manager_1.getUEANonce)(ctx, ueaAddress)
                 : BigInt(0);
             let composedMulticalls;
             let cascadeRequiredNativeValue = BigInt(0);
             try {
-                const composed = yield composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonceCascade, { enforceGasCheck });
+                const composed = await composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonceCascade, { enforceGasCheck });
                 composedMulticalls = composed.multicalls;
                 cascadeRequiredNativeValue = composed.requiredNativeValue;
             }
@@ -1498,7 +1604,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                 // terminal "cascade failed" frame instead of the stream stopping
                 // silently after 203-04.
                 if (err instanceof errors_1.InsufficientUEABalanceError) {
-                    const failedHopIndex = (_a = err.segmentIndex) !== null && _a !== void 0 ? _a : 0;
+                    const failedHopIndex = err.segmentIndex ?? 0;
                     (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_999_02, failedHopIndex + 1, preparedTxs.length, err.message);
                 }
                 throw err;
@@ -1513,7 +1619,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
             if (rootFundsDeposit) {
                 executeParams.funds = rootFundsDeposit;
             }
-            const response = yield withMultihopRootProgressMapping(ctx, () => callbacks.executeFn(executeParams));
+            const response = await withMultihopRootProgressMapping(ctx, () => callbacks.executeFn(executeParams));
             // Build hop info for tracking
             const hopInfos = hops.map((hop, index) => ({
                 hopIndex: index,
@@ -1533,8 +1639,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                 initialTxResponse: response,
                 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, _j, _k;
+                waitForAll: async (opts) => {
                     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
@@ -1555,11 +1660,10 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                     // but guard explicitly in case someone wires a 1-element prepared list.
                     const totalHops = hopInfos.length;
                     const isMulti = totalHops > 1;
-                    const chainLabels = hops.map((h) => {
-                        var _a, _b;
-                        return String((_b = (_a = h.targetChain) !== null && _a !== void 0 ? _a : h.sourceChain) !== null && _b !== void 0 ? _b : (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork));
-                    });
-                    const signerOriginChain = String((_a = ctx.universalSigner.account.chain) !== null && _a !== void 0 ? _a : 'origin');
+                    const chainLabels = hops.map((h) => String(h.targetChain ??
+                        h.sourceChain ??
+                        (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork)));
+                    const signerOriginChain = String(ctx.universalSigner.account.chain ?? 'origin');
                     const emitHopStart = (hopIndex0) => {
                         if (!isMulti)
                             return;
@@ -1576,12 +1680,10 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                             return; // skip after final hop — 999-01 takes over
                         emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_002_99_99](n, totalHops));
                     };
-                    const currentFinalTxHash = () => {
-                        var _a, _b;
-                        return (_b = (_a = [...hopInfos]
-                            .reverse()
-                            .find((hop) => hop.status === 'confirmed' && hop.txHash)) === null || _a === void 0 ? void 0 : _a.txHash) !== null && _b !== void 0 ? _b : response.hash;
-                    };
+                    const currentFinalTxHash = () => [...hopInfos]
+                        .reverse()
+                        .find((hop) => hop.status === 'confirmed' && hop.txHash)
+                        ?.txHash ?? response.hash;
                     const emitCascadeSuccess = () => {
                         if (!isMulti)
                             return;
@@ -1598,13 +1700,12 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                         emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_999_03](failedIdx0 + 1, totalHops, txHash, pushTxHash));
                     };
                     const emitRouteIntermediateComplete = (hop, txHash) => {
-                        var _a;
                         if (!isMulti)
                             return;
                         const n = hop.hopIndex + 1;
                         if (n >= totalHops)
                             return; // final terminal is 999-01
-                        const resolvedTxHash = (_a = txHash !== null && txHash !== void 0 ? txHash : hop.txHash) !== null && _a !== void 0 ? _a : response.hash;
+                        const resolvedTxHash = txHash ?? hop.txHash ?? response.hash;
                         if (hop.route === 'UOA_TO_PUSH') {
                             emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99](resolvedTxHash));
                             return;
@@ -1620,7 +1721,13 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                     const buildCompletionResult = (success, failedAt) => {
                         const finalTxHash = currentFinalTxHash();
                         cascadeResponse.finalTxHash = finalTxHash;
-                        return Object.assign({ success, hops: hopInfos, finalTxHash, finalTxResponse: cascadeResponse }, (failedAt !== undefined ? { failedAt } : {}));
+                        return {
+                            success,
+                            hops: hopInfos,
+                            finalTxHash,
+                            finalTxResponse: cascadeResponse,
+                            ...(failedAt !== undefined ? { failedAt } : {}),
+                        };
                     };
                     if (isMulti) {
                         emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_001](totalHops, chainLabels));
@@ -1631,33 +1738,32 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                         // its "start" coincides with submitting the composed Push tx. For
                         // cascades that begin with R2/R3, the per-outbound/inbound branches
                         // below own the emitHopStart for hop 0 to avoid a duplicate marker.
-                        if (((_b = hopInfos[0]) === null || _b === void 0 ? void 0 : _b.route) === 'UOA_TO_PUSH') {
+                        if (hopInfos[0]?.route === 'UOA_TO_PUSH') {
                             emitHopStart(0);
                         }
-                        cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                        cascadeProgressHook?.({
                             hopIndex: 0,
-                            route: ((_c = hopInfos[0]) === null || _c === void 0 ? void 0 : _c.route) || 'UOA_TO_PUSH',
+                            route: hopInfos[0]?.route || 'UOA_TO_PUSH',
                             chain: (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork),
                             status: 'waiting',
                             elapsed: Date.now() - startTime,
                         });
-                        yield response.wait();
+                        await response.wait();
                         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, trackingOptions) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                            var _a, _b, _c, _d, _e;
+                        const trackOutboundHops = async (outboundHops, pushTxHash, resolvedSubTxId, outboundIndexByHop, trackingOptions) => {
                             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';
+                            const shouldDeferHopCompletion = (hop) => trackingOptions?.deferCeaToPushCompletion === true &&
+                                hop?.route === 'CEA_TO_PUSH';
                             if (outboundHops.length === 1) {
                                 const hop = outboundHops[0];
                                 const hopHooks = (0, progress_route_hooks_1.pickWaitHooks)(hop.route);
                                 const remainingTimeout = timeout - (Date.now() - startTime);
                                 if (remainingTimeout <= 0) {
                                     hop.status = 'failed';
-                                    cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                    cascadeProgressHook?.({
                                         hopIndex: hop.hopIndex,
                                         route: hop.route,
                                         chain: hop.executionChain,
@@ -1670,7 +1776,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 }
                                 emitHopStart(hop.hopIndex);
                                 emitHopEvent(hopHooks.awaiting(hop.executionChain, pushTxHash));
-                                cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                cascadeProgressHook?.({
                                     hopIndex: hop.hopIndex,
                                     route: hop.route,
                                     chain: hop.executionChain,
@@ -1679,12 +1785,19 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 });
                                 let lastEmittedStatus;
                                 try {
-                                    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({
+                                    const outboundDetails = await callbacks.waitForOutboundTxFn(pushTxHash, {
+                                        initialWaitMs: Math.min(60000, remainingTimeout),
+                                        pollingIntervalMs,
+                                        timeout: remainingTimeout,
+                                        _resolvedSubTxId: resolvedSubTxId,
+                                        _expectedDestinationChain: hop.executionChain,
+                                        ...(outboundIndexByHop
+                                            ? {
+                                                _outboundIndex: outboundIndexByHop.get(hop.hopIndex) ?? 0,
+                                            }
+                                            : {}),
+                                        progressHook: (event) => {
+                                            cascadeProgressHook?.({
                                                 hopIndex: hop.hopIndex,
                                                 route: hop.route,
                                                 chain: hop.executionChain,
@@ -1696,14 +1809,18 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                                 lastEmittedStatus = 'polling';
                                                 emitHopEvent(hopHooks.polling(hop.executionChain, event.elapsed, pushTxHash));
                                             }
-                                        } }));
+                                        },
+                                    });
                                     // `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 = (_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 });
+                                    const displayTxHash = (0, helpers_1.toExternalTxHashDisplay)(outboundDetails.destinationChain, outboundDetails.externalTxHash) ?? outboundDetails.externalTxHash;
+                                    const userFacingOutboundDetails = {
+                                        ...outboundDetails,
+                                        externalTxHash: displayTxHash,
+                                    };
                                     const deferHopCompletion = shouldDeferHopCompletion(hop);
                                     hop.status = deferHopCompletion ? 'pending' : 'confirmed';
                                     hop.txHash = displayTxHash;
@@ -1717,7 +1834,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                         }
                                         emitHopComplete(hop.hopIndex);
                                     }
-                                    cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                    cascadeProgressHook?.({
                                         hopIndex: hop.hopIndex,
                                         route: hop.route,
                                         chain: hop.executionChain,
@@ -1729,8 +1846,8 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 catch (err) {
                                     const errMsg = err instanceof Error ? err.message : String(err);
                                     const isTimeout = errMsg.startsWith('Timeout waiting for outbound transaction');
-                                    const failedExternalTxHash = err === null || err === void 0 ? void 0 : err.externalTxHash;
-                                    const failedDisplayTxHash = (_c = (0, helpers_1.toExternalTxHashDisplay)(hop.executionChain, failedExternalTxHash)) !== null && _c !== void 0 ? _c : failedExternalTxHash;
+                                    const failedExternalTxHash = err?.externalTxHash;
+                                    const failedDisplayTxHash = (0, helpers_1.toExternalTxHashDisplay)(hop.executionChain, failedExternalTxHash) ?? failedExternalTxHash;
                                     emitHopEvent(isTimeout
                                         ? hopHooks.timeout(hop.executionChain, remainingTimeout, pushTxHash)
                                         : hopHooks.failed(hop.executionChain, errMsg, {
@@ -1746,7 +1863,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                     if (failedDisplayTxHash)
                                         hop.txHash = failedDisplayTxHash;
                                     hop.status = 'failed';
-                                    cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                    cascadeProgressHook?.({
                                         hopIndex: hop.hopIndex,
                                         route: hop.route,
                                         chain: hop.executionChain,
@@ -1764,17 +1881,22 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 }
                                 const perHopLastStatus = new Map();
                                 const confirmedHops = new Set();
-                                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 allOutboundDetails = await callbacks.waitForAllOutboundTxsFn(pushTxHash, outboundHops, {
+                                    initialWaitMs: Math.min(60000, timeout - (Date.now() - startTime)),
+                                    pollingIntervalMs,
+                                    timeout: timeout - (Date.now() - startTime),
+                                    _resolvedSubTxId: resolvedSubTxId,
+                                    ...(outboundIndexByHop
+                                        ? { _outboundIndexByHop: outboundIndexByHop }
+                                        : {}),
+                                    progressHook: (event) => {
                                         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 eventHooks = (0, progress_route_hooks_1.pickWaitHooks)(matchedHop?.route);
                                         const deferHopCompletion = shouldDeferHopCompletion(matchedHop);
                                         const progressStatus = deferHopCompletion && event.status === 'confirmed'
                                             ? 'found'
                                             : event.status;
-                                        cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                        cascadeProgressHook?.({
                                             hopIndex: event.hopIndex,
                                             route: event.route,
                                             chain: event.chain,
@@ -1785,7 +1907,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                         const prev = perHopLastStatus.get(event.hopIndex);
                                         if (event.status === 'polling' && prev !== 'polling') {
                                             perHopLastStatus.set(event.hopIndex, 'polling');
-                                            emitHopEvent(eventHooks.polling((_b = (_a = matchedHop === null || matchedHop === void 0 ? void 0 : matchedHop.executionChain) !== null && _a !== void 0 ? _a : event.chain) !== null && _b !== void 0 ? _b : '', Date.now() - startTime, pushTxHash));
+                                            emitHopEvent(eventHooks.polling(matchedHop?.executionChain ?? event.chain ?? '', Date.now() - startTime, pushTxHash));
                                         }
                                         if (event.status === 'confirmed' &&
                                             event.txHash &&
@@ -1795,7 +1917,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                             // outbound-sync.ts:348-355). Auto-promotion paths
                                             // without a txHash are skipped by the `event.txHash`
                                             // guard above, so we only reach here with full details.
-                                            if (matchedHop === null || matchedHop === void 0 ? void 0 : matchedHop.outboundDetails) {
+                                            if (matchedHop?.outboundDetails) {
                                                 confirmedHops.add(event.hopIndex);
                                                 if (!deferHopCompletion) {
                                                     if (isMulti) {
@@ -1808,21 +1930,22 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                                 }
                                             }
                                         }
-                                    } }));
+                                    },
+                                });
                                 if (!allOutboundDetails.success) {
-                                    const failedIdx = (_d = allOutboundDetails.failedAt) !== null && _d !== void 0 ? _d : 0;
+                                    const failedIdx = allOutboundDetails.failedAt ?? 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((_e = failedHop === null || failedHop === void 0 ? void 0 : failedHop.executionChain) !== null && _e !== void 0 ? _e : '', failMsg, {
+                                    emitHopEvent((0, progress_route_hooks_1.pickWaitHooks)(failedHop?.route).failed(failedHop?.executionChain ?? '', failMsg, {
                                         pushTxHash,
-                                        txHash: failedHop === null || failedHop === void 0 ? void 0 : failedHop.txHash,
+                                        txHash: failedHop?.txHash,
                                     }));
-                                    emitCascadeFailed(failedIdx, failMsg, failedHop === null || failedHop === void 0 ? void 0 : failedHop.txHash, pushTxHash);
+                                    emitCascadeFailed(failedIdx, failMsg, failedHop?.txHash, pushTxHash);
                                     return buildCompletionResult(false, failedIdx);
                                 }
-                                if (trackingOptions === null || trackingOptions === void 0 ? void 0 : trackingOptions.deferCeaToPushCompletion) {
+                                if (trackingOptions?.deferCeaToPushCompletion) {
                                     for (const outHop of outboundHops) {
                                         if (shouldDeferHopCompletion(outHop) &&
                                             outHop.outboundDetails) {
@@ -1832,7 +1955,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 }
                             }
                             return null;
-                        });
+                        };
                         // Mark only root Push Chain (Route 1) hops as confirmed. Route 1
                         // hops after a Route 3 leg execute in the child inbound Push tx and
                         // must wait for that child UTX to reach terminal success.
@@ -1842,7 +1965,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 emitHopStart(hop.hopIndex);
                                 hop.status = 'confirmed';
                                 hop.txHash = response.hash;
-                                cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                cascadeProgressHook?.({
                                     hopIndex: hop.hopIndex,
                                     route: hop.route,
                                     chain: (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork),
@@ -1858,7 +1981,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 !isAfterCeaToPush(hop.hopIndex)) {
                                 hop.status = 'confirmed';
                                 hop.txHash = response.hash;
-                                cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                cascadeProgressHook?.({
                                     hopIndex: hop.hopIndex,
                                     route: hop.route,
                                     chain: (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork),
@@ -1871,14 +1994,11 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                         }
                         // 2. Track direct outbound hops (Route 2: UOA_TO_CEA) that belong
                         // to the root Push UTX.
-                        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 });
+                        const rootOutboundHops = hopInfos.filter((h) => (h.route === 'UOA_TO_CEA' && !isAfterCeaToPush(h.hopIndex)) ||
+                            (h.hopIndex === ceaToPushIndex &&
+                                h.route === 'CEA_TO_PUSH' &&
+                                chain_1.CHAIN_INFO[h.executionChain]?.vm === enums_1.VM.EVM));
+                        const rootOutboundFailure = await trackOutboundHops(rootOutboundHops, response.hash, undefined, rootOutboundIndexByHop, { deferCeaToPushCompletion: true });
                         if (rootOutboundFailure)
                             return rootOutboundFailure;
                         let childInbound;
@@ -1893,12 +2013,12 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 return buildCompletionResult(false, inboundHop.hopIndex);
                             }
                             const hasTrackedSourceOutbound = Boolean(inboundHop.outboundDetails) &&
-                                ((_d = chain_1.CHAIN_INFO[inboundHop.executionChain]) === null || _d === void 0 ? void 0 : _d.vm) === enums_1.VM.EVM;
+                                chain_1.CHAIN_INFO[inboundHop.executionChain]?.vm === enums_1.VM.EVM;
                             if (!hasTrackedSourceOutbound) {
                                 emitHopStart(inboundHop.hopIndex);
                                 emitHopEvent(hopHooks.awaiting(inboundHop.executionChain, response.hash));
                             }
-                            cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                            cascadeProgressHook?.({
                                 hopIndex: inboundHop.hopIndex,
                                 route: inboundHop.route,
                                 chain: inboundHop.executionChain,
@@ -1914,14 +2034,14 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                         inboundHop.outboundDetails;
                                 }
                                 else {
-                                    sourceOutboundDetails = yield callbacks.waitForOutboundTxFn(response.hash, {
+                                    sourceOutboundDetails = await 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,
+                                        _outboundIndex: rootOutboundIndexByHop.get(inboundHop.hopIndex) ?? 0,
                                         progressHook: (event) => {
-                                            cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                            cascadeProgressHook?.({
                                                 hopIndex: inboundHop.hopIndex,
                                                 route: inboundHop.route,
                                                 chain: inboundHop.executionChain,
@@ -1940,8 +2060,8 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                             catch (err) {
                                 const errMsg = err instanceof Error ? err.message : String(err);
                                 const isTimeout = errMsg.startsWith('Timeout waiting for outbound transaction');
-                                const failedExternalTxHash = err === null || err === void 0 ? void 0 : err.externalTxHash;
-                                const failedDisplayTxHash = (_f = (0, helpers_1.toExternalTxHashDisplay)(inboundHop.executionChain, failedExternalTxHash)) !== null && _f !== void 0 ? _f : failedExternalTxHash;
+                                const failedExternalTxHash = err?.externalTxHash;
+                                const failedDisplayTxHash = (0, helpers_1.toExternalTxHashDisplay)(inboundHop.executionChain, failedExternalTxHash) ?? failedExternalTxHash;
                                 emitHopEvent(isTimeout
                                     ? hopHooks.timeout(inboundHop.executionChain, remainingTimeout, response.hash)
                                     : hopHooks.failed(inboundHop.executionChain, errMsg, {
@@ -1955,7 +2075,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 inboundHop.status = 'failed';
                                 if (failedDisplayTxHash)
                                     inboundHop.txHash = failedDisplayTxHash;
-                                cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                cascadeProgressHook?.({
                                     hopIndex: inboundHop.hopIndex,
                                     route: inboundHop.route,
                                     chain: inboundHop.executionChain,
@@ -1965,15 +2085,19 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 });
                                 return buildCompletionResult(false, inboundHop.hopIndex);
                             }
-                            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 });
+                            const displayExternalTxHash = (0, helpers_1.toExternalTxHashDisplay)(sourceOutboundDetails.destinationChain, sourceOutboundDetails.externalTxHash) ?? sourceOutboundDetails.externalTxHash;
+                            inboundHop.outboundDetails = {
+                                ...sourceOutboundDetails,
+                                externalTxHash: displayExternalTxHash,
+                            };
                             inboundHop.txHash = displayExternalTxHash;
                             emitHopEvent(hopHooks.success(inboundHop.outboundDetails));
                             emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_310_01](inboundHop.executionChain, response.hash));
                             let inboundLastStatus;
                             const inboundRemainingTimeout = timeout - (Date.now() - startTime);
                             try {
-                                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, {
+                                childInbound = await (callbacks.waitForInboundPushTxFn ??
+                                    ((externalTxHash, sourceChain, opts) => (0, inbound_tracker_1.waitForInboundPushTx)(ctx, externalTxHash, sourceChain, opts)))(sourceOutboundDetails.externalTxHash, inboundHop.executionChain, {
                                     initialWaitMs: Math.min(60000, inboundRemainingTimeout),
                                     pollingIntervalMs,
                                     timeout: inboundRemainingTimeout,
@@ -1997,7 +2121,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 else
                                     emitCascadeFailed(inboundHop.hopIndex, errMsg, undefined, response.hash);
                                 inboundHop.status = 'failed';
-                                cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                cascadeProgressHook?.({
                                     hopIndex: inboundHop.hopIndex,
                                     route: inboundHop.route,
                                     chain: inboundHop.executionChain,
@@ -2007,13 +2131,14 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 return buildCompletionResult(false, inboundHop.hopIndex);
                             }
                             if (childInbound.status !== 'confirmed') {
-                                const failMsg = (_j = childInbound.errorMessage) !== null && _j !== void 0 ? _j : 'inbound execution failed on Push Chain';
+                                const failMsg = childInbound.errorMessage ??
+                                    'inbound execution failed on Push Chain';
                                 inboundHop.status = 'failed';
                                 inboundHop.txHash =
                                     childInbound.pushTxHash || displayExternalTxHash;
                                 emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_02](failMsg, 'inbound', inboundHop.executionChain, undefined, response.hash, childInbound.pushTxHash || undefined));
                                 emitCascadeFailed(inboundHop.hopIndex, failMsg, childInbound.pushTxHash || undefined, response.hash);
-                                cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                cascadeProgressHook?.({
                                     hopIndex: inboundHop.hopIndex,
                                     route: inboundHop.route,
                                     chain: inboundHop.executionChain,
@@ -2033,7 +2158,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 emitHopEvent(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_01](inboundHop.executionChain, childInbound.pushTxHash));
                             }
                             emitHopComplete(inboundHop.hopIndex);
-                            cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                            cascadeProgressHook?.({
                                 hopIndex: inboundHop.hopIndex,
                                 route: inboundHop.route,
                                 chain: inboundHop.executionChain,
@@ -2049,7 +2174,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                     emitHopStart(hop.hopIndex);
                                     hop.status = 'confirmed';
                                     hop.txHash = childInbound.pushTxHash;
-                                    cascadeProgressHook === null || cascadeProgressHook === void 0 ? void 0 : cascadeProgressHook({
+                                    cascadeProgressHook?.({
                                         hopIndex: hop.hopIndex,
                                         route: hop.route,
                                         chain: (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork),
@@ -2062,7 +2187,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                                 }
                             }
                             const childOutboundHops = hopInfos.filter((h) => h.route === 'UOA_TO_CEA' && isAfterCeaToPush(h.hopIndex));
-                            const childOutboundFailure = yield trackOutboundHops(childOutboundHops, childInbound.pushTxHash || response.hash, childInbound.childUtxId);
+                            const childOutboundFailure = await trackOutboundHops(childOutboundHops, childInbound.pushTxHash || response.hash, childInbound.childUtxId);
                             if (childOutboundFailure)
                                 return childOutboundFailure;
                         }
@@ -2073,7 +2198,7 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                         const failedIdx = hopInfos.findIndex((h) => h.status !== 'confirmed');
                         const errMsg = err instanceof Error ? err.message : String(err);
                         const failedAt = failedIdx >= 0 ? failedIdx : 0;
-                        const failedTxHash = (_k = hopInfos[failedAt]) === null || _k === void 0 ? void 0 : _k.txHash;
+                        const failedTxHash = hopInfos[failedAt]?.txHash;
                         const isTimeout = errMsg.startsWith('Timeout');
                         if (isTimeout) {
                             emitCascadeTimeout(failedAt, failedTxHash, response.hash);
@@ -2083,11 +2208,11 @@ function createCascadedBuilder(ctx, preparedTxs, callbacks, defaultEventHook, op
                         }
                         return buildCompletionResult(false, failedAt);
                     }
-                }),
-                wait: (opts) => tslib_1.__awaiter(this, void 0, void 0, function* () { return cascadeResponse.waitForAll(opts); }),
+                },
+                wait: async (opts) => cascadeResponse.waitForAll(opts),
             };
             return cascadeResponse;
-        }),
+        },
     };
 }
 //# sourceMappingURL=cascade.js.map