@prosopo/server 0.1.17 → 0.1.19
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 +4 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +22 -20
- package/dist/index.js.map +1 -1
- package/package.json +7 -6
package/dist/index.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { ProviderApi } from '@prosopo/api';
|
|
|
9
9
|
import { WsProvider } from '@polkadot/rpc-provider';
|
|
10
10
|
export declare class ProsopoServer {
|
|
11
11
|
config: ProsopoServerConfig;
|
|
12
|
-
contract: ProsopoCaptchaContract;
|
|
12
|
+
contract: ProsopoCaptchaContract | undefined;
|
|
13
13
|
prosopoContractAddress: string;
|
|
14
14
|
dappContractAddress: string;
|
|
15
15
|
defaultEnvironment: string;
|
|
@@ -19,12 +19,14 @@ export declare class ProsopoServer {
|
|
|
19
19
|
wsProvider: WsProvider;
|
|
20
20
|
keyring: Keyring;
|
|
21
21
|
pair: KeyringPair;
|
|
22
|
-
api: ApiPromise;
|
|
22
|
+
api: ApiPromise | undefined;
|
|
23
23
|
network: NetworkConfig;
|
|
24
24
|
constructor(pair: KeyringPair, config: ProsopoServerConfig);
|
|
25
25
|
getProviderApi(providerUrl: string): Promise<ProviderApi>;
|
|
26
26
|
isReady(): Promise<void>;
|
|
27
27
|
getSigner(): Promise<void>;
|
|
28
|
+
getApi(): ApiPromise;
|
|
29
|
+
getContract(): ProsopoCaptchaContract;
|
|
28
30
|
isVerified(payload: ProcaptchaOutput): Promise<boolean>;
|
|
29
31
|
getContractApi(): Promise<ProsopoCaptchaContract>;
|
|
30
32
|
}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,EAAsB,mBAAmB,EAAkB,MAAM,gBAAgB,CAAA;AACpH,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;AAGnD,qBAAa,aAAa;IACtB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,QAAQ,EAAE,sBAAsB,GAAG,SAAS,CAAA;IAC5C,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,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,aAAa,CAAA;gBAEV,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB;IA6B7C,cAAc,CAAC,WAAW,EAAE,MAAM;IAIzC,OAAO;IAUP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAYhC,MAAM,IAAI,UAAU;IAOpB,WAAW,IAAI,sBAAsB;IAOxB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BvD,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}
|
package/dist/index.js
CHANGED
|
@@ -12,37 +12,27 @@
|
|
|
12
12
|
// See the License for the specific language governing permissions and
|
|
13
13
|
// limitations under the License.
|
|
14
14
|
import { ApiPromise } from '@polkadot/api';
|
|
15
|
+
import { NetworkNamesSchema } from '@prosopo/types';
|
|
15
16
|
import { Keyring } from '@polkadot/keyring';
|
|
16
17
|
import { getLogger } from '@prosopo/common';
|
|
17
18
|
import { ProsopoCaptchaContract, abiJson } from '@prosopo/contract';
|
|
18
19
|
import { ProsopoEnvError, trimProviderUrl } from '@prosopo/common';
|
|
19
20
|
import { ProviderApi } from '@prosopo/api';
|
|
20
21
|
import { WsProvider } from '@polkadot/rpc-provider';
|
|
22
|
+
import { get } from '@prosopo/util';
|
|
21
23
|
export class ProsopoServer {
|
|
22
|
-
config;
|
|
23
|
-
contract;
|
|
24
|
-
prosopoContractAddress;
|
|
25
|
-
dappContractAddress;
|
|
26
|
-
defaultEnvironment;
|
|
27
|
-
contractName;
|
|
28
|
-
abi;
|
|
29
|
-
logger;
|
|
30
|
-
wsProvider;
|
|
31
|
-
keyring;
|
|
32
|
-
pair;
|
|
33
|
-
api;
|
|
34
|
-
network;
|
|
35
24
|
constructor(pair, config) {
|
|
36
25
|
this.config = config;
|
|
37
26
|
this.pair = pair;
|
|
38
27
|
if (this.config.defaultEnvironment &&
|
|
39
28
|
Object.prototype.hasOwnProperty.call(this.config.networks, this.config.defaultEnvironment)) {
|
|
40
29
|
this.defaultEnvironment = this.config.defaultEnvironment;
|
|
41
|
-
|
|
42
|
-
this.
|
|
43
|
-
this.
|
|
30
|
+
const networkName = NetworkNamesSchema.parse(this.defaultEnvironment);
|
|
31
|
+
this.network = get(this.config.networks, networkName);
|
|
32
|
+
this.wsProvider = new WsProvider(this.network.endpoint);
|
|
33
|
+
this.prosopoContractAddress = this.network.contract.address;
|
|
44
34
|
this.dappContractAddress = this.config.account.address;
|
|
45
|
-
this.contractName = this.
|
|
35
|
+
this.contractName = this.network.contract.name;
|
|
46
36
|
this.logger = getLogger(this.config.logLevel, '@prosopo/server');
|
|
47
37
|
this.keyring = new Keyring({
|
|
48
38
|
type: 'sr25519', // TODO get this from the chain
|
|
@@ -78,12 +68,24 @@ export class ProsopoServer {
|
|
|
78
68
|
throw new ProsopoEnvError('CONTRACT.SIGNER_UNDEFINED', this.getSigner.name, {}, err);
|
|
79
69
|
}
|
|
80
70
|
}
|
|
71
|
+
getApi() {
|
|
72
|
+
if (this.api === undefined) {
|
|
73
|
+
throw new ProsopoEnvError(new Error('api undefined'));
|
|
74
|
+
}
|
|
75
|
+
return this.api;
|
|
76
|
+
}
|
|
77
|
+
getContract() {
|
|
78
|
+
if (this.contract === undefined) {
|
|
79
|
+
throw new ProsopoEnvError(new Error('contract undefined'));
|
|
80
|
+
}
|
|
81
|
+
return this.contract;
|
|
82
|
+
}
|
|
81
83
|
async isVerified(payload) {
|
|
82
84
|
const { user, dapp, providerUrl, commitmentId, blockNumber } = payload;
|
|
83
85
|
// first check if the provider was actually chosen at blockNumber
|
|
84
86
|
const contractApi = await this.getContractApi();
|
|
85
|
-
const block = (await this.
|
|
86
|
-
const getRandomProviderResponse = await this.
|
|
87
|
+
const block = (await this.getApi().rpc.chain.getBlockHash(blockNumber));
|
|
88
|
+
const getRandomProviderResponse = await this.getContract().queryAtBlock(block, 'getRandomActiveProvider', [user, dapp]);
|
|
87
89
|
const providerUrlTrimmed = trimProviderUrl(getRandomProviderResponse.provider.url.toString());
|
|
88
90
|
if (providerUrlTrimmed !== providerUrl) {
|
|
89
91
|
return false;
|
|
@@ -102,7 +104,7 @@ export class ProsopoServer {
|
|
|
102
104
|
}
|
|
103
105
|
}
|
|
104
106
|
async getContractApi() {
|
|
105
|
-
this.contract = new ProsopoCaptchaContract(this.
|
|
107
|
+
this.contract = new ProsopoCaptchaContract(this.getApi(), this.abi, this.prosopoContractAddress, this.pair, this.contractName, 0);
|
|
106
108
|
return this.contract;
|
|
107
109
|
}
|
|
108
110
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/server",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.19",
|
|
4
4
|
"description": "NodeJS package for server side communication with the prosopo captcha client",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -26,12 +26,13 @@
|
|
|
26
26
|
"@polkadot/keyring": "12.3.2",
|
|
27
27
|
"@polkadot/rpc-provider": "10.9.1",
|
|
28
28
|
"@polkadot/types": "10.9.1",
|
|
29
|
-
"@prosopo/api": "^0.1.
|
|
30
|
-
"@prosopo/contract": "^0.1.
|
|
31
|
-
"@prosopo/procaptcha": "^0.1.
|
|
32
|
-
"@prosopo/types": "^0.1.
|
|
29
|
+
"@prosopo/api": "^0.1.19",
|
|
30
|
+
"@prosopo/contract": "^0.1.19",
|
|
31
|
+
"@prosopo/procaptcha": "^0.1.19",
|
|
32
|
+
"@prosopo/types": "^0.1.19"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"
|
|
35
|
+
"tslib": "^2.6.2",
|
|
36
|
+
"typescript": "^5.1.6"
|
|
36
37
|
}
|
|
37
38
|
}
|