@prosopo/server 0.2.9 → 0.2.11
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/server.cjs
CHANGED
|
@@ -14,28 +14,19 @@ class ProsopoServer {
|
|
|
14
14
|
constructor(config, pair) {
|
|
15
15
|
this.config = config;
|
|
16
16
|
this.pair = pair;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
this.abi = JSON.parse(captcha.ContractAbi);
|
|
31
|
-
} else {
|
|
32
|
-
throw new common.ProsopoEnvError(
|
|
33
|
-
"CONFIG.UNKNOWN_ENVIRONMENT",
|
|
34
|
-
this.constructor.name,
|
|
35
|
-
{},
|
|
36
|
-
this.config.defaultEnvironment
|
|
37
|
-
);
|
|
38
|
-
}
|
|
17
|
+
this.defaultEnvironment = this.config.defaultEnvironment;
|
|
18
|
+
const networkName = types.NetworkNamesSchema.parse(this.config.defaultNetwork);
|
|
19
|
+
this.network = util.get(this.config.networks, networkName);
|
|
20
|
+
this.wsProvider = new rpcProvider.WsProvider(this.network.endpoint);
|
|
21
|
+
this.prosopoContractAddress = this.network.contract.address;
|
|
22
|
+
this.dappContractAddress = this.config.account.address || contract.getZeroAddress().toString();
|
|
23
|
+
this.contractName = this.network.contract.name;
|
|
24
|
+
this.logger = common.getLogger(this.config.logLevel, "@prosopo/server");
|
|
25
|
+
this.keyring = new keyring.Keyring({
|
|
26
|
+
type: "sr25519"
|
|
27
|
+
// TODO get this from the chain
|
|
28
|
+
});
|
|
29
|
+
this.abi = JSON.parse(captcha.ContractAbi);
|
|
39
30
|
}
|
|
40
31
|
async getProviderApi(providerUrl) {
|
|
41
32
|
return new api.ProviderApi(this.network, providerUrl, this.dappContractAddress);
|
|
@@ -88,10 +79,9 @@ class ProsopoServer {
|
|
|
88
79
|
return false;
|
|
89
80
|
}
|
|
90
81
|
console.log("providerUrlTrimmed", providerUrlTrimmed, "commitmentId", commitmentId);
|
|
91
|
-
if (providerUrlTrimmed
|
|
82
|
+
if (providerUrlTrimmed) {
|
|
92
83
|
const providerApi = await this.getProviderApi(providerUrl);
|
|
93
84
|
const result = await providerApi.verifyDappUser(user, commitmentId);
|
|
94
|
-
console.log(result);
|
|
95
85
|
return result.solutionApproved;
|
|
96
86
|
} else {
|
|
97
87
|
return (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value.unwrap().unwrap();
|
package/dist/server.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { ApiPromise } from '@polkadot/api';
|
|
2
|
-
import { ContractAbi, NetworkConfig, ProsopoServerConfigOutput } from '@prosopo/types';
|
|
2
|
+
import { ContractAbi, NetworkConfig, ProcaptchaOutput, ProsopoServerConfigOutput } from '@prosopo/types';
|
|
3
3
|
import { Keyring } from '@polkadot/keyring';
|
|
4
4
|
import { KeyringPair } from '@polkadot/keyring/types';
|
|
5
5
|
import { Logger } from '@prosopo/common';
|
|
6
|
-
import { ProcaptchaOutput } from '@prosopo/types';
|
|
7
6
|
import { ProsopoCaptchaContract } from '@prosopo/contract';
|
|
8
7
|
import { ProviderApi } from '@prosopo/api';
|
|
9
8
|
import { WsProvider } from '@polkadot/rpc-provider';
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EACH,WAAW,EACX,aAAa,EAEb,gBAAgB,EAChB,yBAAyB,EAC5B,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA+C,MAAM,iBAAiB,CAAA;AAC/F,OAAO,EAAE,sBAAsB,EAAkB,MAAM,mBAAmB,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,qBAAa,aAAa;IACtB,MAAM,EAAE,yBAAyB,CAAA;IACjC,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,GAAG,SAAS,CAAA;IAC7B,GAAG,EAAE,UAAU,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,aAAa,CAAA;gBAEV,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE,WAAW;IAiBpD,cAAc,CAAC,WAAW,EAAE,MAAM;IAIzC,OAAO;IAUP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAchC,MAAM,IAAI,UAAU;IAOpB,WAAW,IAAI,sBAAsB;IAOxB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BvD,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}
|
package/dist/server.js
CHANGED
|
@@ -12,11 +12,10 @@
|
|
|
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
|
+
import { NetworkNamesSchema, } from '@prosopo/types';
|
|
16
16
|
import { Keyring } from '@polkadot/keyring';
|
|
17
|
-
import { getLogger } from '@prosopo/common';
|
|
17
|
+
import { ProsopoEnvError, getLogger, trimProviderUrl } from '@prosopo/common';
|
|
18
18
|
import { ProsopoCaptchaContract, getZeroAddress } from '@prosopo/contract';
|
|
19
|
-
import { ProsopoEnvError, trimProviderUrl } from '@prosopo/common';
|
|
20
19
|
import { ProviderApi } from '@prosopo/api';
|
|
21
20
|
import { ContractAbi as abiJson } from '@prosopo/captcha-contract';
|
|
22
21
|
import { WsProvider } from '@polkadot/rpc-provider';
|
|
@@ -25,24 +24,18 @@ export class ProsopoServer {
|
|
|
25
24
|
constructor(config, pair) {
|
|
26
25
|
this.config = config;
|
|
27
26
|
this.pair = pair;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
});
|
|
41
|
-
this.abi = JSON.parse(abiJson);
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
throw new ProsopoEnvError('CONFIG.UNKNOWN_ENVIRONMENT', this.constructor.name, {}, this.config.defaultEnvironment);
|
|
45
|
-
}
|
|
27
|
+
this.defaultEnvironment = this.config.defaultEnvironment;
|
|
28
|
+
const networkName = NetworkNamesSchema.parse(this.config.defaultNetwork);
|
|
29
|
+
this.network = get(this.config.networks, networkName);
|
|
30
|
+
this.wsProvider = new WsProvider(this.network.endpoint);
|
|
31
|
+
this.prosopoContractAddress = this.network.contract.address;
|
|
32
|
+
this.dappContractAddress = this.config.account.address || getZeroAddress().toString();
|
|
33
|
+
this.contractName = this.network.contract.name;
|
|
34
|
+
this.logger = getLogger(this.config.logLevel, '@prosopo/server');
|
|
35
|
+
this.keyring = new Keyring({
|
|
36
|
+
type: 'sr25519', // TODO get this from the chain
|
|
37
|
+
});
|
|
38
|
+
this.abi = JSON.parse(abiJson);
|
|
46
39
|
}
|
|
47
40
|
async getProviderApi(providerUrl) {
|
|
48
41
|
return new ProviderApi(this.network, providerUrl, this.dappContractAddress);
|
|
@@ -94,10 +87,9 @@ export class ProsopoServer {
|
|
|
94
87
|
return false;
|
|
95
88
|
}
|
|
96
89
|
console.log('providerUrlTrimmed', providerUrlTrimmed, 'commitmentId', commitmentId);
|
|
97
|
-
if (providerUrlTrimmed
|
|
90
|
+
if (providerUrlTrimmed) {
|
|
98
91
|
const providerApi = await this.getProviderApi(providerUrl);
|
|
99
92
|
const result = await providerApi.verifyDappUser(user, commitmentId);
|
|
100
|
-
console.log(result);
|
|
101
93
|
return result.solutionApproved;
|
|
102
94
|
}
|
|
103
95
|
else {
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.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;AAE1C,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.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.2.
|
|
3
|
+
"version": "0.2.11",
|
|
4
4
|
"description": "NodeJS package for server side communication with the prosopo captcha client",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -37,11 +37,11 @@
|
|
|
37
37
|
"@polkadot/keyring": "12.3.2",
|
|
38
38
|
"@polkadot/rpc-provider": "10.9.1",
|
|
39
39
|
"@polkadot/types": "10.9.1",
|
|
40
|
-
"@prosopo/api": "0.2.
|
|
41
|
-
"@prosopo/contract": "0.2.
|
|
42
|
-
"@prosopo/procaptcha": "0.2.
|
|
43
|
-
"@prosopo/captcha-contract": "0.2.
|
|
44
|
-
"@prosopo/types": "0.2.
|
|
40
|
+
"@prosopo/api": "0.2.11",
|
|
41
|
+
"@prosopo/contract": "0.2.11",
|
|
42
|
+
"@prosopo/procaptcha": "0.2.11",
|
|
43
|
+
"@prosopo/captcha-contract": "0.2.11",
|
|
44
|
+
"@prosopo/types": "0.2.11"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"tslib": "2.6.2",
|