@prosopo/keyring 2.6.4 → 2.8.7

package/CHANGELOG.md

@@ -1,5 +1,96 @@
 # @prosopo/keyring
 
+## 2.8.7
+### Patch Changes
+
+- 93d5e50: ensure packages have @prosopo/config as dep for vite configs
+- 3573f0b: fix npm scripts bundle command
+- 3573f0b: build using vite, typecheck using tsc
+- efd8102: Add tests for unwrap error helper
+- 93d5e50: fix missing dep for @prosopo/config
+- f29fc7e: Refining API error handling. Adding more language strings
+- 3573f0b: standardise all vite based npm scripts for bundling
+- Updated dependencies [93d5e50]
+- Updated dependencies [3573f0b]
+- Updated dependencies [8a64429]
+- Updated dependencies [3573f0b]
+- Updated dependencies [efd8102]
+- Updated dependencies [93d5e50]
+- Updated dependencies [63519d7]
+- Updated dependencies [f29fc7e]
+- Updated dependencies [3573f0b]
+- Updated dependencies [2d0dd8a]
+- Updated dependencies [6d604ad]
+  - @prosopo/util-crypto@13.5.2
+  - @prosopo/types@3.0.4
+  - @prosopo/common@3.1.0
+  - @prosopo/config@3.1.1
+
+## 2.8.6
+### Patch Changes
+
+- Updated dependencies [b0d7207]
+  - @prosopo/types@3.0.3
+
+## 2.8.5
+### Patch Changes
+
+- Updated dependencies [f682f0c]
+  - @prosopo/types@3.0.2
+  - @prosopo/common@3.0.2
+
+## 2.8.4
+### Patch Changes
+
+  - @prosopo/common@3.0.1
+  - @prosopo/types@3.0.1
+
+## 2.8.3
+### Patch Changes
+
+- Updated dependencies [64b5bcd]
+  - @prosopo/common@3.0.0
+  - @prosopo/types@3.0.0
+
+## 2.8.2
+### Patch Changes
+
+- Updated dependencies [aee3efe]
+  - @prosopo/types@2.10.0
+
+## 2.8.1
+### Patch Changes
+
+- 86c22b8: structured logging
+- Updated dependencies [86c22b8]
+  - @prosopo/util-crypto@13.5.1
+  - @prosopo/common@2.7.2
+  - @prosopo/types@2.9.1
+
+## 2.8.0
+### Minor Changes
+
+- 30bb383: Making sure verify works and derived accounts
+
+### Patch Changes
+
+- Updated dependencies [30bb383]
+  - @prosopo/util-crypto@13.5.0
+  - @prosopo/types@2.9.0
+  - @prosopo/common@2.7.1
+
+## 2.7.0
+### Minor Changes
+
+- 8f0644a: Taking required functions from polkadot/keyring and polkadot/util-crypto in-house and removing WASM dependencies. Adding @scure JS-based sr25519 function instead.
+
+### Patch Changes
+
+- Updated dependencies [8f0644a]
+  - @prosopo/util-crypto@13.4.0
+  - @prosopo/common@2.7.0
+  - @prosopo/types@2.8.0
+
 ## 2.6.4
 
 ### Patch Changes

package/README.md

@@ -0,0 +1,8 @@
+This is a selective clone
+of [keyring](https://github.com/polkadot-js/common/tree/25fe5f4e27d6dfe0a26082925a49207f2bfcd9fd/packages/keyring)
+from the Polkadot JS repository at `25fe5f4e27d6dfe0a26082925a49207f2bfcd9fd`. Modifications have been made as follows:
+
+- tests switched to vitest
+- package name changed to @prosopo/util-crypto
+- WASM dropped and replaced with JS implementation of sr25519 from @scure/sr25519
+- other account types (`ecdsa`, `ed25519`, `ethereum`) dropped

package/dist/accounts/getPair.js

@@ -1,47 +1,43 @@
-import { Keyring } from "@polkadot/keyring";
-import { cryptoWaitReady } from "@polkadot/util-crypto";
-import { mnemonicValidate } from "@polkadot/util-crypto/mnemonic";
 import { hexToU8a } from "@polkadot/util/hex";
 import { isHex } from "@polkadot/util/is";
 import { ProsopoEnvError } from "@prosopo/common";
-export async function getPairAsync(secret, account, pairType, ss58Format) {
-    await cryptoWaitReady();
-    return getPair(secret, account, pairType, ss58Format);
-}
-export function getPair(secret, account, pairType, ss58Format) {
-    pairType = pairType || "sr25519";
-    ss58Format = ss58Format || 42;
-    const keyring = new Keyring({ type: pairType, ss58Format });
-    if (!secret && account) {
-        return keyring.addFromAddress(account);
+import { mnemonicValidate } from "@prosopo/util-crypto";
+import { Keyring } from "../keyring/keyring.js";
+function getPair(secret, account, pairType, ss58Format) {
+  pairType = pairType || "sr25519";
+  ss58Format = ss58Format || 42;
+  const keyring = new Keyring({ type: pairType, ss58Format });
+  if (!secret && account) {
+    return keyring.addFromAddress(account);
+  }
+  if (secret && typeof secret === "string") {
+    if (mnemonicValidate(secret)) {
+      return keyring.addFromMnemonic(secret);
     }
-    if (secret && typeof secret === "string") {
-        if (mnemonicValidate(secret)) {
-            return keyring.addFromMnemonic(secret);
-        }
-        if (isHex(secret)) {
-            return keyring.addFromSeed(hexToU8a(secret));
-        }
-        if (secret.startsWith("//")) {
-            return keyring.addFromUri(secret);
-        }
-        try {
-            const json = JSON.parse(secret);
-            const { encoding: { content }, } = json;
-            const keyring = new Keyring({ type: content[1], ss58Format });
-            return keyring.addFromJson(json);
-        }
-        catch (e) {
-            throw new ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED", {
-                context: { error: e },
-            });
-        }
+    if (isHex(secret)) {
+      return keyring.addFromSeed(hexToU8a(secret));
     }
-    else if (typeof secret === "object") {
-        return keyring.addFromJson(secret);
+    if (secret.includes("//")) {
+      return keyring.addFromUri(secret);
     }
-    else {
-        throw new ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED");
+    try {
+      const json = JSON.parse(secret);
+      const {
+        encoding: { content }
+      } = json;
+      const keyring2 = new Keyring({ type: content[1], ss58Format });
+      return keyring2.addFromJson(json);
+    } catch (e) {
+      throw new ProsopoEnvError("GENERAL.MISSING_SECRET_KEY", {
+        context: { error: e }
+      });
     }
+  } else if (typeof secret === "object") {
+    return keyring.addFromJson(secret);
+  } else {
+    throw new ProsopoEnvError("GENERAL.MISSING_SECRET_KEY");
+  }
 }
-//# sourceMappingURL=getPair.js.map
+export {
+  getPair
+};

package/dist/accounts/index.js

@@ -1,3 +1,10 @@
-export * from "./mnemonic.js";
-export * from "./getPair.js";
-//# sourceMappingURL=index.js.map
+import { generateMiniSecret, generateMnemonic } from "./mnemonic.js";
+import { getPair } from "./getPair.js";
+import { getDefaultProviders, getDefaultSiteKeys } from "./testAccounts.js";
+export {
+  generateMiniSecret,
+  generateMnemonic,
+  getDefaultProviders,
+  getDefaultSiteKeys,
+  getPair
+};

package/dist/accounts/mnemonic.js

@@ -1,17 +1,18 @@
-import { Keyring } from "@polkadot/keyring";
-import { cryptoWaitReady } from "@polkadot/util-crypto";
-import { mnemonicGenerate, mnemonicToMiniSecret, } from "@polkadot/util-crypto/mnemonic";
-export async function generateMnemonic(keyring, pairType) {
-    if (!keyring) {
-        keyring = new Keyring({ type: pairType || "sr25519" });
-    }
-    await cryptoWaitReady();
-    const mnemonic = mnemonicGenerate();
-    const account = keyring.addFromMnemonic(mnemonic);
-    return [mnemonic, account.address];
+import { mnemonicGenerate, mnemonicToMiniSecret } from "@prosopo/util-crypto";
+import { Keyring } from "../keyring/keyring.js";
+async function generateMnemonic(keyring, pairType) {
+  if (!keyring) {
+    keyring = new Keyring({ type: pairType || "sr25519" });
+  }
+  const mnemonic = mnemonicGenerate();
+  const account = keyring.addFromMnemonic(mnemonic);
+  return [mnemonic, account.address];
 }
-export async function generateMiniSecret(keyring, pairType) {
-    const [mnemonic, address] = await generateMnemonic(keyring, pairType);
-    return [mnemonicToMiniSecret(mnemonic), address];
+async function generateMiniSecret(keyring, pairType) {
+  const [mnemonic, address] = await generateMnemonic(keyring, pairType);
+  return [mnemonicToMiniSecret(mnemonic), address];
 }
-//# sourceMappingURL=mnemonic.js.map
+export {
+  generateMiniSecret,
+  generateMnemonic
+};

package/dist/accounts/testAccounts.js

@@ -0,0 +1,44 @@
+import { CaptchaType, ClientSettingsSchema } from "@prosopo/types";
+import "../keyring/index.js";
+import { getPair } from "./getPair.js";
+import { DEV_PHRASE } from "../keyring/keyring.js";
+function getDefaultSiteKeys() {
+  const captchaTypes = [
+    CaptchaType.image,
+    CaptchaType.pow,
+    CaptchaType.frictionless,
+    CaptchaType.invisible
+  ];
+  const sites = [];
+  for (const captchaType of captchaTypes) {
+    const secret = `${DEV_PHRASE}//${captchaType}`;
+    const pair = getPair(secret);
+    sites.push({
+      pair,
+      address: pair.address,
+      secret,
+      settings: ClientSettingsSchema.parse({
+        captchaType
+      })
+    });
+  }
+  return sites;
+}
+function getDefaultProviders() {
+  const pair = getPair(
+    "puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant"
+  );
+  return [
+    {
+      url: "http://localhost:9229",
+      pair,
+      address: pair.address,
+      datasetFile: "./dev/data/captchas.json",
+      captchaDatasetId: "0x3e067b8f6aeae82fdbe2b2557b9c2d90aaabff241df651bf0f36667d2ab0018d"
+    }
+  ];
+}
+export {
+  getDefaultProviders,
+  getDefaultSiteKeys
+};

package/dist/cjs/accounts/getPair.cjs

@@ -1,15 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const keyring = require("@polkadot/keyring");
-const utilCrypto = require("@polkadot/util-crypto");
-const mnemonic = require("@polkadot/util-crypto/mnemonic");
 const hex = require("@polkadot/util/hex");
 const is = require("@polkadot/util/is");
 const common = require("@prosopo/common");
-async function getPairAsync(secret, account, pairType, ss58Format) {
-  await utilCrypto.cryptoWaitReady();
-  return getPair(secret, account, pairType, ss58Format);
-}
+const utilCrypto = require("@prosopo/util-crypto");
+const keyring = require("../keyring/keyring.cjs");
 function getPair(secret, account, pairType, ss58Format) {
   pairType = pairType || "sr25519";
   ss58Format = ss58Format || 42;
@@ -18,13 +13,13 @@ function getPair(secret, account, pairType, ss58Format) {
     return keyring$1.addFromAddress(account);
   }
   if (secret && typeof secret === "string") {
-    if (mnemonic.mnemonicValidate(secret)) {
+    if (utilCrypto.mnemonicValidate(secret)) {
       return keyring$1.addFromMnemonic(secret);
     }
     if (is.isHex(secret)) {
       return keyring$1.addFromSeed(hex.hexToU8a(secret));
     }
-    if (secret.startsWith("//")) {
+    if (secret.includes("//")) {
       return keyring$1.addFromUri(secret);
     }
     try {
@@ -35,15 +30,14 @@ function getPair(secret, account, pairType, ss58Format) {
       const keyring2 = new keyring.Keyring({ type: content[1], ss58Format });
       return keyring2.addFromJson(json);
     } catch (e) {
-      throw new common.ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED", {
+      throw new common.ProsopoEnvError("GENERAL.MISSING_SECRET_KEY", {
         context: { error: e }
       });
     }
   } else if (typeof secret === "object") {
     return keyring$1.addFromJson(secret);
   } else {
-    throw new common.ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED");
+    throw new common.ProsopoEnvError("GENERAL.MISSING_SECRET_KEY");
   }
 }
 exports.getPair = getPair;
-exports.getPairAsync = getPairAsync;

package/dist/cjs/accounts/index.cjs

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const mnemonic = require("./mnemonic.cjs");
 const getPair = require("./getPair.cjs");
+const testAccounts = require("./testAccounts.cjs");
 exports.generateMiniSecret = mnemonic.generateMiniSecret;
 exports.generateMnemonic = mnemonic.generateMnemonic;
 exports.getPair = getPair.getPair;
-exports.getPairAsync = getPair.getPairAsync;
+exports.getDefaultProviders = testAccounts.getDefaultProviders;
+exports.getDefaultSiteKeys = testAccounts.getDefaultSiteKeys;

package/dist/cjs/accounts/mnemonic.cjs

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const keyring = require("@polkadot/keyring");
-const utilCrypto = require("@polkadot/util-crypto");
-const mnemonic = require("@polkadot/util-crypto/mnemonic");
+const utilCrypto = require("@prosopo/util-crypto");
+const keyring = require("../keyring/keyring.cjs");
 async function generateMnemonic(keyring$1, pairType) {
   if (!keyring$1) {
     keyring$1 = new keyring.Keyring({ type: pairType || "sr25519" });
   }
-  await utilCrypto.cryptoWaitReady();
-  const mnemonic$1 = mnemonic.mnemonicGenerate();
-  const account = keyring$1.addFromMnemonic(mnemonic$1);
-  return [mnemonic$1, account.address];
+  const mnemonic = utilCrypto.mnemonicGenerate();
+  const account = keyring$1.addFromMnemonic(mnemonic);
+  return [mnemonic, account.address];
 }
 async function generateMiniSecret(keyring2, pairType) {
-  const [mnemonic$1, address] = await generateMnemonic(keyring2, pairType);
-  return [mnemonic.mnemonicToMiniSecret(mnemonic$1), address];
+  const [mnemonic, address] = await generateMnemonic(keyring2, pairType);
+  return [utilCrypto.mnemonicToMiniSecret(mnemonic), address];
 }
 exports.generateMiniSecret = generateMiniSecret;
 exports.generateMnemonic = generateMnemonic;

package/dist/cjs/accounts/testAccounts.cjs

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const types = require("@prosopo/types");
+require("../keyring/index.cjs");
+const getPair = require("./getPair.cjs");
+const keyring = require("../keyring/keyring.cjs");
+function getDefaultSiteKeys() {
+  const captchaTypes = [
+    types.CaptchaType.image,
+    types.CaptchaType.pow,
+    types.CaptchaType.frictionless,
+    types.CaptchaType.invisible
+  ];
+  const sites = [];
+  for (const captchaType of captchaTypes) {
+    const secret = `${keyring.DEV_PHRASE}//${captchaType}`;
+    const pair = getPair.getPair(secret);
+    sites.push({
+      pair,
+      address: pair.address,
+      secret,
+      settings: types.ClientSettingsSchema.parse({
+        captchaType
+      })
+    });
+  }
+  return sites;
+}
+function getDefaultProviders() {
+  const pair = getPair.getPair(
+    "puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant"
+  );
+  return [
+    {
+      url: "http://localhost:9229",
+      pair,
+      address: pair.address,
+      datasetFile: "./dev/data/captchas.json",
+      captchaDatasetId: "0x3e067b8f6aeae82fdbe2b2557b9c2d90aaabff241df651bf0f36667d2ab0018d"
+    }
+  ];
+}
+exports.getDefaultProviders = getDefaultProviders;
+exports.getDefaultSiteKeys = getDefaultSiteKeys;

package/dist/cjs/index.cjs

@@ -1,9 +1,19 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./accounts/index.cjs");
+require("./keyring/index.cjs");
+const index = require("./pair/index.cjs");
 const mnemonic = require("./accounts/mnemonic.cjs");
 const getPair = require("./accounts/getPair.cjs");
+const testAccounts = require("./accounts/testAccounts.cjs");
+const keyring = require("./keyring/keyring.cjs");
+const pairs = require("./keyring/pairs.cjs");
+exports.createPair = index.createPair;
 exports.generateMiniSecret = mnemonic.generateMiniSecret;
 exports.generateMnemonic = mnemonic.generateMnemonic;
 exports.getPair = getPair.getPair;
-exports.getPairAsync = getPair.getPairAsync;
+exports.getDefaultProviders = testAccounts.getDefaultProviders;
+exports.getDefaultSiteKeys = testAccounts.getDefaultSiteKeys;
+exports.DEV_PHRASE = keyring.DEV_PHRASE;
+exports.Keyring = keyring.Keyring;
+exports.Pairs = pairs.Pairs;

package/dist/cjs/keyring/index.cjs

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const keyring = require("./keyring.cjs");
+const pairs = require("./pairs.cjs");
+exports.DEV_PHRASE = keyring.DEV_PHRASE;
+exports.Keyring = keyring.Keyring;
+exports.Pairs = pairs.Pairs;