@prosopo/server 0.1.15 → 0.1.17
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/index.d.ts +1 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +41 -30
- package/dist/index.js.map +1 -1
- package/package.json +35 -35
package/dist/index.d.ts
CHANGED
|
@@ -10,7 +10,6 @@ import { WsProvider } from '@polkadot/rpc-provider';
|
|
|
10
10
|
export declare class ProsopoServer {
|
|
11
11
|
config: ProsopoServerConfig;
|
|
12
12
|
contract: ProsopoCaptchaContract;
|
|
13
|
-
mnemonic: string;
|
|
14
13
|
prosopoContractAddress: string;
|
|
15
14
|
dappContractAddress: string;
|
|
16
15
|
defaultEnvironment: string;
|
|
@@ -22,7 +21,7 @@ export declare class ProsopoServer {
|
|
|
22
21
|
pair: KeyringPair;
|
|
23
22
|
api: ApiPromise;
|
|
24
23
|
network: NetworkConfig;
|
|
25
|
-
constructor(
|
|
24
|
+
constructor(pair: KeyringPair, config: ProsopoServerConfig);
|
|
26
25
|
getProviderApi(providerUrl: string): Promise<ProviderApi>;
|
|
27
26
|
isReady(): Promise<void>;
|
|
28
27
|
getSigner(): Promise<void>;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,EAAkB,MAAM,gBAAgB,CAAA;AAChG,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAW,MAAM,mBAAmB,CAAA;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAEnD,qBAAa,aAAa;IACtB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,QAAQ,EAAE,sBAAsB,CAAA;IAChC,sBAAsB,EAAE,MAAM,CAAA;IAC9B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,GAAG,EAAE,WAAW,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,WAAW,CAAA;IACjB,GAAG,EAAE,UAAU,CAAA;IACf,OAAO,EAAE,aAAa,CAAA;gBAEV,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB;IA4B7C,cAAc,CAAC,WAAW,EAAE,MAAM;IAIzC,OAAO;IAUP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAYnB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BvD,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}
|
package/dist/index.js
CHANGED
|
@@ -1,17 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
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
|
+
import { ApiPromise } from '@polkadot/api';
|
|
15
|
+
import { Keyring } from '@polkadot/keyring';
|
|
16
|
+
import { getLogger } from '@prosopo/common';
|
|
17
|
+
import { ProsopoCaptchaContract, abiJson } from '@prosopo/contract';
|
|
18
|
+
import { ProsopoEnvError, trimProviderUrl } from '@prosopo/common';
|
|
19
|
+
import { ProviderApi } from '@prosopo/api';
|
|
20
|
+
import { WsProvider } from '@polkadot/rpc-provider';
|
|
21
|
+
export class ProsopoServer {
|
|
12
22
|
config;
|
|
13
23
|
contract;
|
|
14
|
-
mnemonic;
|
|
15
24
|
prosopoContractAddress;
|
|
16
25
|
dappContractAddress;
|
|
17
26
|
defaultEnvironment;
|
|
@@ -23,48 +32,51 @@ class ProsopoServer {
|
|
|
23
32
|
pair;
|
|
24
33
|
api;
|
|
25
34
|
network;
|
|
26
|
-
constructor(
|
|
35
|
+
constructor(pair, config) {
|
|
27
36
|
this.config = config;
|
|
28
|
-
this.
|
|
37
|
+
this.pair = pair;
|
|
29
38
|
if (this.config.defaultEnvironment &&
|
|
30
39
|
Object.prototype.hasOwnProperty.call(this.config.networks, this.config.defaultEnvironment)) {
|
|
31
40
|
this.defaultEnvironment = this.config.defaultEnvironment;
|
|
32
41
|
this.network = this.config.networks[this.defaultEnvironment];
|
|
33
|
-
this.wsProvider = new
|
|
42
|
+
this.wsProvider = new WsProvider(this.config.networks[this.defaultEnvironment].endpoint);
|
|
34
43
|
this.prosopoContractAddress = this.config.networks[this.defaultEnvironment].contract.address;
|
|
35
44
|
this.dappContractAddress = this.config.account.address;
|
|
36
45
|
this.contractName = this.config.networks[this.defaultEnvironment].contract.name;
|
|
37
|
-
this.logger = (
|
|
38
|
-
this.keyring = new
|
|
46
|
+
this.logger = getLogger(this.config.logLevel, '@prosopo/server');
|
|
47
|
+
this.keyring = new Keyring({
|
|
39
48
|
type: 'sr25519', // TODO get this from the chain
|
|
40
49
|
});
|
|
41
|
-
this.abi =
|
|
50
|
+
this.abi = abiJson;
|
|
42
51
|
}
|
|
43
52
|
else {
|
|
44
|
-
throw new
|
|
53
|
+
throw new ProsopoEnvError('CONFIG.UNKNOWN_ENVIRONMENT', this.constructor.name, {}, this.config.defaultEnvironment);
|
|
45
54
|
}
|
|
46
55
|
}
|
|
47
56
|
async getProviderApi(providerUrl) {
|
|
48
|
-
return new
|
|
57
|
+
return new ProviderApi(this.network, providerUrl, this.config.account.address);
|
|
49
58
|
}
|
|
50
59
|
async isReady() {
|
|
51
60
|
try {
|
|
52
|
-
this.api = await
|
|
61
|
+
this.api = await ApiPromise.create({ provider: this.wsProvider });
|
|
53
62
|
await this.getSigner();
|
|
54
63
|
await this.getContractApi();
|
|
55
64
|
}
|
|
56
65
|
catch (err) {
|
|
57
|
-
throw new
|
|
66
|
+
throw new ProsopoEnvError(err, 'GENERAL.ENVIRONMENT_NOT_READY');
|
|
58
67
|
}
|
|
59
68
|
}
|
|
60
69
|
async getSigner() {
|
|
61
|
-
this.api
|
|
70
|
+
if (!this.api) {
|
|
71
|
+
this.api = await ApiPromise.create({ provider: this.wsProvider });
|
|
72
|
+
}
|
|
62
73
|
await this.api.isReadyOrError;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
74
|
+
try {
|
|
75
|
+
this.pair = this.keyring.addPair(this.pair);
|
|
76
|
+
}
|
|
77
|
+
catch (err) {
|
|
78
|
+
throw new ProsopoEnvError('CONTRACT.SIGNER_UNDEFINED', this.getSigner.name, {}, err);
|
|
66
79
|
}
|
|
67
|
-
this.pair = this.keyring.addFromMnemonic(mnemonic);
|
|
68
80
|
}
|
|
69
81
|
async isVerified(payload) {
|
|
70
82
|
const { user, dapp, providerUrl, commitmentId, blockNumber } = payload;
|
|
@@ -72,7 +84,7 @@ class ProsopoServer {
|
|
|
72
84
|
const contractApi = await this.getContractApi();
|
|
73
85
|
const block = (await this.api.rpc.chain.getBlockHash(blockNumber));
|
|
74
86
|
const getRandomProviderResponse = await this.contract.queryAtBlock(block, 'getRandomActiveProvider', [user, dapp]);
|
|
75
|
-
const providerUrlTrimmed =
|
|
87
|
+
const providerUrlTrimmed = trimProviderUrl(getRandomProviderResponse.provider.url.toString());
|
|
76
88
|
if (providerUrlTrimmed !== providerUrl) {
|
|
77
89
|
return false;
|
|
78
90
|
}
|
|
@@ -90,9 +102,8 @@ class ProsopoServer {
|
|
|
90
102
|
}
|
|
91
103
|
}
|
|
92
104
|
async getContractApi() {
|
|
93
|
-
this.contract = new
|
|
105
|
+
this.contract = new ProsopoCaptchaContract(this.api, this.abi, this.prosopoContractAddress, this.pair, this.contractName, 0);
|
|
94
106
|
return this.contract;
|
|
95
107
|
}
|
|
96
108
|
}
|
|
97
|
-
exports.ProsopoServer = ProsopoServer;
|
|
98
109
|
//# sourceMappingURL=index.js.map
|
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":"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"}
|
package/package.json
CHANGED
|
@@ -1,37 +1,37 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
"
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
2
|
+
"name": "@prosopo/server",
|
|
3
|
+
"version": "0.1.17",
|
|
4
|
+
"description": "NodeJS package for server side communication with the prosopo captcha client",
|
|
5
|
+
"main": "./dist/index.js",
|
|
6
|
+
"type": "module",
|
|
7
|
+
"scripts": {
|
|
8
|
+
"clean": "tsc --build --clean",
|
|
9
|
+
"build": "tsc --build --verbose",
|
|
10
|
+
"lint": "npx eslint .",
|
|
11
|
+
"lint:fix": "npx eslint . --fix --config ../../.eslintrc.js"
|
|
12
|
+
},
|
|
13
|
+
"repository": {
|
|
14
|
+
"type": "git",
|
|
15
|
+
"url": "git+https://github.com/prosopo/captcha.git"
|
|
16
|
+
},
|
|
17
|
+
"author": "PROSOPO LIMITED",
|
|
18
|
+
"license": "Apache-2.0",
|
|
19
|
+
"bugs": {
|
|
20
|
+
"url": "https://github.com/prosopo/captcha/issues"
|
|
21
|
+
},
|
|
22
|
+
"homepage": "https://github.com/prosopo/captcha#readme",
|
|
23
|
+
"sideEffects": false,
|
|
24
|
+
"dependencies": {
|
|
25
|
+
"@polkadot/api": "10.9.1",
|
|
26
|
+
"@polkadot/keyring": "12.3.2",
|
|
27
|
+
"@polkadot/rpc-provider": "10.9.1",
|
|
28
|
+
"@polkadot/types": "10.9.1",
|
|
29
|
+
"@prosopo/api": "^0.1.17",
|
|
30
|
+
"@prosopo/contract": "^0.1.17",
|
|
31
|
+
"@prosopo/procaptcha": "^0.1.17",
|
|
32
|
+
"@prosopo/types": "^0.1.17"
|
|
33
|
+
},
|
|
34
|
+
"devDependencies": {
|
|
35
|
+
"typescript": "^4.9.5"
|
|
36
|
+
}
|
|
37
37
|
}
|