@prosopo/scripts 0.2.13 → 0.2.15

package/dist/scripts/setVersion.js

@@ -1,9 +1,13 @@
 import { getLogLevel, getLogger } from '@prosopo/common';
 import { getPaths } from '@prosopo/config';
+import { loadEnv } from '@prosopo/cli';
 import { parse, stringify } from '@iarna/toml';
 import fs from 'fs';
 import path from 'path';
-const log = getLogger(getLogLevel(), 'setVersion');
+loadEnv();
+const logLevel = getLogLevel();
+const log = getLogger(logLevel, 'setVersion');
+log.info('Log level:', logLevel);
 const parseVersion = (version) => {
     try {
         const parts = version.split('.');
@@ -43,41 +47,34 @@ const find = (pth, filter) => {
     return results;
 };
 export default async function setVersion(version, ignore) {
-    log.info('setting version to ', version);
+    log.info('Setting version to ', version);
     version = parseVersion(version);
     const root = getPaths().root;
-    const ignorePaths = ['node_modules'].concat(ignore ?? []);
-    // walk through all files finding .json or .toml
+    const ignorePaths = ['node_modules', 'cargo-cache', ...(ignore ?? [])];
+    log.debug('Ignoring paths: ', ignorePaths);
     const files = find(root, (pth) => {
-        // ignore node_modules and any user specified paths
         if (ignorePaths.some((ignorePath) => pth.includes(ignorePath))) {
             return false;
         }
         const basename = path.basename(pth);
         return basename === 'package.json' || basename === 'Cargo.toml';
     });
-    // split into json and toml
     files
         .filter((pth) => path.extname(pth) === '.json')
         .forEach((pth) => {
         log.debug('setting version in', pth);
         const content = fs.readFileSync(pth, 'utf8');
-        // replace version in all json files
         const jsonContent = JSON.parse(content);
         if (jsonContent.version) {
-            // only replace if version is set
             jsonContent.version = version;
         }
-        // go through dependencies
         for (const obj of [
             jsonContent.dependencies ?? {},
             jsonContent.devDependencies ?? {},
             jsonContent.peerDependencies ?? {},
         ]) {
-            // detect any prosopo dependencies
             for (const key of Object.keys(obj)) {
-                if (key.startsWith('@prosopo')) {
-                    // and replace version
+                if (key.startsWith('@prosopo') && !key.includes('typechain')) {
                     log.debug(`setting ${key} to ${version} in ${pth}`);
                     obj[key] = version;
                 }
@@ -85,13 +82,14 @@ export default async function setVersion(version, ignore) {
         }
         fs.writeFileSync(pth, JSON.stringify(jsonContent, null, 4) + '\n');
     });
-    // replace version in tomls
     files
         .filter((pth) => path.extname(pth) === '.toml')
+        .filter((pth) => {
+        return !ignorePaths.some((ignorePath) => pth.includes(ignorePath));
+    })
         .forEach((pth) => {
         log.debug('setting version in', pth);
         const content = fs.readFileSync(pth, 'utf8');
-        // replace version in all toml files
         const tomlContent = parse(content);
         if (tomlContent.workspace) {
             if (tomlContent.workspace.version) {
@@ -100,18 +98,15 @@ export default async function setVersion(version, ignore) {
             }
         }
         else {
-            // replace dependency versions in all toml files
             tomlContent['package'].version = version;
         }
         fs.writeFileSync(pth, stringify(tomlContent) + '\n');
     });
-    // go through tomls again now versions have updated and update the version field for dependencies with paths set, as we can follow the path to get the version
     files
         .filter((pth) => path.extname(pth) === '.toml')
         .forEach((pth) => {
         log.debug('setting dependency versions in', pth);
         const content = fs.readFileSync(pth, 'utf8');
-        // replace version in all toml files
         const tomlContent = parse(content);
         if (tomlContent.workspace) {
             if (tomlContent.workspace.version) {
@@ -121,10 +116,8 @@ export default async function setVersion(version, ignore) {
         }
         else {
             for (const obj of [tomlContent.dependencies ?? {}, tomlContent['dev-dependencies'] ?? {}]) {
-                // detect any prosopo dependencies
                 for (const [key, value] of Object.entries(obj)) {
                     if (value.path) {
-                        // trace path to get version
                         path.join(value.path, 'Cargo.toml');
                         const depContent = fs.readFileSync(pth, 'utf8');
                         const depTomlContent = parse(depContent);

package/dist/scripts/setVersion.js.map

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

package/dist/setup/dapp.d.ts

@@ -1,4 +1,4 @@
 import { IDappAccount } from '@prosopo/types';
 import { ProviderEnvironment } from '@prosopo/types-env';
-export declare function setupDapp(env: ProviderEnvironment, dapp: IDappAccount): Promise<void>;
+export declare function setupDapp(env: ProviderEnvironment, dapp: IDappAccount, address?: string): Promise<void>;
 //# sourceMappingURL=dapp.d.ts.map

package/dist/setup/dapp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dapp.d.ts","sourceRoot":"","sources":["../../src/setup/dapp.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAIxD,wBAAsB,SAAS,CAAC,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B3F"}
+{"version":3,"file":"dapp.d.ts","sourceRoot":"","sources":["../../src/setup/dapp.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAKxD,wBAAsB,SAAS,CAAC,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0B7G"}

package/dist/setup/dapp.js

@@ -1,38 +1,38 @@
-// Copyright 2021-2023 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 { BN } from '@polkadot/util';
 import { DappPayee } from '@prosopo/captcha-contract';
 import { Tasks } from '@prosopo/provider';
-import { wrapQuery } from '@prosopo/contract';
-export async function setupDapp(env, dapp) {
+import { oneUnit, wrapQuery } from '@prosopo/contract';
+import { sendFunds } from './funds.js';
+export async function setupDapp(env, dapp, address) {
     const logger = env.logger;
     if (dapp.pair) {
+        const addressToRegister = address || dapp.pair.address;
         await env.changeSigner(dapp.pair);
         const tasks = new Tasks(env);
+        await dappSendFunds(env, dapp);
         try {
-            const dappResult = await wrapQuery(tasks.contract.query.getDapp, tasks.contract.query)(dapp.contractAccount);
+            const dappResult = await wrapQuery(tasks.contract.query.getDapp, tasks.contract.query)(addressToRegister);
             logger.info('   - dapp is already registered');
             logger.info('Dapp', dappResult);
         }
         catch (e) {
             logger.info('   - dappRegister');
-            await wrapQuery(tasks.contract.query.dappRegister, tasks.contract.query)(dapp.contractAccount, DappPayee.dapp);
-            await tasks.contract.tx.dappRegister(dapp.contractAccount, DappPayee.dapp);
+            await wrapQuery(tasks.contract.query.dappRegister, tasks.contract.query)(addressToRegister, DappPayee.dapp);
+            await tasks.contract.tx.dappRegister(addressToRegister, DappPayee.dapp);
             logger.info('   - dappFund');
-            await wrapQuery(tasks.contract.query.dappFund, tasks.contract.query)(dapp.contractAccount, {
+            await wrapQuery(tasks.contract.query.dappFund, tasks.contract.query)(addressToRegister, {
                 value: dapp.fundAmount,
             });
-            await tasks.contract.tx.dappFund(dapp.contractAccount, { value: dapp.fundAmount });
+            await tasks.contract.tx.dappFund(addressToRegister, { value: dapp.fundAmount });
+        }
+    }
+}
+async function dappSendFunds(env, dapp) {
+    if (dapp.pair && !dapp.pair.isLocked) {
+        const sendAmount = oneUnit(env.getApi());
+        const { data: { free: previousFree }, } = await env.getContractInterface().api.query.system.account(dapp.pair.address);
+        if (previousFree.lt(new BN(sendAmount.toString()))) {
+            await sendFunds(env, dapp.pair.address, 'Dapp', sendAmount);
         }
     }
 }

package/dist/setup/dapp.js.map

@@ -1 +1 @@
-{"version":3,"file":"dapp.js","sourceRoot":"","sources":["../../src/setup/dapp.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,EAAQ,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAG3D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE7C,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAwB,EAAE,IAAkB;IACxE,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IACzB,IAAI,IAAI,CAAC,IAAI,EAAE;QACX,MAAM,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;QAE5B,IAAI;YACA,MAAM,UAAU,GAAS,MAAM,SAAS,CACpC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAC5B,KAAK,CAAC,QAAQ,CAAC,KAAK,CACvB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;YACvB,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;YAC9C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;SAClC;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;YAChC,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CACpE,IAAI,CAAC,eAAe,EACpB,SAAS,CAAC,IAAI,CACjB,CAAA;YACD,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;YAC1E,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;YAC5B,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE;gBACvF,KAAK,EAAE,IAAI,CAAC,UAAU;aACzB,CAAC,CAAA;YACF,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;SACrF;KACJ;AACL,CAAC"}
+{"version":3,"file":"dapp.js","sourceRoot":"","sources":["../../src/setup/dapp.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AACnC,OAAO,EAAQ,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAG3D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAwB,EAAE,IAAkB,EAAE,OAAgB;IAC1F,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IAEzB,IAAI,IAAI,CAAC,IAAI,EAAE;QACX,MAAM,iBAAiB,GAAG,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAA;QACtD,MAAM,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;QAC5B,MAAM,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAC9B,IAAI;YACA,MAAM,UAAU,GAAS,MAAM,SAAS,CACpC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAC5B,KAAK,CAAC,QAAQ,CAAC,KAAK,CACvB,CAAC,iBAAiB,CAAC,CAAA;YACpB,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;YAC9C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;SAClC;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;YAChC,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;YAC3G,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;YACvE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;YAC5B,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE;gBACpF,KAAK,EAAE,IAAI,CAAC,UAAU;aACzB,CAAC,CAAA;YACF,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;SAClF;KACJ;AACL,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,GAAwB,EAAE,IAAkB;IACrE,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;QAClC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;QAGxC,MAAM,EACF,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,GAC/B,GAAG,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAChF,IAAI,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE;YAEhD,MAAM,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;SAC9D;KACJ;AACL,CAAC"}

package/dist/setup/funds.d.ts

@@ -2,22 +2,7 @@
 import { AnyNumber } from '@polkadot/types-codec/types';
 import { BN } from '@polkadot/util';
 import { ProsopoEnvironment } from '@prosopo/types-env';
-/** Send funds from one of the development accounts to another account. */
 export declare function sendFunds(env: ProsopoEnvironment, address: string, who: string, amount: AnyNumber): Promise<void>;
-/**
- * Takes the  providerStakeDefault and works out if multiplying it by 100 or
- * stakeMultiplier is greater than the maxStake. If it is, it returns the maxStake
- * If chain decimals = 12, 1 UNIT = 1e12
- * @param env
- * @param providerStakeDefault
- * @param stakeMultiplier
- */
 export declare function getStakeAmount(env: ProsopoEnvironment, providerStakeDefault: BN, stakeMultiplier?: number): BN;
-/**
- * Send funds to a test account, adding the max of 2 * stakeAmount or 100 * the
- * existential deposit
- * @param env
- * @param stakeAmount
- */
 export declare function getSendAmount(env: ProsopoEnvironment, stakeAmount: BN): BN;
 //# sourceMappingURL=funds.d.ts.map

package/dist/setup/funds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"funds.d.ts","sourceRoot":"","sources":["../../src/setup/funds.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAGnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAgBvD,0EAA0E;AAC1E,wBAAsB,SAAS,CAC3B,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,SAAS,GAClB,OAAO,CAAC,IAAI,CAAC,CAgEf;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,EAAE,CAgB9G;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,CAS1E"}
+{"version":3,"file":"funds.d.ts","sourceRoot":"","sources":["../../src/setup/funds.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAGnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAiBvD,wBAAsB,SAAS,CAC3B,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,SAAS,GAClB,OAAO,CAAC,IAAI,CAAC,CAgEf;AAUD,wBAAgB,cAAc,CAAC,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,EAAE,CAgB9G;AAQD,wBAAgB,aAAa,CAAC,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,CAS1E"}

package/dist/setup/funds.js

@@ -4,14 +4,11 @@ import { at } from '@prosopo/util';
 import { dispatchErrorHandler, oneUnit } from '@prosopo/contract';
 const devMnemonics = ['//Alice', '//Bob', '//Charlie', '//Dave', '//Eve', '//Ferdie'];
 let current = -1;
-const MAX_ACCOUNT_FUND = 10000; // 10000 UNIT
-/** Cycle through the dev mnemonics so as not to deplete the funds too quickly
- */
+const MAX_ACCOUNT_FUND = 10000;
 function getNextMnemonic() {
     current = (current + 1) % devMnemonics.length;
     return at(devMnemonics, current);
 }
-/** Send funds from one of the development accounts to another account. */
 export async function sendFunds(env, address, who, amount) {
     const envApi = env.getApi();
     await envApi.isReady;
@@ -30,7 +27,6 @@ export async function sendFunds(env, address, who, amount) {
     const unit = oneUnit(envApi);
     const unitAmount = new BN(amount.toString()).div(unit).toString();
     env.logger.debug('Sending funds from', pair.address, 'to', address, 'Amount:', unitAmount, 'UNIT. Free balance:', previousFree.div(unit).toString(), 'UNIT');
-    // eslint-disable-next-line no-async-promise-executor
     const result = new Promise(async (resolve, reject) => {
         const unsub = await api.tx.balances
             .transfer(address, amount)
@@ -62,20 +58,9 @@ export async function sendFunds(env, address, who, amount) {
         throw new ProsopoEnvError('DEVELOPER.FUNDING_FAILED', undefined, undefined, { e });
     });
 }
-/**
- * Takes the  providerStakeDefault and works out if multiplying it by 100 or
- * stakeMultiplier is greater than the maxStake. If it is, it returns the maxStake
- * If chain decimals = 12, 1 UNIT = 1e12
- * @param env
- * @param providerStakeDefault
- * @param stakeMultiplier
- */
 export function getStakeAmount(env, providerStakeDefault, stakeMultiplier) {
     const unit = oneUnit(env.getApi());
-    // We want to give each provider 100 * the required stake or 1 UNIT, whichever is greater, so that gas fees can be
-    // refunded to the Dapp User from within the contract
     const stake100 = BN.max(providerStakeDefault.muln(stakeMultiplier || 100), unit);
-    // We don't want to stake any more than MAX_ACCOUNT_FUND UNIT per provider as the test account funds will be depleted too quickly
     const maxStake = unit.muln(MAX_ACCOUNT_FUND);
     if (stake100.lt(maxStake)) {
         env.logger.debug('Setting stake amount to', stake100.div(unit).toNumber(), 'UNIT');
@@ -84,17 +69,10 @@ export function getStakeAmount(env, providerStakeDefault, stakeMultiplier) {
     env.logger.debug('Setting stake amount to', maxStake.div(unit).toNumber(), 'UNIT');
     return maxStake;
 }
-/**
- * Send funds to a test account, adding the max of 2 * stakeAmount or 100 * the
- * existential deposit
- * @param env
- * @param stakeAmount
- */
 export function getSendAmount(env, stakeAmount) {
     const unit = oneUnit(env.getApi());
     env.logger.debug('Stake amount', stakeAmount.div(unit).toNumber(), 'UNIT');
     let sendAmount = new BN(stakeAmount).muln(2);
-    // Should result in each account receiving a minimum of existentialDeposit
     sendAmount = BN.max(sendAmount, env.getApi().consts.balances.existentialDeposit.muln(100));
     env.logger.debug('Setting send amount to', sendAmount.div(unit).toNumber(), 'UNIT');
     return sendAmount;

package/dist/setup/funds.js.map

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

package/dist/setup/index.js

@@ -1,16 +1,3 @@
-// Copyright 2021-2023 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.
 export * from './setup.js';
 export * from './provider.js';
 export * from './dapp.js';

package/dist/setup/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/setup/index.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/setup/index.ts"],"names":[],"mappings":"AAaA,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA"}

package/dist/setup/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/setup/provider.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAGjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAQxD,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,OAAO,iBAgC1G;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,mBAAmB,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDvG"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/setup/provider.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAGjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAQxD,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,OAAO,iBAgC1G;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,mBAAmB,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkDvG"}

package/dist/setup/provider.js

@@ -1,7 +1,7 @@
 import { ProsopoEnvError } from '@prosopo/common';
 import { Tasks } from '@prosopo/provider';
+import { datasetWithSolutionHashes } from '@prosopo/datasets';
 import { getSendAmount, getStakeAmount, sendFunds } from './funds.js';
-import { loadJSONFile } from '@prosopo/cli';
 import { stringToU8a } from '@polkadot/util';
 import { wrapQuery } from '@prosopo/contract';
 export async function registerProvider(env, account, force) {
@@ -20,10 +20,8 @@ export async function registerProvider(env, account, force) {
         account.address = providerKeyringPair.address;
         const result = await wrapQuery(env.getContractInterface().query.getProviderStakeThreshold, env.getContractInterface().query)();
         const stakeAmount = result.rawNumber;
-        // use the minimum stake amount from the contract to create a reasonable stake amount
         account.stake = getStakeAmount(env, stakeAmount);
         const sendAmount = getSendAmount(env, account.stake);
-        // send enough funds to cover the stake amount and more
         await sendFunds(env, account.address, 'Provider', sendAmount);
         await setupProvider(env, account);
     }
@@ -74,11 +72,9 @@ export async function setupProvider(env, provider) {
             value: provider.stake,
         },
     ];
-    // Do this to catch any errors before running the tx
     await wrapQuery(tasks.contract.query.providerUpdate, tasks.contract.query)(...providerUpdateArgs);
     await tasks.contract.tx.providerUpdate(...providerUpdateArgs);
     logger.info('   - providerSetDataset');
-    const datasetJSON = loadJSONFile(provider.datasetFile);
-    await tasks.providerSetDatasetFromFile(datasetJSON);
+    await tasks.providerSetDataset(datasetWithSolutionHashes);
 }
 //# sourceMappingURL=provider.js.map

package/dist/setup/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/setup/provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/setup/provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAGjD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE7C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAwB,EAAE,OAAyB,EAAE,KAAe;IACvG,IAAI;QACA,MAAM,QAAQ,GAAG,CAAC,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;QAC9G,IAAI,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,QAAQ,IAAI,CAAC,KAAK,EAAE;YACnD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAA;YACxE,OAAM;SACT;KACJ;IAAC,MAAM;QACJ,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAA;KAC7D;IACD,IAAI,OAAO,CAAC,MAAM,EAAE;QAChB,MAAM,mBAAmB,GAAgB,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAEpF,OAAO,CAAC,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAA;QAE7C,MAAM,MAAM,GAAiB,MAAM,SAAS,CACxC,GAAG,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,yBAAyB,EAC1D,GAAG,CAAC,oBAAoB,EAAE,CAAC,KAAK,CACnC,EAAE,CAAA;QACH,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAA;QAGpC,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAChD,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAGpD,MAAM,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;QAE7D,MAAM,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;KACpC;SAAM;QACH,MAAM,IAAI,eAAe,CAAC,6BAA6B,CAAC,CAAA;KAC3D;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAwB,EAAE,QAA0B;IACpF,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAChB,MAAM,IAAI,eAAe,CAAC,iCAAiC,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;KACnG;IACD,MAAM,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACrC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IACzB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;IACpC,MAAM,oBAAoB,GAA6D;QACnF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrC,QAAQ,CAAC,GAAG;QACZ,QAAQ,CAAC,KAAK;QACd;YACI,KAAK,EAAE,CAAC;SACX;KACJ,CAAA;IACD,IAAI,cAAc,GAAG,KAAK,CAAA;IAC1B,IAAI;QACA,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAA;KACxG;IAAC,OAAO,CAAC,EAAE;QACR,IAAI,CAAC,KAAK,gBAAgB,EAAE;YACxB,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;YACtC,cAAc,GAAG,IAAI,CAAA;SACxB;aAAM;YACH,MAAM,CAAC,CAAA;SACV;KACJ;IAED,IAAI,CAAC,cAAc,EAAE;QACjB,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,oBAAoB,CAAC,CAAA;KACpE;IACD,MAAM,kBAAkB,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACpH,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;IAC/B,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IACjC,MAAM,kBAAkB,GAA2D;QAC/E,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrC,QAAQ,CAAC,GAAG;QACZ,QAAQ,CAAC,KAAK;QACd;YACI,KAAK,EAAE,QAAQ,CAAC,KAAK;SACxB;KACJ,CAAA;IAGD,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAA;IAEjG,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC,CAAA;IAE7D,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;IACtC,MAAM,KAAK,CAAC,kBAAkB,CAAC,yBAAyB,CAAC,CAAA;AAC7D,CAAC"}

package/dist/setup/setup.d.ts

@@ -1,2 +1,3 @@
+export declare function updateEnvFile(vars: Record<string, string>): Promise<void>;
 export declare function setup(force: boolean): Promise<void>;
 //# sourceMappingURL=setup.d.ts.map

package/dist/setup/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/setup/setup.ts"],"names":[],"mappings":"AAsGA,wBAAsB,KAAK,CAAC,KAAK,EAAE,OAAO,iBA4DzC"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/setup/setup.ts"],"names":[],"mappings":"AAwFA,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,iBAW/D;AAMD,wBAAsB,KAAK,CAAC,KAAK,EAAE,OAAO,iBA8EzC"}

package/dist/setup/setup.js

@@ -1,35 +1,38 @@
 import { LogLevel, ProsopoEnvError, getLogger } from '@prosopo/common';
-import { Payee } from '@prosopo/captcha-contract';
+import { Payee } from '@prosopo/captcha-contract/types-returns';
 import { ProviderEnvironment } from '@prosopo/env';
 import { defaultConfig, getSecret } from '@prosopo/cli';
 import { generateMnemonic, getPairAsync, wrapQuery } from '@prosopo/contract';
 import { get } from '@prosopo/util';
 import { getEnvFile } from '@prosopo/cli';
+import { isAddress } from '@polkadot/util-crypto';
 import { registerProvider } from './provider.js';
 import { setupDapp } from './dapp.js';
+import { updateDemoHTMLFiles, updateEnvFiles } from '../util/index.js';
 import fse from 'fs-extra';
 import path from 'path';
 const logger = getLogger(LogLevel.enum.info, 'setup');
 const __dirname = path.resolve();
-// Take the root dir from the environment or assume it's the root of this package
 function getRootDir() {
-    const rootDir = process.env.ROOT_DIR || path.resolve(__dirname, '../..');
+    const rootDir = process.env.PROSOPO_ROOT_DIR || path.resolve(__dirname, '../..');
     logger.info('Root dir:', rootDir);
     return rootDir;
 }
 function getDatasetFilePath() {
-    const datasetFile = process.env.PROVIDER_DATASET_FILE || path.resolve('../data/captchas.json');
+    const datasetFile = process.env.PROSOPO_PROVIDER_DATASET_FILE || path.resolve('../data/captchas.json');
     logger.info('Dataset file:', datasetFile);
     return datasetFile;
 }
 function getDefaultProvider() {
     return {
-        url: process.env.API_PORT ? `http://localhost:${process.env.API_PORT}` : 'http://localhost:3000',
+        url: process.env.PROSOPO_API_PORT
+            ? `http://localhost:${process.env.PROSOPO_API_PORT}`
+            : 'http://localhost:3000',
         fee: 10,
         payee: Payee.dapp,
         stake: Math.pow(10, 13),
         datasetFile: getDatasetFilePath(),
-        address: process.env.PROVIDER_ADDRESS || '',
+        address: process.env.PROSOPO_PROVIDER_ADDRESS || '',
         secret: getSecret(),
         captchaDatasetId: '',
     };
@@ -37,14 +40,12 @@ function getDefaultProvider() {
 function getDefaultDapp() {
     return {
         secret: '//Eve',
-        contractAccount: process.env.DAPP_SITE_KEY || '',
         fundAmount: Math.pow(10, 12),
     };
 }
 async function copyEnvFile() {
     try {
         const rootDir = getRootDir();
-        // TODO move all env files to a single template location
         const tplLocation = path.resolve(rootDir, './dev/scripts');
         const tplEnvFile = getEnvFile(tplLocation, 'env');
         const envFile = getEnvFile(tplLocation, '.env');
@@ -61,17 +62,18 @@ function updateEnvFileVar(source, name, value) {
     }
     return source + `\n${name}=${value}`;
 }
-async function updateEnvFile(vars) {
+export async function updateEnvFile(vars) {
     const rootDir = getRootDir();
     const envFile = getEnvFile(rootDir, '.env');
     let readEnvFile = await fse.readFile(envFile, 'utf8');
     for (const key in vars) {
         readEnvFile = updateEnvFileVar(readEnvFile, key, get(vars, key));
     }
+    logger.info(`Updating ${envFile}`);
     await fse.writeFile(envFile, readEnvFile);
 }
-async function registerDapp(env, dapp) {
-    await setupDapp(env, dapp);
+async function registerDapp(env, dapp, address) {
+    await setupDapp(env, dapp, address);
 }
 export async function setup(force) {
     const defaultProvider = getDefaultProvider();
@@ -86,8 +88,8 @@ export async function setup(force) {
         logger.debug(`Mnemonic: ${mnemonic}`);
         logger.debug('Writing .env file...');
         await copyEnvFile();
-        if (!process.env.DAPP_SITE_KEY) {
-            throw new ProsopoEnvError('DEVELOPER.DAPP_SITE_KEY_MISSING');
+        if (!process.env.PROSOPO_SITE_KEY) {
+            throw new ProsopoEnvError('DEVELOPER.PROSOPO_SITE_KEY_MISSING');
         }
         const config = defaultConfig();
         const providerSecret = config.account.secret;
@@ -102,16 +104,27 @@ export async function setup(force) {
         env.logger.info(`Registering provider... ${defaultProvider.address}`);
         defaultProvider.pair = await getPairAsync(network, providerSecret);
         await registerProvider(env, defaultProvider, force);
-        defaultDapp.contractAccount = process.env.DAPP_SITE_KEY;
         defaultDapp.pair = await getPairAsync(network, defaultDapp.secret);
-        env.logger.info('Registering dapp...');
-        await registerDapp(env, defaultDapp);
+        let dappAddressToRegister = defaultDapp.pair.address;
+        if (process.env.PROSOPO_SITE_KEY && isAddress(process.env.PROSOPO_SITE_KEY)) {
+            dappAddressToRegister = process.env.PROSOPO_SITE_KEY;
+            if (process.env.PROSOPO_SITE_PRIVATE_KEY) {
+                defaultDapp.secret = process.env.PROSOPO_SITE_PRIVATE_KEY;
+                defaultDapp.pair = await getPairAsync(network, defaultDapp.secret);
+                dappAddressToRegister = defaultDapp.pair.address;
+            }
+        }
+        env.logger.info(`Registering dapp... ${defaultDapp.pair.address}`);
+        await registerDapp(env, defaultDapp, dappAddressToRegister);
         if (!hasProviderAccount) {
             await updateEnvFile({
                 PROVIDER_MNEMONIC: `"${mnemonic}"`,
                 PROVIDER_ADDRESS: address,
             });
         }
+        env.logger.debug('Updating env files with PROSOPO_SITE_KEY');
+        await updateDemoHTMLFiles([/data-sitekey="(\w{48})"/, /siteKey:\s*'(\w{48})'/], defaultDapp.pair.address, env.logger);
+        await updateEnvFiles(['NEXT_PUBLIC_PROSOPO_SITE_KEY', 'PROSOPO_SITE_KEY'], defaultDapp.pair.address, env.logger);
         process.exit();
     }
     else {
@@ -119,12 +132,4 @@ export async function setup(force) {
         throw new ProsopoEnvError(`GENERAL.NO_MNEMONIC_OR_SEED`);
     }
 }
-//if main process
-// if (typeof require !== 'undefined' && require.main === module) {
-//     console.info('Running setup as main process')
-//
-//     setup()
-//         .then((r) => logger.debug('Setup done'))
-//         .catch((e) => console.error(e))
-// }
 //# sourceMappingURL=setup.js.map

package/dist/setup/setup.js.map

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

package/dist/util/exec.js

@@ -1,22 +1,9 @@
-// Copyright 2021-2023 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 { spawn } from 'child_process';
 import { stdin } from 'process';
 export const exec = (command, options) => {
     let { pipe, printCmd } = options || {};
-    pipe = pipe === undefined || pipe; // map undefined to true
-    printCmd = printCmd === undefined || printCmd; // map undefined to true
+    pipe = pipe === undefined || pipe;
+    printCmd = printCmd === undefined || printCmd;
     if (printCmd) {
         console.log(`[exec] ${command}`);
     }