@prosopo/cli 3.7.27 → 3.8.0

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.
Files changed (22) hide show
  1. package/.turbo/turbo-build$colon$cjs.log +5 -5
  2. package/.turbo/turbo-build$colon$tsc.log +28 -28
  3. package/.turbo/turbo-build.log +7 -7
  4. package/CHANGELOG.md +31 -0
  5. package/dist/bundle/prosopo-native-ja4.node +0 -0
  6. package/dist/bundle/prosopo-native-merkle.node +0 -0
  7. package/dist/bundle/provider.cli.bundle.js +4747 -4653
  8. package/dist/cjs/commands/siteKeyRegister.cjs +11 -3
  9. package/dist/cjs/commands/siteKeyRegisterApi.cjs +10 -3
  10. package/dist/cjs/start.cjs +1 -0
  11. package/dist/commands/siteKeyRegister.d.ts +5 -0
  12. package/dist/commands/siteKeyRegister.d.ts.map +1 -1
  13. package/dist/commands/siteKeyRegister.js +12 -4
  14. package/dist/commands/siteKeyRegister.js.map +1 -1
  15. package/dist/commands/siteKeyRegisterApi.d.ts +2 -0
  16. package/dist/commands/siteKeyRegisterApi.d.ts.map +1 -1
  17. package/dist/commands/siteKeyRegisterApi.js +11 -4
  18. package/dist/commands/siteKeyRegisterApi.js.map +1 -1
  19. package/dist/start.d.ts.map +1 -1
  20. package/dist/start.js +2 -1
  21. package/dist/start.js.map +1 -1
  22. package/package.json +6 -6
package/dist/cjs/commands/siteKeyRegister.cjs CHANGED
@@ -10,6 +10,7 @@ var SiteKeyRegisterCommandArgsSpec = zod.z.object({
10
10
  tier: zod.z.nativeEnum(_prosopo_types.Tier),
11
11
  captcha_type: _prosopo_types.CaptchaTypeSpec,
12
12
  frictionless_threshold: zod.z.number().max(1).min(0),
13
+ frictionless_image_threshold: zod.z.number().min(0).optional(),
13
14
  pow_difficulty: zod.z.number(),
14
15
  domains: zod.z.array(zod.z.string()),
15
16
  image_threshold: zod.z.number().max(1).min(0),
@@ -39,7 +40,11 @@ var siteKeyRegister_default = (pair, config, cmdArgs) => {
39
40
  }).option("frictionless_threshold", {
40
41
  type: "number",
41
42
  demandOption: false,
42
- desc: "Frictionless threshold for settings"
43
+ desc: "Score above which a puzzle is served (lower rung of the ladder)"
44
+ }).option("frictionless_image_threshold", {
45
+ type: "number",
46
+ demandOption: false,
47
+ desc: "Score at or above which an image captcha is served (upper rung of the ladder)"
43
48
  }).option("pow_difficulty", {
44
49
  type: "number",
45
50
  demandOption: false,
@@ -57,10 +62,13 @@ var siteKeyRegister_default = (pair, config, cmdArgs) => {
57
62
  try {
58
63
  const env = new _prosopo_env.ProviderEnvironment(config, pair);
59
64
  await env.isReady();
60
- const { sitekey, tier, captcha_type, frictionless_threshold, pow_difficulty, domains, image_threshold, image_max_rounds } = SiteKeyRegisterCommandArgsSpec.parse(argv);
65
+ const { sitekey, tier, captcha_type, frictionless_threshold, frictionless_image_threshold, pow_difficulty, domains, image_threshold, image_max_rounds } = SiteKeyRegisterCommandArgsSpec.parse(argv);
61
66
  await new _prosopo_provider.Tasks(env).clientTaskManager.registerSiteKey(sitekey, tier, {
62
67
  captchaType: _prosopo_types.CaptchaTypeSpec.parse(captcha_type),
63
- frictionlessThreshold: frictionless_threshold,
68
+ frictionlessThreshold: {
69
+ frictionlessPuzzleThreshold: frictionless_threshold,
70
+ frictionlessImageThreshold: frictionless_image_threshold ?? _prosopo_types.frictionlessImageThresholdDefault
71
+ },
64
72
  domains: domains || [],
65
73
  powDifficulty: pow_difficulty,
66
74
  imageThreshold: image_threshold,
package/dist/cjs/commands/siteKeyRegisterApi.cjs CHANGED
@@ -31,7 +31,11 @@ var siteKeyRegisterApi_default = (pair, authAccount, config, cmdArgs) => {
31
31
  }).option("frictionless_threshold", {
32
32
  type: "number",
33
33
  demandOption: false,
34
- desc: "Frictionless threshold for settings"
34
+ desc: "Score above which a puzzle is served (lower rung of the ladder)"
35
+ }).option("frictionless_image_threshold", {
36
+ type: "number",
37
+ demandOption: false,
38
+ desc: "Score at or above which an image captcha is served (upper rung of the ladder)"
35
39
  }).option("domains", {
36
40
  type: "array",
37
41
  demandOption: false,
@@ -52,12 +56,15 @@ var siteKeyRegisterApi_default = (pair, authAccount, config, cmdArgs) => {
52
56
  handler: async (argv) => {
53
57
  try {
54
58
  await new _prosopo_env.ProviderEnvironment(config, pair, authAccount).isReady();
55
- const { sitekey, captcha_type, frictionless_threshold, url, domains, pow_difficulty, image_threshold, image_max_rounds } = SiteKeyRegisterApiCommandArgsSpec.parse(argv);
59
+ const { sitekey, captcha_type, frictionless_threshold, frictionless_image_threshold, url, domains, pow_difficulty, image_threshold, image_max_rounds } = SiteKeyRegisterApiCommandArgsSpec.parse(argv);
56
60
  const api = new _prosopo_api.ProviderApi(url, pair.address);
57
61
  const jwt = pair.jwtIssue();
58
62
  await api.registerSiteKey(sitekey, argv.tier, {
59
63
  captchaType: _prosopo_types.CaptchaTypeSpec.parse(captcha_type),
60
- frictionlessThreshold: frictionless_threshold,
64
+ frictionlessThreshold: {
65
+ frictionlessPuzzleThreshold: frictionless_threshold,
66
+ frictionlessImageThreshold: frictionless_image_threshold ?? _prosopo_types.frictionlessImageThresholdDefault
67
+ },
61
68
  domains: domains || [],
62
69
  powDifficulty: pow_difficulty,
63
70
  imageThreshold: image_threshold,
package/dist/cjs/start.cjs CHANGED
@@ -25,6 +25,7 @@ async function start(env, admin, port) {
25
25
  await env.isReady();
26
26
  env.cleanup();
27
27
  const maintenanceMode = process.env.MAINTENANCE_MODE?.toLowerCase() === "true";
28
+ if (!maintenanceMode) await (0, _prosopo_provider.runFrictionlessLadderMigration)(env.getDb(), env.logger);
28
29
  if (env.pair && !maintenanceMode) {
29
30
  const cronScheduleStorage = env.config.scheduledTasks?.captchaScheduler?.schedule;
30
31
  if (cronScheduleStorage) (0, _prosopo_provider.storeCaptchasExternally)(env.pair, cronScheduleStorage, env.config).catch((err) => {
package/dist/commands/siteKeyRegister.d.ts CHANGED
@@ -8,6 +8,7 @@ export declare const SiteKeyRegisterCommandArgsSpec: z.ZodObject<{
8
8
  tier: z.ZodNativeEnum<typeof Tier>;
9
9
  captcha_type: z.ZodNativeEnum<typeof import("@prosopo/types").CaptchaType>;
10
10
  frictionless_threshold: z.ZodNumber;
11
+ frictionless_image_threshold: z.ZodOptional<z.ZodNumber>;
11
12
  pow_difficulty: z.ZodNumber;
12
13
  domains: z.ZodArray<z.ZodString, "many">;
13
14
  image_threshold: z.ZodNumber;
@@ -21,6 +22,7 @@ export declare const SiteKeyRegisterCommandArgsSpec: z.ZodObject<{
21
22
  domains: string[];
22
23
  image_threshold: number;
23
24
  image_max_rounds: number;
25
+ frictionless_image_threshold?: number | undefined;
24
26
  }, {
25
27
  tier: Tier;
26
28
  sitekey: string;
@@ -29,6 +31,7 @@ export declare const SiteKeyRegisterCommandArgsSpec: z.ZodObject<{
29
31
  pow_difficulty: number;
30
32
  domains: string[];
31
33
  image_threshold: number;
34
+ frictionless_image_threshold?: number | undefined;
32
35
  image_max_rounds?: number | undefined;
33
36
  }>;
34
37
  declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
@@ -46,6 +49,8 @@ declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs
46
49
  domains: (string | number)[] | undefined;
47
50
  } & {
48
51
  frictionless_threshold: number | undefined;
52
+ } & {
53
+ frictionless_image_threshold: number | undefined;
49
54
  } & {
50
55
  pow_difficulty: number | undefined;
51
56
  } & {
package/dist/commands/siteKeyRegister.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAeA,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAEN,KAAK,WAAW,EAIhB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;EAczC,CAAC;+BAGI,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;;;oBA0CC,kBAAkB;;;;;AArD1C,wBAsGE"}
1
+ {"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAeA,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAEN,KAAK,WAAW,EAKhB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkBzC,CAAC;+BAGI,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;;;;;oBA+CC,kBAAkB;;;;;AA1D1C,wBAgHE"}
package/dist/commands/siteKeyRegister.js CHANGED
@@ -3,13 +3,14 @@ import { LogLevel, getLogger } from "@prosopo/logger";
3
3
  import { ProviderEnvironment } from "@prosopo/env";
4
4
  import { Tasks } from "@prosopo/provider";
5
5
  import { z } from "zod";
6
- import { CaptchaTypeSpec, ContextType, Tier, contextAwareThresholdDefault, imageMaxRoundsDefault, puzzleToleranceDefault } from "@prosopo/types";
6
+ import { CaptchaTypeSpec, ContextType, Tier, contextAwareThresholdDefault, frictionlessImageThresholdDefault, imageMaxRoundsDefault, puzzleToleranceDefault } from "@prosopo/types";
7
7
  //#region src/commands/siteKeyRegister.ts
8
8
  var SiteKeyRegisterCommandArgsSpec = z.object({
9
9
  sitekey: z.string(),
10
10
  tier: z.nativeEnum(Tier),
11
11
  captcha_type: CaptchaTypeSpec,
12
12
  frictionless_threshold: z.number().max(1).min(0),
13
+ frictionless_image_threshold: z.number().min(0).optional(),
13
14
  pow_difficulty: z.number(),
14
15
  domains: z.array(z.string()),
15
16
  image_threshold: z.number().max(1).min(0),
@@ -39,7 +40,11 @@ var siteKeyRegister_default = (pair, config, cmdArgs) => {
39
40
  }).option("frictionless_threshold", {
40
41
  type: "number",
41
42
  demandOption: false,
42
- desc: "Frictionless threshold for settings"
43
+ desc: "Score above which a puzzle is served (lower rung of the ladder)"
44
+ }).option("frictionless_image_threshold", {
45
+ type: "number",
46
+ demandOption: false,
47
+ desc: "Score at or above which an image captcha is served (upper rung of the ladder)"
43
48
  }).option("pow_difficulty", {
44
49
  type: "number",
45
50
  demandOption: false,
@@ -57,10 +62,13 @@ var siteKeyRegister_default = (pair, config, cmdArgs) => {
57
62
  try {
58
63
  const env = new ProviderEnvironment(config, pair);
59
64
  await env.isReady();
60
- const { sitekey, tier, captcha_type, frictionless_threshold, pow_difficulty, domains, image_threshold, image_max_rounds } = SiteKeyRegisterCommandArgsSpec.parse(argv);
65
+ const { sitekey, tier, captcha_type, frictionless_threshold, frictionless_image_threshold, pow_difficulty, domains, image_threshold, image_max_rounds } = SiteKeyRegisterCommandArgsSpec.parse(argv);
61
66
  await new Tasks(env).clientTaskManager.registerSiteKey(sitekey, tier, {
62
67
  captchaType: CaptchaTypeSpec.parse(captcha_type),
63
- frictionlessThreshold: frictionless_threshold,
68
+ frictionlessThreshold: {
69
+ frictionlessPuzzleThreshold: frictionless_threshold,
70
+ frictionlessImageThreshold: frictionless_image_threshold ?? frictionlessImageThresholdDefault
71
+ },
64
72
  domains: domains || [],
65
73
  powDifficulty: pow_difficulty,
66
74
  imageThreshold: image_threshold,
package/dist/commands/siteKeyRegister.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"siteKeyRegister.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"siteKeyRegister.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"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"}
package/dist/commands/siteKeyRegisterApi.d.ts CHANGED
@@ -17,6 +17,8 @@ declare const _default: (pair: KeyringPair, authAccount: KeyringPair, config: Pr
17
17
  captcha_type: string | undefined;
18
18
  } & {
19
19
  frictionless_threshold: number | undefined;
20
+ } & {
21
+ frictionless_image_threshold: number | undefined;
20
22
  } & {
21
23
  domains: (string | number)[] | undefined;
22
24
  } & {
package/dist/commands/siteKeyRegisterApi.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"siteKeyRegisterApi.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EAEJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAY/C,WAAW,eACJ,WAAW,UAChB,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;;;;;oBA+CC,kBAAkB;;;;;AA3D1C,wBAyGE"}
1
+ {"version":3,"file":"siteKeyRegisterApi.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EAGJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAY/C,WAAW,eACJ,WAAW,UAChB,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;;;;;;;oBAoDC,kBAAkB;;;;;AAhE1C,wBAoHE"}
package/dist/commands/siteKeyRegisterApi.js CHANGED
@@ -3,7 +3,7 @@ import { SiteKeyRegisterCommandArgsSpec } from "./siteKeyRegister.js";
3
3
  import { LogLevel, getLogger } from "@prosopo/logger";
4
4
  import { ProviderEnvironment } from "@prosopo/env";
5
5
  import { z } from "zod";
6
- import { CaptchaTypeSpec, Tier, puzzleToleranceDefault } from "@prosopo/types";
6
+ import { CaptchaTypeSpec, Tier, frictionlessImageThresholdDefault, puzzleToleranceDefault } from "@prosopo/types";
7
7
  import { ProviderApi } from "@prosopo/api";
8
8
  //#region src/commands/siteKeyRegisterApi.ts
9
9
  var SiteKeyRegisterApiCommandArgsSpec = SiteKeyRegisterCommandArgsSpec.extend({ url: z.string() });
@@ -31,7 +31,11 @@ var siteKeyRegisterApi_default = (pair, authAccount, config, cmdArgs) => {
31
31
  }).option("frictionless_threshold", {
32
32
  type: "number",
33
33
  demandOption: false,
34
- desc: "Frictionless threshold for settings"
34
+ desc: "Score above which a puzzle is served (lower rung of the ladder)"
35
+ }).option("frictionless_image_threshold", {
36
+ type: "number",
37
+ demandOption: false,
38
+ desc: "Score at or above which an image captcha is served (upper rung of the ladder)"
35
39
  }).option("domains", {
36
40
  type: "array",
37
41
  demandOption: false,
@@ -52,12 +56,15 @@ var siteKeyRegisterApi_default = (pair, authAccount, config, cmdArgs) => {
52
56
  handler: async (argv) => {
53
57
  try {
54
58
  await new ProviderEnvironment(config, pair, authAccount).isReady();
55
- const { sitekey, captcha_type, frictionless_threshold, url, domains, pow_difficulty, image_threshold, image_max_rounds } = SiteKeyRegisterApiCommandArgsSpec.parse(argv);
59
+ const { sitekey, captcha_type, frictionless_threshold, frictionless_image_threshold, url, domains, pow_difficulty, image_threshold, image_max_rounds } = SiteKeyRegisterApiCommandArgsSpec.parse(argv);
56
60
  const api = new ProviderApi(url, pair.address);
57
61
  const jwt = pair.jwtIssue();
58
62
  await api.registerSiteKey(sitekey, argv.tier, {
59
63
  captchaType: CaptchaTypeSpec.parse(captcha_type),
60
- frictionlessThreshold: frictionless_threshold,
64
+ frictionlessThreshold: {
65
+ frictionlessPuzzleThreshold: frictionless_threshold,
66
+ frictionlessImageThreshold: frictionless_image_threshold ?? frictionlessImageThresholdDefault
67
+ },
61
68
  domains: domains || [],
62
69
  powDifficulty: pow_difficulty,
63
70
  imageThreshold: image_threshold,
package/dist/commands/siteKeyRegisterApi.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"siteKeyRegisterApi.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"siteKeyRegisterApi.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"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"}
package/dist/start.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAYnD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,iCAgFb"}
1
+ {"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAanD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,iCAyFb"}
package/dist/start.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { getDB, getSecret } from "./process.env.js";
2
2
  import getConfig from "./prosopo.config.js";
3
3
  import { ProviderEnvironment } from "@prosopo/env";
4
- import { getClientList, startProviderApi, storeCaptchasExternally, updateSpamEmailDomainsScheduler } from "@prosopo/provider";
4
+ import { getClientList, runFrictionlessLadderMigration, startProviderApi, storeCaptchasExternally, updateSpamEmailDomainsScheduler } from "@prosopo/provider";
5
5
  import { loadEnv } from "@prosopo/dotenv";
6
6
  import { getPair } from "@prosopo/keyring";
7
7
  //#region src/start.ts
@@ -25,6 +25,7 @@ async function start(env, admin, port) {
25
25
  await env.isReady();
26
26
  env.cleanup();
27
27
  const maintenanceMode = process.env.MAINTENANCE_MODE?.toLowerCase() === "true";
28
+ if (!maintenanceMode) await runFrictionlessLadderMigration(env.getDb(), env.logger);
28
29
  if (env.pair && !maintenanceMode) {
29
30
  const cronScheduleStorage = env.config.scheduledTasks?.captchaScheduler?.schedule;
30
31
  if (cronScheduleStorage) storeCaptchasExternally(env.pair, cronScheduleStorage, env.config).catch((err) => {
package/dist/start.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prosopo/cli",
3
- "version": "3.7.27",
3
+ "version": "3.8.0",
4
4
  "description": "CLI for Prosopo Provider",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -35,15 +35,15 @@
35
35
  },
36
36
  "dependencies": {
37
37
  "@polkadot/types-codec": "16.5.6",
38
- "@prosopo/api": "4.1.0",
38
+ "@prosopo/api": "4.1.1",
39
39
  "@prosopo/common": "3.1.52",
40
40
  "@prosopo/logger": "2.0.7",
41
41
  "@prosopo/dotenv": "3.0.53",
42
- "@prosopo/env": "3.6.44",
43
- "@prosopo/keyring": "2.9.79",
42
+ "@prosopo/env": "3.6.45",
43
+ "@prosopo/keyring": "2.9.80",
44
44
  "@prosopo/locale": "3.4.0",
45
- "@prosopo/provider": "5.5.1",
46
- "@prosopo/types": "5.4.0",
45
+ "@prosopo/provider": "5.6.0",
46
+ "@prosopo/types": "5.5.0",
47
47
  "@prosopo/util": "3.3.7",
48
48
  "@prosopo/workspace": "3.2.0",
49
49
  "cron-parser": "4.9.0",