@prosopo/scripts 0.2.11 → 0.2.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +6 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/contract/deploy/protocol.js +2 -2
- package/dist/contract/deploy/protocol.js.map +1 -1
- package/dist/contract/import.js +5 -5
- package/dist/contract/import.js.map +1 -1
- package/dist/scripts/fluxDeploy.js +20 -20
- package/dist/scripts/fluxDeploy.js.map +1 -1
- package/dist/scripts/setVersion.d.ts.map +1 -1
- package/dist/scripts/setVersion.js +15 -4
- package/dist/scripts/setVersion.js.map +1 -1
- package/dist/setup/dapp.d.ts +1 -1
- package/dist/setup/dapp.d.ts.map +1 -1
- package/dist/setup/dapp.js +23 -7
- package/dist/setup/dapp.js.map +1 -1
- package/dist/setup/provider.d.ts.map +1 -1
- package/dist/setup/provider.js +2 -3
- package/dist/setup/provider.js.map +1 -1
- package/dist/setup/setup.d.ts.map +1 -1
- package/dist/setup/setup.js +23 -7
- package/dist/setup/setup.js.map +1 -1
- package/dist/util/updateEnv.d.ts +1 -0
- package/dist/util/updateEnv.d.ts.map +1 -1
- package/dist/util/updateEnv.js +37 -7
- package/dist/util/updateEnv.js.map +1 -1
- package/env.rococo +2 -2
- package/package.json +28 -26
package/dist/cli/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAgCA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAgCA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,iBA+I/C"}
|
package/dist/cli/index.js
CHANGED
|
@@ -15,10 +15,10 @@ import { LogLevel, getLogger } from '@prosopo/common';
|
|
|
15
15
|
import { deployDapp, deployProtocol } from '../contract/deploy/index.js';
|
|
16
16
|
import { exec } from '../util/index.js';
|
|
17
17
|
import { getContractNames, getPaths } from '@prosopo/config';
|
|
18
|
+
import { getEnv, loadEnv } from '@prosopo/cli';
|
|
18
19
|
import { getLogLevel } from '@prosopo/common';
|
|
19
20
|
import { hideBin } from 'yargs/helpers';
|
|
20
21
|
import { importContract } from '../contract/index.js';
|
|
21
|
-
import { loadEnv } from '@prosopo/cli';
|
|
22
22
|
import { setup } from '../setup/index.js';
|
|
23
23
|
import { updateEnvFiles } from '../util/index.js';
|
|
24
24
|
import path from 'path';
|
|
@@ -71,6 +71,11 @@ export async function processArgs(args) {
|
|
|
71
71
|
if (argv.update_env) {
|
|
72
72
|
await updateEnvFiles(['DAPP_SITE_KEY', 'REACT_APP_DAPP_SITE_KEY', 'NEXT_PUBLIC_DAPP_SITE_KEY', 'PROSOPO_SITE_KEY'], dappContractAddress.toString(), log);
|
|
73
73
|
}
|
|
74
|
+
}, [])
|
|
75
|
+
.command('create_env_files', 'Copies the env.xyz files to .env.xyz', (yargs) => yargs, async (argv) => {
|
|
76
|
+
const env = getEnv();
|
|
77
|
+
const paths = getPaths();
|
|
78
|
+
await exec(`cp -v ${paths.scripts}/env.${env} ${paths.scripts}/.env.${env}`);
|
|
74
79
|
}, [])
|
|
75
80
|
.command({
|
|
76
81
|
command: 'setup',
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/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,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,9 @@
|
|
|
13
13
|
// limitations under the License.
|
|
14
14
|
import { Abi } from '@polkadot/api-contract';
|
|
15
15
|
import { AbiJSON, Wasm } from '../../util/index.js';
|
|
16
|
-
import { ContractAbi } from '@prosopo/captcha-contract';
|
|
16
|
+
import { ContractAbi } from '@prosopo/captcha-contract/contract-info';
|
|
17
17
|
import { ContractDeployer, getPairAsync } from '@prosopo/contract';
|
|
18
|
-
import { ContractFile } from '@prosopo/captcha-contract';
|
|
18
|
+
import { ContractFile } from '@prosopo/captcha-contract/contract-info';
|
|
19
19
|
import { LogLevel, getLogger, reverseHexString } from '@prosopo/common';
|
|
20
20
|
import { ProviderEnvironment } from '@prosopo/env';
|
|
21
21
|
import { defaultConfig, getSecret } from '@prosopo/cli';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/contract/deploy/protocol.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,GAAG,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/contract/deploy/protocol.ts"],"names":[],"mappings":"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"}
|
package/dist/contract/import.js
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
// See the License for the specific language governing permissions and
|
|
13
13
|
// limitations under the License.
|
|
14
14
|
import { exec } from '../util/index.js';
|
|
15
|
-
import { lodash } from '@prosopo/util';
|
|
15
|
+
import { lodash } from '@prosopo/util/lodash';
|
|
16
16
|
import fs from 'fs';
|
|
17
17
|
import path from 'path';
|
|
18
18
|
const replaceExtension = (file, ext) => {
|
|
@@ -29,7 +29,7 @@ async function importContract(pathToAbis, pathToOutput) {
|
|
|
29
29
|
if (!fs.existsSync(pathToAbis))
|
|
30
30
|
throw new Error(`Path to ABIs does not exist: ${pathToAbis}`);
|
|
31
31
|
await exec(`mkdir -p ${pathToOutput}`);
|
|
32
|
-
const cmd = `npx @
|
|
32
|
+
const cmd = `npx @prosopo/typechain-polkadot --in ${pathToAbis} --out ${pathToOutput}`;
|
|
33
33
|
await exec(cmd);
|
|
34
34
|
const name = path.basename(pathToAbis);
|
|
35
35
|
// copy the metadata
|
|
@@ -93,15 +93,15 @@ async function importContract(pathToAbis, pathToOutput) {
|
|
|
93
93
|
});
|
|
94
94
|
// replace EventRecord with EventRecord[]
|
|
95
95
|
// eslint-disable-next-line no-useless-escape
|
|
96
|
-
replaced = replaced.replace(
|
|
97
|
-
const result =
|
|
96
|
+
replaced = replaced.replace(/: EventRecord\)/g, (match) => {
|
|
97
|
+
const result = `: EventRecord[])`;
|
|
98
98
|
if (verbose)
|
|
99
99
|
console.log(`Replacing \n\t${match}\nwith\n\t${result}\nin ${filePath}`);
|
|
100
100
|
return result;
|
|
101
101
|
});
|
|
102
102
|
// replace EventRecord incorrect imports
|
|
103
103
|
// eslint-disable-next-line no-useless-escape
|
|
104
|
-
replaced = replaced.replace(/import\s+type\s+\{\s*EventRecord\
|
|
104
|
+
replaced = replaced.replace(/import\s+type\s+\{\s*EventRecord\s*\}\s+from\s+['"]@polkadot\/api\/submittable["']/g, (match) => {
|
|
105
105
|
const result = `import type { EventRecord } from '@polkadot/types/interfaces'`;
|
|
106
106
|
if (verbose)
|
|
107
107
|
console.log(`Replacing \n\t${match}\nwith\n\t${result}\nin ${filePath}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/contract/import.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,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/contract/import.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,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AAgBvB,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,GAAW,EAAU,EAAE;IAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC7B,KAAK,CAAC,GAAG,EAAE,CAAA;IACX,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACf,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC1B,CAAC,CAAA;AAED,KAAK,UAAU,cAAc,CAAC,UAAkB,EAAE,YAAoB;IAClE,MAAM,OAAO,GAAG,KAAK,CAAA;IACrB,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAA;IACrD,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAA;IACzD,kGAAkG;IAClG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,UAAU,EAAE,CAAC,CAAA;IAC7F,MAAM,IAAI,CAAC,YAAY,YAAY,EAAE,CAAC,CAAA;IACtC,MAAM,GAAG,GAAG,wCAAwC,UAAU,UAAU,YAAY,EAAE,CAAA;IACtF,MAAM,IAAI,CAAC,GAAG,CAAC,CAAA;IACf,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;IACtC,oBAAoB;IACpB,sEAAsE;IACtE,MAAM,IAAI,CAAC,MAAM,UAAU,IAAI,IAAI,SAAS,YAAY,IAAI,IAAI,OAAO,CAAC,CAAA;IACxE,yCAAyC;IACzC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;QACzB,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;YACrC,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAClC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;gBACpB,IAAI,CAAC,QAAQ,CAAC,CAAA;aACjB;iBAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACjC,0DAA0D;gBAC1D,6CAA6C;gBAC7C,MAAM,KAAK,GAAG,6EAA6E,CAAA;gBAC3F,MAAM,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;gBACtD,IAAI,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;oBAC7D,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAA;oBAC3B,MAAM,SAAS,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAA;oBAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;oBAC9B,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;oBACnC,IAAI,OAAO;wBAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAA;oBACvC,IAAI,OAAO;wBAAE,OAAO,CAAC,GAAG,CAAC,cAAc,SAAS,EAAE,CAAC,CAAA;oBACnD,IAAI,OAAO;wBAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;oBACpC,IAAI,MAAM,GAAG,EAAE,CAAA;oBACf,IAAI,SAAS,KAAK,IAAI,EAAE;wBACpB,4BAA4B;wBAC5B,OAAO,KAAK,CAAA;qBACf;yBAAM,IAAI,SAAS,KAAK,MAAM,EAAE;wBAC7B,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;4BAC/B,qBAAqB;4BACrB,OAAO,KAAK,CAAA;yBACf;wBACD,uBAAuB;wBACvB,MAAM,GAAG,GAAG,KAAK,IAAI,GAAG,2BAA2B,CAAA;qBACtD;yBAAM;wBACH,sBAAsB;wBACtB,MAAM,GAAG,GAAG,KAAK,IAAI,GAAG,MAAM,CAAA;qBACjC;oBACD,IAAI,OAAO;wBAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,aAAa,MAAM,QAAQ,QAAQ,EAAE,CAAC,CAAA;oBACrF,OAAO,GAAG,MAAM,EAAE,CAAA;gBACtB,CAAC,CAAC,CAAA;gBACF,6CAA6C;gBAC7C,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,iCAAiC,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;oBAC7E,6CAA6C;oBAC7C,IAAI,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC;wBAAE,OAAO,KAAK,CAAA;oBACzD,MAAM,MAAM,GAAG,KAAK,EAAE,KAAK,EAAE,kEAAkE,EAAE,eAAe,CAAA;oBAChH,IAAI,OAAO;wBAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,aAAa,MAAM,QAAQ,QAAQ,EAAE,CAAC,CAAA;oBACrF,OAAO,MAAM,CAAA;gBACjB,CAAC,CAAC,CAAA;gBAEF,yCAAyC;gBACzC,6CAA6C;gBAC7C,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE;oBACtD,MAAM,MAAM,GAAG,kBAAkB,CAAA;oBACjC,IAAI,OAAO;wBAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,aAAa,MAAM,QAAQ,QAAQ,EAAE,CAAC,CAAA;oBACrF,OAAO,MAAM,CAAA;gBACjB,CAAC,CAAC,CAAA;gBAEF,wCAAwC;gBACxC,6CAA6C;gBAC7C,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACvB,qFAAqF,EACrF,CAAC,KAAK,EAAE,EAAE;oBACN,MAAM,MAAM,GAAG,+DAA+D,CAAA;oBAC9E,IAAI,OAAO;wBAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,aAAa,MAAM,QAAQ,QAAQ,EAAE,CAAC,CAAA;oBACrF,OAAO,MAAM,CAAA;gBACjB,CAAC,CACJ,CAAA;gBAED,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;aACvC;SACJ;IACL,CAAC,CAAA;IACD,IAAI,CAAC,YAAY,CAAC,CAAA;IAElB,MAAM,CAAC,GAAG,MAAM,EAAE,CAAA;IAElB,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,EAAE;QACtC,wBAAwB;QACxB,MAAM,aAAa,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACtD,OAAO,EAAE,CAAC,SAAS,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;QACvD,CAAC,CAAC,CAAA;QACF,MAAM,WAAW,GAAa,EAAE,CAAA;QAChC,kHAAkH;QAClH,0HAA0H;QAC1H,MAAM,gBAAgB,GAAmB;YACrC;gBACI,GAAG,EAAE,iBAAiB;gBACtB,iBAAiB,EAAE,YAAY;aAClC;YACD;gBACI,GAAG,EAAE,cAAc;aACtB;YACD;gBACI,GAAG,EAAE,eAAe;gBACpB,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,aAAa;qBACtB;oBACD;wBACI,IAAI,EAAE,cAAc;qBACvB;iBACJ;aACJ;YACD;gBACI,GAAG,EAAE,WAAW;gBAChB,iBAAiB,EAAE,UAAU;aAChC;YACD;gBACI,GAAG,EAAE,MAAM;aACd;YACD;gBACI,GAAG,EAAE,YAAY;aACpB;YACD,8EAA8E;YAC9E,yBAAyB;YACzB,KAAK;YACL;gBACI,GAAG,EAAE,QAAQ;aAChB;YACD;gBACI,GAAG,EAAE,eAAe;gBACpB,iBAAiB,EAAE,SAAS;aAC/B;YACD;gBACI,GAAG,EAAE,OAAO;gBACZ,iBAAiB,EAAE,OAAO;aAC7B;YACD;gBACI,GAAG,EAAE,kBAAkB;gBACvB,iBAAiB,EAAE,IAAI;aAC1B;SACJ,CAAA;QACD,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,2CAA2C;QAC3C,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;YACzC,MAAM,OAAO,GAAG,GAAG,GAAG,IAAI,eAAe,CAAC,GAAG,EAAE,CAAA;YAC/C,uDAAuD;YACvD,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YACrC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACpB,MAAM,IAAI,KAAK,CAAC,sBAAsB,OAAO,WAAW,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;aAC1E;YACD,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YACrB,IAAI,IAAI,KAAK,EAAE,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAA;aACjD;YACD,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACtB,iCAAiC;gBACjC,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;aACtC;YAED,iCAAiC;YACjC,IAAI,eAAe,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBACjD,MAAM,IAAI,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,iBAAiB,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC,CAAA;gBAChG,WAAW,CAAC,IAAI,CAAC,uBAAuB,IAAI,cAAc,eAAe,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,CAAA;aAC5F;YACD,gCAAgC;YAChC,IAAI,eAAe,CAAC,OAAO,KAAK,SAAS,EAAE;gBACvC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBAC5C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;oBACjE,WAAW,CAAC,IAAI,CAAC,YAAY,WAAW,CAAC,IAAI,GAAG,KAAK,cAAc,eAAe,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,CAAA;gBACtG,CAAC,CAAC,CAAA;aACL;QACL,CAAC,CAAC,CAAA;QAEF,uDAAuD;QACvD,WAAW,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAA;QAErD,sJAAsJ;QACtJ,MAAM,KAAK,GAAG,4BAA4B,CAAA;QAC1C,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAC3C,MAAM,yBAAyB,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,GAAG,oBAAoB,MAAM,EAAE,EAAE,MAAM,CAAC,CAAA;QAC7F,MAAM,uBAAuB,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,GAAG,kBAAkB,MAAM,EAAE,EAAE,MAAM,CAAC,CAAA;QACzF,MAAM,aAAa,GAAiB,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACpG,OAAO;gBACH,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;gBACpB,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;aAC3B,CAAA;QACL,CAAC,CAAC,CAAA;QACF,MAAM,WAAW,GAAiB,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAChG,OAAO;gBACH,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;gBACpB,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;aAC3B,CAAA;QACL,CAAC,CAAC,CAAA;QACF,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAClE,MAAM,WAAW,GAAG,CAAC,GAAG,aAAa,CAAC,CAAA;QACtC,MAAM,SAAS,GAAa,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;QAC3E,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1B,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBACzC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACvB,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;aACpC;iBAAM;gBACH,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;aAClC;QACL,CAAC,CAAC,CAAA;QACF,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;YAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,KAAK,MAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;YACzF,WAAW,CAAC,IAAI,CAAC,SAAS,MAAM,MAAM,KAAK,CAAC,IAAI,cAAc,QAAQ,IAAI,IAAI,GAAG,CAAC,CAAA;QACtF,CAAC,CAAC,CAAA;QAEF,uCAAuC;QACvC,EAAE,CAAC,aAAa,CAAC,GAAG,GAAG,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/D,CAAC,CAAA;IAED,iBAAiB,CAAC,YAAY,CAAC,CAAA;AACnC,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE;IACjC,MAAM,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC/B,IAAI,CAAC,IAAI,CAAC,EAAE;QACR,gDAAgD;QAChD,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;KACxB;IACD,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC1B,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE;QACjB,OAAO,EAAE,CAAA;KACZ;IACD,OAAO,GAAG,CAAC,GAAG,EAAE,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE;IAC5B,sCAAsC;IACtC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAA;IAC9D,gCAAgC;IAChC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;IACtD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;AAC9B,CAAC,CAAA;AAED,eAAe,cAAc,CAAA"}
|
|
@@ -3,33 +3,33 @@ import { base64Encode } from '@polkadot/util-crypto';
|
|
|
3
3
|
import { getLogger } from '@prosopo/common';
|
|
4
4
|
import { loadEnv } from '@prosopo/cli';
|
|
5
5
|
import { sign, wifToPrivateKey } from './sep256k1Sign.js';
|
|
6
|
-
import axios from 'axios';
|
|
7
6
|
import qs from 'qs';
|
|
8
7
|
const log = getLogger(`Info`, `fluxDeploy.js`);
|
|
9
|
-
const errorHandler = (
|
|
10
|
-
if (
|
|
11
|
-
throw new Error(
|
|
8
|
+
const errorHandler = async (response) => {
|
|
9
|
+
if (!response.ok) {
|
|
10
|
+
throw new Error(`HTTP error! status: ${response.status}`);
|
|
12
11
|
}
|
|
13
|
-
|
|
12
|
+
const data = await response.json();
|
|
13
|
+
if (data && data.status === 'error') {
|
|
14
|
+
throw new Error(data.data.message);
|
|
15
|
+
}
|
|
16
|
+
return data;
|
|
14
17
|
};
|
|
15
18
|
const getLoginPhrase = async (url) => {
|
|
16
19
|
const apiURL = new URL(`${url || 'https://api.runonflux.io/'}id/loginphrase`);
|
|
17
20
|
log.info('Calling:', apiURL.href);
|
|
18
|
-
const response = await
|
|
19
|
-
errorHandler(response);
|
|
20
|
-
return response.data.data;
|
|
21
|
+
const response = await fetch(apiURL.toString());
|
|
22
|
+
return await errorHandler(response);
|
|
21
23
|
};
|
|
22
24
|
const getFluxAppsDetails = async (zelId, signature, loginPhrase) => {
|
|
23
25
|
const apiUrl = `https://jetpackbridge.runonflux.io/api/v1/dapps.php?filter=&zelid=${zelId}&signature=${signature}&loginPhrase=${loginPhrase}`;
|
|
24
|
-
const response = await
|
|
25
|
-
errorHandler(response);
|
|
26
|
-
return response.data;
|
|
26
|
+
const response = await fetch(apiUrl);
|
|
27
|
+
return await errorHandler(response);
|
|
27
28
|
};
|
|
28
29
|
const getIndividualFluxAppDetails = async (dappName, zelId, signature, loginPhrase) => {
|
|
29
30
|
const apiUrl = `https://jetpackbridge.runonflux.io/api/v1/dapps.php?dapp=${dappName}&zelid=${zelId}&signature=${signature}&loginPhrase=${loginPhrase}`;
|
|
30
|
-
const response = await
|
|
31
|
-
errorHandler(response);
|
|
32
|
-
return response.data;
|
|
31
|
+
const response = await fetch(apiUrl);
|
|
32
|
+
return await errorHandler(response);
|
|
33
33
|
};
|
|
34
34
|
const getFluxOSURLs = async (dappName, zelId, signature, loginPhrase) => {
|
|
35
35
|
const data = await getIndividualFluxAppDetails(dappName, zelId, signature, loginPhrase);
|
|
@@ -44,12 +44,12 @@ const verifyLogin = async (zelid, signature, loginPhrase, url) => {
|
|
|
44
44
|
loginPhrase,
|
|
45
45
|
});
|
|
46
46
|
log.info('Data:', data);
|
|
47
|
-
const response = await
|
|
47
|
+
const response = await fetch(apiUrl, {
|
|
48
48
|
method: 'POST',
|
|
49
|
+
body: data,
|
|
49
50
|
headers: { 'Content-Type': `application/x-www-form-urlencoded` },
|
|
50
51
|
});
|
|
51
|
-
errorHandler(response);
|
|
52
|
-
return response;
|
|
52
|
+
return await errorHandler(response);
|
|
53
53
|
};
|
|
54
54
|
const softRedeploy = async (zelid, signature, loginPhrase, url) => {
|
|
55
55
|
const apiUrl = new URL(`${url}apps/redeploy/imageServer/false/true`).toString();
|
|
@@ -58,13 +58,13 @@ const softRedeploy = async (zelid, signature, loginPhrase, url) => {
|
|
|
58
58
|
signature,
|
|
59
59
|
loginPhrase,
|
|
60
60
|
});
|
|
61
|
-
const response = await
|
|
61
|
+
const response = await fetch(apiUrl, {
|
|
62
62
|
method: 'GET',
|
|
63
63
|
headers: {
|
|
64
64
|
Zelidauth: Zelidauth,
|
|
65
65
|
},
|
|
66
66
|
});
|
|
67
|
-
errorHandler(response);
|
|
67
|
+
await errorHandler(response);
|
|
68
68
|
return response;
|
|
69
69
|
};
|
|
70
70
|
const setupArgs = () => {
|
|
@@ -125,7 +125,7 @@ const getNode = async (appName, zelId, secretKey) => {
|
|
|
125
125
|
await verifyLogin(zelId, nodeSignature, nodeLoginPhrase, nodeAPIURL);
|
|
126
126
|
// Soft redeploy the app
|
|
127
127
|
const redployResponse = await softRedeploy(zelId, nodeSignature, nodeLoginPhrase, nodeAPIURL);
|
|
128
|
-
log.info(redployResponse.
|
|
128
|
+
log.info(redployResponse.json());
|
|
129
129
|
process.exit(0);
|
|
130
130
|
}
|
|
131
131
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fluxDeploy.js","sourceRoot":"","sources":["../../src/scripts/fluxDeploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAA;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACzD,OAAO,
|
|
1
|
+
{"version":3,"file":"fluxDeploy.js","sourceRoot":"","sources":["../../src/scripts/fluxDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setVersion.d.ts","sourceRoot":"","sources":["../../src/scripts/setVersion.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setVersion.d.ts","sourceRoot":"","sources":["../../src/scripts/setVersion.ts"],"names":[],"mappings":"AAoDA,wBAA8B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,iBAgG1E"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import { getLogLevel, getLogger } from '@prosopo/common';
|
|
2
2
|
import { getPaths } from '@prosopo/config';
|
|
3
|
+
import { loadEnv } from '@prosopo/cli';
|
|
3
4
|
import { parse, stringify } from '@iarna/toml';
|
|
4
5
|
import fs from 'fs';
|
|
5
6
|
import path from 'path';
|
|
6
|
-
|
|
7
|
+
// We have to load env here if we're importing this file from cli/index.ts, otherwise, the env is loaded after the
|
|
8
|
+
// logger is created
|
|
9
|
+
loadEnv();
|
|
10
|
+
const logLevel = getLogLevel();
|
|
11
|
+
const log = getLogger(logLevel, 'setVersion');
|
|
12
|
+
log.info('Log level:', logLevel);
|
|
7
13
|
const parseVersion = (version) => {
|
|
8
14
|
try {
|
|
9
15
|
const parts = version.split('.');
|
|
@@ -43,10 +49,11 @@ const find = (pth, filter) => {
|
|
|
43
49
|
return results;
|
|
44
50
|
};
|
|
45
51
|
export default async function setVersion(version, ignore) {
|
|
46
|
-
log.info('
|
|
52
|
+
log.info('Setting version to ', version);
|
|
47
53
|
version = parseVersion(version);
|
|
48
54
|
const root = getPaths().root;
|
|
49
|
-
const ignorePaths = ['node_modules'
|
|
55
|
+
const ignorePaths = ['node_modules', 'cargo-cache', ...(ignore ?? [])];
|
|
56
|
+
log.debug('Ignoring paths: ', ignorePaths);
|
|
50
57
|
// walk through all files finding .json or .toml
|
|
51
58
|
const files = find(root, (pth) => {
|
|
52
59
|
// ignore node_modules and any user specified paths
|
|
@@ -76,7 +83,7 @@ export default async function setVersion(version, ignore) {
|
|
|
76
83
|
]) {
|
|
77
84
|
// detect any prosopo dependencies
|
|
78
85
|
for (const key of Object.keys(obj)) {
|
|
79
|
-
if (key.startsWith('@prosopo')) {
|
|
86
|
+
if (key.startsWith('@prosopo') && !key.includes('typechain')) {
|
|
80
87
|
// and replace version
|
|
81
88
|
log.debug(`setting ${key} to ${version} in ${pth}`);
|
|
82
89
|
obj[key] = version;
|
|
@@ -88,6 +95,10 @@ export default async function setVersion(version, ignore) {
|
|
|
88
95
|
// replace version in tomls
|
|
89
96
|
files
|
|
90
97
|
.filter((pth) => path.extname(pth) === '.toml')
|
|
98
|
+
.filter((pth) => {
|
|
99
|
+
// ignore node_modules and any user specified paths
|
|
100
|
+
return !ignorePaths.some((ignorePath) => pth.includes(ignorePath));
|
|
101
|
+
})
|
|
91
102
|
.forEach((pth) => {
|
|
92
103
|
log.debug('setting version in', pth);
|
|
93
104
|
const content = fs.readFileSync(pth, 'utf8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setVersion.js","sourceRoot":"","sources":["../../src/scripts/setVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,GAAG,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"setVersion.js","sourceRoot":"","sources":["../../src/scripts/setVersion.ts"],"names":[],"mappings":"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"}
|
package/dist/setup/dapp.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { IDappAccount } from '@prosopo/types';
|
|
2
2
|
import { ProviderEnvironment } from '@prosopo/types-env';
|
|
3
|
-
export declare function setupDapp(env: ProviderEnvironment, dapp: IDappAccount): Promise<void>;
|
|
3
|
+
export declare function setupDapp(env: ProviderEnvironment, dapp: IDappAccount, address?: string): Promise<void>;
|
|
4
4
|
//# sourceMappingURL=dapp.d.ts.map
|
package/dist/setup/dapp.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dapp.d.ts","sourceRoot":"","sources":["../../src/setup/dapp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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
CHANGED
|
@@ -11,28 +11,44 @@
|
|
|
11
11
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
12
|
// See the License for the specific language governing permissions and
|
|
13
13
|
// limitations under the License.
|
|
14
|
+
import { BN } from '@polkadot/util';
|
|
14
15
|
import { DappPayee } from '@prosopo/captcha-contract';
|
|
15
16
|
import { Tasks } from '@prosopo/provider';
|
|
16
|
-
import { wrapQuery } from '@prosopo/contract';
|
|
17
|
-
|
|
17
|
+
import { oneUnit, wrapQuery } from '@prosopo/contract';
|
|
18
|
+
import { sendFunds } from './funds.js';
|
|
19
|
+
export async function setupDapp(env, dapp, address) {
|
|
18
20
|
const logger = env.logger;
|
|
19
21
|
if (dapp.pair) {
|
|
22
|
+
const addressToRegister = address || dapp.pair.address;
|
|
20
23
|
await env.changeSigner(dapp.pair);
|
|
21
24
|
const tasks = new Tasks(env);
|
|
25
|
+
await dappSendFunds(env, dapp);
|
|
22
26
|
try {
|
|
23
|
-
const dappResult = await wrapQuery(tasks.contract.query.getDapp, tasks.contract.query)(
|
|
27
|
+
const dappResult = await wrapQuery(tasks.contract.query.getDapp, tasks.contract.query)(addressToRegister);
|
|
24
28
|
logger.info(' - dapp is already registered');
|
|
25
29
|
logger.info('Dapp', dappResult);
|
|
26
30
|
}
|
|
27
31
|
catch (e) {
|
|
28
32
|
logger.info(' - dappRegister');
|
|
29
|
-
await wrapQuery(tasks.contract.query.dappRegister, tasks.contract.query)(
|
|
30
|
-
await tasks.contract.tx.dappRegister(
|
|
33
|
+
await wrapQuery(tasks.contract.query.dappRegister, tasks.contract.query)(addressToRegister, DappPayee.dapp);
|
|
34
|
+
await tasks.contract.tx.dappRegister(addressToRegister, DappPayee.dapp);
|
|
31
35
|
logger.info(' - dappFund');
|
|
32
|
-
await wrapQuery(tasks.contract.query.dappFund, tasks.contract.query)(
|
|
36
|
+
await wrapQuery(tasks.contract.query.dappFund, tasks.contract.query)(addressToRegister, {
|
|
33
37
|
value: dapp.fundAmount,
|
|
34
38
|
});
|
|
35
|
-
await tasks.contract.tx.dappFund(
|
|
39
|
+
await tasks.contract.tx.dappFund(addressToRegister, { value: dapp.fundAmount });
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
async function dappSendFunds(env, dapp) {
|
|
44
|
+
if (dapp.pair && !dapp.pair.isLocked) {
|
|
45
|
+
const sendAmount = oneUnit(env.getApi());
|
|
46
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
47
|
+
// @ts-ignore
|
|
48
|
+
const { data: { free: previousFree }, } = await env.getContractInterface().api.query.system.account(dapp.pair.address);
|
|
49
|
+
if (previousFree.lt(new BN(sendAmount.toString()))) {
|
|
50
|
+
// send enough funds to cover the tx fees
|
|
51
|
+
await sendFunds(env, dapp.pair.address, 'Dapp', sendAmount);
|
|
36
52
|
}
|
|
37
53
|
}
|
|
38
54
|
}
|
package/dist/setup/dapp.js.map
CHANGED
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"dapp.js","sourceRoot":"","sources":["../../src/setup/dapp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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,
|
|
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,CAkDvG"}
|
package/dist/setup/provider.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ProsopoEnvError } from '@prosopo/common';
|
|
2
2
|
import { Tasks } from '@prosopo/provider';
|
|
3
|
+
import { datasetWithSolutionHashes } from '@prosopo/datasets';
|
|
3
4
|
import { getSendAmount, getStakeAmount, sendFunds } from './funds.js';
|
|
4
|
-
import { loadJSONFile } from '@prosopo/cli';
|
|
5
5
|
import { stringToU8a } from '@polkadot/util';
|
|
6
6
|
import { wrapQuery } from '@prosopo/contract';
|
|
7
7
|
export async function registerProvider(env, account, force) {
|
|
@@ -78,7 +78,6 @@ export async function setupProvider(env, provider) {
|
|
|
78
78
|
await wrapQuery(tasks.contract.query.providerUpdate, tasks.contract.query)(...providerUpdateArgs);
|
|
79
79
|
await tasks.contract.tx.providerUpdate(...providerUpdateArgs);
|
|
80
80
|
logger.info(' - providerSetDataset');
|
|
81
|
-
|
|
82
|
-
await tasks.providerSetDatasetFromFile(datasetJSON);
|
|
81
|
+
await tasks.providerSetDataset(datasetWithSolutionHashes);
|
|
83
82
|
}
|
|
84
83
|
//# sourceMappingURL=provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/setup/provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/setup/setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/setup/setup.ts"],"names":[],"mappings":"AAuGA,wBAAsB,KAAK,CAAC,KAAK,EAAE,OAAO,iBAkFzC"}
|
package/dist/setup/setup.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { LogLevel, ProsopoEnvError, getLogger } from '@prosopo/common';
|
|
2
|
-
import { Payee } from '@prosopo/captcha-contract';
|
|
2
|
+
import { Payee } from '@prosopo/captcha-contract/types-returns';
|
|
3
3
|
import { ProviderEnvironment } from '@prosopo/env';
|
|
4
4
|
import { defaultConfig, getSecret } from '@prosopo/cli';
|
|
5
5
|
import { generateMnemonic, getPairAsync, wrapQuery } from '@prosopo/contract';
|
|
6
6
|
import { get } from '@prosopo/util';
|
|
7
7
|
import { getEnvFile } from '@prosopo/cli';
|
|
8
|
+
import { isAddress } from '@polkadot/util-crypto';
|
|
8
9
|
import { registerProvider } from './provider.js';
|
|
9
10
|
import { setupDapp } from './dapp.js';
|
|
11
|
+
import { updateDemoHTMLFiles, updateEnvFiles } from '../util/index.js';
|
|
10
12
|
import fse from 'fs-extra';
|
|
11
13
|
import path from 'path';
|
|
12
14
|
const logger = getLogger(LogLevel.enum.info, 'setup');
|
|
@@ -37,7 +39,6 @@ function getDefaultProvider() {
|
|
|
37
39
|
function getDefaultDapp() {
|
|
38
40
|
return {
|
|
39
41
|
secret: '//Eve',
|
|
40
|
-
contractAccount: process.env.DAPP_SITE_KEY || '',
|
|
41
42
|
fundAmount: Math.pow(10, 12),
|
|
42
43
|
};
|
|
43
44
|
}
|
|
@@ -70,8 +71,8 @@ async function updateEnvFile(vars) {
|
|
|
70
71
|
}
|
|
71
72
|
await fse.writeFile(envFile, readEnvFile);
|
|
72
73
|
}
|
|
73
|
-
async function registerDapp(env, dapp) {
|
|
74
|
-
await setupDapp(env, dapp);
|
|
74
|
+
async function registerDapp(env, dapp, address) {
|
|
75
|
+
await setupDapp(env, dapp, address);
|
|
75
76
|
}
|
|
76
77
|
export async function setup(force) {
|
|
77
78
|
const defaultProvider = getDefaultProvider();
|
|
@@ -102,16 +103,31 @@ export async function setup(force) {
|
|
|
102
103
|
env.logger.info(`Registering provider... ${defaultProvider.address}`);
|
|
103
104
|
defaultProvider.pair = await getPairAsync(network, providerSecret);
|
|
104
105
|
await registerProvider(env, defaultProvider, force);
|
|
105
|
-
|
|
106
|
+
// If no DAPP_SITE_KEY is present, we will register a test account like //Eve.
|
|
107
|
+
// If a DAPP_SITE_KEY is present, we want to register it in the contract.
|
|
108
|
+
// If a DAPP_SECRET is present, we want the DAPP_SITE_KEY account to register itself.
|
|
109
|
+
// Otherwise, a test account like //Eve is used to register the DAPP_SITE_KEY account.
|
|
106
110
|
defaultDapp.pair = await getPairAsync(network, defaultDapp.secret);
|
|
107
|
-
|
|
108
|
-
|
|
111
|
+
let dappAddressToRegister = defaultDapp.pair.address;
|
|
112
|
+
if (process.env.DAPP_SITE_KEY && isAddress(process.env.DAPP_SITE_KEY)) {
|
|
113
|
+
dappAddressToRegister = process.env.DAPP_SITE_KEY;
|
|
114
|
+
if (process.env.DAPP_SECRET) {
|
|
115
|
+
defaultDapp.secret = process.env.DAPP_SECRET;
|
|
116
|
+
defaultDapp.pair = await getPairAsync(network, defaultDapp.secret);
|
|
117
|
+
dappAddressToRegister = defaultDapp.pair.address;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
env.logger.info(`Registering dapp... ${defaultDapp.pair.address}`);
|
|
121
|
+
await registerDapp(env, defaultDapp, dappAddressToRegister);
|
|
109
122
|
if (!hasProviderAccount) {
|
|
110
123
|
await updateEnvFile({
|
|
111
124
|
PROVIDER_MNEMONIC: `"${mnemonic}"`,
|
|
112
125
|
PROVIDER_ADDRESS: address,
|
|
113
126
|
});
|
|
114
127
|
}
|
|
128
|
+
env.logger.debug('Updating env files with DAPP_SITE_KEY');
|
|
129
|
+
await updateDemoHTMLFiles([/data-sitekey="(\w{48})"/, /siteKey:\s*'(\w{48})'/], defaultDapp.pair.address, env.logger);
|
|
130
|
+
await updateEnvFiles(['DAPP_SITE_KEY', 'REACT_APP_DAPP_SITE_KEY', 'NEXT_PUBLIC_DAPP_SITE_KEY', 'PROSOPO_SITE_KEY'], defaultDapp.pair.address, env.logger);
|
|
115
131
|
process.exit();
|
|
116
132
|
}
|
|
117
133
|
else {
|
package/dist/setup/setup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/setup/setup.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACtE,OAAO,EAAE,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/setup/setup.ts"],"names":[],"mappings":"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"}
|
package/dist/util/updateEnv.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Logger } from '@prosopo/common';
|
|
2
2
|
export declare function findEnvFiles(logger: Logger): Promise<string[]>;
|
|
3
|
+
export declare function updateDemoHTMLFiles(varMatchers: RegExp[], varValue: string, logger: Logger): Promise<void>;
|
|
3
4
|
export declare function updateEnvFiles(varNames: string[], varValue: string, logger: Logger): Promise<void>;
|
|
4
5
|
//# sourceMappingURL=updateEnv.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateEnv.d.ts","sourceRoot":"","sources":["../../src/util/updateEnv.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"updateEnv.d.ts","sourceRoot":"","sources":["../../src/util/updateEnv.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAgBxC,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,qBAQhD;AAED,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBA4BhG;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAyBxF"}
|
package/dist/util/updateEnv.js
CHANGED
|
@@ -1,8 +1,16 @@
|
|
|
1
|
+
import { at } from '@prosopo/util';
|
|
1
2
|
import { getEnv } from '@prosopo/cli';
|
|
2
3
|
import { glob } from 'glob';
|
|
3
4
|
import dotenv from 'dotenv';
|
|
4
5
|
import fs from 'fs';
|
|
5
6
|
import path from 'path';
|
|
7
|
+
const ignore = [
|
|
8
|
+
'node_modules/**',
|
|
9
|
+
'node_modules/**',
|
|
10
|
+
'../../**/node_modules/**',
|
|
11
|
+
'../node_modules/**',
|
|
12
|
+
'../../node_modules/**',
|
|
13
|
+
];
|
|
6
14
|
const __dirname = path.resolve();
|
|
7
15
|
export async function findEnvFiles(logger) {
|
|
8
16
|
const env = getEnv();
|
|
@@ -10,13 +18,35 @@ export async function findEnvFiles(logger) {
|
|
|
10
18
|
// options is optional
|
|
11
19
|
logger.info('Searching for files');
|
|
12
20
|
return await glob.glob(`../../**/${fileName}`, {
|
|
13
|
-
ignore:
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
21
|
+
ignore: ignore,
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
export async function updateDemoHTMLFiles(varMatchers, varValue, logger) {
|
|
25
|
+
// replace the site key in the html files
|
|
26
|
+
const files = await glob.glob('../../demos/**/*.html', {
|
|
27
|
+
ignore: ignore,
|
|
28
|
+
});
|
|
29
|
+
logger.info('HTML files found', files);
|
|
30
|
+
files.forEach((file) => {
|
|
31
|
+
// the following code loads a .env file, searches for the variable and replaces it
|
|
32
|
+
// then saves the file
|
|
33
|
+
const filePath = path.resolve(process.cwd(), file);
|
|
34
|
+
const contents = fs.readFileSync(filePath).toString();
|
|
35
|
+
let newContents = contents;
|
|
36
|
+
for (const varMatcher of varMatchers) {
|
|
37
|
+
const matches = contents.match(varMatcher);
|
|
38
|
+
if (matches) {
|
|
39
|
+
// replace the site key
|
|
40
|
+
const matchedVar = at(matches, 1);
|
|
41
|
+
logger.info('matchedVar', matchedVar);
|
|
42
|
+
newContents = contents.replaceAll(matchedVar, varValue);
|
|
43
|
+
break;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
if (newContents !== contents) {
|
|
47
|
+
// write the file back
|
|
48
|
+
fs.writeFileSync(path.resolve(__dirname, filePath), newContents);
|
|
49
|
+
}
|
|
20
50
|
});
|
|
21
51
|
}
|
|
22
52
|
export async function updateEnvFiles(varNames, varValue, logger) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateEnv.js","sourceRoot":"","sources":["../../src/util/updateEnv.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;AAChC,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,MAAc;IAC7C,MAAM,GAAG,GAAG,MAAM,EAAE,CAAA;IACpB,MAAM,QAAQ,GAAG,QAAQ,GAAG,EAAE,CAAA;IAC9B,sBAAsB;IACtB,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;IAClC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,QAAQ,EAAE,EAAE;QAC3C,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"updateEnv.js","sourceRoot":"","sources":["../../src/util/updateEnv.ts"],"names":[],"mappings":"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"}
|
package/env.rococo
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/scripts",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.14",
|
|
4
4
|
"description": "Dev scripts for working with prosopo packages",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -21,31 +21,30 @@
|
|
|
21
21
|
"license": "Apache-2.0",
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@iarna/toml": "^2.2.5",
|
|
24
|
-
"@polkadot/api": "10.
|
|
25
|
-
"@polkadot/api-contract": "10.
|
|
26
|
-
"@polkadot/
|
|
27
|
-
"@polkadot/
|
|
28
|
-
"@
|
|
29
|
-
"@prosopo/
|
|
30
|
-
"@prosopo/
|
|
31
|
-
"@prosopo/
|
|
32
|
-
"@prosopo/
|
|
33
|
-
"@prosopo/
|
|
34
|
-
"@prosopo/
|
|
35
|
-
"@prosopo/datasets": "0.2.
|
|
36
|
-
"@prosopo/
|
|
37
|
-
"@prosopo/
|
|
38
|
-
"@prosopo/
|
|
39
|
-
"@prosopo/procaptcha": "0.2.
|
|
40
|
-
"@prosopo/procaptcha-
|
|
41
|
-
"@prosopo/
|
|
42
|
-
"@prosopo/
|
|
43
|
-
"@prosopo/
|
|
44
|
-
"@prosopo/types": "0.2.
|
|
45
|
-
"@prosopo/types-
|
|
46
|
-
"@prosopo/
|
|
47
|
-
"@prosopo/
|
|
48
|
-
"@prosopo/util": "0.2.11",
|
|
24
|
+
"@polkadot/api": "10.10.1",
|
|
25
|
+
"@polkadot/api-contract": "10.10.1",
|
|
26
|
+
"@polkadot/types": "10.10.1",
|
|
27
|
+
"@polkadot/util-crypto": "12.5.1",
|
|
28
|
+
"@prosopo/api": "0.2.14",
|
|
29
|
+
"@prosopo/cli": "0.2.14",
|
|
30
|
+
"@prosopo/common": "0.2.14",
|
|
31
|
+
"@prosopo/config": "0.2.14",
|
|
32
|
+
"@prosopo/contract": "0.2.14",
|
|
33
|
+
"@prosopo/database": "0.2.14",
|
|
34
|
+
"@prosopo/datasets": "0.2.14",
|
|
35
|
+
"@prosopo/datasets-fs": "0.2.14",
|
|
36
|
+
"@prosopo/env": "0.2.14",
|
|
37
|
+
"@prosopo/file-server": "0.2.14",
|
|
38
|
+
"@prosopo/procaptcha": "0.2.14",
|
|
39
|
+
"@prosopo/procaptcha-bundle": "0.2.14",
|
|
40
|
+
"@prosopo/procaptcha-react": "0.2.14",
|
|
41
|
+
"@prosopo/provider": "0.2.14",
|
|
42
|
+
"@prosopo/server": "0.2.14",
|
|
43
|
+
"@prosopo/types": "0.2.14",
|
|
44
|
+
"@prosopo/types-database": "0.2.14",
|
|
45
|
+
"@prosopo/types-env": "0.2.14",
|
|
46
|
+
"@prosopo/captcha-contract": "0.2.14",
|
|
47
|
+
"@prosopo/util": "0.2.14",
|
|
49
48
|
"consola": "^3.2.3",
|
|
50
49
|
"dotenv": "^16.0.3",
|
|
51
50
|
"es-main": "^1.2.0",
|
|
@@ -55,6 +54,9 @@
|
|
|
55
54
|
"yargs": "^17.5.1",
|
|
56
55
|
"yargs-parser": "^21.0.1"
|
|
57
56
|
},
|
|
57
|
+
"overrides": {
|
|
58
|
+
"@polkadot/keyring": "12.5.1"
|
|
59
|
+
},
|
|
58
60
|
"devDependencies": {
|
|
59
61
|
"@esm-bundle/chai": "^4.3.4-fix.0",
|
|
60
62
|
"ts-node": "^10.9.1",
|