@pushchain/core 6.0.3 → 6.0.5

package/src/lib/orchestrator/internals/response-builder.js

@@ -29,30 +29,14 @@ const inbound_tracker_1 = require("./inbound-tracker");
 const tx_transformer_1 = require("./tx-transformer");
 const progress_route_hooks_1 = require("./progress-route-hooks");
 const outbound_sync_1 = require("./outbound-sync");
-/**
- * Intermediate Push-success markers (199-99-99 for R3, 299-99 for R2) are
- * internal transition signals — they tell response-builder's wait-phase
- * branch that the Push leg has settled so it can skip re-emitting the
- * intermediate marker on top of a reconstructed stream. They are not part
- * of the published 1XX/2XX/3XX/4XX spec and are suppressed at the consumer
- * dispatch boundary. `printLog` still fires for these so internal traces
- * retain the transition record.
- */
-const INTERMEDIATE_INTERNAL_IDS = new Set([
-    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99_99,
-    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_299_99,
-]);
 /**
  * Fan out a progress event to one or two registered callbacks, deduping
  * when both slots hold the same reference. Keeps the emission policy in a
  * single place shared by `emitProgress` (execute phase) and `emit` (wait
  * phase) — so consumers that wire the same callback at multiple levels
- * never see double-invocation. Intermediate internal markers are dropped
- * here so they never reach the consumer.
+ * never see double-invocation.
  */
 function fanOut(event, primary, secondary) {
-    if (INTERMEDIATE_INTERNAL_IDS.has(event.id))
-        return;
     if (primary)
         primary(event);
     if (secondary && secondary !== primary)
@@ -549,13 +533,6 @@ function transformToUniversalTxResponse(ctx_1, tx_1) {
                 const inboundInitialWaitMs = isReplay
                     ? 0
                     : callbacks.inboundConstants.initialWaitMs;
-                // Track whether reconstruction already emitted the route's
-                // intermediate Push-success marker (299-99 / 199-99-99). When it has,
-                // skip re-emitting from the outbound branch below to avoid duplicates.
-                // This flag is only true when `this` response was created by
-                // trackTransaction() and the reconstructed stream already fired.
-                const alreadyReconstructed = universalTxResponse._eventsReconstructed === true;
-                let intermediateAlreadyEmitted = alreadyReconstructed;
                 // Build the base receipt directly from this response. Any per-call
                 // `tx.progressHook(cb)` already replayed buffered execute-phase events
                 // to `cb` via the progressHook setter — re-running trackTransaction
@@ -580,15 +557,6 @@ function transformToUniversalTxResponse(ctx_1, tx_1) {
                             return;
                         fanOut(event, registeredProgressHook, ctx.progressHook);
                     };
-                    // Intermediate INFO marker — Push Chain tx confirmed, external/inbound
-                    // leg still pending. Per spec, R1 keeps 199-01 as terminal; R2/R3
-                    // reclassify Push success as intermediate. Skip when trackTransaction
-                    // (called above) already reconstructed the same marker via
-                    // reconstructR2/R3, otherwise the consumer sees 299-99 / 199-99-99
-                    // twice in their stream.
-                    if (hooks.intermediatePushOk && !intermediateAlreadyEmitted) {
-                        emit(hooks.intermediatePushOk(targetChain, tx.hash));
-                    }
                     // Awaiting relay
                     emit(hooks.awaiting(targetChain));
                     let lastEmittedStatus;

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

@@ -39,6 +39,7 @@ const price_fetch_1 = require("../../price-fetch/price-fetch");
 const route_detector_1 = require("../route-detector");
 const cea_utils_1 = require("../cea-utils");
 const build_payload_1 = require("../svm-idl/build-payload");
+const data_utils_1 = require("../data-utils");
 const payload_builders_1 = require("../payload-builders");
 const selectors_1 = require("../../constants/selectors");
 const erc20_evm_1 = require("../../constants/abi/erc20.evm");
@@ -73,7 +74,7 @@ function resolveR2Prc20TokenEvm(params, targetChain, pushNetwork) {
         prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, pushNetwork);
         burnAmount = params.value;
     }
-    else if (params.data) {
+    else if ((0, data_utils_1.hasExecutablePayloadData)(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);
@@ -132,12 +133,19 @@ function resolveR3SvmDrain(params, sourceChain, pushNetwork) {
     return { prc20Token, drainAmount, tokenMintHex };
 }
 function buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, inboundNonce) {
-    if (!params.data) {
+    var _a, _b;
+    const shouldBuildPushPayload = (0, data_utils_1.hasExecutablePayloadData)(params.data) ||
+        Boolean(((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) && ((_b = params.value) !== null && _b !== void 0 ? _b : BigInt(0)) > BigInt(0));
+    if (!shouldBuildPushPayload) {
         return undefined;
     }
     const executeParams = (0, helpers_1.toExecuteParams)(params);
     const multicallCtx = Object.assign(Object.assign({}, ctx), { universalSigner: Object.assign(Object.assign({}, ctx.universalSigner), { account: Object.assign(Object.assign({}, ctx.universalSigner.account), { chain: sourceChain }) }) });
-    const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(multicallCtx, executeParams.to, (0, payload_builders_1.buildExecuteMulticall)({ execute: executeParams, ueaAddress }));
+    const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(multicallCtx, executeParams.to, (0, payload_builders_1.buildExecuteMulticall)({
+        execute: executeParams,
+        ueaAddress,
+        allowSelfValueCall: true,
+    }));
     const inboundPayload = (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, {
         nonce: inboundNonce !== null && inboundNonce !== void 0 ? inboundNonce : BigInt(0),
     });
@@ -149,12 +157,13 @@ function buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, inboundNon
  * multicall when the target IS the CEA (avoids a CEA._handleMulticall revert).
  */
 function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     if (params.migration) {
         return (0, payload_builders_1.buildMigrationPayload)();
     }
     const ceaMulticalls = [];
-    if (params.data) {
+    const hasData = (0, data_utils_1.hasExecutablePayloadData)(params.data);
+    if (hasData) {
         if (Array.isArray(params.data)) {
             ceaMulticalls.push(...params.data);
         }
@@ -186,36 +195,13 @@ function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress) {
             });
         }
     }
-    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',
-            });
-        }
-    }
-    else if ((_c = params.funds) === null || _c === void 0 ? void 0 : _c.amount) {
-        // Funds-only transfer (no data, no value). Without this branch the CEA
-        // multicall is empty and the relayed funds sit in the CEA instead of
-        // being forwarded to the caller's recipient.
-        const token = params.funds.token;
-        if (token) {
-            if (token.mechanism === 'native') {
-                // 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,
-                        data: '0x',
-                    });
-                }
-            }
-            else {
-                // ERC-20 funds: forward via ERC20.transfer from the CEA.
+    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') {
+            // 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',
@@ -228,6 +214,28 @@ function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress) {
                 });
             }
         }
+        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',
+                });
+            }
+        }
+        else if (((_e = params.funds) === null || _e === void 0 ? void 0 : _e.amount) && (token === null || token === void 0 ? void 0 : token.mechanism) === 'native') {
+            // 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,
+                    data: '0x',
+                });
+            }
+        }
     }
     return (0, payload_builders_1.buildCeaMulticallPayload)(ceaMulticalls);
 }
@@ -361,7 +369,9 @@ function executeUoaToCea(ctx, params, executeFn) {
         if (params.value && params.value > BigInt(0)) {
             (0, context_1.printLog)(ctx, `executeUoaToCea — auto-selected native PRC-20 ${prc20Token} for chain ${targetChain}, amount: ${burnAmount.toString()}`);
         }
-        else if (!params.migration && !((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) && params.data) {
+        else if (!params.migration &&
+            !((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) &&
+            (0, data_utils_1.hasExecutablePayloadData)(params.data)) {
             (0, context_1.printLog)(ctx, `executeUoaToCea — PAYLOAD-only: using native PRC-20 ${prc20Token} for chain ${targetChain} with zero burn amount`);
         }
         const gasLimitForQuery = (_b = params.gasLimit) !== null && _b !== void 0 ? _b : BigInt(0);
@@ -804,7 +814,7 @@ function executeUoaToCeaSvm(ctx, params, target, executeFn) {
  */
 function executeCeaToPush(ctx, params, executeFn) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         // 1. Validate and extract source chain
         if (!((_a = params.from) === null || _a === void 0 ? void 0 : _a.chain)) {
             throw new Error('Route 3 (CEA -> Push) requires from.chain to specify the source CEA chain');
@@ -893,7 +903,8 @@ function executeCeaToPush(ctx, params, executeFn) {
         // The relay expects a full UniversalPayload struct (to, value, data, gasLimit, ...),
         // where `data` contains the multicall payload (with UEA_MULTICALL_SELECTOR prefix).
         let pushPayload = '0x';
-        if (params.data) {
+        if ((0, data_utils_1.hasExecutablePayloadData)(params.data) ||
+            (((_f = params.funds) === null || _f === void 0 ? void 0 : _f.amount) && ((_g = params.value) !== null && _g !== void 0 ? _g : BigInt(0)) > BigInt(0))) {
             const multicallData = (0, payload_builders_1.buildExecuteMulticall)({
                 execute: {
                     to: pushDestination,
@@ -901,6 +912,7 @@ function executeCeaToPush(ctx, params, executeFn) {
                     data: params.data,
                 },
                 ueaAddress,
+                allowSelfValueCall: true,
             });
             const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, pushDestination, multicallData);
             // Use ueaNonce + 1: the outbound tx itself consumes one nonce via execute(),
@@ -933,7 +945,7 @@ function executeCeaToPush(ctx, params, executeFn) {
         // tokens FROM the CEA back to Push Chain, not to round-trip them.
         const prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);
         const burnAmount = BigInt(0);
-        const outboundGasLimit = (_f = params.gasLimit) !== null && _f !== void 0 ? _f : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
+        const outboundGasLimit = (_h = params.gasLimit) !== null && _h !== void 0 ? _h : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
         (0, context_1.printLog)(ctx, `executeCeaToPush — prc20Token: ${prc20Token}, burnAmount: ${burnAmount.toString()}`);
         // 9. Build outbound request (same structure as Route 2)
         // recipient = CEA address (for self-execution), value = 0 in payload
@@ -942,7 +954,7 @@ function executeCeaToPush(ctx, params, executeFn) {
         burnAmount, // amount: 0 (payload-only, CEA uses its own balance)
         outboundGasLimit, ceaPayload, // payload: ABI-encoded CEA multicall
         ueaAddress, // revertRecipient: UEA
-        (_g = params.maxPCForGas) !== null && _g !== void 0 ? _g : BigInt(0));
+        (_j = params.maxPCForGas) !== null && _j !== void 0 ? _j : BigInt(0));
         (0, context_1.printLog)(ctx, `executeCeaToPush — outbound request: ${JSON.stringify({
             recipient: outboundReq.recipient,
             token: outboundReq.token,
@@ -973,8 +985,8 @@ function executeCeaToPush(ctx, params, executeFn) {
                 protocolFeeR3 = result.protocolFee;
                 nativeValueForGas = result.nativeValueForGas;
                 sizingDecisionR3 = result.sizing;
-                outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, (_h = params.maxPCForGas) !== null && _h !== void 0 ? _h : BigInt(0), outboundGasPriceR3);
-                (0, context_1.printLog)(ctx, `executeCeaToPush — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${(_k = (_j = result.sizing) === null || _j === void 0 ? void 0 : _j.category) !== null && _k !== void 0 ? _k : 'legacy'}`);
+                outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, (_k = params.maxPCForGas) !== null && _k !== void 0 ? _k : BigInt(0), outboundGasPriceR3);
+                (0, context_1.printLog)(ctx, `executeCeaToPush — queried gas fee: ${gasFee.toString()}, gasToken: ${gasToken}, nativeValueForGas: ${nativeValueForGas.toString()}, sizing=${(_m = (_l = result.sizing) === null || _l === void 0 ? void 0 : _l.category) !== null && _m !== void 0 ? _m : 'legacy'}`);
                 (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_02, sourceChain, protocolFeeR3, gasFee);
             }
             catch (err) {
@@ -1056,7 +1068,7 @@ function executeCeaToPush(ctx, params, executeFn) {
             requiredValue: nativeValueForGas,
             gasReserve: OUTBOUND_GAS_RESERVE_R3,
             pathTag: 'R3_EVM',
-            enforceGasCheck: ((_l = params.options) === null || _l === void 0 ? void 0 : _l.enforceGasCheck) === true,
+            enforceGasCheck: ((_o = params.options) === null || _o === void 0 ? void 0 : _o.enforceGasCheck) === true,
         });
         // 12. Build Push Chain multicalls (approvals + sendUniversalTxOutbound)
         const pushChainMulticalls = (0, payload_builders_1.buildOutboundApprovalAndCall)({
@@ -1343,7 +1355,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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
         switch (route) {
             case route_detector_1.TransactionRoute.UOA_TO_PUSH: {
@@ -1396,7 +1408,7 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                 const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, target.chain, (_d = ctx.rpcUrls[target.chain]) === null || _d === void 0 ? void 0 : _d[0]);
                 // Build CEA outbound payload
                 const multicalls = [];
-                if (params.data) {
+                if ((0, data_utils_1.hasExecutablePayloadData)(params.data)) {
                     if (Array.isArray(params.data)) {
                         multicalls.push(...params.data);
                     }
@@ -1503,7 +1515,8 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                 // Build Push Chain payload (what executes after inbound arrives)
                 // Wrap in UniversalPayload struct for the relay.
                 let pushPayload = '0x';
-                if (params.data) {
+                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))) {
                     const multicallData = (0, payload_builders_1.buildExecuteMulticall)({
                         execute: {
                             to: pushDestination,
@@ -1511,6 +1524,7 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                             data: params.data,
                         },
                         ueaAddress,
+                        allowSelfValueCall: true,
                     });
                     const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, pushDestination, multicallData);
                     pushPayload = (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, { nonce: ueaNonceHop + BigInt(1) });
@@ -1524,8 +1538,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 = (_o = params.gasLimit) !== null && _o !== void 0 ? _o : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
-                const outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, prc20Token, burnAmount, outboundGasLimit, ceaPayload, ueaAddress, (_p = params.maxPCForGas) !== null && _p !== void 0 ? _p : BigInt(0));
+                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));
                 return { payload: ceaPayload, gatewayRequest: outboundReq };
             }
             default:

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

@@ -160,11 +160,6 @@ function reconstructR2(universalTxResponse, universalTxData, isFailed, errorMsg)
     if (isFailed) {
         events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_299_02](errorMsg));
     }
-    else {
-        // Push Chain success is intermediate for R2 — the wait() outbound poll
-        // appends the real terminal (299-01/02/03) once the external leg resolves.
-        events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_299_99](targetChain, universalTxResponse.hash));
-    }
     return events;
 }
 function reconstructR3(universalTxResponse, universalTxData, isFailed, errorMsg) {
@@ -190,11 +185,6 @@ function reconstructR3(universalTxResponse, universalTxData, isFailed, errorMsg)
         // "Push Chain Tx Failed" rather than the inbound copy.
         events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_02](errorMsg, 'push'));
     }
-    else {
-        // Push Chain success is intermediate for R3 — wait() drives the source-chain
-        // CEA poll (309-xx) and the inbound-to-Push poll (310-xx / 399-xx) on top.
-        events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99_99](universalTxResponse.hash));
-    }
     return events;
 }
 // ============================================================================
@@ -315,7 +305,7 @@ function reconstructMultichain(universalTxResponse, universalTxData, isFailed, e
     let failedAt = null;
     let failureMsg = errorMsg;
     outbounds.forEach((ob, i) => {
-        var _a;
+        var _a, _b;
         const hopNum = i + 1;
         const fromChain = i === 0 ? sourceChain : outbounds[i - 1].destinationChain;
         const toChain = ob.destinationChain;
@@ -336,6 +326,12 @@ function reconstructMultichain(universalTxResponse, universalTxData, isFailed, e
             events.push(...reconstructR2(legResponse, legData, legFailed, legError));
         }
         if (!legFailed) {
+            if (hopNum < hopCount) {
+                const txHash = ((_b = ob.observedTx) === null || _b === void 0 ? void 0 : _b.txHash) || legResponse.hash;
+                events.push(isR3Leg
+                    ? progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_99](toChain, txHash)
+                    : progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_299_99](toChain, txHash));
+            }
             events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_002_99_99](hopNum, hopCount));
         }
         else if (failedAt === null) {

package/src/lib/orchestrator/orchestrator.js

@@ -7,6 +7,7 @@ const enums_1 = require("../constants/enums");
 const progress_hook_types_1 = require("../progress-hook/progress-hook.types");
 const push_client_1 = require("../push-client/push-client");
 const route_detector_1 = require("./route-detector");
+const data_utils_1 = require("./data-utils");
 const internals_1 = require("./internals");
 class Orchestrator {
     /* @internal */ get pushClient() {
@@ -132,8 +133,9 @@ class Orchestrator {
     execute(params, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e;
-            if (options) {
-                params = Object.assign(Object.assign({}, params), { options: Object.assign(Object.assign({}, params.options), options) });
+            const inlineProgressHook = params.progressHook;
+            if (options || inlineProgressHook) {
+                params = Object.assign(Object.assign({}, params), { options: Object.assign(Object.assign(Object.assign({}, params.options), (inlineProgressHook ? { progressHook: inlineProgressHook } : {})), options) });
             }
             const perCallHook = (_a = params.options) === null || _a === void 0 ? void 0 : _a.progressHook;
             const originalExecuteHook = this.progressHook;
@@ -241,8 +243,7 @@ class Orchestrator {
                 }
                 // Standard Push Chain execution (Route 1)
                 const execute = params;
-                const hasFunds = !!execute.funds;
-                const hasData = execute.data && execute.data !== '0x';
+                const hasData = (0, data_utils_1.hasExecutablePayloadData)(execute.data);
                 const eventBuffer = [];
                 const originalHook = this.progressHook;
                 this.progressHook = (event) => {

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

@@ -101,6 +101,12 @@ export type ExecuteParams = {
      * Optional transaction behavior switches.
      */
     options?: TransactionExecutionOptions;
+    /**
+     * Optional per-call progress callback.
+     * Alias for `sendTransaction(params, { progressHook })`, kept so docs/UI
+     * examples can pass the hook inside the transaction object.
+     */
+    progressHook?: TransactionExecutionOptions['progressHook'];
     /**
      * Optional: pay gas in a specific token. If not provided, use `token` (bridge token) when present; otherwise, native token.
      */
@@ -633,6 +639,8 @@ export interface CascadedTxResponse {
     hops: CascadeHopInfo[];
     /** Total number of hops in the cascade */
     hopCount: number;
+    /** Final tx hash resolved by waitForAll()/wait(), when available */
+    finalTxHash?: string;
     /** Wait for ALL hops to complete across all chains */
     waitForAll: (opts?: CascadeTrackOptions) => Promise<CascadeCompletionResult>;
     /** Convenience alias for waitForAll() */
@@ -707,6 +715,10 @@ export interface CascadeCompletionResult {
     success: boolean;
     /** Final state of all hops */
     hops: CascadeHopInfo[];
+    /** Final tx hash for the last confirmed hop, when available */
+    finalTxHash?: string;
+    /** Original cascaded response object for consumers that need the full context */
+    finalTxResponse?: CascadedTxResponse;
     /** Index of first failed hop (if any) */
     failedAt?: number;
 }

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

@@ -1,9 +1,10 @@
 import { CHAIN } from '../constants/enums';
 import type { ExecuteParams, MultiCall, UniversalOutboundTxRequest, SvmExecutePayloadFields } from './orchestrator.types';
-export declare function buildExecuteMulticall({ execute, ueaAddress, logger, }: {
+export declare function buildExecuteMulticall({ execute, ueaAddress, logger, allowSelfValueCall, }: {
     execute: ExecuteParams;
     ueaAddress: `0x${string}`;
     logger?: (msg: string) => void;
+    allowSelfValueCall?: boolean;
 }): MultiCall[];
 /**
  * Multicall tuple type definition for ABI encoding

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

@@ -23,14 +23,16 @@ const universalGatewayPC_evm_1 = require("../constants/abi/universalGatewayPC.ev
 const selectors_1 = require("../constants/selectors");
 const chain_1 = require("../constants/chain");
 const enums_1 = require("../constants/enums");
-function buildExecuteMulticall({ execute, ueaAddress, logger, }) {
+const data_utils_1 = require("./data-utils");
+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);
+    const hasData = (0, data_utils_1.hasExecutablePayloadData)(execute.data);
     log('buildExecuteMulticall — input: ' + JSON.stringify({
         to: execute.to,
         value: (_b = (_a = execute.value) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : 'undefined',
         data: execute.data ? (Array.isArray(execute.data) ? `Array(${execute.data.length})` : execute.data.slice(0, 20) + '...') : 'undefined',
-        hasData: !!execute.data,
+        hasData,
         fundsAmount: (_e = (_d = (_c = execute.funds) === null || _c === void 0 ? void 0 : _c.amount) === null || _d === void 0 ? void 0 : _d.toString()) !== null && _e !== void 0 ? _e : 'undefined',
         fundsTokenSymbol: (_h = (_g = (_f = execute.funds) === null || _f === void 0 ? void 0 : _f.token) === null || _g === void 0 ? void 0 : _g.symbol) !== null && _h !== void 0 ? _h : 'undefined',
         fundsTokenMechanism: (_l = (_k = (_j = execute.funds) === null || _j === void 0 ? void 0 : _j.token) === null || _k === void 0 ? void 0 : _k.mechanism) !== null && _l !== void 0 ? _l : 'undefined',
@@ -38,19 +40,25 @@ function buildExecuteMulticall({ execute, ueaAddress, logger, }) {
     }, null, 2));
     const multicallData = [];
     // *** We will pass the value alongside with the data in a single message now ***
-    const branch1 = !execute.data && execute.value;
-    log(`buildExecuteMulticall — Branch 1 (!data && value): ${branch1} | !execute.data: ${!execute.data} | execute.value: ${(_o = (_m = execute.value) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : 'undefined'}`);
-    if (!execute.data && execute.value) {
-        multicallData.push({
-            to: execute.to,
-            value: execute.value,
-            data: '0x',
-        });
-        log(`buildExecuteMulticall — Branch 1 ENTERED: pushed native value transfer to ${execute.to}`);
+    const branch1 = !hasData && execute.value;
+    log(`buildExecuteMulticall — Branch 1 (!data && value): ${branch1} | !hasData: ${!hasData} | execute.value: ${(_o = (_m = execute.value) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : 'undefined'}`);
+    if (!hasData && execute.value) {
+        const isValueToSelf = execute.to.toLowerCase() === ueaAddress.toLowerCase();
+        if (isValueToSelf && !allowSelfValueCall) {
+            log('buildExecuteMulticall — Branch 1 SKIPPED: native value targets the UEA itself; parking value via gateway deposit');
+        }
+        else {
+            multicallData.push({
+                to: execute.to,
+                value: execute.value,
+                data: '0x',
+            });
+            log(`buildExecuteMulticall — Branch 1 ENTERED: pushed native value transfer to ${execute.to}`);
+        }
     }
     if ((_p = execute.funds) === null || _p === void 0 ? void 0 : _p.amount) {
         const token = execute.funds.token;
-        const isArrayMulticall = Array.isArray(execute.data);
+        const isArrayMulticall = Array.isArray(execute.data) && execute.data.length > 0;
         const isNative = token.mechanism === 'native';
         log('buildExecuteMulticall — Branch 2 (funds): ' + JSON.stringify({
             amount: execute.funds.amount.toString(),
@@ -82,8 +90,8 @@ function buildExecuteMulticall({ execute, ueaAddress, logger, }) {
     else {
         log('buildExecuteMulticall — Branch 2 SKIPPED: no funds.amount');
     }
-    log(`buildExecuteMulticall — Branch 3 (execute.data): ${!!execute.data}`);
-    if (execute.data) {
+    log(`buildExecuteMulticall — Branch 3 (execute.data): ${hasData}`);
+    if (hasData) {
         // *************************
         // Check for `execute.to`
         // *************************

package/src/lib/orchestrator/route-detector.js

@@ -21,6 +21,7 @@ exports.getRouteInfo = getRouteInfo;
 const enums_1 = require("../constants/enums");
 const tokens_1 = require("../constants/tokens");
 const payload_builders_1 = require("./payload-builders");
+const data_utils_1 = require("./data-utils");
 const normalize_address_1 = require("./svm-idl/normalize-address");
 // ============================================================================
 // Transaction Route Enum
@@ -247,7 +248,7 @@ function validateRouteParams(params, context) {
         if (params.funds) {
             throw new RouteValidationError('migration is incompatible with funds');
         }
-        if (params.data) {
+        if ((0, data_utils_1.hasExecutablePayloadData)(params.data)) {
             throw new RouteValidationError('migration is incompatible with data');
         }
         if (isChainTarget(params.to) && (0, payload_builders_1.isSvmChain)(params.to.chain)) {

package/src/lib/progress-hook/progress-hook.js

@@ -23,10 +23,10 @@ const friendlyChain = (chainOrNs) => {
     const key = utils_1.Utils.chains.getChainName(asString);
     return key ? toTitleCase(key) : asString;
 };
-function preflightLevel(sufficient, enforceGasCheck) {
+function preflightLevel(sufficient) {
     if (sufficient)
         return 'INFO';
-    return enforceGasCheck === false ? 'WARNING' : 'ERROR';
+    return 'WARNING';
 }
 function preflightSuffix(sufficient, pathTag, enforceGasCheck) {
     if (sufficient)
@@ -273,6 +273,20 @@ const RAW_HOOKS_R1 = {
             level: 'ERROR',
         };
     },
+    [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_03]: (targetChain, elapsedMs) => ({
+        id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_03,
+        title: `Syncing State with ${friendlyChain(targetChain)} Timeout`,
+        message: `Timed out waiting for UGPC relay to ${targetChain}`,
+        response: { error: 'relay timeout', chain: targetChain, elapsedMs },
+        level: 'ERROR',
+    }),
+    [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99]: (txHash) => ({
+        id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99,
+        title: 'Push Chain Tx Completed',
+        message: `Intermediate Push Chain tx confirmed: ${txHash}, progressing to next phase`,
+        response: { txHash },
+        level: 'INFO',
+    }),
 };
 // =============================================================================
 // Route 2 — UEA → UGPC → CEA on target chain (201–299, signature-only)
@@ -342,7 +356,7 @@ const RAW_HOOKS_R2 = {
                 warningOnly: !sufficient && enforceGasCheck === false,
                 shortfall: (_d = extra === null || extra === void 0 ? void 0 : extra.shortfall) !== null && _d !== void 0 ? _d : null,
             },
-            level: preflightLevel(sufficient, enforceGasCheck),
+            level: preflightLevel(sufficient),
         };
     },
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_203_04]: (required, available, shortfall, ueaAddress, pathTag, extra) => {
@@ -467,13 +481,6 @@ const RAW_HOOKS_R2 = {
 // Route 3 — UEA → UGPC → CEA → sendUniversalTxToUEA → Push Chain (301–399)
 // =============================================================================
 const RAW_HOOKS_R3 = {
-    [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99_99]: (txHash) => ({
-        id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_99_99,
-        title: 'Push Chain Tx Completed',
-        message: `Intermediate Push Chain tx confirmed: ${txHash}, progressing to next phase`,
-        response: { txHash },
-        level: 'INFO',
-    }),
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_301]: (sourceChain, ceaAddress) => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_301,
         title: `${friendlyChain(sourceChain)}'s Executor Account Detected`,
@@ -560,7 +567,7 @@ const RAW_HOOKS_R3 = {
                 warningOnly: !sufficient && enforceGasCheck === false,
                 shortfall: (_d = extra === null || extra === void 0 ? void 0 : extra.shortfall) !== null && _d !== void 0 ? _d : null,
             },
-            level: preflightLevel(sufficient, enforceGasCheck),
+            level: preflightLevel(sufficient),
         };
     },
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_05]: (required, available, shortfall, ueaAddress, pathTag, extra) => {
@@ -727,6 +734,13 @@ const RAW_HOOKS_R3 = {
         },
         level: 'ERROR',
     }),
+    [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_99]: (sourceChain, txHash) => ({
+        id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_99,
+        title: `${friendlyChain(sourceChain)} Tx Completed`,
+        message: `Intermediate ${friendlyChain(sourceChain)} tx confirmed: ${txHash}, progressing to next phase`,
+        response: { chain: sourceChain, txHash },
+        level: 'INFO',
+    }),
 };
 // =============================================================================
 // UEA Migration hooks (unchanged)
@@ -828,7 +842,7 @@ const RAW_HOOKS_MULTICHAIN = {
                 warningOnly: !sufficient && enforceGasCheck === false,
                 shortfall: (_d = extra === null || extra === void 0 ? void 0 : extra.shortfall) !== null && _d !== void 0 ? _d : null,
             },
-            level: preflightLevel(sufficient, enforceGasCheck),
+            level: preflightLevel(sufficient),
         };
     },
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_003_04]: (required, available, shortfall, ueaAddress, pathTag, extra) => {