@prosopo/cli 0.2.7 → 0.2.9

package/dist/cjs/env.cjs

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const common = require("@prosopo/common");
 const url = require("url");
 const dotenv = require("dotenv");
 const path = require("path");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 const __filename$1 = url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.src || new URL("env.cjs", document.baseURI).href);
 const __dirname$1 = path.dirname(__filename$1);
+const logger = common.getLogger(process.env.LOG_LEVEL || common.LogLevel.enum.info, "env");
 function getEnv() {
   if (process.env.NODE_ENV) {
     return process.env.NODE_ENV.replace(/\W/g, "");
@@ -15,6 +17,7 @@ function getEnv() {
 function loadEnv(rootDir, filename, filePath) {
   const envPath = getEnvFile(path.resolve(rootDir || "."), filename, filePath);
   const args = { path: envPath };
+  logger.info(`Loading env from ${envPath}`);
   dotenv.config(args);
 }
 function getEnvFile(rootDir, filename = ".env", filepath = path.join(__dirname$1, "../..")) {

package/dist/cjs/index.cjs

@@ -10,7 +10,7 @@ const env = require("./env.cjs");
 exports.processArgs = argv.processArgs;
 exports.handleErrors = start.handleErrors;
 exports.start = start.start;
-exports.getConfig = process_env.getConfig;
+exports.getDB = process_env.getDB;
 exports.getPairType = process_env.getPairType;
 exports.getSecret = process_env.getSecret;
 exports.getSs58Format = process_env.getSs58Format;

package/dist/cjs/process.env.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common = require("@prosopo/common");
-const prosopo_config = require("./prosopo.config.cjs");
 function getSs58Format() {
   return parseInt(process.env.SS58_FORMAT || "") || 42;
 }
@@ -20,10 +19,13 @@ function getSecret(who) {
   }
   return secret;
 }
-function getConfig() {
-  return prosopo_config();
+function getDB() {
+  if (!process.env.DATABASE_HOST) {
+    throw new common.ProsopoEnvError("DATABASE.DATABASE_HOST_UNDEFINED");
+  }
+  return process.env.DATABASE_HOST;
 }
-exports.getConfig = getConfig;
+exports.getDB = getDB;
 exports.getPairType = getPairType;
 exports.getSecret = getSecret;
 exports.getSs58Format = getSs58Format;

package/dist/cjs/prosopo.config.cjs

@@ -1,6 +1,7 @@
 "use strict";
 const types = require("@prosopo/types");
 const common = require("@prosopo/common");
+const process_env = require("./process.env.cjs");
 function getMongoURI() {
   const protocol = process.env.DATABASE_PROTOCOL || "mongodb";
   const mongoSrv = protocol === "mongodb+srv";
@@ -11,69 +12,32 @@ function getMongoURI() {
   const retries = mongoSrv ? "?retryWrites=true&w=majority" : "";
   return `${protocol}://${username}:${password}@${host}${port}/${retries}`;
 }
-const prosopoConfig = () => ({
-  logLevel: common.getLogLevel(),
-  defaultEnvironment: process.env.DEFAULT_ENVIRONMENT || types.EnvironmentTypesSchema.enum.development,
-  account: {
-    address: process.env.PROVIDER_ADDRESS || "",
-    password: process.env.PROVIDER_ACCOUNT_PASSWORD || void 0
-  },
-  networks: {
-    development: {
-      endpoint: process.env.SUBSTRATE_NODE_URL || "http://localhost:9944",
-      // TODO accept array of endpoints. WsProvider takes array and has failover.
-      contract: {
-        address: process.env.PROTOCOL_CONTRACT_ADDRESS || "",
-        name: "prosopo"
-      },
-      accounts: ["//Alice", "//Bob", "//Charlie", "//Dave", "//Eve", "//Ferdie"]
+function getConfig(networksConfig, captchaSolutionsConfig, batchCommitConfig, captchaServeConfig) {
+  return types.ProsopoConfigSchema.parse({
+    logLevel: common.getLogLevel(),
+    defaultEnvironment: process.env.DEFAULT_ENVIRONMENT ? types.EnvironmentTypesSchema.parse(process.env.DEFAULT_ENVIRONMENT) : types.EnvironmentTypesSchema.enum.development,
+    defaultNetwork: process.env.DEFAULT_NETWORK ? types.NetworkNamesSchema.parse(process.env.DEFAULT_NETWORK) : types.NetworkNamesSchema.enum.development,
+    account: {
+      address: process.env.PROVIDER_ADDRESS || void 0,
+      password: process.env.PROVIDER_ACCOUNT_PASSWORD || void 0,
+      secret: process_env.getSecret()
     },
-    rococo: {
-      endpoint: process.env.SUBSTRATE_NODE_URL || "wss://rococo-contracts-rpc.polkadot.io:443",
-      contract: {
-        address: process.env.PROTOCOL_CONTRACT_ADDRESS || "",
-        name: "prosopo"
-      },
-      accounts: []
-    }
-  },
-  captchas: {
-    solved: {
-      count: 1
-      // TODO add env var
+    database: {
+      development: {
+        type: types.DatabaseTypes.enum.mongo,
+        endpoint: getMongoURI(),
+        dbname: process.env.DATABASE_NAME || "",
+        authSource: "admin"
+      }
     },
-    unsolved: {
-      count: 1
-      // TODO add env var
-    }
-  },
-  captchaSolutions: {
-    captchaBlockRecency: 10,
-    // TODO add env var
-    requiredNumberOfSolutions: 3,
-    // TODO add env var
-    solutionWinningPercentage: 80,
-    // TODO add env var
-    captchaFilePath: "../../data/captchas_big.json"
-    // TODO add env var
-  },
-  database: {
-    development: {
-      type: types.DatabaseTypes.enum.mongo,
-      endpoint: getMongoURI(),
-      dbname: process.env.DATABASE_NAME || "",
-      authSource: "admin"
-    }
-  },
-  batchCommit: {
-    interval: 300,
-    // TODO add env var
-    maxBatchExtrinsicPercentage: 59
-    // TODO add env var
-  },
-  server: {
-    baseURL: process.env.API_BASE_URL || "",
-    port: process.env.API_PORT ? parseInt(process.env.API_PORT) : 9229
-  }
-});
-module.exports = prosopoConfig;
+    server: {
+      baseURL: process.env.API_BASE_URL || "http://localhost",
+      port: process.env.API_PORT ? parseInt(process.env.API_PORT) : 9229
+    },
+    networks: networksConfig,
+    captchaSolutions: captchaSolutionsConfig,
+    batchCommit: batchCommitConfig,
+    captchas: captchaServeConfig
+  });
+}
+module.exports = getConfig;

package/dist/cjs/start.cjs

@@ -3,11 +3,13 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common = require("@prosopo/common");
 const env$1 = require("@prosopo/env");
 const process_env = require("./process.env.cjs");
+const contract = require("@prosopo/contract");
 const env = require("./env.cjs");
 const provider = require("@prosopo/provider");
 const cors = require("cors");
 const esMain = require("es-main");
 const express = require("express");
+const prosopo_config = require("./prosopo.config.cjs");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 let apiAppSrv;
 const handleErrors = (err, req, res, next) => {
@@ -38,12 +40,11 @@ function startApi(env2) {
 async function start(env$2) {
   if (!env$2) {
     env.loadEnv();
-    const ss58Format = process_env.getSs58Format();
-    const pairType = process_env.getPairType();
+    process_env.getDB();
     const secret = process_env.getSecret();
-    const config = process_env.getConfig();
-    const pair = await common.getPair(pairType, ss58Format, secret);
-    env$2 = new env$1.ProviderEnvironment(pair, config);
+    const config = prosopo_config();
+    const pair = await contract.getPairAsync(config.networks[config.defaultNetwork], secret, "");
+    env$2 = new env$1.ProviderEnvironment(config, pair);
   }
   await env$2.isReady();
   startApi(env$2);

package/dist/cli.js

@@ -11,27 +11,31 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { LogLevel, getLogger, getPair } from '@prosopo/common';
+import { LogLevel, getLogger } from '@prosopo/common';
 import { ProviderEnvironment } from '@prosopo/env';
-import { getConfig, getPairType, getSecret, getSs58Format } from './process.env.js';
+import { getPairAsync } from '@prosopo/contract';
+import { getSecret } from './process.env.js';
 import { loadEnv } from './env.js';
 import { processArgs } from './argv.js';
 import { start } from './start.js';
 import esMain from 'es-main';
+import getConfig from './prosopo.config.js';
 import process from 'process';
 const log = getLogger(LogLevel.enum.info, 'cli');
 async function main() {
     loadEnv();
     const secret = getSecret();
-    const ss58Format = getSs58Format();
-    const pairType = getPairType();
-    const config = getConfig();
-    const pair = await getPair(pairType, ss58Format, secret);
+    // quick fix to allow for new dataset structure that only has `{ solved: true }` captchas
+    const config = getConfig(undefined, undefined, undefined, {
+        solved: { count: 2 },
+        unsolved: { count: 0 },
+    });
+    const pair = await getPairAsync(config.networks[config.defaultNetwork], secret, '');
     log.info(`Pair address: ${pair.address}`);
     log.info(`Contract address: ${process.env.PROTOCOL_CONTRACT_ADDRESS}`);
     const processedArgs = await processArgs(process.argv, pair, config);
     if (processedArgs.api) {
-        const env = new ProviderEnvironment(pair, config);
+        const env = new ProviderEnvironment(config, pair);
         await env.isReady();
         log.info('Starting API');
         await start(env);

package/dist/cli.js.map

@@ -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,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AACnF,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,OAAO,MAAM,SAAS,CAAA;AAC7B,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAChD,KAAK,UAAU,IAAI;IACf,OAAO,EAAE,CAAA;IAET,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAClC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;IAC9B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;IAExD,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,IAAI,EAAE,MAAM,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"}
+{"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;AAC7B,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAChD,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"}

package/dist/commands/batchCommit.d.ts

@@ -1,8 +1,8 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
-import { ProsopoConfig } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfig, cmdArgs?: {
+import { ProsopoConfigOutput } from '@prosopo/types';
+declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => {
     command: string;

package/dist/commands/batchCommit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batchCommit.d.ts","sourceRoot":"","sources":["../../src/commands/batchCommit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA8B,MAAM,iBAAiB,CAAA;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;+BAIxB,WAAW,UAAU,aAAa,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAK9D,IAAI;;;oBAOC,kBAAkB;;;;;;;AAZhD,wBAmCC"}
+{"version":3,"file":"batchCommit.d.ts","sourceRoot":"","sources":["../../src/commands/batchCommit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA8B,MAAM,iBAAiB,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAI9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAKpE,IAAI;;;oBAOC,kBAAkB;;;;;;;AAZhD,wBAmCC"}

package/dist/commands/batchCommit.js

@@ -15,7 +15,7 @@ export default (pair, config, cmdArgs) => {
             });
         },
         handler: async (argv) => {
-            const env = new ProviderEnvironment(pair, config);
+            const env = new ProviderEnvironment(config, pair);
             await env.isReady();
             if (argv.schedule) {
                 throw new ProsopoEnvError('GENERAL.NOT_IMPLEMENTED');

package/dist/commands/batchCommit.js.map

@@ -1 +1 @@
-{"version":3,"file":"batchCommit.js","sourceRoot":"","sources":["../../src/commands/batchCommit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAExD,OAAO,EAAE,QAAQ,EAAU,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAA;AAE5D,eAAe,CAAC,IAAiB,EAAE,MAAqB,EAAE,OAA6B,EAAE,EAAE;IACvF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAA;IACnF,OAAO;QACH,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,yCAAkD;QAC5D,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE;YACrB,OAAO,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC5B,IAAI,EAAE,QAAiB;gBACvB,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,iCAAiC;aACjC,CAAC,CAAA;QACf,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;YACnB,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACf,MAAM,IAAI,eAAe,CAAC,yBAAyB,CAAC,CAAA;aACvD;iBAAM;gBACH,IAAI,GAAG,CAAC,EAAE,EAAE;oBACR,MAAM,cAAc,GAAG,IAAI,oBAAoB,CAC3C,GAAG,CAAC,MAAM,CAAC,WAAW,EACtB,GAAG,CAAC,oBAAoB,EAAE,EAC1B,GAAG,CAAC,EAAE,EACN,EAAE,EACF,GAAG,CAAC,MAAM,CACb,CAAA;oBACD,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,CAAA;oBACzC,MAAM,CAAC,IAAI,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAA;iBAClD;qBAAM;oBACH,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;iBACzC;aACJ;QACL,CAAC;QACD,WAAW,EAAE,CAAC,0BAA0B,CAAC;KAC5C,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"batchCommit.js","sourceRoot":"","sources":["../../src/commands/batchCommit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAExD,OAAO,EAAE,QAAQ,EAAU,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAA;AAE5D,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,kBAAkB,CAAC,CAAA;IACnF,OAAO;QACH,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,yCAAkD;QAC5D,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE;YACrB,OAAO,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC5B,IAAI,EAAE,QAAiB;gBACvB,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,iCAAiC;aACjC,CAAC,CAAA;QACf,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;YACnB,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACf,MAAM,IAAI,eAAe,CAAC,yBAAyB,CAAC,CAAA;aACvD;iBAAM;gBACH,IAAI,GAAG,CAAC,EAAE,EAAE;oBACR,MAAM,cAAc,GAAG,IAAI,oBAAoB,CAC3C,GAAG,CAAC,MAAM,CAAC,WAAW,EACtB,GAAG,CAAC,oBAAoB,EAAE,EAC1B,GAAG,CAAC,EAAE,EACN,EAAE,EACF,GAAG,CAAC,MAAM,CACb,CAAA;oBACD,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,CAAA;oBACzC,MAAM,CAAC,IAAI,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAA;iBAClD;qBAAM;oBACH,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;iBACzC;aACJ;QACL,CAAC;QACD,WAAW,EAAE,CAAC,0BAA0B,CAAC;KAC5C,CAAA;AACL,CAAC,CAAA"}

package/dist/commands/calculateCaptchaSolutions.d.ts

@@ -1,8 +1,8 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
-import { ProsopoConfig } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfig, cmdArgs?: {
+import { ProsopoConfigOutput } from '@prosopo/types';
+declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => {
     command: string;

package/dist/commands/calculateCaptchaSolutions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateCaptchaSolutions.d.ts","sourceRoot":"","sources":["../../src/commands/calculateCaptchaSolutions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA8B,MAAM,iBAAiB,CAAA;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;+BAIxB,WAAW,UAAU,aAAa,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAM9D,IAAI;;;oBAOC,kBAAkB;;;;;;;AAbhD,wBA0BC"}
+{"version":3,"file":"calculateCaptchaSolutions.d.ts","sourceRoot":"","sources":["../../src/commands/calculateCaptchaSolutions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA8B,MAAM,iBAAiB,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAI9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;oBAOC,kBAAkB;;;;;;;AAbhD,wBA0BC"}

package/dist/commands/calculateCaptchaSolutions.js

@@ -15,7 +15,7 @@ export default (pair, config, cmdArgs) => {
             });
         },
         handler: async (argv) => {
-            const env = new ProviderEnvironment(pair, config);
+            const env = new ProviderEnvironment(config, pair);
             await env.isReady();
             if (argv.schedule) {
                 throw new ProsopoEnvError('GENERAL.NOT_IMPLEMENTED');

package/dist/commands/calculateCaptchaSolutions.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculateCaptchaSolutions.js","sourceRoot":"","sources":["../../src/commands/calculateCaptchaSolutions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAE,QAAQ,EAAU,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAA;AAE5D,eAAe,CAAC,IAAiB,EAAE,MAAqB,EAAE,OAA6B,EAAE,EAAE;IACvF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,iCAAiC,CAAC,CAAA;IAElG,OAAO;QACH,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,6BAA6B;QACvC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE;YACrB,OAAO,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC5B,IAAI,EAAE,QAAiB;gBACvB,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,iCAAiC;aACjC,CAAC,CAAA;QACf,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;YACnB,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACf,MAAM,IAAI,eAAe,CAAC,yBAAyB,CAAC,CAAA;aACvD;iBAAM;gBACH,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,CAAC,GAAG,CAAC,CAAA;gBAC9D,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,GAAG,EAAE,CAAA;gBACjD,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,oBAAoB,CAAC,CAAA;aACrD;QACL,CAAC;QACD,WAAW,EAAE,CAAC,0BAA0B,CAAC;KAC5C,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"calculateCaptchaSolutions.js","sourceRoot":"","sources":["../../src/commands/calculateCaptchaSolutions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAE,QAAQ,EAAU,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAA;AAE5D,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,iCAAiC,CAAC,CAAA;IAElG,OAAO;QACH,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,6BAA6B;QACvC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE;YACrB,OAAO,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC5B,IAAI,EAAE,QAAiB;gBACvB,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,iCAAiC;aACjC,CAAC,CAAA;QACf,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;YACnB,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACf,MAAM,IAAI,eAAe,CAAC,yBAAyB,CAAC,CAAA;aACvD;iBAAM;gBACH,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,CAAC,GAAG,CAAC,CAAA;gBAC9D,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,GAAG,EAAE,CAAA;gBACjD,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,oBAAoB,CAAC,CAAA;aACrD;QACL,CAAC;QACD,WAAW,EAAE,CAAC,0BAA0B,CAAC;KAC5C,CAAA;AACL,CAAC,CAAA"}

package/dist/commands/dappAccounts.d.ts

@@ -1,8 +1,8 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
-import { ProsopoConfig } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfig, cmdArgs?: {
+import { ProsopoConfigOutput } from '@prosopo/types';
+declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => {
     command: string;

package/dist/commands/dappAccounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dappAccounts.d.ts","sourceRoot":"","sources":["../../src/commands/dappAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;+BAIxB,WAAW,UAAU,aAAa,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAM9D,IAAI;oBACC,kBAAkB;;;AAPhD,wBAsBC"}
+{"version":3,"file":"dappAccounts.d.ts","sourceRoot":"","sources":["../../src/commands/dappAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAI9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;oBACC,kBAAkB;;;AAPhD,wBAsBC"}

package/dist/commands/dappAccounts.js

@@ -9,7 +9,7 @@ export default (pair, config, cmdArgs) => {
         builder: (yargs) => yargs,
         handler: async (argv) => {
             try {
-                const env = new ProviderEnvironment(pair, config);
+                const env = new ProviderEnvironment(config, pair);
                 await env.isReady();
                 const tasks = new Tasks(env);
                 const result = await tasks.contract.contract['dappAccounts']();

package/dist/commands/dappAccounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"dappAccounts.js","sourceRoot":"","sources":["../../src/commands/dappAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,eAAe,CAAC,IAAiB,EAAE,MAAqB,EAAE,OAA6B,EAAE,EAAE;IACvF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAA;IAEpF,OAAO;QACH,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,wBAAwB;QAClC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK;QAC/B,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAEjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,MAAM,MAAM,GAAG,MAAO,KAAK,CAAC,QAAQ,CAAC,QAAgB,CAAC,cAAc,CAAC,EAAE,CAAA;gBAEvE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;QACD,WAAW,EAAE,EAAE;KAClB,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"dappAccounts.js","sourceRoot":"","sources":["../../src/commands/dappAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,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,mBAAmB,CAAC,CAAA;IAEpF,OAAO;QACH,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,wBAAwB;QAClC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK;QAC/B,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBAEjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,MAAM,MAAM,GAAG,MAAO,KAAK,CAAC,QAAQ,CAAC,QAAgB,CAAC,cAAc,CAAC,EAAE,CAAA;gBAEvE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;QACD,WAAW,EAAE,EAAE;KAClB,CAAA;AACL,CAAC,CAAA"}

package/dist/commands/dappDetails.d.ts

@@ -1,8 +1,8 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
-import { ProsopoConfig } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfig, cmdArgs?: {
+import { ProsopoConfigOutput } from '@prosopo/types';
+declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => {
     command: string;

package/dist/commands/dappDetails.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dappDetails.d.ts","sourceRoot":"","sources":["../../src/commands/dappDetails.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;+BAKxB,WAAW,UAAU,aAAa,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAM9D,IAAI;;;oBAMC,kBAAkB;;;;;AAZhD,wBA4BC"}
+{"version":3,"file":"dappDetails.d.ts","sourceRoot":"","sources":["../../src/commands/dappDetails.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAK9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;oBAMC,kBAAkB;;;;;AAZhD,wBA4BC"}

package/dist/commands/dappDetails.js

@@ -14,7 +14,7 @@ export default (pair, config, cmdArgs) => {
         }),
         handler: async (argv) => {
             try {
-                const env = new ProviderEnvironment(pair, config);
+                const env = new ProviderEnvironment(config, pair);
                 await env.isReady();
                 const tasks = new Tasks(env);
                 const result = (await tasks.contract.query.getDapp(validateAddress(argv).address)).value

package/dist/commands/dappDetails.js.map

@@ -1 +1 @@
-{"version":3,"file":"dappDetails.js","sourceRoot":"","sources":["../../src/commands/dappDetails.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,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,MAAqB,EAAE,OAA6B,EAAE,EAAE;IACvF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAA;IAEnF,OAAO;QACH,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,+BAA+B;QACzC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE;YACpB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,2BAA2B;SAC3B,CAAC;QACf,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;qBACnF,MAAM,EAAE;qBACR,MAAM,EAAE,CAAA;gBAEb,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;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"}
+{"version":3,"file":"dappDetails.js","sourceRoot":"","sources":["../../src/commands/dappDetails.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,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,kBAAkB,CAAC,CAAA;IAEnF,OAAO;QACH,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,+BAA+B;QACzC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE;YACpB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,2BAA2B;SAC3B,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;gBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;qBACnF,MAAM,EAAE;qBACR,MAAM,EAAE,CAAA;gBAEb,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;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/commands/dappRegister.d.ts

@@ -1,8 +1,8 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
-import { ProsopoConfig } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfig, cmdArgs?: {
+import { ProsopoConfigOutput } from '@prosopo/types';
+declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => {
     command: string;

package/dist/commands/dappRegister.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dappRegister.d.ts","sourceRoot":"","sources":["../../src/commands/dappRegister.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;+BAQxB,WAAW,UAAU,aAAa,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAM9D,IAAI;;;;;oBAYC,kBAAkB;;;;;;;AAlBhD,wBAwCC"}
+{"version":3,"file":"dappRegister.d.ts","sourceRoot":"","sources":["../../src/commands/dappRegister.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAQ9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;;;oBAYC,kBAAkB;;;;;;;AAlBhD,wBAwCC"}

package/dist/commands/dappRegister.js

@@ -24,7 +24,7 @@ export default (pair, config, cmdArgs) => {
         }),
         handler: async (argv) => {
             try {
-                const env = new ProviderEnvironment(pair, config);
+                const env = new ProviderEnvironment(config, pair);
                 await env.isReady();
                 const tasks = new Tasks(env);
                 const dappRegisterArgs = [

package/dist/commands/dappRegister.js.map

@@ -1 +1 @@
-{"version":3,"file":"dappRegister.js","sourceRoot":"","sources":["../../src/commands/dappRegister.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAe,CAAC,IAAiB,EAAE,MAAqB,EAAE,OAA6B,EAAE,EAAE;IACvF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAA;IAEpF,OAAO;QACH,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK;aACA,MAAM,CAAC,UAAU,EAAE;YAChB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,2BAA2B;SAC3B,CAAC;aACV,MAAM,CAAC,OAAO,EAAE;YACb,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,wDAAwD;SACxD,CAAC;QACnB,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,MAAM,gBAAgB,GAAyD;oBAC3E,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAC/B,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC5C;wBACI,KAAK,EAAE,CAAC;qBACX;iBACJ,CAAA;gBACD,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAA;gBAC7F,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,gBAAgB,CAAC,CAAA;gBAExE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;QACD,WAAW,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC;KACjD,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"dappRegister.js","sourceRoot":"","sources":["../../src/commands/dappRegister.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,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,mBAAmB,CAAC,CAAA;IAEpF,OAAO;QACH,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK;aACA,MAAM,CAAC,UAAU,EAAE;YAChB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,2BAA2B;SAC3B,CAAC;aACV,MAAM,CAAC,OAAO,EAAE;YACb,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,wDAAwD;SACxD,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,MAAM,gBAAgB,GAAyD;oBAC3E,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAC/B,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC5C;wBACI,KAAK,EAAE,CAAC;qBACX;iBACJ,CAAA;gBACD,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAA;gBAC7F,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,gBAAgB,CAAC,CAAA;gBAExE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;QACD,WAAW,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC;KACjD,CAAA;AACL,CAAC,CAAA"}

package/dist/commands/dappUpdate.d.ts

@@ -1,8 +1,8 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
-import { ProsopoConfig } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfig, cmdArgs?: {
+import { ProsopoConfigOutput } from '@prosopo/types';
+declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => {
     command: string;

package/dist/commands/dappUpdate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dappUpdate.d.ts","sourceRoot":"","sources":["../../src/commands/dappUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;+BAQxB,WAAW,UAAU,aAAa,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAM9D,IAAI;;;;;oBAYC,kBAAkB;;;;;;;AAlBhD,wBA0CC"}
+{"version":3,"file":"dappUpdate.d.ts","sourceRoot":"","sources":["../../src/commands/dappUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAQ9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;;;oBAYC,kBAAkB;;;;;;;AAlBhD,wBA0CC"}

package/dist/commands/dappUpdate.js

@@ -24,7 +24,7 @@ export default (pair, config, cmdArgs) => {
         }),
         handler: async (argv) => {
             try {
-                const env = new ProviderEnvironment(pair, config);
+                const env = new ProviderEnvironment(config, pair);
                 await env.isReady();
                 const tasks = new Tasks(env);
                 const stakeThreshold = (await tasks.contract.query.getDappStakeThreshold({})).value.unwrap();

package/dist/commands/dappUpdate.js.map

@@ -1 +1 @@
-{"version":3,"file":"dappUpdate.js","sourceRoot":"","sources":["../../src/commands/dappUpdate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAe,CAAC,IAAiB,EAAE,MAAqB,EAAE,OAA6B,EAAE,EAAE;IACvF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;IAElF,OAAO;QACH,OAAO,EAAE,aAAa;QACtB,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK;aACA,MAAM,CAAC,UAAU,EAAE;YAChB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,2BAA2B;SAC3B,CAAC;aACV,MAAM,CAAC,OAAO,EAAE;YACb,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,wDAAwD;SACxD,CAAC;QACnB,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,MAAM,cAAc,GAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAA;gBAC5F,MAAM,gBAAgB,GAAuD;oBACzE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAC/B,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC5C,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;oBAC5B;wBACI,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE;qBACnC;iBACJ,CAAA;gBACD,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAA;gBAC3F,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,gBAAgB,CAAC,CAAA;gBAEtE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;QACD,WAAW,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC;KACjD,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"dappUpdate.js","sourceRoot":"","sources":["../../src/commands/dappUpdate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,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,iBAAiB,CAAC,CAAA;IAElF,OAAO;QACH,OAAO,EAAE,aAAa;QACtB,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACrB,KAAK;aACA,MAAM,CAAC,UAAU,EAAE;YAChB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,2BAA2B;SAC3B,CAAC;aACV,MAAM,CAAC,OAAO,EAAE;YACb,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,wDAAwD;SACxD,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,MAAM,cAAc,GAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAA;gBAC5F,MAAM,gBAAgB,GAAuD;oBACzE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAC/B,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC5C,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;oBAC5B;wBACI,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE;qBACnC;iBACJ,CAAA;gBACD,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAA;gBAC3F,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,gBAAgB,CAAC,CAAA;gBAEtE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;QACD,WAAW,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC;KACjD,CAAA;AACL,CAAC,CAAA"}

package/dist/commands/providerAccounts.d.ts

@@ -1,8 +1,8 @@
 import { CommandModule } from 'yargs';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
-import { ProsopoConfig } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfig, cmdArgs?: {
+import { ProsopoConfigOutput } from '@prosopo/types';
+declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => CommandModule;
 export default _default;

package/dist/commands/providerAccounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providerAccounts.d.ts","sourceRoot":"","sources":["../../src/commands/providerAccounts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;+BAIxB,WAAW,UAAU,aAAa,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,aAAa;AAAvG,wBAmBC"}
+{"version":3,"file":"providerAccounts.d.ts","sourceRoot":"","sources":["../../src/commands/providerAccounts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAI9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,aAAa;AAA7G,wBAmBC"}

package/dist/commands/providerAccounts.js

@@ -9,7 +9,7 @@ export default (pair, config, cmdArgs) => {
         builder: (yargs) => yargs,
         handler: async (argv) => {
             try {
-                const env = new ProviderEnvironment(pair, config);
+                const env = new ProviderEnvironment(config, pair);
                 await env.isReady();
                 const tasks = new Tasks(env);
                 const result = await tasks.contract.contract['providerAccounts']();

package/dist/commands/providerAccounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"providerAccounts.js","sourceRoot":"","sources":["../../src/commands/providerAccounts.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,eAAe,CAAC,IAAiB,EAAE,MAAqB,EAAE,OAA6B,EAAiB,EAAE;IACtG,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;IAExF,OAAO;QACH,OAAO,EAAE,mBAAmB;QAC5B,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK;QAC/B,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,MAAM,MAAM,GAAG,MAAO,KAAK,CAAC,QAAQ,CAAC,QAAgB,CAAC,kBAAkB,CAAC,EAAE,CAAA;gBAC3E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"providerAccounts.js","sourceRoot":"","sources":["../../src/commands/providerAccounts.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAiB,EAAE;IAC5G,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;IAExF,OAAO;QACH,OAAO,EAAE,mBAAmB;QAC5B,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK;QAC/B,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,MAAM,MAAM,GAAG,MAAO,KAAK,CAAC,QAAQ,CAAC,QAAgB,CAAC,kBAAkB,CAAC,EAAE,CAAA;gBAC3E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}

package/dist/commands/providerDataset.d.ts

@@ -1,8 +1,8 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
-import { ProsopoConfig } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfig, cmdArgs?: {
+import { ProsopoConfigOutput } from '@prosopo/types';
+declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => {
     command: string;

package/dist/commands/providerDataset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providerDataset.d.ts","sourceRoot":"","sources":["../../src/commands/providerDataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;+BAMxB,WAAW,UAAU,aAAa,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAK9D,IAAI;;;;;oBAYC,kBAAkB;;AAjBhD,wBAsCC"}
+{"version":3,"file":"providerDataset.d.ts","sourceRoot":"","sources":["../../src/commands/providerDataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA8B,MAAM,iBAAiB,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAM9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAKpE,IAAI;;;;;oBAYC,kBAAkB;;AAjBhD,wBAyCC"}

package/dist/commands/providerDataset.js

@@ -1,4 +1,4 @@
-import { LogLevel, getLogger } from '@prosopo/common';
+import { LogLevel, ProsopoEnvError, getLogger } from '@prosopo/common';
 import { ProviderEnvironment } from '@prosopo/env';
 import { Tasks } from '@prosopo/provider';
 import { writeJSONFile } from '../files.js';
@@ -21,10 +21,13 @@ export default (pair, config, cmdArgs) => {
         }),
         handler: async (argv) => {
             try {
-                const env = new ProviderEnvironment(pair, config);
+                const env = new ProviderEnvironment(config, pair);
                 await env.isReady();
                 const tasks = new Tasks(env);
                 let datasetId = z.string().parse(argv.datasetId);
+                if (!env.config.account.address) {
+                    throw new ProsopoEnvError('GENERAL.ACCOUNT_NOT_FOUND');
+                }
                 if (datasetId === undefined) {
                     const providerAddress = env.config.account.address;
                     const provider = (await tasks.contract.query.getProvider(providerAddress)).value.unwrap().unwrap();

package/dist/commands/providerDataset.js.map

@@ -1 +1 @@
-{"version":3,"file":"providerDataset.js","sourceRoot":"","sources":["../../src/commands/providerDataset.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAe,CAAC,IAAiB,EAAE,MAAqB,EAAE,OAA6B,EAAE,EAAE;IACvF,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,IAAI,EAAE,MAAM,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,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAChD,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"}
+{"version":3,"file":"providerDataset.js","sourceRoot":"","sources":["../../src/commands/providerDataset.ts"],"names":[],"mappings":"AAEA,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;AAC3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,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,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAChD,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"}

package/dist/commands/providerDeregister.d.ts

@@ -1,8 +1,8 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
-import { ProsopoConfig } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfig, cmdArgs?: {
+import { ProsopoConfigOutput } from '@prosopo/types';
+declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;
 }) => {
     command: string;

package/dist/commands/providerDeregister.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providerDeregister.d.ts","sourceRoot":"","sources":["../../src/commands/providerDeregister.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;+BAMxB,WAAW,UAAU,aAAa,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAM9D,IAAI;;;oBAMC,kBAAkB;;;;;AAZhD,wBA8BC"}
+{"version":3,"file":"providerDeregister.d.ts","sourceRoot":"","sources":["../../src/commands/providerDeregister.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAM9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;oBAMC,kBAAkB;;;;;AAZhD,wBA8BC"}

package/dist/commands/providerDeregister.js

@@ -15,7 +15,7 @@ export default (pair, config, cmdArgs) => {
         }),
         handler: async (argv) => {
             try {
-                const env = new ProviderEnvironment(pair, config);
+                const env = new ProviderEnvironment(config, pair);
                 await env.isReady();
                 const tasks = new Tasks(env);
                 // TODO provider deregister does not accept params... it should?