@prosopo/scripts 1.0.2 → 2.0.1
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/README.md +4 -3
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +47 -168
- package/dist/cli/index.js.map +1 -1
- package/dist/contract/import.d.ts.map +1 -1
- package/dist/contract/import.js +62 -120
- package/dist/contract/import.js.map +1 -1
- package/dist/contract/index.d.ts +1 -2
- package/dist/contract/index.d.ts.map +1 -1
- package/dist/contract/index.js +1 -2
- package/dist/contract/index.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/scripts/addCopyrightNotice.js +43 -43
- package/dist/scripts/addCopyrightNotice.js.map +1 -1
- package/dist/scripts/bytesToHex.js +3 -5
- package/dist/scripts/bytesToHex.js.map +1 -1
- package/dist/scripts/convertAccount.js +4 -4
- package/dist/scripts/convertAccount.js.map +1 -1
- package/dist/scripts/encodeDecode.js +51 -28
- package/dist/scripts/encodeDecode.js.map +1 -1
- package/dist/scripts/generateMnemonic.js +6 -6
- package/dist/scripts/generateMnemonic.js.map +1 -1
- package/dist/scripts/getBlock.js +3 -3
- package/dist/scripts/getBlock.js.map +1 -1
- package/dist/scripts/getContractInfoOf.js +15 -15
- package/dist/scripts/getContractInfoOf.js.map +1 -1
- package/dist/scripts/getExistentialDeposit.js +9 -9
- package/dist/scripts/getExistentialDeposit.js.map +1 -1
- package/dist/scripts/getRandomProvider.js +9 -12
- package/dist/scripts/getRandomProvider.js.map +1 -1
- package/dist/scripts/hash.js +6 -6
- package/dist/scripts/hash.js.map +1 -1
- package/dist/scripts/hexToBytes.js +2 -2
- package/dist/scripts/hexToBytes.js.map +1 -1
- package/dist/scripts/setVersion.d.ts +1 -1
- package/dist/scripts/setVersion.d.ts.map +1 -1
- package/dist/scripts/setVersion.js +41 -40
- package/dist/scripts/setVersion.js.map +1 -1
- package/dist/scripts/sign.js +19 -19
- package/dist/scripts/sign.js.map +1 -1
- package/dist/setup/index.d.ts +2 -4
- package/dist/setup/index.d.ts.map +1 -1
- package/dist/setup/index.js +2 -4
- package/dist/setup/index.js.map +1 -1
- package/dist/setup/provider.d.ts +2 -3
- package/dist/setup/provider.d.ts.map +1 -1
- package/dist/setup/provider.js +8 -73
- package/dist/setup/provider.js.map +1 -1
- package/dist/setup/setup.d.ts.map +1 -1
- package/dist/setup/setup.js +45 -49
- package/dist/setup/setup.js.map +1 -1
- package/dist/util/exec.d.ts.map +1 -1
- package/dist/util/exec.js +8 -8
- package/dist/util/exec.js.map +1 -1
- package/dist/util/fluxLogDappDetails.js +4 -4
- package/dist/util/fluxLogDappDetails.js.map +1 -1
- package/dist/util/index.d.ts +4 -4
- package/dist/util/index.d.ts.map +1 -1
- package/dist/util/index.js +4 -4
- package/dist/util/index.js.map +1 -1
- package/dist/util/loadContractFiles.d.ts +1 -1
- package/dist/util/loadContractFiles.d.ts.map +1 -1
- package/dist/util/loadContractFiles.js +15 -15
- package/dist/util/loadContractFiles.js.map +1 -1
- package/dist/util/updateEnv.d.ts +1 -1
- package/dist/util/updateEnv.d.ts.map +1 -1
- package/dist/util/updateEnv.js +18 -18
- package/dist/util/updateEnv.js.map +1 -1
- package/env.staging +2 -0
- package/package.json +66 -73
- package/dist/contract/deploy/dapp.d.ts +0 -3
- package/dist/contract/deploy/dapp.d.ts.map +0 -1
- package/dist/contract/deploy/dapp.js +0 -26
- package/dist/contract/deploy/dapp.js.map +0 -1
- package/dist/contract/deploy/index.d.ts +0 -3
- package/dist/contract/deploy/index.d.ts.map +0 -1
- package/dist/contract/deploy/index.js +0 -3
- package/dist/contract/deploy/index.js.map +0 -1
- package/dist/contract/deploy/protocol.d.ts +0 -3
- package/dist/contract/deploy/protocol.d.ts.map +0 -1
- package/dist/contract/deploy/protocol.js +0 -53
- package/dist/contract/deploy/protocol.js.map +0 -1
- package/dist/contract/fundDapps.d.ts +0 -21
- package/dist/contract/fundDapps.d.ts.map +0 -1
- package/dist/contract/fundDapps.js +0 -50
- package/dist/contract/fundDapps.js.map +0 -1
- package/dist/contract/sources/dapp/411053b7ec79cc77f5ec9f5eb18610b24daaaaf0/dapp.json +0 -648
- package/dist/contract/transferContract.d.ts +0 -6
- package/dist/contract/transferContract.d.ts.map +0 -1
- package/dist/contract/transferContract.js +0 -142
- package/dist/contract/transferContract.js.map +0 -1
- package/dist/scripts/getStorage.d.ts +0 -2
- package/dist/scripts/getStorage.d.ts.map +0 -1
- package/dist/scripts/getStorage.js +0 -25
- package/dist/scripts/getStorage.js.map +0 -1
- package/dist/scripts/sendFunds.d.ts +0 -2
- package/dist/scripts/sendFunds.d.ts.map +0 -1
- package/dist/scripts/sendFunds.js +0 -22
- package/dist/scripts/sendFunds.js.map +0 -1
- package/dist/setup/dapp.d.ts +0 -5
- package/dist/setup/dapp.d.ts.map +0 -1
- package/dist/setup/dapp.js +0 -65
- package/dist/setup/dapp.js.map +0 -1
- package/dist/setup/funds.d.ts +0 -8
- package/dist/setup/funds.d.ts.map +0 -1
- package/dist/setup/funds.js +0 -50
- package/dist/setup/funds.js.map +0 -1
package/dist/setup/setup.js
CHANGED
|
@@ -1,54 +1,56 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import
|
|
12
|
-
import { updateDemoHTMLFiles, updateEnvFiles } from
|
|
13
|
-
import
|
|
14
|
-
|
|
15
|
-
const logger = getLogger(LogLevel.enum.info, 'setup');
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { BN } from "@polkadot/util";
|
|
3
|
+
import { isAddress } from "@polkadot/util-crypto";
|
|
4
|
+
import { defaultConfig, getSecret } from "@prosopo/cli";
|
|
5
|
+
import { getEnvFile } from "@prosopo/cli";
|
|
6
|
+
import { LogLevel, ProsopoEnvError, getLogger } from "@prosopo/common";
|
|
7
|
+
import { generateMnemonic, getPairAsync } from "@prosopo/contract";
|
|
8
|
+
import { ProviderEnvironment } from "@prosopo/env";
|
|
9
|
+
import { Payee, } from "@prosopo/types";
|
|
10
|
+
import { get } from "@prosopo/util";
|
|
11
|
+
import fse from "fs-extra";
|
|
12
|
+
import { updateDemoHTMLFiles, updateEnvFiles } from "../util/index.js";
|
|
13
|
+
import { setupProvider } from "./provider.js";
|
|
14
|
+
const logger = getLogger(LogLevel.enum.info, "setup");
|
|
16
15
|
const __dirname = path.resolve();
|
|
17
16
|
function getRootDir() {
|
|
18
|
-
const rootDir = process.env.PROSOPO_ROOT_DIR || path.resolve(__dirname,
|
|
19
|
-
logger.info(
|
|
17
|
+
const rootDir = process.env.PROSOPO_ROOT_DIR || path.resolve(__dirname, "../..");
|
|
18
|
+
logger.info("Root dir:", rootDir);
|
|
20
19
|
return rootDir;
|
|
21
20
|
}
|
|
22
21
|
function getDatasetFilePath() {
|
|
23
|
-
const datasetFile = process.env.PROSOPO_PROVIDER_DATASET_FILE ||
|
|
24
|
-
|
|
22
|
+
const datasetFile = process.env.PROSOPO_PROVIDER_DATASET_FILE ||
|
|
23
|
+
path.resolve("../data/captchas.json");
|
|
24
|
+
logger.info("Dataset file:", datasetFile);
|
|
25
25
|
return datasetFile;
|
|
26
26
|
}
|
|
27
27
|
function getDefaultProvider() {
|
|
28
|
-
const host = process.env.PROSOPO_PROVIDER_HOST ||
|
|
28
|
+
const host = process.env.PROSOPO_PROVIDER_HOST || "localhost";
|
|
29
29
|
return {
|
|
30
|
-
url: process.env.PROSOPO_API_PORT
|
|
30
|
+
url: process.env.PROSOPO_API_PORT
|
|
31
|
+
? `http://${host}:${process.env.PROSOPO_API_PORT}`
|
|
32
|
+
: `http://${host}:9229`,
|
|
31
33
|
fee: 10,
|
|
32
34
|
payee: Payee.dapp,
|
|
33
|
-
stake: new BN(
|
|
35
|
+
stake: new BN(10 ** 13),
|
|
34
36
|
datasetFile: getDatasetFilePath(),
|
|
35
|
-
address: process.env.PROSOPO_PROVIDER_ADDRESS ||
|
|
37
|
+
address: process.env.PROSOPO_PROVIDER_ADDRESS || "",
|
|
36
38
|
secret: getSecret(),
|
|
37
|
-
captchaDatasetId:
|
|
39
|
+
captchaDatasetId: "",
|
|
38
40
|
};
|
|
39
41
|
}
|
|
40
42
|
function getDefaultDapp() {
|
|
41
43
|
return {
|
|
42
|
-
secret:
|
|
43
|
-
fundAmount: new BN(
|
|
44
|
+
secret: "//Eve",
|
|
45
|
+
fundAmount: new BN(10 ** 12),
|
|
44
46
|
};
|
|
45
47
|
}
|
|
46
48
|
async function copyEnvFile() {
|
|
47
49
|
try {
|
|
48
50
|
const rootDir = getRootDir();
|
|
49
|
-
const tplLocation = path.resolve(rootDir,
|
|
50
|
-
const tplEnvFile = getEnvFile(tplLocation,
|
|
51
|
-
const envFile = getEnvFile(tplLocation,
|
|
51
|
+
const tplLocation = path.resolve(rootDir, "./dev/scripts");
|
|
52
|
+
const tplEnvFile = getEnvFile(tplLocation, "env");
|
|
53
|
+
const envFile = getEnvFile(tplLocation, ".env");
|
|
52
54
|
await fse.copy(tplEnvFile, envFile, { overwrite: false });
|
|
53
55
|
}
|
|
54
56
|
catch (err) {
|
|
@@ -56,40 +58,37 @@ async function copyEnvFile() {
|
|
|
56
58
|
}
|
|
57
59
|
}
|
|
58
60
|
function updateEnvFileVar(source, name, value) {
|
|
59
|
-
const envVar = new RegExp(`.*(${name}=)(.*)`,
|
|
61
|
+
const envVar = new RegExp(`.*(${name}=)(.*)`, "g");
|
|
60
62
|
if (envVar.test(source)) {
|
|
61
63
|
return source.replace(envVar, `$1${value}`);
|
|
62
64
|
}
|
|
63
|
-
return source
|
|
65
|
+
return `${source}\n${name}=${value}`;
|
|
64
66
|
}
|
|
65
67
|
export async function updateEnvFile(vars) {
|
|
66
68
|
const rootDir = getRootDir();
|
|
67
|
-
const envFile = getEnvFile(rootDir,
|
|
68
|
-
let readEnvFile = await fse.readFile(envFile,
|
|
69
|
+
const envFile = getEnvFile(rootDir, ".env");
|
|
70
|
+
let readEnvFile = await fse.readFile(envFile, "utf8");
|
|
69
71
|
for (const key in vars) {
|
|
70
72
|
readEnvFile = updateEnvFileVar(readEnvFile, key, get(vars, key));
|
|
71
73
|
}
|
|
72
74
|
logger.info(`Updating ${envFile}`);
|
|
73
75
|
await fse.writeFile(envFile, readEnvFile);
|
|
74
76
|
}
|
|
75
|
-
async function registerDapp(env, dapp, address) {
|
|
76
|
-
await setupDapp(env, dapp, address);
|
|
77
|
-
}
|
|
78
77
|
export async function setup(force) {
|
|
79
78
|
const defaultProvider = getDefaultProvider();
|
|
80
79
|
const defaultDapp = getDefaultDapp();
|
|
81
80
|
if (defaultProvider.secret) {
|
|
82
81
|
const hasProviderAccount = defaultProvider.address && defaultProvider.secret;
|
|
83
|
-
logger.debug(
|
|
82
|
+
logger.debug("ENVIRONMENT", process.env.NODE_ENV);
|
|
84
83
|
const [mnemonic, address] = !hasProviderAccount
|
|
85
84
|
? await generateMnemonic()
|
|
86
85
|
: [defaultProvider.secret, defaultProvider.address];
|
|
87
86
|
logger.debug(`Address: ${address}`);
|
|
88
87
|
logger.debug(`Mnemonic: ${mnemonic}`);
|
|
89
|
-
logger.debug(
|
|
88
|
+
logger.debug("Writing .env file...");
|
|
90
89
|
await copyEnvFile();
|
|
91
90
|
if (!process.env.PROSOPO_SITE_KEY) {
|
|
92
|
-
throw new ProsopoEnvError(
|
|
91
|
+
throw new ProsopoEnvError("DEVELOPER.PROSOPO_SITE_KEY_MISSING");
|
|
93
92
|
}
|
|
94
93
|
const config = defaultConfig();
|
|
95
94
|
const providerSecret = config.account.secret;
|
|
@@ -97,16 +96,13 @@ export async function setup(force) {
|
|
|
97
96
|
const pair = await getPairAsync(network, providerSecret);
|
|
98
97
|
const env = new ProviderEnvironment(defaultConfig(), pair);
|
|
99
98
|
await env.isReady();
|
|
100
|
-
const result = await wrapQuery(env.getContractInterface().query.getDappStakeThreshold, env.getContractInterface().query)();
|
|
101
|
-
const stakeAmount = result.rawNumber;
|
|
102
|
-
defaultDapp.fundAmount = stakeAmount.muln(2);
|
|
103
99
|
defaultProvider.secret = mnemonic;
|
|
104
100
|
env.logger.info(`Registering provider... ${defaultProvider.address}`);
|
|
105
101
|
defaultProvider.pair = await getPairAsync(network, providerSecret);
|
|
106
|
-
await registerProvider(env, defaultProvider, force);
|
|
107
102
|
defaultDapp.pair = await getPairAsync(network, defaultDapp.secret);
|
|
108
103
|
let dappAddressToRegister = defaultDapp.pair.address;
|
|
109
|
-
if (process.env.PROSOPO_SITE_KEY &&
|
|
104
|
+
if (process.env.PROSOPO_SITE_KEY &&
|
|
105
|
+
isAddress(process.env.PROSOPO_SITE_KEY)) {
|
|
110
106
|
dappAddressToRegister = process.env.PROSOPO_SITE_KEY;
|
|
111
107
|
if (process.env.PROSOPO_SITE_PRIVATE_KEY) {
|
|
112
108
|
defaultDapp.secret = process.env.PROSOPO_SITE_PRIVATE_KEY;
|
|
@@ -114,22 +110,22 @@ export async function setup(force) {
|
|
|
114
110
|
dappAddressToRegister = defaultDapp.pair.address;
|
|
115
111
|
}
|
|
116
112
|
}
|
|
113
|
+
await setupProvider(env, defaultProvider);
|
|
117
114
|
env.logger.info(`Registering dapp... ${defaultDapp.pair.address}`);
|
|
118
|
-
await registerDapp(env, defaultDapp, dappAddressToRegister);
|
|
119
115
|
if (!hasProviderAccount) {
|
|
120
116
|
await updateEnvFile({
|
|
121
117
|
PROVIDER_MNEMONIC: `"${mnemonic}"`,
|
|
122
118
|
PROVIDER_ADDRESS: address,
|
|
123
119
|
});
|
|
124
120
|
}
|
|
125
|
-
env.logger.debug(
|
|
121
|
+
env.logger.debug("Updating env files with PROSOPO_SITE_KEY");
|
|
126
122
|
await updateDemoHTMLFiles([/data-sitekey="(\w{48})"/, /siteKey:\s*'(\w{48})'/], defaultDapp.pair.address, env.logger);
|
|
127
|
-
await updateEnvFiles([
|
|
123
|
+
await updateEnvFiles(["NEXT_PUBLIC_PROSOPO_SITE_KEY", "PROSOPO_SITE_KEY"], defaultDapp.pair.address, env.logger);
|
|
128
124
|
process.exit();
|
|
129
125
|
}
|
|
130
126
|
else {
|
|
131
|
-
console.error(
|
|
132
|
-
throw new ProsopoEnvError(
|
|
127
|
+
console.error("no secret found in .env file");
|
|
128
|
+
throw new ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED");
|
|
133
129
|
}
|
|
134
130
|
}
|
|
135
131
|
//# sourceMappingURL=setup.js.map
|
package/dist/setup/setup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/setup/setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/setup/setup.ts"],"names":[],"mappings":"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"}
|
package/dist/util/exec.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/util/exec.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,UAAU;
|
|
1
|
+
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/util/exec.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,UAAU;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,eAAO,MAAM,IAAI,YACP,MAAM,YACL;IACT,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB,KACC,QAAQ,UAAU,CAiDpB,CAAC"}
|
package/dist/util/exec.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { spawn } from
|
|
2
|
-
import { stdin } from
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { stdin } from "node:process";
|
|
3
3
|
export const exec = (command, options) => {
|
|
4
4
|
let { pipe, printCmd } = options || {};
|
|
5
5
|
pipe = pipe === undefined || pipe;
|
|
@@ -17,20 +17,20 @@ export const exec = (command, options) => {
|
|
|
17
17
|
stdin.pipe(prc.stdin);
|
|
18
18
|
const stdoutData = [];
|
|
19
19
|
const stderrData = [];
|
|
20
|
-
prc.stdout.on(
|
|
20
|
+
prc.stdout.on("data", (data) => {
|
|
21
21
|
stdoutData.push(data.toString());
|
|
22
22
|
});
|
|
23
|
-
prc.stderr.on(
|
|
23
|
+
prc.stderr.on("data", (data) => {
|
|
24
24
|
stderrData.push(data.toString());
|
|
25
25
|
});
|
|
26
26
|
return new Promise((resolve, reject) => {
|
|
27
|
-
prc.on(
|
|
27
|
+
prc.on("close", (code) => {
|
|
28
28
|
if (pipe || pipe === undefined) {
|
|
29
|
-
console.log(
|
|
29
|
+
console.log("");
|
|
30
30
|
}
|
|
31
31
|
const output = {
|
|
32
|
-
stdout: stdoutData.join(
|
|
33
|
-
stderr: stderrData.join(
|
|
32
|
+
stdout: stdoutData.join(""),
|
|
33
|
+
stderr: stderrData.join(""),
|
|
34
34
|
code,
|
|
35
35
|
};
|
|
36
36
|
if (code === 0) {
|
package/dist/util/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/util/exec.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/util/exec.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAQrC,MAAM,CAAC,MAAM,IAAI,GAAG,CACnB,OAAe,EACf,OAGC,EACqB,EAAE;IACxB,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IACvC,IAAI,GAAG,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC;IAClC,QAAQ,GAAG,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC;IAE9C,IAAI,QAAQ,EAAE;QACb,OAAO,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;KACjC;IAED,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,EAAE;QAC1B,KAAK,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,IAAI,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;QAI/B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAEhC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;KAChC;IACD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAEtB,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,IAAI,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;gBAC/B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAChB;YACD,MAAM,MAAM,GAAe;gBAC1B,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3B,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3B,IAAI;aACJ,CAAC;YACF,IAAI,IAAI,KAAK,CAAC,EAAE;gBACf,OAAO,CAAC,MAAM,CAAC,CAAC;aAChB;iBAAM;gBACN,MAAM,CAAC,MAAM,CAAC,CAAC;aACf;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
export function extractReferrersFromLogs(logsText) {
|
|
2
2
|
const urls = [
|
|
3
|
-
...logsText.split(
|
|
3
|
+
...logsText.split("\n").reduce((accumulator, line) => {
|
|
4
4
|
const matches = line.match(/"(https?:\/\/[^"]+)"/g);
|
|
5
5
|
if (matches) {
|
|
6
|
-
|
|
6
|
+
for (const match of matches) {
|
|
7
7
|
const url = match.substring(1, match.length - 1);
|
|
8
8
|
accumulator.add(url);
|
|
9
|
-
}
|
|
9
|
+
}
|
|
10
10
|
}
|
|
11
11
|
return accumulator;
|
|
12
12
|
}, new Set()),
|
|
13
13
|
];
|
|
14
|
-
return urls.join(
|
|
14
|
+
return urls.join(" ");
|
|
15
15
|
}
|
|
16
16
|
//# sourceMappingURL=fluxLogDappDetails.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fluxLogDappDetails.js","sourceRoot":"","sources":["../../src/util/fluxLogDappDetails.ts"],"names":[],"mappings":"AAeA,MAAM,UAAU,wBAAwB,CAAC,QAAgB;
|
|
1
|
+
{"version":3,"file":"fluxLogDappDetails.js","sourceRoot":"","sources":["../../src/util/fluxLogDappDetails.ts"],"names":[],"mappings":"AAeA,MAAM,UAAU,wBAAwB,CAAC,QAAgB;IACxD,MAAM,IAAI,GAAG;QACZ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE;YAEpD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACpD,IAAI,OAAO,EAAE;gBACZ,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;oBAE5B,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACjD,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBACrB;aACD;YACD,OAAO,WAAW,CAAC;QACpB,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC;KACb,CAAC;IAEF,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AACjC,CAAC"}
|
package/dist/util/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
4
|
-
export * from
|
|
1
|
+
export * from "./loadContractFiles.js";
|
|
2
|
+
export * from "./updateEnv.js";
|
|
3
|
+
export * from "./exec.js";
|
|
4
|
+
export * from "./fluxLogDappDetails.js";
|
|
5
5
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/util/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAaA,cAAc,wBAAwB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAaA,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC"}
|
package/dist/util/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
4
|
-
export * from
|
|
1
|
+
export * from "./loadContractFiles.js";
|
|
2
|
+
export * from "./updateEnv.js";
|
|
3
|
+
export * from "./exec.js";
|
|
4
|
+
export * from "./fluxLogDappDetails.js";
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
package/dist/util/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAaA,cAAc,wBAAwB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAaA,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Abi } from
|
|
1
|
+
import { Abi } from "@polkadot/api-contract";
|
|
2
2
|
export declare function AbiJSON(filePath: string): Promise<Abi>;
|
|
3
3
|
export declare function Wasm(filePath: string): Promise<Uint8Array>;
|
|
4
4
|
//# sourceMappingURL=loadContractFiles.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadContractFiles.d.ts","sourceRoot":"","sources":["../../src/util/loadContractFiles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loadContractFiles.d.ts","sourceRoot":"","sources":["../../src/util/loadContractFiles.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAM7C,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAgB5D;AAED,wBAAsB,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAkBhE"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import { hexToU8a, isWasm } from
|
|
4
|
-
import
|
|
5
|
-
import
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { Abi } from "@polkadot/api-contract";
|
|
3
|
+
import { hexToU8a, isWasm } from "@polkadot/util";
|
|
4
|
+
import { ProsopoError } from "@prosopo/common";
|
|
5
|
+
import fse from "fs-extra";
|
|
6
6
|
const __dirname = path.resolve();
|
|
7
7
|
export async function AbiJSON(filePath) {
|
|
8
8
|
const resolvedFilePath = path.resolve(__dirname, filePath);
|
|
@@ -10,31 +10,31 @@ export async function AbiJSON(filePath) {
|
|
|
10
10
|
const fileExists = await fse.pathExists(resolvedFilePath);
|
|
11
11
|
if (fileExists) {
|
|
12
12
|
const json = JSON.parse(await fse.readFile(resolvedFilePath, {
|
|
13
|
-
encoding:
|
|
13
|
+
encoding: "utf8",
|
|
14
14
|
}));
|
|
15
15
|
return new Abi(json);
|
|
16
16
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
}
|
|
17
|
+
throw new ProsopoError("FS.FILE_NOT_FOUND", {
|
|
18
|
+
context: { error: `File ${filePath} does not exist` },
|
|
19
|
+
});
|
|
20
20
|
}
|
|
21
21
|
export async function Wasm(filePath) {
|
|
22
22
|
const resolvedFilePath = path.resolve(__dirname, filePath);
|
|
23
23
|
await fse.ensureFile(resolvedFilePath);
|
|
24
24
|
const fileExists = await fse.pathExists(resolvedFilePath);
|
|
25
25
|
if (fileExists) {
|
|
26
|
-
const wasm = `0x${fse.readFileSync(resolvedFilePath).toString(
|
|
26
|
+
const wasm = `0x${fse.readFileSync(resolvedFilePath).toString("hex")}`;
|
|
27
27
|
const wasmBytes = hexToU8a(wasm);
|
|
28
28
|
if (isWasm(wasmBytes)) {
|
|
29
29
|
return wasmBytes;
|
|
30
30
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
process.exit(1);
|
|
34
|
-
}
|
|
31
|
+
console.error(`Error loading contract wasm: ${wasm.slice(0, 10)}...`);
|
|
32
|
+
process.exit(1);
|
|
35
33
|
}
|
|
36
34
|
else {
|
|
37
|
-
throw new ProsopoError(
|
|
35
|
+
throw new ProsopoError("FS.FILE_NOT_FOUND", {
|
|
36
|
+
context: { error: `File ${filePath} does not exist` },
|
|
37
|
+
});
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
//# sourceMappingURL=loadContractFiles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadContractFiles.js","sourceRoot":"","sources":["../../src/util/loadContractFiles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loadContractFiles.js","sourceRoot":"","sources":["../../src/util/loadContractFiles.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAgB7B,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,GAAG,MAAM,UAAU,CAAC;AAE3B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;AACjC,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,QAAgB;IAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC3D,MAAM,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAE1D,IAAI,UAAU,EAAE;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CACtB,MAAM,GAAG,CAAC,QAAQ,CAAC,gBAAgB,EAAE;YACpC,QAAQ,EAAE,MAAM;SAChB,CAAC,CACF,CAAC;QACF,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;KACrB;IACD,MAAM,IAAI,YAAY,CAAC,mBAAmB,EAAE;QAC3C,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,QAAQ,iBAAiB,EAAE;KACrD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,QAAgB;IAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC3D,MAAM,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC1D,IAAI,UAAU,EAAE;QACf,MAAM,IAAI,GAAkB,KAAK,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACtF,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;YACtB,OAAO,SAAS,CAAC;SACjB;QACD,OAAO,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;SAAM;QACN,MAAM,IAAI,YAAY,CAAC,mBAAmB,EAAE;YAC3C,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,QAAQ,iBAAiB,EAAE;SACrD,CAAC,CAAC;KACH;AACF,CAAC"}
|
package/dist/util/updateEnv.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logger } from
|
|
1
|
+
import type { Logger } from "@prosopo/common";
|
|
2
2
|
export declare function findEnvFiles(logger: Logger, cwd?: string): Promise<string[]>;
|
|
3
3
|
export declare function updateDemoHTMLFiles(varMatchers: RegExp[], varValue: string, logger: Logger): Promise<void>;
|
|
4
4
|
export declare function updateEnvFiles(varNames: string[], varValue: string, logger: Logger, cwd?: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateEnv.d.ts","sourceRoot":"","sources":["../../src/util/updateEnv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"updateEnv.d.ts","sourceRoot":"","sources":["../../src/util/updateEnv.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAa9C,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,qBAQ9D;AAED,wBAAsB,mBAAmB,CACxC,WAAW,EAAE,MAAM,EAAE,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,iBA8Bd;AAED,wBAAsB,cAAc,CACnC,QAAQ,EAAE,MAAM,EAAE,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,GAAG,CAAC,EAAE,MAAM,iBA2BZ"}
|
package/dist/util/updateEnv.js
CHANGED
|
@@ -1,30 +1,30 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { getEnv } from "@prosopo/cli";
|
|
4
|
+
import { at } from "@prosopo/util";
|
|
5
|
+
import dotenv from "dotenv";
|
|
6
|
+
import fg from "fast-glob";
|
|
7
7
|
const ignore = [
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
"**/node_modules/**",
|
|
9
|
+
"node_modules/**",
|
|
10
|
+
"../../**/node_modules/**",
|
|
11
|
+
"../node_modules/**",
|
|
12
|
+
"../../node_modules/**",
|
|
13
13
|
];
|
|
14
14
|
const __dirname = path.resolve();
|
|
15
15
|
export async function findEnvFiles(logger, cwd) {
|
|
16
16
|
const env = getEnv();
|
|
17
17
|
const fileName = `.env.${env}`;
|
|
18
|
-
logger.info(
|
|
19
|
-
return await fg(`${cwd ||
|
|
18
|
+
logger.info("Searching for files");
|
|
19
|
+
return await fg(`${cwd || "../.."}/**/${fileName}`, {
|
|
20
20
|
ignore,
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
23
|
export async function updateDemoHTMLFiles(varMatchers, varValue, logger) {
|
|
24
|
-
const files = await fg(
|
|
24
|
+
const files = await fg("../../demos/**/*.html", {
|
|
25
25
|
ignore: ignore,
|
|
26
26
|
});
|
|
27
|
-
logger.info(
|
|
27
|
+
logger.info("HTML files found", files);
|
|
28
28
|
files.forEach((file) => {
|
|
29
29
|
const filePath = path.resolve(process.cwd(), file);
|
|
30
30
|
const contents = fs.readFileSync(filePath).toString();
|
|
@@ -33,7 +33,7 @@ export async function updateDemoHTMLFiles(varMatchers, varValue, logger) {
|
|
|
33
33
|
const matches = contents.match(varMatcher);
|
|
34
34
|
if (matches) {
|
|
35
35
|
const matchedVar = at(matches, 1);
|
|
36
|
-
logger.info(
|
|
36
|
+
logger.info("matchedVar", matchedVar);
|
|
37
37
|
newContents = contents.replaceAll(matchedVar, varValue);
|
|
38
38
|
break;
|
|
39
39
|
}
|
|
@@ -45,7 +45,7 @@ export async function updateDemoHTMLFiles(varMatchers, varValue, logger) {
|
|
|
45
45
|
}
|
|
46
46
|
export async function updateEnvFiles(varNames, varValue, logger, cwd) {
|
|
47
47
|
const files = await findEnvFiles(logger, cwd);
|
|
48
|
-
logger.info(
|
|
48
|
+
logger.info("Env files found", files);
|
|
49
49
|
files.forEach((file) => {
|
|
50
50
|
let write = false;
|
|
51
51
|
const filePath = path.resolve(cwd || process.cwd(), file);
|
|
@@ -59,7 +59,7 @@ export async function updateEnvFiles(varNames, varValue, logger, cwd) {
|
|
|
59
59
|
if (write) {
|
|
60
60
|
fs.writeFileSync(path.resolve(__dirname, filePath), Object.keys(envConfig)
|
|
61
61
|
.map((k) => `${k}=${envConfig[k]}`)
|
|
62
|
-
.join(
|
|
62
|
+
.join("\n"));
|
|
63
63
|
}
|
|
64
64
|
});
|
|
65
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateEnv.js","sourceRoot":"","sources":["../../src/util/updateEnv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"updateEnv.js","sourceRoot":"","sources":["../../src/util/updateEnv.ts"],"names":[],"mappings":"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"}
|
package/env.staging
ADDED