@pushchain/core 6.0.19 → 6.0.21

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

@@ -1,4 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRequiredNativeBalanceForOutbound = getRequiredNativeBalanceForOutbound;
+exports.shouldSkipFeeLockingForOutbound = shouldSkipFeeLockingForOutbound;
+exports.floorR3NativeValueForGas = floorR3NativeValueForGas;
+exports.resolveR2DestinationFundsToken = resolveR2DestinationFundsToken;
+exports.executeMultiChain = executeMultiChain;
+exports.executeUoaToCea = executeUoaToCea;
+exports.executeUoaToCeaSvm = executeUoaToCeaSvm;
+exports.executeCeaToPush = executeCeaToPush;
+exports.executeCeaToPushSvm = executeCeaToPushSvm;
+exports.executeCeaToCea = executeCeaToCea;
+exports.buildPayloadForRoute = buildPayloadForRoute;
+const gate_1 = require("./pc20/gate");
+const export_1 = require("./pc20/export");
 /**
  * Route handler functions extracted from Orchestrator.
  *
@@ -14,18 +51,6 @@
  * Every method receives an `OrchestratorContext` as first parameter and an
  * `executeFn` callback that replaces the former `this.execute()` call.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRequiredNativeBalanceForOutbound = getRequiredNativeBalanceForOutbound;
-exports.shouldSkipFeeLockingForOutbound = shouldSkipFeeLockingForOutbound;
-exports.resolveR2DestinationFundsToken = resolveR2DestinationFundsToken;
-exports.executeMultiChain = executeMultiChain;
-exports.executeUoaToCea = executeUoaToCea;
-exports.executeUoaToCeaSvm = executeUoaToCeaSvm;
-exports.executeCeaToPush = executeCeaToPush;
-exports.executeCeaToPushSvm = executeCeaToPushSvm;
-exports.executeCeaToCea = executeCeaToCea;
-exports.buildPayloadForRoute = buildPayloadForRoute;
-const tslib_1 = require("tslib");
 const web3_js_1 = require("@solana/web3.js");
 const viem_1 = require("viem");
 const context_1 = require("./context");
@@ -43,8 +68,11 @@ const price_fetch_1 = require("../../price-fetch/price-fetch");
 const route_detector_1 = require("../route-detector");
 const cea_utils_1 = require("../cea-utils");
 const build_payload_1 = require("../svm-idl/build-payload");
-const data_utils_1 = require("../data-utils");
 const payload_builders_1 = require("../payload-builders");
+const svm_1 = require("./pc20/svm");
+const svm_rent_2 = require("./svm-rent");
+const data_utils_1 = require("../data-utils");
+const payload_builders_2 = require("../payload-builders");
 const selectors_1 = require("../../constants/selectors");
 const erc20_evm_1 = require("../../constants/abi/erc20.evm");
 const push_chain_1 = require("../../push-chain/push-chain");
@@ -55,6 +83,16 @@ function shouldSkipFeeLockingForOutbound(opts) {
     return (opts.isUEADeployed &&
         opts.balance >= getRequiredNativeBalanceForOutbound(opts.nativeValueForGas, opts.gasReserve));
 }
+/**
+ * Keep Route 3's USD/category sizing, but never let it undercut the live
+ * WPC -> destination-gas-token swap requirement. `bufferedSwapValue` is the
+ * balance-aware result from estimateNativeValueForSwap; protocol fees are
+ * native PC and therefore sit on top of that swap budget.
+ */
+function floorR3NativeValueForGas(sizedValue, bufferedSwapValue, protocolFee) {
+    const livePoolFloor = bufferedSwapValue + protocolFee;
+    return livePoolFloor > sizedValue ? livePoolFloor : sizedValue;
+}
 // =============================================================================
 // Route 2 (UEA → CEA) phase helpers
 // =============================================================================
@@ -64,7 +102,6 @@ function shouldSkipFeeLockingForOutbound(opts) {
  * CEA address, so it can run before the 203 account-resolution phase.
  */
 function resolveR2Prc20TokenEvm(params, targetChain, pushNetwork) {
-    var _a;
     let prc20Token = selectors_1.ZERO_ADDRESS;
     let burnAmount = BigInt(0);
     if (params.migration) {
@@ -72,7 +109,15 @@ function resolveR2Prc20TokenEvm(params, targetChain, pushNetwork) {
         prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, pushNetwork);
         burnAmount = BigInt(0);
     }
-    else if ((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) {
+    else if (params.funds?.amount) {
+        // PC20 export: the token being locked IS the Push-native PC20. There is no
+        // synthetic PRC20 to look up, and the resolver already established it.
+        const pc20 = params._pc20;
+        if (pc20) {
+            prc20Token = pc20.pushAddress;
+            burnAmount = params.funds.amount;
+            return { prc20Token, burnAmount };
+        }
         // User explicitly specified funds with token
         const token = params.funds.token;
         if (token) {
@@ -93,22 +138,23 @@ function resolveR2Prc20TokenEvm(params, targetChain, pushNetwork) {
     return { prc20Token, burnAmount };
 }
 function resolveR2DestinationFundsToken(token, targetChain, pushNetwork) {
-    var _a, _b, _c;
     const pushToken = token;
     if (!pushToken.prc20Address || pushToken.sourceChain !== targetChain) {
         return token;
     }
-    const destinationTokens = (_a = tokens_1.MOVEABLE_TOKENS[targetChain]) !== null && _a !== void 0 ? _a : [];
+    const destinationTokens = tokens_1.MOVEABLE_TOKENS[targetChain] ?? [];
     const nativePrc20 = (0, helpers_1.getNativePRC20ForChain)(targetChain, pushNetwork);
     if (pushToken.prc20Address.toLowerCase() === nativePrc20.toLowerCase()) {
-        return ((_b = destinationTokens.find((candidate) => candidate.mechanism === 'native')) !== null && _b !== void 0 ? _b : {
-            symbol: token.symbol,
-            decimals: token.decimals,
-            address: selectors_1.ZERO_ADDRESS,
-            mechanism: 'native',
-        });
+        return (destinationTokens.find((candidate) => candidate.mechanism === 'native') ??
+            {
+                symbol: token.symbol,
+                decimals: token.decimals,
+                address: selectors_1.ZERO_ADDRESS,
+                mechanism: 'native',
+            });
     }
-    return ((_c = destinationTokens.find((candidate) => candidate.symbol === token.symbol)) !== null && _c !== void 0 ? _c : token);
+    return (destinationTokens.find((candidate) => candidate.symbol === token.symbol) ??
+        token);
 }
 /**
  * SVM counterpart to `resolveR2Prc20TokenEvm`. SVM adds an EXECUTE-only
@@ -116,10 +162,15 @@ function resolveR2DestinationFundsToken(token, targetChain, pushNetwork) {
  * a PRC-20 token for the chain-namespace lookup.
  */
 function resolveR2Prc20TokenSvm(params, targetChain, pushNetwork, hasSvmExecute) {
-    var _a;
     let prc20Token = selectors_1.ZERO_ADDRESS;
     let burnAmount = BigInt(0);
-    if ((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) {
+    if (params.funds?.amount) {
+        // PC20 export: the locked token IS the Push-native PC20 — no synthetic
+        // PRC20 lookup. Mirrors the EVM branch in resolveR2Prc20TokenEvm.
+        const pc20 = params._pc20;
+        if (pc20) {
+            return { prc20Token: pc20.pushAddress, burnAmount: params.funds.amount };
+        }
         const token = params.funds.token;
         if (token) {
             prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
@@ -143,15 +194,23 @@ function resolveR2Prc20TokenSvm(params, targetChain, pushNetwork, hasSvmExecute)
     return { prc20Token, burnAmount };
 }
 function resolveR3SvmDrain(params, sourceChain, pushNetwork) {
-    var _a;
     let drainAmount = BigInt(0);
     let tokenMintHex;
     let splMintBase58;
     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)) {
+    if (params.funds?.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 pc20 = params._pc20;
+        if (pc20?.direction === 'import' && token) {
+            // PC20 CEA burn: the drained token is the wrapper mint. The outbound
+            // relay leg stays on the native PRC-20 (it is a payload relay, not a
+            // PC20 export), so prc20Token is left as initialized above.
+            const mintPk = new web3_js_1.PublicKey(token.address);
+            tokenMintHex = ('0x' + Buffer.from(mintPk.toBytes()).toString('hex'));
+            splMintBase58 = token.address;
+        }
+        else if (token?.mechanism === 'approve') {
             const mintPk = new web3_js_1.PublicKey(token.address);
             tokenMintHex = ('0x' + Buffer.from(mintPk.toBytes()).toString('hex'));
             splMintBase58 = token.address;
@@ -164,21 +223,37 @@ function resolveR3SvmDrain(params, sourceChain, pushNetwork) {
     return { prc20Token, drainAmount, tokenMintHex, splMintBase58 };
 }
 function buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, inboundNonce) {
-    var _a, _b;
+    // PC20: the unlocked Push-native token lands on the UEA (program-enforced
+    // recipient), so a funds-only burn whose destination differs needs a
+    // Push-side forward — same rule as the EVM R3 branch.
+    const extraPc20 = params._pc20;
+    // Always forward for PC20 funds — a payload-less burn emits a selector-only
+    // raw_payload that the chain hard-fails (see the R3 EVM branch note).
+    const pc20Forward = extraPc20?.direction === 'import' && Boolean(params.funds?.amount);
     const shouldBuildPushPayload = (0, data_utils_1.hasExecutablePayloadData)(params.data) ||
-        Boolean(((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) && ((_b = params.value) !== null && _b !== void 0 ? _b : BigInt(0)) > BigInt(0));
+        Boolean(params.funds?.amount && (params.value ?? BigInt(0)) > BigInt(0)) ||
+        pc20Forward;
     if (!shouldBuildPushPayload) {
         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,
+    const multicallCtx = {
+        ...ctx,
+        universalSigner: {
+            ...ctx.universalSigner,
+            account: {
+                ...ctx.universalSigner.account,
+                chain: sourceChain,
+            },
+        },
+    };
+    const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(multicallCtx, executeParams.to, (0, payload_builders_2.buildExecuteMulticall)({
+        execute: (0, gate_1.assertLegacyFunds)(executeParams),
         ueaAddress,
         allowSelfValueCall: true,
     }));
-    const inboundPayload = (0, payload_builders_1.buildInboundUniversalPayloadSvm)(multicallPayload, {
-        nonce: inboundNonce !== null && inboundNonce !== void 0 ? inboundNonce : BigInt(0),
+    const inboundPayload = (0, payload_builders_2.buildInboundUniversalPayloadSvm)(multicallPayload, {
+        nonce: inboundNonce ?? BigInt(0),
     });
     return (0, viem_1.hexToBytes)(inboundPayload);
 }
@@ -187,17 +262,27 @@ function buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, inboundNon
  * resolved `ceaAddress` because the native-value self-call branch skips the
  * multicall when the target IS the CEA (avoids a CEA._handleMulticall revert).
  */
-function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress, targetChain, pushNetwork) {
-    var _a, _b, _c, _d, _e;
+function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress, targetChain, pushNetwork, 
+/**
+ * PC20 export only: the destination wrapper address (registered, or predicted
+ * for a first export). Destination settlement mints the wrapper into the CEA
+ * before running user data, so delivering funds to the requested recipient
+ * needs an explicit wrapper.transfer() built here.
+ */
+pc20Wrapper) {
     if (params.migration) {
-        return (0, payload_builders_1.buildMigrationPayload)();
+        return (0, payload_builders_2.buildMigrationPayload)();
     }
     const ceaMulticalls = [];
     const hasData = (0, data_utils_1.hasExecutablePayloadData)(params.data);
-    const fundsToken = ((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount)
-        ? resolveR2DestinationFundsToken(params.funds.token, targetChain, pushNetwork)
+    const fundsToken = params.funds?.amount
+        ? pc20Wrapper
+            // A PC20 has no MoveableToken form; the wrapper is an ordinary ERC20 on
+            // the destination, so it forwards through the same transfer() path.
+            ? { address: pc20Wrapper, mechanism: 'approve' }
+            : resolveR2DestinationFundsToken(params.funds.token, targetChain, pushNetwork)
         : undefined;
-    const nativeFundsValue = ((_b = params.funds) === null || _b === void 0 ? void 0 : _b.amount) && (fundsToken === null || fundsToken === void 0 ? void 0 : fundsToken.mechanism) === 'native'
+    const nativeFundsValue = params.funds?.amount && fundsToken?.mechanism === 'native'
         ? params.funds.amount
         : BigInt(0);
     if (hasData) {
@@ -208,7 +293,7 @@ function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress, targetChain, pu
             // 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. Mirrors the Route 1 behavior in buildExecuteMulticall.
-            if ((_c = params.funds) === null || _c === void 0 ? void 0 : _c.amount) {
+            if (params.funds?.amount) {
                 if (fundsToken && fundsToken.mechanism !== 'native') {
                     const erc20Transfer = (0, viem_1.encodeFunctionData)({
                         abi: erc20_evm_1.ERC20_EVM,
@@ -226,13 +311,13 @@ function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress, targetChain, pu
             // contract receives it alongside the payload call.
             ceaMulticalls.push({
                 to: targetAddress,
-                value: ((_d = params.value) !== null && _d !== void 0 ? _d : BigInt(0)) + nativeFundsValue,
+                value: (params.value ?? BigInt(0)) + nativeFundsValue,
                 data: params.data,
             });
         }
     }
     else {
-        if (((_e = params.funds) === null || _e === void 0 ? void 0 : _e.amount) && fundsToken && fundsToken.mechanism !== 'native') {
+        if (params.funds?.amount && fundsToken && fundsToken.mechanism !== 'native') {
             // ERC-20 funds: forward via ERC20.transfer from the CEA.
             const erc20Transfer = (0, viem_1.encodeFunctionData)({
                 abi: erc20_evm_1.ERC20_EVM,
@@ -268,7 +353,7 @@ function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress, targetChain, pu
             }
         }
     }
-    return (0, payload_builders_1.buildCeaMulticallPayload)(ceaMulticalls);
+    return (0, payload_builders_2.buildCeaMulticallPayload)(ceaMulticalls);
 }
 const SIZER_HOOK_BY_ROUTE = {
     R3: {
@@ -287,7 +372,7 @@ const SIZER_HOOK_BY_ROUTE = {
  */
 function fireSizingHook(ctx, route, chain, sizing) {
     const hook = SIZER_HOOK_BY_ROUTE[route][sizing.category];
-    const ONE_USD_8D = BigInt(100000000);
+    const ONE_USD_8D = BigInt(100_000_000);
     const totalDepositUSD = sizing.category === 'A' ? ONE_USD_8D : sizing.gasUsd;
     (0, context_1.fireProgressHook)(ctx, hook, chain, sizing.gasLegNativePc, sizing.overflowNativePc, totalDepositUSD);
 }
@@ -297,44 +382,42 @@ function fireSizingHook(ctx, route, chain, sizing) {
 /**
  * Dispatch a universal execution to the correct route handler.
  */
-function executeMultiChain(ctx, params, executeFn) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // Validate route parameters
-        (0, route_detector_1.validateRouteParams)(params, {
-            clientChain: ctx.universalSigner.account.chain,
-        });
-        // Detect the transaction route
-        const route = (0, route_detector_1.detectRoute)(params);
-        (0, context_1.printLog)(ctx, `executeMultiChain — detected route: ${route}, params: ${JSON.stringify({
-            to: typeof params.to === 'string'
-                ? params.to
-                : { address: params.to.address, chain: params.to.chain },
-            from: params.from,
-            hasValue: params.value !== undefined,
-            hasData: params.data !== undefined,
-            hasFunds: params.funds !== undefined,
-        }, null, 2)}`);
-        let response;
-        switch (route) {
-            case route_detector_1.TransactionRoute.UOA_TO_PUSH:
-                response = yield executeFn((0, helpers_1.toExecuteParams)(params));
-                break;
-            case route_detector_1.TransactionRoute.UOA_TO_CEA:
-                response = yield executeUoaToCea(ctx, params, executeFn);
-                break;
-            case route_detector_1.TransactionRoute.CEA_TO_PUSH:
-                response = yield executeCeaToPush(ctx, params, executeFn);
-                break;
-            case route_detector_1.TransactionRoute.CEA_TO_CEA:
-                response = yield executeCeaToCea(ctx, params, executeFn);
-                break;
-            default:
-                throw new Error(`Unknown transaction route: ${route}`);
-        }
-        // Set the route on the response for .wait() to use
-        response.route = route;
-        return response;
+async function executeMultiChain(ctx, params, executeFn) {
+    // Validate route parameters
+    (0, route_detector_1.validateRouteParams)(params, {
+        clientChain: ctx.universalSigner.account.chain,
     });
+    // Detect the transaction route
+    const route = (0, route_detector_1.detectRoute)(params);
+    (0, context_1.printLog)(ctx, `executeMultiChain — detected route: ${route}, params: ${JSON.stringify({
+        to: typeof params.to === 'string'
+            ? params.to
+            : { address: params.to.address, chain: params.to.chain },
+        from: params.from,
+        hasValue: params.value !== undefined,
+        hasData: params.data !== undefined,
+        hasFunds: params.funds !== undefined,
+    }, null, 2)}`);
+    let response;
+    switch (route) {
+        case route_detector_1.TransactionRoute.UOA_TO_PUSH:
+            response = await executeFn((0, helpers_1.toExecuteParams)(params));
+            break;
+        case route_detector_1.TransactionRoute.UOA_TO_CEA:
+            response = await executeUoaToCea(ctx, params, executeFn);
+            break;
+        case route_detector_1.TransactionRoute.CEA_TO_PUSH:
+            response = await executeCeaToPush(ctx, params, executeFn);
+            break;
+        case route_detector_1.TransactionRoute.CEA_TO_CEA:
+            response = await executeCeaToCea(ctx, params, executeFn);
+            break;
+        default:
+            throw new Error(`Unknown transaction route: ${route}`);
+    }
+    // Set the route on the response for .wait() to use
+    response.route = route;
+    return response;
 }
 // ---------------------------------------------------------------------------
 // executeUoaToCea  (Route 2 — EVM)
@@ -349,257 +432,289 @@ function executeMultiChain(ctx, params, executeFn) {
  * The multicall is executed through the normal execute() flow which handles
  * fee-locking on the origin chain and signature verification.
  */
-function executeUoaToCea(ctx, params, executeFn) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        const target = params.to;
-        const targetChain = target.chain;
-        const targetAddress = target.address;
-        const isSvm = (0, payload_builders_1.isSvmChain)(targetChain);
-        // Validate target address based on VM type
-        if (isSvm) {
-            // SVM: 32-byte hex address
-            if (!(0, payload_builders_1.isValidSolanaHexAddress)(targetAddress)) {
-                throw new Error(`Invalid Solana address: ${targetAddress}. ` +
-                    `Expected 0x + 64 hex chars (32 bytes).`);
-            }
-            const ZERO_32 = ('0x' + '0'.repeat(64));
-            if (targetAddress.toLowerCase() === ZERO_32.toLowerCase()) {
-                throw new Error(`Cannot send to zero address on Solana. ` +
-                    `This would result in permanent loss of funds.`);
-            }
+async function executeUoaToCea(ctx, params, executeFn) {
+    const target = params.to;
+    const targetChain = target.chain;
+    const targetAddress = target.address;
+    const isSvm = (0, payload_builders_2.isSvmChain)(targetChain);
+    // Validate target address based on VM type
+    if (isSvm) {
+        // SVM: 32-byte hex address
+        if (!(0, payload_builders_2.isValidSolanaHexAddress)(targetAddress)) {
+            throw new Error(`Invalid Solana address: ${targetAddress}. ` +
+                `Expected 0x + 64 hex chars (32 bytes).`);
         }
-        else {
-            // EVM: 20-byte hex address
-            // Zero address is allowed for multicall (data is array) — the actual targets are in the data entries.
-            const isMulticall = Array.isArray(params.data);
-            if (targetAddress.toLowerCase() === selectors_1.ZERO_ADDRESS.toLowerCase() && !isMulticall) {
-                throw new Error(`Cannot send to zero address (0x0000...0000). ` +
-                    `This would result in permanent loss of funds.`);
-            }
-        }
-        // Validate chain supports outbound operations
-        if (!(0, cea_utils_1.chainSupportsOutbound)(targetChain)) {
-            throw new Error(`Chain ${targetChain} does not support outbound operations. ` +
-                `Supported chains: BNB_TESTNET, ETHEREUM_SEPOLIA, SOLANA_DEVNET, etc.`);
-        }
-        // Branch based on VM type
-        if (isSvm) {
-            return executeUoaToCeaSvm(ctx, params, target, executeFn);
+        const ZERO_32 = ('0x' + '0'.repeat(64));
+        if (targetAddress.toLowerCase() === ZERO_32.toLowerCase()) {
+            throw new Error(`Cannot send to zero address on Solana. ` +
+                `This would result in permanent loss of funds.`);
         }
-        // ===== EVM path (existing logic) =====
-        // R2 pre-broadcast progress: external chain detected
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_201, targetChain, targetAddress);
-        // Compute UEA address (sync, offchain derivation — no RPC).
-        const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
-        (0, context_1.printLog)(ctx, `executeUoaToCea — target chain: ${targetChain}, target address: ${targetAddress}, UEA: ${ueaAddress}`);
-        // --- Token resolution (chain-local, before account resolution) ---
-        // Resolve the PRC-20 burn token + burn amount ahead of CEA resolution.
-        // Chain-local — see `resolveR2Prc20TokenEvm` above.
-        const { prc20Token, burnAmount } = resolveR2Prc20TokenEvm(params, targetChain, ctx.pushNetwork);
-        if (params.value && params.value > BigInt(0)) {
-            (0, context_1.printLog)(ctx, `executeUoaToCea — auto-selected native PRC-20 ${prc20Token} for chain ${targetChain}, amount: ${burnAmount.toString()}`);
-        }
-        else if (!params.migration &&
-            !((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) &&
-            (0, data_utils_1.hasExecutablePayloadData)(params.data)) {
-            (0, context_1.printLog)(ctx, `executeUoaToCea — PAYLOAD-only: using native PRC-20 ${prc20Token} for chain ${targetChain} with zero burn amount`);
+    }
+    else {
+        // EVM: 20-byte hex address
+        // Zero address is allowed for multicall (data is array) — the actual targets are in the data entries.
+        const isMulticall = Array.isArray(params.data);
+        if (targetAddress.toLowerCase() === selectors_1.ZERO_ADDRESS.toLowerCase() && !isMulticall) {
+            throw new Error(`Cannot send to zero address (0x0000...0000). ` +
+                `This would result in permanent loss of funds.`);
         }
-        const gasLimitForQuery = (_b = params.gasLimit) !== null && _b !== void 0 ? _b : BigInt(0);
-        // --- 202: Gas estimation (spec-ordered before 203) ---
-        let gasFee = BigInt(0);
-        let protocolFee = BigInt(0);
-        let gasToken = selectors_1.ZERO_ADDRESS;
-        let universalCoreAddress;
-        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, gasLimitForQuery, targetChain);
-                gasFee = result.gasFee;
-                protocolFee = result.protocolFee;
-                gasToken = result.gasToken;
-                universalCoreAddress = result.universalCoreAddress;
-                (0, context_1.printLog)(ctx, `executeUoaToCea — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}`);
-                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_202_02, targetChain, protocolFee, gasFee);
-            }
-            catch (err) {
-                throw new Error(`Failed to query outbound gas fee: ${err}`);
-            }
+    }
+    // Validate chain supports outbound operations
+    if (!(0, cea_utils_1.chainSupportsOutbound)(targetChain)) {
+        throw new Error(`Chain ${targetChain} does not support outbound operations. ` +
+            `Supported chains: BNB_TESTNET, ETHEREUM_SEPOLIA, SOLANA_DEVNET, etc.`);
+    }
+    // Branch based on VM type
+    if (isSvm) {
+        return executeUoaToCeaSvm(ctx, params, target, executeFn);
+    }
+    // ===== EVM path (existing logic) =====
+    // R2 pre-broadcast progress: external chain detected
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_201, targetChain, targetAddress);
+    // Compute UEA address (sync, offchain derivation — no RPC).
+    const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+    (0, context_1.printLog)(ctx, `executeUoaToCea — target chain: ${targetChain}, target address: ${targetAddress}, UEA: ${ueaAddress}`);
+    // --- Token resolution (chain-local, before account resolution) ---
+    // Resolve the PRC-20 burn token + burn amount ahead of CEA resolution.
+    // Chain-local — see `resolveR2Prc20TokenEvm` above.
+    const { prc20Token, burnAmount } = resolveR2Prc20TokenEvm(params, targetChain, ctx.pushNetwork);
+    if (params.value && params.value > BigInt(0)) {
+        (0, context_1.printLog)(ctx, `executeUoaToCea — auto-selected native PRC-20 ${prc20Token} for chain ${targetChain}, amount: ${burnAmount.toString()}`);
+    }
+    else if (!params.migration &&
+        !params.funds?.amount &&
+        (0, data_utils_1.hasExecutablePayloadData)(params.data)) {
+        (0, context_1.printLog)(ctx, `executeUoaToCea — PAYLOAD-only: using native PRC-20 ${prc20Token} for chain ${targetChain} with zero burn amount`);
+    }
+    const gasLimitForQuery = params.gasLimit ?? BigInt(0);
+    // --- 202: Gas estimation (spec-ordered before 203) ---
+    let gasFee = BigInt(0);
+    let protocolFee = BigInt(0);
+    let gasToken = selectors_1.ZERO_ADDRESS;
+    let universalCoreAddress;
+    if (prc20Token !== selectors_1.ZERO_ADDRESS) {
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_202_01, targetChain);
+        try {
+            // PC20 exports must not use getOutboundTxGasAndFees — only
+            // getPC20ExportGasAndFees accounts for the first-export deployment
+            // overhead, and quoting the wrong one strands the destination transfer.
+            const pc20Export = params._pc20;
+            const result = pc20Export?.direction === 'export'
+                ? await (0, export_1.queryPC20OutboundGasFee)(ctx, prc20Token, gasLimitForQuery, targetChain)
+                : await (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimitForQuery, targetChain);
+            gasFee = result.gasFee;
+            protocolFee = result.protocolFee;
+            gasToken = result.gasToken;
+            universalCoreAddress = result.universalCoreAddress;
+            (0, context_1.printLog)(ctx, `executeUoaToCea — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}`);
+            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_202_02, targetChain, protocolFee, gasFee);
         }
-        // --- 203: CEA resolution + UEA status (single round-trip burst) ---
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_203_01, targetChain);
-        const signerChain = ctx.universalSigner.account.chain;
-        const isNativePushEOA = (0, helpers_1.isPushChain)(signerChain);
-        const [{ cea: ceaAddress, isDeployed: ceaDeployed }, [ueaCode, ueaBalance],] = yield Promise.all([
-            (0, cea_utils_1.getCEAAddress)(ueaAddress, targetChain, (_c = ctx.rpcUrls[targetChain]) === null || _c === void 0 ? void 0 : _c[0]),
-            Promise.all([
-                ctx.pushClient.publicClient.getCode({ address: ueaAddress }),
-                ctx.pushClient.getBalance(ueaAddress),
-            ]),
-        ]);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_203_02, ueaAddress, ceaAddress, targetChain, ceaDeployed);
-        (0, context_1.printLog)(ctx, `executeUoaToCea — CEA address: ${ceaAddress}, deployed: ${ceaDeployed}`);
-        const isUEADeployed = isNativePushEOA || ueaCode !== undefined;
-        const ueaNonce = (!isUEADeployed || isNativePushEOA) ? BigInt(0) : yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress);
-        // --- Build CEA payload (requires ceaAddress for self-call check) ---
-        // Delegates to `buildR2CeaPayloadEvm` — see helper definition above.
-        const ceaPayload = buildR2CeaPayloadEvm(params, ceaAddress, targetAddress, targetChain, ctx.pushNetwork);
-        if (params.migration) {
-            (0, context_1.printLog)(ctx, `executeUoaToCea — MIGRATION: using raw MIGRATION_SELECTOR payload (${ceaPayload}), native PRC-20 ${prc20Token}`);
+        catch (err) {
+            throw new Error(`Failed to query outbound gas fee: ${err}`);
         }
-        // Build outbound request struct for the gateway
-        // 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));
-        (0, context_1.printLog)(ctx, `executeUoaToCea — outbound request: ${JSON.stringify({
-            recipient: outboundReq.recipient,
-            token: outboundReq.token,
-            amount: outboundReq.amount.toString(),
-            gasLimit: outboundReq.gasLimit.toString(),
-            maxPCForGas: outboundReq.maxPCForGas.toString(),
-            payloadLength: outboundReq.payload.length,
-            revertRecipient: outboundReq.revertRecipient,
-        }, null, 2)}`);
-        // Get UniversalGatewayPC address
-        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-        // Build the multicall that will execute ON Push Chain from UEA context
-        // This includes: 1) approve PRC-20 (if needed), 2) call sendUniversalTxOutbound
-        const pushChainMulticalls = [];
-        // ---------------------------------------------------------------------
-        // Native-value selection — R2 does NOT use Case A/B/C gas abstraction.
-        // That feature is scoped to R1 (fee-lock USD caps) and R3 (CEA → Push
-        // outbound msg.value). For R2 we size `nativeValueForGas` from the
-        // live WPC/gasToken Uniswap V3 pool quote plus a 10% safety buffer;
-        // `swapAndBurnGas` refunds any excess as PC back to UEA via
-        // refundUnusedGas.
-        //
-        // Fresh-wallet prediction (below) is retained: it estimates post-fee-lock
-        // UPC balance for UEAs that haven't been funded yet, independent of
-        // Case A/B/C sizing.
-        // ---------------------------------------------------------------------
-        const EVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for outer-tx gas
-        const EVM_NATIVE_VALUE_SAFETY_CAP = BigInt(200e18); // 200 UPC absolute ceiling
-        const ROUTE2_MINIMUM_DEPOSIT_USD = utils_1.Utils.helpers.parseUnits('10', 8); // $10
-        // Effective balance: real for deployed UEAs; predicted post-fee-lock for fresh.
-        let effectiveBalance = ueaBalance;
-        if (!isUEADeployed && effectiveBalance <= EVM_GAS_RESERVE) {
-            const ethPrice = yield new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(signerChain);
-            const nativeAmountETH = ethPrice > BigInt(0)
-                ? (ROUTE2_MINIMUM_DEPOSIT_USD * BigInt(1e18) + (ethPrice - BigInt(1))) / ethPrice + BigInt(1)
-                : BigInt(0);
-            if (nativeAmountETH > BigInt(0)) {
-                const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(signerChain, ctx.pushNetwork);
-                const predictedUPC = yield (0, gas_calculator_1.estimateDepositFromLockedNative)(ctx, nativeAmountETH, originPrc20);
-                if (predictedUPC > BigInt(0)) {
-                    // 10% safety margin for slippage between quote and actual execution
-                    effectiveBalance = (predictedUPC * BigInt(90)) / BigInt(100);
-                    (0, context_1.printLog)(ctx, `executeUoaToCea — fresh wallet: Uniswap quote predicts ${predictedUPC.toString()} UPC ` +
-                        `from ${nativeAmountETH.toString()} wei pETH, using ${effectiveBalance.toString()} (90%)`);
-                }
+    }
+    // --- 203: CEA resolution + UEA status (single round-trip burst) ---
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_203_01, targetChain);
+    const signerChain = ctx.universalSigner.account.chain;
+    const isNativePushEOA = (0, helpers_1.isPushChain)(signerChain);
+    const [{ cea: ceaAddress, isDeployed: ceaDeployed }, [ueaCode, ueaBalance],] = await Promise.all([
+        (0, cea_utils_1.getCEAAddress)(ueaAddress, targetChain, ctx.rpcUrls[targetChain]?.[0]),
+        Promise.all([
+            ctx.pushClient.publicClient.getCode({ address: ueaAddress }),
+            ctx.pushClient.getBalance(ueaAddress),
+        ]),
+    ]);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_203_02, ueaAddress, ceaAddress, targetChain, ceaDeployed);
+    (0, context_1.printLog)(ctx, `executeUoaToCea — CEA address: ${ceaAddress}, deployed: ${ceaDeployed}`);
+    const isUEADeployed = isNativePushEOA || ueaCode !== undefined;
+    const ueaNonce = (!isUEADeployed || isNativePushEOA) ? BigInt(0) : await (0, uea_manager_1.getUEANonce)(ctx, ueaAddress);
+    // --- Build CEA payload (requires ceaAddress for self-call check) ---
+    // Delegates to `buildR2CeaPayloadEvm` — see helper definition above.
+    //
+    // PC20 export: resolve the destination wrapper BEFORE anything approves or
+    // locks the source token. A first export has no registered wrapper, so the
+    // address is predicted from the live registered factory; if that cannot be
+    // established this throws here, with nothing yet committed.
+    const pc20Descriptor = params._pc20;
+    const isPc20Export = pc20Descriptor?.direction === 'export';
+    let pc20Wrapper;
+    if (isPc20Export && pc20Descriptor) {
+        const { wrapper } = await (0, export_1.validatePC20Export)(ctx, pc20Descriptor, targetChain, { network: ctx.pushNetwork, rpcUrls: ctx.rpcUrls });
+        pc20Wrapper = wrapper.address;
+        (0, context_1.printLog)(ctx, `executeUoaToCea — PC20 export: destination wrapper ${pc20Wrapper} ` +
+            `(${wrapper.deployed ? 'registered' : 'predicted, first export'})`);
+    }
+    const ceaPayload = buildR2CeaPayloadEvm(params, ceaAddress, targetAddress, targetChain, ctx.pushNetwork, pc20Wrapper);
+    if (params.migration) {
+        (0, context_1.printLog)(ctx, `executeUoaToCea — MIGRATION: using raw MIGRATION_SELECTOR payload (${ceaPayload}), native PRC-20 ${prc20Token}`);
+    }
+    // Build outbound request struct for the gateway
+    // 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_2.assertCeaFundsParkingInvariant)(targetBytes, ceaPayload);
+    // PC20 export: the gateway expects the PC20 selector plus the destination
+    // wrapper metadata ahead of the user data. Inbound is the mirror image — the
+    // external gateway prepends the selector there, so the SDK must not.
+    const outboundPayload = isPc20Export && pc20Descriptor
+        ? (0, export_1.buildPC20ExportPayload)({
+            destinationChain: targetChain,
+            name: pc20Descriptor.name,
+            symbol: pc20Descriptor.symbol,
+            decimals: pc20Descriptor.decimals,
+            destinationUserData: ceaPayload,
+        })
+        : ceaPayload;
+    const outboundReq = (0, payload_builders_2.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, gasLimitForQuery, outboundPayload, ueaAddress, // revert recipient is the UEA
+    params.maxPCForGas ?? BigInt(0));
+    (0, context_1.printLog)(ctx, `executeUoaToCea — outbound request: ${JSON.stringify({
+        recipient: outboundReq.recipient,
+        token: outboundReq.token,
+        amount: outboundReq.amount.toString(),
+        gasLimit: outboundReq.gasLimit.toString(),
+        maxPCForGas: outboundReq.maxPCForGas.toString(),
+        payloadLength: outboundReq.payload.length,
+        revertRecipient: outboundReq.revertRecipient,
+    }, null, 2)}`);
+    // Get UniversalGatewayPC address
+    const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+    // Build the multicall that will execute ON Push Chain from UEA context
+    // This includes: 1) approve PRC-20 (if needed), 2) call sendUniversalTxOutbound
+    const pushChainMulticalls = [];
+    // ---------------------------------------------------------------------
+    // Native-value selection — R2 does NOT use Case A/B/C gas abstraction.
+    // That feature is scoped to R1 (fee-lock USD caps) and R3 (CEA → Push
+    // outbound msg.value). For R2 we size `nativeValueForGas` from the
+    // live WPC/gasToken Uniswap V3 pool quote plus a 10% safety buffer;
+    // `swapAndBurnGas` refunds any excess as PC back to UEA via
+    // refundUnusedGas.
+    //
+    // Fresh-wallet prediction (below) is retained: it estimates post-fee-lock
+    // UPC balance for UEAs that haven't been funded yet, independent of
+    // Case A/B/C sizing.
+    // ---------------------------------------------------------------------
+    const EVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for outer-tx gas
+    const ROUTE2_MINIMUM_DEPOSIT_USD = utils_1.Utils.helpers.parseUnits('10', 8); // $10
+    // Effective balance: real for deployed UEAs; predicted post-fee-lock for fresh.
+    let effectiveBalance = ueaBalance;
+    if (!isUEADeployed && effectiveBalance <= EVM_GAS_RESERVE) {
+        const ethPrice = await new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(signerChain);
+        const nativeAmountETH = ethPrice > BigInt(0)
+            ? (ROUTE2_MINIMUM_DEPOSIT_USD * BigInt(1e18) + (ethPrice - BigInt(1))) / ethPrice + BigInt(1)
+            : BigInt(0);
+        if (nativeAmountETH > BigInt(0)) {
+            const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(signerChain, ctx.pushNetwork);
+            const predictedUPC = await (0, gas_calculator_1.estimateDepositFromLockedNative)(ctx, nativeAmountETH, originPrc20);
+            if (predictedUPC > BigInt(0)) {
+                // 10% safety margin for slippage between quote and actual execution
+                effectiveBalance = (predictedUPC * BigInt(90)) / BigInt(100);
+                (0, context_1.printLog)(ctx, `executeUoaToCea — fresh wallet: Uniswap quote predicts ${predictedUPC.toString()} UPC ` +
+                    `from ${nativeAmountETH.toString()} wei pETH, using ${effectiveBalance.toString()} (90%)`);
             }
         }
-        // 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)) {
-            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) {
-            (0, context_1.printLog)(ctx, `executeUoaToCea — capping nativeValueForGas at 200 UPC ceiling (was ${nativeValueForGas.toString()})`);
-            nativeValueForGas = EVM_NATIVE_VALUE_SAFETY_CAP;
-        }
-        // Pre-flight: warns by default when UEA cannot cover (nativeValueForGas +
-        // gasReserve) or the PRC-20 burn amount; throws only when
-        // options.enforceGasCheck=true. PRC-20 check fires whenever
-        // burnAmount > 0 — user must pre-hold the burn token, even when it equals
-        // the gas token (the gateway does transferFrom BEFORE the gas swap).
-        let prc20BalanceR2Evm;
-        if (burnAmount > BigInt(0)) {
-            prc20BalanceR2Evm = yield ctx.pushClient.readContract({
-                address: prc20Token,
-                abi: erc20_evm_1.ERC20_EVM,
-                functionName: 'balanceOf',
-                args: [ueaAddress],
-            });
-        }
-        const requiredNativeBalanceR2Evm = getRequiredNativeBalanceForOutbound(nativeValueForGas, EVM_GAS_RESERVE);
-        const skipFeeLockingR2Evm = shouldSkipFeeLockingForOutbound({
-            isUEADeployed,
-            balance: effectiveBalance,
-            nativeValueForGas,
-            gasReserve: EVM_GAS_RESERVE,
-        });
-        (0, preflight_1.runPreflight)({
-            ctx,
-            ueaAddress,
-            ueaBalance: effectiveBalance,
-            requiredValue: nativeValueForGas,
-            gasReserve: EVM_GAS_RESERVE,
-            pathTag: 'R2_EVM',
-            burnToken: prc20Token,
-            burnAmount,
-            prc20Balance: prc20BalanceR2Evm,
-            enforceGasCheck: ((_e = params.options) === null || _e === void 0 ? void 0 : _e.enforceGasCheck) === true,
-        });
-        // 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,
-            gasToken,
-            burnAmount,
-            gasFee,
-            nativeValueForGas,
-            gatewayPcAddress,
-            outboundRequest: outboundReq,
+    }
+    // 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)) {
+        nativeValueForGas = await (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, effectiveBalance);
+        (0, context_1.printLog)(ctx, `executeUoaToCea — nativeValueForGas=${nativeValueForGas.toString()} (includes 2.2x buffer)`);
+    }
+    // Pre-flight: warns by default when UEA cannot cover (nativeValueForGas +
+    // gasReserve) or the PRC-20 burn amount; throws only when
+    // options.enforceGasCheck=true. PRC-20 check fires whenever
+    // burnAmount > 0 — user must pre-hold the burn token, even when it equals
+    // the gas token (the gateway does transferFrom BEFORE the gas swap).
+    let prc20BalanceR2Evm;
+    if (burnAmount > BigInt(0)) {
+        prc20BalanceR2Evm = await ctx.pushClient.readContract({
+            address: prc20Token,
+            abi: erc20_evm_1.ERC20_EVM,
+            functionName: 'balanceOf',
+            args: [ueaAddress],
         });
-        pushChainMulticalls.push(...outboundMulticalls);
-        (0, context_1.printLog)(ctx, `executeUoaToCea — Push Chain multicall has ${pushChainMulticalls.length} operations`);
-        // Execute through the normal execute() flow
-        // This handles fee-locking on origin chain and executes the multicall from UEA context
-        // Sum native values from multicall entries for proper fee calculation
-        const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
-        const executeParams = Object.assign({ to: ueaAddress, value: multicallNativeValue, data: pushChainMulticalls, _ueaStatus: {
-                isDeployed: isUEADeployed,
-                nonce: ueaNonce,
-                balance: ueaBalance,
-            }, _skipFeeLocking: skipFeeLockingR2Evm, _requiredFundsOverride: requiredNativeBalanceR2Evm }, (!skipFeeLockingR2Evm ? { _minimumDepositUsd: ROUTE2_MINIMUM_DEPOSIT_USD } : {}));
-        // Signature request — user is prompted to sign the universal payload.
-        // executeFn is monolithic (sign → broadcast), so we emit the logical
-        // post-sign / pre-broadcast markers as a burst after it returns so
-        // consumers see the spec-ordered stream: 204-01 → 204-02 → 204-03 → 207.
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_01);
-        let response;
-        try {
-            response = yield executeFn(executeParams);
-        }
-        catch (err) {
-            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_04, err instanceof Error ? err.message : String(err));
-            // Suppress the outer orchestrator catch's 299-02 terminal — 204-04
-            // already surfaced the signature/broadcast failure to the consumer.
-            ctx._routeTerminalEmitted = true;
-            throw err;
-        }
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_02);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_03);
-        // R2 broadcast marker — Push Chain tx has been built, signed, and
-        // accepted by the node. Replaces the suppressed 107 emission for this route.
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_207, targetChain);
-        // Add chain info to response
-        response.chain = targetChain;
-        response.chainNamespace = (0, helpers_1.getChainNamespace)(targetChain);
-        return response;
+    }
+    const requiredNativeBalanceR2Evm = getRequiredNativeBalanceForOutbound(nativeValueForGas, EVM_GAS_RESERVE);
+    const skipFeeLockingR2Evm = shouldSkipFeeLockingForOutbound({
+        isUEADeployed,
+        balance: effectiveBalance,
+        nativeValueForGas,
+        gasReserve: EVM_GAS_RESERVE,
     });
+    (0, preflight_1.runPreflight)({
+        ctx,
+        ueaAddress,
+        ueaBalance: effectiveBalance,
+        requiredValue: nativeValueForGas,
+        gasReserve: EVM_GAS_RESERVE,
+        pathTag: 'R2_EVM',
+        burnToken: prc20Token,
+        burnAmount,
+        prc20Balance: prc20BalanceR2Evm,
+        enforceGasCheck: params.options?.enforceGasCheck === true,
+    });
+    // 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_2.buildOutboundApprovalAndCall)({
+        prc20Token,
+        gasToken,
+        burnAmount,
+        gasFee,
+        nativeValueForGas,
+        gatewayPcAddress,
+        outboundRequest: outboundReq,
+    });
+    pushChainMulticalls.push(...outboundMulticalls);
+    (0, context_1.printLog)(ctx, `executeUoaToCea — Push Chain multicall has ${pushChainMulticalls.length} operations`);
+    // Execute through the normal execute() flow
+    // This handles fee-locking on origin chain and executes the multicall from UEA context
+    // Sum native values from multicall entries for proper fee calculation
+    const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => sum + (mc.value ?? BigInt(0)), BigInt(0));
+    const executeParams = {
+        to: ueaAddress, // multicall executes from UEA
+        value: multicallNativeValue, // ensures correct requiredFunds calculation
+        data: pushChainMulticalls, // array triggers multicall mode
+        _ueaStatus: {
+            isDeployed: isUEADeployed,
+            nonce: ueaNonce,
+            balance: ueaBalance,
+        },
+        _skipFeeLocking: skipFeeLockingR2Evm,
+        _requiredFundsOverride: requiredNativeBalanceR2Evm,
+        // Ensure fee-locking deposits enough for the outbound swap whenever it is needed.
+        ...(!skipFeeLockingR2Evm ? { _minimumDepositUsd: ROUTE2_MINIMUM_DEPOSIT_USD } : {}),
+    };
+    // Signature request — user is prompted to sign the universal payload.
+    // executeFn is monolithic (sign → broadcast), so we emit the logical
+    // post-sign / pre-broadcast markers as a burst after it returns so
+    // consumers see the spec-ordered stream: 204-01 → 204-02 → 204-03 → 207.
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_01);
+    let response;
+    try {
+        response = await executeFn(executeParams);
+    }
+    catch (err) {
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_04, err instanceof Error ? err.message : String(err));
+        // Suppress the outer orchestrator catch's 299-02 terminal — 204-04
+        // already surfaced the signature/broadcast failure to the consumer.
+        ctx._routeTerminalEmitted = true;
+        throw err;
+    }
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_02);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_03);
+    // R2 broadcast marker — Push Chain tx has been built, signed, and
+    // accepted by the node. Replaces the suppressed 107 emission for this route.
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_207, targetChain);
+    // Add chain info to response
+    response.chain = targetChain;
+    response.chainNamespace = (0, helpers_1.getChainNamespace)(targetChain);
+    return response;
 }
 // ---------------------------------------------------------------------------
 // executeUoaToCeaSvm  (Route 2 — SVM)
@@ -612,234 +727,324 @@ function executeUoaToCea(ctx, params, executeFn) {
  * 2. Withdraw SPL: Burn PRC-20 on Push Chain, recipient gets SPL token
  * 3. Execute (CPI): Burn pSOL + execute CPI on target Solana program
  */
-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;
-        const targetChain = target.chain;
-        const targetAddress = target.address; // 0x-prefixed, 32 bytes
-        const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
-        // R2 pre-broadcast progress (SVM) — external chain detected
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_201, targetChain, targetAddress);
-        const { svmPayload, targetBytes, hasExecute: hasSvmExecute, } = (0, build_payload_1.buildSvmPayloadFromParams)({
-            data: params.data,
-            to: target,
-            senderUea: ueaAddress,
-        });
-        (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — target: ${targetAddress}, chain: ${targetChain}, ` +
-            `hasSvmExecute: ${hasSvmExecute}, value: ${(_b = (_a = params.value) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '0'}`);
-        if (hasSvmExecute) {
-            (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — encoded execute payload: ${(svmPayload.length - 2) / 2} bytes`);
-        }
-        (0, payload_builders_1.assertSvmPayloadWithinRelayLimit)(svmPayload, `Route 2 SVM ${targetChain}`);
-        // --- Determine PRC-20 token and burn amount (chain-local, pre-203) ---
-        const { prc20Token, burnAmount } = resolveR2Prc20TokenSvm(params, targetChain, ctx.pushNetwork, hasSvmExecute);
-        if (params.value && params.value > BigInt(0)) {
-            (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — auto-selected native PRC-20 ${prc20Token} for chain ${targetChain}, amount: ${burnAmount.toString()}`);
-        }
-        else if (!((_c = params.funds) === null || _c === void 0 ? void 0 : _c.amount) && hasSvmExecute) {
-            (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — EXECUTE-only: using PRC-20 ${prc20Token} with zero burn amount`);
-        }
-        // --- 202: Gas estimation (spec-ordered before 203) ---
-        let gasFee = BigInt(0);
-        let protocolFeeSvm = 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 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);
-        // 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;
-        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);
+async function executeUoaToCeaSvm(ctx, params, target, executeFn) {
+    const targetChain = target.chain;
+    const targetAddress = target.address; // 0x-prefixed, 32 bytes
+    const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+    // R2 pre-broadcast progress (SVM) — external chain detected
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_201, targetChain, targetAddress);
+    const { svmPayload, targetBytes, hasExecute: hasSvmExecute, } = (0, build_payload_1.buildSvmPayloadFromParams)({
+        data: params.data,
+        to: target,
+        senderUea: ueaAddress,
+    });
+    (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — target: ${targetAddress}, chain: ${targetChain}, ` +
+        `hasSvmExecute: ${hasSvmExecute}, value: ${params.value?.toString() ?? '0'}`);
+    if (hasSvmExecute) {
+        (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — encoded execute payload: ${(svmPayload.length - 2) / 2} bytes`);
+    }
+    (0, payload_builders_2.assertSvmPayloadWithinRelayLimit)(svmPayload, `Route 2 SVM ${targetChain}`);
+    // --- PC20 export to Solana ---
+    // The destination wrapper is the deterministic pc20_mint PDA; resolving it
+    // here (pre-approval) also tells us whether this is a first export, which
+    // drives the rent floor below. The generic SVM payload is replaced by the
+    // PC20 payload: selector || abi(namespace,name,symbol,decimals) || userData.
+    //
+    // v1 ships funds-only with EMPTY userData: settlement mints into the
+    // sender's CEA ATA (pc20.rs id=5 mints to cea_ata and only userData moves
+    // funds onward — and a recipient ATA cannot exist before the mint does on a
+    // first export). Tokens in the CEA ATA remain under the sender's control and
+    // are retrievable via the existing R2 execute path. Recipient-ATA delivery
+    // userData lands with the repeat-export policy.
+    const svmPc20Descriptor = params._pc20;
+    const isSvmPc20Export = svmPc20Descriptor?.direction === 'export';
+    let svmPc20FirstExport = false;
+    let pc20SvmPayload = svmPayload;
+    let pc20TargetBytes = targetBytes;
+    if (isSvmPc20Export && svmPc20Descriptor) {
+        const { wrapper } = await (0, export_1.validatePC20Export)(ctx, svmPc20Descriptor, targetChain, { network: ctx.pushNetwork, rpcUrls: ctx.rpcUrls });
+        svmPc20FirstExport = !wrapper.deployed;
+        // Delivery: settlement mints into the CEA ATA and CPIs exactly one
+        // instruction from userData. When the recipient's ATA for the wrapper
+        // mint already exists, that instruction is an SPL TransferChecked to it.
+        // Otherwise userData stays empty and funds land in the sender's CEA ATA
+        // (retrievable via R2 execute) — a first export can never deliver, since
+        // an ATA cannot exist before its mint does.
+        let deliveryUserData = '0x';
+        let deliveryNote = 'funds-only → CEA ATA';
+        if (wrapper.deployed) {
             try {
-                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;
-                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 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})`);
+                const { PublicKey, Connection } = await Promise.resolve().then(() => __importStar(require('@solana/web3.js')));
+                const { buildPC20SvmDeliveryFields } = await Promise.resolve().then(() => __importStar(require('./pc20/svm')));
+                const mint = new PublicKey(wrapper.address);
+                const ceaAuthority = (0, svm_rent_2.deriveSvmCeaPda)(ueaAddress);
+                const recipientPk = new PublicKey(Buffer.from(targetAddress.slice(2), 'hex'));
+                const recipientAta = (0, svm_rent_2.deriveAtaPubkey)(recipientPk, mint);
+                const rpc = ctx.rpcUrls[targetChain]?.[0] ?? chain_1.CHAIN_INFO[targetChain].defaultRPC[0];
+                // 'confirmed' commitment: an ATA created moments ago must count.
+                // Settlement lands ~a minute later, so anything confirmed now is
+                // final long before the CPI runs; probing at 'finalized' would
+                // misroute fresh ATAs to the CEA fallback.
+                const ataInfo = await new Connection(rpc, 'confirmed').getAccountInfo(recipientAta);
+                if (ataInfo) {
+                    const fields = buildPC20SvmDeliveryFields({
+                        mint,
+                        ceaAta: (0, svm_rent_2.deriveAtaPubkey)(ceaAuthority, mint),
+                        recipientAta,
+                        ceaAuthority,
+                        // The PC20 gate guarantees funds.amount > 0 for an export;
+                        // resolveR2Prc20TokenSvm (which defines burnAmount) runs later.
+                        amount: params.funds.amount,
+                        decimals: svmPc20Descriptor.decimals,
+                    });
+                    deliveryUserData = (0, payload_builders_1.encodeSvmExecutePayload)(fields);
+                    deliveryNote = `delivering to recipient ATA ${recipientAta.toBase58()}`;
+                }
+                else {
+                    deliveryNote = `recipient ATA ${recipientAta.toBase58()} missing → CEA ATA`;
                 }
-                (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);
             }
             catch (err) {
-                throw new Error(`Failed to query outbound gas fee: ${err}`);
+                // Delivery is an optimization, not a requirement — funds in the CEA
+                // ATA stay under the sender's control. Never fail the export over it.
+                deliveryNote = `ATA probe failed (${err instanceof Error ? err.message : String(err)}) → CEA ATA`;
             }
         }
-        // --- 203: Execution-account resolution (SVM has a trivial CEA — the
-        // target address IS the CEA, no async lookup needed). Fire the burst
-        // after 202 to keep the progress-hook stream in spec order. ---
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_203_01, targetChain);
-        (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
-        (_f = params.maxPCForGas) !== null && _f !== void 0 ? _f : BigInt(0));
-        (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — outbound request: ${JSON.stringify({
-            recipient: outboundReq.recipient,
-            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)}`);
-        // --- Pre-fetch UEA status — balance is needed for gas value calculation ---
-        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-        const signerChainSvm = ctx.universalSigner.account.chain;
-        const isNativePushEOASvm = (0, helpers_1.isPushChain)(signerChainSvm);
-        // Skip getCode if accountStatusCache already confirmed deployment
-        const deployedHintSvm = (_h = (_g = ctx.accountStatusCache) === null || _g === void 0 ? void 0 : _g.uea) === null || _h === void 0 ? void 0 : _h.deployed;
-        let ueaBalance;
-        let isUEADeployed;
-        if (deployedHintSvm || isNativePushEOASvm) {
-            isUEADeployed = true;
-            ueaBalance = yield ctx.pushClient.getBalance(ueaAddress);
-        }
-        else {
-            const [ueaCode, balance] = yield Promise.all([
-                ctx.pushClient.publicClient.getCode({ address: ueaAddress }),
-                ctx.pushClient.getBalance(ueaAddress),
-            ]);
-            isUEADeployed = ueaCode !== undefined;
-            ueaBalance = balance;
-        }
-        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. 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
-        // easily exceed the UEA's balance. Pre-flight (`runPreflight`) handles
-        // drain protection: an under-funded quote throws cleanly with
-        // `InsufficientUEABalanceError` and no cosmos tx is submitted. The
-        // SVM_NATIVE_VALUE_WARN_THRESHOLD below is telemetry-only; it does NOT
-        // truncate `nativeValueForGas`. v2 may add a hard cap once telemetry
-        // justifies a number — until then the original engineer's pool-skew
-        // warning still applies (capping risks false-positive truncation of
-        // legitimate quotes).
-        const SVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for outer-tx gas
-        let nativeValueForGas = BigInt(0);
-        if (universalCoreAddress && gasFee > BigInt(0)) {
-            // 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: warns by default when UEA cannot cover (nativeValueForGas +
-        // SVM_GAS_RESERVE) or the PRC-20 burn amount; throws only when
-        // options.enforceGasCheck=true.
-        // PRC-20 burn-balance pre-check fires whenever `burnAmount > 0`, regardless
-        // of whether `prc20Token` happens to equal `gasToken`. The gateway's
-        // `sendUniversalTxOutbound` does `transferFrom(user, gateway, burnAmount)`
-        // BEFORE the gas swap, so user must pre-hold `burnAmount` of `prc20Token`
-        // even when it's the same asset as the gas token (verified empirically:
-        // EOA with 77k units of pSOL reverted on-chain when trying to burn 10M).
-        let prc20BalanceR2Svm;
-        if (burnAmount > BigInt(0)) {
-            prc20BalanceR2Svm = yield ctx.pushClient.readContract({
-                address: prc20Token,
-                abi: erc20_evm_1.ERC20_EVM,
-                functionName: 'balanceOf',
-                args: [ueaAddress],
-            });
-        }
-        const requiredNativeBalanceR2Svm = getRequiredNativeBalanceForOutbound(nativeValueForGas, SVM_GAS_RESERVE);
-        const skipFeeLockingR2Svm = shouldSkipFeeLockingForOutbound({
-            isUEADeployed,
-            balance: ueaBalance,
-            nativeValueForGas,
-            gasReserve: SVM_GAS_RESERVE,
-        });
-        (0, preflight_1.runPreflight)({
-            ctx,
-            ueaAddress,
-            ueaBalance,
-            requiredValue: nativeValueForGas,
-            gasReserve: SVM_GAS_RESERVE,
-            pathTag: 'R2_SVM',
-            burnToken: prc20Token,
-            burnAmount,
-            prc20Balance: prc20BalanceR2Svm,
-            enforceGasCheck: ((_j = params.options) === null || _j === void 0 ? void 0 : _j.enforceGasCheck) === true,
-        });
-        // --- Build Push Chain multicalls (approve + sendUniversalTxOutbound) ---
-        // Reuse the same builder as EVM — this part is identical
-        const pushChainMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
-            prc20Token,
-            gasToken,
-            burnAmount,
-            gasFee,
-            nativeValueForGas,
-            gatewayPcAddress,
-            outboundRequest: outboundReq,
+        pc20SvmPayload = (0, export_1.buildPC20ExportPayload)({
+            destinationChain: targetChain,
+            name: svmPc20Descriptor.name,
+            symbol: svmPc20Descriptor.symbol,
+            decimals: svmPc20Descriptor.decimals,
+            destinationUserData: deliveryUserData,
         });
-        (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — Push Chain multicall has ${pushChainMulticalls.length} operations`);
-        // Sum native values from multicall entries for proper fee calculation
-        const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
-        const executeParams = {
-            to: ueaAddress,
-            value: multicallNativeValue, // ensures correct requiredFunds calculation
-            data: pushChainMulticalls,
-            _ueaStatus: {
-                isDeployed: isUEADeployed,
-                nonce: ueaNonce,
-                balance: ueaBalance,
-            },
-            _skipFeeLocking: skipFeeLockingR2Svm,
-            _requiredFundsOverride: requiredNativeBalanceR2Svm,
-        };
-        // Signature request — user is prompted to sign the universal payload.
-        // Emit spec-ordered burst after executeFn returns (sign → verify → broadcast).
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_01);
-        let response;
+        // Outbound recipient: the requested Solana address (0x-hex 32B, already
+        // normalized by the route detector). The validator parses it as a pubkey
+        // for the id=5 TSS message.
+        pc20TargetBytes = targetAddress;
+        (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — PC20 export: wrapper mint ${wrapper.address} ` +
+            `(${wrapper.deployed ? 'exists' : 'first export'}), ${deliveryNote}`);
+    }
+    // --- Determine PRC-20 token and burn amount (chain-local, pre-203) ---
+    const { prc20Token, burnAmount } = resolveR2Prc20TokenSvm(params, targetChain, ctx.pushNetwork, hasSvmExecute);
+    if (params.value && params.value > BigInt(0)) {
+        (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — auto-selected native PRC-20 ${prc20Token} for chain ${targetChain}, amount: ${burnAmount.toString()}`);
+    }
+    else if (!params.funds?.amount && hasSvmExecute) {
+        (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — EXECUTE-only: using PRC-20 ${prc20Token} with zero burn amount`);
+    }
+    // --- 202: Gas estimation (spec-ordered before 203) ---
+    let gasFee = BigInt(0);
+    let protocolFeeSvm = 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 gas quote so the on-chain record
+    // carries a non-zero compute budget the relay can use.
+    let effectiveGasLimit = params.gasLimit ?? BigInt(0);
+    // 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)
+        ? params.funds?.token
+        : undefined;
+    const splMintBase58 = 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 {
-            response = yield executeFn(executeParams);
+            // PC20 exports quote via getPC20ExportGasAndFees — the only quote that
+            // includes first-export overhead (mint + state + ATA rent on Solana).
+            let result = isSvmPc20Export
+                ? await (0, export_1.queryPC20OutboundGasFee)(ctx, prc20Token, effectiveGasLimit, targetChain)
+                : 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: 'executeUoaToCeaSvm',
+                // PC20: id=5 rent floor (CEA ATA + mint/state on first export), and the
+                // bump path must re-quote via getPC20ExportGasAndFees — the default
+                // requote reverts for a token with no PRC20 config.
+                ...(isSvmPc20Export
+                    ? {
+                        pc20: { isFirstExport: svmPc20FirstExport },
+                        requoteFn: (gl) => (0, export_1.queryPC20OutboundGasFee)(ctx, prc20Token, gl, targetChain),
+                    }
+                    : {}),
+            });
+            gasFee = result.gasFee;
+            protocolFeeSvm = result.protocolFee;
+            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 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);
         }
         catch (err) {
-            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_04, err instanceof Error ? err.message : String(err));
-            // Suppress the outer orchestrator catch's 299-02 terminal.
-            ctx._routeTerminalEmitted = true;
-            throw err;
+            throw new Error(`Failed to query outbound gas fee: ${err}`);
         }
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_02);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_03);
-        // R2 broadcast marker (SVM)
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_207, targetChain);
-        // Add chain info to response
-        response.chain = targetChain;
-        response.chainNamespace = (0, helpers_1.getChainNamespace)(targetChain);
-        return response;
+    }
+    // --- 203: Execution-account resolution (SVM has a trivial CEA — the
+    // target address IS the CEA, no async lookup needed). Fire the burst
+    // after 202 to keep the progress-hook stream in spec order. ---
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_203_01, targetChain);
+    (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_2.buildOutboundRequest)(pc20TargetBytes, prc20Token, burnAmount, effectiveGasLimit, pc20SvmPayload, ueaAddress, // revert recipient is the UEA
+    params.maxPCForGas ?? BigInt(0));
+    (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — outbound request: ${JSON.stringify({
+        recipient: outboundReq.recipient,
+        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)}`);
+    // --- Pre-fetch UEA status — balance is needed for gas value calculation ---
+    const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+    const signerChainSvm = ctx.universalSigner.account.chain;
+    const isNativePushEOASvm = (0, helpers_1.isPushChain)(signerChainSvm);
+    // Skip getCode if accountStatusCache already confirmed deployment
+    const deployedHintSvm = ctx.accountStatusCache?.uea?.deployed;
+    let ueaBalance;
+    let isUEADeployed;
+    if (deployedHintSvm || isNativePushEOASvm) {
+        isUEADeployed = true;
+        ueaBalance = await ctx.pushClient.getBalance(ueaAddress);
+    }
+    else {
+        const [ueaCode, balance] = await Promise.all([
+            ctx.pushClient.publicClient.getCode({ address: ueaAddress }),
+            ctx.pushClient.getBalance(ueaAddress),
+        ]);
+        isUEADeployed = ueaCode !== undefined;
+        ueaBalance = balance;
+    }
+    const ueaNonce = (!isUEADeployed || isNativePushEOASvm) ? BigInt(0) : await (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. 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
+    // easily exceed the UEA's balance. Pre-flight (`runPreflight`) handles
+    // drain protection: an under-funded quote throws cleanly with
+    // `InsufficientUEABalanceError` and no cosmos tx is submitted. The
+    // SVM_NATIVE_VALUE_WARN_THRESHOLD below is telemetry-only; it does NOT
+    // truncate `nativeValueForGas`. v2 may add a hard cap once telemetry
+    // justifies a number — until then the original engineer's pool-skew
+    // warning still applies (capping risks false-positive truncation of
+    // legitimate quotes).
+    const SVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for outer-tx gas
+    let nativeValueForGas = BigInt(0);
+    if (universalCoreAddress && gasFee > BigInt(0)) {
+        // 2.2x safety buffer is applied inside estimateNativeValueForSwap so
+        // the function's balance-cap branch bounds the final value correctly.
+        nativeValueForGas = await (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: warns by default when UEA cannot cover (nativeValueForGas +
+    // SVM_GAS_RESERVE) or the PRC-20 burn amount; throws only when
+    // options.enforceGasCheck=true.
+    // PRC-20 burn-balance pre-check fires whenever `burnAmount > 0`, regardless
+    // of whether `prc20Token` happens to equal `gasToken`. The gateway's
+    // `sendUniversalTxOutbound` does `transferFrom(user, gateway, burnAmount)`
+    // BEFORE the gas swap, so user must pre-hold `burnAmount` of `prc20Token`
+    // even when it's the same asset as the gas token (verified empirically:
+    // EOA with 77k units of pSOL reverted on-chain when trying to burn 10M).
+    let prc20BalanceR2Svm;
+    if (burnAmount > BigInt(0)) {
+        prc20BalanceR2Svm = await ctx.pushClient.readContract({
+            address: prc20Token,
+            abi: erc20_evm_1.ERC20_EVM,
+            functionName: 'balanceOf',
+            args: [ueaAddress],
+        });
+    }
+    const requiredNativeBalanceR2Svm = getRequiredNativeBalanceForOutbound(nativeValueForGas, SVM_GAS_RESERVE);
+    const skipFeeLockingR2Svm = shouldSkipFeeLockingForOutbound({
+        isUEADeployed,
+        balance: ueaBalance,
+        nativeValueForGas,
+        gasReserve: SVM_GAS_RESERVE,
+    });
+    (0, preflight_1.runPreflight)({
+        ctx,
+        ueaAddress,
+        ueaBalance,
+        requiredValue: nativeValueForGas,
+        gasReserve: SVM_GAS_RESERVE,
+        pathTag: 'R2_SVM',
+        burnToken: prc20Token,
+        burnAmount,
+        prc20Balance: prc20BalanceR2Svm,
+        enforceGasCheck: params.options?.enforceGasCheck === true,
     });
+    // --- Build Push Chain multicalls (approve + sendUniversalTxOutbound) ---
+    // Reuse the same builder as EVM — this part is identical
+    const pushChainMulticalls = (0, payload_builders_2.buildOutboundApprovalAndCall)({
+        prc20Token,
+        gasToken,
+        burnAmount,
+        gasFee,
+        nativeValueForGas,
+        gatewayPcAddress,
+        outboundRequest: outboundReq,
+    });
+    (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — Push Chain multicall has ${pushChainMulticalls.length} operations`);
+    // Sum native values from multicall entries for proper fee calculation
+    const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => sum + (mc.value ?? BigInt(0)), BigInt(0));
+    const executeParams = {
+        to: ueaAddress,
+        value: multicallNativeValue, // ensures correct requiredFunds calculation
+        data: pushChainMulticalls,
+        _ueaStatus: {
+            isDeployed: isUEADeployed,
+            nonce: ueaNonce,
+            balance: ueaBalance,
+        },
+        _skipFeeLocking: skipFeeLockingR2Svm,
+        _requiredFundsOverride: requiredNativeBalanceR2Svm,
+    };
+    // Signature request — user is prompted to sign the universal payload.
+    // Emit spec-ordered burst after executeFn returns (sign → verify → broadcast).
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_01);
+    let response;
+    try {
+        response = await executeFn(executeParams);
+    }
+    catch (err) {
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_04, err instanceof Error ? err.message : String(err));
+        // Suppress the outer orchestrator catch's 299-02 terminal.
+        ctx._routeTerminalEmitted = true;
+        throw err;
+    }
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_02);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_204_03);
+    // R2 broadcast marker (SVM)
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_207, targetChain);
+    // Add chain info to response
+    response.chain = targetChain;
+    response.chainNamespace = (0, helpers_1.getChainNamespace)(targetChain);
+    return response;
 }
 // ---------------------------------------------------------------------------
 // executeCeaToPush  (Route 3 — EVM)
@@ -855,319 +1060,381 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
  * 2. Execute via Route 2 (UOA -> CEA) with PAYLOAD-only (CEA uses its own funds)
  * 3. CEA executes multicall, Gateway locks funds, relayer mints PRC-20 on Push Chain
  */
-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, _k, _l, _m, _o;
-        // 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');
-        }
-        const sourceChain = params.from.chain;
-        // SVM chains use a fundamentally different flow (gateway self-call, not CEA multicall)
-        if ((0, payload_builders_1.isSvmChain)(sourceChain)) {
-            return executeCeaToPushSvm(ctx, params, sourceChain, executeFn);
-        }
-        // 2. Extract destination on Push Chain
-        // For Route 3, 'to' is a Push Chain address (string), not a ChainTarget
-        const pushDestination = params.to;
-        if (typeof params.to !== 'string') {
-            throw new Error('Route 3 (CEA -> Push): to must be a Push Chain address (string), not a ChainTarget');
-        }
-        // 3. Get UEA address (will be recipient on Push Chain from CEA's perspective)
-        // 4. Get CEA address on source chain
-        // Both happen before the 301 hook fires — wrap them so a pre-sign RPC
-        // failure produces a descriptive message in the subsequent 399-02 body
-        // instead of a bare "failed to fetch" surface.
-        let ueaAddress;
-        let ceaAddress;
-        let ceaDeployed;
-        try {
-            ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
-            const ceaResult = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_b = ctx.rpcUrls[sourceChain]) === null || _b === void 0 ? void 0 : _b[0]);
-            ceaAddress = ceaResult.cea;
-            ceaDeployed = ceaResult.isDeployed;
-        }
-        catch (err) {
-            throw new Error(`Route 3 setup failed: could not resolve CEA on ${sourceChain}: ${err instanceof Error ? err.message : String(err)}`);
-        }
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_301, sourceChain, ceaAddress);
-        (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.
-        // 6. Build multicall for CEA to execute on source chain (self-calls via sendUniversalTxToUEA)
-        const ceaMulticalls = [];
-        // Determine token and amount for sendUniversalTxToUEA
-        let tokenAddress = selectors_1.ZERO_ADDRESS;
-        let amount = BigInt(0);
-        if ((_c = params.funds) === null || _c === void 0 ? void 0 : _c.amount) {
-            // ERC20 token transfer from CEA
-            const token = params.funds.token;
-            if (token) {
-                if (token.mechanism === 'native') {
-                    // Native token (e.g., BNB on BSC)
-                    tokenAddress = selectors_1.ZERO_ADDRESS;
-                    amount = params.funds.amount;
-                }
-                else {
-                    // ERC20 token. CEA handles gateway approval internally around sendUniversalTxToUEA.
-                    tokenAddress = token.address;
-                    amount = params.funds.amount;
-                }
-            }
-        }
-        else if (params.value && params.value > BigInt(0)) {
-            // Native value transfer (e.g., BNB, ETH)
-            tokenAddress = selectors_1.ZERO_ADDRESS;
-            amount = params.value;
-        }
-        // bridgeAmount = only the burn amount (what the Vault will actually deposit to CEA).
-        // Previously this included ceaExistingBalance (CEA's pre-existing balance on the
-        // external chain), but that approach is racy: the balance can change between the SDK
-        // query and relay execution, causing sendUniversalTxToUEA to revert with
-        // InsufficientBalance. Pre-existing CEA funds remain parked and can be swept separately.
-        const bridgeAmount = amount;
-        // 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;
-        let ueaNonce;
-        const deployedHintR3 = (_e = (_d = ctx.accountStatusCache) === null || _d === void 0 ? void 0 : _d.uea) === null || _e === void 0 ? void 0 : _e.deployed;
-        if (deployedHintR3) {
-            isUEADeployed = true;
-            ueaNonce = yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress);
-        }
-        else {
-            const ueaCode = yield ctx.pushClient.publicClient.getCode({ address: ueaAddress });
-            isUEADeployed = ueaCode !== undefined;
-            ueaNonce = isUEADeployed ? yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress) : BigInt(0);
-        }
-        // Build payload for Push Chain execution (if any)
-        // This is what happens AFTER funds arrive on Push Chain.
-        // The relay expects a full UniversalPayload struct (to, value, data, gasLimit, ...),
-        // where `data` contains the multicall payload (with UEA_MULTICALL_SELECTOR prefix).
-        let pushPayload = '0x';
-        if ((0, data_utils_1.hasExecutablePayloadData)(params.data) ||
-            (((_f = params.funds) === null || _f === void 0 ? void 0 : _f.amount) && ((_g = params.value) !== null && _g !== void 0 ? _g : BigInt(0)) > BigInt(0))) {
-            const multicallData = (0, payload_builders_1.buildExecuteMulticall)({
-                execute: {
-                    to: pushDestination,
-                    value: params.value,
-                    data: params.data,
-                },
-                ueaAddress,
-                allowSelfValueCall: true,
-            });
-            const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, pushDestination, multicallData);
-            // Use ueaNonce + 1: the outbound tx itself consumes one nonce via execute(),
-            // 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 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)
-        tokenAddress, // token: address(0) for native, ERC20 address otherwise
-        bridgeAmount, // amount: burn amount only (Vault-deposited)
-        pushPayload, // payload: Push Chain execution payload
-        ueaAddress // revertRecipient: UEA on Push Chain (receives refund if inbound fails)
-        );
-        ceaMulticalls.push(sendUniversalTxCall);
-        // 7. Encode CEA multicalls into outbound payload
-        // CEA will self-execute this multicall (to=CEA, value=0)
-        const ceaPayload = (0, payload_builders_1.buildCeaMulticallPayload)(ceaMulticalls);
-        (0, context_1.printLog)(ctx, `executeCeaToPush — CEA payload (first 100 chars): ${ceaPayload.slice(0, 100)}...`);
-        // 8. Determine PRC-20 token for the outbound relay.
-        // Route 3: ALWAYS use native PRC-20 for chain namespace lookup + gas fees.
-        // The CEA uses its OWN pre-existing balance on the external chain to bridge
-        // tokens back — no PRC-20 burn is needed on Push Chain.
-        // burnAmount = 0 makes this a payload-only outbound relay.
-        //
-        // Previously this burned pUSDT/pToken equal to the bridge amount, which failed
-        // because the UEA never holds pUSDT — the whole point of Route 3 is to get
-        // 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 = (_h = params.gasLimit) !== null && _h !== void 0 ? _h : 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)
-        // recipient = CEA address (for self-execution), value = 0 in payload
-        let outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, // recipient: 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)
-        outboundGasLimit, ceaPayload, // payload: ABI-encoded CEA multicall
-        ueaAddress, // revertRecipient: UEA
-        (_j = params.maxPCForGas) !== null && _j !== void 0 ? _j : BigInt(0));
-        (0, context_1.printLog)(ctx, `executeCeaToPush — outbound request: ${JSON.stringify({
-            recipient: outboundReq.recipient,
-            token: outboundReq.token,
-            amount: outboundReq.amount.toString(),
-            gasLimit: outboundReq.gasLimit.toString(),
-            maxPCForGas: outboundReq.maxPCForGas.toString(),
-            payloadLength: outboundReq.payload.length,
-            revertRecipient: outboundReq.revertRecipient,
-        }, null, 2)}`);
-        // 10. Fetch UEA balance — needed for gas value calculation
-        // (UEA code + nonce already fetched above for the inbound UniversalPayload)
-        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-        const ueaBalance = yield ctx.pushClient.getBalance(ueaAddress);
-        // 11. Query gas fees from UniversalCore
-        let gasFee = BigInt(0);
-        let protocolFeeR3 = BigInt(0);
-        let nativeValueForGas = BigInt(0);
-        let gasToken = selectors_1.ZERO_ADDRESS;
-        let sizingDecisionR3;
-        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, outboundGasLimit, sourceChain);
-                gasToken = result.gasToken;
-                gasFee = result.gasFee;
-                protocolFeeR3 = result.protocolFee;
-                nativeValueForGas = result.nativeValueForGas;
-                sizingDecisionR3 = result.sizing;
-                outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, (_k = params.maxPCForGas) !== null && _k !== void 0 ? _k : BigInt(0));
-                (0, context_1.printLog)(ctx, `executeCeaToPush — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${(_m = (_l = result.sizing) === null || _l === void 0 ? void 0 : _l.category) !== null && _m !== void 0 ? _m : 'legacy'}`);
-                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_02, sourceChain, protocolFeeR3, gasFee);
-            }
-            catch (err) {
-                throw new Error(`Failed to query outbound gas fee for Route 3: ${err}`);
-            }
-        }
-        // Account-resolution checkpoint fires before the gas-sizing sub-hook so
-        // consumers see the full account-resolution phase (303-xx) complete before
-        // the sizing decision is surfaced.
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_01, sourceChain);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_02, ueaAddress, ceaAddress, sourceChain);
-        if (sizingDecisionR3) {
-            fireSizingHook(ctx, 'R3', sourceChain, sizingDecisionR3);
-        }
-        // R3 Case C: unlike R2, R3 has no destination funds-delivery semantic
-        // (CEA self-executes and bridges funds BACK to Push Chain). When the
-        // sizer returns Case C, we simply top up msg.value with the overflow so
-        // `swapAndBurnGas` can afford the full gas cost on destination. No
-        // bridge-swap entries, no fold-in — contract refunds any excess.
-        if ((sizingDecisionR3 === null || sizingDecisionR3 === void 0 ? void 0 : sizingDecisionR3.category) === 'C' &&
-            sizingDecisionR3.overflowNativePc > BigInt(0)) {
-            const bumped = nativeValueForGas + sizingDecisionR3.overflowNativePc;
-            (0, context_1.printLog)(ctx, `executeCeaToPush — Case C: bumping nativeValueForGas from ${nativeValueForGas} to ${bumped} (overflow=${sizingDecisionR3.overflowNativePc})`);
-            nativeValueForGas = bumped;
-        }
-        // Adjust nativeValueForGas using UEA balance (contract refunds excess)
-        // Reuse ueaBalance from line 978 — no tx sent between, balance is stable
-        const currentBalance = ueaBalance;
-        // Cosmos-EVM tx overhead costs ~1 PC per operation; 3 PC covers approve(s) + buffer.
-        const OUTBOUND_GAS_RESERVE_R3 = BigInt(3e18);
-        const ROUTE3_MINIMUM_DEPOSIT_USD = utils_1.Utils.helpers.parseUnits('10', 8); // $10
-        // For fresh wallets: predict post-fee-locking UPC balance using the same
-        // Uniswap V3 quoter the chain uses (pETH → WPC swap), matching Route 2 logic.
-        let effectiveBalance = currentBalance;
-        if (!isUEADeployed && effectiveBalance <= OUTBOUND_GAS_RESERVE_R3) {
-            const signerChain = ctx.universalSigner.account.chain;
-            const ethPrice = yield new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(signerChain);
-            const nativeAmountETH = ethPrice > BigInt(0)
-                ? (ROUTE3_MINIMUM_DEPOSIT_USD * BigInt(1e18) + (ethPrice - BigInt(1))) / ethPrice + BigInt(1)
-                : BigInt(0);
-            if (nativeAmountETH > BigInt(0)) {
-                const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(signerChain, ctx.pushNetwork);
-                const predictedUPC = yield (0, gas_calculator_1.estimateDepositFromLockedNative)(ctx, nativeAmountETH, originPrc20);
-                if (predictedUPC > BigInt(0)) {
-                    effectiveBalance = (predictedUPC * BigInt(90)) / BigInt(100);
-                    (0, context_1.printLog)(ctx, `executeCeaToPush — fresh wallet: Uniswap quote predicts ${predictedUPC.toString()} UPC ` +
-                        `from ${nativeAmountETH.toString()} wei pETH, using ${effectiveBalance.toString()} (90%)`);
-                }
+async function executeCeaToPush(ctx, params, executeFn) {
+    // 1. Validate and extract source chain
+    if (!params.from?.chain) {
+        throw new Error('Route 3 (CEA -> Push) requires from.chain to specify the source CEA chain');
+    }
+    const sourceChain = params.from.chain;
+    // SVM chains use a fundamentally different flow (gateway self-call, not CEA multicall)
+    if ((0, payload_builders_2.isSvmChain)(sourceChain)) {
+        return executeCeaToPushSvm(ctx, params, sourceChain, executeFn);
+    }
+    // 2. Extract destination on Push Chain
+    // For Route 3, 'to' is a Push Chain address (string), not a ChainTarget
+    const pushDestination = params.to;
+    if (typeof params.to !== 'string') {
+        throw new Error('Route 3 (CEA -> Push): to must be a Push Chain address (string), not a ChainTarget');
+    }
+    // 3. Get UEA address (will be recipient on Push Chain from CEA's perspective)
+    // 4. Get CEA address on source chain
+    // Both happen before the 301 hook fires — wrap them so a pre-sign RPC
+    // failure produces a descriptive message in the subsequent 399-02 body
+    // instead of a bare "failed to fetch" surface.
+    let ueaAddress;
+    let ceaAddress;
+    let ceaDeployed;
+    try {
+        ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+        const ceaResult = await (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, ctx.rpcUrls[sourceChain]?.[0]);
+        ceaAddress = ceaResult.cea;
+        ceaDeployed = ceaResult.isDeployed;
+    }
+    catch (err) {
+        throw new Error(`Route 3 setup failed: could not resolve CEA on ${sourceChain}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_301, sourceChain, ceaAddress);
+    (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.
+    // 6. Build multicall for CEA to execute on source chain (self-calls via sendUniversalTxToUEA)
+    const ceaMulticalls = [];
+    // Determine token and amount for sendUniversalTxToUEA
+    let tokenAddress = selectors_1.ZERO_ADDRESS;
+    let amount = BigInt(0);
+    if (params.funds?.amount) {
+        // ERC20 token transfer from CEA
+        const token = params.funds.token;
+        if (token) {
+            if (token.mechanism === 'native') {
+                // Native token (e.g., BNB on BSC)
+                tokenAddress = selectors_1.ZERO_ADDRESS;
+                amount = params.funds.amount;
             }
-        }
-        // Balance-aware *upward* allocation. The previous behaviour silently
-        // clamped to a 200 PC target whenever balance had headroom — which was
-        // a downward clamp when the calibrated value already exceeded 200 PC,
-        // masking under-funded swaps with opaque ExecutionFailed reverts. The
-        // new logic preserves the "consume extra to reduce STF risk" intent for
-        // small calibrated values while never reducing a calibrated value that
-        // happened to land above 200 PC. Down-clamp + zero-balance throws live
-        // in `runPreflight` below.
-        const EVM_NATIVE_VALUE_TARGET_R3 = BigInt(200e18); // 200 UPC target floor
-        if (effectiveBalance > EVM_NATIVE_VALUE_TARGET_R3 + OUTBOUND_GAS_RESERVE_R3) {
-            // Balance can cover the target. Bump nativeValueForGas UP to 200 PC,
-            // but never reduce a calibrated value already above 200.
-            const newValue = nativeValueForGas > EVM_NATIVE_VALUE_TARGET_R3
-                ? nativeValueForGas
-                : EVM_NATIVE_VALUE_TARGET_R3;
-            if (newValue !== nativeValueForGas) {
-                (0, context_1.printLog)(ctx, `executeCeaToPush — adjusting nativeValueForGas UP from ${nativeValueForGas.toString()} to ${newValue.toString()} (EVM_NATIVE_VALUE_TARGET_R3 floor)`);
-                nativeValueForGas = newValue;
+            else {
+                // ERC20 token. CEA handles gateway approval internally around sendUniversalTxToUEA.
+                tokenAddress = token.address;
+                amount = params.funds.amount;
             }
         }
-        // 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. It warns by default and
-        // throws only when options.enforceGasCheck=true.
-        const requiredNativeBalanceR3Evm = getRequiredNativeBalanceForOutbound(nativeValueForGas, OUTBOUND_GAS_RESERVE_R3);
-        const skipFeeLockingR3Evm = shouldSkipFeeLockingForOutbound({
-            isUEADeployed,
-            balance: effectiveBalance,
-            nativeValueForGas,
-            gasReserve: OUTBOUND_GAS_RESERVE_R3,
+    }
+    else if (params.value && params.value > BigInt(0)) {
+        // Native value transfer (e.g., BNB, ETH)
+        tokenAddress = selectors_1.ZERO_ADDRESS;
+        amount = params.value;
+    }
+    // bridgeAmount = only the burn amount (what the Vault will actually deposit to CEA).
+    // Previously this included ceaExistingBalance (CEA's pre-existing balance on the
+    // external chain), but that approach is racy: the balance can change between the SDK
+    // query and relay execution, causing sendUniversalTxToUEA to revert with
+    // InsufficientBalance. Pre-existing CEA funds remain parked and can be swept separately.
+    const bridgeAmount = amount;
+    // 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;
+    let ueaNonce;
+    const isNativePushEOAR3 = (0, helpers_1.isPushChain)(ctx.universalSigner.account.chain);
+    const deployedHintR3 = ctx.accountStatusCache?.uea?.deployed;
+    if (isNativePushEOAR3) {
+        // Native Push accounts execute directly as EOAs. EIP-7702 delegation code
+        // is not a UEA proxy and its executor does not expose the UEA nonce ABI.
+        // Treat the execution account as ready while using no UEA nonce.
+        isUEADeployed = true;
+        ueaNonce = BigInt(0);
+    }
+    else if (deployedHintR3) {
+        isUEADeployed = true;
+        ueaNonce = await (0, uea_manager_1.getUEANonce)(ctx, ueaAddress);
+    }
+    else {
+        const ueaCode = await ctx.pushClient.publicClient.getCode({
+            address: ueaAddress,
         });
-        (0, preflight_1.runPreflight)({
-            ctx,
+        isUEADeployed = ueaCode !== undefined;
+        ueaNonce = isUEADeployed ? await (0, uea_manager_1.getUEANonce)(ctx, ueaAddress) : BigInt(0);
+    }
+    // Build payload for Push Chain execution (if any)
+    // This is what happens AFTER funds arrive on Push Chain.
+    // The relay expects a full UniversalPayload struct (to, value, data, gasLimit, ...),
+    // where `data` contains the multicall payload (with UEA_MULTICALL_SELECTOR prefix).
+    let pushPayload = '0x';
+    // PC20: the chain unlocks the Push-native token to the UEA (unlockPC20 →
+    // in.Recipient, which the CEA sets to its bound UEA), so a funds-only R3
+    // whose destination is NOT the UEA needs a Push-side transfer to forward
+    // it. PRC20 R3 has the same land-on-UEA semantics; PC20 just makes the
+    // forwarding explicit here because the resolved descriptor lets us.
+    const r3Pc20 = params._pc20;
+    // ALWAYS build the forward for PC20 funds — even when the destination is the
+    // UEA itself (an explicit self-transfer). Two reasons:
+    //   1. semantics: the transfer states where funds go instead of relying on
+    //      the unlock's implicit landing spot;
+    //   2. survival: a payload-less PC20 burn produces a selector-only
+    //      raw_payload, which the chain classifies FUNDS_AND_PAYLOAD and then
+    //      hard-fails decoding ("raw_payload decoded to nil" —
+    //      StripSelector yields "0x", the != "" guard admits it). Until that is
+    //      fixed chain-side, an empty R3 PC20 payload bricks the inbound with
+    //      the wrapper already burned.
+    const r3Pc20NeedsForward = r3Pc20?.direction === 'import' && Boolean(params.funds?.amount);
+    if ((0, data_utils_1.hasExecutablePayloadData)(params.data) ||
+        (params.funds?.amount && (params.value ?? BigInt(0)) > BigInt(0)) ||
+        r3Pc20NeedsForward) {
+        const multicallData = (0, payload_builders_2.buildExecuteMulticall)({
+            execute: {
+                to: pushDestination,
+                value: params.value,
+                data: params.data,
+                // Funds + descriptor let the builder emit the Push-native PC20
+                // transfer (its _pc20 branch); omitted for non-PC20 to keep the
+                // existing PRC20 payload byte-identical.
+                ...(r3Pc20NeedsForward
+                    ? { funds: params.funds, _pc20: r3Pc20 }
+                    : {}),
+            },
             ueaAddress,
-            ueaBalance: effectiveBalance,
-            requiredValue: nativeValueForGas,
-            gasReserve: OUTBOUND_GAS_RESERVE_R3,
-            pathTag: 'R3_EVM',
-            enforceGasCheck: ((_o = params.options) === null || _o === void 0 ? void 0 : _o.enforceGasCheck) === true,
+            allowSelfValueCall: true,
         });
-        // 12. Build Push Chain multicalls (approvals + sendUniversalTxOutbound)
-        const pushChainMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
-            prc20Token,
-            gasToken,
-            burnAmount,
-            gasFee,
-            nativeValueForGas,
-            gatewayPcAddress,
-            outboundRequest: outboundReq,
-        });
-        (0, context_1.printLog)(ctx, `executeCeaToPush — Push Chain multicall has ${pushChainMulticalls.length} operations`);
-        // Sum native values from multicall entries for proper fee calculation
-        const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
-        // 13. Execute through the normal execute() flow
-        const executeParams = Object.assign({ to: ueaAddress, value: multicallNativeValue, data: pushChainMulticalls, _ueaStatus: {
-                isDeployed: isUEADeployed,
-                nonce: ueaNonce,
-                balance: ueaBalance,
-            }, _skipFeeLocking: skipFeeLockingR3Evm, _requiredFundsOverride: requiredNativeBalanceR3Evm }, (!skipFeeLockingR3Evm ? { _minimumDepositUsd: ROUTE3_MINIMUM_DEPOSIT_USD } : {}));
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_01);
-        let response;
+        const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, pushDestination, multicallData);
+        // Use ueaNonce + 1: the outbound tx itself consumes one nonce via execute(),
+        // so the inbound will arrive when the UEA nonce is already incremented.
+        pushPayload = (0, payload_builders_2.buildInboundUniversalPayload)(multicallPayload, { nonce: ueaNonce + BigInt(1) });
+    }
+    (0, gate_1.assertPC20ImportHasPayload)(params, pushPayload !== '0x', `Route 3 EVM ${sourceChain}`);
+    // 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_2.buildSendUniversalTxToUEA)(ceaAddress, // to: CEA address (self-call)
+    tokenAddress, // token: address(0) for native, ERC20 address otherwise
+    bridgeAmount, // amount: burn amount only (Vault-deposited)
+    pushPayload, // payload: Push Chain execution payload
+    ueaAddress // revertRecipient: UEA on Push Chain (receives refund if inbound fails)
+    );
+    ceaMulticalls.push(sendUniversalTxCall);
+    // 7. Encode CEA multicalls into outbound payload
+    // CEA will self-execute this multicall (to=CEA, value=0)
+    const ceaPayload = (0, payload_builders_2.buildCeaMulticallPayload)(ceaMulticalls);
+    (0, context_1.printLog)(ctx, `executeCeaToPush — CEA payload (first 100 chars): ${ceaPayload.slice(0, 100)}...`);
+    // 8. Determine PRC-20 token for the outbound relay.
+    // Route 3: ALWAYS use native PRC-20 for chain namespace lookup + gas fees.
+    // The CEA uses its OWN pre-existing balance on the external chain to bridge
+    // tokens back — no PRC-20 burn is needed on Push Chain.
+    // burnAmount = 0 makes this a payload-only outbound relay.
+    //
+    // Previously this burned pUSDT/pToken equal to the bridge amount, which failed
+    // because the UEA never holds pUSDT — the whole point of Route 3 is to get
+    // 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 = params.gasLimit ?? 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)
+    // recipient = CEA address (for self-execution), value = 0 in payload
+    let outboundReq = (0, payload_builders_2.buildOutboundRequest)(ceaAddress, // recipient: 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)
+    outboundGasLimit, ceaPayload, // payload: ABI-encoded CEA multicall
+    ueaAddress, // revertRecipient: UEA
+    params.maxPCForGas ?? BigInt(0));
+    (0, context_1.printLog)(ctx, `executeCeaToPush — outbound request: ${JSON.stringify({
+        recipient: outboundReq.recipient,
+        token: outboundReq.token,
+        amount: outboundReq.amount.toString(),
+        gasLimit: outboundReq.gasLimit.toString(),
+        maxPCForGas: outboundReq.maxPCForGas.toString(),
+        payloadLength: outboundReq.payload.length,
+        revertRecipient: outboundReq.revertRecipient,
+    }, null, 2)}`);
+    // 10. Fetch UEA balance — needed for gas value calculation
+    // (UEA code + nonce already fetched above for the inbound UniversalPayload)
+    const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+    const ueaBalance = await ctx.pushClient.getBalance(ueaAddress);
+    // 11. Query gas fees from UniversalCore
+    let gasFee = BigInt(0);
+    let protocolFeeR3 = BigInt(0);
+    let nativeValueForGas = BigInt(0);
+    let gasToken = selectors_1.ZERO_ADDRESS;
+    let universalCoreAddress;
+    let sizingDecisionR3;
+    if (prc20Token !== selectors_1.ZERO_ADDRESS) {
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_01, sourceChain);
         try {
-            response = yield executeFn(executeParams);
+            const result = await (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, outboundGasLimit, sourceChain);
+            gasToken = result.gasToken;
+            gasFee = result.gasFee;
+            protocolFeeR3 = result.protocolFee;
+            nativeValueForGas = result.nativeValueForGas;
+            universalCoreAddress = result.universalCoreAddress;
+            sizingDecisionR3 = result.sizing;
+            outboundReq = (0, payload_builders_2.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, params.maxPCForGas ?? BigInt(0));
+            (0, context_1.printLog)(ctx, `executeCeaToPush — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${result.sizing?.category ?? 'legacy'}`);
+            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_02, sourceChain, protocolFeeR3, gasFee);
         }
         catch (err) {
-            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_04, err instanceof Error ? err.message : String(err));
-            // Suppress the outer orchestrator catch's 399-02 terminal — 304-04
-            // already surfaced the signature/broadcast failure to the consumer.
-            ctx._routeTerminalEmitted = true;
-            throw err;
+            throw new Error(`Failed to query outbound gas fee for Route 3: ${err}`);
+        }
+    }
+    // Account-resolution checkpoint fires before the gas-sizing sub-hook so
+    // consumers see the full account-resolution phase (303-xx) complete before
+    // the sizing decision is surfaced.
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_01, sourceChain);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_02, ueaAddress, ceaAddress, sourceChain);
+    if (sizingDecisionR3) {
+        fireSizingHook(ctx, 'R3', sourceChain, sizingDecisionR3);
+    }
+    // R3 Case C: unlike R2, R3 has no destination funds-delivery semantic
+    // (CEA self-executes and bridges funds BACK to Push Chain). When the
+    // sizer returns Case C, we simply top up msg.value with the overflow so
+    // `swapAndBurnGas` can afford the full gas cost on destination. No
+    // bridge-swap entries, no fold-in — contract refunds any excess.
+    if (sizingDecisionR3?.category === 'C' &&
+        sizingDecisionR3.overflowNativePc > BigInt(0)) {
+        const bumped = nativeValueForGas + sizingDecisionR3.overflowNativePc;
+        (0, context_1.printLog)(ctx, `executeCeaToPush — Case C: bumping nativeValueForGas from ${nativeValueForGas} to ${bumped} (overflow=${sizingDecisionR3.overflowNativePc})`);
+        nativeValueForGas = bumped;
+    }
+    // The USD sizer can be a few basis points below the executable pool quote
+    // (for example when native Push falls back to the fixed $0.10 PC price).
+    // Because swapAndBurnGas buys an exact gas-token output, even a small
+    // shortfall reverts the entire atomic Push transaction. Floor the category
+    // result with the same live exact-output quote used by Route 2. The quote's
+    // 2.2x buffer is automatically capped to balance - 3 PC when that still
+    // covers the unbuffered swap minimum, and excess is refunded on-chain.
+    if (universalCoreAddress && gasFee > BigInt(0)) {
+        const balanceAvailableForSwap = ueaBalance > protocolFeeR3
+            ? ueaBalance - protocolFeeR3
+            : BigInt(0);
+        const bufferedSwapValue = await (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, balanceAvailableForSwap);
+        const poolFlooredValue = floorR3NativeValueForGas(nativeValueForGas, bufferedSwapValue, protocolFeeR3);
+        if (poolFlooredValue > nativeValueForGas) {
+            (0, context_1.printLog)(ctx, `executeCeaToPush — bumping nativeValueForGas ${nativeValueForGas.toString()} → ${poolFlooredValue.toString()} ` +
+                `(live exact-output pool floor, bufferedSwap=${bufferedSwapValue.toString()}, protocolFee=${protocolFeeR3.toString()})`);
+            nativeValueForGas = poolFlooredValue;
         }
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_02);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_03);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_307, sourceChain);
-        // Add Route 3 context to response
-        response.chain = sourceChain;
-        const chainInfo = chain_1.CHAIN_INFO[sourceChain];
-        response.chainNamespace = `${chain_1.VM_NAMESPACE[chainInfo.vm]}:${chainInfo.chainId}`;
-        // R3 inbound round-trip tracking: enable only when funds actually flow
-        // back (amount > 0). Payload-only R3 has no child inbound UTX on Push
-        // Chain, so polling would hang until timeout — skip the inbound block
-        // for amount == 0.
-        //
-        // Child-utxId correlation uses the universal-tx-detector's deterministic
-        // sha256(caip:txHash:logIndex) derivation (see inbound-tracker.ts
-        // findChildUtxIdFromExternalTx), with the original cosmos
-        // `universal_tx_created.inbound_tx_hash` search kept as a fallback.
-        response._expectsInboundRoundTrip = amount > BigInt(0);
-        return response;
+    }
+    // Adjust nativeValueForGas using UEA balance (contract refunds excess)
+    // Reuse ueaBalance from line 978 — no tx sent between, balance is stable
+    const currentBalance = ueaBalance;
+    // Cosmos-EVM tx overhead costs ~1 PC per operation; 3 PC covers approve(s) + buffer.
+    const OUTBOUND_GAS_RESERVE_R3 = BigInt(3e18);
+    const ROUTE3_MINIMUM_DEPOSIT_USD = utils_1.Utils.helpers.parseUnits('10', 8); // $10
+    // For fresh wallets: predict post-fee-locking UPC balance using the same
+    // Uniswap V3 quoter the chain uses (pETH → WPC swap), matching Route 2 logic.
+    let effectiveBalance = currentBalance;
+    if (!isUEADeployed && effectiveBalance <= OUTBOUND_GAS_RESERVE_R3) {
+        const signerChain = ctx.universalSigner.account.chain;
+        const ethPrice = await new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(signerChain);
+        const nativeAmountETH = ethPrice > BigInt(0)
+            ? (ROUTE3_MINIMUM_DEPOSIT_USD * BigInt(1e18) + (ethPrice - BigInt(1))) / ethPrice + BigInt(1)
+            : BigInt(0);
+        if (nativeAmountETH > BigInt(0)) {
+            const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(signerChain, ctx.pushNetwork);
+            const predictedUPC = await (0, gas_calculator_1.estimateDepositFromLockedNative)(ctx, nativeAmountETH, originPrc20);
+            if (predictedUPC > BigInt(0)) {
+                effectiveBalance = (predictedUPC * BigInt(90)) / BigInt(100);
+                (0, context_1.printLog)(ctx, `executeCeaToPush — fresh wallet: Uniswap quote predicts ${predictedUPC.toString()} UPC ` +
+                    `from ${nativeAmountETH.toString()} wei pETH, using ${effectiveBalance.toString()} (90%)`);
+            }
+        }
+    }
+    // Balance-aware *upward* allocation. The previous behaviour silently
+    // clamped to a 200 PC target whenever balance had headroom — which was
+    // a downward clamp when the calibrated value already exceeded 200 PC,
+    // masking under-funded swaps with opaque ExecutionFailed reverts. The
+    // new logic preserves the "consume extra to reduce STF risk" intent for
+    // small calibrated values while never reducing a calibrated value that
+    // happened to land above 200 PC. Down-clamp + zero-balance throws live
+    // in `runPreflight` below.
+    const EVM_NATIVE_VALUE_TARGET_R3 = BigInt(200e18); // 200 UPC target floor
+    if (effectiveBalance > EVM_NATIVE_VALUE_TARGET_R3 + OUTBOUND_GAS_RESERVE_R3) {
+        // Balance can cover the target. Bump nativeValueForGas UP to 200 PC,
+        // but never reduce a calibrated value already above 200.
+        const newValue = nativeValueForGas > EVM_NATIVE_VALUE_TARGET_R3
+            ? nativeValueForGas
+            : EVM_NATIVE_VALUE_TARGET_R3;
+        if (newValue !== nativeValueForGas) {
+            (0, context_1.printLog)(ctx, `executeCeaToPush — adjusting nativeValueForGas UP from ${nativeValueForGas.toString()} to ${newValue.toString()} (EVM_NATIVE_VALUE_TARGET_R3 floor)`);
+            nativeValueForGas = newValue;
+        }
+    }
+    // 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. It warns by default and
+    // throws only when options.enforceGasCheck=true.
+    const requiredNativeBalanceR3Evm = getRequiredNativeBalanceForOutbound(nativeValueForGas, OUTBOUND_GAS_RESERVE_R3);
+    const skipFeeLockingR3Evm = shouldSkipFeeLockingForOutbound({
+        isUEADeployed,
+        balance: effectiveBalance,
+        nativeValueForGas,
+        gasReserve: OUTBOUND_GAS_RESERVE_R3,
     });
+    (0, preflight_1.runPreflight)({
+        ctx,
+        ueaAddress,
+        ueaBalance: effectiveBalance,
+        requiredValue: nativeValueForGas,
+        gasReserve: OUTBOUND_GAS_RESERVE_R3,
+        pathTag: 'R3_EVM',
+        enforceGasCheck: params.options?.enforceGasCheck === true,
+    });
+    // 12. Build Push Chain multicalls (approvals + sendUniversalTxOutbound)
+    const pushChainMulticalls = (0, payload_builders_2.buildOutboundApprovalAndCall)({
+        prc20Token,
+        gasToken,
+        burnAmount,
+        gasFee,
+        nativeValueForGas,
+        gatewayPcAddress,
+        outboundRequest: outboundReq,
+    });
+    (0, context_1.printLog)(ctx, `executeCeaToPush — Push Chain multicall has ${pushChainMulticalls.length} operations`);
+    // Sum native values from multicall entries for proper fee calculation
+    const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => sum + (mc.value ?? BigInt(0)), BigInt(0));
+    // 13. Execute through the normal execute() flow
+    const executeParams = {
+        to: ueaAddress,
+        value: multicallNativeValue, // ensures correct requiredFunds calculation
+        data: pushChainMulticalls,
+        _ueaStatus: {
+            isDeployed: isUEADeployed,
+            nonce: ueaNonce,
+            balance: ueaBalance,
+        },
+        _skipFeeLocking: skipFeeLockingR3Evm,
+        _requiredFundsOverride: requiredNativeBalanceR3Evm,
+        // Ensure fee-locking deposits enough for the outbound swap whenever it is needed.
+        ...(!skipFeeLockingR3Evm ? { _minimumDepositUsd: ROUTE3_MINIMUM_DEPOSIT_USD } : {}),
+    };
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_01);
+    let response;
+    try {
+        response = await executeFn(executeParams);
+    }
+    catch (err) {
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_04, err instanceof Error ? err.message : String(err));
+        // Suppress the outer orchestrator catch's 399-02 terminal — 304-04
+        // already surfaced the signature/broadcast failure to the consumer.
+        ctx._routeTerminalEmitted = true;
+        throw err;
+    }
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_02);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_03);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_307, sourceChain);
+    // Add Route 3 context to response
+    response.chain = sourceChain;
+    const chainInfo = chain_1.CHAIN_INFO[sourceChain];
+    response.chainNamespace = `${chain_1.VM_NAMESPACE[chainInfo.vm]}:${chainInfo.chainId}`;
+    // R3 inbound round-trip tracking: enable only when funds actually flow
+    // back (amount > 0). Payload-only R3 has no child inbound UTX on Push
+    // Chain, so polling would hang until timeout — skip the inbound block
+    // for amount == 0.
+    //
+    // Child-utxId correlation uses the universal-tx-detector's deterministic
+    // sha256(caip:txHash:logIndex) derivation (see inbound-tracker.ts
+    // findChildUtxIdFromExternalTx), with the original cosmos
+    // `universal_tx_created.inbound_tx_hash` search kept as a fallback.
+    response._expectsInboundRoundTrip = amount > BigInt(0);
+    return response;
 }
 // ---------------------------------------------------------------------------
 // executeCeaToPushSvm  (Route 3 — SVM)
@@ -1180,205 +1447,250 @@ function executeCeaToPush(ctx, params, executeFn) {
  * the SVM gateway program (self-call). For funds-bearing calls the outbound
  * request amount must match the drain amount embedded in the instruction data.
  */
-function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        if (typeof params.to !== 'string') {
-            throw new Error('Route 3 SVM (CEA -> Push): to must be a Push Chain address (string), not a ChainTarget');
-        }
-        const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
-        // Get gateway program ID from chain config and convert to 0x-hex 32 bytes
-        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'));
-        (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}`);
-        // Route 3 SVM drains pre-existing funds from the Solana CEA. The Push-side
-        // outbound is a payload relay; do not burn pSOL/pSPL from the UEA for the
-        // drain amount.
-        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([
+async function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
+    if (typeof params.to !== 'string') {
+        throw new Error('Route 3 SVM (CEA -> Push): to must be a Push Chain address (string), not a ChainTarget');
+    }
+    const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+    // Get gateway program ID from chain config and convert to 0x-hex 32 bytes
+    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'));
+    (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}`);
+    // Route 3 SVM drains pre-existing funds from the Solana CEA. The Push-side
+    // outbound is a payload relay; do not burn pSOL/pSPL from the UEA for the
+    // drain amount.
+    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 isNativePushEOAR3Svm = (0, helpers_1.isPushChain)(ctx.universalSigner.account.chain);
+    let isUEADeployed;
+    let ueaNonce;
+    let ueaBalance;
+    if (isNativePushEOAR3Svm) {
+        isUEADeployed = true;
+        ueaNonce = BigInt(0);
+        ueaBalance = await ctx.pushClient.getBalance(ueaAddress);
+    }
+    else {
+        const [ueaCode, balance] = await 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)({
+        isUEADeployed = ueaCode !== undefined;
+        ueaNonce = isUEADeployed ? await (0, uea_manager_1.getUEANonce)(ctx, ueaAddress) : BigInt(0);
+        ueaBalance = balance;
+    }
+    // PC20 CEA burn uses a different self-call than the SPL drain: the payload
+    // targets `send_universal_tx` (not `send_universal_tx_to_uea`) with the
+    // program-enforced account set, and the finalize dispatcher routes it to
+    // route_pc20_burn_from_finalize_cea. The unlocked Push-native token always
+    // lands on the UEA (recipient == push_account is enforced on-chain);
+    // forwarding to a different destination rides in the push payload.
+    const r3SvmPc20 = params._pc20;
+    let svmPayload;
+    if (r3SvmPc20?.direction === 'import' && drainAmount > BigInt(0)) {
+        const mintPk = new web3_js_1.PublicKey(r3SvmPc20.originAddress);
+        const ceaAta = (0, svm_rent_2.deriveAtaPubkey)(ceaPda, mintPk);
+        const extra = buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, ueaNonce + BigInt(1));
+        (0, gate_1.assertPC20ImportHasPayload)(params, Boolean(extra?.length), `Route 3 SVM ${sourceChain}`);
+        const fields = (0, svm_1.buildPC20SvmCeaBurnPayload)({
+            gatewayProgram: programPk,
+            mint: mintPk,
+            ceaAuthority: ceaPda,
+            ceaAta,
+            ueaAddress,
+            amount: drainAmount,
+            pushPayload: extra ?? new Uint8Array(0),
+        });
+        svmPayload = (0, payload_builders_1.encodeSvmExecutePayload)(fields);
+        (0, context_1.printLog)(ctx, `executeCeaToPushSvm — PC20 burn: mint ${mintPk.toBase58()}, ceaAta ${ceaAta.toBase58()}`);
+    }
+    else {
+        svmPayload = (0, payload_builders_2.encodeSvmCeaToUeaPayload)({
             gatewayProgramHex,
             drainAmount,
             tokenMintHex,
             extraPayload: buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, ueaNonce + BigInt(1)),
             revertRecipientHex: ceaPdaHex,
         });
-        (0, payload_builders_1.assertSvmPayloadWithinRelayLimit)(svmPayload, `Route 3 SVM ${sourceChain}`);
-        (0, context_1.printLog)(ctx, `executeCeaToPushSvm — drainAmount: ${drainAmount.toString()}, payload length: ${(svmPayload.length - 2) / 2} bytes`);
-        const burnAmount = BigInt(0);
-        let effectiveGasLimit = (_a = params.gasLimit) !== null && _a !== void 0 ? _a : BigInt(0);
-        // Build outbound request: recipient = gateway program (self-call)
-        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: recipient=${outboundReq.recipient.slice(0, 20)}..., token=${outboundReq.token}, maxPCForGas=${outboundReq.maxPCForGas}`);
-        // Query gas fees
-        let gasFee = BigInt(0);
-        let protocolFeeR3Svm = 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 {
-                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,
-                    pathTag: 'executeCeaToPushSvm',
-                });
-                gasToken = result.gasToken;
-                gasFee = result.gasFee;
-                protocolFeeR3Svm = result.protocolFee;
-                nativeValueForGas = result.nativeValueForGas;
-                sizingDecisionR3Svm = result.sizing;
-                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));
-                (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) {
-                throw new Error(`Failed to query outbound gas fee for SVM Route 3: ${err}`);
-            }
-        }
-        // Account-resolution checkpoint fires before the gas-sizing sub-hook so
-        // consumers see the full account-resolution phase (303-xx) complete before
-        // the sizing decision is surfaced.
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_01, sourceChain);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_02, ueaAddress, lockerContract, sourceChain);
-        if (sizingDecisionR3Svm) {
-            fireSizingHook(ctx, 'R3', sourceChain, sizingDecisionR3Svm);
-        }
-        // R3 SVM Case C: same minimal interpretation as R3 EVM — bump msg.value
-        // by the overflow so swapAndBurnGas can afford the full gas cost. No
-        // bridge-swap entries (R3 has no destination funds-delivery semantic).
-        if ((sizingDecisionR3Svm === null || sizingDecisionR3Svm === void 0 ? void 0 : sizingDecisionR3Svm.category) === 'C' &&
-            sizingDecisionR3Svm.overflowNativePc > BigInt(0)) {
-            const bumped = nativeValueForGas + sizingDecisionR3Svm.overflowNativePc;
-            (0, context_1.printLog)(ctx, `executeCeaToPushSvm — Case C: bumping nativeValueForGas from ${nativeValueForGas} to ${bumped} (overflow=${sizingDecisionR3Svm.overflowNativePc})`);
-            nativeValueForGas = bumped;
-        }
-        // Re-fetch balance to minimize staleness from gas fee query RPC roundtrips.
-        const currentBalance = yield ctx.pushClient.getBalance(ueaAddress);
-        // Cosmos-EVM tx overhead costs ~1 PC per operation; 3 PC covers approve(s) + buffer.
-        const OUTBOUND_GAS_RESERVE_R3_SVM = BigInt(3e18);
-        // Upward-allocation ceiling: cap the upward adjust at max(200 PC, 5x calibrated)
-        // so a UEA with a giant balance doesn't submit msg.value=balance for a small
-        // gas swap. The contract refunds excess via swapAndBurnGas, but pushing
-        // hundreds of thousands of PC into a Uniswap pool moves the price for other
-        // users. 200 PC mirrors EVM's safety cap; 5x calibrated covers pool-skew
-        // scenarios where the calibrated value itself is > 40 PC (5x40 = 200).
-        const UPWARD_BASE_CEILING_R3_SVM = BigInt(200) * BigInt(1e18);
-        const calibratedCeiling = nativeValueForGas * BigInt(5);
-        const upwardCeiling = calibratedCeiling > UPWARD_BASE_CEILING_R3_SVM
-            ? calibratedCeiling
-            : UPWARD_BASE_CEILING_R3_SVM;
-        // Upward-only allocation: when balance has headroom over the calibrated
-        // value, consume more of it (up to the ceiling above). Down-clamp +
-        // zero-balance handling lives in pre-flight.
-        // Ordering note: pre-flight runs AFTER the upward adjust below; the
-        // semantics are equivalent to running it before — when upward adjust
-        // applies it sets nativeValueForGas to balance-reserve (capped), and the
-        // post-adjust pre-flight check is always satisfied. When upward adjust is
-        // skipped (balance too low), pre-flight runs against the calibrated value
-        // and either warns or throws based on options.enforceGasCheck.
-        if (currentBalance > OUTBOUND_GAS_RESERVE_R3_SVM &&
-            currentBalance - OUTBOUND_GAS_RESERVE_R3_SVM > nativeValueForGas) {
-            const balanceDriven = currentBalance - OUTBOUND_GAS_RESERVE_R3_SVM;
-            const adjustedValue = balanceDriven > upwardCeiling ? upwardCeiling : balanceDriven;
-            if (adjustedValue !== nativeValueForGas) {
-                (0, context_1.printLog)(ctx, `executeCeaToPushSvm — adjusting nativeValueForGas from ${nativeValueForGas.toString()} to ${adjustedValue.toString()} ` +
-                    `(UEA balance: ${currentBalance.toString()}, upwardCeiling: ${upwardCeiling.toString()})`);
-                nativeValueForGas = adjustedValue;
-            }
-        }
-        // SVM warn-threshold telemetry (no truncation — pre-flight handles drain protection).
-        (0, preflight_1.maybeFireSvmWarnThreshold)(ctx, nativeValueForGas, gasToken, 'R3_SVM');
-        const requiredNativeBalanceR3Svm = getRequiredNativeBalanceForOutbound(nativeValueForGas, OUTBOUND_GAS_RESERVE_R3_SVM);
-        const skipFeeLockingR3Svm = shouldSkipFeeLockingForOutbound({
-            isUEADeployed,
-            balance: currentBalance,
-            nativeValueForGas,
-            gasReserve: OUTBOUND_GAS_RESERVE_R3_SVM,
-        });
-        // Pre-flight (R3 SVM): no PRC-20 burn check. The drain amount lives in the
-        // embedded Solana instruction and is withdrawn from the external CEA.
-        (0, preflight_1.runPreflight)({
-            ctx,
-            ueaAddress,
-            ueaBalance: currentBalance,
-            requiredValue: nativeValueForGas,
-            gasReserve: OUTBOUND_GAS_RESERVE_R3_SVM,
-            pathTag: 'R3_SVM',
-            enforceGasCheck: ((_f = params.options) === null || _f === void 0 ? void 0 : _f.enforceGasCheck) === true,
-        });
-        // Build Push Chain multicalls (approvals + sendUniversalTxOutbound)
-        const pushChainMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
-            prc20Token,
-            gasToken,
-            burnAmount,
-            gasFee,
-            nativeValueForGas,
-            gatewayPcAddress,
-            outboundRequest: outboundReq,
-        });
-        // Sum native values from multicall entries for proper fee calculation
-        const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
-        // Execute through the normal execute() flow
-        const executeParams = Object.assign({ to: ueaAddress, value: multicallNativeValue, data: pushChainMulticalls, _ueaStatus: {
-                isDeployed: isUEADeployed,
-                nonce: ueaNonce,
-                balance: currentBalance,
-            }, _skipFeeLocking: skipFeeLockingR3Svm, _requiredFundsOverride: requiredNativeBalanceR3Svm }, (!skipFeeLockingR3Svm ? { _minimumDepositUsd: utils_1.Utils.helpers.parseUnits('10', 8) } : {}));
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_01);
-        let response;
+    }
+    (0, payload_builders_2.assertSvmPayloadWithinRelayLimit)(svmPayload, `Route 3 SVM ${sourceChain}`);
+    (0, context_1.printLog)(ctx, `executeCeaToPushSvm — drainAmount: ${drainAmount.toString()}, payload length: ${(svmPayload.length - 2) / 2} bytes`);
+    const burnAmount = BigInt(0);
+    let effectiveGasLimit = params.gasLimit ?? BigInt(0);
+    // Build outbound request: recipient = gateway program (self-call)
+    let outboundReq = (0, payload_builders_2.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, effectiveGasLimit, svmPayload, ueaAddress, params.maxPCForGas ?? BigInt(0));
+    (0, context_1.printLog)(ctx, `executeCeaToPushSvm — outbound request: recipient=${outboundReq.recipient.slice(0, 20)}..., token=${outboundReq.token}, maxPCForGas=${outboundReq.maxPCForGas}`);
+    // Query gas fees
+    let gasFee = BigInt(0);
+    let protocolFeeR3Svm = 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 {
-            response = yield executeFn(executeParams);
+            let result = await (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, outboundReq.gasLimit, sourceChain);
+            result = await (0, svm_rent_1.ensureSvmFinalizeGasBudgetQuote)({
+                ctx,
+                ueaAddress,
+                targetChain: sourceChain,
+                prc20Token,
+                quote: result,
+                splMintBase58: undefined,
+                burnAmount,
+                pathTag: 'executeCeaToPushSvm',
+            });
+            gasToken = result.gasToken;
+            gasFee = result.gasFee;
+            protocolFeeR3Svm = result.protocolFee;
+            nativeValueForGas = result.nativeValueForGas;
+            sizingDecisionR3Svm = result.sizing;
+            effectiveGasLimit = result.gasLimitUsed;
+            outboundReq = (0, payload_builders_2.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, effectiveGasLimit, svmPayload, ueaAddress, params.maxPCForGas ?? BigInt(0));
+            (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=${result.sizing?.category ?? 'legacy'}`);
+            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_02, sourceChain, protocolFeeR3Svm, gasFee);
         }
         catch (err) {
-            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_04, err instanceof Error ? err.message : String(err));
-            // Suppress the outer orchestrator catch's 399-02 terminal.
-            ctx._routeTerminalEmitted = true;
-            throw err;
+            throw new Error(`Failed to query outbound gas fee for SVM Route 3: ${err}`);
         }
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_02);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_03);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_307, sourceChain);
-        // Add Route 3 SVM context to response
-        response.chain = sourceChain;
-        const chainInfo = chain_1.CHAIN_INFO[sourceChain];
-        response.chainNamespace = `${chain_1.VM_NAMESPACE[chainInfo.vm]}:${chainInfo.chainId}`;
-        // 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;
+    }
+    // Account-resolution checkpoint fires before the gas-sizing sub-hook so
+    // consumers see the full account-resolution phase (303-xx) complete before
+    // the sizing decision is surfaced.
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_01, sourceChain);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_02, ueaAddress, lockerContract, sourceChain);
+    if (sizingDecisionR3Svm) {
+        fireSizingHook(ctx, 'R3', sourceChain, sizingDecisionR3Svm);
+    }
+    // R3 SVM Case C: same minimal interpretation as R3 EVM — bump msg.value
+    // by the overflow so swapAndBurnGas can afford the full gas cost. No
+    // bridge-swap entries (R3 has no destination funds-delivery semantic).
+    if (sizingDecisionR3Svm?.category === 'C' &&
+        sizingDecisionR3Svm.overflowNativePc > BigInt(0)) {
+        const bumped = nativeValueForGas + sizingDecisionR3Svm.overflowNativePc;
+        (0, context_1.printLog)(ctx, `executeCeaToPushSvm — Case C: bumping nativeValueForGas from ${nativeValueForGas} to ${bumped} (overflow=${sizingDecisionR3Svm.overflowNativePc})`);
+        nativeValueForGas = bumped;
+    }
+    // Re-fetch balance to minimize staleness from gas fee query RPC roundtrips.
+    const currentBalance = await ctx.pushClient.getBalance(ueaAddress);
+    // Cosmos-EVM tx overhead costs ~1 PC per operation; 3 PC covers approve(s) + buffer.
+    const OUTBOUND_GAS_RESERVE_R3_SVM = BigInt(3e18);
+    // Upward-allocation ceiling: cap the upward adjust at max(200 PC, 5x calibrated)
+    // so a UEA with a giant balance doesn't submit msg.value=balance for a small
+    // gas swap. The contract refunds excess via swapAndBurnGas, but pushing
+    // hundreds of thousands of PC into a Uniswap pool moves the price for other
+    // users. 200 PC mirrors EVM's safety cap; 5x calibrated covers pool-skew
+    // scenarios where the calibrated value itself is > 40 PC (5x40 = 200).
+    const UPWARD_BASE_CEILING_R3_SVM = BigInt(200) * BigInt(1e18);
+    const calibratedCeiling = nativeValueForGas * BigInt(5);
+    const upwardCeiling = calibratedCeiling > UPWARD_BASE_CEILING_R3_SVM
+        ? calibratedCeiling
+        : UPWARD_BASE_CEILING_R3_SVM;
+    // Upward-only allocation: when balance has headroom over the calibrated
+    // value, consume more of it (up to the ceiling above). Down-clamp +
+    // zero-balance handling lives in pre-flight.
+    // Ordering note: pre-flight runs AFTER the upward adjust below; the
+    // semantics are equivalent to running it before — when upward adjust
+    // applies it sets nativeValueForGas to balance-reserve (capped), and the
+    // post-adjust pre-flight check is always satisfied. When upward adjust is
+    // skipped (balance too low), pre-flight runs against the calibrated value
+    // and either warns or throws based on options.enforceGasCheck.
+    if (currentBalance > OUTBOUND_GAS_RESERVE_R3_SVM &&
+        currentBalance - OUTBOUND_GAS_RESERVE_R3_SVM > nativeValueForGas) {
+        const balanceDriven = currentBalance - OUTBOUND_GAS_RESERVE_R3_SVM;
+        const adjustedValue = balanceDriven > upwardCeiling ? upwardCeiling : balanceDriven;
+        if (adjustedValue !== nativeValueForGas) {
+            (0, context_1.printLog)(ctx, `executeCeaToPushSvm — adjusting nativeValueForGas from ${nativeValueForGas.toString()} to ${adjustedValue.toString()} ` +
+                `(UEA balance: ${currentBalance.toString()}, upwardCeiling: ${upwardCeiling.toString()})`);
+            nativeValueForGas = adjustedValue;
+        }
+    }
+    // SVM warn-threshold telemetry (no truncation — pre-flight handles drain protection).
+    (0, preflight_1.maybeFireSvmWarnThreshold)(ctx, nativeValueForGas, gasToken, 'R3_SVM');
+    const requiredNativeBalanceR3Svm = getRequiredNativeBalanceForOutbound(nativeValueForGas, OUTBOUND_GAS_RESERVE_R3_SVM);
+    const skipFeeLockingR3Svm = shouldSkipFeeLockingForOutbound({
+        isUEADeployed,
+        balance: currentBalance,
+        nativeValueForGas,
+        gasReserve: OUTBOUND_GAS_RESERVE_R3_SVM,
     });
+    // Pre-flight (R3 SVM): no PRC-20 burn check. The drain amount lives in the
+    // embedded Solana instruction and is withdrawn from the external CEA.
+    (0, preflight_1.runPreflight)({
+        ctx,
+        ueaAddress,
+        ueaBalance: currentBalance,
+        requiredValue: nativeValueForGas,
+        gasReserve: OUTBOUND_GAS_RESERVE_R3_SVM,
+        pathTag: 'R3_SVM',
+        enforceGasCheck: params.options?.enforceGasCheck === true,
+    });
+    // Build Push Chain multicalls (approvals + sendUniversalTxOutbound)
+    const pushChainMulticalls = (0, payload_builders_2.buildOutboundApprovalAndCall)({
+        prc20Token,
+        gasToken,
+        burnAmount,
+        gasFee,
+        nativeValueForGas,
+        gatewayPcAddress,
+        outboundRequest: outboundReq,
+    });
+    // Sum native values from multicall entries for proper fee calculation
+    const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => sum + (mc.value ?? BigInt(0)), BigInt(0));
+    // Execute through the normal execute() flow
+    const executeParams = {
+        to: ueaAddress,
+        value: multicallNativeValue, // ensures correct requiredFunds calculation
+        data: pushChainMulticalls,
+        _ueaStatus: {
+            isDeployed: isUEADeployed,
+            nonce: ueaNonce,
+            balance: currentBalance,
+        },
+        _skipFeeLocking: skipFeeLockingR3Svm,
+        _requiredFundsOverride: requiredNativeBalanceR3Svm,
+        // Ensure fee-locking deposits enough for the outbound swap whenever it is needed.
+        ...(!skipFeeLockingR3Svm ? { _minimumDepositUsd: utils_1.Utils.helpers.parseUnits('10', 8) } : {}),
+    };
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_01);
+    let response;
+    try {
+        response = await executeFn(executeParams);
+    }
+    catch (err) {
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_04, err instanceof Error ? err.message : String(err));
+        // Suppress the outer orchestrator catch's 399-02 terminal.
+        ctx._routeTerminalEmitted = true;
+        throw err;
+    }
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_02);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_03);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_307, sourceChain);
+    // Add Route 3 SVM context to response
+    response.chain = sourceChain;
+    const chainInfo = chain_1.CHAIN_INFO[sourceChain];
+    response.chainNamespace = `${chain_1.VM_NAMESPACE[chainInfo.vm]}:${chainInfo.chainId}`;
+    // 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;
 }
 // ---------------------------------------------------------------------------
 // executeCeaToCea  (Route 4 — stub)
@@ -1386,13 +1698,11 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
 /**
  * Route 4: Execute CEA to CEA transaction via Push Chain.
  */
-function executeCeaToCea(ctx, params, executeFn) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // CEA -> CEA requires chaining Route 3 (CEA -> Push) and Route 2 (Push -> CEA)
-        // This is a complex flow that requires coordination
-        throw new Error('CEA -> CEA transactions are not yet fully implemented. ' +
-            'Use prepareTransaction() and executeTransactions() to chain Route 3 -> Route 2 manually.');
-    });
+async function executeCeaToCea(ctx, params, executeFn) {
+    // CEA -> CEA requires chaining Route 3 (CEA -> Push) and Route 2 (Push -> CEA)
+    // This is a complex flow that requires coordination
+    throw new Error('CEA -> CEA transactions are not yet fully implemented. ' +
+        'Use prepareTransaction() and executeTransactions() to chain Route 3 -> Route 2 manually.');
 }
 // ---------------------------------------------------------------------------
 // buildPayloadForRoute
@@ -1400,163 +1710,187 @@ function executeCeaToCea(ctx, params, executeFn) {
 /**
  * Build payload for a specific route.
  */
-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, _m, _o, _p, _q;
-        const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
-        switch (route) {
-            case route_detector_1.TransactionRoute.UOA_TO_PUSH: {
-                // Build standard Push Chain payload
-                const executeParams = (0, helpers_1.toExecuteParams)(params);
-                const multicallData = (0, payload_builders_1.buildExecuteMulticall)({
-                    execute: executeParams,
-                    ueaAddress,
-                });
-                const payload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, executeParams.to, multicallData);
-                const req = (0, payload_builder_1.buildUniversalTxRequest)(ctx.universalSigner.account.address, {
-                    recipient: viem_1.zeroAddress,
-                    token: viem_1.zeroAddress,
-                    amount: BigInt(0),
-                    payload,
+async function buildPayloadForRoute(ctx, params, route, nonce) {
+    const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+    switch (route) {
+        case route_detector_1.TransactionRoute.UOA_TO_PUSH: {
+            // Build standard Push Chain payload
+            const executeParams = (0, helpers_1.toExecuteParams)(params);
+            const multicallData = (0, payload_builders_2.buildExecuteMulticall)({
+                execute: (0, gate_1.assertLegacyFunds)(executeParams),
+                ueaAddress,
+            });
+            const payload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, executeParams.to, multicallData);
+            const req = (0, payload_builder_1.buildUniversalTxRequest)(ctx.universalSigner.account.address, {
+                recipient: viem_1.zeroAddress,
+                token: viem_1.zeroAddress,
+                amount: BigInt(0),
+                payload,
+            });
+            return { payload, gatewayRequest: req };
+        }
+        case route_detector_1.TransactionRoute.UOA_TO_CEA: {
+            const target = params.to;
+            // Branch: SVM vs EVM
+            if ((0, payload_builders_2.isSvmChain)(target.chain)) {
+                // SVM: build SVM payload (binary or empty for withdraw) via IDL resolver
+                const { svmPayload: payload, targetBytes, hasExecute, } = (0, build_payload_1.buildSvmPayloadFromParams)({
+                    data: params.data,
+                    to: target,
+                    senderUea: ueaAddress,
                 });
-                return { payload, gatewayRequest: req };
-            }
-            case route_detector_1.TransactionRoute.UOA_TO_CEA: {
-                const target = params.to;
-                // Branch: SVM vs EVM
-                if ((0, payload_builders_1.isSvmChain)(target.chain)) {
-                    // SVM: build SVM payload (binary or empty for withdraw) via IDL resolver
-                    const { svmPayload: payload, targetBytes, hasExecute, } = (0, build_payload_1.buildSvmPayloadFromParams)({
-                        data: params.data,
-                        to: target,
-                        senderUea: ueaAddress,
-                    });
-                    (0, payload_builders_1.assertSvmPayloadWithinRelayLimit)(payload, `Route 2 SVM ${target.chain}`);
-                    let prc20Token = selectors_1.ZERO_ADDRESS;
-                    let burnAmount = BigInt(0);
-                    if ((_a = params.funds) === null || _a === void 0 ? void 0 : _a.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)(target.chain, ctx.pushNetwork);
-                        burnAmount = params.value;
-                    }
-                    else if (hasExecute) {
-                        prc20Token = (0, helpers_1.getNativePRC20ForChain)(target.chain, ctx.pushNetwork);
-                        burnAmount = BigInt(0);
+                (0, payload_builders_2.assertSvmPayloadWithinRelayLimit)(payload, `Route 2 SVM ${target.chain}`);
+                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;
                     }
-                    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, (_d = ctx.rpcUrls[target.chain]) === null || _d === void 0 ? void 0 : _d[0]);
-                const payload = buildR2CeaPayloadEvm(params, ceaAddress, target.address, target.chain, ctx.pushNetwork);
-                const { prc20Token, burnAmount } = resolveR2Prc20TokenEvm(params, target.chain, ctx.pushNetwork);
-                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, (_e = params.gasLimit) !== null && _e !== void 0 ? _e : BigInt(0), payload, ueaAddress, (_f = params.maxPCForGas) !== null && _f !== void 0 ? _f : BigInt(0));
+                else if (params.value && params.value > BigInt(0)) {
+                    prc20Token = (0, helpers_1.getNativePRC20ForChain)(target.chain, ctx.pushNetwork);
+                    burnAmount = params.value;
+                }
+                else if (hasExecute) {
+                    prc20Token = (0, helpers_1.getNativePRC20ForChain)(target.chain, ctx.pushNetwork);
+                    burnAmount = BigInt(0);
+                }
+                const outboundReq = (0, payload_builders_2.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, params.gasLimit ?? BigInt(0), payload, ueaAddress, params.maxPCForGas ?? BigInt(0));
                 return { payload, gatewayRequest: outboundReq };
             }
-            case route_detector_1.TransactionRoute.CEA_TO_PUSH: {
-                // Route 3: CEA -> Push Chain
-                // Build CEA multicall (sendUniversalTxToUEA self-call) and wrap in outbound
-                if (!((_g = params.from) === null || _g === void 0 ? void 0 : _g.chain)) {
-                    throw new Error('Route 3 (CEA -> Push) requires from.chain');
+            // EVM path: Resolve CEA address first (needed for self-transfer check)
+            const { cea: ceaAddress } = await (0, cea_utils_1.getCEAAddress)(ueaAddress, target.chain, ctx.rpcUrls[target.chain]?.[0]);
+            const payload = buildR2CeaPayloadEvm(params, ceaAddress, target.address, target.chain, ctx.pushNetwork);
+            const { prc20Token, burnAmount } = resolveR2Prc20TokenEvm(params, target.chain, ctx.pushNetwork);
+            const targetBytes = payload === '0x'
+                ? selectors_1.ZERO_ADDRESS
+                : ceaAddress;
+            (0, payload_builders_2.assertCeaFundsParkingInvariant)(targetBytes, payload);
+            const outboundReq = (0, payload_builders_2.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, params.gasLimit ?? BigInt(0), payload, ueaAddress, params.maxPCForGas ?? BigInt(0));
+            return { payload, gatewayRequest: outboundReq };
+        }
+        case route_detector_1.TransactionRoute.CEA_TO_PUSH: {
+            // Route 3: CEA -> Push Chain
+            // Build CEA multicall (sendUniversalTxToUEA self-call) and wrap in outbound
+            if (!params.from?.chain) {
+                throw new Error('Route 3 (CEA -> Push) requires from.chain');
+            }
+            const sourceChain = params.from.chain;
+            const pushDestination = params.to;
+            // SVM chains use gateway self-call, not CEA multicall
+            if ((0, payload_builders_2.isSvmChain)(sourceChain)) {
+                const lockerContract = chain_1.CHAIN_INFO[sourceChain].lockerContract;
+                if (!lockerContract) {
+                    throw new Error(`No SVM gateway program configured for chain ${sourceChain}`);
                 }
-                const sourceChain = params.from.chain;
-                const pushDestination = params.to;
-                // SVM chains use gateway self-call, not 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'));
-                    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);
-                    const ceaPdaHex2 = ('0x' + Buffer.from(ceaPda2.toBytes()).toString('hex'));
-                    const svmPayload = (0, payload_builders_1.encodeSvmCeaToUeaPayload)({
+                const programPk = new web3_js_1.PublicKey(lockerContract);
+                const gatewayProgramHex = ('0x' + Buffer.from(programPk.toBytes()).toString('hex'));
+                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);
+                const ceaPdaHex2 = ('0x' + Buffer.from(ceaPda2.toBytes()).toString('hex'));
+                const extraPayload = buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, nonce + BigInt(1));
+                (0, gate_1.assertPC20ImportHasPayload)(params, Boolean(extraPayload?.length), `Prepared Route 3 SVM ${sourceChain}`);
+                const r3SvmPc20 = params._pc20;
+                let svmPayload;
+                if ((0, gate_1.isPC20ImportWithFunds)(params) && r3SvmPc20) {
+                    const mintPk = new web3_js_1.PublicKey(r3SvmPc20.originAddress);
+                    const fields = (0, svm_1.buildPC20SvmCeaBurnPayload)({
+                        gatewayProgram: programPk,
+                        mint: mintPk,
+                        ceaAuthority: ceaPda2,
+                        ceaAta: (0, svm_rent_2.deriveAtaPubkey)(ceaPda2, mintPk),
+                        ueaAddress,
+                        amount: drainAmount,
+                        pushPayload: extraPayload ?? new Uint8Array(0),
+                    });
+                    svmPayload = (0, payload_builders_1.encodeSvmExecutePayload)(fields);
+                }
+                else {
+                    svmPayload = (0, payload_builders_2.encodeSvmCeaToUeaPayload)({
                         gatewayProgramHex,
                         drainAmount,
                         tokenMintHex,
-                        extraPayload: buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, nonce + BigInt(1)),
+                        extraPayload,
                         revertRecipientHex: ceaPdaHex2,
                     });
-                    (0, payload_builders_1.assertSvmPayloadWithinRelayLimit)(svmPayload, `Route 3 SVM ${sourceChain}`);
-                    // Payload-only outbound: drain amount lives inside ixData.
-                    const burnAmount = BigInt(0);
-                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, (_h = params.gasLimit) !== null && _h !== void 0 ? _h : BigInt(0), svmPayload, ueaAddress, (_j = params.maxPCForGas) !== null && _j !== void 0 ? _j : BigInt(0));
-                    return { payload: svmPayload, gatewayRequest: outboundReq };
                 }
-                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_k = ctx.rpcUrls[sourceChain]) === null || _k === void 0 ? void 0 : _k[0]);
-                // CEA auto-deploys on-chain: Vault.finalizeUniversalTx calls CEAFactory.deployCEA()
-                // if CEA doesn't exist yet. No SDK-side blocking needed.
-                // Build CEA multicalls (self-calls via sendUniversalTxToUEA)
-                const ceaMulticalls = [];
-                let tokenAddress = selectors_1.ZERO_ADDRESS;
-                let amount = BigInt(0);
-                if ((_l = params.funds) === null || _l === void 0 ? void 0 : _l.amount) {
-                    const token = params.funds.token;
-                    if (token) {
-                        if (token.mechanism === 'native') {
-                            tokenAddress = selectors_1.ZERO_ADDRESS;
-                            amount = params.funds.amount;
-                        }
-                        else {
-                            tokenAddress = token.address;
-                            amount = params.funds.amount;
-                        }
+                (0, payload_builders_2.assertSvmPayloadWithinRelayLimit)(svmPayload, `Route 3 SVM ${sourceChain}`);
+                // Payload-only outbound: drain amount lives inside ixData.
+                const burnAmount = BigInt(0);
+                const outboundReq = (0, payload_builders_2.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, params.gasLimit ?? BigInt(0), svmPayload, ueaAddress, params.maxPCForGas ?? BigInt(0));
+                return { payload: svmPayload, gatewayRequest: outboundReq };
+            }
+            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.
+            // Build CEA multicalls (self-calls via sendUniversalTxToUEA)
+            const ceaMulticalls = [];
+            let tokenAddress = selectors_1.ZERO_ADDRESS;
+            let amount = BigInt(0);
+            if (params.funds?.amount) {
+                const token = params.funds.token;
+                if (token) {
+                    if (token.mechanism === 'native') {
+                        tokenAddress = selectors_1.ZERO_ADDRESS;
+                        amount = params.funds.amount;
+                    }
+                    else {
+                        tokenAddress = token.address;
+                        amount = params.funds.amount;
                     }
                 }
-                else if (params.value && params.value > BigInt(0)) {
-                    tokenAddress = selectors_1.ZERO_ADDRESS;
-                    amount = params.value;
-                }
-                // Fetch UEA nonce for inbound UniversalPayload
-                const ueaCodeHop = yield ctx.pushClient.publicClient.getCode({ address: ueaAddress });
-                const ueaNonceHop = ueaCodeHop !== undefined ? yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress) : BigInt(0);
-                // Build Push Chain payload (what executes after inbound arrives)
-                // Wrap in UniversalPayload struct for the relay.
-                let pushPayload = '0x';
-                if ((0, data_utils_1.hasExecutablePayloadData)(params.data) ||
-                    (((_m = params.funds) === null || _m === void 0 ? void 0 : _m.amount) && ((_o = params.value) !== null && _o !== void 0 ? _o : BigInt(0)) > BigInt(0))) {
-                    const multicallData = (0, payload_builders_1.buildExecuteMulticall)({
-                        execute: {
-                            to: pushDestination,
-                            value: params.value,
-                            data: params.data,
-                        },
-                        ueaAddress,
-                        allowSelfValueCall: true,
-                    });
-                    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. 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);
-                const prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
-                // 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 outboundGasLimit = (_p = params.gasLimit) !== null && _p !== void 0 ? _p : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
-                const outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, (_q = params.maxPCForGas) !== null && _q !== void 0 ? _q : BigInt(0));
-                return { payload: ceaPayload, gatewayRequest: outboundReq };
             }
-            default:
-                throw new Error(`Cannot build payload for route: ${route}`);
+            else if (params.value && params.value > BigInt(0)) {
+                tokenAddress = selectors_1.ZERO_ADDRESS;
+                amount = params.value;
+            }
+            // prepareTransaction already resolved the correct nonce semantics. For a
+            // native Push EOA this is zero; for an external-origin account it is the
+            // current UEA nonce. Do not reclassify EIP-7702 code as a deployed UEA.
+            const ueaNonceHop = nonce;
+            // Build Push Chain payload (what executes after inbound arrives)
+            // Wrap in UniversalPayload struct for the relay.
+            let pushPayload = '0x';
+            const r3Pc20 = params._pc20;
+            const r3Pc20NeedsForward = (0, gate_1.isPC20ImportWithFunds)(params);
+            if ((0, data_utils_1.hasExecutablePayloadData)(params.data) ||
+                (params.funds?.amount && (params.value ?? BigInt(0)) > BigInt(0)) ||
+                r3Pc20NeedsForward) {
+                const multicallData = (0, payload_builders_2.buildExecuteMulticall)({
+                    execute: {
+                        to: pushDestination,
+                        value: params.value,
+                        data: params.data,
+                        ...(r3Pc20NeedsForward
+                            ? { funds: params.funds, _pc20: r3Pc20 }
+                            : {}),
+                    },
+                    ueaAddress,
+                    allowSelfValueCall: true,
+                });
+                const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, pushDestination, multicallData);
+                pushPayload = (0, payload_builders_2.buildInboundUniversalPayload)(multicallPayload, { nonce: ueaNonceHop + BigInt(1) });
+            }
+            (0, gate_1.assertPC20ImportHasPayload)(params, pushPayload !== '0x', `Prepared Route 3 EVM ${sourceChain}`);
+            // 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_2.buildSendUniversalTxToUEA)(ceaAddress, tokenAddress, amount, pushPayload, ceaAddress);
+            ceaMulticalls.push(sendCall);
+            const ceaPayload = (0, payload_builders_2.buildCeaMulticallPayload)(ceaMulticalls);
+            const prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
+            // 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 outboundGasLimit = params.gasLimit ?? selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
+            const outboundReq = (0, payload_builders_2.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, params.maxPCForGas ?? BigInt(0));
+            return { payload: ceaPayload, gatewayRequest: outboundReq };
         }
-    });
+        default:
+            throw new Error(`Cannot build payload for route: ${route}`);
+    }
 }
 //# sourceMappingURL=route-handlers.js.map