@prosopo/env 0.2.14 → 0.2.16
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/cjs/env.cjs +1 -1
- package/dist/env.js +4 -21
- package/dist/env.js.map +1 -1
- package/dist/index.js +0 -13
- package/dist/index.js.map +1 -1
- package/dist/provider.js +0 -13
- package/dist/provider.js.map +1 -1
- package/package.json +8 -8
package/dist/cjs/env.cjs
CHANGED
|
@@ -16,7 +16,7 @@ class Environment {
|
|
|
16
16
|
this.defaultNetwork = this.config.defaultNetwork;
|
|
17
17
|
this.pair = pair;
|
|
18
18
|
this.logger = common.getLogger(this.config.logLevel, `ProsopoEnvironment`);
|
|
19
|
-
if (this.config.
|
|
19
|
+
if (this.config.defaultNetwork && Object.prototype.hasOwnProperty.call(this.config.networks, this.config.defaultNetwork) && this.config.networks && this.config.networks[this.defaultNetwork]) {
|
|
20
20
|
const network = this.config.networks[this.defaultNetwork];
|
|
21
21
|
this.logger.info(`Endpoint: ${network == null ? void 0 : network.endpoint}`);
|
|
22
22
|
this.wsProvider = new ws.WsProvider(network == null ? void 0 : network.endpoint);
|
package/dist/env.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 { ApiPromise } from '@polkadot/api/promise/Api';
|
|
15
2
|
import { Databases } from '@prosopo/database';
|
|
16
3
|
import { Keyring } from '@polkadot/keyring';
|
|
@@ -27,8 +14,8 @@ export class Environment {
|
|
|
27
14
|
this.defaultNetwork = this.config.defaultNetwork;
|
|
28
15
|
this.pair = pair;
|
|
29
16
|
this.logger = getLogger(this.config.logLevel, `ProsopoEnvironment`);
|
|
30
|
-
if (this.config.
|
|
31
|
-
Object.prototype.hasOwnProperty.call(this.config.networks, this.config.
|
|
17
|
+
if (this.config.defaultNetwork &&
|
|
18
|
+
Object.prototype.hasOwnProperty.call(this.config.networks, this.config.defaultNetwork) &&
|
|
32
19
|
this.config.networks &&
|
|
33
20
|
this.config.networks[this.defaultNetwork]) {
|
|
34
21
|
const network = this.config.networks[this.defaultNetwork];
|
|
@@ -37,7 +24,7 @@ export class Environment {
|
|
|
37
24
|
this.contractAddress = network?.contract.address;
|
|
38
25
|
this.contractName = network?.contract.name;
|
|
39
26
|
this.keyring = new Keyring({
|
|
40
|
-
type: 'sr25519',
|
|
27
|
+
type: 'sr25519',
|
|
41
28
|
});
|
|
42
29
|
if (this.pair)
|
|
43
30
|
this.keyring.addPair(this.pair);
|
|
@@ -84,8 +71,7 @@ export class Environment {
|
|
|
84
71
|
if (!isAddress(this.contractAddress)) {
|
|
85
72
|
throw new ProsopoEnvError('CONTRACT.CONTRACT_UNDEFINED');
|
|
86
73
|
}
|
|
87
|
-
this.contractInterface = new ProsopoCaptchaContract(this.getApi(), this.abi, this.contractAddress, this.contractName, parseInt(nonce.toString()), this.pair, this.config.logLevel, this.config.account.address
|
|
88
|
-
);
|
|
74
|
+
this.contractInterface = new ProsopoCaptchaContract(this.getApi(), this.abi, this.contractAddress, this.contractName, parseInt(nonce.toString()), this.pair, this.config.logLevel, this.config.account.address);
|
|
89
75
|
return this.contractInterface;
|
|
90
76
|
}
|
|
91
77
|
async isReady() {
|
|
@@ -97,7 +83,6 @@ export class Environment {
|
|
|
97
83
|
this.api = await ApiPromise.create({ provider: this.wsProvider, initWasm: false });
|
|
98
84
|
}
|
|
99
85
|
await this.getSigner();
|
|
100
|
-
// make sure contract address is valid before trying to load contract interface
|
|
101
86
|
if (isAddress(this.contractAddress)) {
|
|
102
87
|
this.contractInterface = await this.getContractApi();
|
|
103
88
|
}
|
|
@@ -114,7 +99,6 @@ export class Environment {
|
|
|
114
99
|
}
|
|
115
100
|
catch (err) {
|
|
116
101
|
this.logger.error(err);
|
|
117
|
-
// TODO fix / improve error handling
|
|
118
102
|
throw new ProsopoEnvError(err, 'GENERAL.ENVIRONMENT_NOT_READY');
|
|
119
103
|
}
|
|
120
104
|
}
|
|
@@ -129,7 +113,6 @@ export class Environment {
|
|
|
129
113
|
}
|
|
130
114
|
}
|
|
131
115
|
catch (err) {
|
|
132
|
-
// TODO fix/improve error handling
|
|
133
116
|
throw new ProsopoEnvError(err, 'DATABASE.DATABASE_IMPORT_FAILED', {}, this.config.database
|
|
134
117
|
? this.config.database[this.defaultEnvironment]
|
|
135
118
|
? this.config.database[this.defaultEnvironment]?.type
|
package/dist/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
|
package/dist/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 { Environment } from './env.js';
|
|
15
2
|
export { ProviderEnvironment } from './provider.js';
|
|
16
3
|
export { MockEnvironment } from './mockenv.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,eAAe,EAAwB,MAAM,cAAc,CAAA"}
|
package/dist/provider.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 { Environment } from './env.js';
|
|
15
2
|
export class ProviderEnvironment extends Environment {
|
|
16
3
|
}
|
package/dist/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAGtC,MAAM,OAAO,mBAAoB,SAAQ,WAAW;CAEnD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/env",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.16",
|
|
4
4
|
"description": "Path env prosopo environment",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -23,13 +23,13 @@
|
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@polkadot/util-crypto": "12.5.1",
|
|
26
|
-
"@prosopo/common": "0.2.
|
|
27
|
-
"@prosopo/contract": "0.2.
|
|
28
|
-
"@prosopo/database": "0.2.
|
|
29
|
-
"@prosopo/types": "0.2.
|
|
30
|
-
"@prosopo/types-database": "0.2.
|
|
31
|
-
"@prosopo/types-env": "0.2.
|
|
32
|
-
"@prosopo/util": "0.2.
|
|
26
|
+
"@prosopo/common": "0.2.16",
|
|
27
|
+
"@prosopo/contract": "0.2.16",
|
|
28
|
+
"@prosopo/database": "0.2.16",
|
|
29
|
+
"@prosopo/types": "0.2.16",
|
|
30
|
+
"@prosopo/types-database": "0.2.16",
|
|
31
|
+
"@prosopo/types-env": "0.2.16",
|
|
32
|
+
"@prosopo/util": "0.2.16",
|
|
33
33
|
"dotenv": "^16.0.1"
|
|
34
34
|
},
|
|
35
35
|
"overrides": {
|