@pushchain/core 6.0.8 → 6.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushchain/core",
-  "version": "6.0.8",
+  "version": "6.0.10",
   "homepage": "https://push.org",
   "keywords": [
     "pushchain",

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

@@ -262,6 +262,12 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                 // Build CEA multicalls
                 const ceaMulticalls = [];
                 const hasData = (0, data_utils_1.hasExecutablePayloadData)(params.data);
+                const fundsToken = ((_h = params.funds) === null || _h === void 0 ? void 0 : _h.amount)
+                    ? (0, route_handlers_1.resolveR2DestinationFundsToken)(params.funds.token, targetChain, ctx.pushNetwork)
+                    : undefined;
+                const nativeFundsValue = ((_j = params.funds) === null || _j === void 0 ? void 0 : _j.amount) && (fundsToken === null || fundsToken === void 0 ? void 0 : fundsToken.mechanism) === 'native'
+                    ? params.funds.amount
+                    : BigInt(0);
                 if (hasData) {
                     if (Array.isArray(params.data)) {
                         ceaMulticalls.push(...params.data);
@@ -270,16 +276,15 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         // 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 ((_h = params.funds) === null || _h === void 0 ? void 0 : _h.amount) {
-                            const token = params.funds.token;
-                            if (token && token.mechanism !== 'native') {
+                        if ((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount) {
+                            if (fundsToken && fundsToken.mechanism !== 'native') {
                                 const erc20Transfer = (0, viem_1.encodeFunctionData)({
                                     abi: erc20_evm_1.ERC20_EVM,
                                     functionName: 'transfer',
                                     args: [target.address, params.funds.amount],
                                 });
                                 ceaMulticalls.push({
-                                    to: token.address,
+                                    to: fundsToken.address,
                                     value: BigInt(0),
                                     data: erc20Transfer,
                                 });
@@ -290,23 +295,20 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         // native value to the CEA, and the multicall forwards it to the target.
                         ceaMulticalls.push({
                             to: target.address,
-                            value: (_j = params.value) !== null && _j !== void 0 ? _j : BigInt(0),
+                            value: ((_l = params.value) !== null && _l !== void 0 ? _l : BigInt(0)) + nativeFundsValue,
                             data: params.data,
                         });
                     }
                 }
                 else {
-                    const token = ((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount)
-                        ? params.funds.token
-                        : undefined;
-                    if (((_l = params.funds) === null || _l === void 0 ? void 0 : _l.amount) && token && token.mechanism !== 'native') {
+                    if (((_m = params.funds) === null || _m === void 0 ? void 0 : _m.amount) && fundsToken && fundsToken.mechanism !== 'native') {
                         const erc20Transfer = (0, viem_1.encodeFunctionData)({
                             abi: erc20_evm_1.ERC20_EVM,
                             functionName: 'transfer',
                             args: [target.address, params.funds.amount],
                         });
                         ceaMulticalls.push({
-                            to: token.address,
+                            to: fundsToken.address,
                             value: BigInt(0),
                             data: erc20Transfer,
                         });
@@ -322,11 +324,11 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                             });
                         }
                     }
-                    else if (((_m = params.funds) === null || _m === void 0 ? void 0 : _m.amount) && (token === null || token === void 0 ? void 0 : token.mechanism) === 'native') {
+                    else if (nativeFundsValue > BigInt(0)) {
                         if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
                             ceaMulticalls.push({
                                 to: target.address,
-                                value: params.funds.amount,
+                                value: nativeFundsValue,
                                 data: '0x',
                             });
                         }
@@ -442,8 +444,8 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         effectiveGasLimit = result.gasLimitUsed;
                     }
                     return Object.assign(Object.assign({}, baseDescriptor), { sourceChain, ceaAddress: ceaPdaHex, isSvmTarget: true, prc20Token, 
-                        // Route 3 is payload-only on Push: the drain amount lives inside the
-                        // SVM payload. Burning here would require the UEA to pre-hold pSOL.
+                        // Route 3 drains pre-existing funds from the external CEA. The
+                        // Push-side outbound is a payload relay, so no PRC-20 is burned.
                         burnAmount: BigInt(0), gasToken,
                         gasFee,
                         gasPrice, gasLimit: effectiveGasLimit, sizing });
@@ -781,7 +783,7 @@ function getInboundFundingForBurnToken(segments, beforeSegmentIndex, burnToken,
 }
 function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         let accumulatedPushMulticalls = [];
         let requiredNativeValue = BigInt(0);
         const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
@@ -964,12 +966,10 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                             : (firstHop === null || firstHop === void 0 ? void 0 : firstHop.ceaAddress) || ueaAddress;
                         (0, payload_builders_1.assertCeaFundsParkingInvariant)(targetForOutbound, outboundPayload);
                     }
-                    // Per-segment PRC-20 burn-balance pre-check (cascade R2-style segments
-                    // only — INBOUND_FROM_CEA segments are payload-only with totalBurnAmount=0
-                    // per the 2026-03-19 fix). Skip MIGRATION (totalBurnAmount=0). Fires
-                    // whenever burnAmount > 0 even when burn token equals gas token — the
-                    // gateway's transferFrom happens BEFORE the gas swap, so user must
-                    // pre-hold the burn amount.
+                    // Per-segment PRC-20 burn-balance pre-check. Fires whenever
+                    // burnAmount > 0 even when burn token equals gas token — the gateway's
+                    // transferFrom happens BEFORE the gas swap, so user must pre-hold the
+                    // burn amount.
                     const segBurnAmount = segment.totalBurnAmount || BigInt(0);
                     const segBurnToken = segment.prc20Token;
                     if (segBurnAmount > BigInt(0) && segBurnToken && !isMigration) {
@@ -1026,7 +1026,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         }
                     }
                     // Build outbound request
-                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetForOutbound, segment.prc20Token || selectors_1.ZERO_ADDRESS, segment.totalBurnAmount || BigInt(0), (_e = segment.gasLimit) !== null && _e !== void 0 ? _e : BigInt(0), outboundPayload, ueaAddress, (_f = segment.maxPCForGas) !== null && _f !== void 0 ? _f : BigInt(0), (_g = segment.gasPrice) !== null && _g !== void 0 ? _g : BigInt(0));
+                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetForOutbound, segment.prc20Token || selectors_1.ZERO_ADDRESS, segment.totalBurnAmount || BigInt(0), (_e = segment.gasLimit) !== null && _e !== void 0 ? _e : BigInt(0), outboundPayload, ueaAddress, (_f = segment.maxPCForGas) !== null && _f !== void 0 ? _f : BigInt(0));
                     // Build approval + outbound multicalls
                     const segGasFee = segment.gasFee || BigInt(0);
                     const svmOverride = svmNativeValueBySegment.get(segment);
@@ -1043,7 +1043,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                     else {
                         evmFallbackValue = segGasFee * BigInt(1000000);
                     }
-                    let nativeValueForGas = (_h = svmOverride !== null && svmOverride !== void 0 ? svmOverride : perOutboundNativeValue) !== null && _h !== void 0 ? _h : evmFallbackValue;
+                    let nativeValueForGas = (_g = svmOverride !== null && svmOverride !== void 0 ? svmOverride : perOutboundNativeValue) !== null && _g !== void 0 ? _g : evmFallbackValue;
                     // SDK 5.2 Case C: when the segment's sizing is category C, compose
                     // R2/OUTBOUND_TO_CEA segments no longer apply Case A/B/C sizing
                     // (scoped to R1 + R3 only). segment.sizing may still be populated
@@ -1084,7 +1084,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                     // UEA multicall so no nested outbound is needed.
                     const mergedHopMulticalls = [];
                     for (const h of segment.hops) {
-                        if ((0, data_utils_1.hasExecutablePayloadData)((_j = h === null || h === void 0 ? void 0 : h.params) === null || _j === void 0 ? void 0 : _j.data) || ((_k = h === null || h === void 0 ? void 0 : h.params) === null || _k === void 0 ? void 0 : _k.value)) {
+                        if ((0, data_utils_1.hasExecutablePayloadData)((_h = h === null || h === void 0 ? void 0 : h.params) === null || _h === void 0 ? void 0 : _h.data) || ((_j = h === null || h === void 0 ? void 0 : h.params) === null || _j === void 0 ? void 0 : _j.value)) {
                             const hopCalls = (0, payload_builders_1.buildExecuteMulticall)({
                                 execute: {
                                     to: h.params.to,
@@ -1105,18 +1105,18 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         ];
                     }
                     // Primary hop carries the sourceChain / CEA address (shared across merged hops).
-                    const hop0 = segment.hops[0];
+                    const hop = segment.hops[0];
+                    const sourceChain = hop.sourceChain;
+                    const ceaAddress = hop.ceaAddress || ueaAddress;
                     let intermediatePayload = '0x';
                     if (accumulatedPushMulticalls.length > 0) {
                         const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, ueaAddress, accumulatedPushMulticalls);
                         // +1: the outbound tx consumes one nonce via execute()
-                        intermediatePayload = (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, {
-                            nonce: (ueaNonce !== null && ueaNonce !== void 0 ? ueaNonce : BigInt(0)) + BigInt(1),
-                        });
+                        const nonce = (ueaNonce !== null && ueaNonce !== void 0 ? ueaNonce : BigInt(0)) + BigInt(1);
+                        intermediatePayload = (0, payload_builders_1.isSvmChain)(sourceChain)
+                            ? (0, payload_builders_1.buildInboundUniversalPayloadSvm)(multicallPayload, { nonce })
+                            : (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, { nonce });
                     }
-                    const hop = segment.hops[0];
-                    const sourceChain = hop.sourceChain;
-                    const ceaAddress = hop.ceaAddress || ueaAddress;
                     // SVM chains: build SVM CPI payload instead of EVM CEA multicall
                     if ((0, payload_builders_1.isSvmChain)(sourceChain)) {
                         const lockerContract = chain_1.CHAIN_INFO[sourceChain].lockerContract;
@@ -1129,7 +1129,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         let drainAmount = BigInt(0);
                         let tokenMintHex;
                         const params = hop.params;
-                        if (((_l = params.funds) === null || _l === void 0 ? void 0 : _l.amount) && params.funds.amount > BigInt(0)) {
+                        if (((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount) && params.funds.amount > BigInt(0)) {
                             drainAmount = params.funds.amount;
                             const token = params.funds.token;
                             if (token && token.address) {
@@ -1158,7 +1158,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         });
                         const svmBurnAmount = segment.totalBurnAmount || BigInt(0);
                         const outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, segment.prc20Token ||
-                            (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), svmBurnAmount, (_m = segment.gasLimit) !== null && _m !== void 0 ? _m : BigInt(0), svmPayload, ueaAddress, (_o = segment.maxPCForGas) !== null && _o !== void 0 ? _o : BigInt(0), (_p = segment.gasPrice) !== null && _p !== void 0 ? _p : BigInt(0));
+                            (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), svmBurnAmount, (_l = segment.gasLimit) !== null && _l !== void 0 ? _l : BigInt(0), svmPayload, ueaAddress, (_m = segment.maxPCForGas) !== null && _m !== void 0 ? _m : BigInt(0));
                         const inboundGasFee = segment.gasFee || BigInt(0);
                         let svmInboundFallback;
                         if (effectiveUeaBalance > BigInt(0)) {
@@ -1172,7 +1172,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         // SDK 5.2 R3-style Case C bump: when the inbound segment's sizing
                         // is C, top up the swap budget by the overflow. No bridge-swap —
                         // R3 has no destination funds delivery.
-                        if (((_q = segment.sizing) === null || _q === void 0 ? void 0 : _q.category) === 'C' &&
+                        if (((_o = segment.sizing) === null || _o === void 0 ? void 0 : _o.category) === 'C' &&
                             segment.sizing.overflowNativePc > BigInt(0)) {
                             const bumped = svmInboundNativeValue + segment.sizing.overflowNativePc;
                             (0, context_1.printLog)(ctx, `composeCascade — INBOUND_FROM_CEA (SVM) Case C: bumping nativeValueForGas from ${svmInboundNativeValue} to ${bumped} (overflow=${segment.sizing.overflowNativePc})`);
@@ -1209,7 +1209,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                     let amount = BigInt(0);
                     for (const mergedHop of segment.hops) {
                         const hParams = mergedHop.params;
-                        if ((_r = hParams.funds) === null || _r === void 0 ? void 0 : _r.amount) {
+                        if ((_p = hParams.funds) === null || _p === void 0 ? void 0 : _p.amount) {
                             const token = hParams.funds.token;
                             if (token) {
                                 if (token.mechanism === 'native') {
@@ -1245,7 +1245,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         ? segment.gasLimit
                         : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
                     const outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, segment.prc20Token ||
-                        (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), segment.totalBurnAmount || BigInt(0), effectiveGasLimit, ceaPayload, ueaAddress, (_s = segment.maxPCForGas) !== null && _s !== void 0 ? _s : BigInt(0), (_t = segment.gasPrice) !== null && _t !== void 0 ? _t : BigInt(0));
+                        (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), segment.totalBurnAmount || BigInt(0), effectiveGasLimit, ceaPayload, ueaAddress, (_q = segment.maxPCForGas) !== null && _q !== void 0 ? _q : BigInt(0));
                     const inboundGasFee = segment.gasFee || BigInt(0);
                     let evmInboundFallback;
                     if (effectiveUeaBalance > BigInt(0)) {
@@ -1259,7 +1259,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                     // SDK 5.2 R3-style Case C bump: when the inbound segment's sizing
                     // is C, top up the swap budget by the overflow. No bridge-swap —
                     // R3 has no destination funds delivery.
-                    if (((_u = segment.sizing) === null || _u === void 0 ? void 0 : _u.category) === 'C' &&
+                    if (((_r = segment.sizing) === null || _r === void 0 ? void 0 : _r.category) === 'C' &&
                         segment.sizing.overflowNativePc > BigInt(0)) {
                         const bumped = evmInboundNativeValue + segment.sizing.overflowNativePc;
                         (0, context_1.printLog)(ctx, `composeCascade — INBOUND_FROM_CEA (EVM) Case C: bumping nativeValueForGas from ${evmInboundNativeValue} to ${bumped} (overflow=${segment.sizing.overflowNativePc})`);

package/src/lib/orchestrator/internals/error-decoder.js

@@ -46,6 +46,12 @@ exports.KNOWN_ERROR_SELECTORS = {
         hint: 'Likely cause: provided gasLimit is below the chain minimum. Omit `gasLimit` to use the per-chain default.',
         provenance: 'Observed in dev (selector source unverified — see plan §9 #5)',
     },
+    '0x05aab006': {
+        name: 'GasPriceBelowBase',
+        hint: 'Likely cause: an explicit outbound gasPrice override is below the current UniversalCore base price. ' +
+            'Omit gasPrice so the gateway resolves the live base price at execution time.',
+        provenance: 'TypesUGPC/UniversalGatewayPC live Route 2 docs e2e, 2026-05-19: gateway tx 0xe1b549eb47c3cbf1abc69ba6e85927832e482147b49a01a0364206098367dbf7.',
+    },
 };
 /** Selector for `Error(string)` (Solidity `require(false, "msg")`). */
 exports.ERROR_STRING_SELECTOR = '0x08c379a0';

package/src/lib/orchestrator/internals/outbound-sync.d.ts

@@ -12,7 +12,7 @@ export declare const OUTBOUND_INITIAL_WAIT_MS = 15000;
 /** Interval between consecutive polls (ms). */
 export declare const OUTBOUND_POLL_INTERVAL_MS = 3000;
 /** Maximum total timeout for the outbound polling loop (ms). */
-export declare const OUTBOUND_MAX_TIMEOUT_MS = 180000;
+export declare const OUTBOUND_MAX_TIMEOUT_MS = 300000;
 /** Maximum total timeout for the R3 inbound round-trip polling loop (ms). */
 export declare const INBOUND_MAX_TIMEOUT_MS = 300000;
 /** Initial wait before the first inbound poll (ms). Validator observation + Push commit + indexer ingestion realistically take 15-25 s on testnet (esp. SVM source), so polling immediately just burns RPC on guaranteed-empty results. */
@@ -49,7 +49,7 @@ export declare class OutboundFailedError extends Error {
  * @internal Used by .wait() for outbound routes - not part of public API.
  * Uses polling with configurable initial wait, interval, and timeout.
  *
- * Default strategy: 15s initial wait, then poll every 3s, 180s total timeout.
+ * Default strategy: 15s initial wait, then poll every 3s, 300s total timeout.
  *
  * @param ctx - Orchestrator context
  * @param pushChainTxHash - The Push Chain transaction hash

package/src/lib/orchestrator/internals/outbound-sync.js

@@ -27,7 +27,7 @@ exports.OUTBOUND_INITIAL_WAIT_MS = 15000; // 15s
 /** Interval between consecutive polls (ms). */
 exports.OUTBOUND_POLL_INTERVAL_MS = 3000; // 3s
 /** Maximum total timeout for the outbound polling loop (ms). */
-exports.OUTBOUND_MAX_TIMEOUT_MS = 180000; // 180s (3 min)
+exports.OUTBOUND_MAX_TIMEOUT_MS = 300000; // 300s (5 min)
 /** Maximum total timeout for the R3 inbound round-trip polling loop (ms). */
 exports.INBOUND_MAX_TIMEOUT_MS = 300000; // 300s (5 min) — covers R3 inbound latency on testnet
 /** Initial wait before the first inbound poll (ms). Validator observation + Push commit + indexer ingestion realistically take 15-25 s on testnet (esp. SVM source), so polling immediately just burns RPC on guaranteed-empty results. */
@@ -75,7 +75,7 @@ exports.OutboundFailedError = OutboundFailedError;
  *
  * Cosmos sometimes populates `observedTx.txHash` while the relayer is still
  * voting on the outboundStatus update. The Push indexer can stay at
- * UNSPECIFIED for the full 180s budget even though the destination tx mined
+ * UNSPECIFIED for the full timeout budget even though the destination tx mined
  * minutes earlier. To avoid those false timeouts we ask the destination
  * chain's own RPC: if it has a confirmed receipt with status=success, we
  * trust it and return FOUND; if status=reverted, we throw OutboundFailedError
@@ -132,7 +132,7 @@ function verifyExternalEvmReceipt(ctx, destinationChain, externalTxHash) {
  * @internal Used by .wait() for outbound routes - not part of public API.
  * Uses polling with configurable initial wait, interval, and timeout.
  *
- * Default strategy: 15s initial wait, then poll every 3s, 180s total timeout.
+ * Default strategy: 15s initial wait, then poll every 3s, 300s total timeout.
  *
  * @param ctx - Orchestrator context
  * @param pushChainTxHash - The Push Chain transaction hash

package/src/lib/orchestrator/internals/route-handlers.d.ts

@@ -15,8 +15,11 @@
  */
 import type { OrchestratorContext } from './context';
 import { CHAIN } from '../../constants/enums';
+import { MoveableToken } from '../../constants/tokens';
 import { TransactionRoute } from '../route-detector';
 import type { ChainTarget, ExecuteParams, UniversalExecuteParams, UniversalOutboundTxRequest, UniversalTxRequest, UniversalTxResponse } from '../orchestrator.types';
+import type { PUSH_NETWORK } from '../../constants/enums';
+export declare function resolveR2DestinationFundsToken(token: MoveableToken, targetChain: CHAIN, pushNetwork: PUSH_NETWORK): MoveableToken;
 type ExecuteFn = (params: ExecuteParams | UniversalExecuteParams) => Promise<UniversalTxResponse>;
 /**
  * Dispatch a universal execution to the correct route handler.
@@ -59,8 +62,8 @@ export declare function executeCeaToPush(ctx: OrchestratorContext, params: Unive
  *
  * Unlike EVM Route 3 which builds CEA multicalls, SVM Route 3 encodes a
  * `send_universal_tx_to_uea` instruction as an execute payload targeting
- * the SVM gateway program (self-call). The drain amount is embedded in
- * the instruction data, not in the outbound request amount.
+ * the SVM gateway program (self-call). For funds-bearing calls the outbound
+ * request amount must match the drain amount embedded in the instruction data.
  */
 export declare function executeCeaToPushSvm(ctx: OrchestratorContext, params: UniversalExecuteParams, sourceChain: CHAIN, executeFn: ExecuteFn): Promise<UniversalTxResponse>;
 /**

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

@@ -15,6 +15,7 @@
  * `executeFn` callback that replaces the former `this.execute()` call.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveR2DestinationFundsToken = resolveR2DestinationFundsToken;
 exports.executeMultiChain = executeMultiChain;
 exports.executeUoaToCea = executeUoaToCea;
 exports.executeUoaToCeaSvm = executeUoaToCeaSvm;
@@ -34,6 +35,7 @@ const gas_calculator_1 = require("./gas-calculator");
 const preflight_1 = require("./preflight");
 const svm_rent_1 = require("./svm-rent");
 const chain_1 = require("../../constants/chain");
+const tokens_1 = require("../../constants/tokens");
 const utils_1 = require("../../utils");
 const price_fetch_1 = require("../../price-fetch/price-fetch");
 const route_detector_1 = require("../route-detector");
@@ -81,6 +83,24 @@ 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 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 ((_c = destinationTokens.find((candidate) => candidate.symbol === token.symbol)) !== null && _c !== void 0 ? _c : token);
+}
 /**
  * SVM counterpart to `resolveR2Prc20TokenEvm`. SVM adds an EXECUTE-only
  * branch (no value, no funds, but `hasSvmExecute === true`) that still needs
@@ -117,6 +137,7 @@ 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)) {
         drainAmount = params.funds.amount;
@@ -124,13 +145,14 @@ function resolveR3SvmDrain(params, sourceChain, pushNetwork) {
         if ((token === null || token === void 0 ? void 0 : token.mechanism) === 'approve') {
             const mintPk = new web3_js_1.PublicKey(token.address);
             tokenMintHex = ('0x' + Buffer.from(mintPk.toBytes()).toString('hex'));
+            splMintBase58 = token.address;
             prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
         }
     }
     else if (params.value && params.value > BigInt(0)) {
         drainAmount = params.value;
     }
-    return { prc20Token, drainAmount, tokenMintHex };
+    return { prc20Token, drainAmount, tokenMintHex, splMintBase58 };
 }
 function buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, inboundNonce) {
     var _a, _b;
@@ -146,7 +168,7 @@ function buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, inboundNon
         ueaAddress,
         allowSelfValueCall: true,
     }));
-    const inboundPayload = (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, {
+    const inboundPayload = (0, payload_builders_1.buildInboundUniversalPayloadSvm)(multicallPayload, {
         nonce: inboundNonce !== null && inboundNonce !== void 0 ? inboundNonce : BigInt(0),
     });
     return (0, viem_1.hexToBytes)(inboundPayload);
@@ -156,13 +178,19 @@ 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) {
+function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress, targetChain, pushNetwork) {
     var _a, _b, _c, _d, _e;
     if (params.migration) {
         return (0, payload_builders_1.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)
+        : undefined;
+    const nativeFundsValue = ((_b = params.funds) === null || _b === void 0 ? void 0 : _b.amount) && (fundsToken === null || fundsToken === void 0 ? void 0 : fundsToken.mechanism) === 'native'
+        ? params.funds.amount
+        : BigInt(0);
     if (hasData) {
         if (Array.isArray(params.data)) {
             ceaMulticalls.push(...params.data);
@@ -171,16 +199,15 @@ function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress) {
             // 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') {
+            if ((_c = params.funds) === null || _c === void 0 ? void 0 : _c.amount) {
+                if (fundsToken && fundsToken.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,
+                        to: fundsToken.address,
                         value: BigInt(0),
                         data: erc20Transfer,
                     });
@@ -190,29 +217,24 @@ function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress) {
             // contract receives it alongside the payload call.
             ceaMulticalls.push({
                 to: targetAddress,
-                value: (_b = params.value) !== null && _b !== void 0 ? _b : BigInt(0),
+                value: ((_d = params.value) !== null && _d !== void 0 ? _d : BigInt(0)) + nativeFundsValue,
                 data: params.data,
             });
         }
     }
     else {
-        const token = ((_c = params.funds) === null || _c === void 0 ? void 0 : _c.amount)
-            ? params.funds.token
-            : undefined;
-        if (((_d = params.funds) === null || _d === void 0 ? void 0 : _d.amount) && token && token.mechanism !== 'native') {
+        if (((_e = params.funds) === null || _e === void 0 ? void 0 : _e.amount) && fundsToken && fundsToken.mechanism !== 'native') {
             // ERC-20 funds: forward via ERC20.transfer from the CEA.
-            if (token) {
-                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,
-                });
-            }
+            const erc20Transfer = (0, viem_1.encodeFunctionData)({
+                abi: erc20_evm_1.ERC20_EVM,
+                functionName: 'transfer',
+                args: [targetAddress, params.funds.amount],
+            });
+            ceaMulticalls.push({
+                to: fundsToken.address,
+                value: BigInt(0),
+                data: erc20Transfer,
+            });
         }
         if (params.value) {
             // Native value transfer only. Skip the multicall when sending to the CEA
@@ -225,13 +247,13 @@ function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress) {
                 });
             }
         }
-        else if (((_e = params.funds) === null || _e === void 0 ? void 0 : _e.amount) && (token === null || token === void 0 ? void 0 : token.mechanism) === 'native') {
+        else if (nativeFundsValue > BigInt(0)) {
             // Native funds (e.g. pETH → ETH): forward value to the recipient.
             // Self-CEA is skipped — the gateway already deposits into the CEA.
             if (targetAddress.toLowerCase() !== ceaAddress.toLowerCase()) {
                 ceaMulticalls.push({
                     to: targetAddress,
-                    value: params.funds.amount,
+                    value: nativeFundsValue,
                     data: '0x',
                 });
             }
@@ -378,7 +400,6 @@ function executeUoaToCea(ctx, params, executeFn) {
         // --- 202: Gas estimation (spec-ordered before 203) ---
         let gasFee = BigInt(0);
         let protocolFee = BigInt(0);
-        let outboundGasPrice = BigInt(0);
         let gasToken = selectors_1.ZERO_ADDRESS;
         let universalCoreAddress;
         if (prc20Token !== selectors_1.ZERO_ADDRESS) {
@@ -387,7 +408,6 @@ function executeUoaToCea(ctx, params, executeFn) {
                 const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, gasLimitForQuery, targetChain);
                 gasFee = result.gasFee;
                 protocolFee = result.protocolFee;
-                outboundGasPrice = result.gasPrice;
                 gasToken = result.gasToken;
                 universalCoreAddress = result.universalCoreAddress;
                 (0, context_1.printLog)(ctx, `executeUoaToCea — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}`);
@@ -414,7 +434,7 @@ function executeUoaToCea(ctx, params, executeFn) {
         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);
+        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}`);
         }
@@ -426,7 +446,7 @@ function executeUoaToCea(ctx, params, executeFn) {
             : ceaAddress;
         (0, payload_builders_1.assertCeaFundsParkingInvariant)(targetBytes, ceaPayload);
         const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetBytes, prc20Token, burnAmount, gasLimitForQuery, ceaPayload, ueaAddress, // revert recipient is the UEA
-        (_d = params.maxPCForGas) !== null && _d !== void 0 ? _d : BigInt(0), outboundGasPrice);
+        (_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,
@@ -605,7 +625,6 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
         // --- 202: Gas estimation (spec-ordered before 203) ---
         let gasFee = BigInt(0);
         let protocolFeeSvm = BigInt(0);
-        let outboundGasPriceSvm = BigInt(0);
         let gasToken = selectors_1.ZERO_ADDRESS;
         let universalCoreAddress;
         // Effective gas limit seeded from the user param. When the user omits
@@ -637,7 +656,6 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
                 });
                 gasFee = result.gasFee;
                 protocolFeeSvm = result.protocolFee;
-                outboundGasPriceSvm = result.gasPrice;
                 gasToken = result.gasToken;
                 universalCoreAddress = result.universalCoreAddress;
                 // When user omits gasLimit (sent as 0), the contract computes fees using
@@ -664,7 +682,7 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
         // --- 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), outboundGasPriceSvm);
+        (_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,
@@ -971,7 +989,6 @@ function executeCeaToPush(ctx, params, executeFn) {
         // 11. Query gas fees from UniversalCore
         let gasFee = BigInt(0);
         let protocolFeeR3 = BigInt(0);
-        let outboundGasPriceR3 = BigInt(0);
         let nativeValueForGas = BigInt(0);
         let gasToken = selectors_1.ZERO_ADDRESS;
         let sizingDecisionR3;
@@ -981,11 +998,10 @@ function executeCeaToPush(ctx, params, executeFn) {
                 const result = yield (0, gas_calculator_1.queryOutboundGasFee)(ctx, prc20Token, outboundGasLimit, sourceChain);
                 gasToken = result.gasToken;
                 gasFee = result.gasFee;
-                outboundGasPriceR3 = result.gasPrice;
                 protocolFeeR3 = result.protocolFee;
                 nativeValueForGas = result.nativeValueForGas;
                 sizingDecisionR3 = result.sizing;
-                outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, (_k = params.maxPCForGas) !== null && _k !== void 0 ? _k : BigInt(0), outboundGasPriceR3);
+                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);
             }
@@ -1129,8 +1145,8 @@ function executeCeaToPush(ctx, params, executeFn) {
  *
  * Unlike EVM Route 3 which builds CEA multicalls, SVM Route 3 encodes a
  * `send_universal_tx_to_uea` instruction as an execute payload targeting
- * the SVM gateway program (self-call). The drain amount is embedded in
- * the instruction data, not in the outbound request amount.
+ * 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* () {
@@ -1148,10 +1164,9 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         const gatewayProgramHex = ('0x' + Buffer.from(programPk.toBytes()).toString('hex'));
         (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_301, sourceChain, lockerContract);
         (0, context_1.printLog)(ctx, `executeCeaToPushSvm — sourceChain: ${sourceChain}, gateway: ${lockerContract}`);
-        // Route 3 SVM: CEA uses its own pre-existing balance — no PRC-20 burn
-        // needed on Push Chain. The outer request token must still match the source
-        // asset so the relayer supplies the same Solana mint that the payload
-        // encodes; otherwise the gateway rejects with InvalidMint.
+        // 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
@@ -1176,12 +1191,6 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
             revertRecipientHex: ceaPdaHex,
         });
         (0, context_1.printLog)(ctx, `executeCeaToPushSvm — drainAmount: ${drainAmount.toString()}, payload length: ${(svmPayload.length - 2) / 2} bytes`);
-        // burnAmount = 0 (payload-only outbound — drain amount lives inside ixData).
-        // Mirrors the 2026-03-19 cascade fix that removed the 1-wei workaround for
-        // SVM payload-only hops because it caused `InsufficientBalance (0xf4d678b8)`
-        // reverts on fresh UEAs that don't hold the source-chain native PRC-20
-        // (e.g. pSOL). The UGPC upgrade post-2026-03-19 already accepts amount = 0
-        // on the cascade path, and the same precompile is used here.
         const burnAmount = BigInt(0);
         let effectiveGasLimit = (_a = params.gasLimit) !== null && _a !== void 0 ? _a : BigInt(0);
         // Build outbound request: recipient = gateway program (self-call)
@@ -1190,7 +1199,6 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         // Query gas fees
         let gasFee = BigInt(0);
         let protocolFeeR3Svm = BigInt(0);
-        let outboundGasPriceR3Svm = BigInt(0);
         let nativeValueForGas = BigInt(0);
         let gasToken = selectors_1.ZERO_ADDRESS;
         let sizingDecisionR3Svm;
@@ -1205,17 +1213,16 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
                     prc20Token,
                     quote: result,
                     splMintBase58: undefined,
-                    burnAmount: BigInt(0),
+                    burnAmount,
                     pathTag: 'executeCeaToPushSvm',
                 });
                 gasToken = result.gasToken;
                 gasFee = result.gasFee;
-                outboundGasPriceR3Svm = result.gasPrice;
                 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), outboundGasPriceR3Svm);
+                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'}`);
@@ -1278,8 +1285,8 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         }
         // SVM warn-threshold telemetry (no truncation — pre-flight handles drain protection).
         (0, preflight_1.maybeFireSvmWarnThreshold)(ctx, nativeValueForGas, gasToken, 'R3_SVM');
-        // Pre-flight (R3 SVM): no PRC-20 burn check. R3 SVM uses burnAmount=0
-        // because the drain amount lives inside the SVM instruction data.
+        // 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,
@@ -1355,7 +1362,7 @@ function executeCeaToCea(ctx, params, executeFn) {
  */
 function buildPayloadForRoute(ctx, params, route, nonce) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        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: {
@@ -1406,56 +1413,19 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                 }
                 // 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]);
-                // Build CEA outbound payload
-                const multicalls = [];
-                if ((0, data_utils_1.hasExecutablePayloadData)(params.data)) {
-                    if (Array.isArray(params.data)) {
-                        multicalls.push(...params.data);
-                    }
-                    else {
-                        // Single call with data. Native value (if any) is already delivered to
-                        // CEA by the Vault via executeUniversalTx{value: amount}(). Attaching
-                        // value to the call would revert if the target function is not payable.
-                        // To call a payable function with value, use explicit multicalls.
-                        multicalls.push({
-                            to: target.address,
-                            value: BigInt(0),
-                            data: params.data,
-                        });
-                    }
-                }
-                else if (params.value) {
-                    // Skip multicall when sending native value to own CEA — gateway deposits directly.
-                    // Self-call with value would revert (CEA._handleMulticall rejects it).
-                    if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
-                        multicalls.push({
-                            to: target.address,
-                            value: params.value,
-                            data: '0x',
-                        });
-                    }
-                }
-                const payload = (0, payload_builders_1.buildCeaMulticallPayload)(multicalls);
-                let prc20Token = selectors_1.ZERO_ADDRESS;
-                let burnAmount = BigInt(0);
-                if ((_e = params.funds) === null || _e === void 0 ? void 0 : _e.amount) {
-                    const token = params.funds.token;
-                    if (token) {
-                        prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
-                        burnAmount = params.funds.amount;
-                    }
-                }
+                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, (_f = params.gasLimit) !== null && _f !== void 0 ? _f : BigInt(0), payload, ueaAddress, (_g = params.maxPCForGas) !== null && _g !== void 0 ? _g : BigInt(0));
+                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));
                 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 (!((_h = params.from) === null || _h === void 0 ? void 0 : _h.chain)) {
+                if (!((_g = params.from) === null || _g === void 0 ? void 0 : _g.chain)) {
                     throw new Error('Route 3 (CEA -> Push) requires from.chain');
                 }
                 const sourceChain = params.from.chain;
@@ -1482,17 +1452,17 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                     });
                     // Payload-only outbound: drain amount lives inside ixData.
                     const burnAmount = BigInt(0);
-                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, prc20Token, burnAmount, (_j = params.gasLimit) !== null && _j !== void 0 ? _j : BigInt(0), svmPayload, ueaAddress, (_k = params.maxPCForGas) !== null && _k !== void 0 ? _k : BigInt(0));
+                    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, (_l = ctx.rpcUrls[sourceChain]) === null || _l === void 0 ? void 0 : _l[0]);
+                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 ((_m = params.funds) === null || _m === void 0 ? void 0 : _m.amount) {
+                if ((_l = params.funds) === null || _l === void 0 ? void 0 : _l.amount) {
                     const token = params.funds.token;
                     if (token) {
                         if (token.mechanism === 'native') {
@@ -1516,7 +1486,7 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                 // Wrap in UniversalPayload struct for the relay.
                 let pushPayload = '0x';
                 if ((0, data_utils_1.hasExecutablePayloadData)(params.data) ||
-                    (((_o = params.funds) === null || _o === void 0 ? void 0 : _o.amount) && ((_p = params.value) !== null && _p !== void 0 ? _p : BigInt(0)) > BigInt(0))) {
+                    (((_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,
@@ -1538,8 +1508,8 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                 // Route 3: CEA uses its own pre-existing balance — no PRC-20 burn needed.
                 // burnAmount = 0 makes this a payload-only outbound relay.
                 const burnAmount = BigInt(0);
-                const outboundGasLimit = (_q = params.gasLimit) !== null && _q !== void 0 ? _q : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
-                const outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, (_r = params.maxPCForGas) !== null && _r !== void 0 ? _r : 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:

package/src/lib/orchestrator/internals/tx-transformer.js

@@ -172,8 +172,9 @@ function reconstructR3(universalTxResponse, universalTxData, isFailed, errorMsg)
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_02](sourceChain, BigInt(0), BigInt(0)));
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_01](sourceChain));
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_02](universalTxResponse.from, ceaAddress, sourceChain));
-    // R3 pre-flight reconstruction — R3 EVM burnAmount=0, R3 SVM burnAmount=0
-    // (post-fix). Only the NATIVE pre-flight check fires; no PRC-20 second hook.
+    // R3 pre-flight reconstruction is intentionally approximate: historical
+    // response data does not include the SDK-side PRC-20 balance snapshot, so
+    // replay only the native check.
     // R3 single-route uses 303-04 (R3 bucket); see runPreflight in preflight.ts.
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_04](BigInt(0), BigInt(0), true, universalTxResponse.from, 'R3_EVM', { kind: 'NATIVE' }));
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_01]());

package/src/lib/orchestrator/orchestrator.types.d.ts

@@ -275,7 +275,7 @@ export interface WaitOptions {
     inboundTimeoutMs?: number;
     /**
      * Override the poll interval (ms) between outbound status checks. Default
-     * is 5000ms. Lower values give faster feedback on fast relays; higher
+     * is 3000ms. Lower values give faster feedback on fast relays; higher
      * values reduce RPC pressure. Only applies to R2 / R3 outbound polling.
      */
     outboundPollingIntervalMs?: number;
@@ -671,7 +671,7 @@ export interface CascadeHopInfo {
 export interface CascadeTrackOptions {
     /** Polling interval (default: 5000ms) */
     pollingIntervalMs?: number;
-    /** Total timeout (default: 600000ms = 10 min) */
+    /** Total timeout (default: 300000ms = 5 min) */
     timeout?: number;
     /** Per-hop progress callback */
     progressHook?: (event: CascadeProgressEvent) => void;
@@ -777,16 +777,16 @@ export interface OutboundTxDetails {
  */
 export interface WaitForOutboundOptions {
     /**
-     * Initial wait before first poll (default: 30000ms)
+     * Initial wait before first poll (default: 15000ms)
      * Gives relay time to process before we start polling
      */
     initialWaitMs?: number;
     /**
-     * Interval between polls (default: 5000ms)
+     * Interval between polls (default: 3000ms)
      */
     pollingIntervalMs?: number;
     /**
-     * Total timeout in milliseconds (default: 120000ms)
+     * Total timeout in milliseconds (default: 300000ms)
      * Measured from start, includes initial wait
      */
     timeout?: number;

package/src/lib/orchestrator/payload-builders.d.ts

@@ -35,7 +35,8 @@ export declare const MULTICALL_TUPLE_TYPE: {
  */
 export declare function buildCeaMulticallPayload(multicalls: MultiCall[]): `0x${string}`;
 /**
- * Build an ABI-encoded UniversalPayload struct for inbound relay (Route 3 CEA→Push).
+ * Build an ABI-encoded UniversalPayload struct for EVM-origin inbound relay
+ * (Route 3 CEA→Push).
  *
  * The relay and Push Chain gateway expect the payload parameter of sendUniversalTxToUEA
  * to be a full UniversalPayload struct: (address to, uint256 value, bytes data, uint256 gasLimit,
@@ -53,6 +54,17 @@ export declare function buildInboundUniversalPayload(multicallData: `0x${string}
     nonce?: bigint;
     deadline?: bigint;
 }): `0x${string}`;
+/**
+ * Build a Borsh-encoded UniversalPayload for SVM-origin inbound relay.
+ *
+ * Push Chain decodes SVM-origin UniversalTx payloads with
+ * DecodeUniversalPayloadSolana, not the EVM ABI decoder used for EVM origins.
+ */
+export declare function buildInboundUniversalPayloadSvm(multicallData: `0x${string}`, opts?: {
+    gasLimit?: bigint;
+    nonce?: bigint;
+    deadline?: bigint;
+}): `0x${string}`;
 /**
  * Build sendUniversalTxToUEA call for CEA self-call (Route 3)
  *

package/src/lib/orchestrator/payload-builders.js

@@ -4,6 +4,7 @@ exports.MULTICALL_TUPLE_TYPE = void 0;
 exports.buildExecuteMulticall = buildExecuteMulticall;
 exports.buildCeaMulticallPayload = buildCeaMulticallPayload;
 exports.buildInboundUniversalPayload = buildInboundUniversalPayload;
+exports.buildInboundUniversalPayloadSvm = buildInboundUniversalPayloadSvm;
 exports.buildSendUniversalTxToUEA = buildSendUniversalTxToUEA;
 exports.buildOutboundRequest = buildOutboundRequest;
 exports.assertCeaFundsParkingInvariant = assertCeaFundsParkingInvariant;
@@ -24,6 +25,8 @@ const selectors_1 = require("../constants/selectors");
 const chain_1 = require("../constants/chain");
 const enums_1 = require("../constants/enums");
 const data_utils_1 = require("./data-utils");
+const tx_1 = require("../generated/v1/tx");
+const signing_1 = require("./internals/signing");
 function buildExecuteMulticall({ execute, ueaAddress, logger, allowSelfValueCall = false, }) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const log = (msg) => logger === null || logger === void 0 ? void 0 : logger(msg);
@@ -161,7 +164,8 @@ function buildCeaMulticallPayload(multicalls) {
     return `${selectors_1.UEA_MULTICALL_SELECTOR}${encoded.slice(2)}`;
 }
 /**
- * Build an ABI-encoded UniversalPayload struct for inbound relay (Route 3 CEA→Push).
+ * Build an ABI-encoded UniversalPayload struct for EVM-origin inbound relay
+ * (Route 3 CEA→Push).
  *
  * The relay and Push Chain gateway expect the payload parameter of sendUniversalTxToUEA
  * to be a full UniversalPayload struct: (address to, uint256 value, bytes data, uint256 gasLimit,
@@ -205,6 +209,27 @@ function buildInboundUniversalPayload(multicallData, opts) {
         },
     ]);
 }
+/**
+ * Build a Borsh-encoded UniversalPayload for SVM-origin inbound relay.
+ *
+ * Push Chain decodes SVM-origin UniversalTx payloads with
+ * DecodeUniversalPayloadSolana, not the EVM ABI decoder used for EVM origins.
+ */
+function buildInboundUniversalPayloadSvm(multicallData, opts) {
+    var _a, _b, _c;
+    const payload = {
+        to: selectors_1.ZERO_ADDRESS,
+        value: BigInt(0).toString(),
+        data: multicallData,
+        gasLimit: ((_a = opts === null || opts === void 0 ? void 0 : opts.gasLimit) !== null && _a !== void 0 ? _a : BigInt(100000000)).toString(),
+        maxFeePerGas: BigInt(10000000000).toString(),
+        maxPriorityFeePerGas: BigInt(0).toString(),
+        nonce: ((_b = opts === null || opts === void 0 ? void 0 : opts.nonce) !== null && _b !== void 0 ? _b : BigInt(0)).toString(),
+        deadline: ((_c = opts === null || opts === void 0 ? void 0 : opts.deadline) !== null && _c !== void 0 ? _c : BigInt(9999999999)).toString(),
+        vType: tx_1.VerificationType.universalTxVerification,
+    };
+    return `0x${(0, signing_1.encodeUniversalPayloadSvm)(payload).toString('hex')}`;
+}
 /**
  * Build sendUniversalTxToUEA call for CEA self-call (Route 3)
  *

package/src/lib/universal-tx-detector/child-inbounds.d.ts

@@ -6,6 +6,9 @@
  *   utxId = sha256(`<sourceChainCaip>:<txHash>:<logIndex>`)
  * See push-chain/x/uexecutor/types/keys.go:49-53 (GetInboundUniversalTxKey).
  *
+ * For SVM sources, `<txHash>` is the 0x-prefixed hex encoding of the 64-byte
+ * Solana signature and `<logIndex>` is the event's index in `meta.logMessages`.
+ *
  * For Push-initiated outbounds (pcTx entries) the formula drops the log index:
  *   utxId = sha256(`<pcChainCaip>:<pcTxHash>`)
  * See push-chain/x/uexecutor/types/keys.go:63-67 (GetPcUniversalTxKey).

package/src/lib/universal-tx-detector/child-inbounds.js

@@ -14,6 +14,9 @@ const tslib_1 = require("tslib");
  *   utxId = sha256(`<sourceChainCaip>:<txHash>:<logIndex>`)
  * See push-chain/x/uexecutor/types/keys.go:49-53 (GetInboundUniversalTxKey).
  *
+ * For SVM sources, `<txHash>` is the 0x-prefixed hex encoding of the 64-byte
+ * Solana signature and `<logIndex>` is the event's index in `meta.logMessages`.
+ *
  * For Push-initiated outbounds (pcTx entries) the formula drops the log index:
  *   utxId = sha256(`<pcChainCaip>:<pcTxHash>`)
  * See push-chain/x/uexecutor/types/keys.go:63-67 (GetPcUniversalTxKey).
@@ -22,6 +25,7 @@ const tslib_1 = require("tslib");
  * `pushClient.getUniversalTxByIdV2`, no event-attribute predicate needed.
  */
 const viem_1 = require("viem");
+const bs58_1 = require("../internal/bs58");
 const normalize_1 = require("./normalize");
 const STATUS_NAMES = {
     0: 'UNIVERSAL_TX_STATUS_UNSPECIFIED',
@@ -45,14 +49,25 @@ const INBOUND_EVENT_NAMES = new Set([
     'UniversalTx',
     'RevertUniversalTx',
 ]);
+const HEX_64_BYTE_RE = /^(?:0x)?[0-9a-fA-F]{128}$/;
+function normalizeInboundTxHashForKey(sourceChainCaip, externalTxHash) {
+    if (!sourceChainCaip.startsWith('solana:')) {
+        return externalTxHash.startsWith('0x')
+            ? externalTxHash
+            : `0x${externalTxHash}`;
+    }
+    if (externalTxHash.startsWith('0x'))
+        return externalTxHash;
+    if (HEX_64_BYTE_RE.test(externalTxHash))
+        return `0x${externalTxHash}`;
+    return (0, viem_1.toHex)(bs58_1.bs58.decode(externalTxHash));
+}
 /**
  * Deterministic child universalTxId for an inbound event on an external chain.
  * Mirrors `GetInboundUniversalTxKey` from the chain module.
  */
 function deriveChildUniversalTxId(sourceChainCaip, externalTxHash, logIndex) {
-    const normHash = externalTxHash.startsWith('0x')
-        ? externalTxHash
-        : `0x${externalTxHash}`;
+    const normHash = normalizeInboundTxHashForKey(sourceChainCaip, externalTxHash);
     const input = `${sourceChainCaip}:${normHash}:${logIndex}`;
     return (0, viem_1.sha256)((0, viem_1.toBytes)(input));
 }

package/src/lib/universal-tx-detector/detector-svm.js

@@ -15,12 +15,9 @@ const tslib_1 = require("tslib");
  * return, same universalTxId derivation strategy (primary-log fallback
  * via deriveChildUniversalTxId on source-chain inbounds).
  *
- * Open contract with the push-chain cosmos keeper (documented in the
- * plan): the keeper must derive SVM inbound universalTxIds using the
- * Solana base58 signature verbatim inside `${caip}:${sig}:${logIndex}`.
- * If the keeper uses a different representation (hex bytes, sub_tx_id
- * field, etc.) the `rawSource` argument to deriveChildUniversalTxId below
- * needs to swap — single line.
+ * The Push keeper stores SVM inbound ids using the 0x-prefixed hex encoding
+ * of the 64-byte Solana signature and the index of the Anchor event inside
+ * `meta.logMessages`: `${caip}:${hexSig}:${logMessageIndex}`.
  */
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
@@ -91,12 +88,11 @@ function detectUniversalTxSvm(signature_1, chain_2) {
         }
         const eventCoder = new anchor_1.BorshEventCoder(universalGatewayV0_json_1.default);
         const matchingLogs = [];
-        // Walk logMessages for `Program data:` entries. Each matched event gets
-        // assigned an ordinal logIndex — its position among matching events.
-        // This is the deterministic integer the cosmos keeper is expected to use
-        // when it derives an inbound universalTxId for SVM sources.
-        let ordinal = 0;
-        for (const rawLog of logMessages) {
+        // Walk logMessages for `Program data:` entries. Each matched event keeps
+        // the actual Solana log-message index because that is the value validators
+        // submit as the inbound log_index and the keeper uses for the UTX key.
+        for (let logIndex = 0; logIndex < logMessages.length; logIndex++) {
+            const rawLog = logMessages[logIndex];
             if (typeof rawLog !== 'string')
                 continue;
             const prefix = 'Program data: ';
@@ -135,10 +131,9 @@ function detectUniversalTxSvm(signature_1, chain_2) {
             matchingLogs.push({
                 eventName,
                 address: emitter,
-                logIndex: ordinal,
+                logIndex,
                 args,
             });
-            ordinal += 1;
         }
         if (matchingLogs.length === 0) {
             notes.push('svm tx has no decoded universal-tx events');
@@ -148,8 +143,7 @@ function detectUniversalTxSvm(signature_1, chain_2) {
         notes.push(...classified.notes);
         const decoded = Object.assign({}, classified.decoded);
         // Inbound fallback for universalTxId: same formula the EVM branch uses,
-        // but the raw signature flows through untouched (no 0x-prefix rewrite,
-        // see deriveSvmChildUniversalTxId in child-inbounds.ts).
+        // with the canonical 0x-hex Solana signature and log-message index.
         if (!decoded.universalTxId) {
             const caip = chain;
             if (INBOUND_KINDS.has(classified.kind) &&