@prosopo/env 2.6.5 → 3.0.6

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 CHANGED
@@ -1,5 +1,117 @@
1
1
  # @prosopo/env
2
2
 
3
+ ## 3.0.6
4
+ ### Patch Changes
5
+
6
+ - Updated dependencies [b0d7207]
7
+ - @prosopo/types-database@3.0.6
8
+ - @prosopo/database@3.0.6
9
+ - @prosopo/types@3.0.3
10
+ - @prosopo/types-env@2.7.10
11
+
12
+ ## 3.0.5
13
+ ### Patch Changes
14
+
15
+ - @prosopo/database@3.0.5
16
+ - @prosopo/types-database@3.0.5
17
+ - @prosopo/types-env@2.7.9
18
+ - @prosopo/util@3.0.2
19
+
20
+ ## 3.0.4
21
+ ### Patch Changes
22
+
23
+ - @prosopo/database@3.0.4
24
+ - @prosopo/types-database@3.0.4
25
+ - @prosopo/types-env@2.7.8
26
+ - @prosopo/util@3.0.1
27
+
28
+ ## 3.0.3
29
+ ### Patch Changes
30
+
31
+ - Updated dependencies [f682f0c]
32
+ - @prosopo/types-database@3.0.3
33
+ - @prosopo/database@3.0.3
34
+ - @prosopo/types@3.0.2
35
+ - @prosopo/types-env@2.7.7
36
+ - @prosopo/common@3.0.2
37
+
38
+ ## 3.0.2
39
+ ### Patch Changes
40
+
41
+ - @prosopo/common@3.0.1
42
+ - @prosopo/types@3.0.1
43
+ - @prosopo/database@3.0.2
44
+ - @prosopo/types-database@3.0.2
45
+ - @prosopo/types-env@2.7.6
46
+
47
+ ## 3.0.1
48
+ ### Patch Changes
49
+
50
+ - Updated dependencies [913f2a6]
51
+ - @prosopo/types-database@3.0.1
52
+ - @prosopo/database@3.0.1
53
+ - @prosopo/types-env@2.7.5
54
+
55
+ ## 3.0.0
56
+ ### Major Changes
57
+
58
+ - 64b5bcd: Access Controls
59
+
60
+ ### Patch Changes
61
+
62
+ - Updated dependencies [64b5bcd]
63
+ - @prosopo/types-database@3.0.0
64
+ - @prosopo/database@3.0.0
65
+ - @prosopo/common@3.0.0
66
+ - @prosopo/types@3.0.0
67
+ - @prosopo/util@3.0.0
68
+ - @prosopo/types-env@2.7.4
69
+
70
+ ## 2.7.3
71
+ ### Patch Changes
72
+
73
+ - Updated dependencies [aee3efe]
74
+ - @prosopo/types@2.10.0
75
+ - @prosopo/database@2.6.9
76
+ - @prosopo/types-database@2.7.6
77
+ - @prosopo/types-env@2.7.3
78
+
79
+ ## 2.7.2
80
+ ### Patch Changes
81
+
82
+ - 86c22b8: structured logging
83
+ - Updated dependencies [86c22b8]
84
+ - @prosopo/types-database@2.7.5
85
+ - @prosopo/types-env@2.7.2
86
+ - @prosopo/database@2.6.8
87
+ - @prosopo/common@2.7.2
88
+ - @prosopo/types@2.9.1
89
+ - @prosopo/util@2.6.1
90
+
91
+ ## 2.7.1
92
+ ### Patch Changes
93
+
94
+ - Updated dependencies [30bb383]
95
+ - @prosopo/types@2.9.0
96
+ - @prosopo/common@2.7.1
97
+ - @prosopo/database@2.6.7
98
+ - @prosopo/types-database@2.7.4
99
+ - @prosopo/types-env@2.7.1
100
+
101
+ ## 2.7.0
102
+ ### Minor Changes
103
+
104
+ - 8f0644a: Taking required functions from polkadot/keyring and polkadot/util-crypto in-house and removing WASM dependencies. Adding @scure JS-based sr25519 function instead.
105
+
106
+ ### Patch Changes
107
+
108
+ - Updated dependencies [8f0644a]
109
+ - @prosopo/types-env@2.7.0
110
+ - @prosopo/common@2.7.0
111
+ - @prosopo/types@2.8.0
112
+ - @prosopo/database@2.6.6
113
+ - @prosopo/types-database@2.7.3
114
+
3
115
  ## 2.6.5
4
116
 
5
117
  ### Patch Changes
package/dist/cjs/env.cjs CHANGED
@@ -1,15 +1,18 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
- const keyring = require("@polkadot/keyring");
4
3
  const common = require("@prosopo/common");
5
4
  const database = require("@prosopo/database");
5
+ const keyring = require("@prosopo/keyring");
6
6
  class Environment {
7
7
  constructor(config, pair, authAccount) {
8
8
  this.config = config;
9
9
  this.defaultEnvironment = this.config.defaultEnvironment;
10
10
  this.pair = pair;
11
11
  this.authAccount = authAccount;
12
- this.logger = common.getLogger(this.config.logLevel, "ProsopoEnvironment");
12
+ this.logger = common.getLogger(
13
+ common.parseLogLevel(this.config.logLevel),
14
+ "ProsopoEnvironment"
15
+ );
13
16
  this.keyring = new keyring.Keyring({
14
17
  type: "sr25519"
15
18
  });
@@ -64,11 +67,11 @@ class Environment {
64
67
  await this.importDatabase();
65
68
  }
66
69
  if (this.db && !this.db.connected) {
67
- this.logger.warn(
68
- `Database connection is not ready (state: ${this.db.connection?.readyState}), reconnecting...`
69
- );
70
+ this.logger.warn(() => ({
71
+ msg: `Database connection is not ready (state: ${this.db?.connection?.readyState}), reconnecting...`
72
+ }));
70
73
  await this.db.connect();
71
- this.logger.info("Connected to db");
74
+ this.logger.info(() => ({ msg: "Connected to db" }));
72
75
  }
73
76
  } catch (err) {
74
77
  throw new common.ProsopoEnvError("GENERAL.ENVIRONMENT_NOT_READY", {
@@ -82,12 +85,18 @@ class Environment {
82
85
  if (this.config.database) {
83
86
  const dbConfig = this.config.database[this.defaultEnvironment];
84
87
  if (dbConfig) {
85
- this.db = new database.ProviderDatabase(
86
- dbConfig.endpoint,
87
- dbConfig.dbname,
88
- dbConfig.authSource,
89
- this.logger
90
- );
88
+ this.db = new database.ProviderDatabase({
89
+ mongo: {
90
+ url: dbConfig.endpoint,
91
+ dbname: dbConfig.dbname,
92
+ authSource: dbConfig.authSource
93
+ },
94
+ redis: {
95
+ url: this.config.redisConnection.url,
96
+ password: this.config.redisConnection.password
97
+ },
98
+ logger: this.logger
99
+ });
91
100
  await this.db.connect();
92
101
  }
93
102
  }
@@ -2,7 +2,5 @@
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
3
  const env = require("./env.cjs");
4
4
  const provider = require("./provider.cjs");
5
- const mockenv = require("./mockenv.cjs");
6
5
  exports.Environment = env.Environment;
7
6
  exports.ProviderEnvironment = provider.ProviderEnvironment;
8
- exports.MockEnvironment = mockenv.MockEnvironment;
@@ -5,7 +5,11 @@ const env = require("./env.cjs");
5
5
  class ProviderEnvironment extends env.Environment {
6
6
  cleanup() {
7
7
  this.getDb().cleanupScheduledTaskStatus(types.ScheduledTaskStatus.Running).catch((err) => {
8
- this.logger.error("Failed to cleanup scheduled tasks", err);
8
+ this.logger.error(() => ({
9
+ msg: "Failed to cleanup running scheduled tasks",
10
+ err,
11
+ data: { failedFuncName: this.cleanup.name }
12
+ }));
9
13
  });
10
14
  }
11
15
  }
package/dist/env.d.ts CHANGED
@@ -1,12 +1,12 @@
1
- import { Keyring } from "@polkadot/keyring";
2
- import type { KeyringPair } from "@polkadot/keyring/types";
3
1
  import { type Logger } from "@prosopo/common";
4
2
  import { ProviderDatabase } from "@prosopo/database";
3
+ import { Keyring } from "@prosopo/keyring";
4
+ import type { KeyringPair } from "@prosopo/types";
5
5
  import type { AssetsResolver, EnvironmentTypes } from "@prosopo/types";
6
- import type { ProsopoBasicConfigOutput } from "@prosopo/types";
6
+ import type { ProsopoConfigOutput } from "@prosopo/types";
7
7
  import type { ProsopoEnvironment } from "@prosopo/types-env";
8
8
  export declare class Environment implements ProsopoEnvironment {
9
- config: ProsopoBasicConfigOutput;
9
+ config: ProsopoConfigOutput;
10
10
  db: ProviderDatabase | undefined;
11
11
  defaultEnvironment: EnvironmentTypes;
12
12
  logger: Logger;
@@ -14,7 +14,7 @@ export declare class Environment implements ProsopoEnvironment {
14
14
  keyring: Keyring;
15
15
  pair: KeyringPair | undefined;
16
16
  authAccount: KeyringPair | undefined;
17
- constructor(config: ProsopoBasicConfigOutput, pair?: KeyringPair, authAccount?: KeyringPair);
17
+ constructor(config: ProsopoConfigOutput, pair?: KeyringPair, authAccount?: KeyringPair);
18
18
  getSigner(): Promise<KeyringPair>;
19
19
  getDb(): ProviderDatabase;
20
20
  getAssetsResolver(): AssetsResolver;
package/dist/env.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAA8B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAa,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,qBAAa,WAAY,YAAW,kBAAkB;IACrD,MAAM,EAAE,wBAAwB,CAAC;IACjC,EAAE,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACjC,kBAAkB,EAAE,gBAAgB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,GAAG,SAAS,CAAC;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAC9B,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;gBAGpC,MAAM,EAAE,wBAAwB,EAChC,IAAI,CAAC,EAAE,WAAW,EAClB,WAAW,CAAC,EAAE,WAAW;IAcpB,SAAS,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBvC,KAAK,IAAI,gBAAgB;IASzB,iBAAiB,IAAI,cAAc;IASnC,OAAO,IAAI,WAAW;IAShB,OAAO;IAyBP,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CA2BrC"}
1
+ {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,MAAM,EAIX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,qBAAa,WAAY,YAAW,kBAAkB;IACrD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,EAAE,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACjC,kBAAkB,EAAE,gBAAgB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,GAAG,SAAS,CAAC;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAC9B,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;gBAGpC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,CAAC,EAAE,WAAW,EAClB,WAAW,CAAC,EAAE,WAAW;IAiBpB,SAAS,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBvC,KAAK,IAAI,gBAAgB;IASzB,iBAAiB,IAAI,cAAc;IASnC,OAAO,IAAI,WAAW;IAShB,OAAO;IAyBP,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAiCrC"}
package/dist/env.js CHANGED
@@ -1,13 +1,13 @@
1
- import { Keyring } from "@polkadot/keyring";
2
- import { ProsopoEnvError, getLogger } from "@prosopo/common";
1
+ import { ProsopoEnvError, getLogger, parseLogLevel, } from "@prosopo/common";
3
2
  import { ProviderDatabase } from "@prosopo/database";
3
+ import { Keyring } from "@prosopo/keyring";
4
4
  export class Environment {
5
5
  constructor(config, pair, authAccount) {
6
6
  this.config = config;
7
7
  this.defaultEnvironment = this.config.defaultEnvironment;
8
8
  this.pair = pair;
9
9
  this.authAccount = authAccount;
10
- this.logger = getLogger(this.config.logLevel, "ProsopoEnvironment");
10
+ this.logger = getLogger(parseLogLevel(this.config.logLevel), "ProsopoEnvironment");
11
11
  this.keyring = new Keyring({
12
12
  type: "sr25519",
13
13
  });
@@ -58,9 +58,11 @@ export class Environment {
58
58
  await this.importDatabase();
59
59
  }
60
60
  if (this.db && !this.db.connected) {
61
- this.logger.warn(`Database connection is not ready (state: ${this.db.connection?.readyState}), reconnecting...`);
61
+ this.logger.warn(() => ({
62
+ msg: `Database connection is not ready (state: ${this.db?.connection?.readyState}), reconnecting...`,
63
+ }));
62
64
  await this.db.connect();
63
- this.logger.info("Connected to db");
65
+ this.logger.info(() => ({ msg: "Connected to db" }));
64
66
  }
65
67
  }
66
68
  catch (err) {
@@ -75,7 +77,18 @@ export class Environment {
75
77
  if (this.config.database) {
76
78
  const dbConfig = this.config.database[this.defaultEnvironment];
77
79
  if (dbConfig) {
78
- this.db = new ProviderDatabase(dbConfig.endpoint, dbConfig.dbname, dbConfig.authSource, this.logger);
80
+ this.db = new ProviderDatabase({
81
+ mongo: {
82
+ url: dbConfig.endpoint,
83
+ dbname: dbConfig.dbname,
84
+ authSource: dbConfig.authSource,
85
+ },
86
+ redis: {
87
+ url: this.config.redisConnection.url,
88
+ password: this.config.redisConnection.password,
89
+ },
90
+ logger: this.logger,
91
+ });
79
92
  await this.db.connect();
80
93
  }
81
94
  }
package/dist/env.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,4 +1,3 @@
1
1
  export * from "./env.js";
2
2
  export * from "./provider.js";
3
- export * from "./mockenv.js";
4
3
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC"}
package/dist/index.js CHANGED
@@ -1,4 +1,3 @@
1
1
  export * from "./env.js";
2
2
  export * from "./provider.js";
3
- export * from "./mockenv.js";
4
3
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,mBAAmB,EAAuB,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,qBAAa,mBAAoB,SAAQ,WAAW;IAC3C,MAAM,EAAE,mBAAmB,CAAC;IAEpC,OAAO,IAAI,IAAI;CAOf"}
1
+ {"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,mBAAmB,EAAuB,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,qBAAa,mBAAoB,SAAQ,WAAW;IAC3C,MAAM,EAAE,mBAAmB,CAAC;IAEpC,OAAO,IAAI,IAAI;CAWf"}
package/dist/provider.js CHANGED
@@ -5,7 +5,11 @@ export class ProviderEnvironment extends Environment {
5
5
  this.getDb()
6
6
  .cleanupScheduledTaskStatus(ScheduledTaskStatus.Running)
7
7
  .catch((err) => {
8
- this.logger.error("Failed to cleanup scheduled tasks", err);
8
+ this.logger.error(() => ({
9
+ msg: "Failed to cleanup running scheduled tasks",
10
+ err,
11
+ data: { failedFuncName: this.cleanup.name },
12
+ }));
9
13
  });
10
14
  }
11
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAcA,OAAO,EAA4B,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,OAAO,mBAAoB,SAAQ,WAAW;IAGnD,OAAO;QACN,IAAI,CAAC,KAAK,EAAE;aACV,0BAA0B,CAAC,mBAAmB,CAAC,OAAO,CAAC;aACvD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC;CACD"}
1
+ {"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAcA,OAAO,EAA4B,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,OAAO,mBAAoB,SAAQ,WAAW;IAGnD,OAAO;QACN,IAAI,CAAC,KAAK,EAAE;aACV,0BAA0B,CAAC,mBAAmB,CAAC,OAAO,CAAC;aACvD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBACxB,GAAG,EAAE,2CAA2C;gBAChD,GAAG;gBACH,IAAI,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;aAC3C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prosopo/env",
3
- "version": "2.6.5",
3
+ "version": "3.0.6",
4
4
  "description": "Path env prosopo environment",
5
5
  "main": "dist/index.js",
6
6
  "type": "module",
@@ -21,30 +21,30 @@
21
21
  "build:cjs": "npx vite --config vite.cjs.config.ts build"
22
22
  },
23
23
  "dependencies": {
24
- "@polkadot/keyring": "12.6.2",
25
24
  "@polkadot/util": "12.6.2",
26
- "@polkadot/util-crypto": "12.6.2",
27
- "@prosopo/common": "2.6.1",
28
- "@prosopo/database": "2.6.5",
29
- "@prosopo/types": "2.7.1",
30
- "@prosopo/types-database": "2.7.2",
31
- "@prosopo/types-env": "2.6.5",
32
- "@prosopo/util": "2.6.0",
33
- "express": "4.21.2"
34
- },
35
- "overrides": {
36
- "@polkadot/keyring": "12.6.2"
25
+ "@prosopo/common": "3.0.2",
26
+ "@prosopo/database": "3.0.6",
27
+ "@prosopo/types": "3.0.3",
28
+ "@prosopo/types-database": "3.0.6",
29
+ "@prosopo/types-env": "2.7.10",
30
+ "@prosopo/util": "3.0.2",
31
+ "@typegoose/auto-increment": "4.13.0",
32
+ "axios": "1.10.0",
33
+ "esbuild": "0.25.6",
34
+ "express": "4.21.2",
35
+ "openpgp": "5.11.3",
36
+ "webpack-dev-server": "5.2.2"
37
37
  },
38
38
  "devDependencies": {
39
- "@prosopo/config": "2.6.0",
39
+ "@prosopo/config": "3.1.0",
40
40
  "@vitest/coverage-v8": "3.0.9",
41
41
  "concurrently": "9.0.1",
42
42
  "del-cli": "6.0.0",
43
- "npm-run-all": "2.1.0",
43
+ "npm-run-all": "4.1.5",
44
44
  "tslib": "2.7.0",
45
- "tsx": "4.19.1",
45
+ "tsx": "4.20.3",
46
46
  "typescript": "5.6.2",
47
- "vite": "6.2.3",
47
+ "vite": "6.3.5",
48
48
  "vitest": "3.0.9"
49
49
  },
50
50
  "author": "Prosopo",
@@ -1,13 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
- const mnemonic = require("@polkadot/util-crypto/mnemonic");
4
- const provider = require("./provider.cjs");
5
- class MockEnvironment extends provider.ProviderEnvironment {
6
- createAccountAndAddToKeyring() {
7
- const mnemonic$1 = mnemonic.mnemonicGenerate();
8
- const account = this.keyring.addFromMnemonic(mnemonic$1);
9
- const { address } = account;
10
- return { address, mnemonic: mnemonic$1, contractAddress: void 0 };
11
- }
12
- }
13
- exports.MockEnvironment = MockEnvironment;
package/dist/mockenv.d.ts DELETED
@@ -1,23 +0,0 @@
1
- import type { BN } from "@polkadot/util/bn";
2
- import type { Dapp, Provider } from "@prosopo/types";
3
- import { ProviderEnvironment } from "./provider.js";
4
- export type TestAccount = {
5
- mnemonic: string;
6
- address: string;
7
- contractAddress: string | undefined;
8
- };
9
- export interface ProviderTestAccount extends TestAccount {
10
- contractValue: Provider;
11
- }
12
- export interface AppTestAccount extends TestAccount {
13
- contractValue: Dapp;
14
- }
15
- export declare class MockEnvironment extends ProviderEnvironment {
16
- createAccountAndAddToKeyring(): TestAccount;
17
- }
18
- export interface ViteTestContext {
19
- env: MockEnvironment;
20
- providerStakeThreshold: BN;
21
- dappStakeThreshold: BN;
22
- }
23
- //# sourceMappingURL=mockenv.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"mockenv.d.ts","sourceRoot":"","sources":["../src/mockenv.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEpD,MAAM,MAAM,WAAW,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACvD,aAAa,EAAE,QAAQ,CAAC;CACxB;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IAClD,aAAa,EAAE,IAAI,CAAC;CACpB;AAED,qBAAa,eAAgB,SAAQ,mBAAmB;IAChD,4BAA4B,IAAI,WAAW;CAMlD;AAED,MAAM,WAAW,eAAe;IAC/B,GAAG,EAAE,eAAe,CAAC;IACrB,sBAAsB,EAAE,EAAE,CAAC;IAC3B,kBAAkB,EAAE,EAAE,CAAC;CACvB"}
package/dist/mockenv.js DELETED
@@ -1,11 +0,0 @@
1
- import { mnemonicGenerate } from "@polkadot/util-crypto/mnemonic";
2
- import { ProviderEnvironment } from "./provider.js";
3
- export class MockEnvironment extends ProviderEnvironment {
4
- createAccountAndAddToKeyring() {
5
- const mnemonic = mnemonicGenerate();
6
- const account = this.keyring.addFromMnemonic(mnemonic);
7
- const { address } = account;
8
- return { address, mnemonic, contractAddress: undefined };
9
- }
10
- }
11
- //# sourceMappingURL=mockenv.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"mockenv.js","sourceRoot":"","sources":["../src/mockenv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAgBlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAgBpD,MAAM,OAAO,eAAgB,SAAQ,mBAAmB;IAChD,4BAA4B;QAClC,MAAM,QAAQ,GAAW,gBAAgB,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC;IAC1D,CAAC;CACD"}