@prosopo/cli 0.2.39 → 0.2.41

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 (9) hide show
  1. package/dist/cjs/cli.cjs +5 -3
  2. package/dist/cjs/process.env.cjs +1 -5
  3. package/dist/cli.js +1 -3
  4. package/dist/cli.js.map +1 -1
  5. package/dist/process.env.d.ts +1 -1
  6. package/dist/process.env.d.ts.map +1 -1
  7. package/dist/process.env.js +2 -6
  8. package/dist/process.env.js.map +1 -1
  9. package/package.json +9 -9
package/dist/cjs/cli.cjs CHANGED
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  const common = require("@prosopo/common");
3
3
  const contract = require("@prosopo/contract");
4
- const process_env = require("./process.env.cjs");
5
4
  const util = require("@prosopo/util");
6
5
  const env = require("./env.cjs");
7
6
  const argv = require("./argv.cjs");
@@ -11,12 +10,15 @@ const process = require("process");
11
10
  const log = common.getLogger(common.LogLevel.enum.info, "CLI");
12
11
  async function main() {
13
12
  const envPath = env.loadEnv();
14
- const secret = process_env.getSecret();
15
13
  const config = prosopo_config(void 0, void 0, void 0, {
16
14
  solved: { count: 2 },
17
15
  unsolved: { count: 0 }
18
16
  });
19
- const pair = await contract.getPairAsync(config.networks[config.defaultNetwork], secret, "");
17
+ const pair = await contract.getPairAsync(
18
+ config.networks[config.defaultNetwork],
19
+ config.account.secret,
20
+ config.account.address
21
+ );
20
22
  log.info(`Pair address: ${pair.address}`);
21
23
  log.info(`Contract address: ${process.env.PROSOPO_CONTRACT_ADDRESS}`);
22
24
  const processedArgs = await argv.processArgs(process.argv, pair, config);
package/dist/cjs/process.env.cjs CHANGED
@@ -13,11 +13,7 @@ function getSecret(who) {
13
13
  } else {
14
14
  who = who.toUpperCase();
15
15
  }
16
- const secret = process.env[`PROSOPO_${who}_MNEMONIC`] || process.env[`PROSOPO_${who}_SEED`] || process.env[`PROSOPO_${who}_URI`] || process.env[`PROSOPO_${who}_JSON`];
17
- if (!secret) {
18
- throw new common.ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED");
19
- }
20
- return secret;
16
+ return process.env[`PROSOPO_${who}_MNEMONIC`] || process.env[`PROSOPO_${who}_SEED`] || process.env[`PROSOPO_${who}_URI`] || process.env[`PROSOPO_${who}_JSON`];
21
17
  }
22
18
  function getDB() {
23
19
  if (!process.env.PROSOPO_DATABASE_HOST) {
package/dist/cli.js CHANGED
@@ -1,6 +1,5 @@
1
1
  import { LogLevel, getLogger } from '@prosopo/common';
2
2
  import { getPairAsync } from '@prosopo/contract';
3
- import { getSecret } from './process.env.js';
4
3
  import { isMain } from '@prosopo/util';
5
4
  import { loadEnv } from './env.js';
6
5
  import { processArgs } from './argv.js';
@@ -10,12 +9,11 @@ import process from 'process';
10
9
  const log = getLogger(LogLevel.enum.info, 'CLI');
11
10
  async function main() {
12
11
  const envPath = loadEnv();
13
- const secret = getSecret();
14
12
  const config = getConfig(undefined, undefined, undefined, {
15
13
  solved: { count: 2 },
16
14
  unsolved: { count: 0 },
17
15
  });
18
- const pair = await getPairAsync(config.networks[config.defaultNetwork], secret, '');
16
+ const pair = await getPairAsync(config.networks[config.defaultNetwork], config.account.secret, config.account.address);
19
17
  log.info(`Pair address: ${pair.address}`);
20
18
  log.info(`Contract address: ${process.env.PROSOPO_CONTRACT_ADDRESS}`);
21
19
  const processedArgs = await processArgs(process.argv, pair, config);
package/dist/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAC3C,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAEhD,KAAK,UAAU,IAAI;IACf,MAAM,OAAO,GAAG,OAAO,EAAE,CAAA;IAEzB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAG1B,MAAM,MAAM,GAAwB,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;QAC3E,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;QACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;KACzB,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnF,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;IAEzC,GAAG,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,CAAA;IAErE,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAEnE,GAAG,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;IACtE,IAAI,aAAa,CAAC,GAAG,EAAE;QACnB,MAAM,IAAI,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,KAAK,EAAE,CAAA;KACvE;SAAM;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC;AAGD,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE;IACrC,IAAI,EAAE;SACD,IAAI,CAAC,GAAG,EAAE;QACP,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;IACvC,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACpB,CAAC,CAAC,CAAA;CACT"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAC3C,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAEhD,KAAK,UAAU,IAAI;IACf,MAAM,OAAO,GAAG,OAAO,EAAE,CAAA;IAGzB,MAAM,MAAM,GAAwB,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;QAC3E,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;QACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;KACzB,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,MAAM,YAAY,CAC3B,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EACtC,MAAM,CAAC,OAAO,CAAC,MAAM,EACrB,MAAM,CAAC,OAAO,CAAC,OAAO,CACzB,CAAA;IAED,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;IAEzC,GAAG,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,CAAA;IAErE,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAEnE,GAAG,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;IACtE,IAAI,aAAa,CAAC,GAAG,EAAE;QACnB,MAAM,IAAI,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,KAAK,EAAE,CAAA;KACvE;SAAM;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC;AAGD,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE;IACrC,IAAI,EAAE;SACD,IAAI,CAAC,GAAG,EAAE;QACP,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;IACvC,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACpB,CAAC,CAAC,CAAA;CACT"}
package/dist/process.env.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { KeypairType } from '@polkadot/util-crypto/types';
2
2
  export declare function getSs58Format(): number;
3
3
  export declare function getPairType(): KeypairType;
4
- export declare function getSecret(who?: string): string;
4
+ export declare function getSecret(who?: string): string | undefined;
5
5
  export declare function getDB(): string;
6
6
  //# sourceMappingURL=process.env.d.ts.map
package/dist/process.env.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"process.env.d.ts","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAGzD,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,WAAW,IAAI,WAAW,CAEzC;AAED,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAe9C;AAED,wBAAgB,KAAK,IAAI,MAAM,CAK9B"}
1
+ {"version":3,"file":"process.env.d.ts","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAGzD,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,WAAW,IAAI,WAAW,CAEzC;AAED,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY1D;AAED,wBAAgB,KAAK,IAAI,MAAM,CAK9B"}
package/dist/process.env.js CHANGED
@@ -12,14 +12,10 @@ export function getSecret(who) {
12
12
  else {
13
13
  who = who.toUpperCase();
14
14
  }
15
- const secret = process.env[`PROSOPO_${who}_MNEMONIC`] ||
15
+ return (process.env[`PROSOPO_${who}_MNEMONIC`] ||
16
16
  process.env[`PROSOPO_${who}_SEED`] ||
17
17
  process.env[`PROSOPO_${who}_URI`] ||
18
- process.env[`PROSOPO_${who}_JSON`];
19
- if (!secret) {
20
- throw new ProsopoEnvError('GENERAL.NO_MNEMONIC_OR_SEED');
21
- }
22
- return secret;
18
+ process.env[`PROSOPO_${who}_JSON`]);
23
19
  }
24
20
  export function getDB() {
25
21
  if (!process.env.PROSOPO_DATABASE_HOST) {
package/dist/process.env.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"process.env.js","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,UAAU,aAAa;IACzB,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,IAAI,EAAE,CAAA;AACxD,CAAC;AAED,MAAM,UAAU,WAAW;IACvB,OAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiC,IAAK,SAAyB,CAAA;AACvF,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAY;IAClC,IAAI,CAAC,GAAG,EAAE;QACN,GAAG,GAAG,UAAU,CAAA;KACnB;SAAM;QACH,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;KAC1B;IACD,MAAM,MAAM,GACR,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,CAAA;IACtC,IAAI,CAAC,MAAM,EAAE;QACT,MAAM,IAAI,eAAe,CAAC,6BAA6B,CAAC,CAAA;KAC3D;IACD,OAAO,MAAM,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,KAAK;IACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;QACpC,MAAM,IAAI,eAAe,CAAC,kCAAkC,CAAC,CAAA;KAChE;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAA;AAC5C,CAAC"}
1
+ {"version":3,"file":"process.env.js","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,UAAU,aAAa;IACzB,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,IAAI,EAAE,CAAA;AACxD,CAAC;AAED,MAAM,UAAU,WAAW;IACvB,OAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiC,IAAK,SAAyB,CAAA;AACvF,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAY;IAClC,IAAI,CAAC,GAAG,EAAE;QACN,GAAG,GAAG,UAAU,CAAA;KACnB;SAAM;QACH,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;KAC1B;IACD,OAAO,CACH,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,CACrC,CAAA;AACL,CAAC;AAED,MAAM,UAAU,KAAK;IACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;QACpC,MAAM,IAAI,eAAe,CAAC,kCAAkC,CAAC,CAAA;KAChE;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAA;AAC5C,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prosopo/cli",
3
- "version": "0.2.39",
3
+ "version": "0.2.41",
4
4
  "description": "CLI for Prosopo Provider",
5
5
  "main": "dist/index.js",
6
6
  "type": "module",
@@ -34,13 +34,13 @@
34
34
  "@polkadot/types": "10.11.1",
35
35
  "@polkadot/util": "12.6.1",
36
36
  "@polkadot/util-crypto": "12.6.1",
37
- "@prosopo/captcha-contract": "0.2.39",
38
- "@prosopo/common": "0.2.39",
39
- "@prosopo/contract": "0.2.39",
40
- "@prosopo/env": "0.2.39",
41
- "@prosopo/provider": "0.2.39",
42
- "@prosopo/types": "0.2.39",
43
- "@prosopo/util": "0.2.39",
37
+ "@prosopo/captcha-contract": "0.2.41",
38
+ "@prosopo/common": "0.2.41",
39
+ "@prosopo/contract": "0.2.41",
40
+ "@prosopo/env": "0.2.41",
41
+ "@prosopo/provider": "0.2.41",
42
+ "@prosopo/types": "0.2.41",
43
+ "@prosopo/util": "0.2.41",
44
44
  "cors": "^2.8.5",
45
45
  "cron-parser": "^4.9.0",
46
46
  "dotenv": "^16.0.1",
@@ -52,7 +52,7 @@
52
52
  "express": "^4.18.2",
53
53
  "vite": "^4.5.2",
54
54
  "vitest": "^0.34.6",
55
- "@prosopo/config": "0.2.39",
55
+ "@prosopo/config": "0.2.41",
56
56
  "@types/cors": "^2.8.14",
57
57
  "tslib": "2.6.2",
58
58
  "typescript": "5.1.6"