@pushchain/core 5.1.5-alpha.1 → 5.1.6

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

@@ -26,6 +26,7 @@ const tslib_1 = require("tslib");
 const web3_js_1 = require("@solana/web3.js");
 const viem_1 = require("viem");
 const context_1 = require("./context");
+const progress_hook_types_1 = require("../../progress-hook/progress-hook.types");
 const helpers_1 = require("./helpers");
 const payload_builder_1 = require("./payload-builder");
 const uea_manager_1 = require("./uea-manager");
@@ -40,6 +41,152 @@ const payload_builders_1 = 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");
+// =============================================================================
+// Route 2 (UEA → CEA) phase helpers
+// =============================================================================
+/**
+ * Decide which PRC-20 token to burn on Push Chain and how much of it to burn
+ * for a Route 2 EVM outbound call. Chain-local — does NOT require a resolved
+ * 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) {
+        // Migration is logic-only — no funds. CEA rejects msg.value != 0.
+        prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, pushNetwork);
+        burnAmount = BigInt(0);
+    }
+    else if ((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) {
+        // User explicitly specified funds with token
+        const token = params.funds.token;
+        if (token) {
+            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+            burnAmount = params.funds.amount;
+        }
+    }
+    else if (params.value && params.value > BigInt(0)) {
+        // Native value transfer: auto-select the PRC-20 token for target chain
+        prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, pushNetwork);
+        burnAmount = params.value;
+    }
+    else if (params.data) {
+        // PAYLOAD-only (no value transfer): still need native token for chain namespace + gas fees
+        prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, pushNetwork);
+        burnAmount = BigInt(0);
+    }
+    return { prc20Token, burnAmount };
+}
+/**
+ * SVM counterpart to `resolveR2Prc20TokenEvm`. SVM adds an EXECUTE-only
+ * branch (no value, no funds, but `hasSvmExecute === true`) that still needs
+ * 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) {
+        const token = params.funds.token;
+        if (token) {
+            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+            burnAmount = params.funds.amount;
+        }
+    }
+    else if (params.value && params.value > BigInt(0)) {
+        prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, pushNetwork);
+        burnAmount = params.value;
+    }
+    else if (hasSvmExecute) {
+        const token = params.funds && params.funds.token;
+        if (token) {
+            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+        }
+        else {
+            prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, pushNetwork);
+        }
+        burnAmount = BigInt(0);
+    }
+    return { prc20Token, burnAmount };
+}
+/**
+ * Build the CEA-side multicall payload for a Route 2 EVM outbound. Needs the
+ * resolved `ceaAddress` because the native-value self-call branch skips the
+ * multicall when the target IS the CEA (avoids a CEA._handleMulticall revert).
+ */
+function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress) {
+    var _a, _b;
+    if (params.migration) {
+        return (0, payload_builders_1.buildMigrationPayload)();
+    }
+    const ceaMulticalls = [];
+    if (params.data) {
+        if (Array.isArray(params.data)) {
+            ceaMulticalls.push(...params.data);
+        }
+        else {
+            // When ERC-20 funds are provided with a single payload, auto-prepend a
+            // transfer() call so the tokens minted to the CEA are forwarded to the
+            // target address. Mirrors the Route 1 behavior in buildExecuteMulticall.
+            if ((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) {
+                const token = params.funds.token;
+                if (token && token.mechanism !== 'native') {
+                    const erc20Transfer = (0, viem_1.encodeFunctionData)({
+                        abi: erc20_evm_1.ERC20_EVM,
+                        functionName: 'transfer',
+                        args: [targetAddress, params.funds.amount],
+                    });
+                    ceaMulticalls.push({
+                        to: token.address,
+                        value: BigInt(0),
+                        data: erc20Transfer,
+                    });
+                }
+            }
+            // Single call with data. Forward native value (if any) so the target
+            // contract receives it alongside the payload call.
+            ceaMulticalls.push({
+                to: targetAddress,
+                value: (_b = params.value) !== null && _b !== void 0 ? _b : BigInt(0),
+                data: params.data,
+            });
+        }
+    }
+    else if (params.value) {
+        // Native value transfer only. Skip the multicall when sending to the CEA
+        // itself — a value-bearing self-call would revert in CEA._handleMulticall.
+        if (targetAddress.toLowerCase() !== ceaAddress.toLowerCase()) {
+            ceaMulticalls.push({
+                to: targetAddress,
+                value: params.value,
+                data: '0x',
+            });
+        }
+    }
+    return (0, payload_builders_1.buildCeaMulticallPayload)(ceaMulticalls);
+}
+const SIZER_HOOK_BY_ROUTE = {
+    R3: {
+        A: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_03_01,
+        B: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_03_02,
+        C: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_03_03,
+    },
+};
+/**
+ * Fire the route-scoped sizing progress hook based on the sizer's decision.
+ * Emits the consumer-facing shape { gasRequired, extraDepositPC, totalDepositUSD, chain }.
+ * - gasRequired   = sizer's gas leg in native PC wei
+ * - extraDepositPC = overflow in native PC wei (> 0 only for Case C)
+ * - totalDepositUSD = sized total in USD (8-dec): $1 for Case A (padded),
+ *   raw gasUsd for Case B/C (which for Case C equals gasLegUsd + overflowUsd).
+ */
+function fireSizingHook(ctx, route, chain, sizing) {
+    const hook = SIZER_HOOK_BY_ROUTE[route][sizing.category];
+    const ONE_USD_8D = BigInt(100000000);
+    const totalDepositUSD = sizing.category === 'A' ? ONE_USD_8D : sizing.gasUsd;
+    (0, context_1.fireProgressHook)(ctx, hook, chain, sizing.gasLegNativePc, sizing.overflowNativePc, totalDepositUSD);
+}
 // ---------------------------------------------------------------------------
 // executeMultiChain
 // ---------------------------------------------------------------------------
@@ -100,7 +247,7 @@ function executeMultiChain(ctx, params, executeFn) {
  */
 function executeUoaToCea(ctx, params, executeFn) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         const target = params.to;
         const targetChain = target.chain;
         const targetAddress = target.address;
@@ -137,100 +284,63 @@ function executeUoaToCea(ctx, params, executeFn) {
             return executeUoaToCeaSvm(ctx, params, target, executeFn);
         }
         // ===== EVM path (existing logic) =====
-        // Get UEA address
+        // 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}`);
-        // Get CEA address for this UEA on target chain
-        const { cea: ceaAddress, isDeployed: ceaDeployed } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, targetChain, (_a = ctx.rpcUrls[targetChain]) === null || _a === void 0 ? void 0 : _a[0]);
-        (0, context_1.printLog)(ctx, `executeUoaToCea — CEA address: ${ceaAddress}, deployed: ${ceaDeployed}`);
-        // Migration path: raw MIGRATION_SELECTOR payload, no multicall wrapping
-        let ceaPayload;
-        let prc20Token = selectors_1.ZERO_ADDRESS;
-        let burnAmount = BigInt(0);
-        if (params.migration) {
-            ceaPayload = (0, payload_builders_1.buildMigrationPayload)();
-            prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
-            burnAmount = BigInt(0); // Migration is logic-only — no funds. CEA rejects msg.value != 0.
-            (0, context_1.printLog)(ctx, `executeUoaToCea — MIGRATION: using raw MIGRATION_SELECTOR payload (${ceaPayload}), native PRC-20 ${prc20Token}`);
+        // --- 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 {
-            // Build multicall for CEA execution on target chain
-            const ceaMulticalls = [];
-            // If there's data to execute on target
-            if (params.data) {
-                if (Array.isArray(params.data)) {
-                    // User provided explicit multicall array
-                    ceaMulticalls.push(...params.data);
-                }
-                else {
-                    // When ERC-20 funds are provided with a single payload, auto-prepend a
-                    // transfer() call so the tokens minted to the CEA are forwarded to the
-                    // target address. This mirrors the Route 1 behavior in buildExecuteMulticall.
-                    if ((_b = params.funds) === null || _b === void 0 ? void 0 : _b.amount) {
-                        const token = params.funds.token;
-                        if (token && token.mechanism !== 'native') {
-                            const erc20Transfer = (0, viem_1.encodeFunctionData)({
-                                abi: erc20_evm_1.ERC20_EVM,
-                                functionName: 'transfer',
-                                args: [targetAddress, params.funds.amount],
-                            });
-                            ceaMulticalls.push({
-                                to: token.address,
-                                value: BigInt(0),
-                                data: erc20Transfer,
-                            });
-                        }
-                    }
-                    // Single call with data. Forward native value (if any) so the target
-                    // contract receives it alongside the payload call. The vault deposits
-                    // native value to the CEA, and the multicall forwards it to the target.
-                    ceaMulticalls.push({
-                        to: targetAddress,
-                        value: (_c = params.value) !== null && _c !== void 0 ? _c : BigInt(0),
-                        data: params.data,
-                    });
-                }
-            }
-            else if (params.value) {
-                // Native value transfer only.
-                // If sending to the CEA itself, skip the multicall — the gateway deposits native
-                // value directly to CEA. A self-call with value would revert (CEA._handleMulticall
-                // rejects value-bearing self-calls).
-                if (targetAddress.toLowerCase() !== ceaAddress.toLowerCase()) {
-                    ceaMulticalls.push({
-                        to: targetAddress,
-                        value: params.value,
-                        data: '0x',
-                    });
-                }
-            }
-            // Build CEA multicall payload (this is what gets executed on the external chain)
-            ceaPayload = (0, payload_builders_1.buildCeaMulticallPayload)(ceaMulticalls);
-            // Determine token to burn on Push Chain
-            // NOTE: Even for PAYLOAD-only (no value), we need a valid PRC-20 token to:
-            // 1. Look up the target chain namespace in the gateway
-            // 2. Query and pay gas fees for the relay
-            if ((_d = params.funds) === null || _d === void 0 ? void 0 : _d.amount) {
-                // User explicitly specified funds with token
-                const token = params.funds.token;
-                if (token) {
-                    prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
-                    burnAmount = params.funds.amount;
-                }
-            }
-            else if (params.value && params.value > BigInt(0)) {
-                // Native value transfer: auto-select the PRC-20 token for target chain
-                prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
-                burnAmount = params.value;
-                (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) && params.data) {
+            (0, context_1.printLog)(ctx, `executeUoaToCea — PAYLOAD-only: using native PRC-20 ${prc20Token} for chain ${targetChain} with zero burn amount`);
+        }
+        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);
             }
-            else if (params.data) {
-                // PAYLOAD-only (no value transfer): still need native token for chain namespace + gas fees
-                prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
-                burnAmount = BigInt(0);
-                (0, context_1.printLog)(ctx, `executeUoaToCea — PAYLOAD-only: using native PRC-20 ${prc20Token} for chain ${targetChain} with zero burn amount`);
+            catch (err) {
+                throw new Error(`Failed to query outbound gas fee: ${err}`);
             }
         }
+        // --- 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);
+        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
         // NOTE: `target` is a LEGACY/DUMMY parameter for contract compatibility.
         // The deployed UniversalGatewayPC still expects this field, but the relay does NOT use it
@@ -238,7 +348,7 @@ function executeUoaToCea(ctx, params, executeFn) {
         // SOURCE_CHAIN_NAMESPACE. We pass the CEA address as a non-zero placeholder.
         // This field will be removed in future contract upgrades.
         const targetBytes = ceaAddress; // Dummy value - any non-zero address works
-        const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, (_e = params.gasLimit) !== null && _e !== void 0 ? _e : BigInt(0), ceaPayload, ueaAddress // revert recipient is the UEA
+        const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, gasLimitForQuery, ceaPayload, ueaAddress // revert recipient is the UEA
         );
         (0, context_1.printLog)(ctx, `executeUoaToCea — outbound request: ${JSON.stringify({
             target: outboundReq.target,
@@ -250,55 +360,32 @@ function executeUoaToCea(ctx, params, executeFn) {
         }, null, 2)}`);
         // Get UniversalGatewayPC address
         const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-        // Pre-fetch UEA status early — balance is needed for gas value calculation
-        const signerChain = ctx.universalSigner.account.chain;
-        const isNativePushEOA = (0, helpers_1.isPushChain)(signerChain);
-        const [ueaCode, ueaBalance] = yield Promise.all([
-            ctx.pushClient.publicClient.getCode({ address: ueaAddress }),
-            ctx.pushClient.getBalance(ueaAddress),
-        ]);
-        const isUEADeployed = isNativePushEOA || ueaCode !== undefined;
-        const ueaNonce = (!isUEADeployed || isNativePushEOA) ? BigInt(0) : yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress);
         // 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 = [];
-        // Query gas fee from UniversalCore contract (needed for approval amount)
-        let gasFee = BigInt(0);
-        let nativeValueForGas = BigInt(0);
-        let gasToken = selectors_1.ZERO_ADDRESS;
-        let universalCoreAddress;
-        if (prc20Token !== selectors_1.ZERO_ADDRESS) {
-            try {
-                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, outboundReq.gasLimit);
-                gasFee = result.gasFee;
-                gasToken = result.gasToken;
-                nativeValueForGas = result.nativeValueForGas;
-                universalCoreAddress = result.universalCoreAddress;
-                (0, context_1.printLog)(ctx, `executeUoaToCea — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}`);
-            }
-            catch (err) {
-                throw new Error(`Failed to query outbound gas fee: ${err}`);
-            }
-        }
-        // Balance-aware adjustment: MAXIMIZE nativeValueForGas within available balance.
-        // The contract's swapAndBurnGas does exactOutputSingle and refunds excess PC,
-        // so overshooting within balance is safe. Undershooting causes the swap to revert.
-        const EVM_NATIVE_VALUE_TARGET = BigInt(200e18); // 200 UPC
-        const EVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for tx overhead
+        // ---------------------------------------------------------------------
+        // 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
-        // Determine effective balance for the adjustment.
-        // For deployed UEAs: use real balance.
-        // For fresh wallets: predict the post-fee-locking balance by querying the same
-        // Uniswap V3 quoter the chain uses (pETH → WPC swap in execute_inbound_gas.go).
+        // Effective balance: real for deployed UEAs; predicted post-fee-lock for fresh.
         let effectiveBalance = ueaBalance;
         if (!isUEADeployed && effectiveBalance <= EVM_GAS_RESERVE) {
-            // Calculate the ETH amount lockFee will send (same formula as lockFee)
             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)) {
-                // Query the real swap quote: how much WPC (UPC) for this pETH amount?
                 const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(signerChain, ctx.pushNetwork);
                 const predictedUPC = yield (0, gas_calculator_1.estimateDepositFromLockedNative)(ctx, nativeAmountETH, originPrc20);
                 if (predictedUPC > BigInt(0)) {
@@ -309,15 +396,35 @@ function executeUoaToCea(ctx, params, executeFn) {
                 }
             }
         }
+        // Pool-quote + 10% safety buffer. Over-send is refunded by the contract.
+        let nativeValueForGas = BigInt(0);
+        if (universalCoreAddress && gasFee > BigInt(0)) {
+            const estimated = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, effectiveBalance);
+            nativeValueForGas = (estimated * BigInt(110)) / BigInt(100);
+            (0, context_1.printLog)(ctx, `executeUoaToCea — nativeValueForGas: pool-quote=${estimated.toString()}, with 10% buffer=${nativeValueForGas.toString()}`);
+        }
+        // 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;
+        }
         let adjustedValue;
-        if (effectiveBalance > EVM_NATIVE_VALUE_TARGET + EVM_GAS_RESERVE) {
-            adjustedValue = EVM_NATIVE_VALUE_TARGET;
+        if (effectiveBalance >= nativeValueForGas + EVM_GAS_RESERVE) {
+            adjustedValue = nativeValueForGas;
         }
         else if (effectiveBalance > EVM_GAS_RESERVE) {
+            // Balance-starved: send everything we can afford. swapAndBurnGas
+            // refunds unused; undershoot will revert with a concrete error.
             adjustedValue = effectiveBalance - EVM_GAS_RESERVE;
         }
+        else if (effectiveBalance > BigInt(0)) {
+            // Drained UEA: overshoot would return (false, "") and surface as an
+            // opaque ExecutionFailed() — clamp to what we have.
+            adjustedValue = effectiveBalance < nativeValueForGas ? effectiveBalance : nativeValueForGas;
+        }
         else {
-            adjustedValue = nativeValueForGas;
+            throw new Error(`UEA ${ueaAddress} has zero UPC balance; cannot fund outbound gas swap. ` +
+                `Bridge UPC to the UEA before retrying.`);
         }
         if (adjustedValue !== nativeValueForGas) {
             (0, context_1.printLog)(ctx, `executeUoaToCea — adjusting nativeValueForGas from ${nativeValueForGas.toString()} ` +
@@ -370,7 +477,27 @@ function executeUoaToCea(ctx, params, executeFn) {
                 nonce: ueaNonce,
                 balance: ueaBalance,
             }, _skipFeeLocking: isUEADeployed }, (!isUEADeployed ? { _minimumDepositUsd: ROUTE2_MINIMUM_DEPOSIT_USD } : {}));
-        const response = yield executeFn(executeParams);
+        // 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);
@@ -394,6 +521,8 @@ 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,
@@ -404,38 +533,55 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
         if (hasSvmExecute) {
             (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — encoded execute payload: ${(svmPayload.length - 2) / 2} bytes`);
         }
-        // --- Determine PRC-20 token and burn amount ---
-        let prc20Token = selectors_1.ZERO_ADDRESS;
-        let burnAmount = BigInt(0);
-        if ((_c = params.funds) === null || _c === void 0 ? void 0 : _c.amount) {
-            // User explicitly specified funds with token
-            const token = params.funds.token;
-            if (token) {
-                prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
-                burnAmount = params.funds.amount;
-            }
-        }
-        else if (params.value && params.value > BigInt(0)) {
-            // Native value transfer: auto-select pSOL for Solana chains
-            prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
-            burnAmount = params.value;
+        // --- 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 (hasSvmExecute) {
-            // Execute-only (no value): check if user specified an SPL token context
-            const token = params.funds && params.funds.token;
-            if (token) {
-                prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+        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 gasFee/gasPrice response 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);
+        if (prc20Token !== selectors_1.ZERO_ADDRESS) {
+            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_202_01, targetChain);
+            try {
+                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, effectiveGasLimit, targetChain);
+                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=0 from the
+                // on-chain outbound record and uses it as the Solana compute budget — 0 CU means the
+                // relay cannot execute the tx. Derive the effective limit from gasFee/gasPrice so
+                // the stored record has a non-zero compute budget the relay can use.
+                if (!params.gasLimit && result.gasPrice > BigInt(0)) {
+                    effectiveGasLimit = result.gasFee / result.gasPrice;
+                    (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — derived effectiveGasLimit: ${effectiveGasLimit} (gasFee=${result.gasFee} / gasPrice=${result.gasPrice})`);
+                }
+                (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);
             }
-            else {
-                prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.pushNetwork);
+            catch (err) {
+                throw new Error(`Failed to query outbound gas fee: ${err}`);
             }
-            burnAmount = BigInt(0);
-            (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — EXECUTE-only: using PRC-20 ${prc20Token} with zero burn amount`);
         }
+        // --- 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, (_d = params.gasLimit) !== null && _d !== void 0 ? _d : BigInt(0), svmPayload, ueaAddress // revert recipient is the UEA
+        const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, effectiveGasLimit, svmPayload, ueaAddress // revert recipient is the UEA
         );
         (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — outbound request: ${JSON.stringify({
             target: outboundReq.target,
@@ -445,7 +591,7 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
             payloadLength: (outboundReq.payload.length - 2) / 2,
             revertRecipient: outboundReq.revertRecipient,
         }, null, 2)}`);
-        // --- Pre-fetch UEA status early — balance is needed for gas value calculation ---
+        // --- 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);
@@ -466,45 +612,43 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
             ueaBalance = balance;
         }
         const ueaNonce = (!isUEADeployed || isNativePushEOASvm) ? BigInt(0) : yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress);
-        // --- Query gas fee (identical to EVM path) ---
-        let gasFee = BigInt(0);
-        let gasToken = selectors_1.ZERO_ADDRESS;
-        let universalCoreAddress;
+        // R2 does NOT use Case A/B/C gas abstraction (scoped to R1 + R3 only).
+        // Size msg.value from the live WPC/gasToken Uniswap V3 pool quote plus
+        // a 10% safety buffer. swapAndBurnGas refunds the excess as PC via
+        // refundUnusedGas.
+        //
+        // SVM pools (WPC/pSOL) are thinner than EVM pools so the pool-quote can
+        // easily exceed the UEA's balance. Apply a balance-aware clamp so the
+        // outer tx doesn't fail with InsufficientFunds before the swap runs.
+        // No hard safety cap here — pSOL pool skew means even legitimate swaps
+        // can need hundreds of PC; capping would trigger Uniswap STF reverts.
+        const SVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for outer-tx gas
         let nativeValueForGas = BigInt(0);
-        if (prc20Token !== selectors_1.ZERO_ADDRESS) {
-            const gasLimit = outboundReq.gasLimit;
-            try {
-                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit);
-                gasFee = result.gasFee;
-                gasToken = result.gasToken;
-                nativeValueForGas = result.nativeValueForGas;
-                universalCoreAddress = result.universalCoreAddress;
-                // When user omits gasLimit (sent as 0), the contract computes fees using its internal
-                // baseGasLimitByChainNamespace. But the relay reads the stored gasLimit=0 from the
-                // on-chain outbound record and uses it as the Solana compute budget — 0 CU means the
-                // relay cannot execute the tx. Derive the effective limit from gasFee/gasPrice so
-                // the stored record has a non-zero compute budget the relay can use.
-                if (!params.gasLimit && result.gasPrice > BigInt(0)) {
-                    outboundReq.gasLimit = result.gasFee / result.gasPrice;
-                    (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — derived effectiveGasLimit: ${outboundReq.gasLimit} (gasFee=${result.gasFee} / gasPrice=${result.gasPrice})`);
-                }
-                (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}`);
-            }
-            catch (err) {
-                throw new Error(`Failed to query outbound gas fee: ${err}`);
-            }
-        }
-        // Estimate the actual WPC needed for the swap using on-chain pool price.
-        // The static 1Mx multiplier from queryOutboundGasFee doesn't reflect the real
-        // WPC/gasToken exchange rate. estimateNativeValueForSwap reads the Uniswap V3
-        // pool's slot0, computes the true cost, and adds a 2x buffer.
-        // Excess msg.value is refunded by the contract's swapAndBurnGas.
         if (universalCoreAddress && gasFee > BigInt(0)) {
             const estimated = yield (0, gas_calculator_1.estimateNativeValueForSwap)(ctx, universalCoreAddress, gasToken, gasFee, ueaBalance);
-            if (estimated > nativeValueForGas) {
-                (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — adjusting nativeValueForGas from ${nativeValueForGas.toString()} to ${estimated.toString()} (pool-price estimate, UEA balance: ${ueaBalance.toString()})`);
-                nativeValueForGas = estimated;
-            }
+            nativeValueForGas = (estimated * BigInt(110)) / BigInt(100);
+            (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — nativeValueForGas: pool-quote=${estimated.toString()}, with 10% buffer=${nativeValueForGas.toString()}`);
+        }
+        // Balance-aware clamp: if UEA balance can't cover target + gas reserve,
+        // send only what we can afford. swapAndBurnGas refunds any excess.
+        let adjustedValueSvm;
+        if (ueaBalance >= nativeValueForGas + SVM_GAS_RESERVE) {
+            adjustedValueSvm = nativeValueForGas;
+        }
+        else if (ueaBalance > SVM_GAS_RESERVE) {
+            adjustedValueSvm = ueaBalance - SVM_GAS_RESERVE;
+        }
+        else if (ueaBalance > BigInt(0)) {
+            adjustedValueSvm = ueaBalance < nativeValueForGas ? ueaBalance : nativeValueForGas;
+        }
+        else {
+            throw new Error(`UEA ${ueaAddress} has zero UPC balance; cannot fund outbound gas swap. ` +
+                `Bridge UPC to the UEA before retrying.`);
+        }
+        if (adjustedValueSvm !== nativeValueForGas) {
+            (0, context_1.printLog)(ctx, `executeUoaToCeaSvm — adjusting nativeValueForGas from ${nativeValueForGas.toString()} ` +
+                `to ${adjustedValueSvm.toString()} (UEA balance: ${ueaBalance.toString()})`);
+            nativeValueForGas = adjustedValueSvm;
         }
         // --- Build Push Chain multicalls (approve + sendUniversalTxOutbound) ---
         // Reuse the same builder as EVM — this part is identical
@@ -531,7 +675,23 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
             },
             _skipFeeLocking: isUEADeployed, // skip fee-locking only if UEA is already deployed
         };
-        const response = yield executeFn(executeParams);
+        // 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 = 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.
+            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);
@@ -554,7 +714,7 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
  */
 function executeCeaToPush(ctx, params, executeFn) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         // 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');
@@ -571,9 +731,23 @@ function executeCeaToPush(ctx, params, executeFn) {
             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)
-        const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
         // 4. Get CEA address on source chain
-        const { cea: ceaAddress, isDeployed: ceaDeployed } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_b = ctx.rpcUrls[sourceChain]) === null || _b === void 0 ? void 0 : _b[0]);
+        // 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.
@@ -723,21 +897,46 @@ function executeCeaToPush(ctx, params, executeFn) {
         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) {
             const gasLimit = outboundReq.gasLimit;
+            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_01, sourceChain);
             try {
-                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit);
+                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimit, sourceChain);
                 gasToken = result.gasToken;
                 gasFee = result.gasFee;
+                protocolFeeR3 = result.protocolFee;
                 nativeValueForGas = result.nativeValueForGas;
-                (0, context_1.printLog)(ctx, `executeCeaToPush — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}`);
+                sizingDecisionR3 = result.sizing;
+                (0, context_1.printLog)(ctx, `executeCeaToPush — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${(_h = (_g = result.sizing) === null || _g === void 0 ? void 0 : _g.category) !== null && _h !== void 0 ? _h : 'legacy'}`);
+                (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;
@@ -775,8 +974,15 @@ function executeCeaToPush(ctx, params, executeFn) {
         else if (effectiveBalance > OUTBOUND_GAS_RESERVE_R3) {
             adjustedValue = effectiveBalance - OUTBOUND_GAS_RESERVE_R3;
         }
+        else if (effectiveBalance > BigInt(0)) {
+            // Drained UEA: overshoot would make the inner .call{value:...} return (false, "")
+            // and the UEA reverts with opaque ExecutionFailed(). Clamp to whatever we have so
+            // the gateway swap either succeeds or surfaces a concrete revert reason.
+            adjustedValue = effectiveBalance < nativeValueForGas ? effectiveBalance : nativeValueForGas;
+        }
         else {
-            adjustedValue = nativeValueForGas;
+            throw new Error(`UEA ${ueaAddress} has zero UPC balance; cannot fund outbound gas swap. ` +
+                `Bridge UPC to the UEA before retrying.`);
         }
         if (adjustedValue !== nativeValueForGas) {
             (0, context_1.printLog)(ctx, `executeCeaToPush — adjusting nativeValueForGas from ${nativeValueForGas.toString()} to ${adjustedValue.toString()} (effective balance: ${effectiveBalance.toString()})`);
@@ -801,11 +1007,35 @@ function executeCeaToPush(ctx, params, executeFn) {
                 nonce: ueaNonce,
                 balance: ueaBalance,
             }, _skipFeeLocking: isUEADeployed }, (!isUEADeployed ? { _minimumDepositUsd: ROUTE3_MINIMUM_DEPOSIT_USD } : {}));
-        const response = yield executeFn(executeParams);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_01);
+        let response;
+        try {
+            response = yield 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;
     });
 }
@@ -822,7 +1052,7 @@ function executeCeaToPush(ctx, params, executeFn) {
  */
 function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (typeof params.to !== 'string') {
             throw new Error('Route 3 SVM (CEA -> Push): to must be a Push Chain address (string), not a ChainTarget');
         }
@@ -834,6 +1064,7 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         }
         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}`);
         // Determine drain amount and token
         let drainAmount = BigInt(0);
@@ -889,20 +1120,43 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         const ueaNonce = isUEADeployed ? yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress) : BigInt(0);
         // 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 {
-                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, outboundReq.gasLimit);
+                const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, outboundReq.gasLimit, sourceChain);
                 gasToken = result.gasToken;
                 gasFee = result.gasFee;
+                protocolFeeR3Svm = result.protocolFee;
                 nativeValueForGas = result.nativeValueForGas;
-                (0, context_1.printLog)(ctx, `executeCeaToPushSvm — gasFee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}`);
+                sizingDecisionR3Svm = result.sizing;
+                (0, context_1.printLog)(ctx, `executeCeaToPushSvm — gasFee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${(_d = (_c = result.sizing) === null || _c === void 0 ? void 0 : _c.category) !== null && _d !== void 0 ? _d : 'legacy'}`);
+                (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;
+        }
         // Adjust nativeValueForGas using UEA balance (contract refunds excess)
         // Re-fetch balance to minimize staleness from gas fee query RPC roundtrips
         const currentBalance = yield ctx.pushClient.getBalance(ueaAddress);
@@ -931,11 +1185,31 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
                 nonce: ueaNonce,
                 balance: ueaBalance,
             }, _skipFeeLocking: isUEADeployed }, (!isUEADeployed ? { _minimumDepositUsd: utils_1.Utils.helpers.parseUnits('10', 8) } : {}));
-        const response = yield executeFn(executeParams);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_01);
+        let response;
+        try {
+            response = yield 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 inbound round-trip tracking: enable only when funds flow back
+        // (drainAmount > 0). See the EVM executeCeaToPush note — child-utxId
+        // correlation uses the universal-tx-detector's deterministic derivation.
+        // NOTE: the detector is EVM-only today; SVM source-chain logs can't be
+        // decoded yet, so this branch will fall back to the (broken) cosmos
+        // search. Disable if SVM R3 tests start timing out in CI.
+        response._expectsInboundRoundTrip = drainAmount > BigInt(0);
         return response;
     });
 }