@prosopo/scripts 1.0.2 → 2.0.1

package/README.md

@@ -4,9 +4,9 @@ This package contains the scripts and configuration for setting up a development
 
 ## Prerequisites
 
--   A unix-style environment (Linux, MacOS, WSL2)
--   [Docker](https://docs.docker.com/get-docker/)
--   [Node.js](https://nodejs.org/en/download/)
+- A unix-style environment (Linux, MacOS, WSL2)
+- [Docker](https://docs.docker.com/get-docker/)
+- [Node.js](https://nodejs.org/en/download/)
 
 ## Dev Setup
 
@@ -131,6 +131,7 @@ This is shorthand for the following command:
 ```bash
 npm run -w @prosopo/scripts cli deploy_protocol --update_env
 ```
+
 Specify the current working directory if you are running from a different location.
 
 ```bash

package/dist/cli/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AA8CA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,iBA2O/C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AA8BA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,iBAqF/C"}

package/dist/cli/index.js

@@ -1,208 +1,87 @@
-import { LogLevel, getLogger } from '@prosopo/common';
-import { NetworkConfigSchema, NetworkNamesSchema, decodeProcaptchaOutput, networks as getNetworks, } from '@prosopo/types';
-import { deployDapp, deployProtocol } from '../contract/deploy/index.js';
-import { exec } from '../util/index.js';
-import { run as fundDapps } from '../contract/fundDapps.js';
-import { get } from '@prosopo/util';
-import { getContractNames, getContractsDir, getProtocolDistDir, getScriptsPkgDir } from '@prosopo/config';
-import { getEnv, loadEnv } from '@prosopo/cli';
-import { getLogLevel } from '@prosopo/common';
-import { hideBin } from 'yargs/helpers';
-import { importContract } from '../contract/index.js';
-import { isHex } from '@polkadot/util';
-import { setup } from '../setup/index.js';
-import { run as transferContract } from '../contract/transferContract.js';
-import { updateEnvFiles } from '../util/index.js';
-import path from 'path';
-import setVersion from '../scripts/setVersion.js';
-import yargs from 'yargs';
-import z from 'zod';
-const rootDir = path.resolve('.');
+import path from "node:path";
+import { isHex } from "@polkadot/util";
+import { getEnv, loadEnv } from "@prosopo/cli";
+import { LogLevel, getLogger } from "@prosopo/common";
+import { getLogLevel } from "@prosopo/common";
+import { getScriptsPkgDir } from "@prosopo/config";
+import { decodeProcaptchaOutput, encodeProcaptchaOutput } from "@prosopo/types";
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+import { importContract } from "../contract/index.js";
+import setVersion from "../scripts/setVersion.js";
+import { setup } from "../setup/index.js";
+import { exec } from "../util/index.js";
+const rootDir = path.resolve(".");
 loadEnv(rootDir);
-const TransferNetworkSchema = z.object({
-    network: z.string(),
-    address: z.string(),
-});
 export async function processArgs(args) {
-    const parsed = await yargs(hideBin(args)).option('logLevel', {
-        describe: 'set log level',
+    const parsed = await yargs(hideBin(args)).option("logLevel", {
+        describe: "set log level",
         choices: Object.keys(LogLevel.enum),
     }).argv;
-    const log = getLogger(getLogLevel(parsed.logLevel), 'CLI');
+    const log = getLogger(getLogLevel(parsed.logLevel), "CLI");
     await yargs(hideBin(args))
-        .usage('Usage: $0 [global options] <command> [options]')
-        .command('deploy_protocol', 'Deploy the prosopo protocol contract', (yargs) => yargs
-        .option('update_env', {
-        type: 'boolean',
-        demandOption: false,
-        desc: 'Update env files with the new contract address',
-        default: false,
-    })
-        .option('deployer', {
-        type: 'string',
-        demandOption: false,
-        desc: `The account prefix that will deploy the contract. Specifying PROVIDER will cause the 
-                        script to look for PROVIDER_JSON in the env file. Specifying DEPLOYER will cause the script to 
-                        look for DEPLOYER_JSON in the env file. Defaults to undefined.`,
-        default: undefined,
-    })
-        .option('cwd', {
-        type: 'string',
-        demandOption: false,
-        desc: `The working directory from which env files will be updated`,
-        default: undefined,
-    }), async (argv) => {
-        const protocolContractAddress = await deployProtocol(process.env.PROSOPO_CAPTCHA_WASM_PATH, process.env.PROSOPO_CAPTCHA_ABI_PATH, argv.deployer);
-        log.info('contract address', protocolContractAddress);
-        if (argv.update_env) {
-            await updateEnvFiles(['PROSOPO_CONTRACT_ADDRESS', 'NEXT_PUBLIC_PROSOPO_CONTRACT_ADDRESS'], protocolContractAddress.toString(), log, argv.cwd);
-        }
-    }, [])
-        .command('deploy_dapp', 'Deploy the prosopo dapp example contract', (yargs) => yargs.option('update_env', {
-        type: 'boolean',
-        demandOption: false,
-        desc: 'Update env files with the new contract address',
-        default: false,
-    }), async (argv) => {
-        const dappContractAddress = await deployDapp();
-        log.info('contract address', dappContractAddress);
-        if (argv.update_env) {
-            await updateEnvFiles(['PROSOPO_SITE_KEY', 'NEXT_PUBLIC_PROSOPO_SITE_KEY'], dappContractAddress.toString(), log);
-        }
-    }, [])
-        .command('create_env_files', 'Copies the env.xyz files to .env.xyz', (yargs) => yargs, async () => {
+        .usage("Usage: $0 [global options] <command> [options]")
+        .command("create_env_files", "Copies the env.xyz files to .env.xyz", (yargs) => yargs, async () => {
         const env = getEnv();
         const scripts = getScriptsPkgDir();
         await exec(`cp -v ${scripts}/env.${env} ${scripts}/.env.${env}`);
     }, [])
         .command({
-        command: 'setup',
-        describe: 'Setup the development environment by registering a provider, staking, loading a data set and then registering a dapp and staking.',
-        builder: (yargs) => yargs.option('force', {
-            type: 'boolean',
+        command: "setup",
+        describe: "Setup the development environment by registering a provider, staking, loading a data set and then registering a dapp and staking.",
+        builder: (yargs) => yargs.option("force", {
+            type: "boolean",
             demandOption: false,
-            desc: 'Force provider re-registration and dataset setup',
+            desc: "Force provider re-registration and dataset setup",
         }),
         handler: async (argv) => {
-            log.info('Running setup scripts');
+            log.info("Running setup scripts");
             await setup(!!argv.force);
         },
     })
         .command({
-        command: 'import_contract',
-        describe: 'Import a contract into the contract package.',
+        command: "import_contract",
+        describe: "Import a contract into the contract package.",
         builder: (yargs) => yargs
-            .option('in', {
-            type: 'string',
+            .option("in", {
+            type: "string",
             demandOption: true,
             desc: "The path to the contract's abi",
         })
-            .option('out', {
-            type: 'string',
+            .option("out", {
+            type: "string",
             demandOption: true,
-            desc: 'The path to the output directory',
+            desc: "The path to the output directory",
         }),
         handler: async (argv) => {
             await importContract(argv.in, argv.out);
         },
     })
         .command({
-        command: 'import_all_contracts',
-        describe: 'Update all contracts into the contract package.',
-        builder: (yargs) => yargs,
-        handler: async () => {
-            const contracts = getContractNames();
-            for (const contract of contracts) {
-                const inDir = `${getProtocolDistDir()}/${contract}`;
-                await exec(`node dist/cli/index.js import_contract --in=${inDir} --out=${getContractsDir()}/${contract}/src`);
-            }
-        },
-    })
-        .command({
-        command: 'fund_dapps',
-        describe: 'Fund the dapps if they are unfunded',
-        builder: (yargs) => yargs,
-        handler: async () => {
-            const atlasUri = process.env._DEV_ONLY_ATLAS_URI;
-            fundDapps(atlasUri)
-                .then((result) => {
-                log.info(result);
-                process.exit(0);
-            })
-                .catch((e) => {
-                console.error(e);
-                process.exit(1);
-            });
-        },
-    })
-        .command({
-        command: 'transfer_contract',
-        describe: 'Transfer dapps and providers from one contract to another',
-        builder: (yargs) => yargs
-            .option('transfer-from', {
-            type: 'string',
-            demandOption: true,
-            desc: 'The name of the network and the contract address to transfer from `{ network, address }`',
-        })
-            .option('transfer-to', {
-            type: 'string',
-            demandOption: false,
-            desc: 'The name of the network and the contract address to transfer to `{ network, address }`',
-        })
-            .option('transfer-providers', {
-            type: 'boolean',
-            demandOption: true,
-            desc: 'Whether to transfer providers or not',
-            default: false,
-        })
-            .option('transfer-dapps', {
-            type: 'boolean',
-            demandOption: true,
-            desc: 'Whether to transfer dapps or not',
-            default: false,
-        }),
-        handler: async (argv) => {
-            log.debug(argv);
-            const atlasUri = process.env._DEV_ONLY_ATLAS_URI;
-            const transferFrom = TransferNetworkSchema.parse(JSON.parse(argv.transferFrom));
-            const networks = getNetworks();
-            const transferFromNetworkName = NetworkNamesSchema.parse(transferFrom.network);
-            const transferFromNetwork = NetworkConfigSchema.parse(get(networks, transferFrom.network));
-            transferFromNetwork.contract.address = transferFrom.address;
-            let transferToNetwork = undefined;
-            let transferToNetworkName = undefined;
-            if (argv.transferTo !== undefined) {
-                const transferTo = TransferNetworkSchema.parse(JSON.parse(argv.transferFrom));
-                transferToNetwork = NetworkConfigSchema.parse(get(networks, transferTo.network));
-                transferToNetwork.contract.address = transferFrom.address;
-                transferToNetworkName = NetworkNamesSchema.parse(transferToNetworkName);
-            }
-            const transferConfig = { dapps: argv.transferDapps, providers: argv.transferProviders };
-            await transferContract(transferFromNetworkName, transferFromNetwork, transferConfig, transferToNetworkName, transferToNetwork, atlasUri);
-        },
-    })
-        .command({
-        command: 'version',
-        describe: 'Set the version of packages',
-        builder: (yargs) => yargs.option('v', { type: 'string', demandOption: true }),
+        command: "version",
+        describe: "Set the version of packages",
+        builder: (yargs) => yargs.option("v", { type: "string", demandOption: true }),
         handler: async (argv) => {
             await setVersion(String(argv.v));
         },
     })
         .command({
-        command: 'token <tokenHex>',
-        describe: 'Decode a Procaptcha token to the JSON output format',
-        builder: (yargs) => yargs.positional('tokenHex', {
-            describe: 'a Procaptcha token to decode',
-            type: 'string',
+        command: "token <token>",
+        describe: "Encode or Decode a Procaptcha token to the JSON output format",
+        builder: (yargs) => yargs.positional("token", {
+            describe: "a Procaptcha token to decode",
+            type: "string",
             demandOption: true,
         }),
         handler: async (argv) => {
-            if (!isHex(argv.tokenHex)) {
-                log.error('Token must be a hex string');
-                process.exit(1);
+            if (!isHex(argv.token)) {
+                log.debug("Encoding token to hex");
+                log.info(encodeProcaptchaOutput(JSON.parse(argv.token)));
+            }
+            else {
+                log.debug("Decoding token from hex");
+                log.info(decodeProcaptchaOutput(argv.token));
             }
-            log.info(decodeProcaptchaOutput(argv.tokenHex));
         },
     }).argv;
 }

package/dist/cli/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}

package/dist/contract/import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../src/contract/import.ts"],"names":[],"mappings":"AAwCA,iBAAe,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBA+NrE;AAuBD,eAAe,cAAc,CAAA"}
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../src/contract/import.ts"],"names":[],"mappings":"AAwCA,iBAAe,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBA+KrE;AAuBD,eAAe,cAAc,CAAC"}

package/dist/contract/import.js

@@ -1,91 +1,27 @@
-import { ProsopoEnvError } from '@prosopo/common';
-import { exec } from '../util/index.js';
-import { lodash } from '@prosopo/util/lodash';
-import fs from 'fs';
-import path from 'path';
+import fs from "node:fs";
+import path from "node:path";
+import { ProsopoEnvError } from "@prosopo/common";
+import { lodash } from "@prosopo/util/lodash";
+import { exec } from "../util/index.js";
 const replaceExtension = (file, ext) => {
-    const parts = file.split('.');
+    const parts = file.split(".");
     parts.pop();
     parts.push(ext);
-    return parts.join('.');
+    return parts.join(".");
 };
 async function importContract(pathToAbis, pathToOutput) {
     const verbose = false;
     pathToAbis = path.relative(process.cwd(), pathToAbis);
     pathToOutput = path.relative(process.cwd(), pathToOutput);
     if (!fs.existsSync(pathToAbis))
-        throw new ProsopoEnvError('FS.FILE_NOT_FOUND', {
+        throw new ProsopoEnvError("FS.FILE_NOT_FOUND", {
             context: { error: `Path to ABIs does not exist: ${pathToAbis}` },
         });
     await exec(`mkdir -p ${pathToOutput}`);
-    const cmd = `npx typechain-polkadot --in ${pathToAbis} --out ${pathToOutput}`;
+    const cmd = `npx @prosopo/typechain-polkadot --in ${pathToAbis} --out ${pathToOutput}`;
     await exec(cmd);
     const name = path.basename(pathToAbis);
     await exec(`cp ${pathToAbis}/${name}.json ${pathToOutput}/${name}.json`);
-    const walk = (dir) => {
-        const files = fs.readdirSync(dir);
-        for (const file of files) {
-            const filePath = path.join(dir, file);
-            const stat = fs.statSync(filePath);
-            if (stat.isDirectory()) {
-                walk(filePath);
-            }
-            else if (filePath.endsWith('.ts')) {
-                const regex = /(import(?:(?!from).)+from\s+)(['"]\.[./\w-]+['"])(\s+assert\s+\{[^}]*\})?/gs;
-                const fileContents = fs.readFileSync(filePath, 'utf8');
-                let replaced = fileContents.replace(regex, (match, p1, p2, p3) => {
-                    const start = p1.toString();
-                    const srcQuoted = p2.toString();
-                    const src = getPath(srcQuoted);
-                    const extension = getExtension(src);
-                    if (verbose)
-                        console.log(`src: ${src}`);
-                    if (verbose)
-                        console.log(`extension: ${extension}`);
-                    if (verbose)
-                        console.log('p3: ', p3);
-                    let result = '';
-                    if (extension === 'js') {
-                        return match;
-                    }
-                    else if (extension === 'json') {
-                        if ((p3 ?? '').includes('assert')) {
-                            return match;
-                        }
-                        result = `${start}'${src}' assert { type: 'json' }`;
-                    }
-                    else {
-                        result = `${start}'${src}.js'`;
-                    }
-                    if (verbose)
-                        console.log(`Replacing \n\t${match}\nwith\n\t${result}\nin ${filePath}`);
-                    return `${result}`;
-                });
-                replaced = replaced.replace(/\n(.*)\n(\s*)\/\/\s*@ts-ignore/g, (match, p1, p2) => {
-                    if (p1.includes('eslint-disable-next-line'))
-                        return match;
-                    const result = `\n${p1}\n${p2}// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n${p2}// @ts-ignore`;
-                    if (verbose)
-                        console.log(`Replacing \n\t${match}\nwith\n\t${result}\nin ${filePath}`);
-                    return result;
-                });
-                replaced = replaced.replace(/: EventRecord\)/g, (match) => {
-                    const result = `: EventRecord[])`;
-                    if (verbose)
-                        console.log(`Replacing \n\t${match}\nwith\n\t${result}\nin ${filePath}`);
-                    return result;
-                });
-                replaced = replaced.replace(/import\s+type\s+\{\s*EventRecord\s*\}\s+from\s+['"]@polkadot\/api\/submittable["']/g, (match) => {
-                    const result = `import type { EventRecord } from '@polkadot/types/interfaces'`;
-                    if (verbose)
-                        console.log(`Replacing \n\t${match}\nwith\n\t${result}\nin ${filePath}`);
-                    return result;
-                });
-                fs.writeFileSync(filePath, replaced);
-            }
-        }
-    };
-    walk(pathToOutput);
     const _ = lodash();
     const writeIndexJsFiles = (src) => {
         const typeChainDirs = fs.readdirSync(src).filter((file) => {
@@ -94,122 +30,128 @@ async function importContract(pathToAbis, pathToOutput) {
         const rootExports = [];
         const typeChainExports = [
             {
-                dir: 'build-extrinsic',
-                defaultExportName: 'extrinsics',
+                dir: "build-extrinsic",
+                defaultExportName: "extrinsics",
             },
             {
-                dir: 'constructors',
+                dir: "constructors",
             },
             {
-                dir: 'contract-info',
+                dir: "contract-info",
                 exports: [
                     {
-                        name: 'ContractAbi',
+                        name: "ContractAbi",
                     },
                     {
-                        name: 'ContractFile',
+                        name: "ContractFile",
                     },
                 ],
             },
             {
-                dir: 'contracts',
-                defaultExportName: 'contract',
+                dir: "contracts",
+                defaultExportName: "contract",
             },
             {
-                dir: 'data',
+                dir: "data",
             },
             {
-                dir: 'event-data',
+                dir: "event-data",
             },
             {
-                dir: 'events',
+                dir: "events",
             },
             {
-                dir: 'mixed-methods',
-                defaultExportName: 'methods',
+                dir: "mixed-methods",
+                defaultExportName: "methods",
             },
             {
-                dir: 'query',
-                defaultExportName: 'query',
+                dir: "query",
+                defaultExportName: "query",
             },
             {
-                dir: 'tx-sign-and-send',
-                defaultExportName: 'tx',
+                dir: "tx-sign-and-send",
+                defaultExportName: "tx",
             },
         ];
-        let file = '';
-        typeChainExports.forEach((typeChainExport) => {
+        let file = "";
+        for (const typeChainExport of typeChainExports) {
             const dirPath = `${src}/${typeChainExport.dir}`;
             const files = fs.readdirSync(dirPath);
             if (files.length !== 1) {
-                throw new ProsopoEnvError('FS.INVALID_DIR_FORMAT', {
-                    context: { error: `Expected 1 file in ${dirPath}, found ${files.length}` },
+                throw new ProsopoEnvError("FS.INVALID_DIR_FORMAT", {
+                    context: {
+                        error: `Expected 1 file in ${dirPath}, found ${files.length}`,
+                    },
                 });
             }
-            file = files[0] || '';
-            if (file === '') {
-                throw new ProsopoEnvError('FS.FILE_NOT_FOUND', { context: { error: `No file found in ${dirPath}` } });
+            file = files[0] || "";
+            if (file === "") {
+                throw new ProsopoEnvError("FS.FILE_NOT_FOUND", {
+                    context: { error: `No file found in ${dirPath}` },
+                });
             }
-            if (file.endsWith('.ts')) {
-                file = replaceExtension(file, 'js');
+            if (file.endsWith(".ts")) {
+                file = replaceExtension(file, "js");
             }
             if (typeChainExport.defaultExportName !== undefined) {
                 const name = _.upperFirst(_.camelCase(typeChainExport.defaultExportName || typeChainExport.dir));
                 rootExports.push(`export { default as ${name} } from './${typeChainExport.dir}/${file}'`);
             }
             if (typeChainExport.exports !== undefined) {
-                typeChainExport.exports.forEach((namedExport) => {
-                    const alias = namedExport.alias ? ` as ${namedExport.alias}` : '';
+                for (const namedExport of typeChainExport.exports) {
+                    const alias = namedExport.alias ? ` as ${namedExport.alias}` : "";
                     rootExports.push(`export { ${namedExport.name}${alias} } from './${typeChainExport.dir}/${file}'`);
-                });
+                }
             }
-        });
+        }
         rootExports.push(`export * from './shared/utils.js'`);
         const regex = /export\s+([a-z]+)\s+(\w+)/g;
-        const fileTs = replaceExtension(file, 'ts');
-        const typesArgumentsFileContent = fs.readFileSync(`${src}/types-arguments/${fileTs}`, 'utf8');
-        const typesReturnsFileContent = fs.readFileSync(`${src}/types-returns/${fileTs}`, 'utf8');
+        const fileTs = replaceExtension(file, "ts");
+        const typesArgumentsFileContent = fs.readFileSync(`${src}/types-arguments/${fileTs}`, "utf8");
+        const typesReturnsFileContent = fs.readFileSync(`${src}/types-returns/${fileTs}`, "utf8");
         const argumentTypes = Array.from(typesArgumentsFileContent.matchAll(regex)).map((match) => {
             return {
-                name: match[2] || '',
-                category: match[1] || '',
+                name: match[2] || "",
+                category: match[1] || "",
             };
         });
         const returnTypes = Array.from(typesReturnsFileContent.matchAll(regex)).map((match) => {
             return {
-                name: match[2] || '',
-                category: match[1] || '',
+                name: match[2] || "",
+                category: match[1] || "",
             };
         });
         const argumentTypeNames = argumentTypes.map((entry) => entry.name);
         const uniqueTypes = [...argumentTypes];
-        const locations = [...argumentTypes.map(() => 'types-arguments')];
-        returnTypes.forEach((entry) => {
+        const locations = [...argumentTypes.map(() => "types-arguments")];
+        for (const entry of returnTypes) {
             if (!argumentTypeNames.includes(entry.name)) {
                 uniqueTypes.push(entry);
-                locations.push('types-arguments');
+                locations.push("types-arguments");
             }
             else {
-                locations.push('types-returns');
+                locations.push("types-returns");
             }
-        });
+        }
         uniqueTypes.forEach((entry, i) => {
             const location = locations[i];
-            const prefix = entry.category === 'type' || entry.category === 'interface' ? ' type' : '';
+            const prefix = entry.category === "type" || entry.category === "interface"
+                ? " type"
+                : "";
             rootExports.push(`export${prefix} { ${entry.name} } from './${location}/${file}'`);
         });
-        fs.writeFileSync(`${src}/index.ts`, rootExports.join('\n'));
+        fs.writeFileSync(`${src}/index.ts`, rootExports.join("\n"));
     };
     writeIndexJsFiles(pathToOutput);
 }
 const getExtension = (str) => {
-    const i = str.indexOf('assert');
+    const i = str.indexOf("assert");
     if (i >= 0) {
         str = str.slice(0, i);
     }
-    const arr = str.split('.');
+    const arr = str.split(".");
     if (arr.length <= 1) {
-        return '';
+        return "";
     }
     return arr.pop();
 };