@prosopo/cli 0.2.14 → 0.2.15

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/dist/cjs/cli.cjs CHANGED
@@ -3,13 +3,12 @@ const common = require("@prosopo/common");
3
3
  const env$1 = require("@prosopo/env");
4
4
  const contract = require("@prosopo/contract");
5
5
  const process_env = require("./process.env.cjs");
6
+ const util = require("@prosopo/util");
6
7
  const env = require("./env.cjs");
7
8
  const argv = require("./argv.cjs");
8
9
  const start = require("./start.cjs");
9
- const esMain = require("es-main");
10
10
  const prosopo_config = require("./prosopo.config.cjs");
11
11
  const process = require("process");
12
- var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
13
12
  const log = common.getLogger(common.LogLevel.enum.info, "CLI");
14
13
  async function main() {
15
14
  env.loadEnv();
@@ -20,7 +19,7 @@ async function main() {
20
19
  });
21
20
  const pair = await contract.getPairAsync(config.networks[config.defaultNetwork], secret, "");
22
21
  log.info(`Pair address: ${pair.address}`);
23
- log.info(`Contract address: ${process.env.PROTOCOL_CONTRACT_ADDRESS}`);
22
+ log.info(`Contract address: ${process.env.PROSOPO_CONTRACT_ADDRESS}`);
24
23
  const processedArgs = await argv.processArgs(process.argv, pair, config);
25
24
  if (processedArgs.api) {
26
25
  const env2 = new env$1.ProviderEnvironment(config, pair);
@@ -31,7 +30,7 @@ async function main() {
31
30
  process.exit(0);
32
31
  }
33
32
  }
34
- if (esMain({ url: typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.src || new URL("cli.cjs", document.baseURI).href })) {
33
+ if (util.isMain(module, "provider")) {
35
34
  main().then(() => {
36
35
  log.info("Running main process...");
37
36
  }).catch((error) => {
package/dist/cjs/env.cjs CHANGED
@@ -4,10 +4,9 @@ const common = require("@prosopo/common");
4
4
  const url = require("url");
5
5
  const dotenv = require("dotenv");
6
6
  const path = require("path");
7
- var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
8
- const __filename$1 = url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.src || new URL("env.cjs", document.baseURI).href);
7
+ const __filename$1 = url.fileURLToPath(module);
9
8
  const __dirname$1 = path.dirname(__filename$1);
10
- const logger = common.getLogger(process.env.LOG_LEVEL || common.LogLevel.enum.info, "env");
9
+ const logger = common.getLogger(process.env.PROSOPO_LOG_LEVEL || common.LogLevel.enum.info, "env");
11
10
  function getEnv() {
12
11
  if (process.env.NODE_ENV) {
13
12
  return process.env.NODE_ENV.replace(/\W/g, "");
@@ -5,7 +5,7 @@ function getSs58Format() {
5
5
  return parseInt(process.env.SS58_FORMAT || "") || 42;
6
6
  }
7
7
  function getPairType() {
8
- return process.env.PAIR_TYPE || "sr25519";
8
+ return process.env.PROSOPO_PAIR_TYPE || "sr25519";
9
9
  }
10
10
  function getSecret(who) {
11
11
  if (!who) {
@@ -13,17 +13,17 @@ function getSecret(who) {
13
13
  } else {
14
14
  who = who.toUpperCase();
15
15
  }
16
- const secret = process.env[`${who}_MNEMONIC`] || process.env[`${who}_SEED`] || process.env[`${who}_URI`] || process.env[`${who}_JSON`];
16
+ const secret = process.env[`PROSOPO_${who}_MNEMONIC`] || process.env[`PROSOPO_${who}_SEED`] || process.env[`PROSOPO_${who}_URI`] || process.env[`PROSOPO_${who}_JSON`];
17
17
  if (!secret) {
18
18
  throw new common.ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED");
19
19
  }
20
20
  return secret;
21
21
  }
22
22
  function getDB() {
23
- if (!process.env.DATABASE_HOST) {
23
+ if (!process.env.PROSOPO_DATABASE_HOST) {
24
24
  throw new common.ProsopoEnvError("DATABASE.DATABASE_HOST_UNDEFINED");
25
25
  }
26
- return process.env.DATABASE_HOST;
26
+ return process.env.PROSOPO_DATABASE_HOST;
27
27
  }
28
28
  exports.getDB = getDB;
29
29
  exports.getPairType = getPairType;
@@ -3,36 +3,36 @@ const types = require("@prosopo/types");
3
3
  const common = require("@prosopo/common");
4
4
  const process_env = require("./process.env.cjs");
5
5
  function getMongoURI() {
6
- const protocol = process.env.DATABASE_PROTOCOL || "mongodb";
6
+ const protocol = process.env.PROSOPO_DATABASE_PROTOCOL || "mongodb";
7
7
  const mongoSrv = protocol === "mongodb+srv";
8
- const password = process.env.DATABASE_PASSWORD || "";
9
- const username = process.env.DATABASE_USERNAME || "";
10
- const host = process.env.DATABASE_HOST || "localhost";
11
- const port = mongoSrv ? "" : `:${process.env.DATABASE_PORT ? process.env.DATABASE_PORT : 27017}`;
8
+ const password = process.env.PROSOPO_DATABASE_PASSWORD || "";
9
+ const username = process.env.PROSOPO_DATABASE_USERNAME || "";
10
+ const host = process.env.PROSOPO_DATABASE_HOST || "localhost";
11
+ const port = mongoSrv ? "" : `:${process.env.PROSOPO_DATABASE_PORT ? process.env.PROSOPO_DATABASE_PORT : 27017}`;
12
12
  const retries = mongoSrv ? "?retryWrites=true&w=majority" : "";
13
13
  return `${protocol}://${username}:${password}@${host}${port}/${retries}`;
14
14
  }
15
15
  function getConfig(networksConfig, captchaSolutionsConfig, batchCommitConfig, captchaServeConfig) {
16
16
  return types.ProsopoConfigSchema.parse({
17
17
  logLevel: common.getLogLevel(),
18
- defaultEnvironment: process.env.DEFAULT_ENVIRONMENT ? types.EnvironmentTypesSchema.parse(process.env.DEFAULT_ENVIRONMENT) : types.EnvironmentTypesSchema.enum.development,
19
- defaultNetwork: process.env.DEFAULT_NETWORK ? types.NetworkNamesSchema.parse(process.env.DEFAULT_NETWORK) : types.NetworkNamesSchema.enum.development,
18
+ defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT ? types.EnvironmentTypesSchema.parse(process.env.PROSOPO_DEFAULT_ENVIRONMENT) : types.EnvironmentTypesSchema.enum.development,
19
+ defaultNetwork: process.env.PROSOPO_DEFAULT_NETWORK ? types.NetworkNamesSchema.parse(process.env.PROSOPO_DEFAULT_NETWORK) : types.NetworkNamesSchema.enum.development,
20
20
  account: {
21
- address: process.env.PROVIDER_ADDRESS || void 0,
22
- password: process.env.PROVIDER_ACCOUNT_PASSWORD || void 0,
21
+ address: process.env.PROSOPO_PROVIDER_ADDRESS || void 0,
22
+ password: process.env.PROSOPO_PROVIDER_ACCOUNT_PASSWORD || void 0,
23
23
  secret: process_env.getSecret()
24
24
  },
25
25
  database: {
26
26
  development: {
27
27
  type: types.DatabaseTypes.enum.mongo,
28
28
  endpoint: getMongoURI(),
29
- dbname: process.env.DATABASE_NAME || "",
29
+ dbname: process.env.PROSOPO_DATABASE_NAME || "",
30
30
  authSource: "admin"
31
31
  }
32
32
  },
33
33
  server: {
34
- baseURL: process.env.API_BASE_URL || "http://localhost",
35
- port: process.env.API_PORT ? parseInt(process.env.API_PORT) : 9229
34
+ baseURL: process.env.PROSOPO_API_BASE_URL || "http://localhost",
35
+ port: process.env.PROSOPO_API_PORT ? parseInt(process.env.PROSOPO_API_PORT) : 9229
36
36
  },
37
37
  networks: networksConfig,
38
38
  captchaSolutions: captchaSolutionsConfig,
@@ -4,13 +4,12 @@ const common = require("@prosopo/common");
4
4
  const env$1 = require("@prosopo/env");
5
5
  const process_env = require("./process.env.cjs");
6
6
  const contract = require("@prosopo/contract");
7
+ const util = require("@prosopo/util");
7
8
  const env = require("./env.cjs");
8
9
  const provider = require("@prosopo/provider");
9
10
  const cors = require("cors");
10
- const esMain = require("es-main");
11
11
  const express = require("express");
12
12
  const prosopo_config = require("./prosopo.config.cjs");
13
- var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
14
13
  const handleErrors = (err, request, response, next) => {
15
14
  const code = "code" in err ? err.code : 400;
16
15
  let message = err.message;
@@ -52,7 +51,7 @@ async function start(env$2) {
52
51
  await env$2.isReady();
53
52
  startApi(env$2);
54
53
  }
55
- if (esMain({ url: typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.src || new URL("start.cjs", document.baseURI).href })) {
54
+ if (util.isMain(module, "provider")) {
56
55
  start().catch((error) => {
57
56
  console.error(error);
58
57
  });
package/dist/cli.js CHANGED
@@ -1,38 +1,24 @@
1
- // Copyright 2021-2022 Prosopo (UK) Ltd.
2
- //
3
- // Licensed under the Apache License, Version 2.0 (the "License");
4
- // you may not use this file except in compliance with the License.
5
- // You may obtain a copy of the License at
6
- //
7
- // http://www.apache.org/licenses/LICENSE-2.0
8
- //
9
- // Unless required by applicable law or agreed to in writing, software
10
- // distributed under the License is distributed on an "AS IS" BASIS,
11
- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- // See the License for the specific language governing permissions and
13
- // limitations under the License.
14
1
  import { LogLevel, getLogger } from '@prosopo/common';
15
2
  import { ProviderEnvironment } from '@prosopo/env';
16
3
  import { getPairAsync } from '@prosopo/contract';
17
4
  import { getSecret } from './process.env.js';
5
+ import { isMain } from '@prosopo/util';
18
6
  import { loadEnv } from './env.js';
19
7
  import { processArgs } from './argv.js';
20
8
  import { start } from './start.js';
21
- import esMain from 'es-main';
22
9
  import getConfig from './prosopo.config.js';
23
10
  import process from 'process';
24
11
  const log = getLogger(LogLevel.enum.info, 'CLI');
25
12
  async function main() {
26
13
  loadEnv();
27
14
  const secret = getSecret();
28
- // quick fix to allow for new dataset structure that only has `{ solved: true }` captchas
29
15
  const config = getConfig(undefined, undefined, undefined, {
30
16
  solved: { count: 2 },
31
17
  unsolved: { count: 0 },
32
18
  });
33
19
  const pair = await getPairAsync(config.networks[config.defaultNetwork], secret, '');
34
20
  log.info(`Pair address: ${pair.address}`);
35
- log.info(`Contract address: ${process.env.PROTOCOL_CONTRACT_ADDRESS}`);
21
+ log.info(`Contract address: ${process.env.PROSOPO_CONTRACT_ADDRESS}`);
36
22
  const processedArgs = await processArgs(process.argv, pair, config);
37
23
  if (processedArgs.api) {
38
24
  const env = new ProviderEnvironment(config, pair);
@@ -44,8 +30,7 @@ async function main() {
44
30
  process.exit(0);
45
31
  }
46
32
  }
47
- //if main process
48
- if (esMain(import.meta)) {
33
+ if (isMain(import.meta.url, 'provider')) {
49
34
  main()
50
35
  .then(() => {
51
36
  log.info('Running main process...');
package/dist/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,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,OAAO,EAAE,CAAA;IAET,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAE1B,yFAAyF;IACzF,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,yBAAyB,EAAE,CAAC,CAAA;IAEtE,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACnE,IAAI,aAAa,CAAC,GAAG,EAAE;QACnB,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;QACnB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACxB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;KACnB;SAAM;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC;AAED,iBAAiB;AACjB,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;IACrB,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,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,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,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,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,OAAO,EAAE,CAAA;IAET,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;IACnE,IAAI,aAAa,CAAC,GAAG,EAAE;QACnB,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;QACnB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACxB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;KACnB;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"}
@@ -34,9 +34,7 @@ export default (pair, config, cmdArgs) => {
34
34
  logger.info(`Getting dataset ID from provider ${providerAddress}`);
35
35
  datasetId = provider.datasetId.toString();
36
36
  }
37
- // get the dataset from the provider database
38
37
  const result = await tasks.getProviderDataset(datasetId);
39
- // export the result to file
40
38
  await writeJSONFile(z.string().parse(argv.file), result);
41
39
  }
42
40
  catch (err) {
@@ -1 +1 @@
1
- {"version":3,"file":"providerDataset.js","sourceRoot":"","sources":["../../src/commands/providerDataset.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAGxB,OAAO,EAAE,QAAQ,EAAU,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAE,EAAE;IAC7F,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAA;IACvF,OAAO;QACH,OAAO,EAAE,kBAAkB;QAC3B,QAAQ,EAAE,8CAA8C;QACxD,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK;aACA,MAAM,CAAC,YAAY,EAAE;YAClB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,0BAA0B;SAC1B,CAAC;aACV,MAAM,CAAC,MAAM,EAAE;YACZ,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,wCAAwC;SACxC,CAAC;QACnB,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,IAAI,SAAS,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAC3D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE;oBAC7B,MAAM,IAAI,eAAe,CAAC,2BAA2B,CAAC,CAAA;iBACzD;gBACD,IAAI,SAAS,KAAK,SAAS,EAAE;oBACzB,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAA;oBAClD,MAAM,QAAQ,GAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;oBAClG,MAAM,CAAC,IAAI,CAAC,oCAAoC,eAAe,EAAE,CAAC,CAAA;oBAClE,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAA;iBAC5C;gBACD,6CAA6C;gBAC7C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAA;gBACxD,4BAA4B;gBAC5B,MAAM,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;aAC3D;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}
1
+ {"version":3,"file":"providerDataset.js","sourceRoot":"","sources":["../../src/commands/providerDataset.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAGxB,OAAO,EAAE,QAAQ,EAAU,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAE,EAAE;IAC7F,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAA;IACvF,OAAO;QACH,OAAO,EAAE,kBAAkB;QAC3B,QAAQ,EAAE,8CAA8C;QACxD,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK;aACA,MAAM,CAAC,YAAY,EAAE;YAClB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,0BAA0B;SAC1B,CAAC;aACV,MAAM,CAAC,MAAM,EAAE;YACZ,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,wCAAwC;SACxC,CAAC;QACnB,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,IAAI,SAAS,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAC3D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE;oBAC7B,MAAM,IAAI,eAAe,CAAC,2BAA2B,CAAC,CAAA;iBACzD;gBACD,IAAI,SAAS,KAAK,SAAS,EAAE;oBACzB,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAA;oBAClD,MAAM,QAAQ,GAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;oBAClG,MAAM,CAAC,IAAI,CAAC,oCAAoC,eAAe,EAAE,CAAC,CAAA;oBAClE,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAA;iBAC5C;gBAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAA;gBAExD,MAAM,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;aAC3D;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}
@@ -18,9 +18,6 @@ export default (pair, config, cmdArgs) => {
18
18
  const env = new ProviderEnvironment(config, pair);
19
19
  await env.isReady();
20
20
  const tasks = new Tasks(env);
21
- // TODO provider deregister does not accept params... it should?
22
- // await tasks.contract.tx.providerDeregister(argv.address)
23
- // logger.info('Provider registered')
24
21
  throw new ProsopoEnvError('GENERAL.NOT_IMPLEMENTED');
25
22
  }
26
23
  catch (err) {
@@ -1 +1 @@
1
- {"version":3,"file":"providerDeregister.js","sourceRoot":"","sources":["../../src/commands/providerDeregister.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAE,EAAE;IAC7F,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAA;IAE1F,OAAO;QACH,OAAO,EAAE,qBAAqB;QAC9B,QAAQ,EAAE,uBAAuB;QACjC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE;YACpB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,+BAA+B;SAC/B,CAAC;QACf,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAE5B,gEAAgE;gBAChE,2DAA2D;gBAE3D,qCAAqC;gBAErC,MAAM,IAAI,eAAe,CAAC,yBAAyB,CAAC,CAAA;aACvD;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;QACD,WAAW,EAAE,CAAC,eAAe,CAAC;KACjC,CAAA;AACL,CAAC,CAAA"}
1
+ {"version":3,"file":"providerDeregister.js","sourceRoot":"","sources":["../../src/commands/providerDeregister.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAE,EAAE;IAC7F,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAA;IAE1F,OAAO;QACH,OAAO,EAAE,qBAAqB;QAC9B,QAAQ,EAAE,uBAAuB;QACjC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE;YACpB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,+BAA+B;SAC/B,CAAC;QACf,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAO5B,MAAM,IAAI,eAAe,CAAC,yBAAyB,CAAC,CAAA;aACvD;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;QACD,WAAW,EAAE,CAAC,eAAe,CAAC;KACjC,CAAA;AACL,CAAC,CAAA"}
package/dist/env.js CHANGED
@@ -1,23 +1,10 @@
1
- // Copyright 2021-2023 Prosopo (UK) Ltd.
2
- //
3
- // Licensed under the Apache License, Version 2.0 (the "License");
4
- // you may not use this file except in compliance with the License.
5
- // You may obtain a copy of the License at
6
- //
7
- // http://www.apache.org/licenses/LICENSE-2.0
8
- //
9
- // Unless required by applicable law or agreed to in writing, software
10
- // distributed under the License is distributed on an "AS IS" BASIS,
11
- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- // See the License for the specific language governing permissions and
13
- // limitations under the License.
14
1
  import { LogLevel, getLogger } from '@prosopo/common';
15
2
  import { fileURLToPath } from 'url';
16
3
  import dotenv from 'dotenv';
17
4
  import path from 'path';
18
5
  const __filename = fileURLToPath(import.meta.url);
19
6
  const __dirname = path.dirname(__filename);
20
- const logger = getLogger(process.env.LOG_LEVEL || LogLevel.enum.info, 'env');
7
+ const logger = getLogger(process.env.PROSOPO_LOG_LEVEL || LogLevel.enum.info, 'env');
21
8
  export function getEnv() {
22
9
  if (process.env.NODE_ENV) {
23
10
  return process.env.NODE_ENV.replace(/\W/g, '');
package/dist/env.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AACnC,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;AAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAE5E,MAAM,UAAU,MAAM;IAClB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;QACtB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;KACjD;IACD,OAAO,aAAa,CAAA;AACxB,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAgB,EAAE,QAAiB,EAAE,QAAiB;IAC1E,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAC5E,MAAM,IAAI,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IAC9B,MAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAA;IAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAAgB,EAAE,QAAQ,GAAG,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;IACpG,MAAM,GAAG,GAAG,MAAM,EAAE,CAAA;IACpB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,QAAQ,EAAE,GAAG,QAAQ,IAAI,GAAG,EAAE,CAAC,CAAA;AAC/D,CAAC"}
1
+ {"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AACnC,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;AAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAEpF,MAAM,UAAU,MAAM;IAClB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;QACtB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;KACjD;IACD,OAAO,aAAa,CAAA;AACxB,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAgB,EAAE,QAAiB,EAAE,QAAiB;IAC1E,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAC5E,MAAM,IAAI,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IAC9B,MAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAA;IAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAAgB,EAAE,QAAQ,GAAG,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;IACpG,MAAM,GAAG,GAAG,MAAM,EAAE,CAAA;IACpB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,QAAQ,EAAE,GAAG,QAAQ,IAAI,GAAG,EAAE,CAAC,CAAA;AAC/D,CAAC"}
package/dist/files.js CHANGED
@@ -1,16 +1,3 @@
1
- // Copyright 2021-2023 Prosopo (UK) Ltd.
2
- //
3
- // Licensed under the Apache License, Version 2.0 (the "License");
4
- // you may not use this file except in compliance with the License.
5
- // You may obtain a copy of the License at
6
- //
7
- // http://www.apache.org/licenses/LICENSE-2.0
8
- //
9
- // Unless required by applicable law or agreed to in writing, software
10
- // distributed under the License is distributed on an "AS IS" BASIS,
11
- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- // See the License for the specific language governing permissions and
13
- // limitations under the License.
14
1
  import { ProsopoEnvError } from '@prosopo/common';
15
2
  import { Readable } from 'stream';
16
3
  import fs, { createWriteStream } from 'fs';
@@ -32,7 +19,6 @@ export function writeJSONFile(filePath, jsonData) {
32
19
  writeStream.on('error', (err) => {
33
20
  reject(err);
34
21
  });
35
- // https://stackoverflow.com/questions/64585940/writestream-nodejs-out-memory
36
22
  const readable = Readable.from(JSON.stringify(jsonData));
37
23
  readable.pipe(writeStream);
38
24
  });
package/dist/files.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"files.js","sourceRoot":"","sources":["../src/files.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAE,EAAE,EAAe,iBAAiB,EAAE,MAAM,IAAI,CAAA;AAEvD,MAAM,UAAU,YAAY,CAAC,QAAgB;IACzC,IAAI;QACA,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;KACvD;IAAC,OAAO,GAAG,EAAE;QACV,MAAM,IAAI,eAAe,CAAC,GAAY,EAAE,0BAA0B,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAA;KACpF;AACL,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,QAA6B;IACzE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,WAAW,GAAgB,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QAE5D,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAEvC,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,CAAA;QACjB,CAAC,CAAC,CAAA;QAEF,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC5B,MAAM,CAAC,GAAG,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;QAEF,6EAA6E;QAC7E,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QAExD,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC9B,CAAC,CAAC,CAAA;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,QAAgB;IAC3C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAChC,IAAI,GAAG;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAA;YACpB,OAAO,CAAC,IAAc,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC"}
1
+ {"version":3,"file":"files.js","sourceRoot":"","sources":["../src/files.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAE,EAAE,EAAe,iBAAiB,EAAE,MAAM,IAAI,CAAA;AAEvD,MAAM,UAAU,YAAY,CAAC,QAAgB;IACzC,IAAI;QACA,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;KACvD;IAAC,OAAO,GAAG,EAAE;QACV,MAAM,IAAI,eAAe,CAAC,GAAY,EAAE,0BAA0B,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAA;KACpF;AACL,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,QAA6B;IACzE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,WAAW,GAAgB,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QAE5D,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAEvC,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,CAAA;QACjB,CAAC,CAAC,CAAA;QAEF,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC5B,MAAM,CAAC,GAAG,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;QAGF,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QAExD,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC9B,CAAC,CAAC,CAAA;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,QAAgB;IAC3C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAChC,IAAI,GAAG;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAA;YACpB,OAAO,CAAC,IAAc,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC"}
package/dist/index.js CHANGED
@@ -1,16 +1,3 @@
1
- // Copyright 2021-2023 Prosopo (UK) Ltd.
2
- //
3
- // Licensed under the Apache License, Version 2.0 (the "License");
4
- // you may not use this file except in compliance with the License.
5
- // You may obtain a copy of the License at
6
- //
7
- // http://www.apache.org/licenses/LICENSE-2.0
8
- //
9
- // Unless required by applicable law or agreed to in writing, software
10
- // distributed under the License is distributed on an "AS IS" BASIS,
11
- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- // See the License for the specific language governing permissions and
13
- // limitations under the License.
14
1
  export * from './argv.js';
15
2
  export * from './cli.js';
16
3
  export * from './start.js';
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC9D,cAAc,UAAU,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC9D,cAAc,UAAU,CAAA"}
@@ -3,7 +3,7 @@ export function getSs58Format() {
3
3
  return parseInt(process.env.SS58_FORMAT || '') || 42;
4
4
  }
5
5
  export function getPairType() {
6
- return process.env.PAIR_TYPE || 'sr25519';
6
+ return process.env.PROSOPO_PAIR_TYPE || 'sr25519';
7
7
  }
8
8
  export function getSecret(who) {
9
9
  if (!who) {
@@ -12,19 +12,19 @@ export function getSecret(who) {
12
12
  else {
13
13
  who = who.toUpperCase();
14
14
  }
15
- const secret = process.env[`${who}_MNEMONIC`] ||
16
- process.env[`${who}_SEED`] ||
17
- process.env[`${who}_URI`] ||
18
- process.env[`${who}_JSON`];
15
+ const secret = process.env[`PROSOPO_${who}_MNEMONIC`] ||
16
+ process.env[`PROSOPO_${who}_SEED`] ||
17
+ process.env[`PROSOPO_${who}_URI`] ||
18
+ process.env[`PROSOPO_${who}_JSON`];
19
19
  if (!secret) {
20
20
  throw new ProsopoEnvError('GENERAL.NO_MNEMONIC_OR_SEED');
21
21
  }
22
22
  return secret;
23
23
  }
24
24
  export function getDB() {
25
- if (!process.env.DATABASE_HOST) {
25
+ if (!process.env.PROSOPO_DATABASE_HOST) {
26
26
  throw new ProsopoEnvError('DATABASE.DATABASE_HOST_UNDEFINED');
27
27
  }
28
- return process.env.DATABASE_HOST;
28
+ return process.env.PROSOPO_DATABASE_HOST;
29
29
  }
30
30
  //# sourceMappingURL=process.env.js.map
@@ -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,SAAyB,IAAK,SAAyB,CAAA;AAC/E,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,GAAG,GAAG,WAAW,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,CAAA;IAC9B,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,aAAa,EAAE;QAC5B,MAAM,IAAI,eAAe,CAAC,kCAAkC,CAAC,CAAA;KAChE;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAA;AACpC,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,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,54 +1,41 @@
1
- // Copyright 2021-2022 Prosopo (UK) Ltd.
2
- //
3
- // Licensed under the Apache License, Version 2.0 (the "License");
4
- // you may not use this file except in compliance with the License.
5
- // You may obtain a copy of the License at
6
- //
7
- // http://www.apache.org/licenses/LICENSE-2.0
8
- //
9
- // Unless required by applicable law or agreed to in writing, software
10
- // distributed under the License is distributed on an "AS IS" BASIS,
11
- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- // See the License for the specific language governing permissions and
13
- // limitations under the License.
14
1
  import { DatabaseTypes, EnvironmentTypesSchema, NetworkNamesSchema, ProsopoConfigSchema, } from '@prosopo/types';
15
2
  import { getLogLevel } from '@prosopo/common';
16
3
  import { getSecret } from './process.env.js';
17
4
  function getMongoURI() {
18
- const protocol = process.env.DATABASE_PROTOCOL || 'mongodb';
5
+ const protocol = process.env.PROSOPO_DATABASE_PROTOCOL || 'mongodb';
19
6
  const mongoSrv = protocol === 'mongodb+srv';
20
- const password = process.env.DATABASE_PASSWORD || '';
21
- const username = process.env.DATABASE_USERNAME || '';
22
- const host = process.env.DATABASE_HOST || 'localhost';
23
- const port = mongoSrv ? '' : `:${process.env.DATABASE_PORT ? process.env.DATABASE_PORT : 27017}`;
7
+ const password = process.env.PROSOPO_DATABASE_PASSWORD || '';
8
+ const username = process.env.PROSOPO_DATABASE_USERNAME || '';
9
+ const host = process.env.PROSOPO_DATABASE_HOST || 'localhost';
10
+ const port = mongoSrv ? '' : `:${process.env.PROSOPO_DATABASE_PORT ? process.env.PROSOPO_DATABASE_PORT : 27017}`;
24
11
  const retries = mongoSrv ? '?retryWrites=true&w=majority' : '';
25
12
  return `${protocol}://${username}:${password}@${host}${port}/${retries}`;
26
13
  }
27
14
  export default function getConfig(networksConfig, captchaSolutionsConfig, batchCommitConfig, captchaServeConfig) {
28
15
  return ProsopoConfigSchema.parse({
29
16
  logLevel: getLogLevel(),
30
- defaultEnvironment: process.env.DEFAULT_ENVIRONMENT
31
- ? EnvironmentTypesSchema.parse(process.env.DEFAULT_ENVIRONMENT)
17
+ defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT
18
+ ? EnvironmentTypesSchema.parse(process.env.PROSOPO_DEFAULT_ENVIRONMENT)
32
19
  : EnvironmentTypesSchema.enum.development,
33
- defaultNetwork: process.env.DEFAULT_NETWORK
34
- ? NetworkNamesSchema.parse(process.env.DEFAULT_NETWORK)
20
+ defaultNetwork: process.env.PROSOPO_DEFAULT_NETWORK
21
+ ? NetworkNamesSchema.parse(process.env.PROSOPO_DEFAULT_NETWORK)
35
22
  : NetworkNamesSchema.enum.development,
36
23
  account: {
37
- address: process.env.PROVIDER_ADDRESS || undefined,
38
- password: process.env.PROVIDER_ACCOUNT_PASSWORD || undefined,
24
+ address: process.env.PROSOPO_PROVIDER_ADDRESS || undefined,
25
+ password: process.env.PROSOPO_PROVIDER_ACCOUNT_PASSWORD || undefined,
39
26
  secret: getSecret(),
40
27
  },
41
28
  database: {
42
29
  development: {
43
30
  type: DatabaseTypes.enum.mongo,
44
31
  endpoint: getMongoURI(),
45
- dbname: process.env.DATABASE_NAME || '',
32
+ dbname: process.env.PROSOPO_DATABASE_NAME || '',
46
33
  authSource: 'admin',
47
34
  },
48
35
  },
49
36
  server: {
50
- baseURL: process.env.API_BASE_URL || 'http://localhost',
51
- port: process.env.API_PORT ? parseInt(process.env.API_PORT) : 9229,
37
+ baseURL: process.env.PROSOPO_API_BASE_URL || 'http://localhost',
38
+ port: process.env.PROSOPO_API_PORT ? parseInt(process.env.PROSOPO_API_PORT) : 9229,
52
39
  },
53
40
  networks: networksConfig,
54
41
  captchaSolutions: captchaSolutionsConfig,
@@ -1 +1 @@
1
- {"version":3,"file":"prosopo.config.js","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prosopo.config.js","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAcA,OAAO,EAEH,aAAa,EACb,sBAAsB,EACtB,kBAAkB,EAKlB,mBAAmB,GAEtB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE5C,SAAS,WAAW;IAChB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,SAAS,CAAA;IACnE,MAAM,QAAQ,GAAG,QAAQ,KAAK,aAAa,CAAA;IAC3C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,EAAE,CAAA;IAC5D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,EAAE,CAAA;IAC5D,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,WAAW,CAAA;IAC7D,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA;IAChH,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9D,OAAO,GAAG,QAAQ,MAAM,QAAQ,IAAI,QAAQ,IAAI,IAAI,GAAG,IAAI,IAAI,OAAO,EAAE,CAAA;AAC5E,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAC7B,cAA2C,EAC3C,sBAAkE,EAClE,iBAAkD,EAClD,kBAAyD;IAEzD,OAAO,mBAAmB,CAAC,KAAK,CAAC;QAC7B,QAAQ,EAAE,WAAW,EAAE;QACvB,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;YACvD,CAAC,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;YACvE,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,WAAW;QAC7C,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;YAC/C,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;YAC/D,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW;QACzC,OAAO,EAAE;YACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,SAAS;YAC1D,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,SAAS;YACpE,MAAM,EAAE,SAAS,EAAE;SACtB;QACD,QAAQ,EAAE;YACN,WAAW,EAAE;gBACT,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,KAAK;gBAC9B,QAAQ,EAAE,WAAW,EAAE;gBACvB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE;gBAC/C,UAAU,EAAE,OAAO;aACtB;SACJ;QACD,MAAM,EAAE;YACJ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,kBAAkB;YAC/D,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI;SACrF;QACD,QAAQ,EAAE,cAAc;QACxB,gBAAgB,EAAE,sBAAsB;QACxC,WAAW,EAAE,iBAAiB;QAC9B,QAAQ,EAAE,kBAAkB;KACT,CAAC,CAAA;AAC5B,CAAC"}
package/dist/start.js CHANGED
@@ -1,27 +1,13 @@
1
- // Copyright 2021-2023 Prosopo (UK) Ltd.
2
- //
3
- // Licensed under the Apache License, Version 2.0 (the "License");
4
- // you may not use this file except in compliance with the License.
5
- // You may obtain a copy of the License at
6
- //
7
- // http://www.apache.org/licenses/LICENSE-2.0
8
- //
9
- // Unless required by applicable law or agreed to in writing, software
10
- // distributed under the License is distributed on an "AS IS" BASIS,
11
- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- // See the License for the specific language governing permissions and
13
- // limitations under the License.
14
1
  import { i18nMiddleware } from '@prosopo/common';
15
2
  import { ProviderEnvironment } from '@prosopo/env';
16
3
  import { getDB, getSecret } from './process.env.js';
17
4
  import { getPairAsync } from '@prosopo/contract';
5
+ import { isMain } from '@prosopo/util';
18
6
  import { loadEnv } from './env.js';
19
7
  import { prosopoRouter } from '@prosopo/provider';
20
8
  import cors from 'cors';
21
- import esMain from 'es-main';
22
9
  import express from 'express';
23
10
  import getConfig from './prosopo.config.js';
24
- // We need the unused params to make express recognise this function as an error handler
25
11
  export const handleErrors = (err, request, response, next) => {
26
12
  const code = 'code' in err ? err.code : 400;
27
13
  let message = err.message;
@@ -52,7 +38,6 @@ function startApi(env) {
52
38
  export async function start(env) {
53
39
  if (!env) {
54
40
  loadEnv();
55
- // Fail to start api if db is not defined
56
41
  getDB();
57
42
  const secret = getSecret();
58
43
  const config = getConfig(undefined, undefined, undefined, {
@@ -65,8 +50,7 @@ export async function start(env) {
65
50
  await env.isReady();
66
51
  startApi(env);
67
52
  }
68
- //if main process
69
- if (esMain(import.meta)) {
53
+ if (isMain(import.meta.url, 'provider')) {
70
54
  start().catch((error) => {
71
55
  console.error(error);
72
56
  });
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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"}
@@ -5,13 +5,9 @@ import { promisify } from 'util';
5
5
  const execPromise = promisify(exec);
6
6
  describe('provider bundle', () => {
7
7
  test('bundle runs after bundling', async () => {
8
- // get file location
9
8
  const dir = getCurrentFileDirectory(import.meta.url);
10
- // get root directory of this package
11
9
  const rootDir = dir.split('/').slice(0, -3).join('/');
12
- // build bundle
13
10
  await execPromise(`cd ${rootDir} && npm run bundle:prod`);
14
- // run bundle and get version
15
11
  const { stdout: runOut, stderr: runErr } = await execPromise(`cd ${rootDir} && node dist/bundle/provider.cli.bundle.js version`);
16
12
  assert(runOut.includes('Version:'));
17
13
  }, 120000);
@@ -1 +1 @@
1
- {"version":3,"file":"bundle.test.js","sourceRoot":"","sources":["../../../src/tests/bundle/bundle.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;AAEnC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC1C,oBAAoB;QACpB,MAAM,GAAG,GAAG,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEpD,qCAAqC;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAErD,eAAe;QACf,MAAM,WAAW,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAA;QAEzD,6BAA6B;QAC7B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CACxD,MAAM,OAAO,qDAAqD,CACrE,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;IACvC,CAAC,EAAE,MAAM,CAAC,CAAA;AACd,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"bundle.test.js","sourceRoot":"","sources":["../../../src/tests/bundle/bundle.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;AAEnC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAE1C,MAAM,GAAG,GAAG,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAGpD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAGrD,MAAM,WAAW,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAA;QAGzD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CACxD,MAAM,OAAO,qDAAqD,CACrE,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;IACvC,CAAC,EAAE,MAAM,CAAC,CAAA;AACd,CAAC,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prosopo/cli",
3
- "version": "0.2.14",
3
+ "version": "0.2.15",
4
4
  "description": "CLI for Prosopo Provider",
5
5
  "main": "dist/index.js",
6
6
  "type": "module",
@@ -30,17 +30,16 @@
30
30
  "@polkadot/types": "10.10.1",
31
31
  "@polkadot/util": "12.5.1",
32
32
  "@polkadot/util-crypto": "12.5.1",
33
- "@prosopo/captcha-contract": "0.2.14",
34
- "@prosopo/common": "0.2.14",
35
- "@prosopo/contract": "0.2.14",
36
- "@prosopo/env": "0.2.14",
37
- "@prosopo/provider": "0.2.14",
38
- "@prosopo/types": "0.2.14",
39
- "@prosopo/util": "0.2.14",
33
+ "@prosopo/captcha-contract": "0.2.15",
34
+ "@prosopo/common": "0.2.15",
35
+ "@prosopo/contract": "0.2.15",
36
+ "@prosopo/env": "0.2.15",
37
+ "@prosopo/provider": "0.2.15",
38
+ "@prosopo/types": "0.2.15",
39
+ "@prosopo/util": "0.2.15",
40
40
  "cors": "^2.8.5",
41
41
  "cron-parser": "^4.9.0",
42
42
  "dotenv": "^16.0.1",
43
- "es-main": "^1.3.0",
44
43
  "yargs": "^17.7.2",
45
44
  "zod": "^3.22.4"
46
45
  },
@@ -49,7 +48,7 @@
49
48
  "express": "^4.18.2",
50
49
  "vite": "^4.5.0",
51
50
  "vitest": "^0.34.6",
52
- "@prosopo/config": "0.2.14",
51
+ "@prosopo/config": "0.2.15",
53
52
  "@types/cors": "^2.8.14",
54
53
  "tslib": "2.6.2",
55
54
  "typescript": "5.1.6"
package/vite.config.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import * as path from 'path'
2
2
  import { ViteBackendConfig } from '@prosopo/config'
3
3
  import { defineConfig } from 'vite'
4
- import { loadEnv } from '.'
4
+ import { loadEnv } from '@prosopo/cli'
5
5
  import { version } from './package.json'
6
6
 
7
7
  // load env using our util because vite loadEnv is not working for .env.development