@dynamic-labs-wallet/node-svm 0.0.0-beta.250.1 → 0.0.0-beta.254.1

package/index.cjs.js

@@ -61,7 +61,7 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    *
    * @param thresholdSignatureScheme The threshold signature scheme to use
    * @returns The account address, public key hex, raw public key, and client key shares
-   */ async createWalletAccount({ thresholdSignatureScheme, password = undefined, onError }) {
+   */ async createWalletAccount({ thresholdSignatureScheme, password = undefined, onError, signedSessionId }) {
         try {
             let ceremonyCeremonyCompleteResolver;
             const ceremonyCompletePromise = new Promise((resolve)=>{
@@ -92,8 +92,8 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
             });
             // Wait for the ceremony to complete before proceeding
             await ceremonyCompletePromise;
-            if (!rawPublicKey || !(rawPublicKey instanceof Uint8Array)) {
-                throw new Error('Raw public key is not a Uint8Array');
+            if (!rawPublicKey || !(rawPublicKey instanceof Uint8Array || typeof rawPublicKey === 'string')) {
+                throw new Error('Raw public key is not a Uint8Array or string' + typeof rawPublicKey);
             }
             if (!externalServerKeyShares) {
                 throw new Error('Error creating wallet account');
@@ -102,11 +102,12 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
             await this.storeEncryptedBackupByWalletWithRetry({
                 accountAddress,
                 externalServerKeyShares,
-                password
+                password,
+                signedSessionId
             });
             return {
                 accountAddress,
-                rawPublicKey: rawPublicKey,
+                rawPublicKey,
                 externalServerKeyShares
             };
         } catch (error) {
@@ -116,9 +117,10 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
     }
     // Function to properly derive account address
     async deriveAccountAddress(rawPublicKey) {
-        const pubKey = new web3_js.PublicKey(rawPublicKey);
-        const fromKey = pubKey.toBase58();
-        const accountAddress = fromKey;
+        const pubKeyBytes = typeof rawPublicKey === 'string' ? Buffer.from(rawPublicKey, 'hex') : rawPublicKey;
+        // Create PublicKey from bytes and convert to base58
+        const pubKey = new web3_js.PublicKey(pubKeyBytes);
+        const accountAddress = pubKey.toBase58();
         return {
             accountAddress
         };
@@ -129,11 +131,12 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * @param message The message to sign (Uint8Array)
    * @param accountAddress Solana address (base58 encoded)
    * @param password The password for encrypted backup shares
-   */ async signMessage({ message, accountAddress, password = undefined }) {
+   */ async signMessage({ message, accountAddress, password = undefined, signedSessionId, externalServerKeyShares }) {
         await this.verifyPassword({
             accountAddress,
             password,
-            walletOperation: node.WalletOperation.SIGN_MESSAGE
+            walletOperation: node.WalletOperation.SIGN_MESSAGE,
+            signedSessionId
         });
         if (!accountAddress) {
             throw new Error('Account address is required');
@@ -143,8 +146,11 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
                 message,
                 accountAddress: accountAddress,
                 chainName: this.chainName,
-                password
+                password,
+                signedSessionId,
+                externalServerKeyShares
             });
+            // Use PublicKey to encode signature
             const base58Signature = new web3_js.PublicKey(signatureEd25519).toBase58();
             return base58Signature;
         } catch (error) {
@@ -152,11 +158,13 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
             throw error;
         }
     }
-    async signTransaction({ senderAddress, transaction, password = undefined }) {
+    //todo:should txn just be a string?
+    async signTransaction({ senderAddress, transaction, password = undefined, signedSessionId, externalServerKeyShares }) {
         await this.verifyPassword({
             accountAddress: senderAddress,
             password,
-            walletOperation: node.WalletOperation.SIGN_TRANSACTION
+            walletOperation: node.WalletOperation.SIGN_TRANSACTION,
+            signedSessionId
         });
         try {
             let messageToSign;
@@ -173,7 +181,9 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
                 message: messageToSign,
                 accountAddress: senderAddress,
                 chainName: this.chainName,
-                password
+                password,
+                signedSessionId,
+                externalServerKeyShares
             });
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
@@ -199,19 +209,18 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * @param accountAddress The account address to export the private key for
    * @param password The password for encrypted backup shares
    * @returns The private key
-   */ async exportPrivateKey({ accountAddress, password = undefined }) {
+   */ async exportPrivateKey({ accountAddress, password = undefined, signedSessionId, externalServerKeyShares }) {
         const { derivedPrivateKey } = await this.exportKey({
             accountAddress,
             chainName: this.chainName,
-            password
+            password,
+            signedSessionId,
+            externalServerKeyShares
         });
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
         }
-        const encodedPrivateKey = new web3_js.PublicKey(derivedPrivateKey).toBase58();
-        return {
-            derivedPrivateKey: encodedPrivateKey
-        };
+        return derivedPrivateKey;
     }
     /**
    * Exports the private key for a given account address
@@ -234,20 +243,18 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * @param privateKey The private key to convert
    * @returns The hex string
    */ decodePrivateKeyForSolana(privateKey) {
-        const decoded = new web3_js.PublicKey(privateKey).toBase58();
+        const decoded = new web3_js.PublicKey(privateKey).toBuffer();
         const slicedBytes = decoded.slice(0, 32);
         return Buffer.from(slicedBytes).toString('hex');
     }
     getPublicKeyFromPrivateKey(privateKey) {
-        const privateKeyBytes = new web3_js.PublicKey(privateKey).toBase58();
-        const keypair = web3_js.Keypair.fromSecretKey(Buffer.from(privateKeyBytes));
+        const privateKeyBytes = new web3_js.PublicKey(privateKey).toBuffer();
+        const keypair = web3_js.Keypair.fromSecretKey(privateKeyBytes);
         const publicKeyBase58 = keypair.publicKey.toBase58();
         return publicKeyBase58;
     }
     encodePublicKey(publicKey) {
-        const pubKey = new web3_js.PublicKey(publicKey);
-        const fromKey = pubKey.toBase58();
-        return fromKey;
+        return new web3_js.PublicKey(publicKey).toBase58();
     }
     /**
    * Imports the private key for a given account address
@@ -257,7 +264,7 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * @param thresholdSignatureScheme The threshold signature scheme to use
    * @param password The password for encrypted backup shares
    * @returns The account address, raw public key, and client key shares
-   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, onError }) {
+   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, onError, signedSessionId }) {
         let ceremonyCeremonyCompleteResolver;
         const ceremonyCompletePromise = new Promise((resolve)=>{
             ceremonyCeremonyCompleteResolver = resolve;
@@ -294,7 +301,8 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
         await this.storeEncryptedBackupByWalletWithRetry({
             accountAddress,
             externalServerKeyShares,
-            password
+            password,
+            signedSessionId
         });
         return {
             accountAddress,

package/index.esm.js

@@ -59,7 +59,7 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    *
    * @param thresholdSignatureScheme The threshold signature scheme to use
    * @returns The account address, public key hex, raw public key, and client key shares
-   */ async createWalletAccount({ thresholdSignatureScheme, password = undefined, onError }) {
+   */ async createWalletAccount({ thresholdSignatureScheme, password = undefined, onError, signedSessionId }) {
         try {
             let ceremonyCeremonyCompleteResolver;
             const ceremonyCompletePromise = new Promise((resolve)=>{
@@ -90,8 +90,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             });
             // Wait for the ceremony to complete before proceeding
             await ceremonyCompletePromise;
-            if (!rawPublicKey || !(rawPublicKey instanceof Uint8Array)) {
-                throw new Error('Raw public key is not a Uint8Array');
+            if (!rawPublicKey || !(rawPublicKey instanceof Uint8Array || typeof rawPublicKey === 'string')) {
+                throw new Error('Raw public key is not a Uint8Array or string' + typeof rawPublicKey);
             }
             if (!externalServerKeyShares) {
                 throw new Error('Error creating wallet account');
@@ -100,11 +100,12 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             await this.storeEncryptedBackupByWalletWithRetry({
                 accountAddress,
                 externalServerKeyShares,
-                password
+                password,
+                signedSessionId
             });
             return {
                 accountAddress,
-                rawPublicKey: rawPublicKey,
+                rawPublicKey,
                 externalServerKeyShares
             };
         } catch (error) {
@@ -114,9 +115,10 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
     }
     // Function to properly derive account address
     async deriveAccountAddress(rawPublicKey) {
-        const pubKey = new PublicKey(rawPublicKey);
-        const fromKey = pubKey.toBase58();
-        const accountAddress = fromKey;
+        const pubKeyBytes = typeof rawPublicKey === 'string' ? Buffer.from(rawPublicKey, 'hex') : rawPublicKey;
+        // Create PublicKey from bytes and convert to base58
+        const pubKey = new PublicKey(pubKeyBytes);
+        const accountAddress = pubKey.toBase58();
         return {
             accountAddress
         };
@@ -127,11 +129,12 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param message The message to sign (Uint8Array)
    * @param accountAddress Solana address (base58 encoded)
    * @param password The password for encrypted backup shares
-   */ async signMessage({ message, accountAddress, password = undefined }) {
+   */ async signMessage({ message, accountAddress, password = undefined, signedSessionId, externalServerKeyShares }) {
         await this.verifyPassword({
             accountAddress,
             password,
-            walletOperation: WalletOperation.SIGN_MESSAGE
+            walletOperation: WalletOperation.SIGN_MESSAGE,
+            signedSessionId
         });
         if (!accountAddress) {
             throw new Error('Account address is required');
@@ -141,8 +144,11 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
                 message,
                 accountAddress: accountAddress,
                 chainName: this.chainName,
-                password
+                password,
+                signedSessionId,
+                externalServerKeyShares
             });
+            // Use PublicKey to encode signature
             const base58Signature = new PublicKey(signatureEd25519).toBase58();
             return base58Signature;
         } catch (error) {
@@ -150,11 +156,13 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             throw error;
         }
     }
-    async signTransaction({ senderAddress, transaction, password = undefined }) {
+    //todo:should txn just be a string?
+    async signTransaction({ senderAddress, transaction, password = undefined, signedSessionId, externalServerKeyShares }) {
         await this.verifyPassword({
             accountAddress: senderAddress,
             password,
-            walletOperation: WalletOperation.SIGN_TRANSACTION
+            walletOperation: WalletOperation.SIGN_TRANSACTION,
+            signedSessionId
         });
         try {
             let messageToSign;
@@ -171,7 +179,9 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
                 message: messageToSign,
                 accountAddress: senderAddress,
                 chainName: this.chainName,
-                password
+                password,
+                signedSessionId,
+                externalServerKeyShares
             });
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
@@ -197,19 +207,18 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param accountAddress The account address to export the private key for
    * @param password The password for encrypted backup shares
    * @returns The private key
-   */ async exportPrivateKey({ accountAddress, password = undefined }) {
+   */ async exportPrivateKey({ accountAddress, password = undefined, signedSessionId, externalServerKeyShares }) {
         const { derivedPrivateKey } = await this.exportKey({
             accountAddress,
             chainName: this.chainName,
-            password
+            password,
+            signedSessionId,
+            externalServerKeyShares
         });
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
         }
-        const encodedPrivateKey = new PublicKey(derivedPrivateKey).toBase58();
-        return {
-            derivedPrivateKey: encodedPrivateKey
-        };
+        return derivedPrivateKey;
     }
     /**
    * Exports the private key for a given account address
@@ -232,20 +241,18 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param privateKey The private key to convert
    * @returns The hex string
    */ decodePrivateKeyForSolana(privateKey) {
-        const decoded = new PublicKey(privateKey).toBase58();
+        const decoded = new PublicKey(privateKey).toBuffer();
         const slicedBytes = decoded.slice(0, 32);
         return Buffer.from(slicedBytes).toString('hex');
     }
     getPublicKeyFromPrivateKey(privateKey) {
-        const privateKeyBytes = new PublicKey(privateKey).toBase58();
-        const keypair = Keypair.fromSecretKey(Buffer.from(privateKeyBytes));
+        const privateKeyBytes = new PublicKey(privateKey).toBuffer();
+        const keypair = Keypair.fromSecretKey(privateKeyBytes);
         const publicKeyBase58 = keypair.publicKey.toBase58();
         return publicKeyBase58;
     }
     encodePublicKey(publicKey) {
-        const pubKey = new PublicKey(publicKey);
-        const fromKey = pubKey.toBase58();
-        return fromKey;
+        return new PublicKey(publicKey).toBase58();
     }
     /**
    * Imports the private key for a given account address
@@ -255,7 +262,7 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param thresholdSignatureScheme The threshold signature scheme to use
    * @param password The password for encrypted backup shares
    * @returns The account address, raw public key, and client key shares
-   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, onError }) {
+   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, onError, signedSessionId }) {
         let ceremonyCeremonyCompleteResolver;
         const ceremonyCompletePromise = new Promise((resolve)=>{
             ceremonyCeremonyCompleteResolver = resolve;
@@ -292,7 +299,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
         await this.storeEncryptedBackupByWalletWithRetry({
             accountAddress,
             externalServerKeyShares,
-            password
+            password,
+            signedSessionId
         });
         return {
             accountAddress,

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dynamic-labs-wallet/node-svm",
-  "version": "0.0.0-beta.250.1",
+  "version": "0.0.0-beta.254.1",
   "license": "MIT",
   "dependencies": {
-    "@dynamic-labs-wallet/node": "0.0.0-beta.250.1",
+    "@dynamic-labs-wallet/node": "0.0.0-beta.254.1",
     "@solana/web3.js": "^1.98.2"
   },
   "publishConfig": {

package/src/client/client.d.ts

@@ -15,16 +15,17 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * @param thresholdSignatureScheme The threshold signature scheme to use
      * @returns The account address, public key hex, raw public key, and client key shares
      */
-    createWalletAccount({ thresholdSignatureScheme, password, onError, }: {
+    createWalletAccount({ thresholdSignatureScheme, password, onError, signedSessionId, }: {
         thresholdSignatureScheme: ThresholdSignatureScheme;
         password?: string;
         onError?: (error: Error) => void;
+        signedSessionId: string;
     }): Promise<{
         accountAddress: string;
-        rawPublicKey: Uint8Array;
+        rawPublicKey: Uint8Array | string;
         externalServerKeyShares: ServerKeyShare[];
     }>;
-    deriveAccountAddress(rawPublicKey: Uint8Array): Promise<{
+    deriveAccountAddress(rawPublicKey: string | Uint8Array): Promise<{
         accountAddress: string;
     }>;
     /**
@@ -34,15 +35,19 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * @param accountAddress Solana address (base58 encoded)
      * @param password The password for encrypted backup shares
      */
-    signMessage({ message, accountAddress, password, }: {
+    signMessage({ message, accountAddress, password, signedSessionId, externalServerKeyShares, }: {
         message: string;
         accountAddress: string;
         password?: string;
+        signedSessionId: string;
+        externalServerKeyShares: ServerKeyShare[];
     }): Promise<string>;
-    signTransaction({ senderAddress, transaction, password, }: {
+    signTransaction({ senderAddress, transaction, password, signedSessionId, externalServerKeyShares, }: {
         senderAddress: string;
         transaction: VersionedTransaction | Transaction;
         password?: string;
+        signedSessionId: string;
+        externalServerKeyShares: ServerKeyShare[];
     }): Promise<VersionedTransaction | Transaction>;
     /**
      * Exports the private key for a given account address
@@ -51,12 +56,12 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * @param password The password for encrypted backup shares
      * @returns The private key
      */
-    exportPrivateKey({ accountAddress, password, }: {
+    exportPrivateKey({ accountAddress, password, signedSessionId, externalServerKeyShares, }: {
         accountAddress: string;
         password?: string;
-    }): Promise<{
-        derivedPrivateKey: string;
-    }>;
+        signedSessionId: string;
+        externalServerKeyShares: ServerKeyShare[];
+    }): Promise<string>;
     /**
      * Exports the private key for a given account address
      *
@@ -87,15 +92,16 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * @param password The password for encrypted backup shares
      * @returns The account address, raw public key, and client key shares
      */
-    importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, onError, }: {
+    importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, onError, signedSessionId, }: {
         privateKey: string;
         chainName: string;
         thresholdSignatureScheme: ThresholdSignatureScheme;
         password?: string;
         onError?: (error: Error) => void;
+        signedSessionId: string;
     }): Promise<{
         accountAddress: string;
-        rawPublicKey: Uint8Array | undefined;
+        rawPublicKey: Uint8Array | string | undefined;
         externalServerKeyShares: ServerKeyShare[];
     }>;
     getSvmWallets(): Promise<any>;

package/src/client/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EAGzB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,WAAW,EACX,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAIzB,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC7D,QAAQ,CAAC,SAAS,SAAS;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;gBAEZ,EACV,aAAa,EACb,UAAU,EACV,kBAAkB,GACnB,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;IAQD;;;;;OAKG;IACG,mBAAmB,CAAC,EACxB,wBAAwB,EACxB,QAAoB,EACpB,OAAO,GACR,EAAE;QACD,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;KAClC,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,CAAC;QACzB,uBAAuB,EAAE,cAAc,EAAE,CAAC;KAC3C,CAAC;IAkEI,oBAAoB,CAAC,YAAY,EAAE,UAAU;;;IASnD;;;;;;OAMG;IACG,WAAW,CAAC,EAChB,OAAO,EACP,cAAc,EACd,QAAoB,GACrB,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IA4BK,eAAe,CAAC,EACpB,aAAa,EACb,WAAW,EACX,QAAoB,GACrB,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,oBAAoB,GAAG,WAAW,CAAC;QAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,oBAAoB,GAAG,WAAW,CAAC;IAgD/C;;;;;;OAMG;IACG,gBAAgB,CAAC,EACrB,cAAc,EACd,QAAoB,GACrB,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;;;IAaD;;;;;OAKG;IACG,uBAAuB,CAAC,EAC5B,SAAS,EACT,cAAc,GACf,EAAE;QACD,SAAS,EAAE,mBAAmB,EAAE,CAAC;QACjC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB;;;IASD;;;;;OAKG;IACH,yBAAyB,CAAC,UAAU,EAAE,MAAM;IAM5C,0BAA0B,CAAC,UAAU,EAAE,MAAM;IAQ7C,eAAe,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM;IAM9C;;;;;;;;OAQG;IACG,gBAAgB,CAAC,EACrB,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,QAAoB,EACpB,OAAO,GACR,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;KAClC,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC;QACrC,uBAAuB,EAAE,cAAc,EAAE,CAAC;KAC3C,CAAC;IA8DI,aAAa;CAOpB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}