@pushchain/core 5.1.2 → 5.1.4-alpha.0

package/src/lib/universal/signer/signer.js

@@ -6,12 +6,53 @@ exports.construct = construct;
 exports.toUniversal = toUniversal;
 const tslib_1 = require("tslib");
 const viem_1 = require("viem");
-const nacl = tslib_1.__importStar(require("tweetnacl"));
+let _nacl = null;
+function getNacl() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (!_nacl)
+            _nacl = yield Promise.resolve().then(() => tslib_1.__importStar(require('tweetnacl')));
+        return _nacl;
+    });
+}
 const web3_js_1 = require("@solana/web3.js");
 const enums_1 = require("../../constants/enums");
-const ethers_1 = require("ethers");
 const chain_1 = require("../../constants/chain");
-const anchor_1 = require("@coral-xyz/anchor");
+const bs58_1 = require("../../internal/bs58");
+/**
+ * Converts viem's parsed transaction to an ethers-compatible TransactionRequest.
+ * viem uses `gas` while ethers expects `gasLimit`.
+ */
+function toEthersTxRequest(viemTx) {
+    const _a = viemTx, { gas } = _a, rest = tslib_1.__rest(_a, ["gas"]);
+    return Object.assign(Object.assign({}, rest), { gasLimit: gas });
+}
+/**
+ * Maps an EVM numeric chainId to the corresponding CHAIN enum.
+ * Shared by all signer skeleton generators to avoid duplication.
+ */
+function chainIdToChain(chainId) {
+    const id = chainId.toString();
+    switch (id) {
+        case '11155111':
+            return enums_1.CHAIN.ETHEREUM_SEPOLIA;
+        case '421614':
+            return enums_1.CHAIN.ARBITRUM_SEPOLIA;
+        case '84532':
+            return enums_1.CHAIN.BASE_SEPOLIA;
+        case '97':
+            return enums_1.CHAIN.BNB_TESTNET;
+        case '1':
+            return enums_1.CHAIN.ETHEREUM_MAINNET;
+        case '9':
+            return enums_1.CHAIN.PUSH_MAINNET;
+        case '42101':
+            return enums_1.CHAIN.PUSH_TESTNET;
+        case '9000':
+            return enums_1.CHAIN.PUSH_LOCALNET;
+        default:
+            throw new Error(`Unsupported chainId: ${chainId}`);
+    }
+}
 /**
  * Creates a `UniversalSigner` object for signing messages and transactions
  * on any supported chain.
@@ -42,7 +83,7 @@ function createUniversalSigner({ account, signMessage, signAndSendTransaction, s
 /**
  * Creates a UniversalSigner from either a viem, ethers, solana WalletClient or Account instance.
  *
- * @param {WalletClient | Account | Keypair | ethers.HDNodeWallet} clientOrAccount - The viem WalletClient or Account instance
+ * @param {WalletClient | Account | Keypair} clientOrAccount - The viem WalletClient or Account instance
  * @param {CHAIN} chain - The chain the signer will operate on
  * @returns {Promise<UniversalSigner>} A signer object configured for the specified chain
  */
@@ -71,22 +112,22 @@ function toUniversalFromKeypair(clientOrAccount_1, _a) {
                     throw new Error(`Chain mismatch: wallet is on ${chainId}, expected ${chain}`);
                 }
                 address = yield wallet.getAddress();
-                // raw bytes → ethers.signMessage → hex → back to bytes
+                // raw bytes → signMessage → hex → back to bytes
                 signMessage = (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     const sigHex = yield wallet.signMessage(data);
-                    return (0, ethers_1.getBytes)(sigHex);
+                    return (0, viem_1.hexToBytes)(sigHex);
                 });
                 // raw unsigned tx bytes → hex → parse → signAndSendTransaction → bytes
                 signAndSendTransaction = (raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const unsignedHex = (0, ethers_1.hexlify)(raw);
-                    const tx = ethers_1.ethers.Transaction.from(unsignedHex);
+                    const unsignedHex = (0, viem_1.bytesToHex)(raw);
+                    const tx = toEthersTxRequest((0, viem_1.parseTransaction)(unsignedHex));
                     const txResponse = yield wallet.sendTransaction(tx);
                     return (0, viem_1.hexToBytes)(txResponse.hash);
                 });
-                // EIP-712 typed data → _signTypedData → hex → bytes
+                // EIP-712 typed data → signTypedData → hex → bytes
                 signTypedData = (_a) => tslib_1.__awaiter(this, [_a], void 0, function* ({ domain, types, primaryType, message }) {
                     const sigHex = yield wallet.signTypedData(domain, types, message);
-                    return (0, ethers_1.getBytes)(sigHex);
+                    return (0, viem_1.hexToBytes)(sigHex);
                 });
                 break;
             }
@@ -127,6 +168,7 @@ function toUniversalFromKeypair(clientOrAccount_1, _a) {
                 }
                 address = keypair.publicKey.toBase58();
                 signMessage = (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    const nacl = yield getNacl();
                     return nacl.sign.detached(data, keypair.secretKey);
                 });
                 // ✅ Sign and send the transaction to Solana network
@@ -158,12 +200,13 @@ function toUniversalFromKeypair(clientOrAccount_1, _a) {
                         // Handle as legacy transaction
                         const tx = web3_js_1.Transaction.from(unsignedTx);
                         const messageBytes = tx.serializeMessage();
+                        const nacl = yield getNacl();
                         const signature = nacl.sign.detached(messageBytes, keypair.secretKey);
                         tx.addSignature(new web3_js_1.PublicKey(keypair.publicKey.toBase58()), Buffer.from(signature));
                         const rawTx = tx.serialize();
                         txHash = yield connection.sendRawTransaction(rawTx);
                     }
-                    return anchor_1.utils.bytes.bs58.decode(txHash);
+                    return bs58_1.bs58.decode(txHash);
                 });
                 signTypedData = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     throw new Error('Typed data signing is not supported for Solana');
@@ -232,56 +275,24 @@ function generateSkeletonFromEthersV5(signer) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const address = yield signer.getAddress();
         const { chainId } = yield signer.provider.getNetwork();
-        // Map chainId to CHAIN enum - this is a simplified mapping
-        let chain;
-        switch (chainId.toString()) {
-            case '11155111':
-                chain = enums_1.CHAIN.ETHEREUM_SEPOLIA;
-                break;
-            case '421614':
-                chain = enums_1.CHAIN.ARBITRUM_SEPOLIA;
-                break;
-            case '84532':
-                chain = enums_1.CHAIN.BASE_SEPOLIA;
-                break;
-            case '97':
-                chain = enums_1.CHAIN.BNB_TESTNET;
-                break;
-            case '1':
-                chain = enums_1.CHAIN.ETHEREUM_MAINNET;
-                break;
-            case '9':
-                chain = enums_1.CHAIN.PUSH_MAINNET;
-                break;
-            case '42101':
-                chain = enums_1.CHAIN.PUSH_TESTNET;
-                break;
-            case '9000':
-                chain = enums_1.CHAIN.PUSH_LOCALNET;
-                break;
-            default:
-                throw new Error(`Unsupported chainId: ${chainId}`);
-        }
-        if (!Object.values(enums_1.CHAIN).includes(chain)) {
-            throw new Error(`Unsupported chainId: ${chainId}`);
-        }
+        const chain = chainIdToChain(chainId);
         return {
             signerId: `EthersSignerV5-${address}`,
             account: { address, chain },
             signMessage: (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const sigHex = yield signer.signMessage(data);
-                return (0, ethers_1.getBytes)(sigHex);
+                return (0, viem_1.hexToBytes)(sigHex);
             }),
             // raw unsigned tx bytes → hex → parse → signTransaction → bytes
             signAndSendTransaction: (raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                const unsignedHex = (0, ethers_1.hexlify)(raw);
-                const tx = ethers_1.ethers.Transaction.from(unsignedHex);
+                const unsignedHex = (0, viem_1.bytesToHex)(raw);
+                const tx = toEthersTxRequest((0, viem_1.parseTransaction)(unsignedHex));
                 const txResponse = yield signer.sendTransaction(tx);
                 return (0, viem_1.hexToBytes)(txResponse.hash);
             }),
             signTypedData: (_a) => tslib_1.__awaiter(this, [_a], void 0, function* ({ domain, types, primaryType, message }) {
                 const sigHex = yield signer._signTypedData(domain, types, message);
-                return (0, ethers_1.getBytes)(sigHex);
+                return (0, viem_1.hexToBytes)(sigHex);
             }),
         };
     });
@@ -290,56 +301,24 @@ function generateSkeletonFromEthersV6(signer) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const address = yield signer.getAddress();
         const { chainId } = yield signer.provider.getNetwork();
-        // Map chainId to CHAIN enum - this is a simplified mapping
-        let chain;
-        switch (chainId.toString()) {
-            case '11155111':
-                chain = enums_1.CHAIN.ETHEREUM_SEPOLIA;
-                break;
-            case '421614':
-                chain = enums_1.CHAIN.ARBITRUM_SEPOLIA;
-                break;
-            case '84532':
-                chain = enums_1.CHAIN.BASE_SEPOLIA;
-                break;
-            case '97':
-                chain = enums_1.CHAIN.BNB_TESTNET;
-                break;
-            case '1':
-                chain = enums_1.CHAIN.ETHEREUM_MAINNET;
-                break;
-            case '9':
-                chain = enums_1.CHAIN.PUSH_MAINNET;
-                break;
-            case '42101':
-                chain = enums_1.CHAIN.PUSH_TESTNET;
-                break;
-            case '9000':
-                chain = enums_1.CHAIN.PUSH_LOCALNET;
-                break;
-            default:
-                throw new Error(`Unsupported chainId: ${chainId}`);
-        }
-        if (!Object.values(enums_1.CHAIN).includes(chain)) {
-            throw new Error(`Unsupported chainId: ${chainId}`);
-        }
+        const chain = chainIdToChain(chainId);
         return {
             signerId: `EthersSignerV6-${address}`,
             account: { address, chain },
             signMessage: (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const sigHex = yield signer.signMessage(data);
-                return (0, ethers_1.getBytes)(sigHex);
+                return (0, viem_1.hexToBytes)(sigHex);
             }),
             // raw unsigned tx bytes → hex → parse → signTransaction → bytes
             signAndSendTransaction: (raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                const unsignedHex = (0, ethers_1.hexlify)(raw);
-                const tx = ethers_1.ethers.Transaction.from(unsignedHex);
+                const unsignedHex = (0, viem_1.bytesToHex)(raw);
+                const tx = toEthersTxRequest((0, viem_1.parseTransaction)(unsignedHex));
                 const txResponse = yield signer.sendTransaction(tx);
                 return (0, viem_1.hexToBytes)(txResponse.hash);
             }),
             signTypedData: (_a) => tslib_1.__awaiter(this, [_a], void 0, function* ({ domain, types, primaryType, message }) {
                 const sigHex = yield signer.signTypedData(domain, types, message);
-                return (0, ethers_1.getBytes)(sigHex);
+                return (0, viem_1.hexToBytes)(sigHex);
             }),
         };
     });
@@ -355,36 +334,7 @@ function generateSkeletonFromViem(signer) {
         }
         const address = signer.account['address'];
         const chainId = yield signer.getChainId();
-        // Map chainId to CHAIN enum
-        let chain;
-        switch (chainId.toString()) {
-            case '11155111':
-                chain = enums_1.CHAIN.ETHEREUM_SEPOLIA;
-                break;
-            case '421614':
-                chain = enums_1.CHAIN.ARBITRUM_SEPOLIA;
-                break;
-            case '84532':
-                chain = enums_1.CHAIN.BASE_SEPOLIA;
-                break;
-            case '97':
-                chain = enums_1.CHAIN.BNB_TESTNET;
-                break;
-            case '1':
-                chain = enums_1.CHAIN.ETHEREUM_MAINNET;
-                break;
-            case '9':
-                chain = enums_1.CHAIN.PUSH_MAINNET;
-                break;
-            case '42101':
-                chain = enums_1.CHAIN.PUSH_TESTNET;
-                break;
-            case '9000':
-                chain = enums_1.CHAIN.PUSH_LOCALNET;
-                break;
-            default:
-                throw new Error(`Unsupported chainId: ${chainId}`);
-        }
+        const chain = chainIdToChain(chainId);
         return {
             signerId: `ViemSigner-${address}`,
             account: {

package/src/lib/universal/signer/signer.js.map

@@ -1 +1 @@
-{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../../../../../packages/core/src/lib/universal/signer/signer.ts"],"names":[],"mappings":";;AAgDA,sDAYC;AASD,wDA4LC;AAGD,8BAmCC;AAED,kCAmCC;;AA5UD,+BAMc;AAUd,wDAAkC;AAClC,6CAMyB;AACzB,iDAAuD;AACvD,mCAAmD;AACnD,iDAAmD;AACnD,8CAA0C;AAE1C;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,qBAAqB,CAAC,EACpC,OAAO,EACP,WAAW,EACX,sBAAsB,EACtB,aAAa,GACG;IAChB,OAAO;QACL,OAAO;QACP,WAAW;QACX,sBAAsB;QACtB,aAAa;KACd,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAsB,sBAAsB;iEAC1C,eAA6E,EAC7E,EAAE,KAAK,EAAE,OAAO,EAAsC;QAEtD,IAAI,OAAe,CAAC;QACpB,IAAI,WAAsD,CAAC;QAC3D,IAAI,sBAAuE,CAAC;QAC5E,IAAI,aAUqB,CAAC;QAE1B,uJAAuJ;QACvJ,wDAAwD;QAExD,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,eAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBAC/B,IACE,OAAQ,eAAuB,CAAC,WAAW,KAAK,UAAU;oBAC1D,OAAQ,eAAuB,CAAC,eAAe,KAAK,UAAU;oBAC9D,OAAQ,eAAuB,CAAC,UAAU,KAAK,UAAU,EACzD,CAAC;oBACD,MAAM,IAAI,KAAK,CACb,wGAAwG,CACzG,CAAC;gBACJ,CAAC;gBACD,MAAM,MAAM,GAAG,eAAsD,CAAC;gBACtE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACrB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,CAAC;gBACD,yBAAyB;gBACzB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBACvD,IAAI,OAAO,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/C,MAAM,IAAI,KAAK,CACb,gCAAgC,OAAO,cAAc,KAAK,EAAE,CAC7D,CAAC;gBACJ,CAAC;gBAED,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;gBAEpC,uDAAuD;gBACvD,WAAW,GAAG,CAAO,IAAI,EAAE,EAAE;oBAC3B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBAC9C,OAAO,IAAA,iBAAQ,EAAC,MAAM,CAAC,CAAC;gBAC1B,CAAC,CAAA,CAAC;gBAEF,uEAAuE;gBACvE,sBAAsB,GAAG,CAAO,GAAG,EAAE,EAAE;oBACrC,MAAM,WAAW,GAAG,IAAA,gBAAO,EAAC,GAAG,CAAC,CAAC;oBACjC,MAAM,EAAE,GAAG,eAAM,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAChD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBACpD,OAAO,IAAA,iBAAU,EAAC,UAAU,CAAC,IAAW,CAAC,CAAC;gBAC5C,CAAC,CAAA,CAAC;gBAEF,oDAAoD;gBACpD,aAAa,GAAG,KAAgD,EAAE,kDAA3C,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE;oBAC5D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CACvC,MAAM,EACN,KAAyC,EACzC,OAAO,CACR,CAAC;oBACF,OAAO,IAAA,iBAAQ,EAAC,MAAM,CAAC,CAAC;gBAC1B,CAAC,CAAA,CAAC;gBAEF,MAAM;YACR,CAAC;YAED,KAAK,eAAO,CAAC,aAAa,CAAC,CAAC,CAAC;gBAC3B,MAAM,MAAM,GAAG,eAA+B,CAAC;gBAC/C,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE3C,WAAW,GAAG,CAAO,IAAgB,EAAE,EAAE;oBACvC,MAAM,MAAM,GAAG,MAAO,eAAgC,CAAC,WAAW,CAAC;wBACjE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAK,OAAyB;wBACrD,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;qBACvB,CAAC,CAAC;oBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC,CAAA,CAAC;gBAEF,sBAAsB,GAAG,CAAO,UAAsB,EAAE,EAAE;oBACxD,MAAM,EAAE,GAAG,IAAA,uBAAgB,EAAC,IAAA,iBAAU,EAAC,UAAU,CAAC,CAAC,CAAC;oBACpD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,EAAW,CAAC,CAAC;oBACzD,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC,CAAA,CAAC;gBAEF,aAAa,GAAG,KAAgD,EAAE,kDAA3C,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE;oBAC5D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC;wBACxC,MAAM;wBACN,KAAK;wBACL,WAAW;wBACX,OAAO;wBACP,OAAO,EACJ,eAAgC,CAAC,OAAO;4BACxC,OAAyB;qBAC7B,CAAC,CAAC;oBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC,CAAA,CAAC;gBACF,MAAM;YACR,CAAC;YAED,KAAK,eAAO,CAAC,aAAa,CAAC,CAAC,CAAC;gBAC3B,MAAM,OAAO,GAAG,eAA0B,CAAC;gBAC3C,IACE,KAAK,KAAK,aAAK,CAAC,cAAc;oBAC9B,KAAK,KAAK,aAAK,CAAC,cAAc;oBAC9B,KAAK,KAAK,aAAK,CAAC,aAAa,EAC7B,CAAC;oBACD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;gBACtD,CAAC;gBAED,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAEvC,WAAW,GAAG,CAAO,IAAgB,EAAE,EAAE;oBACvC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBACrD,CAAC,CAAA,CAAC;gBAEF,oDAAoD;gBACpD,sBAAsB,GAAG,CAAO,UAAsB,EAAE,EAAE;oBACxD,MAAM,QAAQ,GAAG,kBAAU,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;oBACjD,MAAM,UAAU,GAAG,IAAI,oBAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;oBAEzD,IAAI,MAAc,CAAC;oBAEnB,+EAA+E;oBAC/E,2EAA2E;oBAC3E,mFAAmF;oBACnF,6DAA6D;oBAC7D,IAAI,SAAS,GAAG,CAAC,CAAC;oBAClB,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oBAC/B,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;wBACrB,gCAAgC;wBAChC,SAAS,GAAG,CAAC,CAAC;oBAChB,CAAC;oBACD,6DAA6D;oBAC7D,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,EAAE,CAAC;oBAChD,MAAM,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC;oBAExD,IAAI,aAAa,EAAE,CAAC;wBAClB,uCAAuC;wBACvC,MAAM,GAAG,GAAG,8BAAoB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;wBACzD,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;wBACpB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;wBAC/B,MAAM,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;oBACvD,CAAC;yBAAM,CAAC;wBACN,+BAA+B;wBAC/B,MAAM,EAAE,GAAG,qBAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;wBACxC,MAAM,YAAY,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC;wBAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;wBACtE,EAAE,CAAC,YAAY,CACb,IAAI,mBAAS,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAC3C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CACvB,CAAC;wBACF,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC;wBAC7B,MAAM,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;oBACtD,CAAC;oBAED,OAAO,cAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACzC,CAAC,CAAA,CAAC;gBAEF,aAAa,GAAG,GAAS,EAAE;oBACzB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,CAAC,CAAA,CAAC;gBAEF,MAAM;YACR,CAAC;YAED,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;QAED,MAAM,eAAe,GAAoB;YACvC,OAAO,EAAE;gBACP,OAAO;gBACP,KAAK;aACN;YACD,WAAW;YACX,sBAAsB;YACtB,aAAa;SACd,CAAC;QACF,OAAO,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;CAAA;AAED,wFAAwF;AACxF,SAAgB,SAAS,CACvB,OAAyB,EACzB,OAcC;IAED,MAAM,EAAE,WAAW,EAAE,sBAAsB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACvE,IACE,aAAa;QACb,CAAC,OAAO,CAAC,KAAK,KAAK,aAAK,CAAC,cAAc;YACrC,OAAO,CAAC,KAAK,KAAK,aAAK,CAAC,cAAc;YACtC,OAAO,CAAC,KAAK,KAAK,aAAK,CAAC,aAAa,CAAC,EACxC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,uBAAuB;QACjC,OAAO;QACP,WAAW;QACX,sBAAsB;QACtB,aAAa;KACd,CAAC;AACJ,CAAC;AAED,SAAsB,WAAW,CAC/B,MAIkB;;QAElB,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;YACzB,OAAO,qBAAqB,CAAC,MAAiC,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,QAAiC,CAAC;QACtC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAiD,CAAC;YACjE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACrB,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;YACJ,CAAC;YAED,wFAAwF;YACxF,IAAI,gBAAgB,IAAI,MAAM,EAAE,CAAC;gBAC/B,QAAQ,GAAG,MAAM,4BAA4B,CAC3C,MAA4B,CAC7B,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,MAAM,4BAA4B,CAC3C,MAA4B,CAC7B,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,MAAM,wBAAwB,CAAC,MAAwB,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;CAAA;AAED,SAAe,4BAA4B,CACzC,MAA0B;;QAE1B,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;QAE1C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAEvD,2DAA2D;QAC3D,IAAI,KAAY,CAAC;QACjB,QAAQ,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3B,KAAK,UAAU;gBACb,KAAK,GAAG,aAAK,CAAC,gBAAgB,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ;gBACX,KAAK,GAAG,aAAK,CAAC,gBAAgB,CAAC;gBAC/B,MAAM;YACR,KAAK,OAAO;gBACV,KAAK,GAAG,aAAK,CAAC,YAAY,CAAC;gBAC3B,MAAM;YACR,KAAK,IAAI;gBACP,KAAK,GAAG,aAAK,CAAC,WAAW,CAAC;gBAC1B,MAAM;YACR,KAAK,GAAG;gBACN,KAAK,GAAG,aAAK,CAAC,gBAAgB,CAAC;gBAC/B,MAAM;YACR,KAAK,GAAG;gBACN,KAAK,GAAG,aAAK,CAAC,YAAY,CAAC;gBAC3B,MAAM;YACR,KAAK,OAAO;gBACV,KAAK,GAAG,aAAK,CAAC,YAAY,CAAC;gBAC3B,MAAM;YACR,KAAK,MAAM;gBACT,KAAK,GAAG,aAAK,CAAC,aAAa,CAAC;gBAC5B,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,OAAO;YACL,QAAQ,EAAE,kBAAkB,OAAO,EAAE;YACrC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;YAE3B,WAAW,EAAE,CAAO,IAAI,EAAE,EAAE;gBAC1B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBAC9C,OAAO,IAAA,iBAAQ,EAAC,MAAM,CAAC,CAAC;YAC1B,CAAC,CAAA;YAED,gEAAgE;YAChE,sBAAsB,EAAE,CAAO,GAAG,EAAE,EAAE;gBACpC,MAAM,WAAW,GAAG,IAAA,gBAAO,EAAC,GAAG,CAAC,CAAC;gBACjC,MAAM,EAAE,GAAG,eAAM,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;gBACpD,OAAO,IAAA,iBAAU,EAAC,UAAU,CAAC,IAAW,CAAC,CAAC;YAC5C,CAAC,CAAA;YAED,aAAa,EAAE,KAAgD,EAAE,kDAA3C,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE;gBAC3D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,cAAc,CACxC,MAAM,EACN,KAAyC,EACzC,OAAO,CACR,CAAC;gBACF,OAAO,IAAA,iBAAQ,EAAC,MAAM,CAAC,CAAC;YAC1B,CAAC,CAAA;SACF,CAAC;IACJ,CAAC;CAAA;AAED,SAAe,4BAA4B,CACzC,MAA0B;;QAE1B,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;QAE1C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAEvD,2DAA2D;QAC3D,IAAI,KAAY,CAAC;QACjB,QAAQ,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3B,KAAK,UAAU;gBACb,KAAK,GAAG,aAAK,CAAC,gBAAgB,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ;gBACX,KAAK,GAAG,aAAK,CAAC,gBAAgB,CAAC;gBAC/B,MAAM;YACR,KAAK,OAAO;gBACV,KAAK,GAAG,aAAK,CAAC,YAAY,CAAC;gBAC3B,MAAM;YACR,KAAK,IAAI;gBACP,KAAK,GAAG,aAAK,CAAC,WAAW,CAAC;gBAC1B,MAAM;YACR,KAAK,GAAG;gBACN,KAAK,GAAG,aAAK,CAAC,gBAAgB,CAAC;gBAC/B,MAAM;YACR,KAAK,GAAG;gBACN,KAAK,GAAG,aAAK,CAAC,YAAY,CAAC;gBAC3B,MAAM;YACR,KAAK,OAAO;gBACV,KAAK,GAAG,aAAK,CAAC,YAAY,CAAC;gBAC3B,MAAM;YACR,KAAK,MAAM;gBACT,KAAK,GAAG,aAAK,CAAC,aAAa,CAAC;gBAC5B,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,OAAO;YACL,QAAQ,EAAE,kBAAkB,OAAO,EAAE;YACrC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;YAE3B,WAAW,EAAE,CAAO,IAAI,EAAE,EAAE;gBAC1B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBAC9C,OAAO,IAAA,iBAAQ,EAAC,MAAM,CAAC,CAAC;YAC1B,CAAC,CAAA;YAED,gEAAgE;YAChE,sBAAsB,EAAE,CAAO,GAAG,EAAE,EAAE;gBACpC,MAAM,WAAW,GAAG,IAAA,gBAAO,EAAC,GAAG,CAAC,CAAC;gBACjC,MAAM,EAAE,GAAG,eAAM,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;gBACpD,OAAO,IAAA,iBAAU,EAAC,UAAU,CAAC,IAAW,CAAC,CAAC;YAC5C,CAAC,CAAA;YAED,aAAa,EAAE,KAAgD,EAAE,kDAA3C,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE;gBAC3D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CACvC,MAAM,EACN,KAAyC,EACzC,OAAO,CACR,CAAC;gBACF,OAAO,IAAA,iBAAQ,EAAC,MAAM,CAAC,CAAC;YAC1B,CAAC,CAAA;SACF,CAAC;IACJ,CAAC;CAAA;AAED,SAAS,YAAY,CACnB,MAAgE;IAEhE,OAAO,CACL,OAAQ,MAAc,CAAC,aAAa,KAAK,UAAU;QACnD,OAAQ,MAAc,CAAC,UAAU,KAAK,UAAU,CACjD,CAAC;AACJ,CAAC;AAED,SAAe,wBAAwB,CACrC,MAAsB;;QAEtB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;QAE1C,4BAA4B;QAC5B,IAAI,KAAY,CAAC;QACjB,QAAQ,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3B,KAAK,UAAU;gBACb,KAAK,GAAG,aAAK,CAAC,gBAAgB,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ;gBACX,KAAK,GAAG,aAAK,CAAC,gBAAgB,CAAC;gBAC/B,MAAM;YACR,KAAK,OAAO;gBACV,KAAK,GAAG,aAAK,CAAC,YAAY,CAAC;gBAC3B,MAAM;YACR,KAAK,IAAI;gBACP,KAAK,GAAG,aAAK,CAAC,WAAW,CAAC;gBAC1B,MAAM;YACR,KAAK,GAAG;gBACN,KAAK,GAAG,aAAK,CAAC,gBAAgB,CAAC;gBAC/B,MAAM;YACR,KAAK,GAAG;gBACN,KAAK,GAAG,aAAK,CAAC,YAAY,CAAC;gBAC3B,MAAM;YACR,KAAK,OAAO;gBACV,KAAK,GAAG,aAAK,CAAC,YAAY,CAAC;gBAC3B,MAAM;YACR,KAAK,MAAM;gBACT,KAAK,GAAG,aAAK,CAAC,aAAa,CAAC;gBAC5B,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,OAAO;YACL,QAAQ,EAAE,cAAc,OAAO,EAAE;YACjC,OAAO,EAAE;gBACP,OAAO;gBACP,KAAK;aACN;YACD,WAAW,EAAE,CAAO,IAAgB,EAAE,EAAE;gBACtC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;oBACtC,OAAO,EAAE,OAAwB;oBACjC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBACvB,CAAC,CAAC;gBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAA;YACD,sBAAsB,EAAE,CAAO,UAAsB,EAAE,EAAE;gBACvD,sEAAsE;gBACtE,uEAAuE;gBACvE,wDAAwD;gBACxD,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;oBACtC,MAAM,EAAE,GAAG,IAAA,uBAAgB,EAAC,IAAA,iBAAU,EAAC,UAAU,CAAC,CAAC,CAAC;oBACpD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAChD,OAAO,IAAA,iBAAU,EAAC,MAAa,CAAC,CAAC;gBACnC,CAAC;gBACD,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;YACJ,CAAC,CAAA;YACD,aAAa,EAAE,KAAgD,EAAE,kDAA3C,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE;gBAC3D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC;oBACxC,MAAM;oBACN,KAAK;oBACL,WAAW;oBACX,OAAO;oBACP,OAAO,EAAG,MAAuB,CAAC,OAAO,IAAK,OAAyB;iBACxE,CAAC,CAAC;gBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAA;SACF,CAAC;IACJ,CAAC;CAAA"}
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../../../../../packages/core/src/lib/universal/signer/signer.ts"],"names":[],"mappings":"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"}

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

@@ -123,3 +123,44 @@ export interface ExecutorAccountInfo {
      */
     deployed?: boolean;
 }
+/**
+ * Account type in the Push Chain ecosystem.
+ */
+export type AccountType = 'uea' | 'cea' | 'uoa';
+/**
+ * Role of an account in the controller relationship.
+ */
+export type AccountRole = 'controller';
+/**
+ * Response from deriveExecutorAccount.
+ */
+export interface DerivedExecutorAccount {
+    /** The computed executor address on Push Chain (or CEA on external chain) */
+    address: `0x${string}`;
+    /** Whether the executor account is deployed on-chain */
+    deployed: boolean;
+}
+/**
+ * A single resolved account entry in the resolveControllerAccount response.
+ */
+export interface ResolvedAccount {
+    /** Fully qualified chain identifier (e.g., "eip155:42101") */
+    chain: string;
+    /** Human-readable chain name (e.g., "PUSH_TESTNET_DONUT") */
+    chainName: string;
+    /** The account address */
+    address: string;
+    /** Account type in the ecosystem */
+    type: AccountType;
+    /** Whether this account exists on-chain */
+    exists: boolean;
+    /** Role of this account (present only for controller accounts) */
+    role?: AccountRole;
+}
+/**
+ * Response from resolveControllerAccount.
+ */
+export interface ResolvedControllerAccounts {
+    /** List of resolved accounts in the controller chain */
+    accounts: ResolvedAccount[];
+}

package/src/lib/utils.d.ts

@@ -1,4 +1,4 @@
-import { convertOriginToExecutor, fromChainAgnostic, convertExecutorToOriginAccount, toChainAgnostic, toUniversal } from './universal/account';
+import { convertOriginToExecutor, fromChainAgnostic, convertExecutorToOriginAccount, toChainAgnostic, toUniversal, deriveExecutorAccount, resolveControllerAccount } from './universal/account';
 import { construct, toUniversal as toUniversalSigner, toUniversalFromKeypair } from './universal/signer';
 import { CHAIN, PUSH_NETWORK } from './constants/enums';
 import { type MoveableToken } from './constants/tokens';
@@ -29,6 +29,8 @@ export declare class Utils {
         fromChainAgnostic: typeof fromChainAgnostic;
         convertOriginToExecutor: typeof convertOriginToExecutor;
         convertExecutorToOriginAccount: typeof convertExecutorToOriginAccount;
+        deriveExecutorAccount: typeof deriveExecutorAccount;
+        resolveControllerAccount: typeof resolveControllerAccount;
     };
     static signer: {
         /**
@@ -195,6 +197,7 @@ export declare class Utils {
         getMoveableTokens(chainOrClient?: CHAIN | PushChain): {
             tokens: Array<{
                 chain: CHAIN;
+                chainName: string;
                 symbol: string;
                 decimals: number;
                 address: string;
@@ -209,6 +212,7 @@ export declare class Utils {
         getPayableTokens(chainOrClient?: CHAIN | PushChain): {
             tokens: Array<{
                 chain: CHAIN;
+                chainName: string;
                 symbol: string;
                 decimals: number;
                 address: string;
@@ -236,6 +240,8 @@ export declare class Utils {
         getPRC20Address(token: MoveableToken | {
             chain: string;
             address: string;
+        }, options?: {
+            network?: PUSH_NETWORK;
         }): `0x${string}`;
     };
     /**

package/src/lib/utils.js

@@ -6,7 +6,7 @@ const signer_1 = require("./universal/signer");
 const enums_1 = require("./constants/enums");
 const tokens_1 = require("./constants/tokens");
 const chain_1 = require("./constants/chain");
-const ethers_1 = require("ethers");
+const viem_1 = require("viem");
 /**
  * @dev - THESE UTILS ARE EXPORTED TO SDK CONSUMER
  * @dev - Make sure each exported fn has good comments to help out sdk consumer
@@ -71,6 +71,8 @@ Utils.account = {
     fromChainAgnostic: account_1.fromChainAgnostic,
     convertOriginToExecutor: account_1.convertOriginToExecutor,
     convertExecutorToOriginAccount: account_1.convertExecutorToOriginAccount,
+    deriveExecutorAccount: account_1.deriveExecutorAccount,
+    resolveControllerAccount: account_1.resolveControllerAccount,
 };
 Utils.signer = {
     /**
@@ -193,13 +195,17 @@ Utils.helpers = {
      * Alias maintained for backwards compatibility. Logs a deprecation warning
      * and delegates to Utils.chains.getChainNamespace.
      */
-    getChainName: (chainName) => {
-        // Emit deprecation warning on every call to surface migration need
-        // Note: Keeping message explicit for SDK consumers
-        console.warn('[DEPRECATED] PushChain.utils.helper.getChainName is deprecated. ' +
-            'Use PushChain.utils.chains.getChainNamespace(chainName) instead.');
-        return Utils.chains.getChainName(chainName);
-    },
+    getChainName: (() => {
+        let warned = false;
+        return (chainName) => {
+            if (!warned) {
+                console.warn('[DEPRECATED] PushChain.utils.helper.getChainName is deprecated. ' +
+                    'Use PushChain.utils.chains.getChainNamespace(chainName) instead.');
+                warned = true;
+            }
+            return Utils.chains.getChainName(chainName);
+        };
+    })(),
     encodeTxData({ abi, functionName, args = [], }) {
         // Validate inputs
         if (!Array.isArray(abi)) {
@@ -214,9 +220,7 @@ Utils.helpers = {
             throw new Error(`Function '${functionName}' not found in ABI`);
         }
         try {
-            // Create ethers Interface and encode the function data
-            const abiInterface = new ethers_1.ethers.Interface(abi);
-            const data = abiInterface.encodeFunctionData(functionName, args);
+            const data = (0, viem_1.encodeFunctionData)({ abi, functionName, args });
             return data;
         }
         catch (error) {
@@ -384,8 +388,12 @@ Utils.helpers = {
         try {
             // Convert string to bigint if needed
             const bigintValue = typeof value === 'string' ? BigInt(value) : value;
-            // Use ethers to format the units
-            const formatted = ethers_1.ethers.formatUnits(bigintValue, decimals);
+            let formatted = (0, viem_1.formatUnits)(bigintValue, decimals);
+            // Ensure at least one decimal place for backward compatibility
+            // (only when decimals > 0, matching prior ethers behavior)
+            if (decimals > 0 && !formatted.includes('.')) {
+                formatted = formatted + '.0';
+            }
             // Apply precision if specified
             if (precision !== undefined) {
                 const num = parseFloat(formatted);
@@ -470,18 +478,22 @@ Utils.tokens = {
      * - Otherwise returns tokens across all chains
      */
     getMoveableTokens(chainOrClient) {
-        var _a;
+        var _a, _b;
         const chain = Utils.resolveChainFromInput(chainOrClient);
         if (chain) {
             const list = (_a = tokens_1.MOVEABLE_TOKENS[chain]) !== null && _a !== void 0 ? _a : [];
             return {
-                tokens: list.map((t) => ({
-                    chain,
-                    symbol: t.symbol,
-                    decimals: t.decimals,
-                    address: t.address,
-                    mechanism: t.mechanism,
-                })),
+                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,
+                    });
+                }),
             };
         }
         const tokens = [];
@@ -490,6 +502,7 @@ Utils.tokens = {
             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,
@@ -505,18 +518,22 @@ Utils.tokens = {
      * - Otherwise returns tokens across all chains
      */
     getPayableTokens(chainOrClient) {
-        var _a;
+        var _a, _b;
         const chain = Utils.resolveChainFromInput(chainOrClient);
         if (chain) {
             const list = (_a = tokens_1.PAYABLE_TOKENS[chain]) !== null && _a !== void 0 ? _a : [];
             return {
-                tokens: list.map((t) => ({
-                    chain,
-                    symbol: t.symbol,
-                    decimals: t.decimals,
-                    address: t.address,
-                    mechanism: t.mechanism,
-                })),
+                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,
+                    });
+                }),
             };
         }
         const tokens = [];
@@ -525,6 +542,7 @@ Utils.tokens = {
             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,
@@ -552,8 +570,8 @@ Utils.tokens = {
      * // → `0x...`
      * ```
      */
-    getPRC20Address(token) {
-        var _a;
+    getPRC20Address(token, options) {
+        var _a, _b;
         // Infer origin chain and symbol by matching against the MOVEABLE_TOKENS registry
         let originChain;
         let tokenSymbol;
@@ -581,8 +599,7 @@ Utils.tokens = {
         if (!originChain || !tokenSymbol) {
             throw new Error('Unable to infer origin chain or token symbol for token');
         }
-        // Select Push network mapping (tests/use-cases use TESTNET_DONUT; identical to TESTNET here)
-        const network = enums_1.PUSH_NETWORK.TESTNET_DONUT;
+        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];
         // Map token → synthetic key by origin chain family
         const isEthFamily = originChain === enums_1.CHAIN.ETHEREUM_MAINNET ||
@@ -627,6 +644,21 @@ Utils.tokens = {
                     throw new Error('Unsupported USDT origin chain for synthetic mapping');
                 break;
             }
+            case 'USDC': {
+                if (isEthFamily)
+                    key = 'USDC_ETH';
+                else if (isArbFamily)
+                    key = 'USDC_ARB';
+                else if (isBaseFamily)
+                    key = 'USDC_BASE';
+                else if (isBnbFamily)
+                    key = 'USDC_BNB';
+                else if (isSolFamily)
+                    key = 'USDC_SOL';
+                else
+                    throw new Error('Unsupported USDC origin chain for synthetic mapping');
+                break;
+            }
             default:
                 throw new Error(`Unsupported token symbol: ${tokenSymbol}`);
         }