@dynamic-labs-wallet/svm 0.0.68 → 0.0.70

package/index.cjs.js

@@ -44,8 +44,8 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
                     });
                 }
             });
-            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 (!clientKeyShares) {
                 throw new Error('Error creating wallet account');
@@ -75,9 +75,9 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
             throw new Error(ERROR_CREATE_WALLET_ACCOUNT);
         }
     }
-    // Function to properly derive account address
     async deriveAccountAddress(rawPublicKey) {
-        const accountAddress = bs58.encode(rawPublicKey);
+        const pubKeyBytes = typeof rawPublicKey === 'string' ? Buffer.from(rawPublicKey, 'hex') : rawPublicKey;
+        const accountAddress = bs58.encode(pubKeyBytes);
         return {
             accountAddress
         };
@@ -159,6 +159,7 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
    * @param password The password for encrypted backup shares
    * @returns The private key
    */ async exportPrivateKey({ accountAddress, displayContainer, password = undefined }) {
+        var _derivedPrivateKey_match;
         await this.verifyPassword({
             accountAddress,
             password,
@@ -172,12 +173,13 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
         }
-        const encodedPrivateKey = bs58.encode(Buffer.from(derivedPrivateKey));
+        // Convert hex string to Uint8Array
+        const privateKeyBytes = new Uint8Array(((_derivedPrivateKey_match = derivedPrivateKey.match(/.{1,2}/g)) == null ? void 0 : _derivedPrivateKey_match.map((byte)=>parseInt(byte, 16))) || []);
         // Display the private key in the container via iframe
         const { iframeDisplay } = await this.initializeIframeDisplayForContainer({
             container: displayContainer
         });
-        iframeDisplay.displayPrivateKey(encodedPrivateKey);
+        iframeDisplay.displayPrivateKey(JSON.stringify(Array.from(privateKeyBytes)));
     }
     /**
    * Exports the private key for a given account address

package/index.esm.js

@@ -42,8 +42,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
                     });
                 }
             });
-            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 (!clientKeyShares) {
                 throw new Error('Error creating wallet account');
@@ -73,9 +73,9 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             throw new Error(ERROR_CREATE_WALLET_ACCOUNT);
         }
     }
-    // Function to properly derive account address
     async deriveAccountAddress(rawPublicKey) {
-        const accountAddress = bs58.encode(rawPublicKey);
+        const pubKeyBytes = typeof rawPublicKey === 'string' ? Buffer.from(rawPublicKey, 'hex') : rawPublicKey;
+        const accountAddress = bs58.encode(pubKeyBytes);
         return {
             accountAddress
         };
@@ -157,6 +157,7 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param password The password for encrypted backup shares
    * @returns The private key
    */ async exportPrivateKey({ accountAddress, displayContainer, password = undefined }) {
+        var _derivedPrivateKey_match;
         await this.verifyPassword({
             accountAddress,
             password,
@@ -170,12 +171,13 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
         }
-        const encodedPrivateKey = bs58.encode(Buffer.from(derivedPrivateKey));
+        // Convert hex string to Uint8Array
+        const privateKeyBytes = new Uint8Array(((_derivedPrivateKey_match = derivedPrivateKey.match(/.{1,2}/g)) == null ? void 0 : _derivedPrivateKey_match.map((byte)=>parseInt(byte, 16))) || []);
         // Display the private key in the container via iframe
         const { iframeDisplay } = await this.initializeIframeDisplayForContainer({
             container: displayContainer
         });
-        iframeDisplay.displayPrivateKey(encodedPrivateKey);
+        iframeDisplay.displayPrivateKey(JSON.stringify(Array.from(privateKeyBytes)));
     }
     /**
    * Exports the private key for a given account address

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dynamic-labs-wallet/svm",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "license": "MIT",
   "dependencies": {
-    "@dynamic-labs-wallet/browser": "0.0.68",
+    "@dynamic-labs-wallet/browser": "0.0.70",
     "@solana/web3.js": "^1.98.2",
     "bs58": "^6.0.0"
   },

package/src/svm/svm.d.ts

@@ -23,7 +23,7 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
         rawPublicKey: Uint8Array;
         clientKeyShares: ClientKeyShare[];
     }>;
-    deriveAccountAddress(rawPublicKey: Uint8Array): Promise<{
+    deriveAccountAddress(rawPublicKey: string | Uint8Array): Promise<{
         accountAddress: string;
     }>;
     /**

package/src/svm/svm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svm.d.ts","sourceRoot":"","sources":["../../src/svm/svm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EAGzB,MAAM,8BAA8B,CAAC;AAEtC,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,SAAS,EACT,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;IASD;;;;;OAKG;IACG,mBAAmB,CAAC,EACxB,wBAAwB,EACxB,QAAoB,GACrB,EAAE;QACD,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,CAAC;QACzB,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IA0DI,oBAAoB,CAAC,YAAY,EAAE,UAAU;;;IAOnD;;;;;;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;IA2BK,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,gBAAgB,EAChB,QAAoB,GACrB,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,WAAW,CAAC;QAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IAwBD;;;;;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;IAI9C;;;;;;;;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,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IA6DI,aAAa;CAOpB"}
+{"version":3,"file":"svm.d.ts","sourceRoot":"","sources":["../../src/svm/svm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EAGzB,MAAM,8BAA8B,CAAC;AAEtC,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,SAAS,EACT,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;IASD;;;;;OAKG;IACG,mBAAmB,CAAC,EACxB,wBAAwB,EACxB,QAAoB,GACrB,EAAE;QACD,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,CAAC;QACzB,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IAgEI,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU;;;IAY5D;;;;;;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;IA2BK,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,gBAAgB,EAChB,QAAoB,GACrB,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,WAAW,CAAC;QAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IA8BD;;;;;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;IAI9C;;;;;;;;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,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IA6DI,aAAa;CAOpB"}