@prosopo/procaptcha 2.0.0 → 2.0.2

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.
Files changed (13) hide show
  1. package/dist/cjs/account/dist/extension/ExtensionWeb2.cjs +1 -16
  2. package/dist/cjs/modules/Manager.cjs +23 -32
  3. package/dist/cjs/modules/ProsopoCaptchaApi.cjs +3 -20
  4. package/dist/modules/Manager.d.ts.map +1 -1
  5. package/dist/modules/Manager.js +20 -27
  6. package/dist/modules/Manager.js.map +1 -1
  7. package/dist/modules/ProsopoCaptchaApi.d.ts +2 -4
  8. package/dist/modules/ProsopoCaptchaApi.d.ts.map +1 -1
  9. package/dist/modules/ProsopoCaptchaApi.js +3 -19
  10. package/dist/modules/ProsopoCaptchaApi.js.map +1 -1
  11. package/dist/tests/modules/storage.test.js +1 -3
  12. package/dist/tests/modules/storage.test.js.map +1 -1
  13. package/package.json +77 -77
package/dist/cjs/account/dist/extension/ExtensionWeb2.cjs CHANGED
@@ -11,20 +11,6 @@ const index = require("../../../detector/src/index.cjs");
11
11
  const util = require("@prosopo/util");
12
12
  const Extension = require("./Extension.cjs");
13
13
  class ExtensionWeb2 extends Extension.Extension {
14
- constructor() {
15
- super(...arguments);
16
- this.getNetwork = (config) => {
17
- const network = config.networks[config.defaultNetwork];
18
- if (!network) {
19
- throw new common.ProsopoEnvError("DEVELOPER.NETWORK_NOT_FOUND", {
20
- context: {
21
- error: `No network found for environment ${config.defaultEnvironment}`
22
- }
23
- });
24
- }
25
- return network;
26
- };
27
- }
28
14
  async getAccount(config) {
29
15
  const account = await this.createAccount(config);
30
16
  const extension = await this.createExtension(account);
@@ -78,8 +64,7 @@ class ExtensionWeb2 extends Extension.Extension {
78
64
  const mnemonic = bip39.entropyToMnemonic(u8Entropy);
79
65
  const type = "sr25519";
80
66
  const keyring$1 = new keyring.Keyring({
81
- type,
82
- ss58Format: config.networks[config.defaultNetwork].ss58Format
67
+ type
83
68
  });
84
69
  const keypair = keyring$1.addFromMnemonic(mnemonic);
85
70
  const address = keypair.address;
package/dist/cjs/modules/Manager.cjs CHANGED
@@ -12,6 +12,7 @@ const util = require("@prosopo/util");
12
12
  const utils = require("../utils/utils.cjs");
13
13
  const ProsopoCaptchaApi = require("./ProsopoCaptchaApi.cjs");
14
14
  const storage = require("./storage.cjs");
15
+ const string = require("@polkadot/util/string");
15
16
  const ExtensionWeb2 = require("../account/dist/extension/ExtensionWeb2.cjs");
16
17
  const ExtensionWeb3 = require("../account/dist/extension/ExtensionWeb3.cjs");
17
18
  const defaultState = () => {
@@ -28,17 +29,6 @@ const defaultState = () => {
28
29
  // don't handle timeout here, this should be handled by the state management
29
30
  };
30
31
  };
31
- const getNetwork = (config) => {
32
- const network = config.networks[config.defaultNetwork];
33
- if (!network) {
34
- throw new common.ProsopoEnvError("DEVELOPER.NETWORK_NOT_FOUND", {
35
- context: {
36
- error: `No network found for environment ${config.defaultEnvironment}`
37
- }
38
- });
39
- }
40
- return network;
41
- };
42
32
  const getRandomActiveProvider = (config) => {
43
33
  const randomIntBetween = (min, max) => Math.floor(Math.random() * (max - min + 1) + min);
44
34
  const PROVIDERS = loadBalancer.loadBalancer(config.defaultEnvironment);
@@ -52,8 +42,7 @@ const getRandomActiveProvider = (config) => {
52
42
  url: randomProvderObj.url,
53
43
  datasetId: randomProvderObj.datasetId,
54
44
  datasetIdContent: randomProvderObj.datasetIdContent
55
- },
56
- blockNumber: 0
45
+ }
57
46
  };
58
47
  };
59
48
  function Manager(configOptional, state, onStateUpdate, callbacks) {
@@ -98,14 +87,11 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
98
87
  updateState({ dappAccount: config.account.address });
99
88
  await utils.sleep(100);
100
89
  const account = await loadAccount();
101
- const contract = getNetwork(config).contract.address;
102
90
  const getRandomProviderResponse = getRandomActiveProvider(getConfig());
103
- const blockNumber = getRandomProviderResponse.blockNumber;
104
91
  const providerUrl = getRandomProviderResponse.provider.url;
105
92
  const providerApi = await loadProviderApi(providerUrl);
106
93
  const captchaApi = new ProsopoCaptchaApi.ProsopoCaptchaApi(
107
94
  account.account.address,
108
- contract,
109
95
  getRandomProviderResponse,
110
96
  providerApi,
111
97
  config.web2,
@@ -128,8 +114,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
128
114
  solutions: challenge.captchas.map(() => []),
129
115
  challenge,
130
116
  showModal: true,
131
- timeout,
132
- blockNumber
117
+ timeout
133
118
  });
134
119
  });
135
120
  };
@@ -156,7 +141,6 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
156
141
  }
157
142
  );
158
143
  const account = getAccount();
159
- const blockNumber = getBlockNumber();
160
144
  const signer = getExtension(account).signer;
161
145
  const first = util.at(challenge.captchas, 0);
162
146
  if (!first.datasetId) {
@@ -170,13 +154,24 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
170
154
  context: { error: "No Captcha API found in state" }
171
155
  });
172
156
  }
157
+ if (!signer || !signer.signRaw) {
158
+ throw new common.ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
159
+ context: {
160
+ error: "Signer is not defined, cannot sign message to prove account ownership"
161
+ }
162
+ });
163
+ }
164
+ const userRequestHashSignature = await signer.signRaw({
165
+ address: account.account.address,
166
+ data: string.stringToHex(challenge.requestHash),
167
+ type: "bytes"
168
+ });
173
169
  const submission = await captchaApi.submitCaptchaSolution(
174
- signer,
170
+ userRequestHashSignature.signature,
175
171
  challenge.requestHash,
176
172
  captchaSolution,
177
- salt,
178
173
  challenge.timestamp,
179
- challenge.signature.provider.timestamp
174
+ challenge.signature.provider.requestHash
180
175
  );
181
176
  const isHuman = submission[0].verified;
182
177
  if (!isHuman) {
@@ -191,8 +186,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
191
186
  const providerUrl = captchaApi.provider.provider.url;
192
187
  storage.setProcaptchaStorage({
193
188
  ...storage.getProcaptchaStorage(),
194
- providerUrl,
195
- blockNumber
189
+ providerUrl
196
190
  });
197
191
  events.onHuman(
198
192
  types.encodeProcaptchaOutput({
@@ -200,11 +194,13 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
200
194
  [types.ApiParams.user]: account.account.address,
201
195
  [types.ApiParams.dapp]: getDappAccount(),
202
196
  [types.ApiParams.commitmentId]: util.hashToHex(submission[1]),
203
- [types.ApiParams.blockNumber]: blockNumber,
204
197
  [types.ApiParams.timestamp]: challenge.timestamp,
205
198
  [types.ApiParams.signature]: {
206
199
  [types.ApiParams.provider]: {
207
- [types.ApiParams.timestamp]: challenge.signature.provider.timestamp
200
+ [types.ApiParams.requestHash]: challenge.signature.provider.requestHash
201
+ },
202
+ [types.ApiParams.user]: {
203
+ [types.ApiParams.requestHash]: userRequestHashSignature.signature
208
204
  }
209
205
  }
210
206
  })
@@ -258,11 +254,10 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
258
254
  };
259
255
  const loadProviderApi = async (providerUrl) => {
260
256
  const config = getConfig();
261
- const network = getNetwork(config);
262
257
  if (!config.account.address) {
263
258
  throw new common.ProsopoEnvError("GENERAL.SITE_KEY_MISSING");
264
259
  }
265
- return new api.ProviderApi(network, providerUrl, config.account.address);
260
+ return new api.ProviderApi(providerUrl, config.account.address);
266
261
  };
267
262
  const clearTimeout = () => {
268
263
  window.clearTimeout(state.timeout);
@@ -309,10 +304,6 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
309
304
  const dappAccount = state.dappAccount;
310
305
  return dappAccount;
311
306
  };
312
- const getBlockNumber = () => {
313
- const blockNumber = state.blockNumber || 0;
314
- return blockNumber;
315
- };
316
307
  const getExtension = (possiblyAccount) => {
317
308
  const account = possiblyAccount || getAccount();
318
309
  if (!account.extension) {
package/dist/cjs/modules/ProsopoCaptchaApi.cjs CHANGED
@@ -1,12 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
3
- const string = require("@polkadot/util/string");
4
3
  const common = require("@prosopo/common");
5
4
  const datasets = require("@prosopo/datasets");
6
5
  class ProsopoCaptchaApi {
7
- constructor(userAccount, contract, provider, providerApi, web2, dappAccount) {
6
+ constructor(userAccount, provider, providerApi, web2, dappAccount) {
8
7
  this.userAccount = userAccount;
9
- this.contract = contract;
10
8
  this.provider = provider;
11
9
  this.providerApi = providerApi;
12
10
  this._web2 = web2;
@@ -35,7 +33,7 @@ class ProsopoCaptchaApi {
35
33
  });
36
34
  }
37
35
  }
38
- async submitCaptchaSolution(signer, requestHash, solutions, salt, timestamp, providerTimestampSignature) {
36
+ async submitCaptchaSolution(userRequestHashSignature, requestHash, solutions, timestamp, providerRequestHashSignature) {
39
37
  const tree = new datasets.CaptchaMerkleTree();
40
38
  const captchasHashed = solutions.map(
41
39
  (captcha) => datasets.computeCaptchaSolutionHash(captcha)
@@ -48,29 +46,14 @@ class ProsopoCaptchaApi {
48
46
  }
49
47
  const commitmentId = tree.root.hash;
50
48
  const tx = void 0;
51
- let userRequestHashSignature = void 0;
52
- if (!signer || !signer.signRaw) {
53
- throw new common.ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
54
- context: {
55
- error: "Signer is not defined, cannot sign message to prove account ownership"
56
- }
57
- });
58
- }
59
49
  let result;
60
- const signed = await signer.signRaw({
61
- address: this.userAccount,
62
- data: string.stringToHex(requestHash),
63
- type: "bytes"
64
- });
65
- userRequestHashSignature = signed.signature;
66
50
  try {
67
51
  result = await this.providerApi.submitCaptchaSolution(
68
52
  solutions,
69
53
  requestHash,
70
54
  this.userAccount,
71
- salt,
72
55
  timestamp,
73
- providerTimestampSignature,
56
+ providerRequestHashSignature,
74
57
  userRequestHashSignature
75
58
  );
76
59
  } catch (error) {
package/dist/modules/Manager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"AAyBA,OAAO,EAKL,KAAK,mBAAmB,EAExB,KAAK,4BAA4B,EAEjC,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAK7B,MAAM,gBAAgB,CAAC;AA8DxB,wBAAgB,OAAO,CACrB,cAAc,EAAE,4BAA4B,EAC5C,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBA4OR,MAAM;;EAiJ7B"}
1
+ {"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"AAwBA,OAAO,EAKL,KAAK,mBAAmB,EAExB,KAAK,4BAA4B,EAEjC,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAK7B,MAAM,gBAAgB,CAAC;AAkDxB,wBAAgB,OAAO,CACrB,cAAc,EAAE,4BAA4B,EAC5C,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBAuPR,MAAM;;EA2I7B"}
package/dist/modules/Manager.js CHANGED
@@ -10,6 +10,7 @@ import { at, hashToHex } from "@prosopo/util";
10
10
  import { sleep } from "../utils/utils.js";
11
11
  import ProsopoCaptchaApi from "./ProsopoCaptchaApi.js";
12
12
  import storage from "./storage.js";
13
+ import { stringToHex } from "@polkadot/util/string";
13
14
  const defaultState = () => {
14
15
  return {
15
16
  showModal: false,
@@ -22,17 +23,6 @@ const defaultState = () => {
22
23
  account: undefined,
23
24
  };
24
25
  };
25
- const getNetwork = (config) => {
26
- const network = config.networks[config.defaultNetwork];
27
- if (!network) {
28
- throw new ProsopoEnvError("DEVELOPER.NETWORK_NOT_FOUND", {
29
- context: {
30
- error: `No network found for environment ${config.defaultEnvironment}`,
31
- },
32
- });
33
- }
34
- return network;
35
- };
36
26
  const getRandomActiveProvider = (config) => {
37
27
  const randomIntBetween = (min, max) => Math.floor(Math.random() * (max - min + 1) + min);
38
28
  const PROVIDERS = loadBalancer(config.defaultEnvironment);
@@ -44,7 +34,6 @@ const getRandomActiveProvider = (config) => {
44
34
  datasetId: randomProvderObj.datasetId,
45
35
  datasetIdContent: randomProvderObj.datasetIdContent,
46
36
  },
47
- blockNumber: 0,
48
37
  };
49
38
  };
50
39
  export function Manager(configOptional, state, onStateUpdate, callbacks) {
@@ -90,12 +79,10 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
90
79
  updateState({ dappAccount: config.account.address });
91
80
  await sleep(100);
92
81
  const account = await loadAccount();
93
- const contract = getNetwork(config).contract.address;
94
82
  const getRandomProviderResponse = getRandomActiveProvider(getConfig());
95
- const blockNumber = getRandomProviderResponse.blockNumber;
96
83
  const providerUrl = getRandomProviderResponse.provider.url;
97
84
  const providerApi = await loadProviderApi(providerUrl);
98
- const captchaApi = new ProsopoCaptchaApi(account.account.address, contract, getRandomProviderResponse, providerApi, config.web2, config.account.address || "");
85
+ const captchaApi = new ProsopoCaptchaApi(account.account.address, getRandomProviderResponse, providerApi, config.web2, config.account.address || "");
99
86
  updateState({ captchaApi });
100
87
  const challenge = await captchaApi.getCaptchaChallenge();
101
88
  if (challenge.captchas.length <= 0) {
@@ -114,7 +101,6 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
114
101
  challenge,
115
102
  showModal: true,
116
103
  timeout,
117
- blockNumber,
118
104
  });
119
105
  });
120
106
  };
@@ -139,7 +125,6 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
139
125
  };
140
126
  });
141
127
  const account = getAccount();
142
- const blockNumber = getBlockNumber();
143
128
  const signer = getExtension(account).signer;
144
129
  const first = at(challenge.captchas, 0);
145
130
  if (!first.datasetId) {
@@ -153,7 +138,19 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
153
138
  context: { error: "No Captcha API found in state" },
154
139
  });
155
140
  }
156
- const submission = await captchaApi.submitCaptchaSolution(signer, challenge.requestHash, captchaSolution, salt, challenge.timestamp, challenge.signature.provider.timestamp);
141
+ if (!signer || !signer.signRaw) {
142
+ throw new ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
143
+ context: {
144
+ error: "Signer is not defined, cannot sign message to prove account ownership",
145
+ },
146
+ });
147
+ }
148
+ const userRequestHashSignature = await signer.signRaw({
149
+ address: account.account.address,
150
+ data: stringToHex(challenge.requestHash),
151
+ type: "bytes",
152
+ });
153
+ const submission = await captchaApi.submitCaptchaSolution(userRequestHashSignature.signature, challenge.requestHash, captchaSolution, challenge.timestamp, challenge.signature.provider.requestHash);
157
154
  const isHuman = submission[0].verified;
158
155
  if (!isHuman) {
159
156
  events.onFailed();
@@ -168,18 +165,19 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
168
165
  storage.setProcaptchaStorage({
169
166
  ...storage.getProcaptchaStorage(),
170
167
  providerUrl,
171
- blockNumber,
172
168
  });
173
169
  events.onHuman(encodeProcaptchaOutput({
174
170
  [ApiParams.providerUrl]: providerUrl,
175
171
  [ApiParams.user]: account.account.address,
176
172
  [ApiParams.dapp]: getDappAccount(),
177
173
  [ApiParams.commitmentId]: hashToHex(submission[1]),
178
- [ApiParams.blockNumber]: blockNumber,
179
174
  [ApiParams.timestamp]: challenge.timestamp,
180
175
  [ApiParams.signature]: {
181
176
  [ApiParams.provider]: {
182
- [ApiParams.timestamp]: challenge.signature.provider.timestamp,
177
+ [ApiParams.requestHash]: challenge.signature.provider.requestHash,
178
+ },
179
+ [ApiParams.user]: {
180
+ [ApiParams.requestHash]: userRequestHashSignature.signature,
183
181
  },
184
182
  },
185
183
  }));
@@ -233,11 +231,10 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
233
231
  };
234
232
  const loadProviderApi = async (providerUrl) => {
235
233
  const config = getConfig();
236
- const network = getNetwork(config);
237
234
  if (!config.account.address) {
238
235
  throw new ProsopoEnvError("GENERAL.SITE_KEY_MISSING");
239
236
  }
240
- return new ProviderApi(network, providerUrl, config.account.address);
237
+ return new ProviderApi(providerUrl, config.account.address);
241
238
  };
242
239
  const clearTimeout = () => {
243
240
  window.clearTimeout(state.timeout);
@@ -284,10 +281,6 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
284
281
  const dappAccount = state.dappAccount;
285
282
  return dappAccount;
286
283
  };
287
- const getBlockNumber = () => {
288
- const blockNumber = state.blockNumber || 0;
289
- return blockNumber;
290
- };
291
284
  const getExtension = (possiblyAccount) => {
292
285
  const account = possiblyAccount || getAccount();
293
286
  if (!account.extension) {
package/dist/modules/Manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"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"}
package/dist/modules/ProsopoCaptchaApi.d.ts CHANGED
@@ -1,18 +1,16 @@
1
- import type { Signer } from "@polkadot/api/types";
2
1
  import type { ProviderApi } from "@prosopo/api";
3
2
  import type { CaptchaResponseBody, CaptchaSolution, ProsopoCaptchaApiInterface, RandomProvider } from "@prosopo/types";
4
3
  import type { TCaptchaSubmitResult } from "@prosopo/types";
5
4
  export declare class ProsopoCaptchaApi implements ProsopoCaptchaApiInterface {
6
5
  userAccount: string;
7
- contract: string;
8
6
  provider: RandomProvider;
9
7
  providerApi: ProviderApi;
10
8
  dappAccount: string;
11
9
  _web2: boolean;
12
- constructor(userAccount: string, contract: string, provider: RandomProvider, providerApi: ProviderApi, web2: boolean, dappAccount: string);
10
+ constructor(userAccount: string, provider: RandomProvider, providerApi: ProviderApi, web2: boolean, dappAccount: string);
13
11
  get web2(): boolean;
14
12
  getCaptchaChallenge(): Promise<CaptchaResponseBody>;
15
- submitCaptchaSolution(signer: Signer, requestHash: string, solutions: CaptchaSolution[], salt: string, timestamp: string, providerTimestampSignature: string): Promise<TCaptchaSubmitResult>;
13
+ submitCaptchaSolution(userRequestHashSignature: string, requestHash: string, solutions: CaptchaSolution[], timestamp: string, providerRequestHashSignature: string): Promise<TCaptchaSubmitResult>;
16
14
  }
17
15
  export default ProsopoCaptchaApi;
18
16
  //# sourceMappingURL=ProsopoCaptchaApi.d.ts.map
package/dist/modules/ProsopoCaptchaApi.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProsopoCaptchaApi.d.ts","sourceRoot":"","sources":["../../src/modules/ProsopoCaptchaApi.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAMhD,OAAO,KAAK,EACV,mBAAmB,EACnB,eAAe,EAEf,0BAA0B,EAC1B,cAAc,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,iBAAkB,YAAW,0BAA0B;IAClE,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,cAAc,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,OAAO,CAAC;gBAGb,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM;IAUrB,IAAI,IAAI,IAAI,OAAO,CAElB;IAEY,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAyBnD,qBAAqB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,eAAe,EAAE,EAC5B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,0BAA0B,EAAE,MAAM,GACjC,OAAO,CAAC,oBAAoB,CAAC;CA0DjC;AAED,eAAe,iBAAiB,CAAC"}
1
+ {"version":3,"file":"ProsopoCaptchaApi.d.ts","sourceRoot":"","sources":["../../src/modules/ProsopoCaptchaApi.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAMhD,OAAO,KAAK,EACV,mBAAmB,EACnB,eAAe,EAEf,0BAA0B,EAC1B,cAAc,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,iBAAkB,YAAW,0BAA0B;IAClE,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,cAAc,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,OAAO,CAAC;gBAGb,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM;IASrB,IAAI,IAAI,IAAI,OAAO,CAElB;IAEY,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAyBnD,qBAAqB,CAChC,wBAAwB,EAAE,MAAM,EAChC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,eAAe,EAAE,EAC5B,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,MAAM,GACnC,OAAO,CAAC,oBAAoB,CAAC;CAsCjC;AAED,eAAe,iBAAiB,CAAC"}
package/dist/modules/ProsopoCaptchaApi.js CHANGED
@@ -1,10 +1,8 @@
1
- import { stringToHex } from "@polkadot/util/string";
2
1
  import { ProsopoDatasetError, ProsopoEnvError } from "@prosopo/common";
3
2
  import { CaptchaMerkleTree, computeCaptchaSolutionHash, } from "@prosopo/datasets";
4
3
  export class ProsopoCaptchaApi {
5
- constructor(userAccount, contract, provider, providerApi, web2, dappAccount) {
4
+ constructor(userAccount, provider, providerApi, web2, dappAccount) {
6
5
  this.userAccount = userAccount;
7
- this.contract = contract;
8
6
  this.provider = provider;
9
7
  this.providerApi = providerApi;
10
8
  this._web2 = web2;
@@ -31,7 +29,7 @@ export class ProsopoCaptchaApi {
31
29
  });
32
30
  }
33
31
  }
34
- async submitCaptchaSolution(signer, requestHash, solutions, salt, timestamp, providerTimestampSignature) {
32
+ async submitCaptchaSolution(userRequestHashSignature, requestHash, solutions, timestamp, providerRequestHashSignature) {
35
33
  const tree = new CaptchaMerkleTree();
36
34
  const captchasHashed = solutions.map((captcha) => computeCaptchaSolutionHash(captcha));
37
35
  tree.build(captchasHashed);
@@ -42,23 +40,9 @@ export class ProsopoCaptchaApi {
42
40
  }
43
41
  const commitmentId = tree.root.hash;
44
42
  const tx = undefined;
45
- let userRequestHashSignature = undefined;
46
- if (!signer || !signer.signRaw) {
47
- throw new ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
48
- context: {
49
- error: "Signer is not defined, cannot sign message to prove account ownership",
50
- },
51
- });
52
- }
53
43
  let result;
54
- const signed = await signer.signRaw({
55
- address: this.userAccount,
56
- data: stringToHex(requestHash),
57
- type: "bytes",
58
- });
59
- userRequestHashSignature = signed.signature;
60
44
  try {
61
- result = await this.providerApi.submitCaptchaSolution(solutions, requestHash, this.userAccount, salt, timestamp, providerTimestampSignature, userRequestHashSignature);
45
+ result = await this.providerApi.submitCaptchaSolution(solutions, requestHash, this.userAccount, timestamp, providerRequestHashSignature, userRequestHashSignature);
62
46
  }
63
47
  catch (error) {
64
48
  throw new ProsopoDatasetError("CAPTCHA.INVALID_CAPTCHA_CHALLENGE", {
package/dist/modules/ProsopoCaptchaApi.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProsopoCaptchaApi.js","sourceRoot":"","sources":["../../src/modules/ProsopoCaptchaApi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ProsopoCaptchaApi.js","sourceRoot":"","sources":["../../src/modules/ProsopoCaptchaApi.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EACL,iBAAiB,EACjB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAU3B,MAAM,OAAO,iBAAiB;IAO5B,YACE,WAAmB,EACnB,QAAwB,EACxB,WAAwB,EACxB,IAAa,EACb,WAAmB;QAEnB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,mBAAmB;QAC9B,IAAI;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CACjE,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,CACd,CAAC;YAEF,KAAK,MAAM,OAAO,IAAI,gBAAgB,CAAC,QAAQ,EAAE;gBAC/C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE;oBAChC,IAAI,IAAI,CAAC,IAAI,EAAE;wBAGb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;qBACvD;iBACF;aACF;YAED,OAAO,gBAAgB,CAAC;SACzB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,eAAe,CAAC,mCAAmC,EAAE;gBAC7D,OAAO,EAAE,EAAE,KAAK,EAAE;aACnB,CAAC,CAAC;SACJ;IACH,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAChC,wBAAgC,EAChC,WAAmB,EACnB,SAA4B,EAC5B,SAAiB,EACjB,4BAAoC;QAEpC,MAAM,IAAI,GAAG,IAAI,iBAAiB,EAAE,CAAC;QAErC,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC/C,0BAA0B,CAAC,OAAO,CAAC,CACpC,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAE3B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,EAAE;gBACjE,OAAO,EAAE,EAAE,KAAK,EAAE,+BAA+B,EAAE;aACpD,CAAC,CAAC;SACJ;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QAEpC,MAAM,EAAE,GAA0C,SAAS,CAAC;QAE5D,IAAI,MAA+B,CAAC;QAEpC,IAAI;YACF,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAqB,CACnD,SAAS,EACT,WAAW,EACX,IAAI,CAAC,WAAW,EAChB,SAAS,EACT,4BAA4B,EAC5B,wBAAwB,CACzB,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,EAAE;gBACjE,OAAO,EAAE,EAAE,KAAK,EAAE;aACnB,CAAC,CAAC;SACJ;QAED,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;IACpC,CAAC;CACF;AAED,eAAe,iBAAiB,CAAC"}
package/dist/tests/modules/storage.test.js CHANGED
@@ -6,18 +6,16 @@ describe("storage tests", () => {
6
6
  setAccount("abc");
7
7
  expect(getAccount()).to.equal("abc");
8
8
  });
9
- test("sets provider URL and block number", async () => {
9
+ test("sets provider URL", async () => {
10
10
  setAccount("abc");
11
11
  const procaptchaStorage = getProcaptchaStorage();
12
12
  setProcaptchaStorage({
13
13
  ...procaptchaStorage,
14
14
  providerUrl: "http://localhost:9229",
15
- blockNumber: 100,
16
15
  });
17
16
  expect(getProcaptchaStorage()).toMatchObject({
18
17
  account: "abc",
19
18
  providerUrl: "http://localhost:9229",
20
- blockNumber: 100,
21
19
  });
22
20
  });
23
21
  });
package/dist/tests/modules/storage.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"storage.test.js","sourceRoot":"","sources":["../../../src/tests/modules/storage.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAE/C,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GAC3E,OAAO,CAAC;AAET,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC9B,IAAI,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACxC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClB,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QACrD,UAAU,CAAC,KAAK,CAAC,CAAC;QAClB,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;QACjD,oBAAoB,CAAC;YACpB,GAAG,iBAAiB;YACpB,WAAW,EAAE,uBAAuB;YACpC,WAAW,EAAE,GAAG;SAChB,CAAC,CAAC;QACH,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC,aAAa,CAAC;YAC5C,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,uBAAuB;YACpC,WAAW,EAAE,GAAG;SAChB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"storage.test.js","sourceRoot":"","sources":["../../../src/tests/modules/storage.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAE/C,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GAC3E,OAAO,CAAC;AAET,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC9B,IAAI,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACxC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClB,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;QACpC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClB,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;QACjD,oBAAoB,CAAC;YACpB,GAAG,iBAAiB;YACpB,WAAW,EAAE,uBAAuB;SACpC,CAAC,CAAC;QACH,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC,aAAa,CAAC;YAC5C,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,uBAAuB;SACpC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,79 +1,79 @@
1
1
  {
2
- "name": "@prosopo/procaptcha",
3
- "version": "2.0.0",
4
- "author": "PROSOPO LIMITED <info@prosopo.io>",
5
- "license": "Apache-2.0",
6
- "main": "./dist/index.js",
7
- "type": "module",
8
- "types": "./dist/index.d.ts",
9
- "engines": {
10
- "node": ">=20",
11
- "npm": ">=9"
12
- },
13
- "scripts": {
14
- "clean": "tsc --build --clean",
15
- "build": "tsc --build --verbose",
16
- "build:cjs": "npx vite --config vite.cjs.config.ts build",
17
- "test": "NODE_ENV=${NODE_ENV:-test}; vitest --run --config vite.test.config.ts"
18
- },
19
- "exports": {
20
- ".": {
21
- "import": "./dist/index.js",
22
- "require": "./dist/cjs/index.cjs"
23
- },
24
- "./modules/Manager": {
25
- "types": "./dist/modules/Manager.d.ts",
26
- "import": "./dist/modules/Manager.js",
27
- "require": "./dist/cjs/modules/Manager.cjs",
28
- "default": "./dist/modules/Manager.js"
29
- }
30
- },
31
- "dependencies": {
32
- "@polkadot/api": "10.13.1",
33
- "@polkadot/api-contract": "10.13.1",
34
- "@polkadot/util": "12.6.2",
35
- "@polkadot/util-crypto": "12.6.2",
36
- "@prosopo/account": "2.0.0",
37
- "@prosopo/api": "2.0.0",
38
- "@prosopo/common": "2.0.0",
39
- "@prosopo/datasets": "2.0.0",
40
- "@prosopo/load-balancer": "2.0.0",
41
- "@prosopo/procaptcha-common": "2.0.0",
42
- "@prosopo/types": "2.0.0",
43
- "@prosopo/util": "2.0.0",
44
- "jsdom": "^24.1.0"
45
- },
46
- "overrides": {
47
- "@polkadot/extension-inject": {
48
- "@polkadot/api": {
49
- "version": "10.13.1"
50
- }
51
- },
52
- "@polkadot/extension-dapp": {
53
- "@polkadot/api": {
54
- "version": "10.13.1"
55
- }
56
- }
57
- },
58
- "devDependencies": {
59
- "@prosopo/config": "2.0.0",
60
- "dotenv": "^16.0.1",
61
- "tslib": "2.6.2",
62
- "typescript": "5.1.6",
63
- "vitest": "^1.3.1"
64
- },
65
- "keywords": [],
66
- "repository": {
67
- "type": "git",
68
- "url": "git+https://github.com/prosopo/captcha.git"
69
- },
70
- "bugs": {
71
- "url": "https://github.com/prosopo/captcha/issues"
72
- },
73
- "homepage": "https://github.com/prosopo/captcha#readme",
74
- "description": "",
75
- "publishConfig": {
76
- "registry": "https://registry.npmjs.org"
77
- },
78
- "sideEffects": false
2
+ "name": "@prosopo/procaptcha",
3
+ "version": "2.0.2",
4
+ "author": "PROSOPO LIMITED <info@prosopo.io>",
5
+ "license": "Apache-2.0",
6
+ "main": "./dist/index.js",
7
+ "type": "module",
8
+ "types": "./dist/index.d.ts",
9
+ "engines": {
10
+ "node": ">=20",
11
+ "npm": ">=9"
12
+ },
13
+ "scripts": {
14
+ "clean": "tsc --build --clean",
15
+ "build": "tsc --build --verbose",
16
+ "build:cjs": "npx vite --config vite.cjs.config.ts build",
17
+ "test": "NODE_ENV=${NODE_ENV:-test}; vitest --run --config vite.test.config.ts"
18
+ },
19
+ "exports": {
20
+ ".": {
21
+ "import": "./dist/index.js",
22
+ "require": "./dist/cjs/index.cjs"
23
+ },
24
+ "./modules/Manager": {
25
+ "types": "./dist/modules/Manager.d.ts",
26
+ "import": "./dist/modules/Manager.js",
27
+ "require": "./dist/cjs/modules/Manager.cjs",
28
+ "default": "./dist/modules/Manager.js"
29
+ }
30
+ },
31
+ "dependencies": {
32
+ "@polkadot/api": "10.13.1",
33
+ "@polkadot/api-contract": "10.13.1",
34
+ "@polkadot/util": "12.6.2",
35
+ "@polkadot/util-crypto": "12.6.2",
36
+ "@prosopo/account": "2.0.2",
37
+ "@prosopo/api": "2.0.2",
38
+ "@prosopo/common": "2.0.2",
39
+ "@prosopo/datasets": "2.0.2",
40
+ "@prosopo/load-balancer": "2.0.2",
41
+ "@prosopo/procaptcha-common": "2.0.2",
42
+ "@prosopo/types": "2.0.2",
43
+ "@prosopo/util": "2.0.2",
44
+ "jsdom": "^24.1.0"
45
+ },
46
+ "overrides": {
47
+ "@polkadot/extension-inject": {
48
+ "@polkadot/api": {
49
+ "version": "10.13.1"
50
+ }
51
+ },
52
+ "@polkadot/extension-dapp": {
53
+ "@polkadot/api": {
54
+ "version": "10.13.1"
55
+ }
56
+ }
57
+ },
58
+ "devDependencies": {
59
+ "@prosopo/config": "2.0.2",
60
+ "dotenv": "^16.0.1",
61
+ "tslib": "2.6.2",
62
+ "typescript": "5.1.6",
63
+ "vitest": "^1.3.1"
64
+ },
65
+ "keywords": [],
66
+ "repository": {
67
+ "type": "git",
68
+ "url": "git+https://github.com/prosopo/captcha.git"
69
+ },
70
+ "bugs": {
71
+ "url": "https://github.com/prosopo/captcha/issues"
72
+ },
73
+ "homepage": "https://github.com/prosopo/captcha#readme",
74
+ "description": "",
75
+ "publishConfig": {
76
+ "registry": "https://registry.npmjs.org"
77
+ },
78
+ "sideEffects": false
79
79
  }