@prosopo/provider 0.2.11 → 0.2.14

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 (65) hide show
  1. package/dist/api/captcha.d.ts.map +1 -1
  2. package/dist/api/captcha.js +13 -10
  3. package/dist/api/captcha.js.map +1 -1
  4. package/dist/batch/commitments.d.ts +2 -2
  5. package/dist/batch/commitments.d.ts.map +1 -1
  6. package/dist/batch/commitments.js +2 -2
  7. package/dist/batch/commitments.js.map +1 -1
  8. package/dist/cjs/api/captcha.cjs +15 -13
  9. package/dist/cjs/batch/commitments.cjs +12 -12
  10. package/dist/cjs/tasks/tasks.cjs +22 -21
  11. package/dist/cjs/util.cjs +9 -8
  12. package/dist/tasks/tasks.d.ts +3 -3
  13. package/dist/tasks/tasks.d.ts.map +1 -1
  14. package/dist/tasks/tasks.js +5 -3
  15. package/dist/tasks/tasks.js.map +1 -1
  16. package/dist/tests/accounts.d.ts.map +1 -1
  17. package/dist/tests/accounts.js +2 -3
  18. package/dist/tests/accounts.js.map +1 -1
  19. package/dist/tests/batch/commitments.test.d.ts.map +1 -1
  20. package/dist/tests/batch/commitments.test.js +8 -9
  21. package/dist/tests/batch/commitments.test.js.map +1 -1
  22. package/dist/tests/contract/helpers.test.d.ts.map +1 -1
  23. package/dist/tests/contract/helpers.test.js +3 -2
  24. package/dist/tests/contract/helpers.test.js.map +1 -1
  25. package/dist/tests/dataUtils/DatabasePopulator.d.ts +1 -1
  26. package/dist/tests/dataUtils/DatabasePopulator.d.ts.map +1 -1
  27. package/dist/tests/dataUtils/DatabasePopulator.js +10 -9
  28. package/dist/tests/dataUtils/DatabasePopulator.js.map +1 -1
  29. package/dist/tests/dataUtils/dapp-example-contract/loadFiles.d.ts +1 -1
  30. package/dist/tests/dataUtils/dapp-example-contract/loadFiles.d.ts.map +1 -1
  31. package/dist/tests/dataUtils/dapp-example-contract/loadFiles.js +3 -2
  32. package/dist/tests/dataUtils/dapp-example-contract/loadFiles.js.map +1 -1
  33. package/dist/tests/dataUtils/funds.d.ts +1 -1
  34. package/dist/tests/dataUtils/funds.d.ts.map +1 -1
  35. package/dist/tests/dataUtils/funds.js +1 -1
  36. package/dist/tests/dataUtils/funds.js.map +1 -1
  37. package/dist/tests/dataUtils/populateDatabase.d.ts +1 -1
  38. package/dist/tests/dataUtils/populateDatabase.d.ts.map +1 -1
  39. package/dist/tests/tasks/tasks.test.d.ts.map +1 -1
  40. package/dist/tests/tasks/tasks.test.js +16 -16
  41. package/dist/tests/tasks/tasks.test.js.map +1 -1
  42. package/dist/util.d.ts.map +1 -1
  43. package/dist/util.js +3 -2
  44. package/dist/util.js.map +1 -1
  45. package/package.json +15 -16
  46. package/dist/cjs/contracts/captcha/dist/build-extrinsic/captcha.cjs +0 -339
  47. package/dist/cjs/contracts/captcha/dist/contract-info/captcha.cjs +0 -6
  48. package/dist/cjs/contracts/captcha/dist/contracts/captcha.cjs +0 -79
  49. package/dist/cjs/contracts/captcha/dist/data/captcha.json.cjs +0 -3374
  50. package/dist/cjs/contracts/captcha/dist/event-data/captcha.json.cjs +0 -3
  51. package/dist/cjs/contracts/captcha/dist/events/captcha.cjs +0 -23
  52. package/dist/cjs/contracts/captcha/dist/index.cjs +0 -44
  53. package/dist/cjs/contracts/captcha/dist/mixed-methods/captcha.cjs +0 -470
  54. package/dist/cjs/contracts/captcha/dist/query/captcha.cjs +0 -468
  55. package/dist/cjs/contracts/captcha/dist/shared/utils.cjs +0 -31
  56. package/dist/cjs/contracts/captcha/dist/tx-sign-and-send/captcha.cjs +0 -426
  57. package/dist/cjs/contracts/captcha/dist/types-arguments/captcha.cjs +0 -62
  58. package/dist/tests/data/captchas.d.ts +0 -37
  59. package/dist/tests/data/captchas.d.ts.map +0 -1
  60. package/dist/tests/data/captchas.js +0 -902
  61. package/dist/tests/data/captchas.js.map +0 -1
  62. package/dist/tests/data/captchas1.json +0 -53
  63. package/dist/tests/data/captchas2.json +0 -69
  64. package/dist/tests/data/captchas3.json +0 -54
  65. package/dist/tests/data/captchas4.json +0 -53
@@ -12,10 +12,10 @@
12
12
  // See the License for the specific language governing permissions and
13
13
  // limitations under the License.
14
14
  import { AccountKey } from '../dataUtils/DatabaseAccounts.js';
15
- import { BN, BN_THOUSAND, BN_TWO, bnMin, stringToHex } from '@polkadot/util';
15
+ import { BN, BN_THOUSAND, BN_TWO, bnMin } from '@polkadot/util/bn';
16
16
  import { BatchCommitmentsTask } from '../../batch/commitments.js';
17
17
  import { ScheduledTaskNames } from '@prosopo/types';
18
- import { CaptchaStatus } from '@prosopo/captcha-contract';
18
+ import { CaptchaStatus } from '@prosopo/captcha-contract/types-returns';
19
19
  import { MockEnvironment } from '@prosopo/env';
20
20
  import { ProsopoEnvError } from '@prosopo/common';
21
21
  import { accountAddress, accountContract, accountMnemonic, getSignedTasks } from '../accounts.js';
@@ -24,8 +24,9 @@ import { at } from '@prosopo/util';
24
24
  import { getPairAsync, wrapQuery } from '@prosopo/contract';
25
25
  import { getTestConfig } from '@prosopo/config';
26
26
  import { getUser } from '../getUser.js';
27
- import { randomAsHex } from '@polkadot/util-crypto';
27
+ import { randomAsHex } from '@polkadot/util-crypto/random';
28
28
  import { sleep } from '../tasks/tasks.test.js';
29
+ import { stringToHex } from '@polkadot/util/string';
29
30
  // Some chains incorrectly use these, i.e. it is set to values such as 0 or even 2
30
31
  // Use a low minimum validity threshold to check these against
31
32
  const THRESHOLD = BN_THOUSAND.div(BN_TWO);
@@ -91,14 +92,12 @@ describe('BATCH TESTS', function () {
91
92
  .unwrap()
92
93
  .unwrap();
93
94
  const dappAccount = await getUser(env, AccountKey.dappsWithStake);
94
- const randomCaptchasResult = await providerTasks.db.getRandomCaptcha(false, providerDetails.datasetId);
95
+ const randomCaptchasResult = await providerTasks.db.getRandomCaptcha(true, providerDetails.datasetId);
95
96
  if (randomCaptchasResult) {
97
+ const solutions = await providerTasks.db.getSolutions(providerDetails.datasetId.toString());
98
+ const solutionIndex = solutions.findIndex((s) => s.captchaContentId === at(randomCaptchasResult, 0).captchaContentId);
99
+ const solution = at(solutions, solutionIndex).solution;
96
100
  const unsolvedCaptcha = at(randomCaptchasResult, 0);
97
- const solution = [
98
- at(unsolvedCaptcha.items, 0).hash || '',
99
- at(unsolvedCaptcha.items, 2).hash || '',
100
- at(unsolvedCaptcha.items, 3).hash || '',
101
- ];
102
101
  const captchaSolution = { ...unsolvedCaptcha, solution, salt: randomAsHex() };
103
102
  const commitmentIds = [];
104
103
  // Store 10 commitments in the local db
@@ -1 +1 @@
1
- {"version":3,"file":"commitments.test.js","sourceRoot":"","sources":["../../../src/tests/batch/commitments.test.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;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAE7D,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAAmB,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAIjD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACjG,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AACtE,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAA;AAClC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,kFAAkF;AAClF,8DAA8D;AAC9D,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AACzC,MAAM,YAAY,GAAG,IAAI,EAAE,CAAC,IAAK,CAAC,CAAA;AAClC,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;AAEzC,SAAS,YAAY,CAAC,GAAe;IACjC,OAAO,KAAK,CACR,KAAK;IACL,+CAA+C;IAC/C,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,iBAAiB;QAC9B,kBAAkB;QAClB,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,eAAe;QACtC,WAAW;QACX,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,iBAAiB;QACtC,sDAAsD;QACtD,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC;YAC/C,CAAC,CAAC,gCAAgC;gBAChC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC;YAChD,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe;gBAC3B,CAAC,CAAC,gCAAgC;oBAChC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;gBAC1B,CAAC,CAAC,2BAA2B;oBAC3B,YAAY,CAAC,CAC1B,CAAA;AACL,CAAC;AAMD,QAAQ,CAAC,aAAa,EAAE;IACpB,UAAU,CAAC,KAAK,WAAW,OAAwB;QAC/C,MAAM,MAAM,GAAG,aAAa,EAAE,CAAA;QAC9B,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QACxD,OAAO,CAAC,GAAG,GAAG,IAAI,eAAe,CAAC,aAAa,EAAE,EAAE,SAAS,CAAC,CAAA;QAC7D,IAAI;YACA,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;SAC9B;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,eAAe,CAAC,CAAU,CAAC,CAAA;SACxC;QACD,MAAM,mBAAmB,GAA0B,SAAS,CACxD,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,yBAAyB,EAClE,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAC3C,EAAE,CAAA;QACH,OAAO,CAAC,sBAAsB,GAAG,IAAI,EAAE,CAAC,CAAC,MAAM,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAiB,EAAE;QACvC,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG;YAAE,MAAM,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,CAAA;IACjD,CAAC,CAAC,CAAA;IAEF,MAAM,eAAe,GAAG,EAAE,CAAA;IAE1B,IAAI,CAAC,YAAY,eAAe,uBAAuB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;QACvE,IAAI,GAAG,CAAC,EAAE,EAAE;YACR,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,4BAA4B,CAAC,CAAA;YAEnF,MAAM,GAAG,CAAC,YAAY,CAClB,MAAM,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,eAAe,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAC3G,CAAA;YACD,4GAA4G;YAC5G,kDAAkD;YAClD,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,cAAc,EAAE,CAAA;YAC9C,4DAA4D;YAC5D,0GAA0G;YAC1G,gGAAgG;YAChG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YAC9C,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YAEhD,oBAAoB;YACpB,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAA;YAE3G,0GAA0G;YAC1G,+CAA+C;YAC/C,MAAM,OAAO,GAAG,IAAI,oBAAoB,CACpC,GAAG,CAAC,MAAM,CAAC,WAAW,EACtB,MAAM,GAAG,CAAC,cAAc,EAAE,EAC1B,GAAG,CAAC,EAAE,EACN,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,EAC7B,GAAG,CAAC,MAAM,CACb,CAAA;YAED,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,eAAe,CAAC,CAAA;YAChE,MAAM,eAAe,GAAG,CACpB,MAAM,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAClF,CAAC,KAAK;iBACF,MAAM,EAAE;iBACR,MAAM,EAAE,CAAA;YACb,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,cAAc,CAAC,CAAA;YACjE,MAAM,oBAAoB,GAAG,MAAM,aAAa,CAAC,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;YAEtG,IAAI,oBAAoB,EAAE;gBACtB,MAAM,eAAe,GAAG,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAA;gBACnD,MAAM,QAAQ,GAAG;oBACb,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;oBACvC,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;oBACvC,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;iBAC1C,CAAA;gBACD,MAAM,eAAe,GAAoB,EAAE,GAAG,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAA;gBAC9F,MAAM,aAAa,GAAa,EAAE,CAAA;gBAElC,uCAAuC;gBACvC,MAAM,WAAW,GAAG,CAAC,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;gBAC5F,MAAM,WAAW,GAAG,WAAW,GAAG,CAAC,CAAA;gBACnC,MAAM,WAAW,GAAG,aAAa,CAAA;gBACjC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,eAAe,EAAE,KAAK,EAAE,EAAE;oBAClD,gGAAgG;oBAChG,oGAAoG;oBACpG,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;oBAChE,qFAAqF;oBACrF,MAAM,YAAY,GAAG,WAAW,EAAE,CAAA;oBAClC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;oBAChC,MAAM,MAAM,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,CAAA;oBACnF,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAA;oBACrE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAA;oBAC3D,MAAM,MAAM,GAAyB;wBACjC,EAAE,EAAE,YAAY;wBAChB,WAAW,EAAE,cAAc,CAAC,QAAQ,CAAC;wBACrC,eAAe,EAAE,cAAc,CAAC,eAAe,CAAC;wBAChD,SAAS,EAAE,eAAe,CAAC,SAAS,CAAC,QAAQ,EAAE;wBAC/C,YAAY,EAAE,eAAe,CAAC,WAAW,CAAC;wBAC1C,MAAM;wBACN,WAAW;wBACX,WAAW;wBACX,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;wBACxC,SAAS,EAAE,KAAK;wBAChB,OAAO,EAAE,KAAK;qBACjB,CAAA;oBACD,MAAM,aAAa,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,CAAA;oBACvE,IAAI,MAAM,KAAK,aAAa,CAAC,QAAQ,EAAE;wBACnC,MAAM,aAAa,CAAC,EAAE,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAA;qBACjE;oBACD,MAAM,KAAK,CAAC,EAAE,CAAC,CAAA;oBACf,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,EAAE,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;oBAClF,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAA;oBACrC,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,EAAE,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAA;oBACnF,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAA;iBACvC;gBACD,sDAAsD;gBACtD,MAAM,yBAAyB,GAAG,MAAM,OAAO,CAAC,cAAc,EAAE,CAAA;gBAEhE,MAAM,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;gBAErE,yDAAyD;gBACzD,MAAM,CACF,yBAAyB;qBACpB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,QAAQ,CAAC,CAAC;qBAClD,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,CAC3C,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAA;gBAE3C,yCAAyC;gBACzC,MAAM,OAAO,CAAC,GAAG,EAAE,CAAA;gBAEnB,qCAAqC;gBACrC,0CAA0C;gBAC1C,MAAM;gBACN,MAAM;gBACN,mDAAmD;gBACnD,sFAAsF;gBACtF,wCAAwC;gBACxC,uDAAuD;gBACvD,2BAA2B;gBAC3B,eAAe;gBACf,OAAO;gBACP,QAAQ;gBACR,qDAAqD;gBACrD,wFAAwF;gBACxF,0CAA0C;gBAC1C,yDAAyD;gBACzD,+BAA+B;gBAC/B,oBAAoB;gBACpB,sBAAsB;gBACtB,mCAAmC;gBACnC,4FAA4F;gBAC5F,gGAAgG;gBAEhG,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;gBACjG,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,CAAA;gBAC3C,IACI,CAAC,aAAa;oBACd,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;oBACxC,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EACvE;oBACE,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAA;iBAC3B;gBAED,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE;oBACpE,MAAM,sBAAsB,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAA;oBACtE,MAAM,oBAAoB,GAAG,yBAAyB,CAAC,MAAM,CACzD,CAAC,UAAU,EAAE,EAAE,CAAC,sBAAsB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,CAChF,CAAA;oBAED,kDAAkD;oBAClD,MAAM,sBAAsB,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,+BAA+B,EAAE,CAAA;oBAE7E,+FAA+F;oBAC/F,2BAA2B;oBAC3B,MAAM,CAAC,yBAAyB,CAAC,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAC3E,sBAAsB,CAAC,MAAM,CAChC,CAAA;oBAED,uEAAuE;oBACvE,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,GAAiB,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;oBAC3E,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,QAAQ,6CAA6C,CAAC,CAAA;oBAClF,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAA;oBAErB,4CAA4C;oBAE5C,IAAI,KAAK,GAAG,CAAC,CAAA;oBACb,KAAK,MAAM,UAAU,IAAI,oBAAoB,EAAE;wBAC3C,MAAM,QAAQ,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAA;wBAC7D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,UAAU,CAAC,EAAE,gBAAgB,CAAC,CAAA;wBACvE,MAAM,kBAAkB,GAAG,CAAC,MAAM,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK;6BAC9E,MAAM,EAAE;6BACR,MAAM,EAAE,CAAA;wBACb,MAAM,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAA;wBAC1C,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;wBACvD,KAAK,EAAE,CAAA;qBACV;oBACD,uCAAuC;oBACvC,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,EAAE,CAAC,0BAA0B,CACrE,kBAAkB,CAAC,eAAe,CACrC,CAAA;oBACD,MAAM,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAA;oBACvC,MAAM,CAAC,eAAgB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;oBAExD,yEAAyE;oBACzE,IAAI,eAAe,KAAK,SAAS,EAAE;wBAC/B,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA;qBAChF;iBACJ;aACJ;SACJ;IACL,CAAC,EAAE,KAAK,CAAC,CAAA;AACb,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"commitments.test.js","sourceRoot":"","sources":["../../../src/tests/batch/commitments.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.test.d.ts","sourceRoot":"","sources":["../../../src/tests/contract/helpers.test.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAM9C,OAAO,QAAQ,QAAQ,CAAC;IAEpB,UAAiB,WAAY,SAAQ,eAAe;KAAG;CAC1D"}
1
+ {"version":3,"file":"helpers.test.d.ts","sourceRoot":"","sources":["../../../src/tests/contract/helpers.test.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAO9C,OAAO,QAAQ,QAAQ,CAAC;IAEpB,UAAiB,WAAY,SAAQ,eAAe;KAAG;CAC1D"}
@@ -1,11 +1,12 @@
1
- import { BN, hexToU8a } from '@polkadot/util';
1
+ import { BN } from '@polkadot/util/bn';
2
2
  import { LogLevel, ProsopoEnvError, getLogger } from '@prosopo/common';
3
3
  import { MockEnvironment } from '@prosopo/env';
4
- import { TypeDefInfo } from '@polkadot/types-create';
4
+ import { TypeDefInfo } from '@polkadot/types-create/types';
5
5
  import { afterEach, beforeEach, describe, expect, test } from 'vitest';
6
6
  import { at } from '@prosopo/util';
7
7
  import { encodeStringArgs, getPairAsync, wrapQuery } from '@prosopo/contract';
8
8
  import { getTestConfig } from '@prosopo/config';
9
+ import { hexToU8a } from '@polkadot/util/hex';
9
10
  describe('CONTRACT HELPERS', function () {
10
11
  const log = getLogger(LogLevel.enum.info, 'TEST');
11
12
  beforeEach(async function (context) {
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.test.js","sourceRoot":"","sources":["../../../src/tests/contract/helpers.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.test.js","sourceRoot":"","sources":["../../../src/tests/contract/helpers.test.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Abi } from '@polkadot/api-contract';
1
+ import { Abi } from '@polkadot/api-contract/Abi';
2
2
  import { Account } from '../accounts.js';
3
3
  import { IDatabaseAccounts } from './DatabaseAccounts.js';
4
4
  import { ProsopoEnvError } from '@prosopo/common';
@@ -1 +1 @@
1
- {"version":3,"file":"DatabasePopulator.d.ts","sourceRoot":"","sources":["../../../src/tests/dataUtils/DatabasePopulator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DatabasePopulator.d.ts","sourceRoot":"","sources":["../../../src/tests/dataUtils/DatabasePopulator.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,16 @@
1
1
  import { accountAddress, accountContract, accountMnemonic } from '../accounts.js';
2
- import { BN, stringToU8a } from '@polkadot/util';
2
+ import { BN } from '@polkadot/util/bn';
3
3
  import { ContractDeployer, ProsopoContractError, getPairAsync, wrapQuery } from '@prosopo/contract';
4
- import { DappPayee, Payee } from '@prosopo/captcha-contract';
4
+ import { DappPayee, Payee } from '@prosopo/captcha-contract/types-returns';
5
5
  import { ProsopoEnvError } from '@prosopo/common';
6
6
  import { Tasks } from '../../tasks/index.js';
7
7
  import { sendFunds as _sendFunds, getSendAmount, getStakeAmount } from './funds.js';
8
- import { captchaData } from '../data/captchas.js';
9
- import { createType } from '@polkadot/types';
8
+ import { createType } from '@polkadot/types/create';
9
+ import { datasetWithSolutionHashes } from '@prosopo/datasets';
10
10
  import { get } from '@prosopo/util';
11
- import { mnemonicGenerate, randomAsHex } from '@polkadot/util-crypto';
11
+ import { mnemonicGenerate } from '@polkadot/util-crypto/mnemonic';
12
+ import { randomAsHex } from '@polkadot/util-crypto/random';
13
+ import { stringToU8a } from '@polkadot/util/string';
12
14
  const urlBase = 'http://localhost:';
13
15
  const PROVIDER_FEE = 10;
14
16
  const PROVIDER_PAYEE = Payee.dapp;
@@ -168,11 +170,11 @@ class DatabasePopulator {
168
170
  throw this.createError(e, this.registerProviderWithStake.name);
169
171
  }
170
172
  }
171
- async addDataset(account, datasetJSON) {
173
+ async addDataset(account, dataset) {
172
174
  try {
173
175
  await this.changeSigner(account);
174
176
  const tasks = new Tasks(this.mockEnv);
175
- await tasks.providerSetDatasetFromFile(datasetJSON);
177
+ await tasks.providerSetDataset(dataset);
176
178
  }
177
179
  catch (e) {
178
180
  throw this.createError(e, this.addDataset.name);
@@ -183,8 +185,7 @@ class DatabasePopulator {
183
185
  const url = urlBase + randomAsHex().slice(0, 8);
184
186
  const account = await this.registerProvider(fund, url, true);
185
187
  await this.updateProvider(account, url);
186
- const datasetJSON = JSON.parse(JSON.stringify(captchaData));
187
- await this.addDataset(account, datasetJSON);
188
+ await this.addDataset(account, datasetWithSolutionHashes);
188
189
  this._registeredProvidersWithStakeAndDataset.push(account);
189
190
  return account;
190
191
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DatabasePopulator.js","sourceRoot":"","sources":["../../../src/tests/dataUtils/DatabasePopulator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DatabasePopulator.js","sourceRoot":"","sources":["../../../src/tests/dataUtils/DatabasePopulator.ts"],"names":[],"mappings":"AAcA,OAAO,EAAW,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAE1F,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAA;AACtC,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACnG,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,yCAAyC,CAAA;AAI1E,OAAO,EAAE,eAAe,EAAkB,MAAM,iBAAiB,CAAA;AAGjE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC5C,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEnD,MAAM,OAAO,GAAG,mBAAmB,CAAA;AAEnC,MAAM,YAAY,GAAG,EAAE,CAAA;AACvB,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAA;AAEjC,MAAM,CAAN,IAAY,6BAOX;AAPD,WAAY,6BAA6B;IACrC,sEAAqC,CAAA;IACrC,wFAAuD,CAAA;IACvD,4GAA2E,CAAA;IAC3E,8DAA6B,CAAA;IAC7B,gFAA+C,CAAA;IAC/C,sEAAqC,CAAA;AACzC,CAAC,EAPW,6BAA6B,KAA7B,6BAA6B,QAOxC;AAED,MAAM,OAAO,yBAAyB;CAmBrC;AAED,MAAM,iBAAiB;IAwBnB,YAAY,GAAwB,EAAE,eAAoB,EAAE,QAAoB;QArBxE,yBAAoB,GAAc,EAAE,CAAA;QAEpC,kCAA6B,GAAc,EAAE,CAAA;QAE7C,4CAAuC,GAAc,EAAE,CAAA;QAEvD,qBAAgB,GAAc,EAAE,CAAA;QAEhC,8BAAyB,GAAc,EAAE,CAAA;QAEzC,yBAAoB,GAAc,EAAE,CAAA;QAEpC,yBAAoB,GAAgB,CAAC,CAAA;QAErC,gBAAW,GAAgB,CAAC,CAAA;QAC5B,eAAU,GAAgB,CAAC,CAAA;QAO/B,IAAI,CAAC,OAAO,GAAG,GAAG,CAAA;QAClB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAC7C,IAAI;gBACA,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACrC,MAAM,mBAAmB,GAA0B,SAAS,CACxD,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,yBAAyB,EAC9C,KAAK,CAAC,QAAQ,CAAC,KAAK,CACvB,EAAE,CAAA;gBACH,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;oBACpC,IAAI,CAAC,oBAAoB,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;oBAClD,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAA;oBACjE,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC1D,CAAC,CAAC,CAAA;aACL;YAAC,OAAO,CAAC,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;aAC7B;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IAED,IAAI,SAAS,CAAC,QAAmB;QAC7B,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAA;IACxC,CAAC;IAED,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,6BAA6B,CAAA;IAC7C,CAAC;IAED,IAAI,kBAAkB,CAAC,QAAmB;QACtC,IAAI,CAAC,6BAA6B,GAAG,QAAQ,CAAA;IACjD,CAAC;IAED,IAAI,4BAA4B;QAC5B,OAAO,IAAI,CAAC,uCAAuC,CAAA;IACvD,CAAC;IAED,IAAI,4BAA4B,CAAC,QAAmB;QAChD,IAAI,CAAC,uCAAuC,GAAG,QAAQ,CAAA;IAC3D,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,gBAAgB,CAAA;IAChC,CAAC;IAED,IAAI,KAAK,CAAC,QAAmB;QACzB,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAA;IACpC,CAAC;IAED,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,yBAAyB,CAAA;IACzC,CAAC;IAED,IAAI,cAAc,CAAC,QAAmB;QAClC,IAAI,CAAC,yBAAyB,GAAG,QAAQ,CAAA;IAC7C,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IAED,IAAI,SAAS,CAAC,QAAmB;QAC7B,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAA;IACxC,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;IAEO,aAAa;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAA;QAEnD,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,eAAe,CAAC,iCAAiC,CAAC,CAAA;SAC/D;QAED,OAAO,OAAO,CAAA;IAClB,CAAC;IAEO,4BAA4B;QAChC,MAAM,QAAQ,GAAW,gBAAgB,EAAE,CAAA;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC9D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;QAC3B,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC9B,CAAC;IAIO,SAAS,CAAC,OAAyB,EAAE,KAAa,EAAE,MAAiB;QACzE,MAAM,OAAO,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;QAE/E,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;IACtE,CAAC;IAIO,KAAK,CAAC,YAAY,CAAC,OAAyB;QAChD,MAAM,QAAQ,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAEjF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;YACjC,MAAM,IAAI,eAAe,CAAC,uBAAuB,CAAC,CAAA;SACrD;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QACzE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QAEtD,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,IAAa,EAAE,GAAY,EAAE,MAAgB;QACvE,IAAI;YACA,MAAM,SAAS,GAAG,GAAG,IAAI,OAAO,GAAG,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC5D,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAA;YAE/C,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;YACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACrB,sBAAsB,EACtB,GAAG,EACH,cAAc,CAAC,OAAO,CAAC,EACvB,GAAG,EACH,qBAAqB,EACrB,SAAS,CACZ,CAAA;YACD,IAAI,IAAI,EAAE;gBACN,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;aAC7E;YACD,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;YACjD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAErC,qEAAqE;YACrE,EAAE;YACF,8BAA8B;YAC9B,iBAAiB;YAEjB,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,cAAc,CAAC,CAAA;YAE5E,MAAM,QAAQ,GAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;YAC1G,8CAA8C;YAC9C,IAAI,CAAC,MAAM,EAAE;gBACT,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aAC1C;YACD,OAAO,OAAO,CAAA;SACjB;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,CAAC,WAAW,CAAC,CAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;SACjE;IACL,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAAgB,EAAE,GAAW;QACtD,IAAI;YACA,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;YAEhC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAErC,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,cAAc,CAClC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAC5B,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,CAAC,EACrF,cAAc,EACd,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,CAC9B,CAAA;YAED,sFAAsF;YACtF,mCAAmC;SACtC;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,CAAC,WAAW,CAAC,CAAU,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;SAC/D;IACL,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,IAAa;QAChD,IAAI;YACA,MAAM,GAAG,GAAG,OAAO,GAAG,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAE/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;YAE5D,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;YAEvC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAEhD,OAAO,OAAO,CAAA;SACjB;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,CAAC,WAAW,CAAC,CAAU,EAAE,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAA;SAC1E;IACL,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,OAAgB,EAAE,OAA8B;QACrE,IAAI;YACA,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;YAEhC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAErC,MAAM,KAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;SAC1C;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,CAAC,WAAW,CAAC,CAAU,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;SAC3D;IACL,CAAC;IAEM,KAAK,CAAC,mCAAmC,CAAC,IAAa;QAC1D,IAAI;YACA,MAAM,GAAG,GAAG,OAAO,GAAG,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAE/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;YAC5D,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;YACvC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAA;YAEzD,IAAI,CAAC,uCAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAE1D,OAAO,OAAO,CAAA;SACjB;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,CAAC,WAAW,CAAC,CAAU,EAAE,IAAI,CAAC,mCAAmC,CAAC,IAAI,CAAC,CAAA;SACpF;IACL,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAa,EAAE,GAAY,EAAE,MAAgB;QACnE,IAAI;YACA,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;YACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAA;YAC7E,IAAI,IAAI,EAAE;gBACN,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;aACzE;YAED,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAA;YAC/E,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;YAEjD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;YAC3E,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACrC,MAAM,UAAU,GAAG,CAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;YAE1G,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;gBACpB,MAAM,IAAI,oBAAoB,CAAC,2BAA2B,CAAC,CAAA;aAC9D;YAED,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CACjC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EACrB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,UAAU,EACV,CAAC,EACD,CAAC,EACD,WAAW,EAAE,EACb,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAC/B,CAAA;YACD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;YAE5C,MAAM,gBAAgB,GAA4B,YAAY,CAAC,MAAM,CAAC,IAAI,CACtE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,KAAK,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,cAAc,CAC1F,CAAA;YACD,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAU,gBAAgB,EAAE,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAA;YAEtF,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;YAE7B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAA;YAEnE,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;YAE5F,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAA;YAEhE,IAAI,KAAK,EAAE;gBACP,MAAM,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAA;aACxC;YAED,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;YAErE,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;YAEhE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,CAAA;YAE1E,IAAI,CAAC,MAAM,EAAE;gBACT,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aACtC;YAED,OAAO,OAAO,CAAA;SACjB;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,CAAC,WAAW,CAAC,CAAU,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;SAC7D;IACL,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,OAAgB;QACnC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QAEhC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAErC,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IAC3F,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,IAAa;QAC5C,IAAI;YACA,MAAM,GAAG,GAAG,OAAO,GAAG,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;YACxD,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;YAE5B,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAE5C,OAAO,OAAO,CAAA;SACjB;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;SAC7B;IACL,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,IAAa;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QACpC,IAAI,IAAI,EAAE;YACN,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;SAC7E;QAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEvC,OAAO,OAAO,CAAA;IAClB,CAAC;IAED,WAAW,CAAC,GAAU,EAAE,YAAoB;QACxC,MAAM,CAAC,GAEH;YACA,KAAK,EAAE,GAAG;SACb,CAAA;QACD,OAAO,IAAI,eAAe,CAAC,iCAAmD,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;IAC/G,CAAC;CACJ;AAED,eAAe,iBAAiB,CAAA"}
@@ -1,4 +1,4 @@
1
- import { Abi } from '@polkadot/api-contract';
1
+ import { Abi } from '@polkadot/api-contract/Abi';
2
2
  export declare function DappAbiJSON(): Promise<Abi>;
3
3
  export declare function DappWasm(): Promise<Uint8Array>;
4
4
  //# sourceMappingURL=loadFiles.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"loadFiles.d.ts","sourceRoot":"","sources":["../../../../src/tests/dataUtils/dapp-example-contract/loadFiles.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAA;AAO5C,wBAAsB,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,CAQhD;AAED,wBAAsB,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,CASpD"}
1
+ {"version":3,"file":"loadFiles.d.ts","sourceRoot":"","sources":["../../../../src/tests/dataUtils/dapp-example-contract/loadFiles.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAA;AAQhD,wBAAsB,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,CAQhD;AAED,wBAAsB,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,CASpD"}
@@ -11,8 +11,9 @@
11
11
  // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
12
  // See the License for the specific language governing permissions and
13
13
  // limitations under the License.
14
- import { Abi } from '@polkadot/api-contract';
15
- import { hexToU8a, isWasm } from '@polkadot/util';
14
+ import { Abi } from '@polkadot/api-contract/Abi';
15
+ import { hexToU8a } from '@polkadot/util/hex';
16
+ import { isWasm } from '@polkadot/util/is';
16
17
  import fse from 'fs-extra';
17
18
  import path from 'path';
18
19
  // TODO use the .contract file instead of the .json and .wasm files. Polkadot-JS apps is also erroring out when using
@@ -1 +1 @@
1
- {"version":3,"file":"loadFiles.js","sourceRoot":"","sources":["../../../../src/tests/dataUtils/dapp-example-contract/loadFiles.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,GAAG,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,GAAG,MAAM,UAAU,CAAA;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,qHAAqH;AACrH,8EAA8E;AAE9E,MAAM,CAAC,KAAK,UAAU,WAAW;IAC7B,IAAI;QACA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;QAC3G,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;KACvB;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAA;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC1B,MAAM,IAAI,GAAkB,KAAK,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAA;IAC3G,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;IAChC,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;QACnB,OAAO,SAAS,CAAA;KACnB;SAAM;QACH,OAAO,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;QACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC"}
1
+ {"version":3,"file":"loadFiles.js","sourceRoot":"","sources":["../../../../src/tests/dataUtils/dapp-example-contract/loadFiles.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,GAAG,EAAE,MAAM,4BAA4B,CAAA;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,GAAG,MAAM,UAAU,CAAA;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,qHAAqH;AACrH,8EAA8E;AAE9E,MAAM,CAAC,KAAK,UAAU,WAAW;IAC7B,IAAI;QACA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;QAC3G,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;KACvB;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAA;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC1B,MAAM,IAAI,GAAkB,KAAK,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAA;IAC3G,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;IAChC,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;QACnB,OAAO,SAAS,CAAA;KACnB;SAAM;QACH,OAAO,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;QACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC"}
@@ -1,6 +1,6 @@
1
1
  /// <reference types="bn.js" />
2
2
  import { AnyNumber } from '@polkadot/types-codec/types';
3
- import { BN } from '@polkadot/util';
3
+ import { BN } from '@polkadot/util/bn';
4
4
  import { ProsopoEnvironment } from '@prosopo/types-env';
5
5
  /** Send funds from one of the development accounts to another account. */
6
6
  export declare function sendFunds(env: ProsopoEnvironment, address: string, who: string, amount: AnyNumber): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"funds.d.ts","sourceRoot":"","sources":["../../../src/tests/dataUtils/funds.ts"],"names":[],"mappings":";AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAGnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAgBvD,0EAA0E;AAC1E,wBAAsB,SAAS,CAC3B,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,SAAS,GAClB,OAAO,CAAC,IAAI,CAAC,CA+Df;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,EAAE,CAoB9G;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,CAS1E"}
1
+ {"version":3,"file":"funds.d.ts","sourceRoot":"","sources":["../../../src/tests/dataUtils/funds.ts"],"names":[],"mappings":";AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAA;AAGtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAgBvD,0EAA0E;AAC1E,wBAAsB,SAAS,CAC3B,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,SAAS,GAClB,OAAO,CAAC,IAAI,CAAC,CA+Df;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,EAAE,CAoB9G;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,CAS1E"}
@@ -1,4 +1,4 @@
1
- import { BN } from '@polkadot/util';
1
+ import { BN } from '@polkadot/util/bn';
2
2
  import { ProsopoEnvError } from '@prosopo/common';
3
3
  import { at } from '@prosopo/util';
4
4
  import { dispatchErrorHandler, oneUnit } from '@prosopo/contract';
@@ -1 +1 @@
1
- {"version":3,"file":"funds.js","sourceRoot":"","sources":["../../../src/tests/dataUtils/funds.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAEnC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAA;AAClC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAEjE,MAAM,YAAY,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;AACrF,IAAI,OAAO,GAAG,CAAC,CAAC,CAAA;AAChB,MAAM,gBAAgB,GAAG,KAAK,CAAA,CAAC,aAAa;AAE5C;GACG;AACH,SAAS,eAAe;IACpB,OAAO,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,MAAM,CAAA;IAE7C,OAAO,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;AACpC,CAAC;AAED,0EAA0E;AAC1E,MAAM,CAAC,KAAK,UAAU,SAAS,CAC3B,GAAuB,EACvB,OAAe,EACf,GAAW,EACX,MAAiB;IAEjB,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAA;IAC1B,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAA;IAClC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IAClD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC1E,MAAM,EACF,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,GAC/B,GAAG,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3E,IAAI,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE;QAC5C,MAAM,IAAI,eAAe,CAAC,2BAA2B,EAAE,SAAS,EAAE,SAAS,EAAE;YACzE,QAAQ;YACR,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;SAC5B,CAAC,CAAA;KACL;IAED,MAAM,GAAG,GAAG,GAAG,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAA;IAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;IAClC,MAAM,UAAU,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAA;IACjE,GAAG,CAAC,MAAM,CAAC,KAAK,CACZ,qBAAqB,EACrB,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,OAAO,EACP,WAAW,EACX,UAAU,EACV,uBAAuB,EACvB,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EACjC,OAAO,CACV,CAAA;IACD,qDAAqD;IACrD,MAAM,MAAM,GAAgC,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9E,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,QAAQ;aAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;aACzB,WAAW,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,MAA0B,EAAE,EAAE;YACzD,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;gBACtD,MAAM,CAAC,MAAM;qBACR,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAO,EAAW,EAAE,CAAC,OAAO,KAAK,QAAQ,CAAC;qBACtE,OAAO,CAAC,CAAC,KAAK,EAAQ,EAAE;oBACrB,MAAM,EACF,KAAK,EAAE,EAAE,MAAM,EAAE,GACpB,GAAG,KAAK,CAAA;oBAET,IAAI,MAAM,KAAK,iBAAiB,EAAE;wBAC9B,KAAK,EAAE,CAAA;wBACP,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;qBACpD;gBACL,CAAC,CAAC,CAAA;gBACN,KAAK,EAAE,CAAA;gBACP,OAAO,CAAC,MAAM,CAAC,CAAA;aAClB;iBAAM,IAAI,MAAM,CAAC,OAAO,EAAE;gBACvB,KAAK,EAAE,CAAA;gBACP,MAAM,CAAC,MAAM,CAAC,CAAA;aACjB;QACL,CAAC,CAAC,CAAA;IACV,CAAC,CAAC,CAAA;IACF,MAAM,MAAM;SACP,IAAI,CAAC,CAAC,MAA0B,EAAE,EAAE;QACjC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAA;IACzG,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,IAAI,eAAe,CAAC,0BAA0B,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;IACtF,CAAC,CAAC,CAAA;AACV,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,GAAuB,EAAE,oBAAwB,EAAE,eAAwB;IACtG,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;IAElC,kHAAkH;IAClH,qDAAqD;IACrD,MAAM,QAAQ,GAAG,EAAE,CAAC,GAAG,CACnB,oBAAoB,CAAC,IAAI,CAAC,eAAe,IAAI,GAAG,CAAC,EACjD,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,EAAE,CACzD,CAAA;IAED,mHAAmH;IACnH,qCAAqC;IACrC,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAE9F,IAAI,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;QACvB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;QAClF,OAAO,QAAQ,CAAA;KAClB;IACD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;IAClF,OAAO,QAAQ,CAAA;AACnB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,GAAuB,EAAE,WAAe;IAClE,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;IAClC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;IAC1E,IAAI,UAAU,GAAG,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAE5C,0EAA0E;IAC1E,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;IAC5F,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;IACnF,OAAO,UAAU,CAAA;AACrB,CAAC"}
1
+ {"version":3,"file":"funds.js","sourceRoot":"","sources":["../../../src/tests/dataUtils/funds.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Abi } from '@polkadot/api-contract';
1
+ import { Abi } from '@polkadot/api-contract/Abi';
2
2
  import { AccountKey, IDatabaseAccounts } from './DatabaseAccounts.js';
3
3
  import { KeyringPair } from '@polkadot/keyring/types';
4
4
  import { ProsopoConfigOutput } from '@prosopo/types';
@@ -1 +1 @@
1
- {"version":3,"file":"populateDatabase.d.ts","sourceRoot":"","sources":["../../../src/tests/dataUtils/populateDatabase.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAA0B,MAAM,uBAAuB,CAAA;AAE7F,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAOlD,MAAM,MAAM,SAAS,GAAG;KACnB,GAAG,IAAI,UAAU,GAAG,MAAM;CAC9B,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;KAClB,GAAG,IAAI,UAAU,GAAG,OAAO;CAC/B,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,QAOhC,CAAA;AAiDD,wBAAsB,gBAAgB,CAClC,GAAG,EAAE,mBAAmB,EACxB,UAAU,EAAE,SAAS,EACrB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,UAAU,GACrB,OAAO,CAAC,iBAAiB,CAAC,CA6B5B;AAED,wBAA8B,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB,iBAY/E"}
1
+ {"version":3,"file":"populateDatabase.d.ts","sourceRoot":"","sources":["../../../src/tests/dataUtils/populateDatabase.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAA0B,MAAM,uBAAuB,CAAA;AAE7F,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAOlD,MAAM,MAAM,SAAS,GAAG;KACnB,GAAG,IAAI,UAAU,GAAG,MAAM;CAC9B,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;KAClB,GAAG,IAAI,UAAU,GAAG,OAAO;CAC/B,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,QAOhC,CAAA;AAiDD,wBAAsB,gBAAgB,CAClC,GAAG,EAAE,mBAAmB,EACxB,UAAU,EAAE,SAAS,EACrB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,UAAU,GACrB,OAAO,CAAC,iBAAiB,CAAC,CA6B5B;AAED,wBAA8B,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB,iBAY/E"}
@@ -1 +1 @@
1
- {"version":3,"file":"tasks.test.d.ts","sourceRoot":"","sources":["../../../src/tests/tasks/tasks.test.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAe9C,wBAAsB,KAAK,CAAC,OAAO,EAAE,MAAM,iBAE1C;AAGD,OAAO,QAAQ,QAAQ,CAAC;IAEpB,UAAiB,WAAY,SAAQ,eAAe;KAAG;CAC1D"}
1
+ {"version":3,"file":"tasks.test.d.ts","sourceRoot":"","sources":["../../../src/tests/tasks/tasks.test.ts"],"names":[],"mappings":"AAsCA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAkB9C,wBAAsB,KAAK,CAAC,OAAO,EAAE,MAAM,iBAE1C;AAGD,OAAO,QAAQ,QAAQ,CAAC;IAEpB,UAAiB,WAAY,SAAQ,eAAe;KAAG;CAC1D"}
@@ -13,9 +13,9 @@
13
13
  //
14
14
  // You should have received a copy of the GNU General Public License
15
15
  import { AccountKey } from '../dataUtils/DatabaseAccounts.js';
16
- import { BN, stringToHex, stringToU8a, u8aToHex } from '@polkadot/util';
17
- import { CaptchaMerkleTree, computeCaptchaSolutionHash, computePendingRequestHash } from '@prosopo/datasets';
18
- import { CaptchaStatus, DappPayee, Payee } from '@prosopo/captcha-contract';
16
+ import { BN } from '@polkadot/util/bn';
17
+ import { CaptchaMerkleTree, computeCaptchaSolutionHash, computePendingRequestHash, datasetWithSolutionHashes, } from '@prosopo/datasets';
18
+ import { CaptchaStatus, DappPayee, Payee } from '@prosopo/captcha-contract/types-returns';
19
19
  import { ContractDeployer, ProsopoContractError, getBlockNumber, getDispatchError, getPairAsync, wrapQuery, } from '@prosopo/contract';
20
20
  import { DappAbiJSON, DappWasm } from '../dataUtils/dapp-example-contract/loadFiles.js';
21
21
  import { MockEnvironment } from '@prosopo/env';
@@ -23,13 +23,16 @@ import { PROVIDER, accountAddress, accountContract, accountMnemonic, getSignedTa
23
23
  import { ProsopoEnvError, hexHash, i18n } from '@prosopo/common';
24
24
  import { afterEach, beforeEach, describe, expect, test } from 'vitest';
25
25
  import { at, get } from '@prosopo/util';
26
- import { captchaData } from '../data/captchas.js';
27
- import { createType } from '@polkadot/types';
26
+ import { createType } from '@polkadot/types/create';
27
+ import { datasetWithIndexSolutions } from '@prosopo/datasets';
28
28
  import { getSendAmount, getStakeAmount, sendFunds } from '../dataUtils/funds.js';
29
29
  import { getTestConfig } from '@prosopo/config';
30
30
  import { getUser } from '../getUser.js';
31
31
  import { parseBlockNumber } from '../../index.js';
32
- import { randomAsHex, signatureVerify } from '@polkadot/util-crypto';
32
+ import { randomAsHex } from '@polkadot/util-crypto/random';
33
+ import { signatureVerify } from '@polkadot/util-crypto/signature';
34
+ import { stringToHex, stringToU8a } from '@polkadot/util/string';
35
+ import { u8aToHex } from '@polkadot/util/u8a';
33
36
  function delay(ms) {
34
37
  return new Promise((resolve) => setTimeout(resolve, ms));
35
38
  }
@@ -134,13 +137,13 @@ describe.sequential('CONTRACT TASKS', async function () {
134
137
  test('Provider add dataset', async ({ env }) => {
135
138
  const providerAccount = await getUser(env, AccountKey.providersWithStake);
136
139
  const tasks = await getSignedTasks(env, providerAccount);
137
- await tasks.providerSetDatasetFromFile(JSON.parse(JSON.stringify(captchaData)));
140
+ await tasks.providerSetDatasetFromFile(JSON.parse(JSON.stringify(datasetWithIndexSolutions)));
138
141
  }, 8000);
139
142
  test('Provider add dataset with too few captchas will fail', async ({ env }) => {
140
143
  const providerAccount = await getUser(env, AccountKey.providersWithStake);
141
144
  const tasks = await getSignedTasks(env, providerAccount);
142
145
  // copy captchaData and remove all but one captcha
143
- const dataset = { ...captchaData };
146
+ const dataset = { ...datasetWithIndexSolutions };
144
147
  dataset.captchas = dataset.captchas.slice(0, 1);
145
148
  try {
146
149
  await tasks.providerSetDatasetFromFile(JSON.parse(JSON.stringify(dataset)));
@@ -152,7 +155,7 @@ describe.sequential('CONTRACT TASKS', async function () {
152
155
  test('Provider add dataset with too few solutions will fail', async ({ env }) => {
153
156
  const providerAccount = await getUser(env, AccountKey.providersWithStake);
154
157
  const tasks = await getSignedTasks(env, providerAccount);
155
- const dataset = { ...captchaData };
158
+ const dataset = { ...datasetWithIndexSolutions };
156
159
  // remove solution field from each captcha
157
160
  dataset.captchas = dataset.captchas.map((captcha) => {
158
161
  const { solution, ...rest } = captcha;
@@ -169,7 +172,7 @@ describe.sequential('CONTRACT TASKS', async function () {
169
172
  const providerAccount = await getUser(env, AccountKey.providers);
170
173
  const tasks = await getSignedTasks(env, providerAccount);
171
174
  try {
172
- await tasks.providerSetDatasetFromFile(JSON.parse(JSON.stringify(captchaData)));
175
+ await tasks.providerSetDatasetFromFile(JSON.parse(JSON.stringify(datasetWithIndexSolutions)));
173
176
  }
174
177
  catch (e) {
175
178
  expect(e).to.match(/ProviderInactive/);
@@ -594,16 +597,13 @@ describe.sequential('CONTRACT TASKS', async function () {
594
597
  // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
595
598
  // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
596
599
  const dappUserAccount = await getUser(env, AccountKey.dappUsers);
597
- const dappAccount = await getUser(env, AccountKey.dappsWithStake);
598
600
  // there must be at least one provider in the contract and db
599
601
  await getUser(env, AccountKey.providersWithStakeAndDataset);
600
602
  const dappUserTasks = await getSignedTasks(env, dappUserAccount);
601
603
  const solvedCaptchaCount = env.config.captchas.solved.count;
602
604
  const unsolvedCaptchaCount = env.config.captchas.unsolved.count;
603
- const { provider } = (await dappUserTasks.contract.query.getRandomActiveProvider(accountAddress(dappUserAccount), accountContract(dappAccount))).value
604
- .unwrap()
605
- .unwrap();
606
- const { captchas, requestHash } = await dappUserTasks.getRandomCaptchasAndRequestHash(provider.datasetId.toString(), hexHash(accountAddress(dappUserAccount)));
605
+ const { captchas, requestHash } = await dappUserTasks.getRandomCaptchasAndRequestHash(datasetWithSolutionHashes.datasetId.toString(), // This is the dataset that all test providers have loaded
606
+ hexHash(accountAddress(dappUserAccount)));
607
607
  expect(captchas.length).to.equal(solvedCaptchaCount + unsolvedCaptchaCount);
608
608
  const pendingRequest = env.db?.getDappUserPending(requestHash);
609
609
  expect(pendingRequest).to.not.be.null;
@@ -640,7 +640,7 @@ describe.sequential('CONTRACT TASKS', async function () {
640
640
  value: providerStakeThreshold,
641
641
  })).result;
642
642
  expect(resultproviderUpdate2?.isError).to.be.false;
643
- await tasks.providerSetDatasetFromFile(JSON.parse(JSON.stringify(captchaData)));
643
+ await tasks.providerSetDatasetFromFile(JSON.parse(JSON.stringify(datasetWithIndexSolutions)));
644
644
  const dappAccount = await getUser(env, AccountKey.dappsWithStake);
645
645
  const dappUser = await getUser(env, AccountKey.dappUsers);
646
646
  const dappUserTasks = await getSignedTasks(env, dappUser);