@pushchain/core 6.0.3 → 6.0.4

package/package.json

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

package/src/lib/orchestrator/data-utils.d.ts

@@ -0,0 +1,5 @@
+import type { ExecuteParams } from './orchestrator.types';
+type PayloadData = ExecuteParams['data'];
+export declare function hasExecutablePayloadData(data: PayloadData): boolean;
+export declare function isEmptyPayloadData(data: PayloadData): boolean;
+export {};

package/src/lib/orchestrator/data-utils.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasExecutablePayloadData = hasExecutablePayloadData;
+exports.isEmptyPayloadData = isEmptyPayloadData;
+function hasExecutablePayloadData(data) {
+    return !(data === undefined ||
+        data === '0x' ||
+        (Array.isArray(data) && data.length === 0));
+}
+function isEmptyPayloadData(data) {
+    return !hasExecutablePayloadData(data);
+}
+//# sourceMappingURL=data-utils.js.map

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

@@ -23,6 +23,7 @@ const selectors_1 = require("../../constants/selectors");
 const route_detector_1 = require("../route-detector");
 const cea_utils_1 = require("../cea-utils");
 const payload_builders_1 = require("../payload-builders");
+const data_utils_1 = require("../data-utils");
 const push_chain_1 = require("../../push-chain/push-chain");
 const context_1 = require("./context");
 const helpers_1 = require("./helpers");
@@ -122,7 +123,7 @@ function prepareTransaction(ctx, params, callbacks) {
 // ============================================================================
 function buildHopDescriptor(ctx, params, route, ueaAddress) {
     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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         // Pass 0 when user omits gasLimit so the contract uses the per-chain base,
         // except EVM Route 3 where a CEA deploy + sendUniversalTxToUEA needs more
         // than the generic 500k source-chain base.
@@ -258,7 +259,8 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                 }
                 // Build CEA multicalls
                 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);
                     }
@@ -291,42 +293,39 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         });
                     }
                 }
-                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()) {
+                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') {
+                        const erc20Transfer = (0, viem_1.encodeFunctionData)({
+                            abi: erc20_evm_1.ERC20_EVM,
+                            functionName: 'transfer',
+                            args: [target.address, params.funds.amount],
+                        });
                         ceaMulticalls.push({
-                            to: target.address,
-                            value: params.value,
-                            data: '0x',
+                            to: token.address,
+                            value: BigInt(0),
+                            data: erc20Transfer,
                         });
                     }
-                }
-                else if ((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount) {
-                    // Funds-only transfer (no data, no value). Without this branch the
-                    // CEA multicall is empty and relayed funds stay in the CEA instead
-                    // of reaching the caller's recipient.
-                    const token = params.funds.token;
-                    if (token) {
-                        if (token.mechanism === 'native') {
-                            if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
-                                ceaMulticalls.push({
-                                    to: target.address,
-                                    value: params.funds.amount,
-                                    data: '0x',
-                                });
-                            }
-                        }
-                        else {
-                            const erc20Transfer = (0, viem_1.encodeFunctionData)({
-                                abi: erc20_evm_1.ERC20_EVM,
-                                functionName: 'transfer',
-                                args: [target.address, params.funds.amount],
+                    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()) {
+                            ceaMulticalls.push({
+                                to: target.address,
+                                value: params.value,
+                                data: '0x',
                             });
+                        }
+                    }
+                    else if (((_m = params.funds) === null || _m === void 0 ? void 0 : _m.amount) && (token === null || token === void 0 ? void 0 : token.mechanism) === 'native') {
+                        if (target.address.toLowerCase() !== ceaAddress.toLowerCase()) {
                             ceaMulticalls.push({
-                                to: token.address,
-                                value: BigInt(0),
-                                data: erc20Transfer,
+                                to: target.address,
+                                value: params.funds.amount,
+                                data: '0x',
                             });
                         }
                     }
@@ -334,7 +333,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                 // Determine PRC-20 token and burn amount
                 let prc20Token = selectors_1.ZERO_ADDRESS;
                 let burnAmount = BigInt(0);
-                if ((_l = params.funds) === null || _l === void 0 ? void 0 : _l.amount) {
+                if ((_o = params.funds) === null || _o === void 0 ? void 0 : _o.amount) {
                     const token = params.funds.token;
                     if (token) {
                         prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
@@ -345,7 +344,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, ctx.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 PRC-20 token for
                     // chain namespace lookup + gas fees, but burn amount must be zero.
                     // Matches the direct executeUoaToCea path (route-handlers.ts).
@@ -379,7 +378,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
             case route_detector_1.TransactionRoute.CEA_TO_PUSH: {
                 // Route 3: Build CEA multicalls for sendUniversalTxFromCEA
                 const sourceChain = params.from.chain;
-                const seedAmount = (_m = params.value) !== null && _m !== void 0 ? _m : BigInt(0);
+                const seedAmount = (_p = params.value) !== null && _p !== void 0 ? _p : BigInt(0);
                 if (isValueOnlyNativeSeedToOwnUea(params, ueaAddress)) {
                     return Object.assign(Object.assign({}, baseDescriptor), { sourceChain, burnAmount: BigInt(0), gasToken: selectors_1.ZERO_ADDRESS, gasFee: BigInt(0), nativeSeedOnly: true, nativeSeedAmount: seedAmount });
                 }
@@ -399,7 +398,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         Buffer.from(ceaPda.toBytes()).toString('hex'));
                     let amount = BigInt(0);
                     let prc20Token;
-                    if (((_o = params.funds) === null || _o === void 0 ? void 0 : _o.amount) && params.funds.amount > BigInt(0)) {
+                    if (((_q = params.funds) === null || _q === void 0 ? void 0 : _q.amount) && params.funds.amount > BigInt(0)) {
                         amount = params.funds.amount;
                         const token = params.funds.token;
                         if (token && token.address) {
@@ -447,14 +446,14 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         gasFee,
                         gasPrice, gasLimit: effectiveGasLimit, sizing });
                 }
-                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_p = ctx.rpcUrls[sourceChain]) === null || _p === void 0 ? void 0 : _p[0]);
+                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_r = ctx.rpcUrls[sourceChain]) === null || _r === void 0 ? void 0 : _r[0]);
                 // CEA auto-deploys on-chain: Vault.finalizeUniversalTx calls CEAFactory.deployCEA()
                 // if CEA doesn't exist yet. No SDK-side blocking needed.
                 // Determine token/amount for the inbound
                 let tokenAddress = selectors_1.ZERO_ADDRESS;
                 let amount = BigInt(0);
                 let nativeValue = BigInt(0);
-                if ((_q = params.funds) === null || _q === void 0 ? void 0 : _q.amount) {
+                if ((_s = params.funds) === null || _s === void 0 ? void 0 : _s.amount) {
                     const token = params.funds.token;
                     if (token) {
                         if (token.mechanism === 'native') {
@@ -644,16 +643,11 @@ function getSegmentType(route) {
 function sumMulticallNativeValue(multicalls) {
     return (multicalls !== null && multicalls !== void 0 ? multicalls : []).reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
 }
-function isEmptyPayloadData(data) {
-    return (data === undefined ||
-        data === '0x' ||
-        (Array.isArray(data) && data.length === 0));
-}
 function isValueOnlyNativeSeedToOwnUea(params, ueaAddress) {
     var _a, _b;
     return (((_a = params.value) !== null && _a !== void 0 ? _a : BigInt(0)) > BigInt(0) &&
         !((_b = params.funds) === null || _b === void 0 ? void 0 : _b.amount) &&
-        isEmptyPayloadData(params.data) &&
+        (0, data_utils_1.isEmptyPayloadData)(params.data) &&
         typeof params.to === 'string' &&
         params.to.toLowerCase() === ueaAddress.toLowerCase());
 }
@@ -1058,7 +1052,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 (((_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)((_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)) {
                             const hopCalls = (0, payload_builders_1.buildExecuteMulticall)({
                                 execute: {
                                     to: h.params.to,
@@ -1066,6 +1060,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                                     data: h.params.data,
                                 },
                                 ueaAddress,
+                                allowSelfValueCall: true,
                             });
                             mergedHopMulticalls.push(...hopCalls);
                         }

package/src/lib/orchestrator/internals/execute-funds-only.js

@@ -69,7 +69,7 @@ function executeFundsOnly(ctx, execute, eventBuffer, getResponseCallbacks) {
 // ============================================================================
 function executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, lockerContract, bridgeAmount, symbol) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const evmClient = (0, context_1.getOriginEvmClient)(ctx);
         const gatewayAddress = lockerContract;
         const tokenAddr = execute.funds.token.address;
@@ -96,8 +96,28 @@ function executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcU
             nonce: nonce.toString(), deployed,
         }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
         const ueaBalanceForGas = yield ctx.pushClient.getBalance(ueaAddress);
-        const nativeAmount = yield (0, gas_calculator_1.calculateNativeAmountForDeposit)(ctx, chain, BigInt(0), ueaBalanceForGas);
-        (0, context_2.printLog)(ctx, `sendFunds — nativeAmount: ${nativeAmount.toString()}, ueaBalanceForGas: ${ueaBalanceForGas.toString()}`);
+        const gasEstimate = execute.gasLimit || BigInt(1e7);
+        const gasPrice = yield ctx.pushClient.getGasPrice();
+        const requiredGasFee = gasEstimate * gasPrice;
+        const requiredFunds = requiredGasFee + ((_c = execute.value) !== null && _c !== void 0 ? _c : BigInt(0));
+        let nativeAmount = yield (0, gas_calculator_1.calculateNativeAmountForDeposit)(ctx, chain, requiredFunds, ueaBalanceForGas);
+        // For EVM fee-locking, fixed-rate PC→USD sizing can underfund when the
+        // live WPC/native pool prices PC above the SDK's fallback price. Size the
+        // native deposit against the same Push Chain pool used by the gateway.
+        if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.EVM && requiredFunds > ueaBalanceForGas) {
+            const deficit = requiredFunds - ueaBalanceForGas;
+            const targetWpc = (deficit * BigInt(12)) / BigInt(10);
+            const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(chain, ctx.pushNetwork);
+            const poolNativeAmount = yield (0, gas_calculator_1.estimateNativeForDesiredDeposit)(ctx, targetWpc, originPrc20);
+            if (poolNativeAmount > nativeAmount) {
+                (0, context_2.printLog)(ctx, `sendFunds — pool-based deposit sizing overrides fixed-rate estimate: fixedNative=${nativeAmount.toString()}, ` +
+                    `poolNative=${poolNativeAmount.toString()}, requiredFunds=${requiredFunds.toString()}, ` +
+                    `ueaBalance=${ueaBalanceForGas.toString()}`);
+                nativeAmount = poolNativeAmount;
+            }
+        }
+        (0, context_2.printLog)(ctx, `sendFunds — nativeAmount: ${nativeAmount.toString()}, ueaBalanceForGas: ${ueaBalanceForGas.toString()}, ` +
+            `requiredFunds: ${requiredFunds.toString()}`);
         (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_01);
         (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_02, ueaAddress, deployed);
         (0, context_2.printLog)(ctx, `UEA resolved: ${ueaAddress}, deployed: ${deployed}`);

package/src/lib/orchestrator/internals/preflight.d.ts

@@ -13,8 +13,9 @@
  *   - emits `SEND-TX-203-03` (INFO, sufficient) and lets the caller proceed;
  *   - emits `SEND-TX-203-03` (WARNING, insufficient) and proceeds when
  *     enforceGasCheck is false/omitted; or
- *   - emits `SEND-TX-203-03` (ERROR, insufficient) + `SEND-TX-203-04` and
- *     throws `InsufficientUEABalanceError` when enforceGasCheck is true.
+ *   - emits `SEND-TX-203-03` (WARNING, insufficient) + `SEND-TX-203-04`
+ *     (ERROR, terminal shortfall) and throws `InsufficientUEABalanceError`
+ *     when enforceGasCheck is true.
  *
  * The helper is intentionally not "pure" — it emits hooks and may throw.
  * Callers fetch all balances (so the helper itself does no I/O).

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

@@ -14,8 +14,9 @@
  *   - emits `SEND-TX-203-03` (INFO, sufficient) and lets the caller proceed;
  *   - emits `SEND-TX-203-03` (WARNING, insufficient) and proceeds when
  *     enforceGasCheck is false/omitted; or
- *   - emits `SEND-TX-203-03` (ERROR, insufficient) + `SEND-TX-203-04` and
- *     throws `InsufficientUEABalanceError` when enforceGasCheck is true.
+ *   - emits `SEND-TX-203-03` (WARNING, insufficient) + `SEND-TX-203-04`
+ *     (ERROR, terminal shortfall) and throws `InsufficientUEABalanceError`
+ *     when enforceGasCheck is true.
  *
  * The helper is intentionally not "pure" — it emits hooks and may throw.
  * Callers fetch all balances (so the helper itself does no I/O).

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/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.
      */

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)
@@ -342,7 +342,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) => {
@@ -560,7 +560,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) => {
@@ -828,7 +828,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) => {

package/src/lib/progress-hook/progress-hook.types.d.ts

@@ -68,7 +68,7 @@ export declare enum PROGRESS_HOOK {
     SEND_TX_303_03_01 = "SEND-TX-303-03-01",// Sizer: Case A (< $1, padded)
     SEND_TX_303_03_02 = "SEND-TX-303-03-02",// Sizer: Case B ($1–$10, happy path)
     SEND_TX_303_03_03 = "SEND-TX-303-03-03",// Sizer: Case C (> $10, split + overflow bridge)
-    SEND_TX_303_04 = "SEND-TX-303-04",// R3 pre-flight balance check (INFO/WARNING/ERROR per enforceGasCheck)
+    SEND_TX_303_04 = "SEND-TX-303-04",// R3 pre-flight balance check (INFO when sufficient, WARNING when short)
     SEND_TX_303_05 = "SEND-TX-303-05",// R3 pre-flight FAILED (ERROR, terminal precursor before 399-02)
     SEND_TX_303_06 = "SEND-TX-303-06",// R3 SVM warn-threshold tripped (INFO, no action)
     SEND_TX_304_01 = "SEND-TX-304-01",
@@ -87,7 +87,7 @@ export declare enum PROGRESS_HOOK {
     SEND_TX_001 = "SEND-TX-001",
     SEND_TX_002_01 = "SEND-TX-002-01",
     SEND_TX_002_99_99 = "SEND-TX-002-99-99",
-    SEND_TX_003_03 = "SEND-TX-003-03",// Cascade pre-flight balance check (INFO/WARNING/ERROR per enforceGasCheck)
+    SEND_TX_003_03 = "SEND-TX-003-03",// Cascade pre-flight balance check (INFO when sufficient, WARNING when short)
     SEND_TX_003_04 = "SEND-TX-003-04",// Cascade pre-flight FAILED (ERROR, terminal precursor before 999-02)
     SEND_TX_003_05 = "SEND-TX-003-05",// Cascade SVM warn-threshold tripped (INFO, no action)
     SEND_TX_999_01 = "SEND-TX-999-01",

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

@@ -37,8 +37,7 @@ var PROGRESS_HOOK;
     PROGRESS_HOOK["SEND_TX_202_02"] = "SEND-TX-202-02";
     PROGRESS_HOOK["SEND_TX_203_01"] = "SEND-TX-203-01";
     PROGRESS_HOOK["SEND_TX_203_02"] = "SEND-TX-203-02";
-    // Pre-flight balance check (203-03 INFO when sufficient, WARNING when
-    // short but enforceGasCheck=false, ERROR when enforceGasCheck=true;
+    // Pre-flight balance check (203-03 INFO when sufficient, WARNING when short;
     // 203-04 ERROR terminal precursor on enforced shortfall;
     // 203-05 INFO SVM warn-threshold tripped).
     // 203 bucket choice is temporal (sits between 203-02 CEA-resolved and 204-01 sign),

package/src/lib/push-chain/push-chain.d.ts

@@ -71,6 +71,8 @@ export declare class PushChain {
          * @param options.enforceGasCheck - Defaults to false. When true, the
          *   SDK stops on pre-flight gas/balance shortfall instead of warning
          *   and proceeding.
+         * @param params.progressHook - Optional per-call progress callback.
+         *   Alias for `sendTransaction(params, { progressHook })`.
          * @param options.progressHook - Optional per-call progress callback.
          *   Additive with the init-time `progressHook` passed to `initialize`:
          *   both hooks receive every `ProgressEvent` emitted during this call.