@prosopo/cli 0.2.13 → 0.2.15

package/dist/cjs/cli.cjs

@@ -3,14 +3,13 @@ const common = require("@prosopo/common");
 const env$1 = require("@prosopo/env");
 const contract = require("@prosopo/contract");
 const process_env = require("./process.env.cjs");
+const util = require("@prosopo/util");
 const env = require("./env.cjs");
 const argv = require("./argv.cjs");
 const start = require("./start.cjs");
-const esMain = require("es-main");
 const prosopo_config = require("./prosopo.config.cjs");
 const process = require("process");
-var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
-const log = common.getLogger(common.LogLevel.enum.info, "cli");
+const log = common.getLogger(common.LogLevel.enum.info, "CLI");
 async function main() {
   env.loadEnv();
   const secret = process_env.getSecret();
@@ -20,7 +19,7 @@ async function main() {
   });
   const pair = await contract.getPairAsync(config.networks[config.defaultNetwork], secret, "");
   log.info(`Pair address: ${pair.address}`);
-  log.info(`Contract address: ${process.env.PROTOCOL_CONTRACT_ADDRESS}`);
+  log.info(`Contract address: ${process.env.PROSOPO_CONTRACT_ADDRESS}`);
   const processedArgs = await argv.processArgs(process.argv, pair, config);
   if (processedArgs.api) {
     const env2 = new env$1.ProviderEnvironment(config, pair);
@@ -31,7 +30,7 @@ async function main() {
     process.exit(0);
   }
 }
-if (esMain({ url: typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.src || new URL("cli.cjs", document.baseURI).href })) {
+if (util.isMain(module, "provider")) {
   main().then(() => {
     log.info("Running main process...");
   }).catch((error) => {

package/dist/cjs/commands/dappRegister.cjs

@@ -1,13 +1,29 @@
 "use strict";
-require("../contracts/captcha/dist/index.cjs");
+const z = require("zod");
+const typesReturns = require("@prosopo/captcha-contract/types-returns");
 const common = require("@prosopo/common");
 const env = require("@prosopo/env");
 const provider = require("@prosopo/provider");
 const util = require("@prosopo/util");
 const validators = require("./validators.cjs");
 const contract = require("@prosopo/contract");
-const z = require("zod");
-const captcha = require("../contracts/captcha/dist/types-arguments/captcha.cjs");
+function _interopNamespaceDefault(e) {
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
 const commandDappRegister = (pair, config, cmdArgs) => {
   const logger = (cmdArgs == null ? void 0 : cmdArgs.logger) || common.getLogger(common.LogLevel.enum.info, "cli.dapp_register");
   return {
@@ -28,8 +44,8 @@ const commandDappRegister = (pair, config, cmdArgs) => {
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
         const dappRegisterArgs = [
-          z.z.string().parse(argv.contract),
-          util.get(captcha.DappPayee, z.z.string().parse(argv.payee)),
+          z__namespace.string().parse(argv.contract),
+          util.get(typesReturns.DappPayee, z__namespace.string().parse(argv.payee)),
           {
             value: 0
           }

package/dist/cjs/commands/dappUpdate.cjs

@@ -1,13 +1,29 @@
 "use strict";
-require("../contracts/captcha/dist/index.cjs");
+const z = require("zod");
+const typesReturns = require("@prosopo/captcha-contract/types-returns");
 const common = require("@prosopo/common");
 const env = require("@prosopo/env");
 const provider = require("@prosopo/provider");
 const util = require("@prosopo/util");
 const validators = require("./validators.cjs");
 const contract = require("@prosopo/contract");
-const z = require("zod");
-const captcha = require("../contracts/captcha/dist/types-arguments/captcha.cjs");
+function _interopNamespaceDefault(e) {
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
 const commandDappUpdate = (pair, config, cmdArgs) => {
   const logger = (cmdArgs == null ? void 0 : cmdArgs.logger) || common.getLogger(common.LogLevel.enum.info, "cli.dapp_update");
   return {
@@ -29,9 +45,9 @@ const commandDappUpdate = (pair, config, cmdArgs) => {
         const tasks = new provider.Tasks(env$1);
         const stakeThreshold = (await tasks.contract.query.getDappStakeThreshold({})).value.unwrap();
         const dappRegisterArgs = [
-          z.z.string().parse(argv.contract),
-          util.get(captcha.DappPayee, z.z.string().parse(argv.payee)),
-          z.z.string().parse(argv.owner),
+          z__namespace.string().parse(argv.contract),
+          util.get(typesReturns.DappPayee, z__namespace.string().parse(argv.payee)),
+          z__namespace.string().parse(argv.owner),
           {
             value: stakeThreshold.toNumber()
           }

package/dist/cjs/commands/providerDataset.cjs

@@ -1,9 +1,26 @@
 "use strict";
+const z = require("zod");
 const common = require("@prosopo/common");
 const env = require("@prosopo/env");
 const provider = require("@prosopo/provider");
 const files = require("../files.cjs");
-const z = require("zod");
+function _interopNamespaceDefault(e) {
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
 const commandProviderDataset = (pair, config, cmdArgs) => {
   const logger = (cmdArgs == null ? void 0 : cmdArgs.logger) || common.getLogger(common.LogLevel.enum.info, "cli.provider_dataset");
   return {
@@ -23,7 +40,7 @@ const commandProviderDataset = (pair, config, cmdArgs) => {
         const env$1 = new env.ProviderEnvironment(config, pair);
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
-        let datasetId = z.z.string().parse(argv.datasetId);
+        let datasetId = z__namespace.string().optional().parse(argv.datasetId);
         if (!env$1.config.account.address) {
           throw new common.ProsopoEnvError("GENERAL.ACCOUNT_NOT_FOUND");
         }
@@ -34,7 +51,7 @@ const commandProviderDataset = (pair, config, cmdArgs) => {
           datasetId = provider2.datasetId.toString();
         }
         const result = await tasks.getProviderDataset(datasetId);
-        await files.writeJSONFile(z.z.string().parse(argv.file), result);
+        await files.writeJSONFile(z__namespace.string().parse(argv.file), result);
       } catch (err) {
         logger.error(err);
       }

package/dist/cjs/commands/providerDetails.cjs

@@ -1,9 +1,26 @@
 "use strict";
+const z = require("zod");
 const common = require("@prosopo/common");
 const env = require("@prosopo/env");
 const provider = require("@prosopo/provider");
 const validators = require("./validators.cjs");
-const z = require("zod");
+function _interopNamespaceDefault(e) {
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
 const commandProviderDetails = (pair, config, cmdArgs) => {
   const logger = (cmdArgs == null ? void 0 : cmdArgs.logger) || common.getLogger(common.LogLevel.enum.info, "cli.provider_details");
   return {
@@ -19,7 +36,7 @@ const commandProviderDetails = (pair, config, cmdArgs) => {
         const env$1 = new env.ProviderEnvironment(config, pair);
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
-        const result = (await tasks.contract.query.getProvider(z.z.string().parse(argv.address), {})).value.unwrap().unwrap();
+        const result = (await tasks.contract.query.getProvider(z__namespace.string().parse(argv.address), {})).value.unwrap().unwrap();
         logger.info(JSON.stringify(result, null, 2));
       } catch (err) {
         logger.error(err);

package/dist/cjs/commands/providerRegister.cjs

@@ -1,13 +1,12 @@
 "use strict";
 const z = require("zod");
 const common = require("@prosopo/common");
-require("../contracts/captcha/dist/index.cjs");
+const typesReturns = require("@prosopo/captcha-contract/types-returns");
 const env = require("@prosopo/env");
 const provider = require("@prosopo/provider");
-const util = require("@polkadot/util");
+const string = require("@polkadot/util/string");
 const validators = require("./validators.cjs");
 const contract = require("@prosopo/contract");
-const captcha = require("../contracts/captcha/dist/types-arguments/captcha.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -28,7 +27,7 @@ const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
 const providerRegisterArgsParser = z__namespace.object({
   url: z__namespace.string(),
   fee: z__namespace.number(),
-  payee: z__namespace.nativeEnum(captcha.Payee)
+  payee: z__namespace.nativeEnum(typesReturns.Payee)
 });
 const commandProviderRegister = (pair, config, cmdArgs) => {
   const logger = (cmdArgs == null ? void 0 : cmdArgs.logger) || common.getLogger(common.LogLevel.enum.info, "cli.provider_register");
@@ -55,7 +54,7 @@ const commandProviderRegister = (pair, config, cmdArgs) => {
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
         const providerRegisterArgs = [
-          Array.from(util.stringToU8a(parsedArgs.url)),
+          Array.from(string.stringToU8a(parsedArgs.url)),
           parsedArgs.fee,
           parsedArgs.payee,
           {

package/dist/cjs/commands/providerSetDataset.cjs

@@ -1,9 +1,26 @@
 "use strict";
+const z = require("zod");
 const common = require("@prosopo/common");
 const env = require("@prosopo/env");
 const provider = require("@prosopo/provider");
 const files = require("../files.cjs");
-const z = require("zod");
+function _interopNamespaceDefault(e) {
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
 const commandProviderSetDataset = (pair, config, cmdArgs) => {
   const logger = (cmdArgs == null ? void 0 : cmdArgs.logger) || common.getLogger(common.LogLevel.enum.info, "cli.provider_set_data_set");
   return {
@@ -19,7 +36,7 @@ const commandProviderSetDataset = (pair, config, cmdArgs) => {
         const env$1 = new env.ProviderEnvironment(config, pair);
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
-        const file = z.z.string().parse(argv.file);
+        const file = z__namespace.string().parse(argv.file);
         const jsonFile = files.loadJSONFile(file);
         logger.info(`Loaded JSON from ${file}`);
         const result = await tasks.providerSetDatasetFromFile(jsonFile);

package/dist/cjs/commands/providerUpdate.cjs

@@ -1,12 +1,28 @@
 "use strict";
+const z = require("zod");
 const common = require("@prosopo/common");
-require("../contracts/captcha/dist/index.cjs");
+const typesReturns = require("@prosopo/captcha-contract/types-returns");
 const env = require("@prosopo/env");
 const provider = require("@prosopo/provider");
 const validators = require("./validators.cjs");
 const contract = require("@prosopo/contract");
-const z = require("zod");
-const captcha = require("../contracts/captcha/dist/types-arguments/captcha.cjs");
+function _interopNamespaceDefault(e) {
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
 const commandProviderUpdate = (pair, config, cmdArgs) => {
   const logger = (cmdArgs == null ? void 0 : cmdArgs.logger) || common.getLogger(common.LogLevel.enum.info, "cli.provider_update");
   return {
@@ -34,12 +50,12 @@ const commandProviderUpdate = (pair, config, cmdArgs) => {
         const env$1 = new env.ProviderEnvironment(config, pair);
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
-        const { url, fee, payee, value, address } = z.z.object({
-          url: z.z.string().optional(),
-          fee: z.z.number().optional(),
-          payee: z.z.nativeEnum(captcha.Payee).optional(),
-          value: z.z.number().optional(),
-          address: z.z.string()
+        const { url, fee, payee, value, address } = z__namespace.object({
+          url: z__namespace.string().optional(),
+          fee: z__namespace.number().optional(),
+          payee: z__namespace.nativeEnum(typesReturns.Payee).optional(),
+          value: z__namespace.number().optional(),
+          address: z__namespace.string()
         }).parse(argv);
         const provider$1 = (await tasks.contract.query.getProvider(address, {})).value.unwrap().unwrap();
         if (provider$1 && (url || fee || payee || value)) {

package/dist/cjs/commands/validators.cjs

@@ -1,11 +1,28 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const z = require("zod");
 const types = require("@prosopo/types");
 const common = require("@prosopo/common");
 const provider = require("@prosopo/provider");
-const util = require("@prosopo/util");
-const z = require("zod");
+const lodash = require("@prosopo/util/lodash");
 const parser = require("cron-parser");
+function _interopNamespaceDefault(e) {
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
 const validateAddress = (argv) => {
   const address = provider.encodeStringAddress(argv.address);
   return { address };
@@ -18,8 +35,8 @@ const validatePayee = (argv) => {
   try {
     if (!argv.payee)
       return;
-    const _ = util.lodash();
-    const payeeArg = _.capitalize(z.z.string().parse(argv.payee));
+    const _ = lodash.lodash();
+    const payeeArg = _.capitalize(z__namespace.string().parse(argv.payee));
     const payee = types.PayeeSchema.parse(payeeArg);
     return { payee };
   } catch (error) {

package/dist/cjs/env.cjs

@@ -4,10 +4,9 @@ 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 __filename$1 = url.fileURLToPath(module);
 const __dirname$1 = path.dirname(__filename$1);
-const logger = common.getLogger(process.env.LOG_LEVEL || common.LogLevel.enum.info, "env");
+const logger = common.getLogger(process.env.PROSOPO_LOG_LEVEL || common.LogLevel.enum.info, "env");
 function getEnv() {
   if (process.env.NODE_ENV) {
     return process.env.NODE_ENV.replace(/\W/g, "");

package/dist/cjs/process.env.cjs

@@ -5,7 +5,7 @@ function getSs58Format() {
   return parseInt(process.env.SS58_FORMAT || "") || 42;
 }
 function getPairType() {
-  return process.env.PAIR_TYPE || "sr25519";
+  return process.env.PROSOPO_PAIR_TYPE || "sr25519";
 }
 function getSecret(who) {
   if (!who) {
@@ -13,17 +13,17 @@ function getSecret(who) {
   } else {
     who = who.toUpperCase();
   }
-  const secret = process.env[`${who}_MNEMONIC`] || process.env[`${who}_SEED`] || process.env[`${who}_URI`] || process.env[`${who}_JSON`];
+  const secret = process.env[`PROSOPO_${who}_MNEMONIC`] || process.env[`PROSOPO_${who}_SEED`] || process.env[`PROSOPO_${who}_URI`] || process.env[`PROSOPO_${who}_JSON`];
   if (!secret) {
     throw new common.ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED");
   }
   return secret;
 }
 function getDB() {
-  if (!process.env.DATABASE_HOST) {
+  if (!process.env.PROSOPO_DATABASE_HOST) {
     throw new common.ProsopoEnvError("DATABASE.DATABASE_HOST_UNDEFINED");
   }
-  return process.env.DATABASE_HOST;
+  return process.env.PROSOPO_DATABASE_HOST;
 }
 exports.getDB = getDB;
 exports.getPairType = getPairType;

package/dist/cjs/prosopo.config.cjs

@@ -3,36 +3,36 @@ 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 protocol = process.env.PROSOPO_DATABASE_PROTOCOL || "mongodb";
   const mongoSrv = protocol === "mongodb+srv";
-  const password = process.env.DATABASE_PASSWORD || "";
-  const username = process.env.DATABASE_USERNAME || "";
-  const host = process.env.DATABASE_HOST || "localhost";
-  const port = mongoSrv ? "" : `:${process.env.DATABASE_PORT ? process.env.DATABASE_PORT : 27017}`;
+  const password = process.env.PROSOPO_DATABASE_PASSWORD || "";
+  const username = process.env.PROSOPO_DATABASE_USERNAME || "";
+  const host = process.env.PROSOPO_DATABASE_HOST || "localhost";
+  const port = mongoSrv ? "" : `:${process.env.PROSOPO_DATABASE_PORT ? process.env.PROSOPO_DATABASE_PORT : 27017}`;
   const retries = mongoSrv ? "?retryWrites=true&w=majority" : "";
   return `${protocol}://${username}:${password}@${host}${port}/${retries}`;
 }
 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,
+    defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT ? types.EnvironmentTypesSchema.parse(process.env.PROSOPO_DEFAULT_ENVIRONMENT) : types.EnvironmentTypesSchema.enum.development,
+    defaultNetwork: process.env.PROSOPO_DEFAULT_NETWORK ? types.NetworkNamesSchema.parse(process.env.PROSOPO_DEFAULT_NETWORK) : types.NetworkNamesSchema.enum.development,
     account: {
-      address: process.env.PROVIDER_ADDRESS || void 0,
-      password: process.env.PROVIDER_ACCOUNT_PASSWORD || void 0,
+      address: process.env.PROSOPO_PROVIDER_ADDRESS || void 0,
+      password: process.env.PROSOPO_PROVIDER_ACCOUNT_PASSWORD || void 0,
       secret: process_env.getSecret()
     },
     database: {
       development: {
         type: types.DatabaseTypes.enum.mongo,
         endpoint: getMongoURI(),
-        dbname: process.env.DATABASE_NAME || "",
+        dbname: process.env.PROSOPO_DATABASE_NAME || "",
         authSource: "admin"
       }
     },
     server: {
-      baseURL: process.env.API_BASE_URL || "http://localhost",
-      port: process.env.API_PORT ? parseInt(process.env.API_PORT) : 9229
+      baseURL: process.env.PROSOPO_API_BASE_URL || "http://localhost",
+      port: process.env.PROSOPO_API_PORT ? parseInt(process.env.PROSOPO_API_PORT) : 9229
     },
     networks: networksConfig,
     captchaSolutions: captchaSolutionsConfig,

package/dist/cjs/start.cjs

@@ -4,21 +4,21 @@ const common = require("@prosopo/common");
 const env$1 = require("@prosopo/env");
 const process_env = require("./process.env.cjs");
 const contract = require("@prosopo/contract");
+const util = require("@prosopo/util");
 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;
-const handleErrors = (err, req, res) => {
+const handleErrors = (err, request, response, next) => {
+  const code = "code" in err ? err.code : 400;
   let message = err.message;
   try {
     message = JSON.parse(err.message);
   } catch {
     console.debug("Invalid JSON error message");
   }
-  return res.status(err.code).json({
+  return response.status(code).json({
     message,
     name: err.name
   });
@@ -41,14 +41,17 @@ async function start(env$2) {
     env.loadEnv();
     process_env.getDB();
     const secret = process_env.getSecret();
-    const config = prosopo_config();
+    const config = prosopo_config(void 0, void 0, void 0, {
+      solved: { count: 2 },
+      unsolved: { count: 0 }
+    });
     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);
 }
-if (esMain({ url: typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.src || new URL("start.cjs", document.baseURI).href })) {
+if (util.isMain(module, "provider")) {
   start().catch((error) => {
     console.error(error);
   });

package/dist/cli.js

@@ -1,38 +1,24 @@
-// Copyright 2021-2022 Prosopo (UK) Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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 } from '@prosopo/common';
 import { ProviderEnvironment } from '@prosopo/env';
 import { getPairAsync } from '@prosopo/contract';
 import { getSecret } from './process.env.js';
+import { isMain } from '@prosopo/util';
 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');
+const log = getLogger(LogLevel.enum.info, 'CLI');
 async function main() {
     loadEnv();
     const secret = getSecret();
-    // 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}`);
+    log.info(`Contract address: ${process.env.PROSOPO_CONTRACT_ADDRESS}`);
     const processedArgs = await processArgs(process.argv, pair, config);
     if (processedArgs.api) {
         const env = new ProviderEnvironment(config, pair);
@@ -44,8 +30,7 @@ async function main() {
         process.exit(0);
     }
 }
-//if main process
-if (esMain(import.meta)) {
+if (isMain(import.meta.url, 'provider')) {
     main()
         .then(() => {
         log.info('Running main process...');

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,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"}
+{"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"}

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,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAQ9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;;;oBAYC,kBAAkB;;;;;;;AAlBhD,wBAwCC"}
+{"version":3,"file":"dappRegister.d.ts","sourceRoot":"","sources":["../../src/commands/dappRegister.ts"],"names":[],"mappings":"AACA,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;+BAO9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;;;oBAYC,kBAAkB;;;;;;;AAlBhD,wBAwCC"}

package/dist/commands/dappRegister.js

@@ -1,11 +1,11 @@
-import { DappPayee } from '@prosopo/captcha-contract';
+import * as z from 'zod';
+import { DappPayee } from '@prosopo/captcha-contract/types-returns';
 import { LogLevel, getLogger } from '@prosopo/common';
 import { ProviderEnvironment } from '@prosopo/env';
 import { Tasks } from '@prosopo/provider';
 import { get } from '@prosopo/util';
 import { validateContract, validatePayee } from './validators.js';
 import { wrapQuery } from '@prosopo/contract';
-import { z } from 'zod';
 export default (pair, config, cmdArgs) => {
     const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, 'cli.dapp_register');
     return {

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,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"}
+{"version":3,"file":"dappRegister.js","sourceRoot":"","sources":["../../src/commands/dappRegister.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAEnE,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;AAE7C,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.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,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAQ9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;;;oBAYC,kBAAkB;;;;;;;AAlBhD,wBA0CC"}
+{"version":3,"file":"dappUpdate.d.ts","sourceRoot":"","sources":["../../src/commands/dappUpdate.ts"],"names":[],"mappings":"AACA,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;+BAO9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;;;oBAYC,kBAAkB;;;;;;;AAlBhD,wBA0CC"}

package/dist/commands/dappUpdate.js

@@ -1,11 +1,11 @@
-import { DappPayee } from '@prosopo/captcha-contract';
+import * as z from 'zod';
+import { DappPayee } from '@prosopo/captcha-contract/types-returns';
 import { LogLevel, getLogger } from '@prosopo/common';
 import { ProviderEnvironment } from '@prosopo/env';
 import { Tasks } from '@prosopo/provider';
 import { get } from '@prosopo/util';
 import { validateContract, validatePayee } from './validators.js';
 import { wrapQuery } from '@prosopo/contract';
-import { z } from 'zod';
 export default (pair, config, cmdArgs) => {
     const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, 'cli.dapp_update');
     return {