@pushchain/core 5.1.8 → 5.1.10

package/package.json

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

package/src/lib/constants/chain.d.ts

@@ -28,7 +28,7 @@ export declare const SYNTHETIC_PUSH_ERC20: Record<PUSH_NETWORK, {
     pETH: `0x${string}`;
     pETH_ARB: `0x${string}`;
     pETH_BASE: `0x${string}`;
-    pETH_BNB: `0x${string}`;
+    pBNB: `0x${string}`;
     pSOL: `0x${string}`;
     USDT_ETH: `0x${string}`;
     USDC_ETH: `0x${string}`;
@@ -40,6 +40,9 @@ export declare const SYNTHETIC_PUSH_ERC20: Record<PUSH_NETWORK, {
     USDC_BNB: `0x${string}`;
     USDT_BASE: `0x${string}`;
     USDC_BASE: `0x${string}`;
+    WETH_ETH: `0x${string}`;
+    stETH_ETH: `0x${string}`;
+    DAI_SOL: `0x${string}`;
 }>;
 /**
  * Canonical metadata for each chain supported by the SDK.

package/src/lib/constants/chain.js

@@ -54,7 +54,7 @@ exports.SYNTHETIC_PUSH_ERC20 = {
         pETH: '0x2971824Db68229D087931155C2b8bB820B275809',
         pETH_ARB: '0xc0a821a1AfEd1322c5e15f1F4586C0B8cE65400e',
         pETH_BASE: '0xc7007af2B24D4eb963fc9633B0c66e1d2D90Fc21',
-        pETH_BNB: '0x7a9082dA308f3fa005beA7dB0d203b3b86664E36',
+        pBNB: '0x7a9082dA308f3fa005beA7dB0d203b3b86664E36',
         pSOL: '0x5D525Df2bD99a6e7ec58b76aF2fd95F39874EBed',
         USDT_ETH: '0xCA0C5E6F002A389E1580F0DB7cd06e4549B5F9d3',
         USDC_ETH: '0x7A58048036206bB898008b5bBDA85697DB1e5d66',
@@ -66,12 +66,15 @@ exports.SYNTHETIC_PUSH_ERC20 = {
         USDC_BNB: '0xTBD',
         USDT_BASE: '0x2C455189D2af6643B924A981a9080CcC63d5a567',
         USDC_BASE: '0xD7C6cA1e2c0CE260BE0c0AD39C1540de460e3Be1',
+        WETH_ETH: '0x0d0dF7E8807430A81104EA84d926139816eC7586',
+        stETH_ETH: '0xaf89E805949c628ebde3262e91dc4ab9eA12668E',
+        DAI_SOL: '0x5861f56A556c990358cc9cccd8B5baa3767982A8',
     },
     [enums_1.PUSH_NETWORK.TESTNET]: {
         pETH: '0x2971824Db68229D087931155C2b8bB820B275809',
         pETH_ARB: '0xc0a821a1AfEd1322c5e15f1F4586C0B8cE65400e',
         pETH_BASE: '0xc7007af2B24D4eb963fc9633B0c66e1d2D90Fc21',
-        pETH_BNB: '0x7a9082dA308f3fa005beA7dB0d203b3b86664E36',
+        pBNB: '0x7a9082dA308f3fa005beA7dB0d203b3b86664E36',
         pSOL: '0x5D525Df2bD99a6e7ec58b76aF2fd95F39874EBed',
         USDT_ETH: '0xCA0C5E6F002A389E1580F0DB7cd06e4549B5F9d3',
         USDC_ETH: '0x7A58048036206bB898008b5bBDA85697DB1e5d66',
@@ -83,12 +86,15 @@ exports.SYNTHETIC_PUSH_ERC20 = {
         USDC_BNB: '0xTBD',
         USDT_BASE: '0x2C455189D2af6643B924A981a9080CcC63d5a567',
         USDC_BASE: '0xD7C6cA1e2c0CE260BE0c0AD39C1540de460e3Be1',
+        WETH_ETH: '0x0d0dF7E8807430A81104EA84d926139816eC7586',
+        stETH_ETH: '0xaf89E805949c628ebde3262e91dc4ab9eA12668E',
+        DAI_SOL: '0x5861f56A556c990358cc9cccd8B5baa3767982A8',
     },
     [enums_1.PUSH_NETWORK.LOCALNET]: {
         pETH: '0xTBD',
         pETH_ARB: '0xTBD',
         pETH_BASE: '0xTBD',
-        pETH_BNB: '0xTBD',
+        pBNB: '0xTBD',
         pSOL: '0xTBD',
         USDT_ETH: '0xTBD',
         USDC_ETH: '0xTBD',
@@ -100,12 +106,15 @@ exports.SYNTHETIC_PUSH_ERC20 = {
         USDC_BNB: '0xTBD',
         USDT_BASE: '0xTBD',
         USDC_BASE: '0xTBD',
+        WETH_ETH: '0xTBD',
+        stETH_ETH: '0xTBD',
+        DAI_SOL: '0xTBD',
     },
     [enums_1.PUSH_NETWORK.MAINNET]: {
         pETH: '0xTBD',
         pETH_ARB: '0xTBD',
         pETH_BASE: '0xTBD',
-        pETH_BNB: '0xTBD',
+        pBNB: '0xTBD',
         pSOL: '0xTBD',
         USDT_ETH: '0xTBD',
         USDC_ETH: '0xTBD',
@@ -117,6 +126,9 @@ exports.SYNTHETIC_PUSH_ERC20 = {
         USDC_BNB: '0xTBD',
         USDT_BASE: '0xTBD',
         USDC_BASE: '0xTBD',
+        WETH_ETH: '0xTBD',
+        stETH_ETH: '0xTBD',
+        DAI_SOL: '0xTBD',
     },
 };
 /**
@@ -206,8 +218,8 @@ exports.CHAIN_INFO = {
         timeout: 30000,
         explorerUrl: 'https://sepolia.arbiscan.io',
         dex: {
-            uniV3Factory: '0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24',
-            uniV3QuoterV2: '0xTBD',
+            uniV3Factory: '0x248AB79Bbb9bC29bB72f7Cd42F17e054Fc40188e',
+            uniV3QuoterV2: '0x2779a0CC1c3e0E44D2542EC3e79e3864Ae93Ef0B',
             weth: '0x980B62Da83eFf3D4576C647993b0c1D7faf17c73',
         },
     },
@@ -226,7 +238,7 @@ exports.CHAIN_INFO = {
         explorerUrl: 'https://sepolia.basescan.org',
         dex: {
             uniV3Factory: '0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24',
-            uniV3QuoterV2: '0xTBD',
+            uniV3QuoterV2: '0xC5290058841028F1614F3A6F0F5816cAd0df5E27',
             weth: '0x4200000000000000000000000000000000000006',
         },
     },

package/src/lib/constants/tokens.d.ts

@@ -14,17 +14,21 @@ export interface PayableToken {
 export type MoveableTokenMap = Partial<{
     ETH: MoveableToken;
     SOL: MoveableToken;
+    BNB: MoveableToken;
     USDT: MoveableToken;
     USDC: MoveableToken;
     WETH: MoveableToken;
     stETH: MoveableToken;
+    DAI: MoveableToken;
 }>;
 export type PayableTokenMap = Partial<{
     ETH: PayableToken;
+    BNB: PayableToken;
     USDT: PayableToken;
     USDC: PayableToken;
     WETH: PayableToken;
     stETH: PayableToken;
+    DAI: PayableToken;
 }>;
 export declare class MoveableTokenAccessor {
     private readonly tokens;
@@ -32,16 +36,19 @@ export declare class MoveableTokenAccessor {
     private require;
     get ETH(): MoveableToken;
     get SOL(): MoveableToken;
+    get BNB(): MoveableToken;
     get USDT(): MoveableToken;
     get WETH(): MoveableToken;
     get USDC(): MoveableToken;
     get stETH(): MoveableToken;
+    get DAI(): MoveableToken;
 }
 export declare class PayableTokenAccessor {
     private readonly tokens;
     constructor(tokens: Record<string, PayableToken>);
     private require;
     get ETH(): PayableToken;
+    get BNB(): PayableToken;
     get USDT(): PayableToken;
     get USDC(): PayableToken;
     get WETH(): PayableToken;
@@ -73,8 +80,11 @@ export interface PushChainMoveableTokenAccessor {
     readonly pEth: PushChainMoveableToken;
     readonly pEthArb: PushChainMoveableToken;
     readonly pEthBase: PushChainMoveableToken;
-    readonly pEthBnb: PushChainMoveableToken;
+    readonly pBnb: PushChainMoveableToken;
     readonly pSol: PushChainMoveableToken;
+    readonly pWeth: PushChainMoveableToken;
+    readonly pStEth: PushChainMoveableToken;
+    readonly pDai: PushChainMoveableToken;
     readonly USDT: ChainSuffixAccessor;
     readonly USDC: ChainSuffixAccessor;
 }

package/src/lib/constants/tokens.js

@@ -21,6 +21,9 @@ class MoveableTokenAccessor {
     get SOL() {
         return this.require('SOL');
     }
+    get BNB() {
+        return this.require('BNB');
+    }
     get USDT() {
         return this.require('USDT');
     }
@@ -33,6 +36,9 @@ class MoveableTokenAccessor {
     get stETH() {
         return this.require('stETH');
     }
+    get DAI() {
+        return this.require('DAI');
+    }
 }
 exports.MoveableTokenAccessor = MoveableTokenAccessor;
 class PayableTokenAccessor {
@@ -48,6 +54,9 @@ class PayableTokenAccessor {
     get ETH() {
         return this.require('ETH');
     }
+    get BNB() {
+        return this.require('BNB');
+    }
     get USDT() {
         return this.require('USDT');
     }
@@ -175,25 +184,24 @@ const TOKEN_META = {
     },
     // BNB Testnet
     [enums_1.CHAIN.BNB_TESTNET]: {
-        // NOTE: Both symbols are provided to mirror existing usage across maps
         BNB: {
             symbol: 'BNB',
             decimals: 18,
             address: NATIVE,
             mechanism: 'native',
         },
-        ETH: {
-            symbol: 'ETH',
-            decimals: 18,
-            address: NATIVE,
-            mechanism: 'native',
-        },
         USDT: {
             symbol: 'USDT',
             decimals: 6,
             address: '0xBC14F348BC9667be46b35Edc9B68653d86013DC5',
             mechanism: 'approve',
         },
+        USDC: {
+            symbol: 'USDC',
+            decimals: 6,
+            address: '0x64544969ed7EBf5f083679233325356EbE738930',
+            mechanism: 'approve',
+        },
     },
     // Solana Devnet
     [enums_1.CHAIN.SOLANA_DEVNET]: {
@@ -215,6 +223,12 @@ const TOKEN_META = {
             address: '4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU',
             mechanism: 'approve',
         },
+        DAI: {
+            symbol: 'DAI',
+            decimals: 18,
+            address: 'G2ZLaRhpohW23KTEX3fBjZXtNTFFwemqCaWWnWVTj4TB',
+            mechanism: 'approve',
+        },
     },
 };
 function makeToken(chain, symbol) {
@@ -239,7 +253,7 @@ function buildPushChainMoveableTokenList() {
         mk('pETH', 18, s.pETH),
         mk('pETH_ARB', 18, s.pETH_ARB),
         mk('pETH_BASE', 18, s.pETH_BASE),
-        mk('pETH_BNB', 18, s.pETH_BNB),
+        mk('pBNB', 18, s.pBNB),
         mk('pSOL', 9, s.pSOL),
         mk('USDT', 6, s.USDT_ETH),
         mk('USDT', 6, s.USDT_ARB),
@@ -251,6 +265,9 @@ function buildPushChainMoveableTokenList() {
         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),
     ];
 }
 // Minimal initial registries. These can be extended safely without breaking the API.
@@ -281,13 +298,15 @@ exports.MOVEABLE_TOKENS = {
         makeToken(enums_1.CHAIN.BASE_SEPOLIA, 'WETH'),
     ],
     [enums_1.CHAIN.BNB_TESTNET]: [
-        makeToken(enums_1.CHAIN.BNB_TESTNET, 'ETH'),
+        makeToken(enums_1.CHAIN.BNB_TESTNET, 'BNB'),
         makeToken(enums_1.CHAIN.BNB_TESTNET, 'USDT'),
+        makeToken(enums_1.CHAIN.BNB_TESTNET, 'USDC'),
     ],
     [enums_1.CHAIN.SOLANA_DEVNET]: [
         makeToken(enums_1.CHAIN.SOLANA_DEVNET, 'SOL'),
         makeToken(enums_1.CHAIN.SOLANA_DEVNET, 'USDT'),
         makeToken(enums_1.CHAIN.SOLANA_DEVNET, 'USDC'),
+        makeToken(enums_1.CHAIN.SOLANA_DEVNET, 'DAI'),
     ],
 };
 exports.PAYABLE_TOKENS = {
@@ -342,8 +361,11 @@ function buildPushChainMoveableTokenAccessor() {
         pEth: mk('pETH', 18, s.pETH, enums_1.CHAIN.ETHEREUM_SEPOLIA),
         pEthArb: mk('pETH_ARB', 18, s.pETH_ARB, enums_1.CHAIN.ARBITRUM_SEPOLIA),
         pEthBase: mk('pETH_BASE', 18, s.pETH_BASE, enums_1.CHAIN.BASE_SEPOLIA),
-        pEthBnb: mk('pETH_BNB', 18, s.pETH_BNB, enums_1.CHAIN.BNB_TESTNET),
+        pBnb: mk('pBNB', 18, s.pBNB, enums_1.CHAIN.BNB_TESTNET),
         pSol: mk('pSOL', 9, s.pSOL, enums_1.CHAIN.SOLANA_DEVNET),
+        pWeth: mk('WETH', 18, s.WETH_ETH, enums_1.CHAIN.ETHEREUM_SEPOLIA),
+        pStEth: mk('stETH', 18, s.stETH_ETH, enums_1.CHAIN.ETHEREUM_SEPOLIA),
+        pDai: mk('DAI', 18, s.DAI_SOL, enums_1.CHAIN.SOLANA_DEVNET),
         USDT: {
             eth: mk('USDT', 6, s.USDT_ETH, enums_1.CHAIN.ETHEREUM_SEPOLIA),
             arb: mk('USDT', 6, s.USDT_ARB, enums_1.CHAIN.ARBITRUM_SEPOLIA),

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

@@ -127,7 +127,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                     if ((_b = params.funds) === null || _b === void 0 ? void 0 : _b.amount) {
                         const token = params.funds.token;
                         if (token) {
-                            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+                            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
                             burnAmount = params.funds.amount;
                         }
                     }
@@ -233,7 +233,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                 if ((_f = params.funds) === null || _f === void 0 ? void 0 : _f.amount) {
                     const token = params.funds.token;
                     if (token) {
-                        prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+                        prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
                         burnAmount = params.funds.amount;
                     }
                 }
@@ -292,7 +292,7 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         amount = params.funds.amount;
                         const token = params.funds.token;
                         if (token && token.address) {
-                            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+                            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
                         }
                         else {
                             prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork);

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

@@ -75,7 +75,7 @@ function getNativePRC20ForChain(targetChain, pushNetwork) {
         case enums_1.CHAIN.BASE_SEPOLIA:
             return synthetics.pETH_BASE;
         case enums_1.CHAIN.BNB_TESTNET:
-            return synthetics.pETH_BNB;
+            return synthetics.pBNB;
         case enums_1.CHAIN.SOLANA_DEVNET:
         case enums_1.CHAIN.SOLANA_TESTNET:
         case enums_1.CHAIN.SOLANA_MAINNET:

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

@@ -62,7 +62,7 @@ function resolveR2Prc20TokenEvm(params, targetChain, pushNetwork) {
         // User explicitly specified funds with token
         const token = params.funds.token;
         if (token) {
-            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
             burnAmount = params.funds.amount;
         }
     }
@@ -90,7 +90,7 @@ function resolveR2Prc20TokenSvm(params, targetChain, pushNetwork, hasSvmExecute)
     if ((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) {
         const token = params.funds.token;
         if (token) {
-            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
             burnAmount = params.funds.amount;
         }
     }
@@ -101,7 +101,7 @@ function resolveR2Prc20TokenSvm(params, targetChain, pushNetwork, hasSvmExecute)
     else if (hasSvmExecute) {
         const token = params.funds && params.funds.token;
         if (token) {
-            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
         }
         else {
             prc20Token = (0, helpers_1.getNativePRC20ForChain)(targetChain, pushNetwork);
@@ -1269,7 +1269,7 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                     if ((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) {
                         const token = params.funds.token;
                         if (token) {
-                            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+                            prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
                             burnAmount = params.funds.amount;
                         }
                     }
@@ -1321,7 +1321,7 @@ function buildPayloadForRoute(ctx, params, route, nonce) {
                 if ((_d = params.funds) === null || _d === void 0 ? void 0 : _d.amount) {
                     const token = params.funds.token;
                     if (token) {
-                        prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+                        prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
                         burnAmount = params.funds.amount;
                     }
                 }

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

@@ -68,7 +68,7 @@ function buildExecuteMulticall({ execute, ueaAddress, logger, }) {
                 functionName: 'transfer',
                 args: [execute.to, (_q = execute.funds) === null || _q === void 0 ? void 0 : _q.amount],
             });
-            const pushChainTo = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
+            const { address: pushChainTo } = push_chain_1.PushChain.utils.tokens.getPRC20Address(token);
             multicallData.push({
                 to: pushChainTo,
                 value: BigInt(0),

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, _c, _d;
+    var _a, _b;
     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) {
@@ -254,51 +254,45 @@ function validateRouteParams(params, context) {
             throw new RouteValidationError('migration is not supported on SVM chains');
         }
     }
-    // Validate funds token symbol is available on target chain (Route 2 outbound).
-    // A PushChainMoveableToken (e.g. pSOL, pETH_BNB) carries a `sourceChain` pointing at
-    // the external chain it mirrors — bridging it to that chain is always valid since
-    // the target receives the underlying asset (SOL, ETH, etc.).
-    if (((_b = params.funds) === null || _b === void 0 ? void 0 : _b.token) && isChainTarget(params.to)) {
-        const targetChain = params.to.chain;
-        if (!isPushChain(targetChain)) {
-            const tokenSourceChain = params.funds.token.sourceChain;
-            const isBridgeBack = tokenSourceChain === targetChain;
-            const targetTokens = tokens_1.MOVEABLE_TOKENS[targetChain] || [];
-            const hasSymbolOnTarget = targetTokens.some(t => t.symbol === params.funds.token.symbol);
-            if (!hasSymbolOnTarget && !isBridgeBack) {
-                const tokenChain = findTokenChain(params.funds.token);
-                const tokenLabel = tokenChain
-                    ? `${chainEnumToName(tokenChain)}.${params.funds.token.symbol}`
-                    : params.funds.token.symbol;
-                const clientLabel = (context === null || context === void 0 ? void 0 : context.clientChain)
-                    ? chainEnumToName(context.clientChain)
-                    : 'unknown';
+    // Validate funds.token against the route-relevant chain.
+    // - Route 1 (UOA_TO_PUSH): no bridging, nothing to validate here.
+    // - Route 2 (UOA_TO_CEA): validate against to.chain.
+    // - Route 3/4 (CEA_TO_PUSH, CEA_TO_CEA): validate against from.chain.
+    // For a Push-registered PRC-20 the token's own `sourceChain` must match; for a
+    // non-Push token, the token's symbol must be registered on the chain.
+    if ((_b = params.funds) === null || _b === void 0 ? void 0 : _b.token) {
+        const token = params.funds.token;
+        const clientLabel = (context === null || context === void 0 ? void 0 : context.clientChain)
+            ? chainEnumToName(context.clientChain)
+            : 'unknown';
+        const registeredOn = findTokenChain(token);
+        const tokenLabel = registeredOn
+            ? `${chainEnumToName(registeredOn)}.${token.symbol}`
+            : token.symbol;
+        const isPushToken = registeredOn !== undefined && isPushChain(registeredOn);
+        const validateAgainst = (chain, direction) => {
+            if (isPushChain(chain))
+                return;
+            const ok = isPushToken
+                ? token.sourceChain === 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` +
                     `token=${tokenLabel}\n` +
                     `clientChain=${clientLabel}\n` +
-                    `destination=${chainEnumToName(targetChain)}`);
-            }
-        }
-    }
-    // Validate funds token is available on source chain (Route 3 inbound)
-    if (((_c = params.funds) === null || _c === void 0 ? void 0 : _c.token) && ((_d = params.from) === null || _d === void 0 ? void 0 : _d.chain)) {
-        const sourceChain = params.from.chain;
-        if (!isPushChain(sourceChain)) {
-            const sourceTokens = tokens_1.MOVEABLE_TOKENS[sourceChain] || [];
-            const hasSymbolOnSource = sourceTokens.some(t => t.symbol === params.funds.token.symbol);
-            if (!hasSymbolOnSource) {
-                const tokenChain = findTokenChain(params.funds.token);
-                const tokenLabel = tokenChain
-                    ? `${chainEnumToName(tokenChain)}.${params.funds.token.symbol}`
-                    : params.funds.token.symbol;
-                const clientLabel = (context === null || context === void 0 ? void 0 : context.clientChain)
-                    ? chainEnumToName(context.clientChain)
-                    : 'unknown';
-                throw new RouteValidationError(`Unsupported moveable token for current client and route:\n` +
-                    `token=${tokenLabel}\n` +
-                    `clientChain=${clientLabel}\n` +
-                    `source=${chainEnumToName(sourceChain)}`);
+                    `${direction}=${chainEnumToName(chain)}`);
             }
+        };
+        switch (route) {
+            case TransactionRoute.UOA_TO_PUSH:
+                break;
+            case TransactionRoute.UOA_TO_CEA:
+                validateAgainst(params.to.chain, 'destination');
+                break;
+            case TransactionRoute.CEA_TO_PUSH:
+            case TransactionRoute.CEA_TO_CEA:
+                validateAgainst(params.from.chain, 'source');
+                break;
         }
     }
     // Validate address format

package/src/lib/utils.d.ts

@@ -256,21 +256,19 @@ export declare class Utils {
             }>;
         };
         /**
-         * Convert any supported origin-chain token into its mapped PRC20 token address on Push Chain.
+         * Convert any supported origin-chain token into its mapped PRC20 token on Push Chain.
          *
          * @param token - Either a MoveableToken from `pushChainClient.moveable.token.*`
          * or an object with the origin chain and token address.
-         * @returns {`0x${string}`} The synthetic asset address on Push Chain.
+         * @returns An object describing the synthetic PRC-20 on Push Chain.
          *
          * @example
          * ```jsx
-         * PushChain.utils.tokens.getPRC20Address(
-         *   token: MoveableToken | {
-         *     chain: CONSTANTS.CHAIN.ETHEREUM_SEPOLIA;
-         *     address: `0x${string}`;
-         *   }
-         * );
-         * // → `0x...`
+         * const { address, chain, symbol, decimals, network } =
+         *   PushChain.utils.tokens.getPRC20Address({
+         *     chain: CONSTANTS.CHAIN.ETHEREUM_SEPOLIA,
+         *     address: '0x...',
+         *   });
          * ```
          */
         getPRC20Address(token: MoveableToken | {
@@ -278,7 +276,13 @@ export declare class Utils {
             address: string;
         }, options?: {
             network?: PUSH_NETWORK;
-        }): `0x${string}`;
+        }): {
+            address: `0x${string}`;
+            chain: CHAIN;
+            symbol: string;
+            decimals: number;
+            network: PUSH_NETWORK;
+        };
     };
     /**
      * Internal: resolves a CHAIN enum from either a CHAIN value or a PushChain client instance.

package/src/lib/utils.js

@@ -601,42 +601,55 @@ Utils.tokens = {
         return { tokens };
     },
     /**
-     * Convert any supported origin-chain token into its mapped PRC20 token address on Push Chain.
+     * Convert any supported origin-chain token into its mapped PRC20 token on Push Chain.
      *
      * @param token - Either a MoveableToken from `pushChainClient.moveable.token.*`
      * or an object with the origin chain and token address.
-     * @returns {`0x${string}`} The synthetic asset address on Push Chain.
+     * @returns An object describing the synthetic PRC-20 on Push Chain.
      *
      * @example
      * ```jsx
-     * PushChain.utils.tokens.getPRC20Address(
-     *   token: MoveableToken | {
-     *     chain: CONSTANTS.CHAIN.ETHEREUM_SEPOLIA;
-     *     address: `0x${string}`;
-     *   }
-     * );
-     * // → `0x...`
+     * const { address, chain, symbol, decimals, network } =
+     *   PushChain.utils.tokens.getPRC20Address({
+     *     chain: CONSTANTS.CHAIN.ETHEREUM_SEPOLIA,
+     *     address: '0x...',
+     *   });
      * ```
      */
     getPRC20Address(token, options) {
-        var _a, _b;
+        var _a, _b, _c, _d;
+        const network = (_a = options === null || options === void 0 ? void 0 : options.network) !== null && _a !== void 0 ? _a : enums_1.PUSH_NETWORK.TESTNET_DONUT;
+        const assertDeployed = (addr, ctx) => {
+            if (!addr || addr === '0xTBD') {
+                throw new Error(`PRC20 address not available for ${ctx} on network ${network}`);
+            }
+            return addr;
+        };
         // PushChainMoveableToken (pETH, pSOL, pUSDT(BNB), …) carries its PRC-20 address
-        // directly. Return it as-is — no registry lookup needed.
-        const maybePrc20 = token.prc20Address;
-        if (maybePrc20) {
-            return maybePrc20;
+        // and origin `sourceChain` directly — no registry lookup needed.
+        const pcToken = token;
+        if (pcToken.prc20Address) {
+            return {
+                address: assertDeployed(pcToken.prc20Address, `${(_b = pcToken.symbol) !== null && _b !== void 0 ? _b : 'token'} (${(_c = pcToken.sourceChain) !== null && _c !== void 0 ? _c : 'unknown'})`),
+                chain: pcToken.sourceChain,
+                symbol: pcToken.symbol,
+                decimals: pcToken.decimals,
+                network,
+            };
         }
-        // Infer origin chain and symbol by matching against the MOVEABLE_TOKENS registry
+        // Infer origin chain, symbol, decimals by matching against MOVEABLE_TOKENS
         let originChain;
         let tokenSymbol;
+        let tokenDecimals;
         if ('symbol' in token) {
             // MoveableToken path: infer chain by symbol + address
             for (const [key, list] of Object.entries(tokens_1.MOVEABLE_TOKENS)) {
                 const k = key;
-                const found = (list !== null && list !== void 0 ? list : []).some((t) => t.symbol === token.symbol && t.address === token.address);
-                if (found) {
+                const match = (list !== null && list !== void 0 ? list : []).find((t) => t.symbol === token.symbol && t.address === token.address);
+                if (match) {
                     originChain = k;
-                    tokenSymbol = token.symbol;
+                    tokenSymbol = match.symbol;
+                    tokenDecimals = match.decimals;
                     break;
                 }
             }
@@ -644,17 +657,20 @@ Utils.tokens = {
         else {
             // { chain, address } path: trust the provided chain and resolve symbol via registry
             originChain = token.chain;
-            const list = (_a = tokens_1.MOVEABLE_TOKENS[originChain]) !== null && _a !== void 0 ? _a : [];
-            const match = (list !== null && list !== void 0 ? list : []).find((t) => t.address === token.address);
+            const list = (_d = tokens_1.MOVEABLE_TOKENS[originChain]) !== null && _d !== void 0 ? _d : [];
+            const match = list.find((t) => t.address === token.address);
             if (match) {
                 tokenSymbol = match.symbol;
+                tokenDecimals = match.decimals;
             }
         }
-        if (!originChain || !tokenSymbol) {
+        if (!originChain || !tokenSymbol || tokenDecimals === undefined) {
             throw new Error('Unable to infer origin chain or token symbol for token');
         }
-        const network = (_b = options === null || options === void 0 ? void 0 : options.network) !== null && _b !== void 0 ? _b : enums_1.PUSH_NETWORK.TESTNET_DONUT;
         const map = chain_1.SYNTHETIC_PUSH_ERC20[network];
+        if (!map) {
+            throw new Error(`No PRC20 address map configured for network: ${network}`);
+        }
         // Map token → synthetic key by origin chain family
         const isEthFamily = originChain === enums_1.CHAIN.ETHEREUM_MAINNET ||
             originChain === enums_1.CHAIN.ETHEREUM_SEPOLIA;
@@ -671,8 +687,6 @@ Utils.tokens = {
                     key = 'pETH_ARB';
                 else if (isBaseFamily)
                     key = 'pETH_BASE';
-                else if (isBnbFamily)
-                    key = 'pETH_BNB';
                 else
                     throw new Error('Unsupported ETH origin chain for synthetic mapping');
                 break;
@@ -683,6 +697,12 @@ Utils.tokens = {
                 key = 'pSOL';
                 break;
             }
+            case 'BNB': {
+                if (!isBnbFamily)
+                    throw new Error('BNB token provided but origin is not BNB Testnet');
+                key = 'pBNB';
+                break;
+            }
             case 'USDT': {
                 if (isEthFamily)
                     key = 'USDT_ETH';
@@ -716,7 +736,13 @@ Utils.tokens = {
             default:
                 throw new Error(`Unsupported token symbol: ${tokenSymbol}`);
         }
-        return map[key];
+        return {
+            address: assertDeployed(map[key], `${tokenSymbol} on ${originChain}`),
+            chain: originChain,
+            symbol: tokenSymbol,
+            decimals: tokenDecimals,
+            network,
+        };
     },
 };
 //# sourceMappingURL=utils.js.map