@talismn/keyring 0.1.2 → 0.1.3

package/dist/talismn-keyring.cjs.dev.js

@@ -45,19 +45,15 @@ const getAccountPlatform = account => {
 };
 
 // Derive a key generated with PBKDF2 that will be used for AES-GCM encryption
-const deriveKey = async (password, salt) => {
-  // Deriving 32-byte key using PBKDF2 with 100000 iterations and SHA-256
-  const keyMaterial = await crypto.subtle.importKey("raw", new TextEncoder().encode(password), "PBKDF2", false, ["deriveKey"]);
-  return crypto.subtle.deriveKey({
-    name: "PBKDF2",
-    salt,
-    iterations: 100000,
-    hash: "SHA-256"
-  }, keyMaterial, {
-    name: "AES-GCM",
-    length: 256
-  }, false, ["encrypt", "decrypt"]);
-};
+const deriveKey = async (password, salt) =>
+// Deriving 32-byte key using PBKDF2 with 100,000 iterations and SHA-256
+await crypto.subtle.importKey("raw", await crypto$1.pbkdf2("SHA-256", new TextEncoder().encode(password), salt, 100_000,
+// 100,000 iterations
+32 // 32 bytes (32 * 8 == 256 bits)
+), {
+  name: "AES-GCM",
+  length: 256
+}, false, ["encrypt", "decrypt"]);
 const encryptData = async (data, password) => {
   try {
     const salt = crypto.getRandomValues(new Uint8Array(16)); // 16 bytes of salt
@@ -337,7 +333,7 @@ class Keyring {
     const mnemonic = this.#data.mnemonics.find(s => s.id === mnemonicId);
     if (!mnemonic) throw new Error("Mnemonic not found");
     const entropy = await decryptData(mnemonic.entropy, password);
-    const seed = crypto$1.entropyToSeed(entropy, curve);
+    const seed = await crypto$1.entropyToSeed(entropy, curve);
     const pair = crypto$1.deriveKeypair(seed, derivationPath, curve);
     if (this.getAccount(pair.address)) throw new Error("Account already exists");
     const account = {
@@ -388,7 +384,7 @@ class Keyring {
     const mnemonic = this.#data.mnemonics.find(s => s.id === mnemonicId);
     if (!mnemonic) throw new Error("Mnemonic not found");
     const entropy = await decryptData(mnemonic.entropy, password);
-    const seed = crypto$1.entropyToSeed(entropy, curve);
+    const seed = await crypto$1.entropyToSeed(entropy, curve);
     const pair = crypto$1.deriveKeypair(seed, derivationPath, curve);
     return pair.address;
   }

package/dist/talismn-keyring.cjs.prod.js

@@ -45,19 +45,15 @@ const getAccountPlatform = account => {
 };
 
 // Derive a key generated with PBKDF2 that will be used for AES-GCM encryption
-const deriveKey = async (password, salt) => {
-  // Deriving 32-byte key using PBKDF2 with 100000 iterations and SHA-256
-  const keyMaterial = await crypto.subtle.importKey("raw", new TextEncoder().encode(password), "PBKDF2", false, ["deriveKey"]);
-  return crypto.subtle.deriveKey({
-    name: "PBKDF2",
-    salt,
-    iterations: 100000,
-    hash: "SHA-256"
-  }, keyMaterial, {
-    name: "AES-GCM",
-    length: 256
-  }, false, ["encrypt", "decrypt"]);
-};
+const deriveKey = async (password, salt) =>
+// Deriving 32-byte key using PBKDF2 with 100,000 iterations and SHA-256
+await crypto.subtle.importKey("raw", await crypto$1.pbkdf2("SHA-256", new TextEncoder().encode(password), salt, 100_000,
+// 100,000 iterations
+32 // 32 bytes (32 * 8 == 256 bits)
+), {
+  name: "AES-GCM",
+  length: 256
+}, false, ["encrypt", "decrypt"]);
 const encryptData = async (data, password) => {
   try {
     const salt = crypto.getRandomValues(new Uint8Array(16)); // 16 bytes of salt
@@ -337,7 +333,7 @@ class Keyring {
     const mnemonic = this.#data.mnemonics.find(s => s.id === mnemonicId);
     if (!mnemonic) throw new Error("Mnemonic not found");
     const entropy = await decryptData(mnemonic.entropy, password);
-    const seed = crypto$1.entropyToSeed(entropy, curve);
+    const seed = await crypto$1.entropyToSeed(entropy, curve);
     const pair = crypto$1.deriveKeypair(seed, derivationPath, curve);
     if (this.getAccount(pair.address)) throw new Error("Account already exists");
     const account = {
@@ -388,7 +384,7 @@ class Keyring {
     const mnemonic = this.#data.mnemonics.find(s => s.id === mnemonicId);
     if (!mnemonic) throw new Error("Mnemonic not found");
     const entropy = await decryptData(mnemonic.entropy, password);
-    const seed = crypto$1.entropyToSeed(entropy, curve);
+    const seed = await crypto$1.entropyToSeed(entropy, curve);
     const pair = crypto$1.deriveKeypair(seed, derivationPath, curve);
     return pair.address;
   }

package/dist/talismn-keyring.esm.js

@@ -1,4 +1,4 @@
-import { isEthereumAddress, detectAddressEncoding, platformFromCurve, platformFromAddress, stringToBytes, bytesToString, isValidMnemonic, mnemonicToEntropy, entropyToMnemonic, isAddressEqual, normalizeAddress, entropyToSeed, deriveKeypair, getPublicKeyFromSecret, addressEncodingFromCurve, addressFromPublicKey, blake3 } from '@talismn/crypto';
+import { isEthereumAddress, detectAddressEncoding, platformFromCurve, platformFromAddress, pbkdf2, stringToBytes, bytesToString, isValidMnemonic, mnemonicToEntropy, entropyToMnemonic, isAddressEqual, normalizeAddress, entropyToSeed, deriveKeypair, getPublicKeyFromSecret, addressEncodingFromCurve, addressFromPublicKey, blake3 } from '@talismn/crypto';
 
 const isAccountOfType = (account, type) => {
   return account?.type === type;
@@ -43,19 +43,15 @@ const getAccountPlatform = account => {
 };
 
 // Derive a key generated with PBKDF2 that will be used for AES-GCM encryption
-const deriveKey = async (password, salt) => {
-  // Deriving 32-byte key using PBKDF2 with 100000 iterations and SHA-256
-  const keyMaterial = await crypto.subtle.importKey("raw", new TextEncoder().encode(password), "PBKDF2", false, ["deriveKey"]);
-  return crypto.subtle.deriveKey({
-    name: "PBKDF2",
-    salt,
-    iterations: 100000,
-    hash: "SHA-256"
-  }, keyMaterial, {
-    name: "AES-GCM",
-    length: 256
-  }, false, ["encrypt", "decrypt"]);
-};
+const deriveKey = async (password, salt) =>
+// Deriving 32-byte key using PBKDF2 with 100,000 iterations and SHA-256
+await crypto.subtle.importKey("raw", await pbkdf2("SHA-256", new TextEncoder().encode(password), salt, 100_000,
+// 100,000 iterations
+32 // 32 bytes (32 * 8 == 256 bits)
+), {
+  name: "AES-GCM",
+  length: 256
+}, false, ["encrypt", "decrypt"]);
 const encryptData = async (data, password) => {
   try {
     const salt = crypto.getRandomValues(new Uint8Array(16)); // 16 bytes of salt
@@ -335,7 +331,7 @@ class Keyring {
     const mnemonic = this.#data.mnemonics.find(s => s.id === mnemonicId);
     if (!mnemonic) throw new Error("Mnemonic not found");
     const entropy = await decryptData(mnemonic.entropy, password);
-    const seed = entropyToSeed(entropy, curve);
+    const seed = await entropyToSeed(entropy, curve);
     const pair = deriveKeypair(seed, derivationPath, curve);
     if (this.getAccount(pair.address)) throw new Error("Account already exists");
     const account = {
@@ -386,7 +382,7 @@ class Keyring {
     const mnemonic = this.#data.mnemonics.find(s => s.id === mnemonicId);
     if (!mnemonic) throw new Error("Mnemonic not found");
     const entropy = await decryptData(mnemonic.entropy, password);
-    const seed = entropyToSeed(entropy, curve);
+    const seed = await entropyToSeed(entropy, curve);
     const pair = deriveKeypair(seed, derivationPath, curve);
     return pair.address;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/keyring",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -22,7 +22,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@talismn/crypto": "0.1.1"
+    "@talismn/crypto": "0.1.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",