@pushchain/core 5.1.17 → 6.0.0

package/src/lib/orchestrator/internals/route-handlers.js

@@ -112,6 +112,37 @@ function resolveR2Prc20TokenSvm(params, targetChain, pushNetwork, hasSvmExecute)
     }
     return { prc20Token, burnAmount };
 }
+function resolveR3SvmDrain(params, sourceChain, pushNetwork) {
+    var _a;
+    let drainAmount = BigInt(0);
+    let tokenMintHex;
+    let prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, pushNetwork);
+    if (((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) && params.funds.amount > BigInt(0)) {
+        drainAmount = params.funds.amount;
+        const token = params.funds.token;
+        if ((token === null || token === void 0 ? void 0 : token.mechanism) === 'approve') {
+            const mintPk = new web3_js_1.PublicKey(token.address);
+            tokenMintHex = ('0x' + Buffer.from(mintPk.toBytes()).toString('hex'));
+            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
+        }
+    }
+    else if (params.value && params.value > BigInt(0)) {
+        drainAmount = params.value;
+    }
+    return { prc20Token, drainAmount, tokenMintHex };
+}
+function buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, inboundNonce) {
+    if (!params.data) {
+        return undefined;
+    }
+    const executeParams = (0, helpers_1.toExecuteParams)(params);
+    const multicallCtx = Object.assign(Object.assign({}, ctx), { universalSigner: Object.assign(Object.assign({}, ctx.universalSigner), { account: Object.assign(Object.assign({}, ctx.universalSigner.account), { chain: sourceChain }) }) });
+    const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(multicallCtx, executeParams.to, (0, payload_builders_1.buildExecuteMulticall)({ execute: executeParams, ueaAddress }));
+    const inboundPayload = (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, {
+        nonce: inboundNonce !== null && inboundNonce !== void 0 ? inboundNonce : BigInt(0),
+    });
+    return (0, viem_1.hexToBytes)(inboundPayload);
+}
 /**
  * Build the CEA-side multicall payload for a Route 2 EVM outbound. Needs the
  * resolved `ceaAddress` because the native-value self-call branch skips the
@@ -337,6 +368,7 @@ function executeUoaToCea(ctx, params, executeFn) {
         // --- 202: Gas estimation (spec-ordered before 203) ---
         let gasFee = BigInt(0);
         let protocolFee = BigInt(0);
+        let outboundGasPrice = BigInt(0);
         let gasToken = selectors_1.ZERO_ADDRESS;
         let universalCoreAddress;
         if (prc20Token !== selectors_1.ZERO_ADDRESS) {
@@ -345,6 +377,7 @@ function executeUoaToCea(ctx, params, executeFn) {
                 const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimitForQuery, targetChain);
                 gasFee = result.gasFee;
                 protocolFee = result.protocolFee;
+                outboundGasPrice = result.gasPrice;
                 gasToken = result.gasToken;
                 universalCoreAddress = result.universalCoreAddress;
                 (0, context_1.printLog)(ctx, `executeUoaToCea — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}`);
@@ -376,19 +409,20 @@ function executeUoaToCea(ctx, params, executeFn) {
             (0, context_1.printLog)(ctx, `executeUoaToCea — MIGRATION: using raw MIGRATION_SELECTOR payload (${ceaPayload}), native PRC-20 ${prc20Token}`);
         }
         // Build outbound request struct for the gateway
-        // NOTE: `target` is a LEGACY/DUMMY parameter for contract compatibility.
-        // The deployed UniversalGatewayPC still expects this field, but the relay does NOT use it
-        // to determine the actual destination. The relay determines destination from the PRC-20 token's
-        // SOURCE_CHAIN_NAMESPACE. We pass the CEA address as a non-zero placeholder.
-        // This field will be removed in future contract upgrades.
-        const targetBytes = ceaAddress; // Dummy value - any non-zero address works
-        const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, gasLimitForQuery, ceaPayload, ueaAddress // revert recipient is the UEA
-        );
+        // Empty CEA payloads intentionally use zero recipient to park funds in the
+        // CEA under the post-audit single-call guard.
+        const targetBytes = ceaPayload === '0x'
+            ? selectors_1.ZERO_ADDRESS
+            : ceaAddress;
+        (0, payload_builders_1.assertCeaFundsParkingInvariant)(targetBytes, ceaPayload);
+        const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, gasLimitForQuery, ceaPayload, ueaAddress, // revert recipient is the UEA
+        (_d = params.maxPCForGas) !== null && _d !== void 0 ? _d : BigInt(0), outboundGasPrice);
         (0, context_1.printLog)(ctx, `executeUoaToCea — outbound request: ${JSON.stringify({
             target: outboundReq.target,
             token: outboundReq.token,
             amount: outboundReq.amount.toString(),
             gasLimit: outboundReq.gasLimit.toString(),
+            maxPCForGas: outboundReq.maxPCForGas.toString(),
             payloadLength: outboundReq.payload.length,
             revertRecipient: outboundReq.revertRecipient,
         }, null, 2)}`);
@@ -430,12 +464,16 @@ function executeUoaToCea(ctx, params, executeFn) {
                 }
             }
         }
-        // Pool-quote + 10% safety buffer. Over-send is refunded by the contract.
+        // estimateNativeValueForSwap applies the full 2.2x safety buffer
+        // internally (pool-slippage cushion + the 10% headroom that used to be
+        // multiplied here). Folded into one place so the function's cap branch
+        // bounds the final value — the previous outer ×110/100 on top of the
+        // inner cap broke preflight whenever the cap fired. Over-send is refunded
+        // by the contract.
         let nativeValueForGas = BigInt(0);
         if (universalCoreAddress && gasFee > BigInt(0)) {
-            const estimated = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, effectiveBalance);
-            nativeValueForGas = (estimated * BigInt(110)) / BigInt(100);
-            (0, context_1.printLog)(ctx, `executeUoaToCea — nativeValueForGas: pool-quote=${estimated.toString()}, with 10% buffer=${nativeValueForGas.toString()}`);
+            nativeValueForGas = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, effectiveBalance);
+            (0, context_1.printLog)(ctx, `executeUoaToCea — nativeValueForGas=${nativeValueForGas.toString()} (includes 2.2x buffer)`);
         }
         // Hard safety cap so a broken pool price can't drain the UEA.
         if (nativeValueForGas > EVM_NATIVE_VALUE_SAFETY_CAP) {
@@ -457,8 +495,7 @@ function executeUoaToCea(ctx, params, executeFn) {
                 args: [ueaAddress],
             });
         }
-        const allowUnderfundedR2Evm = ((_d = params.options) === null || _d === void 0 ? void 0 : _d.allowUnderfundedSwap) === true;
-        const preflightR2Evm = (0, preflight_1.runPreflight)({
+        (0, preflight_1.runPreflight)({
             ctx,
             ueaAddress,
             ueaBalance: effectiveBalance,
@@ -468,13 +505,8 @@ function executeUoaToCea(ctx, params, executeFn) {
             burnToken: prc20Token,
             burnAmount,
             prc20Balance: prc20BalanceR2Evm,
-            allowUnderfundedSwap: allowUnderfundedR2Evm,
         });
-        if (!preflightR2Evm.ok) {
-            nativeValueForGas = preflightR2Evm.legacyClampedValue;
-            (0, context_1.printLog)(ctx, `executeUoaToCea — allowUnderfundedSwap=true; using legacy clamped value ${nativeValueForGas.toString()}`);
-        }
-        // ok=true → nativeValueForGas already covers required + reserve; no adjust needed.
+        // Preflight success means nativeValueForGas already covers required + reserve; no adjust needed.
         // Build outbound multicalls (approve burn + sendUniversalTxOutbound with native value)
         const outboundMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
             prc20Token,
@@ -536,7 +568,7 @@ function executeUoaToCea(ctx, params, executeFn) {
  */
 function executeUoaToCeaSvm(ctx, params, target, executeFn) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const targetChain = target.chain;
         const targetAddress = target.address; // 0x-prefixed, 32 bytes
         const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
@@ -563,44 +595,49 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
         // --- 202: Gas estimation (spec-ordered before 203) ---
         let gasFee = BigInt(0);
         let protocolFeeSvm = BigInt(0);
+        let outboundGasPriceSvm = BigInt(0);
         let gasToken = selectors_1.ZERO_ADDRESS;
         let universalCoreAddress;
         // Effective gas limit seeded from the user param. When the user omits
-        // gasLimit, it'll be derived from the gasFee/gasPrice response so the
-        // on-chain record carries a non-zero compute budget the relay can use.
+        // gasLimit, it'll be derived from the gas quote so the on-chain record
+        // carries a non-zero compute budget the relay can use.
         let effectiveGasLimit = (_d = params.gasLimit) !== null && _d !== void 0 ? _d : BigInt(0);
-        // Conditional CEA-ATA rent bump: when the SPL outbound's destination ATA
-        // does not yet exist on Solana, the gateway needs an extra ~2.04M lamports
-        // for ATA-create rent. The on-chain quote does NOT include this, so bump
-        // effectiveGasLimit BEFORE queryOutboundGasFee so the returned gasFee
-        // already covers the rent.
-        const splMintBase58 = burnAmount > BigInt(0)
-            ? (_f = (_e = params.funds) === null || _e === void 0 ? void 0 : _e.token) === null || _f === void 0 ? void 0 : _f.address
+        // SVM finalize budget: the Solana gateway requires gas_fee to cover the
+        // relayer signature fee, ExecutedSubTx rent, a compute buffer, and
+        // conditionally CEA ATA rent for SPL outbounds. The on-chain quote can be
+        // below that floor, so we compare the quoted fee in lamports and re-query
+        // with a bumped gasLimit when required.
+        const svmFundsToken = burnAmount > BigInt(0)
+            ? (_e = params.funds) === null || _e === void 0 ? void 0 : _e.token
             : undefined;
-        effectiveGasLimit = yield (0, svm_rent_1.maybeBumpForCeaAtaRent)({
-            ctx,
-            ueaAddress,
-            targetChain,
-            splMintBase58,
-            burnAmount,
-            effectiveGasLimit,
-        });
+        const splMintBase58 = (svmFundsToken === null || svmFundsToken === void 0 ? void 0 : svmFundsToken.mechanism) === 'approve' ? svmFundsToken.address : undefined;
         if (prc20Token !== selectors_1.ZERO_ADDRESS) {
             (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_202_01, targetChain);
             try {
-                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, effectiveGasLimit, targetChain);
+                let result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, effectiveGasLimit, targetChain);
+                result = yield (0, svm_rent_1.ensureSvmFinalizeGasBudgetQuote)({
+                    ctx,
+                    ueaAddress,
+                    targetChain,
+                    prc20Token,
+                    quote: result,
+                    splMintBase58,
+                    burnAmount,
+                    pathTag: 'executeUoaToCeaSvm',
+                });
                 gasFee = result.gasFee;
                 protocolFeeSvm = result.protocolFee;
+                outboundGasPriceSvm = result.gasPrice;
                 gasToken = result.gasToken;
                 universalCoreAddress = result.universalCoreAddress;
-                // When user omits gasLimit (sent as 0), the contract computes fees using its internal
-                // baseGasLimitByChainNamespace. But the relay reads the stored gasLimit=0 from the
-                // on-chain outbound record and uses it as the Solana compute budget — 0 CU means the
-                // relay cannot execute the tx. Derive the effective limit from gasFee/gasPrice so
-                // the stored record has a non-zero compute budget the relay can use.
-                if (!params.gasLimit && result.gasPrice > BigInt(0)) {
-                    effectiveGasLimit = result.gasFee / result.gasPrice;
-                    (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — derived effectiveGasLimit: ${effectiveGasLimit} (gasFee=${result.gasFee} / gasPrice=${result.gasPrice})`);
+                // When user omits gasLimit (sent as 0), the contract computes fees using
+                // its internal baseGasLimitByChainNamespace. But the relay reads the
+                // stored gasLimit from the outbound record. Store the resolved value from
+                // UniversalCore so the relayer has a non-zero SVM budget.
+                effectiveGasLimit = result.gasLimitUsed;
+                if (!params.gasLimit) {
+                    (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — resolved effectiveGasLimit: ${effectiveGasLimit} ` +
+                        `(gasFee=${result.gasFee}, gasPrice=${result.gasPrice})`);
                 }
                 (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}`);
                 (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_202_02, targetChain, protocolFeeSvm, gasFee);
@@ -616,13 +653,14 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
         (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_203_02, ueaAddress, targetAddress, targetChain, true);
         // --- Build outbound request ---
         // targetBytes: for execute = program id (resolver output); for withdraw = to.address
-        const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, effectiveGasLimit, svmPayload, ueaAddress // revert recipient is the UEA
-        );
+        const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, effectiveGasLimit, svmPayload, ueaAddress, // revert recipient is the UEA
+        (_f = params.maxPCForGas) !== null && _f !== void 0 ? _f : BigInt(0), outboundGasPriceSvm);
         (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — outbound request: ${JSON.stringify({
             target: outboundReq.target,
             token: outboundReq.token,
             amount: outboundReq.amount.toString(),
             gasLimit: outboundReq.gasLimit.toString(),
+            maxPCForGas: outboundReq.maxPCForGas.toString(),
             payloadLength: (outboundReq.payload.length - 2) / 2,
             revertRecipient: outboundReq.revertRecipient,
         }, null, 2)}`);
@@ -648,8 +686,10 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
         }
         const ueaNonce = (!isUEADeployed || isNativePushEOASvm) ? BigInt(0) : yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress);
         // R2 does NOT use Case A/B/C gas abstraction (scoped to R1 + R3 only).
-        // Size msg.value from the live WPC/gasToken Uniswap V3 pool quote plus
-        // a 10% safety buffer. swapAndBurnGas refunds the excess as PC via
+        // Size msg.value from the live WPC/gasToken Uniswap V3 pool quote. The
+        // 2.2x safety buffer is applied inside estimateNativeValueForSwap (was
+        // split as inner 2x + outer 10% — combined to keep the cap branch
+        // mathematically correct). swapAndBurnGas refunds the excess as PC via
         // refundUnusedGas.
         //
         // SVM pools (WPC/pSOL) are thinner than EVM pools so the pool-quote can
@@ -664,9 +704,10 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
         const SVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for outer-tx gas
         let nativeValueForGas = BigInt(0);
         if (universalCoreAddress && gasFee > BigInt(0)) {
-            const estimated = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, ueaBalance);
-            nativeValueForGas = (estimated * BigInt(110)) / BigInt(100);
-            (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — nativeValueForGas: pool-quote=${estimated.toString()}, with 10% buffer=${nativeValueForGas.toString()}`);
+            // 2.2x safety buffer is applied inside estimateNativeValueForSwap so
+            // the function's balance-cap branch bounds the final value correctly.
+            nativeValueForGas = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, ueaBalance);
+            (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — nativeValueForGas=${nativeValueForGas.toString()} (includes 2.2x buffer)`);
             (0, preflight_1.maybeFireSvmWarnThreshold)(ctx, nativeValueForGas, gasToken, 'R2_SVM');
         }
         // Pre-flight: throws InsufficientUEABalanceError when UEA cannot cover
@@ -688,8 +729,7 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
                 args: [ueaAddress],
             });
         }
-        const allowUnderfundedR2Svm = ((_j = params.options) === null || _j === void 0 ? void 0 : _j.allowUnderfundedSwap) === true;
-        const preflightR2Svm = (0, preflight_1.runPreflight)({
+        (0, preflight_1.runPreflight)({
             ctx,
             ueaAddress,
             ueaBalance,
@@ -699,12 +739,7 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
             burnToken: prc20Token,
             burnAmount,
             prc20Balance: prc20BalanceR2Svm,
-            allowUnderfundedSwap: allowUnderfundedR2Svm,
         });
-        if (!preflightR2Svm.ok) {
-            nativeValueForGas = preflightR2Svm.legacyClampedValue;
-            (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — allowUnderfundedSwap=true; using legacy clamped value ${nativeValueForGas.toString()}`);
-        }
         // --- Build Push Chain multicalls (approve + sendUniversalTxOutbound) ---
         // Reuse the same builder as EVM — this part is identical
         const pushChainMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
@@ -769,7 +804,7 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
  */
 function executeCeaToPush(ctx, params, executeFn) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // 1. Validate and extract source chain
         if (!((_a = params.from) === null || _a === void 0 ? void 0 : _a.chain)) {
             throw new Error('Route 3 (CEA -> Push) requires from.chain to specify the source CEA chain');
@@ -806,11 +841,6 @@ function executeCeaToPush(ctx, params, executeFn) {
         (0, context_1.printLog)(ctx, `executeCeaToPush — sourceChain: ${sourceChain}, CEA: ${ceaAddress}, deployed: ${ceaDeployed}`);
         // CEA auto-deploys on-chain: Vault.finalizeUniversalTx calls CEAFactory.deployCEA()
         // if CEA doesn't exist yet. No SDK-side blocking needed.
-        // 5. Get UniversalGateway address on source chain
-        const gatewayAddress = chain_1.UNIVERSAL_GATEWAY_ADDRESSES[sourceChain];
-        if (!gatewayAddress) {
-            throw new Error(`No UniversalGateway address configured for chain ${sourceChain}`);
-        }
         // 6. Build multicall for CEA to execute on source chain (self-calls via sendUniversalTxToUEA)
         const ceaMulticalls = [];
         // Determine token and amount for sendUniversalTxToUEA
@@ -826,7 +856,7 @@ function executeCeaToPush(ctx, params, executeFn) {
                     amount = params.funds.amount;
                 }
                 else {
-                    // ERC20 token - need approval for gateway before sendUniversalTxToUEA
+                    // ERC20 token. CEA handles gateway approval internally around sendUniversalTxToUEA.
                     tokenAddress = token.address;
                     amount = params.funds.amount;
                 }
@@ -843,33 +873,7 @@ function executeCeaToPush(ctx, params, executeFn) {
         // query and relay execution, causing sendUniversalTxToUEA to revert with
         // InsufficientBalance. Pre-existing CEA funds remain parked and can be swept separately.
         const bridgeAmount = amount;
-        // Note: CEA contract may reject amount=0 in sendUniversalTxToUEA.
-        // Keeping bridgeAmount as-is (0) for payload-only to test precompile behavior.
-        // For ERC20 tokens, add approve call for the bridge amount
-        // (CEA approves gateway to spend the Vault-deposited amount)
-        // Reset to 0 first for USDT-style tokens that revert on non-zero to non-zero approve.
-        if (tokenAddress !== selectors_1.ZERO_ADDRESS && bridgeAmount > BigInt(0)) {
-            const approveZeroData = (0, viem_1.encodeFunctionData)({
-                abi: erc20_evm_1.ERC20_EVM,
-                functionName: 'approve',
-                args: [gatewayAddress, BigInt(0)],
-            });
-            ceaMulticalls.push({
-                to: tokenAddress,
-                value: BigInt(0),
-                data: approveZeroData,
-            });
-            const approveData = (0, viem_1.encodeFunctionData)({
-                abi: erc20_evm_1.ERC20_EVM,
-                functionName: 'approve',
-                args: [gatewayAddress, bridgeAmount],
-            });
-            ceaMulticalls.push({
-                to: tokenAddress,
-                value: BigInt(0),
-                data: approveData,
-            });
-        }
+        // The post-audit CEA allows amount=0 for payload-only sendUniversalTxToUEA.
         // Pre-fetch UEA nonce — needed for the inbound UniversalPayload struct
         // Skip getCode if accountStatusCache already confirmed deployment
         let isUEADeployed;
@@ -903,8 +907,8 @@ function executeCeaToPush(ctx, params, executeFn) {
             // so the inbound will arrive when the UEA nonce is already incremented.
             pushPayload = (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, { nonce: ueaNonce + BigInt(1) });
         }
-        // Build sendUniversalTxToUEA self-call on CEA
-        // CEA multicall: to=CEA (self-call), value=0
+        // Build sendUniversalTxToUEA self-call on CEA. CEA self-calls must always
+        // use value=0; native sends spend from the CEA's existing balance.
         // CEA internally calls gateway.sendUniversalTxFromCEA(...)
         // Uses bridgeAmount (= burn amount deposited by Vault)
         const sendUniversalTxCall = (0, payload_builders_1.buildSendUniversalTxToUEA)(ceaAddress, // to: CEA address (self-call)
@@ -929,20 +933,22 @@ function executeCeaToPush(ctx, params, executeFn) {
         // tokens FROM the CEA back to Push Chain, not to round-trip them.
         const prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
         const burnAmount = BigInt(0);
+        const outboundGasLimit = (_f = params.gasLimit) !== null && _f !== void 0 ? _f : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
         (0, context_1.printLog)(ctx, `executeCeaToPush — prc20Token: ${prc20Token}, burnAmount: ${burnAmount.toString()}`);
         // 9. Build outbound request (same structure as Route 2)
         // target = CEA address (for self-execution), value = 0 in payload
-        const outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, // target: CEA address (to=CEA for self-execution)
+        let outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, // target: CEA address (to=CEA for self-execution)
         prc20Token, // token: native PRC-20 for source chain (for namespace lookup)
         burnAmount, // amount: 0 (payload-only, CEA uses its own balance)
-        (_f = params.gasLimit) !== null && _f !== void 0 ? _f : BigInt(0), ceaPayload, // payload: ABI-encoded CEA multicall
-        ueaAddress // revertRecipient: UEA
-        );
+        outboundGasLimit, ceaPayload, // payload: ABI-encoded CEA multicall
+        ueaAddress, // revertRecipient: UEA
+        (_g = params.maxPCForGas) !== null && _g !== void 0 ? _g : BigInt(0));
         (0, context_1.printLog)(ctx, `executeCeaToPush — outbound request: ${JSON.stringify({
             target: outboundReq.target,
             token: outboundReq.token,
             amount: outboundReq.amount.toString(),
             gasLimit: outboundReq.gasLimit.toString(),
+            maxPCForGas: outboundReq.maxPCForGas.toString(),
             payloadLength: outboundReq.payload.length,
             revertRecipient: outboundReq.revertRecipient,
         }, null, 2)}`);
@@ -953,20 +959,22 @@ function executeCeaToPush(ctx, params, executeFn) {
         // 11. Query gas fees from UniversalCore
         let gasFee = BigInt(0);
         let protocolFeeR3 = BigInt(0);
+        let outboundGasPriceR3 = BigInt(0);
         let nativeValueForGas = BigInt(0);
         let gasToken = selectors_1.ZERO_ADDRESS;
         let sizingDecisionR3;
         if (prc20Token !== selectors_1.ZERO_ADDRESS) {
-            const gasLimit = outboundReq.gasLimit;
             (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_01, sourceChain);
             try {
-                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit, sourceChain);
+                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, outboundGasLimit, sourceChain);
                 gasToken = result.gasToken;
                 gasFee = result.gasFee;
+                outboundGasPriceR3 = result.gasPrice;
                 protocolFeeR3 = result.protocolFee;
                 nativeValueForGas = result.nativeValueForGas;
                 sizingDecisionR3 = result.sizing;
-                (0, context_1.printLog)(ctx, `executeCeaToPush — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${(_h = (_g = result.sizing) === null || _g === void 0 ? void 0 : _g.category) !== null && _h !== void 0 ? _h : 'legacy'}`);
+                outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, (_h = params.maxPCForGas) !== null && _h !== void 0 ? _h : BigInt(0), outboundGasPriceR3);
+                (0, context_1.printLog)(ctx, `executeCeaToPush — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${(_k = (_j = result.sizing) === null || _j === void 0 ? void 0 : _j.category) !== null && _k !== void 0 ? _k : 'legacy'}`);
                 (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_02, sourceChain, protocolFeeR3, gasFee);
             }
             catch (err) {
@@ -1040,20 +1048,14 @@ function executeCeaToPush(ctx, params, executeFn) {
         // Pre-flight (R3 EVM): no PRC-20 burn check — `burnAmount = 0` makes this
         // payload-only (UEA never holds the source-chain PRC-20; see plan §9 #4).
         // Native UPC check still applies for the gas swap.
-        const allowUnderfundedR3Evm = ((_j = params.options) === null || _j === void 0 ? void 0 : _j.allowUnderfundedSwap) === true;
-        const preflightR3Evm = (0, preflight_1.runPreflight)({
+        (0, preflight_1.runPreflight)({
             ctx,
             ueaAddress,
             ueaBalance: effectiveBalance,
             requiredValue: nativeValueForGas,
             gasReserve: OUTBOUND_GAS_RESERVE_R3,
             pathTag: 'R3_EVM',
-            allowUnderfundedSwap: allowUnderfundedR3Evm,
         });
-        if (!preflightR3Evm.ok) {
-            nativeValueForGas = preflightR3Evm.legacyClampedValue;
-            (0, context_1.printLog)(ctx, `executeCeaToPush — allowUnderfundedSwap=true; using legacy clamped value ${nativeValueForGas.toString()}`);
-        }
         // 12. Build Push Chain multicalls (approvals + sendUniversalTxOutbound)
         const pushChainMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
             prc20Token,
@@ -1132,41 +1134,31 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         const gatewayProgramHex = ('0x' + Buffer.from(programPk.toBytes()).toString('hex'));
         (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_301, sourceChain, lockerContract);
         (0, context_1.printLog)(ctx, `executeCeaToPushSvm — sourceChain: ${sourceChain}, gateway: ${lockerContract}`);
-        // Determine drain amount and token
-        let drainAmount = BigInt(0);
-        let tokenMintHex;
-        if (((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) && params.funds.amount > BigInt(0)) {
-            // SPL token drain
-            drainAmount = params.funds.amount;
-            const token = params.funds.token;
-            if (token && token.address) {
-                // Convert SPL mint address to 32-byte hex
-                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)) {
-            // Native SOL drain
-            drainAmount = params.value;
-        }
-        // Route 3 SVM: ALWAYS use native PRC-20 for chain namespace lookup + gas fees.
-        // CEA uses its own pre-existing balance — no PRC-20 burn needed on Push Chain.
-        const prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
-        // Build the SVM CPI payload (send_universal_tx_to_uea wrapped in execute)
-        // If params.data is provided, pass it as extraPayload for Push Chain execution
-        let extraPayload;
-        if (params.data && typeof params.data === 'string') {
-            extraPayload = (0, viem_1.hexToBytes)(params.data);
-        }
+        // Route 3 SVM: CEA uses its own pre-existing balance — no PRC-20 burn
+        // needed on Push Chain. The outer request token must still match the source
+        // asset so the relayer supplies the same Solana mint that the payload
+        // encodes; otherwise the gateway rejects with InvalidMint.
+        const { prc20Token, drainAmount, tokenMintHex } = resolveR3SvmDrain(params, sourceChain, ctx.pushNetwork);
         // Derive CEA PDA as revert recipient: ["push_identity", ueaAddress_20_bytes]
         const ueaBytes = Buffer.from(ueaAddress.slice(2), 'hex'); // 20 bytes
         const [ceaPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('push_identity'), ueaBytes], programPk);
         const ceaPdaHex = ('0x' + Buffer.from(ceaPda.toBytes()).toString('hex'));
+        // Pre-fetch UEA status before payload construction. The inbound
+        // UniversalPayload must use the nonce after this outbound execution, because
+        // the Push-side execute() below consumes one UEA nonce before the Solana
+        // round-trip payload returns.
+        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+        const [ueaCode, ueaBalance] = yield Promise.all([
+            ctx.pushClient.publicClient.getCode({ address: ueaAddress }),
+            ctx.pushClient.getBalance(ueaAddress),
+        ]);
+        const isUEADeployed = ueaCode !== undefined;
+        const ueaNonce = isUEADeployed ? yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress) : BigInt(0);
         const svmPayload = (0, payload_builders_1.encodeSvmCeaToUeaPayload)({
             gatewayProgramHex,
             drainAmount,
             tokenMintHex,
-            extraPayload,
+            extraPayload: buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, ueaNonce + BigInt(1)),
             revertRecipientHex: ceaPdaHex,
         });
         (0, context_1.printLog)(ctx, `executeCeaToPushSvm — drainAmount: ${drainAmount.toString()}, payload length: ${(svmPayload.length - 2) / 2} bytes`);
@@ -1177,33 +1169,42 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         // (e.g. pSOL). The UGPC upgrade post-2026-03-19 already accepts amount = 0
         // on the cascade path, and the same precompile is used here.
         const burnAmount = BigInt(0);
+        let effectiveGasLimit = (_a = params.gasLimit) !== null && _a !== void 0 ? _a : BigInt(0);
         // Build outbound request: target = gateway program (self-call)
-        const outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, (_b = params.gasLimit) !== null && _b !== void 0 ? _b : BigInt(0), svmPayload, ueaAddress);
-        (0, context_1.printLog)(ctx, `executeCeaToPushSvm — outbound request: target=${outboundReq.target.slice(0, 20)}..., token=${outboundReq.token}`);
-        // Pre-fetch UEA status early — balance is needed for gas value calculation
-        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-        const [ueaCode, ueaBalance] = yield Promise.all([
-            ctx.pushClient.publicClient.getCode({ address: ueaAddress }),
-            ctx.pushClient.getBalance(ueaAddress),
-        ]);
-        const isUEADeployed = ueaCode !== undefined;
-        const ueaNonce = isUEADeployed ? yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress) : BigInt(0);
+        let outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, effectiveGasLimit, svmPayload, ueaAddress, (_b = params.maxPCForGas) !== null && _b !== void 0 ? _b : BigInt(0));
+        (0, context_1.printLog)(ctx, `executeCeaToPushSvm — outbound request: target=${outboundReq.target.slice(0, 20)}..., token=${outboundReq.token}, maxPCForGas=${outboundReq.maxPCForGas}`);
         // Query gas fees
         let gasFee = BigInt(0);
         let protocolFeeR3Svm = BigInt(0);
+        let outboundGasPriceR3Svm = BigInt(0);
         let nativeValueForGas = BigInt(0);
         let gasToken = selectors_1.ZERO_ADDRESS;
         let sizingDecisionR3Svm;
         if (prc20Token !== selectors_1.ZERO_ADDRESS) {
             (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_01, sourceChain);
             try {
-                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, outboundReq.gasLimit, sourceChain);
+                let result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, outboundReq.gasLimit, sourceChain);
+                result = yield (0, svm_rent_1.ensureSvmFinalizeGasBudgetQuote)({
+                    ctx,
+                    ueaAddress,
+                    targetChain: sourceChain,
+                    prc20Token,
+                    quote: result,
+                    splMintBase58: undefined,
+                    burnAmount: BigInt(0),
+                    pathTag: 'executeCeaToPushSvm',
+                });
                 gasToken = result.gasToken;
                 gasFee = result.gasFee;
+                outboundGasPriceR3Svm = result.gasPrice;
                 protocolFeeR3Svm = result.protocolFee;
                 nativeValueForGas = result.nativeValueForGas;
                 sizingDecisionR3Svm = result.sizing;
-                (0, context_1.printLog)(ctx, `executeCeaToPushSvm — gasFee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${(_d = (_c = result.sizing) === null || _c === void 0 ? void 0 : _c.category) !== null && _d !== void 0 ? _d : 'legacy'}`);
+                effectiveGasLimit = result.gasLimitUsed;
+                outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, effectiveGasLimit, svmPayload, ueaAddress, (_c = params.maxPCForGas) !== null && _c !== void 0 ? _c : BigInt(0), outboundGasPriceR3Svm);
+                (0, context_1.printLog)(ctx, `executeCeaToPushSvm — resolved effectiveGasLimit: ${effectiveGasLimit} ` +
+                    `(gasFee=${result.gasFee}, gasPrice=${result.gasPrice})`);
+                (0, context_1.printLog)(ctx, `executeCeaToPushSvm — gasFee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${(_e = (_d = result.sizing) === null || _d === void 0 ? void 0 : _d.category) !== null && _e !== void 0 ? _e : 'legacy'}`);
                 (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_02, sourceChain, protocolFeeR3Svm, gasFee);
             }
             catch (err) {
@@ -1263,23 +1264,16 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         }
         // SVM warn-threshold telemetry (no truncation — pre-flight handles drain protection).
         (0, preflight_1.maybeFireSvmWarnThreshold)(ctx, nativeValueForGas, gasToken, 'R3_SVM');
-        // Pre-flight (R3 SVM): no PRC-20 burn check — `burnAmount = 1` is a legacy
-        // precompile-validation shim against a token UEAs structurally don't hold
-        // (see plan §9 #4 / §10.2 latent-bug ticket). Native UPC check still applies.
-        const allowUnderfundedR3Svm = ((_e = params.options) === null || _e === void 0 ? void 0 : _e.allowUnderfundedSwap) === true;
-        const preflightR3Svm = (0, preflight_1.runPreflight)({
+        // Pre-flight (R3 SVM): no PRC-20 burn check. R3 SVM uses burnAmount=0
+        // because the drain amount lives inside the SVM instruction data.
+        (0, preflight_1.runPreflight)({
             ctx,
             ueaAddress,
             ueaBalance: currentBalance,
             requiredValue: nativeValueForGas,
             gasReserve: OUTBOUND_GAS_RESERVE_R3_SVM,
             pathTag: 'R3_SVM',
-            allowUnderfundedSwap: allowUnderfundedR3Svm,
         });
-        if (!preflightR3Svm.ok) {
-            nativeValueForGas = preflightR3Svm.legacyClampedValue;
-            (0, context_1.printLog)(ctx, `executeCeaToPushSvm — allowUnderfundedSwap=true; using legacy clamped value ${nativeValueForGas.toString()}`);
-        }
         // Build Push Chain multicalls (approvals + sendUniversalTxOutbound)
         const pushChainMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
             prc20Token,
@@ -1316,17 +1310,11 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         response.chain = sourceChain;
         const chainInfo = chain_1.CHAIN_INFO[sourceChain];
         response.chainNamespace = `${chain_1.VM_NAMESPACE[chainInfo.vm]}:${chainInfo.chainId}`;
-        // R3 SVM inbound round-trip tracking is disabled.
-        //
-        // For Route 3 SVM drains (rescue_funds-style flow, txType=RESCUE_FUNDS),
-        // empirical check on donut showed the keeper does NOT create a child
-        // universalTxId on Push for the Solana-side `UniversalTx(fromCEA=true)`
-        // log — the parent utxId's `outboundStatus=OBSERVED` is the terminal state.
-        // Polling for a deterministically-derived child id therefore never
-        // resolves, and the cosmos `inbound_tx_hash` text-search fallback also
-        // returns 0 hits. Receipts now resolve as soon as the Solana outbound is
-        // observed instead of timing out at 300s.
-        response._expectsInboundRoundTrip = false;
+        // R3 SVM mirrors EVM R3: when funds drain back to Push, the Solana-side
+        // send_universal_tx_to_uea emits an inbound leg whose payload can execute on
+        // Push. Payload-only R3 has no child inbound UTX, so skip round-trip tracking
+        // when no amount is being drained.
+        response._expectsInboundRoundTrip = drainAmount > BigInt(0);
         return response;
     });
 }
@@ -1352,7 +1340,7 @@ function executeCeaToCea(ctx, params, executeFn) {
  */
 function buildPayloadForRoute(ctx, params, route, nonce) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
         switch (route) {
             case route_detector_1.TransactionRoute.UOA_TO_PUSH: {
@@ -1396,13 +1384,13 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                     }
                     else if (hasExecute) {
                         prc20Token = (0, helpers_1.getNativePRC20ForChain)(target.chain, ctx.pushNetwork);
-                        burnAmount = BigInt(1);
+                        burnAmount = BigInt(0);
                     }
-                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, (_b = params.gasLimit) !== null && _b !== void 0 ? _b : BigInt(0), payload, ueaAddress);
+                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, (_b = params.gasLimit) !== null && _b !== void 0 ? _b : BigInt(0), payload, ueaAddress, (_c = params.maxPCForGas) !== null && _c !== void 0 ? _c : BigInt(0));
                     return { payload, gatewayRequest: outboundReq };
                 }
                 // EVM path: Resolve CEA address first (needed for self-transfer check)
-                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, target.chain, (_c = ctx.rpcUrls[target.chain]) === null || _c === void 0 ? void 0 : _c[0]);
+                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, target.chain, (_d = ctx.rpcUrls[target.chain]) === null || _d === void 0 ? void 0 : _d[0]);
                 // Build CEA outbound payload
                 const multicalls = [];
                 if (params.data) {
@@ -1435,21 +1423,24 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                 const payload = (0, payload_builders_1.buildCeaMulticallPayload)(multicalls);
                 let prc20Token = selectors_1.ZERO_ADDRESS;
                 let burnAmount = BigInt(0);
-                if ((_d = params.funds) === null || _d === void 0 ? void 0 : _d.amount) {
+                if ((_e = params.funds) === null || _e === void 0 ? void 0 : _e.amount) {
                     const token = params.funds.token;
                     if (token) {
                         prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
                         burnAmount = params.funds.amount;
                     }
                 }
-                const targetBytes = ceaAddress;
-                const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, (_e = params.gasLimit) !== null && _e !== void 0 ? _e : BigInt(0), payload, ueaAddress);
+                const targetBytes = payload === '0x'
+                    ? selectors_1.ZERO_ADDRESS
+                    : ceaAddress;
+                (0, payload_builders_1.assertCeaFundsParkingInvariant)(targetBytes, payload);
+                const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, (_f = params.gasLimit) !== null && _f !== void 0 ? _f : BigInt(0), payload, ueaAddress, (_g = params.maxPCForGas) !== null && _g !== void 0 ? _g : BigInt(0));
                 return { payload, gatewayRequest: outboundReq };
             }
             case route_detector_1.TransactionRoute.CEA_TO_PUSH: {
                 // Route 3: CEA -> Push Chain
-                // Build CEA multicall (approve + sendUniversalTxFromCEA) and wrap in outbound
-                if (!((_f = params.from) === null || _f === void 0 ? void 0 : _f.chain)) {
+                // Build CEA multicall (sendUniversalTxToUEA self-call) and wrap in outbound
+                if (!((_h = params.from) === null || _h === void 0 ? void 0 : _h.chain)) {
                     throw new Error('Route 3 (CEA -> Push) requires from.chain');
                 }
                 const sourceChain = params.from.chain;
@@ -1462,21 +1453,7 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                     }
                     const programPk = new web3_js_1.PublicKey(lockerContract);
                     const gatewayProgramHex = ('0x' + Buffer.from(programPk.toBytes()).toString('hex'));
-                    let drainAmount = BigInt(0);
-                    let tokenMintHex;
-                    if (((_g = params.funds) === null || _g === void 0 ? void 0 : _g.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;
-                    }
-                    // Route 3 SVM: ALWAYS use native PRC-20, CEA uses its own balance.
-                    const prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
+                    const { prc20Token, drainAmount, tokenMintHex } = resolveR3SvmDrain(params, sourceChain, ctx.pushNetwork);
                     // Derive CEA PDA as revert recipient
                     const ueaBytes2 = Buffer.from(ueaAddress.slice(2), 'hex');
                     const [ceaPda2] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('push_identity'), ueaBytes2], programPk);
@@ -1485,25 +1462,22 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                         gatewayProgramHex,
                         drainAmount,
                         tokenMintHex,
+                        extraPayload: buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, nonce + BigInt(1)),
                         revertRecipientHex: ceaPdaHex2,
                     });
-                    // burnAmount = 1 (minimum for precompile; drain amount lives inside the ixData)
-                    const burnAmount = BigInt(1);
-                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, (_h = params.gasLimit) !== null && _h !== void 0 ? _h : BigInt(0), svmPayload, ueaAddress);
+                    // Payload-only outbound: drain amount lives inside ixData.
+                    const burnAmount = BigInt(0);
+                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, (_j = params.gasLimit) !== null && _j !== void 0 ? _j : BigInt(0), svmPayload, ueaAddress, (_k = params.maxPCForGas) !== null && _k !== void 0 ? _k : BigInt(0));
                     return { payload: svmPayload, gatewayRequest: outboundReq };
                 }
-                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_j = ctx.rpcUrls[sourceChain]) === null || _j === void 0 ? void 0 : _j[0]);
+                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_l = ctx.rpcUrls[sourceChain]) === null || _l === void 0 ? void 0 : _l[0]);
                 // CEA auto-deploys on-chain: Vault.finalizeUniversalTx calls CEAFactory.deployCEA()
                 // if CEA doesn't exist yet. No SDK-side blocking needed.
-                const gatewayAddr = chain_1.UNIVERSAL_GATEWAY_ADDRESSES[sourceChain];
-                if (!gatewayAddr) {
-                    throw new Error(`No UniversalGateway address configured for chain ${sourceChain}`);
-                }
                 // Build CEA multicalls (self-calls via sendUniversalTxToUEA)
                 const ceaMulticalls = [];
                 let tokenAddress = selectors_1.ZERO_ADDRESS;
                 let amount = BigInt(0);
-                if ((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount) {
+                if ((_m = params.funds) === null || _m === void 0 ? void 0 : _m.amount) {
                     const token = params.funds.token;
                     if (token) {
                         if (token.mechanism === 'native') {
@@ -1513,27 +1487,6 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                         else {
                             tokenAddress = token.address;
                             amount = params.funds.amount;
-                            // Reset allowance to 0 first for USDT-style tokens, then approve
-                            const approveZeroData = (0, viem_1.encodeFunctionData)({
-                                abi: erc20_evm_1.ERC20_EVM,
-                                functionName: 'approve',
-                                args: [gatewayAddr, BigInt(0)],
-                            });
-                            ceaMulticalls.push({
-                                to: tokenAddress,
-                                value: BigInt(0),
-                                data: approveZeroData,
-                            });
-                            const approveData = (0, viem_1.encodeFunctionData)({
-                                abi: erc20_evm_1.ERC20_EVM,
-                                functionName: 'approve',
-                                args: [gatewayAddr, amount],
-                            });
-                            ceaMulticalls.push({
-                                to: tokenAddress,
-                                value: BigInt(0),
-                                data: approveData,
-                            });
                         }
                     }
                 }
@@ -1559,7 +1512,8 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                     const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, pushDestination, multicallData);
                     pushPayload = (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, { nonce: ueaNonceHop + BigInt(1) });
                 }
-                // Build sendUniversalTxToUEA self-call on CEA (to=CEA, value=0)
+                // Build sendUniversalTxToUEA self-call on CEA. CEA self-calls must
+                // always use value=0; native sends spend from the CEA balance.
                 const sendCall = (0, payload_builders_1.buildSendUniversalTxToUEA)(ceaAddress, tokenAddress, amount, pushPayload, ceaAddress);
                 ceaMulticalls.push(sendCall);
                 const ceaPayload = (0, payload_builders_1.buildCeaMulticallPayload)(ceaMulticalls);
@@ -1567,7 +1521,8 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                 // Route 3: CEA uses its own pre-existing balance — no PRC-20 burn needed.
                 // burnAmount = 0 makes this a payload-only outbound relay.
                 const burnAmount = BigInt(0);
-                const outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, (_l = params.gasLimit) !== null && _l !== void 0 ? _l : BigInt(0), ceaPayload, ueaAddress);
+                const outboundGasLimit = (_o = params.gasLimit) !== null && _o !== void 0 ? _o : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
+                const outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, (_p = params.maxPCForGas) !== null && _p !== void 0 ? _p : BigInt(0));
                 return { payload: ceaPayload, gatewayRequest: outboundReq };
             }
             default: