@pushchain/core 0.1.0 → 0.1.2

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":";;AAkCA,sDAaC;AASD,kDAwGC;AASD,oEAsBC;;AA/LD,+BAQc;AACd,gDAA4D;AAE5D,iDAA8C;AAC9C,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,mBAAmB,CACvC,eAAuC,EACvC,KAAY;;QAEZ,IAAI,OAAsB,CAAC;QAC3B,IAAI,WAAsD,CAAC;QAC3D,IAAI,eAAgE,CAAC;QACrE,IAAI,aAUqB,CAAC;QAE1B,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;YACtC,sBAAsB;YACtB,OAAO,GAAG,CAAC,MAAM,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,WAAW,GAAG,CAAO,IAAgB,EAAE,EAAE;gBACvC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC;oBAC/C,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,OAAO;oBAC3C,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBACvB,CAAC,CAAC;gBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAA,CAAC;YACF,eAAe,GAAG,CAAO,UAAsB,EAAE,EAAE;gBACjD,MAAM,EAAE,GAAG,IAAA,uBAAgB,EAAC,IAAA,iBAAU,EAAC,UAAU,CAAC,CAAC,CAAC;gBACpD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,eAAe,CAAC,EAAW,CAAC,CAAC;gBAClE,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAA,CAAC;YACF,aAAa,GAAG,KAUb,EAAE,kDAVkB,EACrB,MAAM,EACN,KAAK,EACL,WAAW,EACX,OAAO,GAMR;gBACC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC;oBACjD,MAAM;oBACN,KAAK;oBACL,WAAW;oBACX,OAAO;oBACP,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,OAAO;iBAC5C,CAAC,CAAC;gBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAA,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,kBAAkB;YAClB,IACE,CAAC,eAAe,CAAC,OAAO;gBACxB,CAAC,eAAe,CAAC,WAAW;gBAC5B,CAAC,eAAe,CAAC,eAAe,EAChC,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;YAC3E,CAAC;YACD,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;YAClC,WAAW,GAAG,CAAO,IAAgB,EAAE,EAAE;gBACvC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC;oBAC/C,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBACvB,CAAC,CAAC;gBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAA,CAAC;YACF,eAAe,GAAG,CAAO,UAAsB,EAAE,EAAE;gBACjD,MAAM,EAAE,GAAG,IAAA,uBAAgB,EAAC,IAAA,iBAAU,EAAC,UAAU,CAAC,CAAC,CAAC;gBACpD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;gBACzD,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAA,CAAC;YACF,aAAa,GAAG,KAUb,EAAE,kDAVkB,EACrB,MAAM,EACN,KAAK,EACL,WAAW,EACX,OAAO,GAMR;gBACC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC;oBACjD,MAAM;oBACN,KAAK;oBACL,WAAW;oBACX,OAAO;iBACR,CAAC,CAAC;gBACH,OAAO,IAAA,iBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAA,CAAC;QACJ,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;AAED;;;;;;GAMG;AACH,SAAgB,4BAA4B,CAC1C,OAAgB,EAChB,KAAY;IAEZ,IACE,KAAK,KAAK,aAAK,CAAC,cAAc;QAC9B,KAAK,KAAK,aAAK,CAAC,cAAc;QAC9B,KAAK,KAAK,aAAK,CAAC,aAAa,EAC7B,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IACD,MAAM,eAAe,GAAoB;QACvC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE;QACrC,KAAK;QACL,WAAW,EAAE,CAAO,IAAgB,EAAE,EAAE;YACtC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACrD,CAAC,CAAA;QACD,eAAe,EAAE,CAAO,UAAsB,EAAE,EAAE;YAChD,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC3D,CAAC,CAAA;KACF,CAAC;IACF,OAAO,qBAAqB,CAAC,eAAe,CAAC,CAAC;AAChD,CAAC"}
+{"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

@@ -1,5 +1,6 @@
 import { TypedData, TypedDataDomain } from 'viem';
 import { CHAIN } from '../constants/enums';
+import { Keypair } from '@solana/web3.js';
 /**
  * A chain-agnostic account representation.
  * Used to represent a wallet address along with its chain context.
@@ -14,11 +15,55 @@ export interface UniversalAccount {
      */
     address: string;
 }
+export interface CustomUniversalSigner {
+    signerId: 'custom_generated_signer';
+    account: UniversalAccount;
+    signMessage: (data: Uint8Array) => Promise<Uint8Array>;
+    signTransaction: (unsignedTx: Uint8Array) => Promise<Uint8Array>;
+    signTypedData: ({ domain, types, primaryType, message, }: {
+        domain: TypedDataDomain;
+        types: TypedData;
+        primaryType: string;
+        message: Record<string, any>;
+    }) => Promise<Uint8Array>;
+}
+export interface MetamaskSigner {
+    signMessage: (data: Uint8Array) => Promise<Uint8Array>;
+    signTransaction: (unsignedTx: Uint8Array) => Promise<Uint8Array>;
+    signTypedData: ({ domain, types, primaryType, message, }: {
+        domain: TypedDataDomain;
+        types: TypedData;
+        primaryType: string;
+        message: Record<string, any>;
+    }) => Promise<Uint8Array>;
+}
+export interface ViemSigner {
+    signTypedData: (args: {
+        account: any;
+        domain: any;
+        types: any;
+        primaryType: any;
+        message: any;
+    }) => Promise<`0x${string}`>;
+    getChainId: () => Promise<number>;
+    signMessage: (args: {
+        message: any;
+        account: any;
+        [key: string]: any;
+    }) => Promise<`0x${string}`>;
+    account: {
+        [key: string]: any;
+    };
+    privateKey?: string;
+    provider?: any;
+}
+export type SolanaWeb3jsSigner = Keypair;
 /**
  * A signer capable of signing messages for a specific chain.
  * Used to abstract away signing across multiple VM types.
  */
-export interface UniversalSigner extends UniversalAccount {
+export interface UniversalSigner {
+    account: UniversalAccount;
     /**
      * Signs an arbitrary data, provided as binary data.
      *
@@ -50,3 +95,15 @@ export interface UniversalSigner extends UniversalAccount {
      */
     signTransaction: (unsignedTx: Uint8Array) => Promise<Uint8Array>;
 }
+export interface UniversalSignerSkeleton {
+    signerId: 'CustomGeneratedSigner';
+    account: UniversalAccount;
+    signMessage: (data: Uint8Array) => Promise<Uint8Array>;
+    signTransaction: (unsignedTx: Uint8Array) => Promise<Uint8Array>;
+    signTypedData?: ({ domain, types, primaryType, message, }: {
+        domain: TypedDataDomain;
+        types: TypedData;
+        primaryType: string;
+        message: Record<string, any>;
+    }) => Promise<Uint8Array>;
+}

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 { toUniversalFromKeyPair, construct, 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,16 @@ 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;
+        toUniversalFromKeyPair: typeof toUniversalFromKeyPair;
         /**
-         * Wraps a Solana Keypair into a UniversalSigner.
+         * Constructs a UniversalSignerSkeleton from raw signing functions.
          */
-        toUniversalFromSolanaKeypair: typeof toUniversalFromSolanaKeypair;
+        construct: typeof construct;
+        /**
+         * Converts a UniversalSignerSkeleton to a UniversalSigner.
+         */
+        toUniversal: typeof toUniversal;
     };
 }

package/src/lib/utils.js

@@ -47,12 +47,16 @@ 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,
+    toUniversalFromKeyPair: signer_1.toUniversalFromKeyPair,
     /**
-     * Wraps a Solana Keypair into a UniversalSigner.
+     * Constructs a UniversalSignerSkeleton from raw signing functions.
      */
-    toUniversalFromSolanaKeypair: signer_1.toUniversalFromSolanaKeypair,
+    construct: signer_1.construct,
+    /**
+     * Converts a UniversalSignerSkeleton to a UniversalSigner.
+     */
+    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,+CAI4B;AAE5B;;;GAGG;AAEH;;;GAGG;AACH,MAAa,KAAK;;AAAlB,sBAgDC;AA/CQ,aAAO,GAAG;IACf;;;;;;;;;;;;;;;OAeG;IACH,eAAe,EAAf,yBAAe;IAEf;;;;;;;;;;OAUG;IACH,WAAW,EAAE,qBAAkB;CAChC,CAAC;AAEK,YAAM,GAAG;IACd;;OAEG;IACH,sBAAsB,EAAtB,+BAAsB;IACtB;;OAEG;IACH,SAAS,EAAT,kBAAS;IACT;;OAEG;IACH,WAAW,EAAX,oBAAW;CACZ,CAAC"}

package/src/lib/vm-client/evm-client.d.ts

@@ -138,7 +138,7 @@ export declare class EvmClient {
      * });
      *
      * const gasEstimate = await evmClient.estimateGas({
-     *   from: universalSigner.address as `0x${string}`,
+     *   from: universalSigner.account.address as `0x${string}`,
      *   to: '0xContractAddress',
      *   data,
      *   value: BigInt(0),

package/src/lib/vm-client/evm-client.js

@@ -144,10 +144,10 @@ class EvmClient {
         return tslib_1.__awaiter(this, arguments, void 0, function* ({ to, data, value = (0, viem_1.parseEther)('0'), signer, }) {
             const [nonce, gas, feePerGas] = yield Promise.all([
                 this.publicClient.getTransactionCount({
-                    address: signer.address,
+                    address: signer.account.address,
                 }),
                 this.publicClient.estimateGas({
-                    account: signer.address,
+                    account: signer.account.address,
                     to,
                     data,
                     value,
@@ -199,7 +199,7 @@ class EvmClient {
      * });
      *
      * const gasEstimate = await evmClient.estimateGas({
-     *   from: universalSigner.address as `0x${string}`,
+     *   from: universalSigner.account.address as `0x${string}`,
      *   to: '0xContractAddress',
      *   data,
      *   value: BigInt(0),

package/src/lib/vm-client/evm-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"evm-client.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/vm-client/evm-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evm-client.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/vm-client/evm-client.ts"],"names":[],"mappings":"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"}

package/src/lib/vm-client/svm-client.js

@@ -74,7 +74,7 @@ class SvmClient {
      */
     sendTransaction(_a) {
         return tslib_1.__awaiter(this, arguments, void 0, function* ({ instruction, signer, extraSigners = [], }) {
-            const feePayerPubkey = new web3_js_1.PublicKey(signer.address);
+            const feePayerPubkey = new web3_js_1.PublicKey(signer.account.address);
             const { blockhash, lastValidBlockHeight } = yield this.connection.getLatestBlockhash('finalized');
             const tx = new web3_js_1.Transaction({
                 feePayer: feePayerPubkey,
@@ -119,7 +119,7 @@ class SvmClient {
      */
     estimateGas(_a) {
         return tslib_1.__awaiter(this, arguments, void 0, function* ({ instructions, signer, }) {
-            const feePayer = new web3_js_1.PublicKey(signer.address);
+            const feePayer = new web3_js_1.PublicKey(signer.account.address);
             const { blockhash, lastValidBlockHeight } = yield this.connection.getLatestBlockhash();
             const tx = new web3_js_1.Transaction({ blockhash, lastValidBlockHeight, feePayer });
             if (instructions.length)

package/src/lib/vm-client/svm-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"svm-client.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/vm-client/svm-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"svm-client.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/vm-client/svm-client.ts"],"names":[],"mappings":"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"}