@prosopo/scripts 0.2.14 → 0.2.15
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 +3 -20
- package/dist/cli/index.js.map +1 -1
- package/dist/contract/deploy/dapp.js +3 -5
- package/dist/contract/deploy/dapp.js.map +1 -1
- package/dist/contract/deploy/index.js +0 -13
- package/dist/contract/deploy/index.js.map +1 -1
- package/dist/contract/deploy/protocol.js +1 -17
- package/dist/contract/deploy/protocol.js.map +1 -1
- package/dist/contract/import.js +0 -46
- package/dist/contract/import.js.map +1 -1
- package/dist/contract/index.js +0 -13
- package/dist/contract/index.js.map +1 -1
- package/dist/index.js +0 -13
- package/dist/index.js.map +1 -1
- package/dist/scripts/addCopyrightNotice.js +0 -20
- package/dist/scripts/addCopyrightNotice.js.map +1 -1
- package/dist/scripts/bytesToHex.js +0 -13
- package/dist/scripts/bytesToHex.js.map +1 -1
- package/dist/scripts/convertAccount.js +0 -14
- package/dist/scripts/convertAccount.js.map +1 -1
- package/dist/scripts/encodeDecode.js +0 -13
- package/dist/scripts/encodeDecode.js.map +1 -1
- package/dist/scripts/fluxDeploy.js +2 -12
- package/dist/scripts/fluxDeploy.js.map +1 -1
- package/dist/scripts/generateMnemonic.js +14 -18
- package/dist/scripts/generateMnemonic.js.map +1 -1
- package/dist/scripts/getBlock.js +0 -15
- package/dist/scripts/getBlock.js.map +1 -1
- package/dist/scripts/getContractInfoOf.js +0 -13
- package/dist/scripts/getContractInfoOf.js.map +1 -1
- package/dist/scripts/getExistentialDeposit.js +0 -16
- package/dist/scripts/getExistentialDeposit.js.map +1 -1
- package/dist/scripts/getRandomProvider.js +1 -14
- package/dist/scripts/getRandomProvider.js.map +1 -1
- package/dist/scripts/getStorage.js +0 -13
- package/dist/scripts/getStorage.js.map +1 -1
- package/dist/scripts/hash.js +0 -15
- package/dist/scripts/hash.js.map +1 -1
- package/dist/scripts/hexToBytes.js +0 -13
- package/dist/scripts/hexToBytes.js.map +1 -1
- package/dist/scripts/populateTxAndSign.js +0 -63
- package/dist/scripts/populateTxAndSign.js.map +1 -1
- package/dist/scripts/sendFunds.js +0 -13
- package/dist/scripts/sendFunds.js.map +1 -1
- package/dist/scripts/sep256k1Sign.js +7 -18
- package/dist/scripts/sep256k1Sign.js.map +1 -1
- package/dist/scripts/setVersion.js +0 -18
- package/dist/scripts/setVersion.js.map +1 -1
- package/dist/setup/dapp.js +0 -16
- package/dist/setup/dapp.js.map +1 -1
- package/dist/setup/funds.d.ts +0 -15
- package/dist/setup/funds.d.ts.map +1 -1
- package/dist/setup/funds.js +1 -23
- package/dist/setup/funds.js.map +1 -1
- package/dist/setup/index.js +0 -13
- package/dist/setup/index.js.map +1 -1
- package/dist/setup/provider.js +0 -3
- package/dist/setup/provider.js.map +1 -1
- package/dist/setup/setup.d.ts +1 -0
- package/dist/setup/setup.d.ts.map +1 -1
- package/dist/setup/setup.js +16 -27
- package/dist/setup/setup.js.map +1 -1
- package/dist/util/exec.js +2 -15
- package/dist/util/exec.js.map +1 -1
- package/dist/util/index.js +0 -13
- package/dist/util/index.js.map +1 -1
- package/dist/util/loadContractFiles.js +0 -15
- package/dist/util/loadContractFiles.js.map +1 -1
- package/dist/util/updateEnv.js +0 -9
- package/dist/util/updateEnv.js.map +1 -1
- package/env.rococo +4 -4
- package/package.json +21 -22
|
@@ -4,8 +4,6 @@ import { loadEnv } from '@prosopo/cli';
|
|
|
4
4
|
import { parse, stringify } from '@iarna/toml';
|
|
5
5
|
import fs from 'fs';
|
|
6
6
|
import path from 'path';
|
|
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
7
|
loadEnv();
|
|
10
8
|
const logLevel = getLogLevel();
|
|
11
9
|
const log = getLogger(logLevel, 'setVersion');
|
|
@@ -54,37 +52,29 @@ export default async function setVersion(version, ignore) {
|
|
|
54
52
|
const root = getPaths().root;
|
|
55
53
|
const ignorePaths = ['node_modules', 'cargo-cache', ...(ignore ?? [])];
|
|
56
54
|
log.debug('Ignoring paths: ', ignorePaths);
|
|
57
|
-
// walk through all files finding .json or .toml
|
|
58
55
|
const files = find(root, (pth) => {
|
|
59
|
-
// ignore node_modules and any user specified paths
|
|
60
56
|
if (ignorePaths.some((ignorePath) => pth.includes(ignorePath))) {
|
|
61
57
|
return false;
|
|
62
58
|
}
|
|
63
59
|
const basename = path.basename(pth);
|
|
64
60
|
return basename === 'package.json' || basename === 'Cargo.toml';
|
|
65
61
|
});
|
|
66
|
-
// split into json and toml
|
|
67
62
|
files
|
|
68
63
|
.filter((pth) => path.extname(pth) === '.json')
|
|
69
64
|
.forEach((pth) => {
|
|
70
65
|
log.debug('setting version in', pth);
|
|
71
66
|
const content = fs.readFileSync(pth, 'utf8');
|
|
72
|
-
// replace version in all json files
|
|
73
67
|
const jsonContent = JSON.parse(content);
|
|
74
68
|
if (jsonContent.version) {
|
|
75
|
-
// only replace if version is set
|
|
76
69
|
jsonContent.version = version;
|
|
77
70
|
}
|
|
78
|
-
// go through dependencies
|
|
79
71
|
for (const obj of [
|
|
80
72
|
jsonContent.dependencies ?? {},
|
|
81
73
|
jsonContent.devDependencies ?? {},
|
|
82
74
|
jsonContent.peerDependencies ?? {},
|
|
83
75
|
]) {
|
|
84
|
-
// detect any prosopo dependencies
|
|
85
76
|
for (const key of Object.keys(obj)) {
|
|
86
77
|
if (key.startsWith('@prosopo') && !key.includes('typechain')) {
|
|
87
|
-
// and replace version
|
|
88
78
|
log.debug(`setting ${key} to ${version} in ${pth}`);
|
|
89
79
|
obj[key] = version;
|
|
90
80
|
}
|
|
@@ -92,17 +82,14 @@ export default async function setVersion(version, ignore) {
|
|
|
92
82
|
}
|
|
93
83
|
fs.writeFileSync(pth, JSON.stringify(jsonContent, null, 4) + '\n');
|
|
94
84
|
});
|
|
95
|
-
// replace version in tomls
|
|
96
85
|
files
|
|
97
86
|
.filter((pth) => path.extname(pth) === '.toml')
|
|
98
87
|
.filter((pth) => {
|
|
99
|
-
// ignore node_modules and any user specified paths
|
|
100
88
|
return !ignorePaths.some((ignorePath) => pth.includes(ignorePath));
|
|
101
89
|
})
|
|
102
90
|
.forEach((pth) => {
|
|
103
91
|
log.debug('setting version in', pth);
|
|
104
92
|
const content = fs.readFileSync(pth, 'utf8');
|
|
105
|
-
// replace version in all toml files
|
|
106
93
|
const tomlContent = parse(content);
|
|
107
94
|
if (tomlContent.workspace) {
|
|
108
95
|
if (tomlContent.workspace.version) {
|
|
@@ -111,18 +98,15 @@ export default async function setVersion(version, ignore) {
|
|
|
111
98
|
}
|
|
112
99
|
}
|
|
113
100
|
else {
|
|
114
|
-
// replace dependency versions in all toml files
|
|
115
101
|
tomlContent['package'].version = version;
|
|
116
102
|
}
|
|
117
103
|
fs.writeFileSync(pth, stringify(tomlContent) + '\n');
|
|
118
104
|
});
|
|
119
|
-
// 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
|
|
120
105
|
files
|
|
121
106
|
.filter((pth) => path.extname(pth) === '.toml')
|
|
122
107
|
.forEach((pth) => {
|
|
123
108
|
log.debug('setting dependency versions in', pth);
|
|
124
109
|
const content = fs.readFileSync(pth, 'utf8');
|
|
125
|
-
// replace version in all toml files
|
|
126
110
|
const tomlContent = parse(content);
|
|
127
111
|
if (tomlContent.workspace) {
|
|
128
112
|
if (tomlContent.workspace.version) {
|
|
@@ -132,10 +116,8 @@ export default async function setVersion(version, ignore) {
|
|
|
132
116
|
}
|
|
133
117
|
else {
|
|
134
118
|
for (const obj of [tomlContent.dependencies ?? {}, tomlContent['dev-dependencies'] ?? {}]) {
|
|
135
|
-
// detect any prosopo dependencies
|
|
136
119
|
for (const [key, value] of Object.entries(obj)) {
|
|
137
120
|
if (value.path) {
|
|
138
|
-
// trace path to get version
|
|
139
121
|
path.join(value.path, 'Cargo.toml');
|
|
140
122
|
const depContent = fs.readFileSync(pth, 'utf8');
|
|
141
123
|
const depTomlContent = parse(depContent);
|
|
@@ -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,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"setVersion.js","sourceRoot":"","sources":["../../src/scripts/setVersion.ts"],"names":[],"mappings":"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"}
|
package/dist/setup/dapp.js
CHANGED
|
@@ -1,16 +1,3 @@
|
|
|
1
|
-
// Copyright 2021-2023 Prosopo (UK) Ltd.
|
|
2
|
-
//
|
|
3
|
-
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
-
// you may not use this file except in compliance with the License.
|
|
5
|
-
// You may obtain a copy of the License at
|
|
6
|
-
//
|
|
7
|
-
// http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
-
//
|
|
9
|
-
// Unless required by applicable law or agreed to in writing, software
|
|
10
|
-
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
-
// See the License for the specific language governing permissions and
|
|
13
|
-
// limitations under the License.
|
|
14
1
|
import { BN } from '@polkadot/util';
|
|
15
2
|
import { DappPayee } from '@prosopo/captcha-contract';
|
|
16
3
|
import { Tasks } from '@prosopo/provider';
|
|
@@ -43,11 +30,8 @@ export async function setupDapp(env, dapp, address) {
|
|
|
43
30
|
async function dappSendFunds(env, dapp) {
|
|
44
31
|
if (dapp.pair && !dapp.pair.isLocked) {
|
|
45
32
|
const sendAmount = oneUnit(env.getApi());
|
|
46
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
47
|
-
// @ts-ignore
|
|
48
33
|
const { data: { free: previousFree }, } = await env.getContractInterface().api.query.system.account(dapp.pair.address);
|
|
49
34
|
if (previousFree.lt(new BN(sendAmount.toString()))) {
|
|
50
|
-
// send enough funds to cover the tx fees
|
|
51
35
|
await sendFunds(env, dapp.pair.address, 'Dapp', sendAmount);
|
|
52
36
|
}
|
|
53
37
|
}
|
package/dist/setup/dapp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dapp.js","sourceRoot":"","sources":["../../src/setup/dapp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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
CHANGED
|
@@ -2,22 +2,7 @@
|
|
|
2
2
|
import { AnyNumber } from '@polkadot/types-codec/types';
|
|
3
3
|
import { BN } from '@polkadot/util';
|
|
4
4
|
import { ProsopoEnvironment } from '@prosopo/types-env';
|
|
5
|
-
/** Send funds from one of the development accounts to another account. */
|
|
6
5
|
export declare function sendFunds(env: ProsopoEnvironment, address: string, who: string, amount: AnyNumber): Promise<void>;
|
|
7
|
-
/**
|
|
8
|
-
* Takes the providerStakeDefault and works out if multiplying it by 100 or
|
|
9
|
-
* stakeMultiplier is greater than the maxStake. If it is, it returns the maxStake
|
|
10
|
-
* If chain decimals = 12, 1 UNIT = 1e12
|
|
11
|
-
* @param env
|
|
12
|
-
* @param providerStakeDefault
|
|
13
|
-
* @param stakeMultiplier
|
|
14
|
-
*/
|
|
15
6
|
export declare function getStakeAmount(env: ProsopoEnvironment, providerStakeDefault: BN, stakeMultiplier?: number): BN;
|
|
16
|
-
/**
|
|
17
|
-
* Send funds to a test account, adding the max of 2 * stakeAmount or 100 * the
|
|
18
|
-
* existential deposit
|
|
19
|
-
* @param env
|
|
20
|
-
* @param stakeAmount
|
|
21
|
-
*/
|
|
22
7
|
export declare function getSendAmount(env: ProsopoEnvironment, stakeAmount: BN): BN;
|
|
23
8
|
//# sourceMappingURL=funds.d.ts.map
|
|
@@ -1 +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;
|
|
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;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
CHANGED
|
@@ -4,14 +4,11 @@ import { at } from '@prosopo/util';
|
|
|
4
4
|
import { dispatchErrorHandler, oneUnit } from '@prosopo/contract';
|
|
5
5
|
const devMnemonics = ['//Alice', '//Bob', '//Charlie', '//Dave', '//Eve', '//Ferdie'];
|
|
6
6
|
let current = -1;
|
|
7
|
-
const MAX_ACCOUNT_FUND = 10000;
|
|
8
|
-
/** Cycle through the dev mnemonics so as not to deplete the funds too quickly
|
|
9
|
-
*/
|
|
7
|
+
const MAX_ACCOUNT_FUND = 10000;
|
|
10
8
|
function getNextMnemonic() {
|
|
11
9
|
current = (current + 1) % devMnemonics.length;
|
|
12
10
|
return at(devMnemonics, current);
|
|
13
11
|
}
|
|
14
|
-
/** Send funds from one of the development accounts to another account. */
|
|
15
12
|
export async function sendFunds(env, address, who, amount) {
|
|
16
13
|
const envApi = env.getApi();
|
|
17
14
|
await envApi.isReady;
|
|
@@ -30,7 +27,6 @@ export async function sendFunds(env, address, who, amount) {
|
|
|
30
27
|
const unit = oneUnit(envApi);
|
|
31
28
|
const unitAmount = new BN(amount.toString()).div(unit).toString();
|
|
32
29
|
env.logger.debug('Sending funds from', pair.address, 'to', address, 'Amount:', unitAmount, 'UNIT. Free balance:', previousFree.div(unit).toString(), 'UNIT');
|
|
33
|
-
// eslint-disable-next-line no-async-promise-executor
|
|
34
30
|
const result = new Promise(async (resolve, reject) => {
|
|
35
31
|
const unsub = await api.tx.balances
|
|
36
32
|
.transfer(address, amount)
|
|
@@ -62,20 +58,9 @@ export async function sendFunds(env, address, who, amount) {
|
|
|
62
58
|
throw new ProsopoEnvError('DEVELOPER.FUNDING_FAILED', undefined, undefined, { e });
|
|
63
59
|
});
|
|
64
60
|
}
|
|
65
|
-
/**
|
|
66
|
-
* Takes the providerStakeDefault and works out if multiplying it by 100 or
|
|
67
|
-
* stakeMultiplier is greater than the maxStake. If it is, it returns the maxStake
|
|
68
|
-
* If chain decimals = 12, 1 UNIT = 1e12
|
|
69
|
-
* @param env
|
|
70
|
-
* @param providerStakeDefault
|
|
71
|
-
* @param stakeMultiplier
|
|
72
|
-
*/
|
|
73
61
|
export function getStakeAmount(env, providerStakeDefault, stakeMultiplier) {
|
|
74
62
|
const unit = oneUnit(env.getApi());
|
|
75
|
-
// We want to give each provider 100 * the required stake or 1 UNIT, whichever is greater, so that gas fees can be
|
|
76
|
-
// refunded to the Dapp User from within the contract
|
|
77
63
|
const stake100 = BN.max(providerStakeDefault.muln(stakeMultiplier || 100), unit);
|
|
78
|
-
// 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
|
|
79
64
|
const maxStake = unit.muln(MAX_ACCOUNT_FUND);
|
|
80
65
|
if (stake100.lt(maxStake)) {
|
|
81
66
|
env.logger.debug('Setting stake amount to', stake100.div(unit).toNumber(), 'UNIT');
|
|
@@ -84,17 +69,10 @@ export function getStakeAmount(env, providerStakeDefault, stakeMultiplier) {
|
|
|
84
69
|
env.logger.debug('Setting stake amount to', maxStake.div(unit).toNumber(), 'UNIT');
|
|
85
70
|
return maxStake;
|
|
86
71
|
}
|
|
87
|
-
/**
|
|
88
|
-
* Send funds to a test account, adding the max of 2 * stakeAmount or 100 * the
|
|
89
|
-
* existential deposit
|
|
90
|
-
* @param env
|
|
91
|
-
* @param stakeAmount
|
|
92
|
-
*/
|
|
93
72
|
export function getSendAmount(env, stakeAmount) {
|
|
94
73
|
const unit = oneUnit(env.getApi());
|
|
95
74
|
env.logger.debug('Stake amount', stakeAmount.div(unit).toNumber(), 'UNIT');
|
|
96
75
|
let sendAmount = new BN(stakeAmount).muln(2);
|
|
97
|
-
// Should result in each account receiving a minimum of existentialDeposit
|
|
98
76
|
sendAmount = BN.max(sendAmount, env.getApi().consts.balances.existentialDeposit.muln(100));
|
|
99
77
|
env.logger.debug('Setting send amount to', sendAmount.div(unit).toNumber(), 'UNIT');
|
|
100
78
|
return sendAmount;
|
package/dist/setup/funds.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"funds.js","sourceRoot":"","sources":["../../src/setup/funds.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAEnC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAA;AAClC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAEjE,MAAM,YAAY,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;AACrF,IAAI,OAAO,GAAG,CAAC,CAAC,CAAA;AAChB,MAAM,gBAAgB,GAAG,KAAK,CAAA
|
|
1
|
+
{"version":3,"file":"funds.js","sourceRoot":"","sources":["../../src/setup/funds.ts"],"names":[],"mappings":"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"}
|
package/dist/setup/index.js
CHANGED
|
@@ -1,16 +1,3 @@
|
|
|
1
|
-
// Copyright 2021-2023 Prosopo (UK) Ltd.
|
|
2
|
-
//
|
|
3
|
-
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
-
// you may not use this file except in compliance with the License.
|
|
5
|
-
// You may obtain a copy of the License at
|
|
6
|
-
//
|
|
7
|
-
// http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
-
//
|
|
9
|
-
// Unless required by applicable law or agreed to in writing, software
|
|
10
|
-
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
-
// See the License for the specific language governing permissions and
|
|
13
|
-
// limitations under the License.
|
|
14
1
|
export * from './setup.js';
|
|
15
2
|
export * from './provider.js';
|
|
16
3
|
export * from './dapp.js';
|
package/dist/setup/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/setup/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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.js
CHANGED
|
@@ -20,10 +20,8 @@ export async function registerProvider(env, account, force) {
|
|
|
20
20
|
account.address = providerKeyringPair.address;
|
|
21
21
|
const result = await wrapQuery(env.getContractInterface().query.getProviderStakeThreshold, env.getContractInterface().query)();
|
|
22
22
|
const stakeAmount = result.rawNumber;
|
|
23
|
-
// use the minimum stake amount from the contract to create a reasonable stake amount
|
|
24
23
|
account.stake = getStakeAmount(env, stakeAmount);
|
|
25
24
|
const sendAmount = getSendAmount(env, account.stake);
|
|
26
|
-
// send enough funds to cover the stake amount and more
|
|
27
25
|
await sendFunds(env, account.address, 'Provider', sendAmount);
|
|
28
26
|
await setupProvider(env, account);
|
|
29
27
|
}
|
|
@@ -74,7 +72,6 @@ export async function setupProvider(env, provider) {
|
|
|
74
72
|
value: provider.stake,
|
|
75
73
|
},
|
|
76
74
|
];
|
|
77
|
-
// Do this to catch any errors before running the tx
|
|
78
75
|
await wrapQuery(tasks.contract.query.providerUpdate, tasks.contract.query)(...providerUpdateArgs);
|
|
79
76
|
await tasks.contract.tx.providerUpdate(...providerUpdateArgs);
|
|
80
77
|
logger.info(' - providerSetDataset');
|
|
@@ -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,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;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/setup/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/setup/setup.d.ts
CHANGED
|
@@ -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":"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
CHANGED
|
@@ -13,25 +13,26 @@ import fse from 'fs-extra';
|
|
|
13
13
|
import path from 'path';
|
|
14
14
|
const logger = getLogger(LogLevel.enum.info, 'setup');
|
|
15
15
|
const __dirname = path.resolve();
|
|
16
|
-
// Take the root dir from the environment or assume it's the root of this package
|
|
17
16
|
function getRootDir() {
|
|
18
|
-
const rootDir = process.env.
|
|
17
|
+
const rootDir = process.env.PROSOPO_ROOT_DIR || path.resolve(__dirname, '../..');
|
|
19
18
|
logger.info('Root dir:', rootDir);
|
|
20
19
|
return rootDir;
|
|
21
20
|
}
|
|
22
21
|
function getDatasetFilePath() {
|
|
23
|
-
const datasetFile = process.env.
|
|
22
|
+
const datasetFile = process.env.PROSOPO_PROVIDER_DATASET_FILE || path.resolve('../data/captchas.json');
|
|
24
23
|
logger.info('Dataset file:', datasetFile);
|
|
25
24
|
return datasetFile;
|
|
26
25
|
}
|
|
27
26
|
function getDefaultProvider() {
|
|
28
27
|
return {
|
|
29
|
-
url: process.env.
|
|
28
|
+
url: process.env.PROSOPO_API_PORT
|
|
29
|
+
? `http://localhost:${process.env.PROSOPO_API_PORT}`
|
|
30
|
+
: 'http://localhost:3000',
|
|
30
31
|
fee: 10,
|
|
31
32
|
payee: Payee.dapp,
|
|
32
33
|
stake: Math.pow(10, 13),
|
|
33
34
|
datasetFile: getDatasetFilePath(),
|
|
34
|
-
address: process.env.
|
|
35
|
+
address: process.env.PROSOPO_PROVIDER_ADDRESS || '',
|
|
35
36
|
secret: getSecret(),
|
|
36
37
|
captchaDatasetId: '',
|
|
37
38
|
};
|
|
@@ -45,7 +46,6 @@ function getDefaultDapp() {
|
|
|
45
46
|
async function copyEnvFile() {
|
|
46
47
|
try {
|
|
47
48
|
const rootDir = getRootDir();
|
|
48
|
-
// TODO move all env files to a single template location
|
|
49
49
|
const tplLocation = path.resolve(rootDir, './dev/scripts');
|
|
50
50
|
const tplEnvFile = getEnvFile(tplLocation, 'env');
|
|
51
51
|
const envFile = getEnvFile(tplLocation, '.env');
|
|
@@ -62,13 +62,14 @@ function updateEnvFileVar(source, name, value) {
|
|
|
62
62
|
}
|
|
63
63
|
return source + `\n${name}=${value}`;
|
|
64
64
|
}
|
|
65
|
-
async function updateEnvFile(vars) {
|
|
65
|
+
export async function updateEnvFile(vars) {
|
|
66
66
|
const rootDir = getRootDir();
|
|
67
67
|
const envFile = getEnvFile(rootDir, '.env');
|
|
68
68
|
let readEnvFile = await fse.readFile(envFile, 'utf8');
|
|
69
69
|
for (const key in vars) {
|
|
70
70
|
readEnvFile = updateEnvFileVar(readEnvFile, key, get(vars, key));
|
|
71
71
|
}
|
|
72
|
+
logger.info(`Updating ${envFile}`);
|
|
72
73
|
await fse.writeFile(envFile, readEnvFile);
|
|
73
74
|
}
|
|
74
75
|
async function registerDapp(env, dapp, address) {
|
|
@@ -87,8 +88,8 @@ export async function setup(force) {
|
|
|
87
88
|
logger.debug(`Mnemonic: ${mnemonic}`);
|
|
88
89
|
logger.debug('Writing .env file...');
|
|
89
90
|
await copyEnvFile();
|
|
90
|
-
if (!process.env.
|
|
91
|
-
throw new ProsopoEnvError('DEVELOPER.
|
|
91
|
+
if (!process.env.PROSOPO_SITE_KEY) {
|
|
92
|
+
throw new ProsopoEnvError('DEVELOPER.PROSOPO_SITE_KEY_MISSING');
|
|
92
93
|
}
|
|
93
94
|
const config = defaultConfig();
|
|
94
95
|
const providerSecret = config.account.secret;
|
|
@@ -103,16 +104,12 @@ export async function setup(force) {
|
|
|
103
104
|
env.logger.info(`Registering provider... ${defaultProvider.address}`);
|
|
104
105
|
defaultProvider.pair = await getPairAsync(network, providerSecret);
|
|
105
106
|
await registerProvider(env, defaultProvider, force);
|
|
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.
|
|
110
107
|
defaultDapp.pair = await getPairAsync(network, defaultDapp.secret);
|
|
111
108
|
let dappAddressToRegister = defaultDapp.pair.address;
|
|
112
|
-
if (process.env.
|
|
113
|
-
dappAddressToRegister = process.env.
|
|
114
|
-
if (process.env.
|
|
115
|
-
defaultDapp.secret = process.env.
|
|
109
|
+
if (process.env.PROSOPO_SITE_KEY && isAddress(process.env.PROSOPO_SITE_KEY)) {
|
|
110
|
+
dappAddressToRegister = process.env.PROSOPO_SITE_KEY;
|
|
111
|
+
if (process.env.PROSOPO_SITE_PRIVATE_KEY) {
|
|
112
|
+
defaultDapp.secret = process.env.PROSOPO_SITE_PRIVATE_KEY;
|
|
116
113
|
defaultDapp.pair = await getPairAsync(network, defaultDapp.secret);
|
|
117
114
|
dappAddressToRegister = defaultDapp.pair.address;
|
|
118
115
|
}
|
|
@@ -125,9 +122,9 @@ export async function setup(force) {
|
|
|
125
122
|
PROVIDER_ADDRESS: address,
|
|
126
123
|
});
|
|
127
124
|
}
|
|
128
|
-
env.logger.debug('Updating env files with
|
|
125
|
+
env.logger.debug('Updating env files with PROSOPO_SITE_KEY');
|
|
129
126
|
await updateDemoHTMLFiles([/data-sitekey="(\w{48})"/, /siteKey:\s*'(\w{48})'/], defaultDapp.pair.address, env.logger);
|
|
130
|
-
await updateEnvFiles(['
|
|
127
|
+
await updateEnvFiles(['NEXT_PUBLIC_PROSOPO_SITE_KEY', 'PROSOPO_SITE_KEY'], defaultDapp.pair.address, env.logger);
|
|
131
128
|
process.exit();
|
|
132
129
|
}
|
|
133
130
|
else {
|
|
@@ -135,12 +132,4 @@ export async function setup(force) {
|
|
|
135
132
|
throw new ProsopoEnvError(`GENERAL.NO_MNEMONIC_OR_SEED`);
|
|
136
133
|
}
|
|
137
134
|
}
|
|
138
|
-
//if main process
|
|
139
|
-
// if (typeof require !== 'undefined' && require.main === module) {
|
|
140
|
-
// console.info('Running setup as main process')
|
|
141
|
-
//
|
|
142
|
-
// setup()
|
|
143
|
-
// .then((r) => logger.debug('Setup done'))
|
|
144
|
-
// .catch((e) => console.error(e))
|
|
145
|
-
// }
|
|
146
135
|
//# 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":"AAcA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACtE,OAAO,EAAE,KAAK,EAAE,MAAM,yCAAyC,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7E,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACtE,OAAO,GAAG,MAAM,UAAU,CAAA;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AACrD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/setup/setup.ts"],"names":[],"mappings":"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"}
|
package/dist/util/exec.js
CHANGED
|
@@ -1,22 +1,9 @@
|
|
|
1
|
-
// Copyright 2021-2023 Prosopo (UK) Ltd.
|
|
2
|
-
//
|
|
3
|
-
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
-
// you may not use this file except in compliance with the License.
|
|
5
|
-
// You may obtain a copy of the License at
|
|
6
|
-
//
|
|
7
|
-
// http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
-
//
|
|
9
|
-
// Unless required by applicable law or agreed to in writing, software
|
|
10
|
-
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
-
// See the License for the specific language governing permissions and
|
|
13
|
-
// limitations under the License.
|
|
14
1
|
import { spawn } from 'child_process';
|
|
15
2
|
import { stdin } from 'process';
|
|
16
3
|
export const exec = (command, options) => {
|
|
17
4
|
let { pipe, printCmd } = options || {};
|
|
18
|
-
pipe = pipe === undefined || pipe;
|
|
19
|
-
printCmd = printCmd === undefined || printCmd;
|
|
5
|
+
pipe = pipe === undefined || pipe;
|
|
6
|
+
printCmd = printCmd === undefined || printCmd;
|
|
20
7
|
if (printCmd) {
|
|
21
8
|
console.log(`[exec] ${command}`);
|
|
22
9
|
}
|
package/dist/util/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/util/exec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/util/exec.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAQ/B,MAAM,CAAC,MAAM,IAAI,GAAG,CAChB,OAAe,EACf,OAGC,EACkB,EAAE;IACrB,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IACtC,IAAI,GAAG,IAAI,KAAK,SAAS,IAAI,IAAI,CAAA;IACjC,QAAQ,GAAG,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAA;IAE7C,IAAI,QAAQ,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAA;KACnC;IAED,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,EAAE;QACvB,KAAK,EAAE,IAAI;KACd,CAAC,CAAA;IAEF,IAAI,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;QAC5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC/B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;KAClC;IACD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAErB,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IACF,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,IAAI;YAC1B,IAAI,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;gBAC5B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;aAClB;YACD,MAAM,MAAM,GAAe;gBACvB,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3B,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3B,IAAI;aACP,CAAA;YACD,IAAI,IAAI,KAAK,CAAC,EAAE;gBACZ,OAAO,CAAC,MAAM,CAAC,CAAA;aAClB;iBAAM;gBACH,MAAM,CAAC,MAAM,CAAC,CAAA;aACjB;QACL,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC,CAAA"}
|
package/dist/util/index.js
CHANGED
|
@@ -1,16 +1,3 @@
|
|
|
1
|
-
// Copyright 2021-2023 Prosopo (UK) Ltd.
|
|
2
|
-
//
|
|
3
|
-
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
-
// you may not use this file except in compliance with the License.
|
|
5
|
-
// You may obtain a copy of the License at
|
|
6
|
-
//
|
|
7
|
-
// http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
-
//
|
|
9
|
-
// Unless required by applicable law or agreed to in writing, software
|
|
10
|
-
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
-
// See the License for the specific language governing permissions and
|
|
13
|
-
// limitations under the License.
|
|
14
1
|
export * from './loadContractFiles.js';
|
|
15
2
|
export * from './updateEnv.js';
|
|
16
3
|
export * from './exec.js';
|
package/dist/util/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAaA,cAAc,wBAAwB,CAAA;AACtC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,WAAW,CAAA"}
|
|
@@ -1,18 +1,3 @@
|
|
|
1
|
-
// Copyright 2021-2023 Prosopo (UK) Ltd.
|
|
2
|
-
//
|
|
3
|
-
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
-
// you may not use this file except in compliance with the License.
|
|
5
|
-
// You may obtain a copy of the License at
|
|
6
|
-
//
|
|
7
|
-
// http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
-
//
|
|
9
|
-
// Unless required by applicable law or agreed to in writing, software
|
|
10
|
-
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
-
// See the License for the specific language governing permissions and
|
|
13
|
-
// limitations under the License.
|
|
14
|
-
// TODO use the .contract file instead of the .json and .wasm files. Polkadot-JS apps is also erroring out when using
|
|
15
|
-
// the .wasm and .json files. The .contract file works but I don't know why.
|
|
16
1
|
import { Abi } from '@polkadot/api-contract';
|
|
17
2
|
import { hexToU8a, isWasm } from '@polkadot/util';
|
|
18
3
|
import fse from 'fs-extra';
|
|
@@ -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":"AAeA,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,GAAG,MAAM,UAAU,CAAA;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;AAChC,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,QAAgB;IAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC1D,MAAM,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAA;IACtC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAA;IAEzD,IAAI,UAAU,EAAE;QACZ,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CACnB,MAAM,GAAG,CAAC,QAAQ,CAAC,gBAAgB,EAAE;YACjC,QAAQ,EAAE,MAAM;SACnB,CAAC,CACL,CAAA;QACD,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;KACvB;SAAM;QACH,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,iBAAiB,CAAC,CAAA;KACrD;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,QAAgB;IACvC,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC1D,MAAM,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAA;IACtC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAA;IACzD,IAAI,UAAU,EAAE;QACZ,MAAM,IAAI,GAAkB,KAAK,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAA;QACrF,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;QAEhC,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;YACnB,OAAO,SAAS,CAAA;SACnB;aAAM;YACH,OAAO,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;YACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAClB;KACJ;SAAM;QACH,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,iBAAiB,CAAC,CAAA;KACrD;AACL,CAAC"}
|