@pushchain/core 5.1.10 → 5.1.12

package/package.json

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

package/src/lib/constants/tokens.js

@@ -248,26 +248,33 @@ function makeToken(chain, symbol) {
 // Source of truth: SYNTHETIC_PUSH_ERC20 in ./chain.
 function buildPushChainMoveableTokenList() {
     const s = chain_1.SYNTHETIC_PUSH_ERC20[enums_1.PUSH_NETWORK.TESTNET_DONUT];
-    const mk = (symbol, decimals, address) => ({ symbol, decimals, address, mechanism: 'approve' });
+    const mk = (symbol, decimals, address, sourceChain) => ({
+        symbol,
+        decimals,
+        address,
+        mechanism: 'approve',
+        sourceChain,
+        prc20Address: address,
+    });
     return [
-        mk('pETH', 18, s.pETH),
-        mk('pETH_ARB', 18, s.pETH_ARB),
-        mk('pETH_BASE', 18, s.pETH_BASE),
-        mk('pBNB', 18, s.pBNB),
-        mk('pSOL', 9, s.pSOL),
-        mk('USDT', 6, s.USDT_ETH),
-        mk('USDT', 6, s.USDT_ARB),
-        mk('USDT', 6, s.USDT_BASE),
-        mk('USDT', 6, s.USDT_BNB),
-        mk('USDT', 6, s.USDT_SOL),
-        mk('USDC', 6, s.USDC_ETH),
-        mk('USDC', 6, s.USDC_ARB),
-        mk('USDC', 6, s.USDC_BASE),
-        mk('USDC', 6, s.USDC_BNB),
-        mk('USDC', 6, s.USDC_SOL),
-        mk('WETH', 18, s.WETH_ETH),
-        mk('stETH', 18, s.stETH_ETH),
-        mk('DAI', 18, s.DAI_SOL),
+        mk('pETH', 18, s.pETH, enums_1.CHAIN.ETHEREUM_SEPOLIA),
+        mk('pETH_ARB', 18, s.pETH_ARB, enums_1.CHAIN.ARBITRUM_SEPOLIA),
+        mk('pETH_BASE', 18, s.pETH_BASE, enums_1.CHAIN.BASE_SEPOLIA),
+        mk('pBNB', 18, s.pBNB, enums_1.CHAIN.BNB_TESTNET),
+        mk('pSOL', 9, s.pSOL, enums_1.CHAIN.SOLANA_DEVNET),
+        mk('USDT', 6, s.USDT_ETH, enums_1.CHAIN.ETHEREUM_SEPOLIA),
+        mk('USDT', 6, s.USDT_ARB, enums_1.CHAIN.ARBITRUM_SEPOLIA),
+        mk('USDT', 6, s.USDT_BASE, enums_1.CHAIN.BASE_SEPOLIA),
+        mk('USDT', 6, s.USDT_BNB, enums_1.CHAIN.BNB_TESTNET),
+        mk('USDT', 6, s.USDT_SOL, enums_1.CHAIN.SOLANA_DEVNET),
+        mk('USDC', 6, s.USDC_ETH, enums_1.CHAIN.ETHEREUM_SEPOLIA),
+        mk('USDC', 6, s.USDC_ARB, enums_1.CHAIN.ARBITRUM_SEPOLIA),
+        mk('USDC', 6, s.USDC_BASE, enums_1.CHAIN.BASE_SEPOLIA),
+        mk('USDC', 6, s.USDC_BNB, enums_1.CHAIN.BNB_TESTNET),
+        mk('USDC', 6, s.USDC_SOL, enums_1.CHAIN.SOLANA_DEVNET),
+        mk('WETH', 18, s.WETH_ETH, enums_1.CHAIN.ETHEREUM_SEPOLIA),
+        mk('stETH', 18, s.stETH_ETH, enums_1.CHAIN.ETHEREUM_SEPOLIA),
+        mk('DAI', 18, s.DAI_SOL, enums_1.CHAIN.SOLANA_DEVNET),
     ];
 }
 // Minimal initial registries. These can be extended safely without breaking the API.

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

@@ -89,7 +89,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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // Pass 0 when user omits gasLimit → contract uses per-chain baseGasLimitByChainNamespace
         const gasLimit = (_a = params.gasLimit) !== null && _a !== void 0 ? _a : BigInt(0);
         const routeStr = route;
@@ -227,10 +227,39 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         });
                     }
                 }
+                else if ((_f = params.funds) === null || _f === void 0 ? void 0 : _f.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],
+                            });
+                            ceaMulticalls.push({
+                                to: token.address,
+                                value: BigInt(0),
+                                data: erc20Transfer,
+                            });
+                        }
+                    }
+                }
                 // Determine PRC-20 token and burn amount
                 let prc20Token = selectors_1.ZERO_ADDRESS;
                 let burnAmount = BigInt(0);
-                if ((_f = params.funds) === null || _f === void 0 ? void 0 : _f.amount) {
+                if ((_g = params.funds) === null || _g === void 0 ? void 0 : _g.amount) {
                     const token = params.funds.token;
                     if (token) {
                         prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
@@ -288,7 +317,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         Buffer.from(ceaPda.toBytes()).toString('hex'));
                     let amount = BigInt(0);
                     let prc20Token;
-                    if (((_g = params.funds) === null || _g === void 0 ? void 0 : _g.amount) && params.funds.amount > BigInt(0)) {
+                    if (((_h = params.funds) === null || _h === void 0 ? void 0 : _h.amount) && params.funds.amount > BigInt(0)) {
                         amount = params.funds.amount;
                         const token = params.funds.token;
                         if (token && token.address) {
@@ -319,14 +348,14 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         gasFee,
                         sizing });
                 }
-                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_h = ctx.rpcUrls[sourceChain]) === null || _h === void 0 ? void 0 : _h[0]);
+                const { cea: ceaAddress } = yield (0, cea_utils_1.getCEAAddress)(ueaAddress, sourceChain, (_j = ctx.rpcUrls[sourceChain]) === null || _j === void 0 ? void 0 : _j[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 ((_j = params.funds) === null || _j === void 0 ? void 0 : _j.amount) {
+                if ((_k = params.funds) === null || _k === void 0 ? void 0 : _k.amount) {
                     const token = params.funds.token;
                     if (token) {
                         if (token.mechanism === 'native') {

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

@@ -116,7 +116,7 @@ function resolveR2Prc20TokenSvm(params, targetChain, pushNetwork, hasSvmExecute)
  * multicall when the target IS the CEA (avoids a CEA._handleMulticall revert).
  */
 function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress) {
-    var _a, _b;
+    var _a, _b, _c;
     if (params.migration) {
         return (0, payload_builders_1.buildMigrationPayload)();
     }
@@ -164,6 +164,38 @@ function buildR2CeaPayloadEvm(params, ceaAddress, targetAddress) {
             });
         }
     }
+    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.
+                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,
+                });
+            }
+        }
+    }
     return (0, payload_builders_1.buildCeaMulticallPayload)(ceaMulticalls);
 }
 const SIZER_HOOK_BY_ROUTE = {

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

@@ -212,7 +212,7 @@ function detectRoute(params) {
  * @throws ChainNotSupportedError if chain is not supported
  */
 function validateRouteParams(params, context) {
-    var _a, _b;
+    var _a, _b, _c;
     const route = detectRoute(params);
     // Validate from.chain is supported external chain (Routes 3, 4)
     if ((_a = params.from) === null || _a === void 0 ? void 0 : _a.chain) {
@@ -270,11 +270,19 @@ function validateRouteParams(params, context) {
             ? `${chainEnumToName(registeredOn)}.${token.symbol}`
             : token.symbol;
         const isPushToken = registeredOn !== undefined && isPushChain(registeredOn);
+        // For Push-registered tokens the caller may pass a stripped clone (e.g. via
+        // utils.tokens.getMoveableTokens), so look up the authoritative sourceChain
+        // from the registry rather than trusting only the caller-supplied field.
+        const registrySourceChain = registeredOn
+            ? (tokens_1.MOVEABLE_TOKENS[registeredOn] || []).find(t => t.address.toLowerCase() === token.address.toLowerCase() &&
+                t.symbol === token.symbol)
+            : undefined;
+        const effectiveSourceChain = (_c = token.sourceChain) !== null && _c !== void 0 ? _c : registrySourceChain === null || registrySourceChain === void 0 ? void 0 : registrySourceChain.sourceChain;
         const validateAgainst = (chain, direction) => {
             if (isPushChain(chain))
                 return;
             const ok = isPushToken
-                ? token.sourceChain === chain
+                ? effectiveSourceChain === chain
                 : (tokens_1.MOVEABLE_TOKENS[chain] || []).some(t => t.symbol === token.symbol);
             if (!ok) {
                 throw new RouteValidationError(`Unsupported moveable token for current client and route:\n` +

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

@@ -8,12 +8,19 @@ const withTimestamp = (fn) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return (...args) => (Object.assign(Object.assign({}, fn(...args)), { timestamp: new Date().toISOString() }));
 };
+const ACRONYMS = new Set(['BNB']);
+const toTitleCase = (key) => key
+    .split('_')
+    .map((part) => ACRONYMS.has(part)
+    ? part
+    : part.charAt(0).toUpperCase() + part.slice(1).toLowerCase())
+    .join(' ');
 const friendlyChain = (chainOrNs) => {
-    var _a;
     if (!chainOrNs)
         return 'chain';
     const asString = String(chainOrNs);
-    return (_a = utils_1.Utils.chains.getChainName(asString)) !== null && _a !== void 0 ? _a : asString;
+    const key = utils_1.Utils.chains.getChainName(asString);
+    return key ? toTitleCase(key) : asString;
 };
 /**
  * Classify a sign-time error as either a true wallet user-decline

package/src/lib/utils.d.ts

@@ -238,6 +238,8 @@ export declare class Utils {
                 decimals: number;
                 address: string;
                 mechanism: "approve" | "permit2" | "native";
+                sourceChain?: CHAIN;
+                prc20Address?: `0x${string}`;
             }>;
         };
         /**

package/src/lib/utils.js

@@ -526,37 +526,22 @@ Utils.tokens = {
      * - Otherwise returns tokens across all chains
      */
     getMoveableTokens(chainOrClient) {
-        var _a, _b;
+        var _a;
         const chain = Utils.resolveChainFromInput(chainOrClient);
+        const map = (k, t) => {
+            var _a;
+            const extra = t;
+            return Object.assign(Object.assign({ chain: k, chainName: (_a = Utils.chains.getChainName(k)) !== null && _a !== void 0 ? _a : k, symbol: t.symbol, decimals: t.decimals, address: t.address, mechanism: t.mechanism }, (extra.sourceChain ? { sourceChain: extra.sourceChain } : {})), (extra.prc20Address ? { prc20Address: extra.prc20Address } : {}));
+        };
         if (chain) {
             const list = (_a = tokens_1.MOVEABLE_TOKENS[chain]) !== null && _a !== void 0 ? _a : [];
-            return {
-                tokens: list.map((t) => {
-                    var _a;
-                    return ({
-                        chain,
-                        chainName: (_a = Utils.chains.getChainName(chain)) !== null && _a !== void 0 ? _a : chain,
-                        symbol: t.symbol,
-                        decimals: t.decimals,
-                        address: t.address,
-                        mechanism: t.mechanism,
-                    });
-                }),
-            };
+            return { tokens: list.map((t) => map(chain, t)) };
         }
         const tokens = [];
         for (const [key, list] of Object.entries(tokens_1.MOVEABLE_TOKENS)) {
             const k = key;
-            for (const t of list !== null && list !== void 0 ? list : []) {
-                tokens.push({
-                    chain: k,
-                    chainName: (_b = Utils.chains.getChainName(k)) !== null && _b !== void 0 ? _b : k,
-                    symbol: t.symbol,
-                    decimals: t.decimals,
-                    address: t.address,
-                    mechanism: t.mechanism,
-                });
-            }
+            for (const t of list !== null && list !== void 0 ? list : [])
+                tokens.push(map(k, t));
         }
         return { tokens };
     },