@prosopo/scripts 0.3.41 → 0.3.42
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 +106 -34
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +72 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/contract/deploy/dapp.js +3 -15
- package/dist/contract/deploy/dapp.js.map +1 -1
- package/dist/contract/deploy/protocol.d.ts.map +1 -1
- package/dist/contract/deploy/protocol.js +7 -23
- package/dist/contract/deploy/protocol.js.map +1 -1
- package/dist/contract/fundDapps.d.ts +20 -1
- package/dist/contract/fundDapps.d.ts.map +1 -1
- package/dist/contract/fundDapps.js +4 -42
- package/dist/contract/fundDapps.js.map +1 -1
- package/dist/contract/transferContract.d.ts +6 -0
- package/dist/contract/transferContract.d.ts.map +1 -0
- package/dist/contract/transferContract.js +142 -0
- package/dist/contract/transferContract.js.map +1 -0
- package/dist/scripts/getExistentialDeposit.js +8 -4
- package/dist/scripts/getExistentialDeposit.js.map +1 -1
- package/dist/setup/dapp.d.ts.map +1 -1
- package/dist/setup/dapp.js +6 -30
- package/dist/setup/dapp.js.map +1 -1
- package/dist/setup/funds.d.ts.map +1 -1
- package/dist/setup/funds.js +4 -43
- package/dist/setup/funds.js.map +1 -1
- package/dist/setup/setup.d.ts.map +1 -1
- package/dist/setup/setup.js +3 -2
- package/dist/setup/setup.js.map +1 -1
- package/package.json +21 -21
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Prosopo Dev Package
|
|
1
|
+
# Prosopo Dev Scripts Package
|
|
2
2
|
|
|
3
3
|
This package contains the scripts and configuration for setting up a development environment for Prosopo.
|
|
4
4
|
|
|
@@ -16,9 +16,14 @@ This package contains the scripts and configuration for setting up a development
|
|
|
16
16
|
git clone https://github.com/prosopo/captcha
|
|
17
17
|
cd captcha
|
|
18
18
|
npm i
|
|
19
|
-
npm run
|
|
19
|
+
npm run build:all
|
|
20
20
|
docker compose --file docker/docker-compose.development.yml up -d
|
|
21
|
-
cp
|
|
21
|
+
cp demos/client-example-server/env.development demos/client-example-server/.env.development
|
|
22
|
+
cp demos/client-example/env.development demos/client-example/.env.development
|
|
23
|
+
cp dev/scripts/env.development .env.development
|
|
24
|
+
cp dev/scripts/env.development dev/scripts/.env.development
|
|
25
|
+
cp dev/scripts/env.development packages/cli/.env.development
|
|
26
|
+
cp dev/scripts/env.development packages/procaptcha-bundle/.env.development
|
|
22
27
|
npm run setup:all
|
|
23
28
|
```
|
|
24
29
|
|
|
@@ -42,32 +47,19 @@ npm run start:provider
|
|
|
42
47
|
npm run start:demo
|
|
43
48
|
```
|
|
44
49
|
|
|
45
|
-
Go to [http://localhost:
|
|
50
|
+
Go to [http://localhost:9230](http://localhost:3001) in your browser.
|
|
46
51
|
|
|
47
52
|
### In-depth
|
|
48
53
|
|
|
49
54
|
#### Set up Containers
|
|
50
55
|
|
|
51
|
-
Setup your
|
|
56
|
+
Setup your containers by running the following command from the root of
|
|
52
57
|
the [scripts](https://github.com/prosopo/scripts) repository.
|
|
53
58
|
|
|
54
59
|
```bash
|
|
55
60
|
docker compose --file ./docker/docker-compose.development.yml up -d
|
|
56
61
|
```
|
|
57
62
|
|
|
58
|
-
This does the following:
|
|
59
|
-
|
|
60
|
-
1. Pulls and starts a substrate node container containing pre-deployed [protocol](https://github.com/prosopo/protocol/)
|
|
61
|
-
2. Pulls and starts up a mongodb container.
|
|
62
|
-
|
|
63
|
-
##### Substrate Container Details
|
|
64
|
-
|
|
65
|
-
| Container Name | Description |
|
|
66
|
-
| ------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
|
|
67
|
-
| prosopo/substrate:dev-aura-aadbbed50ede27817158c7517f13f6f61c9cf000 | Substrate node with pre-deployed protocol at commit aadbbed50ede27817158c7517f13f6f61c9cf000. |
|
|
68
|
-
| prosopo/substrate-contracts-node:v0.25 | Substrate contracts node version 0.25 with no contracts. |
|
|
69
|
-
| prosopo/substrate-contracts-node:v0.24 | Substrate contracts node version 0.24 with no contracts. |
|
|
70
|
-
|
|
71
63
|
#### Install node modules
|
|
72
64
|
|
|
73
65
|
Install the node modules by running the following command from the root of the captcha workspace.
|
|
@@ -81,24 +73,25 @@ npm i
|
|
|
81
73
|
Build all packages by running the following command from the root of the captcha workspace.
|
|
82
74
|
|
|
83
75
|
```bash
|
|
84
|
-
npm run
|
|
76
|
+
npm run build:all
|
|
85
77
|
```
|
|
86
78
|
|
|
87
79
|
#### Deploy contracts (Optional)
|
|
88
80
|
|
|
89
|
-
If you want to deploy
|
|
81
|
+
If you want to deploy the Procaptcha protocol contract, you can do so by running the following command from the root
|
|
90
82
|
of the captcha workspace. Any .env files will be updated with the new contract addresses.
|
|
91
83
|
|
|
92
84
|
```bash
|
|
93
85
|
npm run deploy_protocol
|
|
94
|
-
npm run deploy_dapp
|
|
95
86
|
npm run setup
|
|
96
87
|
```
|
|
97
88
|
|
|
89
|
+
Alternatively, run `npm setup:all` to run both of the above commands.
|
|
90
|
+
|
|
98
91
|
##### Env file
|
|
99
92
|
|
|
100
|
-
You must have a valid env file in `./
|
|
101
|
-
file `./
|
|
93
|
+
You must have a valid env file in `./dev/scripts/` for these commands to work. You can use the
|
|
94
|
+
file `./dev/scripts/env.development` as a template.
|
|
102
95
|
|
|
103
96
|
#### Set up a Provider and Register a Dapp
|
|
104
97
|
|
|
@@ -106,10 +99,10 @@ Providers are the nodes in the network that supply CAPTCHA. Run the following co
|
|
|
106
99
|
workspace to register a Provider and a Dapp in the Protocol contract and start the Provider API.
|
|
107
100
|
|
|
108
101
|
```bash
|
|
109
|
-
npm run setup && npm run start
|
|
102
|
+
npm run setup && npm run start:provider
|
|
110
103
|
```
|
|
111
104
|
|
|
112
|
-
**Protocol**
|
|
105
|
+
The **Protocol** contract **must** exist on the substrate node for the setup script to run.
|
|
113
106
|
|
|
114
107
|
## Testing
|
|
115
108
|
|
|
@@ -121,16 +114,95 @@ Run all the tests using the following command from the root of the captcha works
|
|
|
121
114
|
npm run test
|
|
122
115
|
```
|
|
123
116
|
|
|
124
|
-
|
|
117
|
+
## CLI
|
|
118
|
+
|
|
119
|
+
The development scripts package contains a CLI tool that can be used for various development tasks.
|
|
120
|
+
|
|
121
|
+
### Deploy Protocol Contract
|
|
122
|
+
|
|
123
|
+
From the root of the `captcha` workspace run:
|
|
124
|
+
|
|
125
|
+
```bash
|
|
126
|
+
npm run deploy_protocol
|
|
127
|
+
```
|
|
128
|
+
|
|
129
|
+
This is shorthand for the following command:
|
|
130
|
+
|
|
131
|
+
```bash
|
|
132
|
+
npm run -w @prosopo/scripts cli deploy_protocol --update_env
|
|
133
|
+
```
|
|
134
|
+
Specify the current working directory if you are running from a different location.
|
|
135
|
+
|
|
136
|
+
```bash
|
|
137
|
+
npm run -w @prosopo/scripts cli deploy_protocol --update_env --cwd $(pwd)
|
|
138
|
+
```
|
|
139
|
+
|
|
140
|
+
The default environment is `development`. To deploy to a different environment, set the `NODE_ENV` environment variable.
|
|
141
|
+
|
|
142
|
+
```bash
|
|
143
|
+
NODE_ENV=test npm run -w @prosopo/scripts cli deploy_protocol --update_env
|
|
144
|
+
```
|
|
145
|
+
|
|
146
|
+
### Create env files
|
|
147
|
+
|
|
148
|
+
TODO
|
|
149
|
+
|
|
150
|
+
### Setup the Protocol Contract
|
|
151
|
+
|
|
152
|
+
```bash
|
|
153
|
+
npm run setup
|
|
154
|
+
```
|
|
155
|
+
|
|
156
|
+
### Import Contracts using Typechain
|
|
157
|
+
|
|
158
|
+
```bash
|
|
159
|
+
...
|
|
160
|
+
```
|
|
161
|
+
|
|
162
|
+
### Import All Contracts
|
|
163
|
+
|
|
164
|
+
```bash
|
|
165
|
+
...
|
|
166
|
+
```
|
|
167
|
+
|
|
168
|
+
### Fund Dapps
|
|
169
|
+
|
|
170
|
+
Maintenance script to fund dapps in contract that are not `Active`.
|
|
171
|
+
|
|
172
|
+
```bash
|
|
173
|
+
npm run -w @prosopo/scripts -- cli fund_dapps
|
|
174
|
+
```
|
|
175
|
+
|
|
176
|
+
### Transfer Contract between networks
|
|
177
|
+
|
|
178
|
+
By default, the current `.env` setup will be used as the `--transfer-to` network.
|
|
179
|
+
|
|
180
|
+
```bash
|
|
181
|
+
Transfer dapps and providers from one contract to another
|
|
182
|
+
|
|
183
|
+
Options:
|
|
184
|
+
--help Show help [boolean]
|
|
185
|
+
--version Show version number [boolean]
|
|
186
|
+
--transfer-from The name of the network and the contract address to tran
|
|
187
|
+
sfer from `{ network, address }` [string] [required]
|
|
188
|
+
--transfer-to The name of the network and the contract address to tran
|
|
189
|
+
sfer to `{ network, address }` [string]
|
|
190
|
+
--transfer-providers Whether to transfer providers or not
|
|
191
|
+
[boolean] [required] [default: false]
|
|
192
|
+
--transfer-dapps Whether to transfer dapps or not
|
|
193
|
+
[boolean] [required] [default: false]
|
|
194
|
+
```
|
|
195
|
+
|
|
196
|
+
From the root of the workspace run:
|
|
197
|
+
|
|
198
|
+
```bash
|
|
199
|
+
npm run -w @prosopo/scripts -- cli transfer_contract --transfer-from '{"network":"rococo", "address":"..."}' --transfer-dapps=true --transfer-providers=true
|
|
200
|
+
```
|
|
201
|
+
|
|
202
|
+
### Display Version
|
|
125
203
|
|
|
126
|
-
|
|
127
|
-
with the container prosopo/substrate:dev-aura-aadbbed50ede27817158c7517f13f6f61c9cf000. To test with this container, use
|
|
128
|
-
the docker compose file called `docker-compose.test.yml` in the scripts repository. Copy the template env.development
|
|
129
|
-
file to `.env.test` in the dev package so that the correct contract addresses are used.
|
|
204
|
+
From the root of the workspace run:
|
|
130
205
|
|
|
131
206
|
```bash
|
|
132
|
-
|
|
133
|
-
docker compose --file ./docker/docker-compose.test.yml up -d
|
|
134
|
-
cp dev/env.development dev/.env.test
|
|
135
|
-
NODE_ENV=test npm run test
|
|
207
|
+
npm run -w @prosopo/scripts -- cli --version
|
|
136
208
|
```
|
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":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAwCA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,iBA0N/C"}
|
package/dist/cli/index.js
CHANGED
|
@@ -1,18 +1,27 @@
|
|
|
1
1
|
import { LogLevel, getLogger } from '@prosopo/common';
|
|
2
|
+
import { NetworkConfigSchema, NetworkNamesSchema, networks as getNetworks } from '@prosopo/types';
|
|
2
3
|
import { deployDapp, deployProtocol } from '../contract/deploy/index.js';
|
|
3
4
|
import { exec } from '../util/index.js';
|
|
5
|
+
import { run as fundDapps } from '../contract/fundDapps.js';
|
|
6
|
+
import { get } from '@prosopo/util';
|
|
4
7
|
import { getContractNames, getContractsDir, getProtocolDistDir, getScriptsPkgDir } from '@prosopo/config';
|
|
5
8
|
import { getEnv, loadEnv } from '@prosopo/cli';
|
|
6
9
|
import { getLogLevel } from '@prosopo/common';
|
|
7
10
|
import { hideBin } from 'yargs/helpers';
|
|
8
11
|
import { importContract } from '../contract/index.js';
|
|
9
12
|
import { setup } from '../setup/index.js';
|
|
13
|
+
import { run as transferContract } from '../contract/transferContract.js';
|
|
10
14
|
import { updateEnvFiles } from '../util/index.js';
|
|
11
15
|
import path from 'path';
|
|
12
16
|
import setVersion from '../scripts/setVersion.js';
|
|
13
17
|
import yargs from 'yargs';
|
|
18
|
+
import z from 'zod';
|
|
14
19
|
const rootDir = path.resolve('.');
|
|
15
20
|
loadEnv(rootDir);
|
|
21
|
+
const TransferNetworkSchema = z.object({
|
|
22
|
+
network: z.string(),
|
|
23
|
+
address: z.string(),
|
|
24
|
+
});
|
|
16
25
|
export async function processArgs(args) {
|
|
17
26
|
const parsed = await yargs(hideBin(args)).option('logLevel', {
|
|
18
27
|
describe: 'set log level',
|
|
@@ -107,6 +116,69 @@ export async function processArgs(args) {
|
|
|
107
116
|
await exec(`node dist/cli/index.js import_contract --in=${inDir} --out=${getContractsDir()}/${contract}/src`);
|
|
108
117
|
}
|
|
109
118
|
},
|
|
119
|
+
})
|
|
120
|
+
.command({
|
|
121
|
+
command: 'fund_dapps',
|
|
122
|
+
describe: 'Fund the dapps if they are unfunded',
|
|
123
|
+
builder: (yargs) => yargs,
|
|
124
|
+
handler: async (argv) => {
|
|
125
|
+
const atlasUri = process.env._DEV_ONLY_ATLAS_URI;
|
|
126
|
+
fundDapps(atlasUri)
|
|
127
|
+
.then((result) => {
|
|
128
|
+
log.info(result);
|
|
129
|
+
process.exit(0);
|
|
130
|
+
})
|
|
131
|
+
.catch((e) => {
|
|
132
|
+
console.error(e);
|
|
133
|
+
process.exit(1);
|
|
134
|
+
});
|
|
135
|
+
},
|
|
136
|
+
})
|
|
137
|
+
.command({
|
|
138
|
+
command: 'transfer_contract',
|
|
139
|
+
describe: 'Transfer dapps and providers from one contract to another',
|
|
140
|
+
builder: (yargs) => yargs
|
|
141
|
+
.option('transfer-from', {
|
|
142
|
+
type: 'string',
|
|
143
|
+
demandOption: true,
|
|
144
|
+
desc: 'The name of the network and the contract address to transfer from `{ network, address }`',
|
|
145
|
+
})
|
|
146
|
+
.option('transfer-to', {
|
|
147
|
+
type: 'string',
|
|
148
|
+
demandOption: false,
|
|
149
|
+
desc: 'The name of the network and the contract address to transfer to `{ network, address }`',
|
|
150
|
+
})
|
|
151
|
+
.option('transfer-providers', {
|
|
152
|
+
type: 'boolean',
|
|
153
|
+
demandOption: true,
|
|
154
|
+
desc: 'Whether to transfer providers or not',
|
|
155
|
+
default: false,
|
|
156
|
+
})
|
|
157
|
+
.option('transfer-dapps', {
|
|
158
|
+
type: 'boolean',
|
|
159
|
+
demandOption: true,
|
|
160
|
+
desc: 'Whether to transfer dapps or not',
|
|
161
|
+
default: false,
|
|
162
|
+
}),
|
|
163
|
+
handler: async (argv) => {
|
|
164
|
+
log.debug(argv);
|
|
165
|
+
const atlasUri = process.env._DEV_ONLY_ATLAS_URI;
|
|
166
|
+
const transferFrom = TransferNetworkSchema.parse(JSON.parse(argv.transferFrom));
|
|
167
|
+
const networks = getNetworks();
|
|
168
|
+
const transferFromNetworkName = NetworkNamesSchema.parse(transferFrom.network);
|
|
169
|
+
const transferFromNetwork = NetworkConfigSchema.parse(get(networks, transferFrom.network));
|
|
170
|
+
transferFromNetwork.contract.address = transferFrom.address;
|
|
171
|
+
let transferToNetwork = undefined;
|
|
172
|
+
let transferToNetworkName = undefined;
|
|
173
|
+
if (argv.transferTo !== undefined) {
|
|
174
|
+
const transferTo = TransferNetworkSchema.parse(JSON.parse(argv.transferFrom));
|
|
175
|
+
transferToNetwork = NetworkConfigSchema.parse(get(networks, transferTo.network));
|
|
176
|
+
transferToNetwork.contract.address = transferFrom.address;
|
|
177
|
+
transferToNetworkName = NetworkNamesSchema.parse(transferToNetworkName);
|
|
178
|
+
}
|
|
179
|
+
const transferConfig = { dapps: argv.transferDapps, providers: argv.transferProviders };
|
|
180
|
+
await transferContract(transferFromNetworkName, transferFromNetwork, transferConfig, transferToNetworkName, transferToNetwork, atlasUri);
|
|
181
|
+
},
|
|
110
182
|
})
|
|
111
183
|
.command({
|
|
112
184
|
command: 'version',
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAaA,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,eAAe,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AACzG,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,UAAU,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,16 +3,16 @@ import { ContractDeployer, getPairAsync } from '@prosopo/contract';
|
|
|
3
3
|
import { ProviderEnvironment } from '@prosopo/env';
|
|
4
4
|
import { defaultConfig } from '@prosopo/cli';
|
|
5
5
|
import { get } from '@prosopo/util';
|
|
6
|
-
import { loadEnv } from '@prosopo/cli';
|
|
7
6
|
import { randomAsHex } from '@polkadot/util-crypto';
|
|
8
7
|
import path from 'path';
|
|
9
8
|
async function deploy(wasm, abi) {
|
|
10
|
-
const
|
|
9
|
+
const config = defaultConfig();
|
|
10
|
+
const network = config.networks[defaultConfig().defaultNetwork];
|
|
11
11
|
const pair = await getPairAsync(network, '//Alice');
|
|
12
12
|
const env = new ProviderEnvironment(defaultConfig(), pair);
|
|
13
13
|
await env.isReady();
|
|
14
14
|
const params = ['1000000000000000', 1000, process.env.PROSOPO_CONTRACT_ADDRESS, 50, 1000000];
|
|
15
|
-
const deployer = new ContractDeployer(env.getApi(), abi, wasm, pair, params, 0, 0, randomAsHex());
|
|
15
|
+
const deployer = new ContractDeployer(env.getApi(), abi, wasm, pair, params, 0, 0, randomAsHex(), config.logLevel);
|
|
16
16
|
return await deployer.deploy();
|
|
17
17
|
}
|
|
18
18
|
export async function run() {
|
|
@@ -23,16 +23,4 @@ export async function run() {
|
|
|
23
23
|
const contractAddress = String(get(instantiateEvent?.event.data, 'contract'));
|
|
24
24
|
return contractAddress;
|
|
25
25
|
}
|
|
26
|
-
if (typeof require !== 'undefined' && require.main === module) {
|
|
27
|
-
loadEnv(path.resolve('../..'));
|
|
28
|
-
run()
|
|
29
|
-
.then((deployResult) => {
|
|
30
|
-
console.log('Deployed with address', deployResult);
|
|
31
|
-
process.exit(0);
|
|
32
|
-
})
|
|
33
|
-
.catch((e) => {
|
|
34
|
-
console.error(e);
|
|
35
|
-
process.exit(1);
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
26
|
//# sourceMappingURL=dapp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dapp.js","sourceRoot":"","sources":["../../../src/contract/deploy/dapp.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dapp.js","sourceRoot":"","sources":["../../../src/contract/deploy/dapp.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,KAAK,UAAU,MAAM,CAAC,IAAgB,EAAE,GAAQ;IAC5C,MAAM,MAAM,GAAG,aAAa,EAAE,CAAA;IAC9B,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IACnD,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,CAAA;IAC1D,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;IAEnB,MAAM,MAAM,GAAG,CAAC,kBAAkB,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;IAC5F,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;IAClH,OAAO,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;AAClC,CAAC;AACD,MAAM,CAAC,KAAK,UAAU,GAAG;IACrB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,GAAG,CAAC,CAAC,CAAA;IAChF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,GAAG,CAAC,CAAC,CAAA;IACjF,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAE5C,MAAM,gBAAgB,GAA4B,YAAY,CAAC,MAAM,CAAC,IAAI,CACtE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,KAAK,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,cAAc,CAC1F,CAAA;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAA;IAE7E,OAAO,eAAe,CAAA;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/contract/deploy/protocol.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/contract/deploy/protocol.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AA4B1C,wBAAsB,GAAG,CACrB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,SAAS,CAAC,CA+BpB"}
|
|
@@ -3,27 +3,24 @@ import { AbiJSON, Wasm } from '../../util/index.js';
|
|
|
3
3
|
import { ContractAbi } from '@prosopo/captcha-contract/contract-info';
|
|
4
4
|
import { ContractDeployer, getPairAsync } from '@prosopo/contract';
|
|
5
5
|
import { ContractFile } from '@prosopo/captcha-contract/contract-info';
|
|
6
|
-
import { LogLevel, getLogger
|
|
6
|
+
import { LogLevel, getLogger } from '@prosopo/common';
|
|
7
7
|
import { ProviderEnvironment } from '@prosopo/env';
|
|
8
|
-
import { defaultConfig
|
|
8
|
+
import { defaultConfig } from '@prosopo/cli';
|
|
9
9
|
import { get } from '@prosopo/util';
|
|
10
10
|
import { hexToU8a } from '@polkadot/util';
|
|
11
|
-
import { loadEnv } from '@prosopo/cli';
|
|
12
11
|
import { randomAsHex } from '@polkadot/util-crypto';
|
|
13
12
|
import path from 'path';
|
|
14
|
-
const log = getLogger(LogLevel.enum.info, '
|
|
13
|
+
const log = getLogger(LogLevel.enum.info, 'scripts.deploy');
|
|
15
14
|
async function deploy(wasm, abi, deployerPrefix) {
|
|
16
|
-
const config = defaultConfig();
|
|
15
|
+
const config = defaultConfig(undefined, undefined, undefined, undefined, deployerPrefix);
|
|
16
|
+
log.setLogLevel(config.logLevel);
|
|
17
17
|
const network = config.networks[config.defaultNetwork];
|
|
18
|
-
const secret =
|
|
18
|
+
const secret = config.defaultEnvironment === 'development' ? '//Alice' : config.account.secret;
|
|
19
19
|
const pair = await getPairAsync(network, secret);
|
|
20
20
|
const env = new ProviderEnvironment(config, pair);
|
|
21
21
|
await env.isReady();
|
|
22
|
-
log.debug(reverseHexString(env.getApi().createType('u16', 10).toHex().toString()), 'max_user_history_len');
|
|
23
|
-
log.debug(reverseHexString(env.getApi().createType('BlockNumber', 32).toHex().toString()), 'max_user_history_age');
|
|
24
|
-
log.debug(reverseHexString(env.getApi().createType('u16', 1).toHex().toString()), 'min_num_active_providers');
|
|
25
22
|
const params = [];
|
|
26
|
-
const deployer = new ContractDeployer(env.getApi(), abi, wasm, pair, params, 0, 0, randomAsHex());
|
|
23
|
+
const deployer = new ContractDeployer(env.getApi(), abi, wasm, pair, params, 0, 0, randomAsHex(), config.logLevel);
|
|
27
24
|
return await deployer.deploy();
|
|
28
25
|
}
|
|
29
26
|
export async function run(wasmPath, abiPath, deployer) {
|
|
@@ -53,17 +50,4 @@ export async function run(wasmPath, abiPath, deployer) {
|
|
|
53
50
|
const contractAddress = String(get(instantiateEvent?.event.data, 'contract'));
|
|
54
51
|
return contractAddress;
|
|
55
52
|
}
|
|
56
|
-
if (typeof require !== 'undefined' && require.main === module) {
|
|
57
|
-
log.info('Loading env from', path.resolve('.'));
|
|
58
|
-
loadEnv(path.resolve('.'));
|
|
59
|
-
run(process.env.PROSOPO_CAPTCHA_WASM_PATH, process.env.PROSOPO_CAPTCHA_ABI_PATH)
|
|
60
|
-
.then((deployResult) => {
|
|
61
|
-
log.info('Deployed with address', deployResult);
|
|
62
|
-
process.exit(0);
|
|
63
|
-
})
|
|
64
|
-
.catch((e) => {
|
|
65
|
-
console.error(e);
|
|
66
|
-
process.exit(1);
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
53
|
//# sourceMappingURL=protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/contract/deploy/protocol.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAA;AAEtE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/contract/deploy/protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,21 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="mongoose/types/document.js" />
|
|
2
|
+
/// <reference types="mongoose/types/types.js" />
|
|
3
|
+
/// <reference types="mongoose/types/models.js" />
|
|
4
|
+
/// <reference types="mongoose/types/schemaoptions.js" />
|
|
5
|
+
import mongoose from 'mongoose';
|
|
6
|
+
export interface Emails {
|
|
7
|
+
email: string;
|
|
8
|
+
name: string;
|
|
9
|
+
url: string;
|
|
10
|
+
account: string;
|
|
11
|
+
mnemonic: string;
|
|
12
|
+
createdAt: number;
|
|
13
|
+
marketingPreferences: boolean;
|
|
14
|
+
}
|
|
15
|
+
export declare const EmailModelSchema: mongoose.Schema<Emails, mongoose.Model<Emails, any, any, any, mongoose.Document<unknown, any, Emails> & Emails & {
|
|
16
|
+
_id: mongoose.Types.ObjectId;
|
|
17
|
+
}, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, Emails, mongoose.Document<unknown, {}, Emails> & Emails & {
|
|
18
|
+
_id: mongoose.Types.ObjectId;
|
|
19
|
+
}>;
|
|
20
|
+
export declare function run(atlasUri: string | undefined): Promise<void>;
|
|
2
21
|
//# sourceMappingURL=fundDapps.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fundDapps.d.ts","sourceRoot":"","sources":["../../src/contract/fundDapps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fundDapps.d.ts","sourceRoot":"","sources":["../../src/contract/fundDapps.ts"],"names":[],"mappings":";;;;AAmBA,OAAO,QAAmB,MAAM,UAAU,CAAA;AAI1C,MAAM,WAAW,MAAM;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,OAAO,CAAA;CAChC;AAED,eAAO,MAAM,gBAAgB;;;;EAW5B,CAAA;AASD,wBAAsB,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,iBA2BrD"}
|
|
@@ -1,19 +1,12 @@
|
|
|
1
|
-
import { Abi } from '@polkadot/api-contract';
|
|
2
|
-
import { AbiJSON, Wasm } from '../util/index.js';
|
|
3
|
-
import { ContractAbi } from '@prosopo/captcha-contract/contract-info';
|
|
4
|
-
import { ContractFile } from '@prosopo/captcha-contract/contract-info';
|
|
5
1
|
import { LogLevel, getLogger } from '@prosopo/common';
|
|
6
2
|
import { ProviderEnvironment } from '@prosopo/env';
|
|
7
|
-
import { TransactionQueue } from '@prosopo/tx';
|
|
3
|
+
import { TransactionQueue, oneUnit } from '@prosopo/tx';
|
|
8
4
|
import { defaultConfig } from '@prosopo/cli';
|
|
9
|
-
import { getPairAsync
|
|
10
|
-
import { hexToU8a } from '@polkadot/util';
|
|
11
|
-
import { loadEnv } from '@prosopo/cli';
|
|
5
|
+
import { getPairAsync } from '@prosopo/contract';
|
|
12
6
|
import { setupDapp } from '../setup/index.js';
|
|
13
7
|
import mongoose from 'mongoose';
|
|
14
|
-
import path from 'path';
|
|
15
8
|
const log = getLogger(LogLevel.enum.info, 'dev.deploy');
|
|
16
|
-
const EmailModelSchema = new mongoose.Schema({
|
|
9
|
+
export const EmailModelSchema = new mongoose.Schema({
|
|
17
10
|
email: String,
|
|
18
11
|
name: String,
|
|
19
12
|
url: String,
|
|
@@ -29,30 +22,10 @@ try {
|
|
|
29
22
|
catch (error) {
|
|
30
23
|
EmailsModel = mongoose.model('emails', EmailModelSchema);
|
|
31
24
|
}
|
|
32
|
-
export async function run(
|
|
25
|
+
export async function run(atlasUri) {
|
|
33
26
|
if (!atlasUri) {
|
|
34
27
|
throw new Error('Atlas URI not found in env');
|
|
35
28
|
}
|
|
36
|
-
let wasm;
|
|
37
|
-
if (wasmPath === undefined) {
|
|
38
|
-
log.info('Using wasm from captcha contract');
|
|
39
|
-
const jsonContent = JSON.parse(ContractFile);
|
|
40
|
-
const hex = jsonContent['source']['wasm'];
|
|
41
|
-
wasm = hexToU8a(hex);
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
log.info('WASM Path', wasmPath);
|
|
45
|
-
wasm = await Wasm(path.resolve(wasmPath));
|
|
46
|
-
}
|
|
47
|
-
let abi;
|
|
48
|
-
if (abiPath === undefined) {
|
|
49
|
-
log.info('Using abi from captcha contract');
|
|
50
|
-
abi = new Abi(ContractAbi);
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
log.info('ABI Path', abiPath);
|
|
54
|
-
abi = await AbiJSON(path.resolve(abiPath));
|
|
55
|
-
}
|
|
56
29
|
await mongoose.connect(atlasUri, { dbName: 'prosopo' });
|
|
57
30
|
const dapps = await EmailsModel.find({}).exec();
|
|
58
31
|
log.info(dapps);
|
|
@@ -74,15 +47,4 @@ export async function run(wasmPath, abiPath, atlasUri) {
|
|
|
74
47
|
.filter((dappRecord) => dappRecord.account)
|
|
75
48
|
.map((dappRecord) => setupDapp(env, { pair, secret, fundAmount }, dappRecord.account, queue)));
|
|
76
49
|
}
|
|
77
|
-
log.info('Loading env from', path.resolve('.'));
|
|
78
|
-
loadEnv(path.resolve('.'));
|
|
79
|
-
run(process.env.PROSOPO_CAPTCHA_WASM_PATH, process.env.PROSOPO_CAPTCHA_ABI_PATH, process.env._DEV_ONLY_ATLAS_URI)
|
|
80
|
-
.then((result) => {
|
|
81
|
-
log.info(result);
|
|
82
|
-
process.exit(0);
|
|
83
|
-
})
|
|
84
|
-
.catch((e) => {
|
|
85
|
-
console.error(e);
|
|
86
|
-
process.exit(1);
|
|
87
|
-
});
|
|
88
50
|
//# sourceMappingURL=fundDapps.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fundDapps.js","sourceRoot":"","sources":["../../src/contract/fundDapps.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"fundDapps.js","sourceRoot":"","sources":["../../src/contract/fundDapps.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { NetworkConfig, NetworkNames } from '@prosopo/types';
|
|
2
|
+
export declare const run: (transferFromNetworkName: NetworkNames, transferFrom: NetworkConfig, transferConfig: {
|
|
3
|
+
dapps: boolean;
|
|
4
|
+
providers: boolean;
|
|
5
|
+
}, transferToNetworkName?: NetworkNames, transferTo?: NetworkConfig, atlasUri?: string) => Promise<void>;
|
|
6
|
+
//# sourceMappingURL=transferContract.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transferContract.d.ts","sourceRoot":"","sources":["../../src/contract/transferContract.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,YAAY,EAA0B,MAAM,gBAAgB,CAAA;AA+KpF,eAAO,MAAM,GAAG,4BACa,YAAY,gBACvB,aAAa,kBACX;IACZ,KAAK,EAAE,OAAO,CAAA;IACd,SAAS,EAAE,OAAO,CAAA;CACrB,0BACuB,YAAY,eACvB,aAAa,aACf,MAAM,kBAuCpB,CAAA"}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
import { BN_ZERO } from '@polkadot/util/bn';
|
|
2
|
+
import { DappPayee, GovernanceStatus, Payee } from '@prosopo/captcha-contract';
|
|
3
|
+
import { EmailModelSchema } from './fundDapps.js';
|
|
4
|
+
import { LogLevel, getLogger } from '@prosopo/common';
|
|
5
|
+
import { PolkadotSecretJSONSpec } from '@prosopo/types';
|
|
6
|
+
import { ProviderEnvironment } from '@prosopo/env';
|
|
7
|
+
import { Tasks } from '@prosopo/provider';
|
|
8
|
+
import { TransactionQueue, getBalance, oneUnit, send, submitTx } from '@prosopo/tx';
|
|
9
|
+
import { defaultConfig } from '@prosopo/cli';
|
|
10
|
+
import { encodeAddress } from '@polkadot/keyring';
|
|
11
|
+
import { getPairAsync, wrapQuery } from '@prosopo/contract';
|
|
12
|
+
import mongoose from 'mongoose';
|
|
13
|
+
import z from 'zod';
|
|
14
|
+
const log = getLogger(LogLevel.enum.info, 'Scripts.transferContract');
|
|
15
|
+
let EmailsModel;
|
|
16
|
+
try {
|
|
17
|
+
EmailsModel = mongoose.model('emails');
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
EmailsModel = mongoose.model('emails', EmailModelSchema);
|
|
21
|
+
}
|
|
22
|
+
const getAllMongoDapps = async (atlasUri) => {
|
|
23
|
+
await mongoose
|
|
24
|
+
.connect(atlasUri, { dbName: 'prosopo' })
|
|
25
|
+
.then(() => console.log('Connected to MongoDB Atlas'))
|
|
26
|
+
.catch((err) => console.error('Error connecting to MongoDB:', err));
|
|
27
|
+
return await EmailsModel.find({}).exec();
|
|
28
|
+
};
|
|
29
|
+
const registerDapps = async (addresses, transferTo, accountPrefix) => {
|
|
30
|
+
const config = defaultConfig(undefined, undefined, undefined, undefined, accountPrefix);
|
|
31
|
+
const network = transferTo || config.networks[config.defaultNetwork];
|
|
32
|
+
const secret = config.account.secret;
|
|
33
|
+
const pair = await getPairAsync(network, secret);
|
|
34
|
+
const env = new ProviderEnvironment(config, pair);
|
|
35
|
+
await env.isReady();
|
|
36
|
+
const queue = new TransactionQueue(env.getApi(), pair, config.logLevel);
|
|
37
|
+
const tasks = new Tasks(env);
|
|
38
|
+
const dappStakeDefaultPromise = wrapQuery(env.getContractInterface().query.getDappStakeThreshold, env.getContractInterface().query)();
|
|
39
|
+
const dappStakeDefault = (await dappStakeDefaultPromise).rawNumber;
|
|
40
|
+
for (const addressToRegister of addresses) {
|
|
41
|
+
try {
|
|
42
|
+
await wrapQuery(tasks.contract.query.getDapp, tasks.contract.query)(addressToRegister);
|
|
43
|
+
}
|
|
44
|
+
catch (e) {
|
|
45
|
+
log.info(' - dappRegister', addressToRegister);
|
|
46
|
+
await submitTx(queue, tasks.contract, 'dappRegister', [addressToRegister, DappPayee.dapp], dappStakeDefault);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
const getAllProviders = async (networkName, networkConfig) => {
|
|
51
|
+
const config = defaultConfig(networkName && networkConfig ? { [networkName]: networkConfig } : undefined);
|
|
52
|
+
config.defaultNetwork = networkName || config.defaultNetwork;
|
|
53
|
+
delete config.database;
|
|
54
|
+
const network = config.networks[config.defaultNetwork];
|
|
55
|
+
const secret = config.account.secret;
|
|
56
|
+
const pair = await getPairAsync(network, secret);
|
|
57
|
+
const env = new ProviderEnvironment(config, pair);
|
|
58
|
+
await env.isReady();
|
|
59
|
+
const providerAccounts = await wrapQuery(env.getContractInterface().query.getAllProviderAccounts, env.getContractInterface().query)();
|
|
60
|
+
const providers = {};
|
|
61
|
+
for (const account of providerAccounts) {
|
|
62
|
+
const provider = await wrapQuery(env.getContractInterface().query.getProvider, env.getContractInterface().query)(account);
|
|
63
|
+
if (provider.status === GovernanceStatus.active) {
|
|
64
|
+
providers[encodeAddress(account, 42).toString()] = provider;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return providers;
|
|
68
|
+
};
|
|
69
|
+
const registerProviders = async (providers, transferTo, accountPrefix) => {
|
|
70
|
+
const config = defaultConfig(undefined, undefined, undefined, undefined, accountPrefix);
|
|
71
|
+
delete config.database;
|
|
72
|
+
const network = transferTo || config.networks[config.defaultNetwork];
|
|
73
|
+
const secret = config.account.secret;
|
|
74
|
+
const pair = await getPairAsync(network, secret);
|
|
75
|
+
const env = new ProviderEnvironment(config, pair);
|
|
76
|
+
await env.isReady();
|
|
77
|
+
const unit = oneUnit(env.getApi());
|
|
78
|
+
const providerStakeDefaultPromise = wrapQuery(env.getContractInterface().query.getProviderStakeThreshold, env.getContractInterface().query)();
|
|
79
|
+
const providerStakeDefault = (await providerStakeDefaultPromise).rawNumber;
|
|
80
|
+
const adminPair = env.getPair();
|
|
81
|
+
for (const [address, provider] of Object.entries(providers)) {
|
|
82
|
+
const providerBalance = await getBalance(env.getApi(), address);
|
|
83
|
+
const balanceToHave = providerStakeDefault.add(unit);
|
|
84
|
+
log.info('Balance to have', balanceToHave.toString());
|
|
85
|
+
log.info('Provider balance', providerBalance.toString());
|
|
86
|
+
log.info('Env pair', env.getPair().address);
|
|
87
|
+
log.info('Provider stake default', providerStakeDefault.toString());
|
|
88
|
+
if (providerBalance.lt(balanceToHave)) {
|
|
89
|
+
const balanceToSend = balanceToHave.sub(providerBalance);
|
|
90
|
+
await send(env.getApi(), address, balanceToSend, adminPair);
|
|
91
|
+
}
|
|
92
|
+
const pair = await getPairAsync(network, provider.secret, address);
|
|
93
|
+
log.info('Registering provider', pair.address);
|
|
94
|
+
pair.unlock(provider.password);
|
|
95
|
+
await env.changeSigner(pair);
|
|
96
|
+
const queue = new TransactionQueue(env.getApi(), pair, config.logLevel);
|
|
97
|
+
await submitTx(queue, env.getContractInterface(), 'providerRegister', [provider.url, 0, Payee.dapp], providerStakeDefault);
|
|
98
|
+
log.info('Setting dataset for provider', pair.address);
|
|
99
|
+
await submitTx(queue, env.getContractInterface(), 'providerSetDataset', [provider.datasetId, provider.datasetIdContent], BN_ZERO);
|
|
100
|
+
}
|
|
101
|
+
};
|
|
102
|
+
const PronodeSecretsSpec = z.array(z.object({ password: z.string(), secret: PolkadotSecretJSONSpec }));
|
|
103
|
+
const mapProvidersToProviderSecrets = (providers, providerSecrets) => {
|
|
104
|
+
const providerAddresses = Object.keys(providers);
|
|
105
|
+
const providersWithSecrets = {};
|
|
106
|
+
providerSecrets.map((providerSecret) => {
|
|
107
|
+
if (providerAddresses.includes(providerSecret.secret.address)) {
|
|
108
|
+
providersWithSecrets[providerSecret.secret.address] = {
|
|
109
|
+
...providers[providerSecret.secret.address],
|
|
110
|
+
secret: providerSecret.secret,
|
|
111
|
+
password: providerSecret.password,
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
return providersWithSecrets;
|
|
116
|
+
};
|
|
117
|
+
export const run = async (transferFromNetworkName, transferFrom, transferConfig, transferToNetworkName, transferTo, atlasUri) => {
|
|
118
|
+
if (!atlasUri) {
|
|
119
|
+
throw new Error('Atlas URI not found in env');
|
|
120
|
+
}
|
|
121
|
+
if (transferConfig.dapps) {
|
|
122
|
+
const dapps = await getAllMongoDapps(atlasUri);
|
|
123
|
+
log.info(dapps);
|
|
124
|
+
await registerDapps(dapps.map((dapp) => dapp.account), transferTo, 'DEPLOYER');
|
|
125
|
+
}
|
|
126
|
+
if (transferConfig.providers) {
|
|
127
|
+
log.info(transferFrom);
|
|
128
|
+
const providers = await getAllProviders(transferFromNetworkName, transferFrom);
|
|
129
|
+
const newProviders = await getAllProviders(transferToNetworkName, transferTo);
|
|
130
|
+
log.info('Existing providers on new network', newProviders);
|
|
131
|
+
for (const [address, provider] of Object.entries(providers)) {
|
|
132
|
+
if (newProviders[address]) {
|
|
133
|
+
delete providers[address];
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
log.info('Registering the following providers', providers);
|
|
137
|
+
const providerSecrets = PronodeSecretsSpec.parse(JSON.parse(process.env.PROSOPO_PRONODE_SECRETS || '[]'));
|
|
138
|
+
const providersWithSecrets = mapProvidersToProviderSecrets(providers, providerSecrets);
|
|
139
|
+
await registerProviders(providersWithSecrets, transferTo, 'DEPLOYER');
|
|
140
|
+
}
|
|
141
|
+
};
|
|
142
|
+
//# sourceMappingURL=transferContract.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transferContract.js","sourceRoot":"","sources":["../../src/contract/transferContract.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { ApiPromise, WsProvider } from '@polkadot/api';
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
import { networks } from '@prosopo/types';
|
|
3
|
+
import { get } from '@prosopo/util';
|
|
4
|
+
import { oneUnit } from '@prosopo/tx';
|
|
5
|
+
async function run(defaultNetwork) {
|
|
6
|
+
const defaultNetworks = networks();
|
|
7
|
+
const provider = get(defaultNetworks, defaultNetwork).endpoint;
|
|
5
8
|
const wsProvider = new WsProvider(provider);
|
|
6
9
|
const api = await ApiPromise.create({ provider: wsProvider });
|
|
7
10
|
const existentialDeposit = await api.consts.balances.existentialDeposit;
|
|
@@ -14,7 +17,8 @@ async function run() {
|
|
|
14
17
|
console.log('Existential Deposit Hex:', existentialDeposit.toHex?.());
|
|
15
18
|
return existentialDeposit;
|
|
16
19
|
}
|
|
17
|
-
|
|
20
|
+
const defaultNetwork = process.argv[2];
|
|
21
|
+
run(defaultNetwork)
|
|
18
22
|
.then(() => process.exit(0))
|
|
19
23
|
.catch((error) => {
|
|
20
24
|
console.error(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExistentialDeposit.js","sourceRoot":"","sources":["../../src/scripts/getExistentialDeposit.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"getExistentialDeposit.js","sourceRoot":"","sources":["../../src/scripts/getExistentialDeposit.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAgB,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,KAAK,UAAU,GAAG,CAAC,cAA4B;IAC3C,MAAM,eAAe,GAAG,QAAQ,EAAE,CAAA;IAElC,MAAM,QAAQ,GAAG,GAAG,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAA;IAC9D,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAA;IAC3C,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAA;IAG7D,MAAM,kBAAkB,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAA;IACvE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;IAC/B,MAAM,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAA;IAChD,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,aAAa,CAAC,CAAA;IACnD,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;IACzC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAA;IAClE,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;IAC7F,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACrE,OAAO,kBAAkB,CAAA;AAC7B,CAAC;AAED,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAiB,CAAA;AACtD,GAAG,CAAC,cAAc,CAAC;KACd,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAC3B,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AACpB,CAAC,CAAC,CAAA"}
|
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;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,EAAE,gBAAgB,EAAqB,MAAM,aAAa,CAAA;AAOjE,wBAAsB,SAAS,CAC3B,GAAG,EAAE,mBAAmB,EACxB,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,IAAI,CAAC,CAmDf"}
|
package/dist/setup/dapp.js
CHANGED
|
@@ -1,36 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BN_ZERO } from '@polkadot/util/bn';
|
|
2
2
|
import { DappPayee } from '@prosopo/captcha-contract';
|
|
3
3
|
import { LogLevel } from '@prosopo/common';
|
|
4
|
-
import { oneUnit, wrapQuery } from '@prosopo/contract';
|
|
5
|
-
import { ProsopoContractError, getLogger } from '@prosopo/common';
|
|
6
4
|
import { Tasks } from '@prosopo/provider';
|
|
5
|
+
import { oneUnit, submitTx } from '@prosopo/tx';
|
|
6
|
+
import { getLogger } from '@prosopo/common';
|
|
7
7
|
import { sendFunds } from './funds.js';
|
|
8
|
+
import { wrapQuery } from '@prosopo/contract';
|
|
8
9
|
const log = getLogger(LogLevel.enum.info, 'setupDapp');
|
|
9
|
-
async function submitTx(transactionQueue, contract, method, args, value, pair) {
|
|
10
|
-
return new Promise((resolve, reject) => {
|
|
11
|
-
if (contract.nativeContract.tx &&
|
|
12
|
-
method in contract.nativeContract.tx &&
|
|
13
|
-
contract.nativeContract.tx[method] !== undefined) {
|
|
14
|
-
try {
|
|
15
|
-
contract.dryRunContractMethod(method, args, value).then((extrinsic) => {
|
|
16
|
-
transactionQueue
|
|
17
|
-
.add(extrinsic, (result) => {
|
|
18
|
-
resolve(result);
|
|
19
|
-
}, pair, method)
|
|
20
|
-
.then((result) => {
|
|
21
|
-
log.debug('Transaction added to queue', result);
|
|
22
|
-
});
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
|
-
catch (err) {
|
|
26
|
-
reject(err);
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
reject(new ProsopoContractError('CONTRACT.INVALID_METHOD', { context: { failedFuncName: submitTx.name } }));
|
|
31
|
-
}
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
10
|
export async function setupDapp(env, dapp, address, queue) {
|
|
35
11
|
const logger = env.logger;
|
|
36
12
|
if (dapp.pair) {
|
|
@@ -59,7 +35,7 @@ export async function setupDapp(env, dapp, address, queue) {
|
|
|
59
35
|
logger.info(' - dappRegister', addressToRegister);
|
|
60
36
|
await wrapQuery(tasks.contract.query.dappRegister, tasks.contract.query)(addressToRegister, DappPayee.dapp);
|
|
61
37
|
if (queue) {
|
|
62
|
-
await submitTx(queue, tasks.contract, 'dappRegister', [addressToRegister, DappPayee.dapp],
|
|
38
|
+
await submitTx(queue, tasks.contract, 'dappRegister', [addressToRegister, DappPayee.dapp], BN_ZERO);
|
|
63
39
|
}
|
|
64
40
|
else {
|
|
65
41
|
await tasks.contract.tx.dappRegister(addressToRegister, DappPayee.dapp);
|
|
@@ -81,7 +57,7 @@ async function dappSendFunds(env, dapp) {
|
|
|
81
57
|
if (dapp.pair && !dapp.pair.isLocked) {
|
|
82
58
|
const sendAmount = oneUnit(env.getApi());
|
|
83
59
|
const { data: { free: previousFree }, } = await env.getContractInterface().api.query.system.account(dapp.pair.address);
|
|
84
|
-
if (previousFree.lt(
|
|
60
|
+
if (previousFree.lt(sendAmount)) {
|
|
85
61
|
await sendFunds(env, dapp.pair.address, 'Dapp', sendAmount);
|
|
86
62
|
}
|
|
87
63
|
}
|
package/dist/setup/dapp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dapp.js","sourceRoot":"","sources":["../../src/setup/dapp.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dapp.js","sourceRoot":"","sources":["../../src/setup/dapp.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAQ,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE1C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAoB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE7C,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AAEtD,MAAM,CAAC,KAAK,UAAU,SAAS,CAC3B,GAAwB,EACxB,IAAkB,EAClB,OAAgB,EAChB,KAAwB;IAExB,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;YAC/B,IAAI,UAAU,CAAC,MAAM,KAAK,UAAU,EAAE;gBAClC,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE;oBACpF,KAAK,EAAE,IAAI,CAAC,UAAU;iBACzB,CAAC,CAAA;gBAEF,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;gBAE5B,IAAI,KAAK,EAAE;oBACP,MAAM,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;iBAC1F;qBAAM;oBACH,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;iBAClF;aACJ;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAA;YAEnD,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,IAAI,KAAK,EAAE;gBACP,MAAM,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAA;aACtG;iBAAM;gBACH,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;aAC1E;YAED,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;YAEF,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;YAE5B,IAAI,KAAK,EAAE;gBACP,MAAM,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;aAC1F;iBAAM;gBACH,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;aAClF;SACJ;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,UAAU,CAAC,EAAE;YAE7B,MAAM,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;SAC9D;KACJ;AACL,CAAC"}
|
|
@@ -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;
|
|
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;AAEnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAkBvD,wBAAsB,SAAS,CAC3B,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,SAAS,GAClB,OAAO,CAAC,IAAI,CAAC,CAiBf;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
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { BN } from '@polkadot/util';
|
|
2
2
|
import { ProsopoEnvError } from '@prosopo/common';
|
|
3
3
|
import { at } from '@prosopo/util';
|
|
4
|
-
import {
|
|
4
|
+
import { getBalance, oneUnit } from '@prosopo/tx';
|
|
5
|
+
import { send } from '@prosopo/tx';
|
|
5
6
|
const devMnemonics = ['//Alice', '//Bob', '//Charlie', '//Dave', '//Eve', '//Ferdie'];
|
|
6
7
|
let current = -1;
|
|
7
8
|
const MAX_ACCOUNT_FUND = 10000;
|
|
@@ -15,7 +16,7 @@ export async function sendFunds(env, address, who, amount) {
|
|
|
15
16
|
const mnemonic = getNextMnemonic();
|
|
16
17
|
const pair = env.keyring.addFromMnemonic(mnemonic);
|
|
17
18
|
const nonce = await envApi.rpc.system.accountNextIndex(pair.address);
|
|
18
|
-
const
|
|
19
|
+
const previousFree = await getBalance(envApi, pair.address);
|
|
19
20
|
if (previousFree.lt(new BN(amount.toString()))) {
|
|
20
21
|
throw new ProsopoEnvError('DEVELOPER.BALANCE_TOO_LOW', {
|
|
21
22
|
context: {
|
|
@@ -25,47 +26,7 @@ export async function sendFunds(env, address, who, amount) {
|
|
|
25
26
|
},
|
|
26
27
|
});
|
|
27
28
|
}
|
|
28
|
-
|
|
29
|
-
const unit = oneUnit(envApi);
|
|
30
|
-
const unitAmount = new BN(amount.toString()).div(unit).toString();
|
|
31
|
-
env.logger.debug('Sending funds from', pair.address, 'to', address, 'Amount:', unitAmount, 'UNIT. Free balance:', previousFree.div(unit).toString(), 'UNIT');
|
|
32
|
-
const result = new Promise(async (resolve, reject) => {
|
|
33
|
-
const unsub = await api.tx.balances
|
|
34
|
-
.transferAllowDeath(address, amount)
|
|
35
|
-
.signAndSend(pair, { nonce }, (result) => {
|
|
36
|
-
if (result.status.isInBlock || result.status.isFinalized) {
|
|
37
|
-
result.events
|
|
38
|
-
.filter(({ event: { section } }) => section === 'system')
|
|
39
|
-
.forEach((event) => {
|
|
40
|
-
const { event: { method }, } = event;
|
|
41
|
-
if (method === 'ExtrinsicFailed') {
|
|
42
|
-
unsub();
|
|
43
|
-
reject(dispatchErrorHandler(api.registry, event));
|
|
44
|
-
}
|
|
45
|
-
});
|
|
46
|
-
unsub();
|
|
47
|
-
resolve(result);
|
|
48
|
-
}
|
|
49
|
-
else if (result.isError) {
|
|
50
|
-
unsub();
|
|
51
|
-
reject(result);
|
|
52
|
-
}
|
|
53
|
-
});
|
|
54
|
-
});
|
|
55
|
-
await result
|
|
56
|
-
.then(async (result) => {
|
|
57
|
-
if (result.status.isFuture) {
|
|
58
|
-
const block = await api.rpc.chain.getBlock();
|
|
59
|
-
JSON.stringify(block);
|
|
60
|
-
env.logger.debug(who, 'sent amount', unitAmount, 'UNIT in FUTURE tx hash ', result.status.asInBlock.toHex());
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
63
|
-
env.logger.debug(who, 'sent amount', unitAmount, 'UNIT at tx hash ', result.txHash.toHex());
|
|
64
|
-
}
|
|
65
|
-
})
|
|
66
|
-
.catch((e) => {
|
|
67
|
-
throw new ProsopoEnvError('DEVELOPER.FUNDING_FAILED', { context: { error: e } });
|
|
68
|
-
});
|
|
29
|
+
await send(envApi, address, amount, pair, nonce);
|
|
69
30
|
}
|
|
70
31
|
export function getStakeAmount(env, providerStakeDefault, stakeMultiplier) {
|
|
71
32
|
const unit = oneUnit(env.getApi());
|
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;
|
|
1
|
+
{"version":3,"file":"funds.js","sourceRoot":"","sources":["../../src/setup/funds.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":"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
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BN } from '@polkadot/util';
|
|
1
2
|
import { LogLevel, ProsopoEnvError, getLogger } from '@prosopo/common';
|
|
2
3
|
import { Payee } from '@prosopo/captcha-contract/types-returns';
|
|
3
4
|
import { ProviderEnvironment } from '@prosopo/env';
|
|
@@ -29,7 +30,7 @@ function getDefaultProvider() {
|
|
|
29
30
|
url: process.env.PROSOPO_API_PORT ? `http://${host}:${process.env.PROSOPO_API_PORT}` : `http://${host}:9229`,
|
|
30
31
|
fee: 10,
|
|
31
32
|
payee: Payee.dapp,
|
|
32
|
-
stake: Math.pow(10, 13),
|
|
33
|
+
stake: new BN(Math.pow(10, 13)),
|
|
33
34
|
datasetFile: getDatasetFilePath(),
|
|
34
35
|
address: process.env.PROSOPO_PROVIDER_ADDRESS || '',
|
|
35
36
|
secret: getSecret(),
|
|
@@ -39,7 +40,7 @@ function getDefaultProvider() {
|
|
|
39
40
|
function getDefaultDapp() {
|
|
40
41
|
return {
|
|
41
42
|
secret: '//Eve',
|
|
42
|
-
fundAmount: Math.pow(10, 12),
|
|
43
|
+
fundAmount: new BN(Math.pow(10, 12)),
|
|
43
44
|
};
|
|
44
45
|
}
|
|
45
46
|
async function copyEnvFile() {
|
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/scripts",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.42",
|
|
4
4
|
"description": "Dev scripts for working with prosopo packages",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -32,26 +32,26 @@
|
|
|
32
32
|
"@polkadot/api-contract": "10.13.1",
|
|
33
33
|
"@polkadot/types": "10.13.1",
|
|
34
34
|
"@polkadot/util-crypto": "12.6.2",
|
|
35
|
-
"@prosopo/api": "0.3.
|
|
36
|
-
"@prosopo/cli": "0.3.
|
|
37
|
-
"@prosopo/common": "0.3.
|
|
38
|
-
"@prosopo/config": "0.3.
|
|
39
|
-
"@prosopo/contract": "0.3.
|
|
40
|
-
"@prosopo/database": "0.3.
|
|
41
|
-
"@prosopo/datasets": "0.3.
|
|
42
|
-
"@prosopo/datasets-fs": "0.3.
|
|
43
|
-
"@prosopo/env": "0.3.
|
|
44
|
-
"@prosopo/file-server": "0.3.
|
|
45
|
-
"@prosopo/procaptcha": "0.3.
|
|
46
|
-
"@prosopo/procaptcha-bundle": "0.3.
|
|
47
|
-
"@prosopo/procaptcha-react": "0.3.
|
|
48
|
-
"@prosopo/provider": "0.3.
|
|
49
|
-
"@prosopo/server": "0.3.
|
|
50
|
-
"@prosopo/types": "0.3.
|
|
51
|
-
"@prosopo/types-database": "0.3.
|
|
52
|
-
"@prosopo/types-env": "0.3.
|
|
53
|
-
"@prosopo/captcha-contract": "0.3.
|
|
54
|
-
"@prosopo/util": "0.3.
|
|
35
|
+
"@prosopo/api": "0.3.42",
|
|
36
|
+
"@prosopo/cli": "0.3.42",
|
|
37
|
+
"@prosopo/common": "0.3.42",
|
|
38
|
+
"@prosopo/config": "0.3.42",
|
|
39
|
+
"@prosopo/contract": "0.3.42",
|
|
40
|
+
"@prosopo/database": "0.3.42",
|
|
41
|
+
"@prosopo/datasets": "0.3.42",
|
|
42
|
+
"@prosopo/datasets-fs": "0.3.42",
|
|
43
|
+
"@prosopo/env": "0.3.42",
|
|
44
|
+
"@prosopo/file-server": "0.3.42",
|
|
45
|
+
"@prosopo/procaptcha": "0.3.42",
|
|
46
|
+
"@prosopo/procaptcha-bundle": "0.3.42",
|
|
47
|
+
"@prosopo/procaptcha-react": "0.3.42",
|
|
48
|
+
"@prosopo/provider": "0.3.42",
|
|
49
|
+
"@prosopo/server": "0.3.42",
|
|
50
|
+
"@prosopo/types": "0.3.42",
|
|
51
|
+
"@prosopo/types-database": "0.3.42",
|
|
52
|
+
"@prosopo/types-env": "0.3.42",
|
|
53
|
+
"@prosopo/captcha-contract": "0.3.42",
|
|
54
|
+
"@prosopo/util": "0.3.42",
|
|
55
55
|
"consola": "^3.2.3",
|
|
56
56
|
"dotenv": "^16.0.3",
|
|
57
57
|
"fast-glob": "^3.3.2",
|