@prosopo/keyring 2.8.6 → 2.8.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +26 -0
- package/dist/accounts/getPair.js +33 -32
- package/dist/accounts/index.js +10 -4
- package/dist/accounts/mnemonic.js +15 -12
- package/dist/accounts/testAccounts.js +41 -35
- package/dist/cjs/accounts/getPair.cjs +2 -2
- package/dist/cjs/accounts/mnemonic.cjs +1 -2
- package/dist/index.js +19 -4
- package/dist/keyring/index.js +7 -3
- package/dist/keyring/keyring.js +255 -130
- package/dist/keyring/pairs.js +24 -27
- package/dist/pair/decode.js +26 -24
- package/dist/pair/defaults.js +30 -8
- package/dist/pair/encode.js +16 -14
- package/dist/pair/index.js +139 -134
- package/dist/pair/toJson.js +11 -6
- package/package.json +18 -14
- package/vite.cjs.config.ts +4 -1
- package/vite.esm.config.ts +20 -0
- package/vite.test.config.ts +32 -0
- package/dist/accounts/getPair.d.ts +0 -5
- package/dist/accounts/getPair.d.ts.map +0 -1
- package/dist/accounts/getPair.js.map +0 -1
- package/dist/accounts/index.d.ts +0 -4
- package/dist/accounts/index.d.ts.map +0 -1
- package/dist/accounts/index.js.map +0 -1
- package/dist/accounts/mnemonic.d.ts +0 -5
- package/dist/accounts/mnemonic.d.ts.map +0 -1
- package/dist/accounts/mnemonic.js.map +0 -1
- package/dist/accounts/testAccounts.d.ts +0 -4
- package/dist/accounts/testAccounts.d.ts.map +0 -1
- package/dist/accounts/testAccounts.js.map +0 -1
- package/dist/cjs/dist/accounts/getPair.cjs +0 -41
- package/dist/cjs/dist/accounts/index.cjs +0 -10
- package/dist/cjs/dist/accounts/mnemonic.cjs +0 -19
- package/dist/cjs/dist/accounts/testAccounts.cjs +0 -42
- package/dist/cjs/dist/index.cjs +0 -6
- package/dist/cjs/dist/keyring/index.cjs +0 -7
- package/dist/cjs/dist/keyring/keyring.cjs +0 -138
- package/dist/cjs/dist/keyring/pairs.cjs +0 -31
- package/dist/cjs/dist/pair/decode.cjs +0 -32
- package/dist/cjs/dist/pair/defaults.cjs +0 -31
- package/dist/cjs/dist/pair/encode.cjs +0 -18
- package/dist/cjs/dist/pair/index.cjs +0 -143
- package/dist/cjs/dist/pair/toJson.cjs +0 -11
- package/dist/index.d.ts +0 -4
- package/dist/index.d.ts.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/keyring/index.d.ts +0 -3
- package/dist/keyring/index.d.ts.map +0 -1
- package/dist/keyring/index.js.map +0 -1
- package/dist/keyring/keyring.d.ts +0 -36
- package/dist/keyring/keyring.d.ts.map +0 -1
- package/dist/keyring/keyring.js.map +0 -1
- package/dist/keyring/pairs.d.ts +0 -9
- package/dist/keyring/pairs.d.ts.map +0 -1
- package/dist/keyring/pairs.js.map +0 -1
- package/dist/keyring/testing.d.ts +0 -14
- package/dist/keyring/testing.d.ts.map +0 -1
- package/dist/keyring/testing.js +0 -76
- package/dist/keyring/testing.js.map +0 -1
- package/dist/keyring/testingPairs.d.ts +0 -26
- package/dist/keyring/testingPairs.d.ts.map +0 -1
- package/dist/keyring/testingPairs.js +0 -14
- package/dist/keyring/testingPairs.js.map +0 -1
- package/dist/pair/decode.d.ts +0 -6
- package/dist/pair/decode.d.ts.map +0 -1
- package/dist/pair/decode.js.map +0 -1
- package/dist/pair/decode.spec.d.ts +0 -2
- package/dist/pair/decode.spec.d.ts.map +0 -1
- package/dist/pair/decode.spec.js +0 -13
- package/dist/pair/decode.spec.js.map +0 -1
- package/dist/pair/defaults.d.ts +0 -7
- package/dist/pair/defaults.d.ts.map +0 -1
- package/dist/pair/defaults.js.map +0 -1
- package/dist/pair/encode.d.ts +0 -3
- package/dist/pair/encode.d.ts.map +0 -1
- package/dist/pair/encode.js.map +0 -1
- package/dist/pair/encode.spec.d.ts +0 -2
- package/dist/pair/encode.spec.d.ts.map +0 -1
- package/dist/pair/encode.spec.js +0 -16
- package/dist/pair/encode.spec.js.map +0 -1
- package/dist/pair/index.d.ts +0 -11
- package/dist/pair/index.d.ts.map +0 -1
- package/dist/pair/index.js.map +0 -1
- package/dist/pair/nobody.d.ts +0 -3
- package/dist/pair/nobody.d.ts.map +0 -1
- package/dist/pair/nobody.js +0 -40
- package/dist/pair/nobody.js.map +0 -1
- package/dist/pair/toJson.d.ts +0 -9
- package/dist/pair/toJson.d.ts.map +0 -1
- package/dist/pair/toJson.js.map +0 -1
- package/dist/pair/toJson.spec.d.ts +0 -2
- package/dist/pair/toJson.spec.d.ts.map +0 -1
- package/dist/pair/toJson.spec.js +0 -33
- package/dist/pair/toJson.spec.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,31 @@
|
|
|
1
1
|
# @prosopo/keyring
|
|
2
2
|
|
|
3
|
+
## 2.8.7
|
|
4
|
+
### Patch Changes
|
|
5
|
+
|
|
6
|
+
- 93d5e50: ensure packages have @prosopo/config as dep for vite configs
|
|
7
|
+
- 3573f0b: fix npm scripts bundle command
|
|
8
|
+
- 3573f0b: build using vite, typecheck using tsc
|
|
9
|
+
- efd8102: Add tests for unwrap error helper
|
|
10
|
+
- 93d5e50: fix missing dep for @prosopo/config
|
|
11
|
+
- f29fc7e: Refining API error handling. Adding more language strings
|
|
12
|
+
- 3573f0b: standardise all vite based npm scripts for bundling
|
|
13
|
+
- Updated dependencies [93d5e50]
|
|
14
|
+
- Updated dependencies [3573f0b]
|
|
15
|
+
- Updated dependencies [8a64429]
|
|
16
|
+
- Updated dependencies [3573f0b]
|
|
17
|
+
- Updated dependencies [efd8102]
|
|
18
|
+
- Updated dependencies [93d5e50]
|
|
19
|
+
- Updated dependencies [63519d7]
|
|
20
|
+
- Updated dependencies [f29fc7e]
|
|
21
|
+
- Updated dependencies [3573f0b]
|
|
22
|
+
- Updated dependencies [2d0dd8a]
|
|
23
|
+
- Updated dependencies [6d604ad]
|
|
24
|
+
- @prosopo/util-crypto@13.5.2
|
|
25
|
+
- @prosopo/types@3.0.4
|
|
26
|
+
- @prosopo/common@3.1.0
|
|
27
|
+
- @prosopo/config@3.1.1
|
|
28
|
+
|
|
3
29
|
## 2.8.6
|
|
4
30
|
### Patch Changes
|
|
5
31
|
|
package/dist/accounts/getPair.js
CHANGED
|
@@ -3,40 +3,41 @@ import { isHex } from "@polkadot/util/is";
|
|
|
3
3
|
import { ProsopoEnvError } from "@prosopo/common";
|
|
4
4
|
import { mnemonicValidate } from "@prosopo/util-crypto";
|
|
5
5
|
import { Keyring } from "../keyring/keyring.js";
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
6
|
+
function getPair(secret, account, pairType, ss58Format) {
|
|
7
|
+
pairType = pairType || "sr25519";
|
|
8
|
+
ss58Format = ss58Format || 42;
|
|
9
|
+
const keyring = new Keyring({ type: pairType, ss58Format });
|
|
10
|
+
if (!secret && account) {
|
|
11
|
+
return keyring.addFromAddress(account);
|
|
12
|
+
}
|
|
13
|
+
if (secret && typeof secret === "string") {
|
|
14
|
+
if (mnemonicValidate(secret)) {
|
|
15
|
+
return keyring.addFromMnemonic(secret);
|
|
12
16
|
}
|
|
13
|
-
if (secret
|
|
14
|
-
|
|
15
|
-
return keyring.addFromMnemonic(secret);
|
|
16
|
-
}
|
|
17
|
-
if (isHex(secret)) {
|
|
18
|
-
return keyring.addFromSeed(hexToU8a(secret));
|
|
19
|
-
}
|
|
20
|
-
if (secret.includes("//")) {
|
|
21
|
-
return keyring.addFromUri(secret);
|
|
22
|
-
}
|
|
23
|
-
try {
|
|
24
|
-
const json = JSON.parse(secret);
|
|
25
|
-
const { encoding: { content }, } = json;
|
|
26
|
-
const keyring = new Keyring({ type: content[1], ss58Format });
|
|
27
|
-
return keyring.addFromJson(json);
|
|
28
|
-
}
|
|
29
|
-
catch (e) {
|
|
30
|
-
throw new ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED", {
|
|
31
|
-
context: { error: e },
|
|
32
|
-
});
|
|
33
|
-
}
|
|
17
|
+
if (isHex(secret)) {
|
|
18
|
+
return keyring.addFromSeed(hexToU8a(secret));
|
|
34
19
|
}
|
|
35
|
-
|
|
36
|
-
|
|
20
|
+
if (secret.includes("//")) {
|
|
21
|
+
return keyring.addFromUri(secret);
|
|
37
22
|
}
|
|
38
|
-
|
|
39
|
-
|
|
23
|
+
try {
|
|
24
|
+
const json = JSON.parse(secret);
|
|
25
|
+
const {
|
|
26
|
+
encoding: { content }
|
|
27
|
+
} = json;
|
|
28
|
+
const keyring2 = new Keyring({ type: content[1], ss58Format });
|
|
29
|
+
return keyring2.addFromJson(json);
|
|
30
|
+
} catch (e) {
|
|
31
|
+
throw new ProsopoEnvError("GENERAL.MISSING_SECRET_KEY", {
|
|
32
|
+
context: { error: e }
|
|
33
|
+
});
|
|
40
34
|
}
|
|
35
|
+
} else if (typeof secret === "object") {
|
|
36
|
+
return keyring.addFromJson(secret);
|
|
37
|
+
} else {
|
|
38
|
+
throw new ProsopoEnvError("GENERAL.MISSING_SECRET_KEY");
|
|
39
|
+
}
|
|
41
40
|
}
|
|
42
|
-
|
|
41
|
+
export {
|
|
42
|
+
getPair
|
|
43
|
+
};
|
package/dist/accounts/index.js
CHANGED
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { generateMiniSecret, generateMnemonic } from "./mnemonic.js";
|
|
2
|
+
import { getPair } from "./getPair.js";
|
|
3
|
+
import { getDefaultProviders, getDefaultSiteKeys } from "./testAccounts.js";
|
|
4
|
+
export {
|
|
5
|
+
generateMiniSecret,
|
|
6
|
+
generateMnemonic,
|
|
7
|
+
getDefaultProviders,
|
|
8
|
+
getDefaultSiteKeys,
|
|
9
|
+
getPair
|
|
10
|
+
};
|
|
@@ -1,15 +1,18 @@
|
|
|
1
|
-
import { Keyring } from "@prosopo/keyring";
|
|
2
1
|
import { mnemonicGenerate, mnemonicToMiniSecret } from "@prosopo/util-crypto";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
2
|
+
import { Keyring } from "../keyring/keyring.js";
|
|
3
|
+
async function generateMnemonic(keyring, pairType) {
|
|
4
|
+
if (!keyring) {
|
|
5
|
+
keyring = new Keyring({ type: pairType || "sr25519" });
|
|
6
|
+
}
|
|
7
|
+
const mnemonic = mnemonicGenerate();
|
|
8
|
+
const account = keyring.addFromMnemonic(mnemonic);
|
|
9
|
+
return [mnemonic, account.address];
|
|
10
10
|
}
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
async function generateMiniSecret(keyring, pairType) {
|
|
12
|
+
const [mnemonic, address] = await generateMnemonic(keyring, pairType);
|
|
13
|
+
return [mnemonicToMiniSecret(mnemonic), address];
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
export {
|
|
16
|
+
generateMiniSecret,
|
|
17
|
+
generateMnemonic
|
|
18
|
+
};
|
|
@@ -1,38 +1,44 @@
|
|
|
1
|
-
import { CaptchaType, ClientSettingsSchema
|
|
2
|
-
import
|
|
1
|
+
import { CaptchaType, ClientSettingsSchema } from "@prosopo/types";
|
|
2
|
+
import "../keyring/index.js";
|
|
3
3
|
import { getPair } from "./getPair.js";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
|
|
4
|
+
import { DEV_PHRASE } from "../keyring/keyring.js";
|
|
5
|
+
function getDefaultSiteKeys() {
|
|
6
|
+
const captchaTypes = [
|
|
7
|
+
CaptchaType.image,
|
|
8
|
+
CaptchaType.pow,
|
|
9
|
+
CaptchaType.frictionless,
|
|
10
|
+
CaptchaType.invisible
|
|
11
|
+
];
|
|
12
|
+
const sites = [];
|
|
13
|
+
for (const captchaType of captchaTypes) {
|
|
14
|
+
const secret = `${DEV_PHRASE}//${captchaType}`;
|
|
15
|
+
const pair = getPair(secret);
|
|
16
|
+
sites.push({
|
|
17
|
+
pair,
|
|
18
|
+
address: pair.address,
|
|
19
|
+
secret,
|
|
20
|
+
settings: ClientSettingsSchema.parse({
|
|
21
|
+
captchaType
|
|
22
|
+
})
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
return sites;
|
|
25
26
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
27
|
+
function getDefaultProviders() {
|
|
28
|
+
const pair = getPair(
|
|
29
|
+
"puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant"
|
|
30
|
+
);
|
|
31
|
+
return [
|
|
32
|
+
{
|
|
33
|
+
url: "http://localhost:9229",
|
|
34
|
+
pair,
|
|
35
|
+
address: pair.address,
|
|
36
|
+
datasetFile: "./dev/data/captchas.json",
|
|
37
|
+
captchaDatasetId: "0x3e067b8f6aeae82fdbe2b2557b9c2d90aaabff241df651bf0f36667d2ab0018d"
|
|
38
|
+
}
|
|
39
|
+
];
|
|
37
40
|
}
|
|
38
|
-
|
|
41
|
+
export {
|
|
42
|
+
getDefaultProviders,
|
|
43
|
+
getDefaultSiteKeys
|
|
44
|
+
};
|
|
@@ -30,14 +30,14 @@ function getPair(secret, account, pairType, ss58Format) {
|
|
|
30
30
|
const keyring2 = new keyring.Keyring({ type: content[1], ss58Format });
|
|
31
31
|
return keyring2.addFromJson(json);
|
|
32
32
|
} catch (e) {
|
|
33
|
-
throw new common.ProsopoEnvError("GENERAL.
|
|
33
|
+
throw new common.ProsopoEnvError("GENERAL.MISSING_SECRET_KEY", {
|
|
34
34
|
context: { error: e }
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
} else if (typeof secret === "object") {
|
|
38
38
|
return keyring$1.addFromJson(secret);
|
|
39
39
|
} else {
|
|
40
|
-
throw new common.ProsopoEnvError("GENERAL.
|
|
40
|
+
throw new common.ProsopoEnvError("GENERAL.MISSING_SECRET_KEY");
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
exports.getPair = getPair;
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
-
require("../dist/index.cjs");
|
|
4
3
|
const utilCrypto = require("@prosopo/util-crypto");
|
|
5
|
-
const keyring = require("../
|
|
4
|
+
const keyring = require("../keyring/keyring.cjs");
|
|
6
5
|
async function generateMnemonic(keyring$1, pairType) {
|
|
7
6
|
if (!keyring$1) {
|
|
8
7
|
keyring$1 = new keyring.Keyring({ type: pairType || "sr25519" });
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import "./accounts/index.js";
|
|
2
|
+
import "./keyring/index.js";
|
|
3
|
+
import { createPair } from "./pair/index.js";
|
|
4
|
+
import { generateMiniSecret, generateMnemonic } from "./accounts/mnemonic.js";
|
|
5
|
+
import { getPair } from "./accounts/getPair.js";
|
|
6
|
+
import { getDefaultProviders, getDefaultSiteKeys } from "./accounts/testAccounts.js";
|
|
7
|
+
import { DEV_PHRASE, Keyring } from "./keyring/keyring.js";
|
|
8
|
+
import { Pairs } from "./keyring/pairs.js";
|
|
9
|
+
export {
|
|
10
|
+
DEV_PHRASE,
|
|
11
|
+
Keyring,
|
|
12
|
+
Pairs,
|
|
13
|
+
createPair,
|
|
14
|
+
generateMiniSecret,
|
|
15
|
+
generateMnemonic,
|
|
16
|
+
getDefaultProviders,
|
|
17
|
+
getDefaultSiteKeys,
|
|
18
|
+
getPair
|
|
19
|
+
};
|
package/dist/keyring/index.js
CHANGED