@prosopo/cli 0.2.6 → 0.2.8

package/dist/argv.d.ts

@@ -1,6 +1,6 @@
 import { KeyringPair } from '@polkadot/keyring/types';
-import { ProsopoConfig } from '@prosopo/types';
-export declare function processArgs(args: string[], pair: KeyringPair, config: ProsopoConfig): {
+import { ProsopoConfigOutput } from '@prosopo/types';
+export declare function processArgs(args: string[], pair: KeyringPair, config: ProsopoConfigOutput): {
     [x: string]: unknown;
     api: boolean;
     _: (string | number)[];

package/dist/argv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argv.d.ts","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAoB9C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa;;;;;;;;;;GAoBnF"}
+{"version":3,"file":"argv.d.ts","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAoBpD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB;;;;;;;;;;GAoBzF"}

package/dist/argv.js.map

@@ -1 +1 @@
-{"version":3,"file":"argv.js","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,EACH,kBAAkB,EAClB,gCAAgC,EAChC,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACvB,sBAAsB,EACtB,yBAAyB,EACzB,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,EACrB,cAAc,GACjB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,UAAU,WAAW,CAAC,IAAc,EAAE,IAAiB,EAAE,MAAqB;IAChF,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACnD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACtB,KAAK,CAAC,gDAAgD,CAAC;SACvD,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAW,CAAC;SAC1E,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC1D,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxD,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC5D,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC5D,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACtD,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACpD,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC1D,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACtD,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACzD,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACzD,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACrD,OAAO,CAAC,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACnE,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACrD,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACjD,KAAK,EAAE,CAAA;AAChB,CAAC"}
+{"version":3,"file":"argv.js","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,EACH,kBAAkB,EAClB,gCAAgC,EAChC,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACvB,sBAAsB,EACtB,yBAAyB,EACzB,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,EACrB,cAAc,GACjB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,UAAU,WAAW,CAAC,IAAc,EAAE,IAAiB,EAAE,MAA2B;IACtF,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACnD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACtB,KAAK,CAAC,gDAAgD,CAAC;SACvD,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAW,CAAC;SAC1E,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC1D,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxD,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC5D,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC5D,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACtD,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACpD,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC1D,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACtD,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACzD,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACzD,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACrD,OAAO,CAAC,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACnE,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACrD,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACjD,KAAK,EAAE,CAAA;AAChB,CAAC"}

package/dist/cjs/cli.cjs

@@ -1,26 +1,26 @@
 "use strict";
 const common = require("@prosopo/common");
 const env$1 = require("@prosopo/env");
+const contract = require("@prosopo/contract");
 const process_env = require("./process.env.cjs");
 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");
 async function main() {
   env.loadEnv();
   const secret = process_env.getSecret();
-  const ss58Format = process_env.getSs58Format();
-  const pairType = process_env.getPairType();
-  const config = process_env.getConfig();
-  const pair = await common.getPair(pairType, ss58Format, secret);
+  const config = prosopo_config();
+  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}`);
   const processedArgs = await argv.processArgs(process.argv, pair, config);
   if (processedArgs.api) {
-    const env2 = new env$1.ProviderEnvironment(pair, config);
+    const env2 = new env$1.ProviderEnvironment(config, pair);
     await env2.isReady();
     log.info("Starting API");
     await start.start(env2);

package/dist/cjs/commands/batchCommit.cjs

@@ -16,7 +16,7 @@ const commandBatchCommit = (pair, config, cmdArgs) => {
       });
     },
     handler: async (argv) => {
-      const env$1 = new env.ProviderEnvironment(pair, config);
+      const env$1 = new env.ProviderEnvironment(config, pair);
       await env$1.isReady();
       if (argv.schedule) {
         throw new common.ProsopoEnvError("GENERAL.NOT_IMPLEMENTED");

package/dist/cjs/commands/calculateCaptchaSolutions.cjs

@@ -16,7 +16,7 @@ const commandCalculateCaptchaSolutions = (pair, config, cmdArgs) => {
       });
     },
     handler: async (argv) => {
-      const env$1 = new env.ProviderEnvironment(pair, config);
+      const env$1 = new env.ProviderEnvironment(config, pair);
       await env$1.isReady();
       if (argv.schedule) {
         throw new common.ProsopoEnvError("GENERAL.NOT_IMPLEMENTED");

package/dist/cjs/commands/dappAccounts.cjs

@@ -10,7 +10,7 @@ const commandDappAccounts = (pair, config, cmdArgs) => {
     builder: (yargs) => yargs,
     handler: async (argv) => {
       try {
-        const env$1 = new env.ProviderEnvironment(pair, config);
+        const env$1 = new env.ProviderEnvironment(config, pair);
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
         const result = await tasks.contract.contract["dappAccounts"]();

package/dist/cjs/commands/dappDetails.cjs

@@ -15,7 +15,7 @@ const commandDappDetails = (pair, config, cmdArgs) => {
     }),
     handler: async (argv) => {
       try {
-        const env$1 = new env.ProviderEnvironment(pair, config);
+        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.getDapp(validators.validateAddress(argv).address)).value.unwrap().unwrap();

package/dist/cjs/commands/dappRegister.cjs

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

package/dist/cjs/commands/dappUpdate.cjs

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

package/dist/cjs/commands/providerAccounts.cjs

@@ -10,7 +10,7 @@ const commandProviderAccounts = (pair, config, cmdArgs) => {
     builder: (yargs) => yargs,
     handler: async (argv) => {
       try {
-        const env$1 = new env.ProviderEnvironment(pair, config);
+        const env$1 = new env.ProviderEnvironment(config, pair);
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
         const result = await tasks.contract.contract["providerAccounts"]();

package/dist/cjs/commands/providerDataset.cjs

@@ -20,10 +20,13 @@ const commandProviderDataset = (pair, config, cmdArgs) => {
     }),
     handler: async (argv) => {
       try {
-        const env$1 = new env.ProviderEnvironment(pair, config);
+        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);
+        if (!env$1.config.account.address) {
+          throw new common.ProsopoEnvError("GENERAL.ACCOUNT_NOT_FOUND");
+        }
         if (datasetId === void 0) {
           const providerAddress = env$1.config.account.address;
           const provider2 = (await tasks.contract.query.getProvider(providerAddress)).value.unwrap().unwrap();

package/dist/cjs/commands/providerDeregister.cjs

@@ -15,7 +15,7 @@ const commandProviderDeregister = (pair, config, cmdArgs) => {
     }),
     handler: async (argv) => {
       try {
-        const env$1 = new env.ProviderEnvironment(pair, config);
+        const env$1 = new env.ProviderEnvironment(config, pair);
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
         throw new common.ProsopoEnvError("GENERAL.NOT_IMPLEMENTED");

package/dist/cjs/commands/providerDetails.cjs

@@ -16,7 +16,7 @@ const commandProviderDetails = (pair, config, cmdArgs) => {
     }),
     handler: async (argv) => {
       try {
-        const env$1 = new env.ProviderEnvironment(pair, config);
+        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();

package/dist/cjs/commands/providerRegister.cjs

@@ -51,7 +51,7 @@ const commandProviderRegister = (pair, config, cmdArgs) => {
     handler: async (argv) => {
       try {
         const parsedArgs = providerRegisterArgsParser.parse(argv);
-        const env$1 = new env.ProviderEnvironment(pair, config);
+        const env$1 = new env.ProviderEnvironment(config, pair);
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
         const providerRegisterArgs = [

package/dist/cjs/commands/providerSetDataset.cjs

@@ -16,7 +16,7 @@ const commandProviderSetDataset = (pair, config, cmdArgs) => {
     }),
     handler: async (argv) => {
       try {
-        const env$1 = new env.ProviderEnvironment(pair, config);
+        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);

package/dist/cjs/commands/providerUpdate.cjs

@@ -31,7 +31,7 @@ const commandProviderUpdate = (pair, config, cmdArgs) => {
     }),
     handler: async (argv) => {
       try {
-        const env$1 = new env.ProviderEnvironment(pair, config);
+        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({