@pushchain/core 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushchain/core",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "dependencies": {
     "@bufbuild/protobuf": "^2.0.0",
     "@coral-xyz/anchor": "^0.31.0",

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

@@ -28,3 +28,7 @@ export declare enum VM {
     EVM = "EVM",
     SVM = "SVM"
 }
+export declare enum LIBRARY {
+    ETHEREUM_VIEM = "viem",
+    SOLANA_WEB3 = "solana-web3"
+}

package/src/lib/constants/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VM = exports.CHAIN = exports.NETWORK = void 0;
+exports.LIBRARY = exports.VM = exports.CHAIN = exports.NETWORK = void 0;
 /**
  * Specifies the Push Chain environment the SDK will connect to.
  * Determines the RPC endpoints, contract addresses, and network context
@@ -37,4 +37,9 @@ var VM;
     VM["EVM"] = "EVM";
     VM["SVM"] = "SVM";
 })(VM || (exports.VM = VM = {}));
+var LIBRARY;
+(function (LIBRARY) {
+    LIBRARY["ETHEREUM_VIEM"] = "viem";
+    LIBRARY["SOLANA_WEB3"] = "solana-web3";
+})(LIBRARY || (exports.LIBRARY = LIBRARY = {}));
 //# sourceMappingURL=enums.js.map

package/src/lib/constants/enums.js.map

@@ -1 +1 @@
-{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/constants/enums.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,8BAAmB,CAAA;IACnB,8BAAmB,CAAA;IACnB,gCAAqB,CAAA;AACvB,CAAC,EAJW,OAAO,uBAAP,OAAO,QAIlB;AAED;;GAEG;AACH,IAAY,KAcX;AAdD,WAAY,KAAK;IACf,OAAO;IACP,sCAA6B,CAAA;IAC7B,sCAA6B,CAAA;IAC7B,wCAA+B,CAAA;IAE/B,WAAW;IACX,8CAAqC,CAAA;IACrC,8CAAqC,CAAA;IAErC,SAAS;IACT,0CAAiC,CAAA;IACjC,0CAAiC,CAAA;IACjC,wCAA+B,CAAA;AACjC,CAAC,EAdW,KAAK,qBAAL,KAAK,QAchB;AAED;;GAEG;AACH,IAAY,EAGX;AAHD,WAAY,EAAE;IACZ,iBAAW,CAAA;IACX,iBAAW,CAAA;AACb,CAAC,EAHW,EAAE,kBAAF,EAAE,QAGb"}
+{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/constants/enums.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,8BAAmB,CAAA;IACnB,8BAAmB,CAAA;IACnB,gCAAqB,CAAA;AACvB,CAAC,EAJW,OAAO,uBAAP,OAAO,QAIlB;AAED;;GAEG;AACH,IAAY,KAcX;AAdD,WAAY,KAAK;IACf,OAAO;IACP,sCAA6B,CAAA;IAC7B,sCAA6B,CAAA;IAC7B,wCAA+B,CAAA;IAE/B,WAAW;IACX,8CAAqC,CAAA;IACrC,8CAAqC,CAAA;IAErC,SAAS;IACT,0CAAiC,CAAA;IACjC,0CAAiC,CAAA;IACjC,wCAA+B,CAAA;AACjC,CAAC,EAdW,KAAK,qBAAL,KAAK,QAchB;AAED;;GAEG;AACH,IAAY,EAGX;AAHD,WAAY,EAAE;IACZ,iBAAW,CAAA;IACX,iBAAW,CAAA;AACb,CAAC,EAHW,EAAE,kBAAF,EAAE,QAGb;AAED,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,iCAAsB,CAAA;IACtB,sCAA2B,CAAA;AAC7B,CAAC,EAHW,OAAO,uBAAP,OAAO,QAGlB"}

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

@@ -1,5 +1,43 @@
-import { CHAIN, NETWORK } from './enums';
+import { CHAIN, LIBRARY, NETWORK } from './enums';
 export declare const CONSTANTS: {
     NETWORK: typeof NETWORK;
     CHAIN: typeof CHAIN;
+    VIEM_PUSH_TESTNET: {
+        blockExplorers: {
+            readonly default: {
+                readonly name: "Push Testnet Explorer";
+                readonly url: "https://explorer.dev.push.org/";
+            };
+        };
+        contracts?: import("viem").Prettify<{
+            [key: string]: import("viem").ChainContract | {
+                [sourceId: number]: import("viem").ChainContract | undefined;
+            } | undefined;
+        } & {
+            ensRegistry?: import("viem").ChainContract | undefined;
+            ensUniversalResolver?: import("viem").ChainContract | undefined;
+            multicall3?: import("viem").ChainContract | undefined;
+            universalSignatureVerifier?: import("viem").ChainContract | undefined;
+        }> | undefined;
+        ensTlds?: readonly string[] | undefined;
+        id: number;
+        name: "Push Testnet";
+        nativeCurrency: {
+            readonly decimals: 18;
+            readonly name: "nPUSH";
+            readonly symbol: "nPUSH";
+        };
+        rpcUrls: {
+            readonly default: {
+                readonly http: readonly [string];
+            };
+        };
+        sourceId?: number | undefined;
+        testnet?: boolean | undefined;
+        custom?: Record<string, unknown> | undefined;
+        fees?: import("viem").ChainFees<undefined> | undefined;
+        formatters?: undefined;
+        serializers?: import("viem").ChainSerializers<undefined, import("viem").TransactionSerializable> | undefined;
+    };
+    LIBRARY: typeof LIBRARY;
 };

package/src/lib/constants/index.js

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CONSTANTS = void 0;
 const enums_1 = require("./enums");
+const viem_push_testnet_1 = require("./viem-push-testnet");
 // NOTE - Only include enums & constants which need to be exported to end user.
 exports.CONSTANTS = {
     NETWORK: enums_1.NETWORK,
     CHAIN: enums_1.CHAIN,
+    VIEM_PUSH_TESTNET: viem_push_testnet_1.VIEM_PUSH_TESTNET,
+    LIBRARY: enums_1.LIBRARY,
 };
 //# sourceMappingURL=index.js.map

package/src/lib/constants/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/constants/index.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AAEzC,+EAA+E;AAClE,QAAA,SAAS,GAAG;IACvB,OAAO,EAAP,eAAO;IACP,KAAK,EAAL,aAAK;CACN,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/constants/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkD;AAClD,2DAAwD;AAExD,+EAA+E;AAClE,QAAA,SAAS,GAAG;IACvB,OAAO,EAAP,eAAO;IACP,KAAK,EAAL,aAAK;IACL,iBAAiB,EAAjB,qCAAiB;IACjB,OAAO,EAAP,eAAO;CACR,CAAC"}

package/src/lib/constants/viem-push-testnet.d.ts

@@ -0,0 +1,38 @@
+import * as viem from 'viem';
+export declare const VIEM_PUSH_TESTNET: {
+    blockExplorers: {
+        readonly default: {
+            readonly name: "Push Testnet Explorer";
+            readonly url: "https://explorer.dev.push.org/";
+        };
+    };
+    contracts?: viem.Prettify<{
+        [key: string]: viem.ChainContract | {
+            [sourceId: number]: viem.ChainContract | undefined;
+        } | undefined;
+    } & {
+        ensRegistry?: viem.ChainContract | undefined;
+        ensUniversalResolver?: viem.ChainContract | undefined;
+        multicall3?: viem.ChainContract | undefined;
+        universalSignatureVerifier?: viem.ChainContract | undefined;
+    }> | undefined;
+    ensTlds?: readonly string[] | undefined;
+    id: number;
+    name: "Push Testnet";
+    nativeCurrency: {
+        readonly decimals: 18;
+        readonly name: "nPUSH";
+        readonly symbol: "nPUSH";
+    };
+    rpcUrls: {
+        readonly default: {
+            readonly http: readonly [string];
+        };
+    };
+    sourceId?: number | undefined;
+    testnet?: boolean | undefined;
+    custom?: Record<string, unknown> | undefined;
+    fees?: viem.ChainFees<undefined> | undefined;
+    formatters?: undefined;
+    serializers?: viem.ChainSerializers<undefined, viem.TransactionSerializable> | undefined;
+};

package/src/lib/constants/viem-push-testnet.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VIEM_PUSH_TESTNET = void 0;
+const tslib_1 = require("tslib");
+const chain_1 = require("./chain");
+const viem = tslib_1.__importStar(require("viem"));
+// Define Push Chain networks as viem chains
+exports.VIEM_PUSH_TESTNET = viem.defineChain({
+    id: parseInt(chain_1.CHAIN_INFO.PUSH_TESTNET.chainId),
+    name: 'Push Testnet',
+    nativeCurrency: {
+        decimals: 18,
+        name: 'nPUSH',
+        symbol: 'nPUSH',
+    },
+    rpcUrls: {
+        default: {
+            http: [chain_1.CHAIN_INFO.PUSH_TESTNET.defaultRPC],
+        },
+    },
+    blockExplorers: {
+        default: {
+            name: 'Push Testnet Explorer',
+            url: 'https://explorer.dev.push.org/',
+        },
+    },
+});
+//# sourceMappingURL=viem-push-testnet.js.map

package/src/lib/constants/viem-push-testnet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"viem-push-testnet.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/constants/viem-push-testnet.ts"],"names":[],"mappings":";;;;AAAA,mCAAqC;AACrC,mDAA6B;AAE7B,4CAA4C;AAC/B,QAAA,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC;IAChD,EAAE,EAAE,QAAQ,CAAC,kBAAU,CAAC,YAAY,CAAC,OAAO,CAAC;IAC7C,IAAI,EAAE,cAAc;IACpB,cAAc,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,OAAO;KAChB;IACD,OAAO,EAAE;QACP,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,kBAAU,CAAC,YAAY,CAAC,UAAU,CAAC;SAC3C;KACF;IACD,cAAc,EAAE;QACd,OAAO,EAAE;YACP,IAAI,EAAE,uBAAuB;YAC7B,GAAG,EAAE,gCAAgC;SACtC;KACF;CACF,CAAC,CAAC"}

package/src/lib/pushChain.d.ts

@@ -22,13 +22,18 @@ export declare class PushChain {
     static viem: typeof viem;
     private orchestartor;
     /**
-     * Executes a transaction on Push Chain
+     * Universal namespace containing core transaction and address computation methods
      */
-    sendTransaction: Orchestrator['execute'];
-    /**
-     * Computes the NMSC address for the universal signer on Push
-     */
-    getNMSCAddress: Orchestrator['getNMSCAddress'];
+    Universal: {
+        /**
+         * Executes a transaction on Push Chain
+         */
+        sendTransaction: Orchestrator['execute'];
+        /**
+         * Computes the NMSC address for the universal signer on Push
+         */
+        getNMSCAddress: Orchestrator['getNMSCAddress'];
+    };
     private constructor();
     /**
      * @method initialize
@@ -37,14 +42,14 @@ export declare class PushChain {
      * @param universalSigner
      * @param options - Optional settings to configure the SDK instance.
      *   - network: PushChain network to target (e.g., TESTNET, MAINNET).
-     *   - rpcUrl: Custom RPC URLs mapped by chain IDs.
+     *   - rpcUrls: Custom RPC URLs mapped by chain IDs.
      *   - printTraces: Whether to print internal trace logs for debugging.
      *
      * @returns An initialized instance of PushChain.
      */
     static initialize: (universalSigner: UniversalSigner, options?: {
         network?: NETWORK;
-        rpcUrl?: Partial<Record<CHAIN, string>>;
+        rpcUrls?: Partial<Record<CHAIN, string>>;
         printTraces?: boolean;
     }) => Promise<PushChain>;
 }

package/src/lib/pushChain.js

@@ -17,9 +17,11 @@ const viem = tslib_1.__importStar(require("viem"));
 class PushChain {
     constructor(orchestartor) {
         this.orchestartor = orchestartor;
-        // Ensure context is preserved when methods are called externally
-        this.sendTransaction = this.orchestartor.execute.bind(this.orchestartor);
-        this.getNMSCAddress = this.orchestartor.getNMSCAddress.bind(this.orchestartor);
+        // Initialize Universal namespace with bound methods
+        this.Universal = {
+            sendTransaction: this.orchestartor.execute.bind(this.orchestartor),
+            getNMSCAddress: this.orchestartor.getNMSCAddress.bind(this.orchestartor),
+        };
     }
 }
 exports.PushChain = PushChain;
@@ -41,7 +43,7 @@ PushChain.viem = viem;
  * @param universalSigner
  * @param options - Optional settings to configure the SDK instance.
  *   - network: PushChain network to target (e.g., TESTNET, MAINNET).
- *   - rpcUrl: Custom RPC URLs mapped by chain IDs.
+ *   - rpcUrls: Custom RPC URLs mapped by chain IDs.
  *   - printTraces: Whether to print internal trace logs for debugging.
  *
  * @returns An initialized instance of PushChain.
@@ -51,7 +53,7 @@ PushChain.initialize = (universalSigner, options) => tslib_1.__awaiter(void 0, v
     /**
      * Ensures the signer conforms to the UniversalSigner interface.
      */
-    (0, signer_1.createUniversalSigner)(universalSigner), (options === null || options === void 0 ? void 0 : options.network) || enums_1.NETWORK.TESTNET, (options === null || options === void 0 ? void 0 : options.rpcUrl) || {}, (options === null || options === void 0 ? void 0 : options.printTraces) || false);
+    (0, signer_1.createUniversalSigner)(universalSigner), (options === null || options === void 0 ? void 0 : options.network) || enums_1.NETWORK.TESTNET, (options === null || options === void 0 ? void 0 : options.rpcUrls) || {}, (options === null || options === void 0 ? void 0 : options.printTraces) || false);
     return new _a(orchestartor);
 });
 //# sourceMappingURL=pushChain.js.map

package/src/lib/pushChain.js.map

@@ -1 +1 @@
-{"version":3,"file":"pushChain.js","sourceRoot":"","sources":["../../../../../packages/core/src/lib/pushChain.ts"],"names":[],"mappings":";;;;;AAAA,6CAAmD;AACnD,8DAA2D;AAC3D,+CAA2D;AAE3D,mCAAgC;AAChC,mDAA6B;AAE7B;;;;;GAKG;AACH,MAAa,SAAS;IAyBpB,YAAoB,YAA0B;QAC5C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,iEAAiE;QACjE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CACzD,IAAI,CAAC,YAAY,CAClB,CAAC;IACJ,CAAC;;AAjCH,8BAkEC;;AAjEC;;;GAGG;AACW,eAAK,GAAG,aAAK,AAAR,CAAS;AAE5B;;;GAGG;AACI,cAAI,GAAG,IAAI,AAAP,CAAQ;AAwBnB;;;;;;;;;;;GAWG;AACI,oBAAU,GAAG,CAClB,eAAgC,EAChC,OAIC,EACD,EAAE;IACF,MAAM,YAAY,GAAG,IAAI,2BAAY;IACnC;;OAEG;IACH,IAAA,8BAAqB,EAAC,eAAe,CAAC,EACtC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,eAAO,CAAC,OAAO,EACnC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,KAAI,EAAE,EACrB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,KAAK,CAC9B,CAAC;IACF,OAAO,IAAI,EAAS,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC,CAAA,AAlBgB,CAkBf"}
+{"version":3,"file":"pushChain.js","sourceRoot":"","sources":["../../../../../packages/core/src/lib/pushChain.ts"],"names":[],"mappings":";;;;;AAAA,6CAAmD;AACnD,8DAA2D;AAC3D,+CAA2D;AAE3D,mCAAgC;AAChC,mDAA6B;AAE7B;;;;;GAKG;AACH,MAAa,SAAS;IA6BpB,YAAoB,YAA0B;QAC5C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,oDAAoD;QACpD,IAAI,CAAC,SAAS,GAAG;YACf,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;YAClE,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;SACzE,CAAC;IACJ,CAAC;;AArCH,8BAsEC;;AArEC;;;GAGG;AACW,eAAK,GAAG,aAAK,AAAR,CAAS;AAE5B;;;GAGG;AACI,cAAI,GAAG,IAAI,AAAP,CAAQ;AA4BnB;;;;;;;;;;;GAWG;AACI,oBAAU,GAAG,CAClB,eAAgC,EAChC,OAIC,EACD,EAAE;IACF,MAAM,YAAY,GAAG,IAAI,2BAAY;IACnC;;OAEG;IACH,IAAA,8BAAqB,EAAC,eAAe,CAAC,EACtC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,eAAO,CAAC,OAAO,EACnC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,EAAE,EACtB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,KAAK,CAC9B,CAAC;IACF,OAAO,IAAI,EAAS,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC,CAAA,AAlBgB,CAkBf"}

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

@@ -1,6 +1,6 @@
 import { WalletClient, Account } from 'viem';
 import { UniversalSigner } from '../universal.types';
-import { CHAIN } from '../../constants/enums';
+import { CHAIN, LIBRARY } from '../../constants/enums';
 import { Keypair } from '@solana/web3.js';
 /**
  * Creates a `UniversalSigner` object for signing messages and transactions
@@ -29,12 +29,7 @@ export declare function createUniversalSigner({ chain, address, signMessage, sig
  * @param {CHAIN} chain - The chain the signer will operate on
  * @returns {Promise<UniversalSigner>} A signer object configured for the specified chain
  */
-export declare function toUniversalFromViem(clientOrAccount: WalletClient | Account, chain: CHAIN): Promise<UniversalSigner>;
-/**
- * Creates a UniversalSigner from a Solana Keypair.
- *
- * @param {Keypair} keypair - The Solana Keypair to create the signer from
- * @param {CHAIN} chain - The chain the signer will operate on (should be a Solana chain)
- * @returns {UniversalSigner} A signer object configured for Solana operations
- */
-export declare function toUniversalFromSolanaKeypair(keypair: Keypair, chain: CHAIN): UniversalSigner;
+export declare function toUniversal(clientOrAccount: WalletClient | Account | Keypair, { chain, library }: {
+    chain: CHAIN;
+    library: LIBRARY;
+}): Promise<UniversalSigner>;

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

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUniversalSigner = createUniversalSigner;
-exports.toUniversalFromViem = toUniversalFromViem;
-exports.toUniversalFromSolanaKeypair = toUniversalFromSolanaKeypair;
+exports.toUniversal = toUniversal;
 const tslib_1 = require("tslib");
 const viem_1 = require("viem");
 const account_1 = require("../account/account");
@@ -39,66 +38,95 @@ function createUniversalSigner({ chain, address, signMessage, signTransaction, s
  * @param {CHAIN} chain - The chain the signer will operate on
  * @returns {Promise<UniversalSigner>} A signer object configured for the specified chain
  */
-function toUniversalFromViem(clientOrAccount, chain) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+function toUniversal(clientOrAccount_1, _a) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (clientOrAccount, { chain, library }) {
         let address;
         let signMessage;
         let signTransaction;
         let signTypedData;
-        if ('getAddresses' in clientOrAccount) {
-            // It's a WalletClient
-            address = (yield clientOrAccount.getAddresses())[0];
-            signMessage = (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                const hexSig = yield clientOrAccount.signMessage({
-                    account: clientOrAccount.account || address,
-                    message: { raw: data },
-                });
-                return (0, viem_1.hexToBytes)(hexSig);
-            });
-            signTransaction = (unsignedTx) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                const tx = (0, viem_1.parseTransaction)((0, viem_1.bytesToHex)(unsignedTx));
-                const txHash = yield clientOrAccount.signTransaction(tx);
-                return (0, viem_1.hexToBytes)(txHash);
-            });
-            signTypedData = (_a) => tslib_1.__awaiter(this, [_a], void 0, function* ({ domain, types, primaryType, message, }) {
-                const hexSig = yield clientOrAccount.signTypedData({
-                    domain,
-                    types,
-                    primaryType,
-                    message,
-                    account: clientOrAccount.account || address,
-                });
-                return (0, viem_1.hexToBytes)(hexSig);
-            });
-        }
-        else {
-            // It's an Account
-            if (!clientOrAccount.address ||
-                !clientOrAccount.signMessage ||
-                !clientOrAccount.signTransaction) {
-                throw new Error('Invalid Account instance: missing required properties');
+        switch (library) {
+            case enums_1.LIBRARY.ETHEREUM_VIEM: {
+                if ('getAddresses' in clientOrAccount) {
+                    // It's a WalletClient
+                    address = (yield clientOrAccount.getAddresses())[0];
+                    signMessage = (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        const hexSig = yield clientOrAccount.signMessage({
+                            account: clientOrAccount.account || address,
+                            message: { raw: data },
+                        });
+                        return (0, viem_1.hexToBytes)(hexSig);
+                    });
+                    signTransaction = (unsignedTx) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        const tx = (0, viem_1.parseTransaction)((0, viem_1.bytesToHex)(unsignedTx));
+                        const txHash = yield clientOrAccount.signTransaction(tx);
+                        return (0, viem_1.hexToBytes)(txHash);
+                    });
+                    signTypedData = (_a) => tslib_1.__awaiter(this, [_a], void 0, function* ({ domain, types, primaryType, message, }) {
+                        const hexSig = yield clientOrAccount.signTypedData({
+                            domain,
+                            types,
+                            primaryType,
+                            message,
+                            account: clientOrAccount.account || address,
+                        });
+                        return (0, viem_1.hexToBytes)(hexSig);
+                    });
+                }
+                else {
+                    // It's an Account
+                    const account = clientOrAccount;
+                    if (!account.address ||
+                        !account.signMessage ||
+                        !account.signTransaction) {
+                        throw new Error('Invalid Account instance: missing required properties');
+                    }
+                    address = account.address;
+                    signMessage = (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        const hexSig = yield account.signMessage({
+                            message: { raw: data },
+                        });
+                        return (0, viem_1.hexToBytes)(hexSig);
+                    });
+                    signTransaction = (unsignedTx) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        const tx = (0, viem_1.parseTransaction)((0, viem_1.bytesToHex)(unsignedTx));
+                        const hexSig = yield account.signTransaction(tx);
+                        return (0, viem_1.hexToBytes)(hexSig);
+                    });
+                    signTypedData = (_a) => tslib_1.__awaiter(this, [_a], void 0, function* ({ domain, types, primaryType, message, }) {
+                        const hexSig = yield account.signTypedData({
+                            domain,
+                            types,
+                            primaryType,
+                            message,
+                        });
+                        return (0, viem_1.hexToBytes)(hexSig);
+                    });
+                }
+                break;
             }
-            address = clientOrAccount.address;
-            signMessage = (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                const hexSig = yield clientOrAccount.signMessage({
-                    message: { raw: data },
+            case enums_1.LIBRARY.SOLANA_WEB3: {
+                // It's a Solana Keypair
+                const keypair = clientOrAccount;
+                if (chain !== enums_1.CHAIN.SOLANA_MAINNET &&
+                    chain !== enums_1.CHAIN.SOLANA_TESTNET &&
+                    chain !== enums_1.CHAIN.SOLANA_DEVNET) {
+                    throw new Error('Invalid chain for Solana Keypair');
+                }
+                address = keypair.publicKey.toBase58();
+                signMessage = (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    return nacl.sign.detached(data, keypair.secretKey);
                 });
-                return (0, viem_1.hexToBytes)(hexSig);
-            });
-            signTransaction = (unsignedTx) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                const tx = (0, viem_1.parseTransaction)((0, viem_1.bytesToHex)(unsignedTx));
-                const hexSig = yield clientOrAccount.signTransaction(tx);
-                return (0, viem_1.hexToBytes)(hexSig);
-            });
-            signTypedData = (_a) => tslib_1.__awaiter(this, [_a], void 0, function* ({ domain, types, primaryType, message, }) {
-                const hexSig = yield clientOrAccount.signTypedData({
-                    domain,
-                    types,
-                    primaryType,
-                    message,
+                signTransaction = (unsignedTx) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    return nacl.sign.detached(unsignedTx, keypair.secretKey);
                 });
-                return (0, viem_1.hexToBytes)(hexSig);
-            });
+                signTypedData = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    throw new Error('Typed data signing is not supported for Solana');
+                });
+                break;
+            }
+            default: {
+                throw new Error(`Unsupported library: ${library}`);
+            }
         }
         const universalSigner = {
             address,
@@ -110,29 +138,4 @@ function toUniversalFromViem(clientOrAccount, chain) {
         return createUniversalSigner(universalSigner);
     });
 }
-/**
- * Creates a UniversalSigner from a Solana Keypair.
- *
- * @param {Keypair} keypair - The Solana Keypair to create the signer from
- * @param {CHAIN} chain - The chain the signer will operate on (should be a Solana chain)
- * @returns {UniversalSigner} A signer object configured for Solana operations
- */
-function toUniversalFromSolanaKeypair(keypair, chain) {
-    if (chain !== enums_1.CHAIN.SOLANA_MAINNET &&
-        chain !== enums_1.CHAIN.SOLANA_TESTNET &&
-        chain !== enums_1.CHAIN.SOLANA_DEVNET) {
-        throw new Error('Invalid chain for Solana Keypair');
-    }
-    const universalSigner = {
-        address: keypair.publicKey.toBase58(),
-        chain,
-        signMessage: (data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return nacl.sign.detached(data, keypair.secretKey);
-        }),
-        signTransaction: (unsignedTx) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return nacl.sign.detached(unsignedTx, keypair.secretKey);
-        }),
-    };
-    return createUniversalSigner(universalSigner);
-}
 //# sourceMappingURL=signer.js.map

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":"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"}
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../../../../../packages/core/src/lib/universal/signer/signer.ts"],"names":[],"mappings":";;AAkCA,sDAaC;AASD,kCA4IC;;AApMD,+BAQc;AACd,gDAA4D;AAE5D,iDAAuD;AACvD,wDAAkC;AAGlC;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,qBAAqB,CAAC,EACpC,KAAK,EACL,OAAO,EACP,WAAW,EACX,eAAe,EACf,aAAa,GACG;IAChB,uCACK,IAAA,gCAAsB,EAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,KAC7C,WAAW;QACX,eAAe;QACf,aAAa,IACb;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAsB,WAAW;iEAC/B,eAAiD,EACjD,EAAE,KAAK,EAAE,OAAO,EAAsC;QAEtD,IAAI,OAAe,CAAC;QACpB,IAAI,WAAsD,CAAC;QAC3D,IAAI,eAAgE,CAAC;QACrE,IAAI,aAUqB,CAAC;QAE1B,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,eAAO,CAAC,aAAa,CAAC,CAAC,CAAC;gBAC3B,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;oBACtC,sBAAsB;oBACtB,OAAO,GAAG,CAAC,MAAM,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpD,WAAW,GAAG,CAAO,IAAgB,EAAE,EAAE;wBACvC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC;4BAC/C,OAAO,EAAE,eAAe,CAAC,OAAO,IAAK,OAAyB;4BAC9D,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;yBACvB,CAAC,CAAC;wBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;oBAC5B,CAAC,CAAA,CAAC;oBACF,eAAe,GAAG,CAAO,UAAsB,EAAE,EAAE;wBACjD,MAAM,EAAE,GAAG,IAAA,uBAAgB,EAAC,IAAA,iBAAU,EAAC,UAAU,CAAC,CAAC,CAAC;wBACpD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,eAAe,CAAC,EAAW,CAAC,CAAC;wBAClE,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;oBAC5B,CAAC,CAAA,CAAC;oBACF,aAAa,GAAG,KAUb,EAAE,kDAVkB,EACrB,MAAM,EACN,KAAK,EACL,WAAW,EACX,OAAO,GAMR;wBACC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC;4BACjD,MAAM;4BACN,KAAK;4BACL,WAAW;4BACX,OAAO;4BACP,OAAO,EAAE,eAAe,CAAC,OAAO,IAAK,OAAyB;yBAC/D,CAAC,CAAC;wBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;oBAC5B,CAAC,CAAA,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,kBAAkB;oBAClB,MAAM,OAAO,GAAG,eAA0B,CAAC;oBAC3C,IACE,CAAC,OAAO,CAAC,OAAO;wBAChB,CAAC,OAAO,CAAC,WAAW;wBACpB,CAAC,OAAO,CAAC,eAAe,EACxB,CAAC;wBACD,MAAM,IAAI,KAAK,CACb,uDAAuD,CACxD,CAAC;oBACJ,CAAC;oBACD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;oBAC1B,WAAW,GAAG,CAAO,IAAgB,EAAE,EAAE;wBACvC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC;4BACvC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;yBACvB,CAAC,CAAC;wBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;oBAC5B,CAAC,CAAA,CAAC;oBACF,eAAe,GAAG,CAAO,UAAsB,EAAE,EAAE;wBACjD,MAAM,EAAE,GAAG,IAAA,uBAAgB,EAAC,IAAA,iBAAU,EAAC,UAAU,CAAC,CAAC,CAAC;wBACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;wBACjD,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;oBAC5B,CAAC,CAAA,CAAC;oBACF,aAAa,GAAG,KAUb,EAAE,kDAVkB,EACrB,MAAM,EACN,KAAK,EACL,WAAW,EACX,OAAO,GAMR;wBACC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC;4BACzC,MAAM;4BACN,KAAK;4BACL,WAAW;4BACX,OAAO;yBACR,CAAC,CAAC;wBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;oBAC5B,CAAC,CAAA,CAAC;gBACJ,CAAC;gBACD,MAAM;YACR,CAAC;YAED,KAAK,eAAO,CAAC,WAAW,CAAC,CAAC,CAAC;gBACzB,wBAAwB;gBACxB,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;gBACvC,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;gBACF,eAAe,GAAG,CAAO,UAAsB,EAAE,EAAE;oBACjD,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC3D,CAAC,CAAA,CAAC;gBACF,aAAa,GAAG,GAAS,EAAE;oBACzB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,CAAC,CAAA,CAAC;gBACF,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;YACP,KAAK;YACL,WAAW;YACX,eAAe;YACf,aAAa;SACd,CAAC;QACF,OAAO,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;CAAA"}

package/src/lib/utils.d.ts

@@ -1,5 +1,5 @@
 import { toChainAgnostic, toUniversal as toUniversalAccount } from './universal/account';
-import { toUniversalFromSolanaKeypair, toUniversalFromViem } from './universal/signer';
+import { toUniversal } from './universal/signer';
 /**
  * @dev - THESE UTILS ARE EXPORTED TO SDK CONSUMER
  * @dev - Make sure each exported fn has good comments to help out sdk consumer
@@ -42,12 +42,8 @@ export declare class Utils {
     };
     static signer: {
         /**
-         * Wraps a viem WalletClient into a UniversalSigner.
+         * Converts various signer types (viem, ethers v6, Solana) into a UniversalSigner.
          */
-        toUniversalFromViem: typeof toUniversalFromViem;
-        /**
-         * Wraps a Solana Keypair into a UniversalSigner.
-         */
-        toUniversalFromSolanaKeypair: typeof toUniversalFromSolanaKeypair;
+        toUniversal: typeof toUniversal;
     };
 }

package/src/lib/utils.js

@@ -47,12 +47,8 @@ Utils.account = {
 };
 Utils.signer = {
     /**
-     * Wraps a viem WalletClient into a UniversalSigner.
+     * Converts various signer types (viem, ethers v6, Solana) into a UniversalSigner.
      */
-    toUniversalFromViem: signer_1.toUniversalFromViem,
-    /**
-     * Wraps a Solana Keypair into a UniversalSigner.
-     */
-    toUniversalFromSolanaKeypair: signer_1.toUniversalFromSolanaKeypair,
+    toUniversal: signer_1.toUniversal,
 };
 //# sourceMappingURL=utils.js.map

package/src/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/core/src/lib/utils.ts"],"names":[],"mappings":";;;AAAA,iDAG6B;AAC7B,+CAG4B;AAE5B;;;GAGG;AAEH;;;GAGG;AACH,MAAa,KAAK;;AAAlB,sBA6CC;AA5CQ,aAAO,GAAG;IACf;;;;;;;;;;;;;;;OAeG;IACH,eAAe,EAAf,yBAAe;IAEf;;;;;;;;;;OAUG;IACH,WAAW,EAAE,qBAAkB;CAChC,CAAC;AAEK,YAAM,GAAG;IACd;;OAEG;IACH,mBAAmB,EAAnB,4BAAmB;IAEnB;;OAEG;IACH,4BAA4B,EAA5B,qCAA4B;CAC7B,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/core/src/lib/utils.ts"],"names":[],"mappings":";;;AAAA,iDAG6B;AAC7B,+CAAiD;AAEjD;;;GAGG;AAEH;;;GAGG;AACH,MAAa,KAAK;;AAAlB,sBAwCC;AAvCQ,aAAO,GAAG;IACf;;;;;;;;;;;;;;;OAeG;IACH,eAAe,EAAf,yBAAe;IAEf;;;;;;;;;;OAUG;IACH,WAAW,EAAE,qBAAkB;CAChC,CAAC;AAEK,YAAM,GAAG;IACd;;OAEG;IACH,WAAW,EAAX,oBAAW;CACZ,CAAC"}