@reclaimprotocol/attestor-core 3.1.1 → 4.0.0

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 (88) hide show
  1. package/lib/avs/contracts/index.js +18 -8
  2. package/lib/avs/utils/tasks.d.ts +1 -1
  3. package/lib/client/create-claim.d.ts +2 -2
  4. package/lib/client/create-claim.js +89 -33
  5. package/lib/client/utils/client-socket.d.ts +3 -1
  6. package/lib/client/utils/client-socket.js +25 -8
  7. package/lib/config/index.d.ts +4 -0
  8. package/lib/config/index.js +8 -3
  9. package/lib/index.js +18 -8
  10. package/lib/proto/api.d.ts +80 -2
  11. package/lib/proto/api.js +853 -101
  12. package/lib/providers/http/index.js +180 -109
  13. package/lib/providers/http/utils.d.ts +3 -6
  14. package/lib/providers/http/utils.js +13 -11
  15. package/lib/providers/index.js +1 -3
  16. package/lib/scripts/generate-receipt.js +6 -3
  17. package/lib/scripts/generate-toprf-keys.d.ts +1 -0
  18. package/lib/scripts/generate-toprf-keys.js +23 -0
  19. package/lib/server/create-server.js +14 -7
  20. package/lib/server/handlers/claimTunnel.js +33 -10
  21. package/lib/server/handlers/createTunnel.js +44 -8
  22. package/lib/server/handlers/disconnectTunnel.js +2 -2
  23. package/lib/server/handlers/index.js +4 -2
  24. package/lib/server/handlers/init.js +17 -2
  25. package/lib/server/handlers/toprf.d.ts +2 -0
  26. package/lib/server/handlers/toprf.js +21 -0
  27. package/lib/server/socket.d.ts +5 -3
  28. package/lib/server/socket.js +25 -5
  29. package/lib/server/tunnels/make-tcp-tunnel.js +10 -24
  30. package/lib/server/utils/apm.js +1 -1
  31. package/lib/server/utils/assert-valid-claim-request.d.ts +2 -2
  32. package/lib/server/utils/assert-valid-claim-request.js +17 -9
  33. package/lib/server/utils/dns.d.ts +1 -0
  34. package/lib/server/utils/dns.js +22 -0
  35. package/lib/server/utils/generics.d.ts +1 -1
  36. package/lib/tests/describe-with-server.d.ts +0 -2
  37. package/lib/tests/describe-with-server.js +1 -4
  38. package/lib/tests/mock-provider-server.d.ts +1 -1
  39. package/lib/tests/test.auth.d.ts +1 -0
  40. package/lib/tests/test.auth.js +75 -0
  41. package/lib/tests/test.bgp-listener.d.ts +1 -0
  42. package/lib/tests/test.bgp-listener.js +169 -0
  43. package/lib/tests/test.claim-creation.js +100 -7
  44. package/lib/tests/test.http-parser.d.ts +1 -1
  45. package/lib/tests/test.http-parser.js +7 -5
  46. package/lib/tests/test.http-provider-utils.js +155 -30
  47. package/lib/tests/test.http-provider.js +50 -7
  48. package/lib/tests/test.zk.js +54 -4
  49. package/lib/tests/utils.d.ts +6 -0
  50. package/lib/tests/utils.js +16 -1
  51. package/lib/types/bgp.d.ts +11 -0
  52. package/lib/types/bgp.js +3 -0
  53. package/lib/types/claims.d.ts +14 -5
  54. package/lib/types/client.d.ts +30 -3
  55. package/lib/types/general.d.ts +12 -0
  56. package/lib/types/handlers.d.ts +4 -4
  57. package/lib/types/index.d.ts +1 -0
  58. package/lib/types/index.js +2 -1
  59. package/lib/types/providers.d.ts +9 -9
  60. package/lib/types/providers.gen.d.ts +12 -152
  61. package/lib/types/providers.gen.js +2 -6
  62. package/lib/types/zk.d.ts +11 -2
  63. package/lib/utils/auth.d.ts +7 -0
  64. package/lib/utils/auth.js +64 -0
  65. package/lib/utils/b64-json.d.ts +2 -0
  66. package/lib/utils/b64-json.js +23 -0
  67. package/lib/utils/bgp-listener.d.ts +7 -0
  68. package/lib/utils/bgp-listener.js +126 -0
  69. package/lib/utils/claims.js +3 -3
  70. package/lib/utils/generics.d.ts +5 -5
  71. package/lib/utils/generics.js +3 -3
  72. package/lib/utils/index.d.ts +2 -0
  73. package/lib/utils/index.js +3 -1
  74. package/lib/utils/redactions.d.ts +19 -6
  75. package/lib/utils/redactions.js +41 -4
  76. package/lib/utils/socket-base.d.ts +3 -2
  77. package/lib/utils/socket-base.js +7 -2
  78. package/lib/utils/ws.d.ts +5 -5
  79. package/lib/utils/ws.js +27 -10
  80. package/lib/utils/zk.d.ts +12 -7
  81. package/lib/utils/zk.js +197 -42
  82. package/lib/window-rpc/setup-window-rpc.js +29 -8
  83. package/lib/window-rpc/types.d.ts +16 -21
  84. package/lib/window-rpc/utils.d.ts +2 -1
  85. package/lib/window-rpc/utils.js +27 -1
  86. package/lib/window-rpc/window-rpc-zk.d.ts +8 -3
  87. package/lib/window-rpc/window-rpc-zk.js +58 -45
  88. package/package.json +24 -22
@@ -1,16 +1,17 @@
1
1
  import { InitRequest, RPCMessage, RPCMessages } from '../proto/api';
2
2
  import { IAttestorSocket, Logger, RPCEvent, RPCEventMap } from '../types';
3
+ import type { WebSocket as WSWebSocket } from 'ws';
3
4
  /**
4
5
  * Common AttestorSocket class used on the client & server side as the
5
6
  * base for their respective socket implementations.
6
7
  */
7
8
  export declare class AttestorSocket implements IAttestorSocket {
8
- protected socket: WebSocket;
9
+ protected socket: WebSocket | WSWebSocket;
9
10
  metadata: InitRequest;
10
11
  logger: Logger;
11
12
  private eventTarget;
12
13
  isInitialised: boolean;
13
- constructor(socket: WebSocket, metadata: InitRequest, logger: Logger);
14
+ constructor(socket: WebSocket | WSWebSocket, metadata: InitRequest, logger: Logger);
14
15
  get isOpen(): boolean;
15
16
  get isClosed(): boolean;
16
17
  sendMessage(...msgs: Partial<RPCMessage>[]): Promise<RPCMessages>;
@@ -47,7 +47,12 @@ class AttestorSocket {
47
47
  }
48
48
  const msg = (0, utils_1.packRpcMessages)(...msgs);
49
49
  const bytes = api_1.RPCMessages.encode(msg).finish();
50
- await this.socket.send(bytes);
50
+ if ('sendPromise' in this.socket && this.socket.sendPromise) {
51
+ await this.socket.sendPromise(bytes);
52
+ }
53
+ else {
54
+ this.socket.send(bytes);
55
+ }
51
56
  return msg;
52
57
  }
53
58
  dispatchRPCEvent(type, data) {
@@ -86,4 +91,4 @@ class AttestorSocket {
86
91
  }
87
92
  }
88
93
  exports.AttestorSocket = AttestorSocket;
89
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ja2V0LWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvc29ja2V0LWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0VBQW1FO0FBQ25FLHVDQUFvRTtBQUVwRSxxQ0FBd0U7QUFFeEU7OztHQUdHO0FBQ0gsTUFBYSxjQUFjO0lBTTFCLFlBQ1csTUFBaUIsRUFDcEIsUUFBcUIsRUFDckIsTUFBYztRQUZYLFdBQU0sR0FBTixNQUFNLENBQVc7UUFDcEIsYUFBUSxHQUFSLFFBQVEsQ0FBYTtRQUNyQixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBUGQsZ0JBQVcsR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFBO1FBRXZDLGtCQUFhLEdBQUcsS0FBSyxDQUFBO1FBT3BCLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxLQUFpQixFQUFFLEVBQUU7WUFDdEQsTUFBTSxNQUFNLEdBQUcscUJBQWEsQ0FBQyxTQUFTLENBQ3JDLEtBQUssQ0FBQyxLQUFLO21CQUNQLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FDNUIsQ0FBQTtZQUNELE1BQU0sQ0FBQyxJQUFJLEdBQUcscUJBQXFCLENBQUE7WUFFbkMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLHVCQUF1QixFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQ3ZELENBQUMsQ0FBQyxDQUFBO1FBRUYsTUFBTSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUN0QyxJQUFJLENBQUMsZ0JBQWdCLENBQ3BCLHVCQUF1QixFQUN2QixJQUFJLHFCQUFhLENBQ2hCLGdCQUFnQixFQUNoQixtQkFBbUIsQ0FDbkIsQ0FDRCxDQUNELENBQUMsQ0FBQTtRQUVGLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsS0FBSyxFQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRTtZQUNwRCxJQUFJLENBQUM7Z0JB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
94
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ja2V0LWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvc29ja2V0LWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0VBQW1FO0FBQ25FLHVDQUFvRTtBQUVwRSxxQ0FBd0U7QUFHeEU7OztHQUdHO0FBQ0gsTUFBYSxjQUFjO0lBTTFCLFlBQ1csTUFBK0IsRUFDbEMsUUFBcUIsRUFDckIsTUFBYztRQUZYLFdBQU0sR0FBTixNQUFNLENBQXlCO1FBQ2xDLGFBQVEsR0FBUixRQUFRLENBQWE7UUFDckIsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQVBkLGdCQUFXLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQTtRQUV2QyxrQkFBYSxHQUFHLEtBQUssQ0FBQTtRQU9wQixNQUFNLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDMUMsTUFBTSxNQUFNLEdBQUcscUJBQWEsQ0FBQyxTQUFTLENBQ3JDLEtBQUssQ0FBQyxLQUFLO21CQUNQLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FDNUIsQ0FBQTtZQUNELE1BQU0sQ0FBQyxJQUFJLEdBQUcscUJBQXFCLENBQUE7WUFFbkMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLHVCQUF1QixFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQ3ZELENBQUMsQ0FBQyxDQUFBO1FBRUYsTUFBTSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUN0QyxJQUFJLENBQUMsZ0JBQWdCLENBQ3BCLHVCQUF1QixFQUN2QixJQUFJLHFCQUFhLENBQ2hCLGdCQUFnQixFQUNoQixtQkFBbUIsQ0FDbkIsQ0FDRCxDQUNELENBQUMsQ0FBQTtRQUVGLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsS0FBSyxFQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRTtZQUNwRCxJQUFJLENBQUM7Z0JBQ0osTUFBTSxrQ0FBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFBO1lBQ3hDLENBQUM7WUFBQyxPQUFNLEdBQUcsRUFBRSxDQUFDO2dCQUNiLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxFQUFFLEVBQUUsMEJBQTBCLENBQUMsQ0FBQTtZQUN2RCxDQUFDO1FBQ0YsQ0FBQyxDQUFDLENBQUE7SUFDSCxDQUFDO0lBRUQsSUFBSSxNQUFNO1FBQ1QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsS0FBSyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQTtJQUNuRCxDQUFDO0lBRUQsSUFBSSxRQUFRO1FBQ1gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsS0FBSyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU07ZUFDaEQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEtBQUssSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUE7SUFDbkQsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUMsR0FBRyxJQUEyQjtRQUMvQyxJQUFHLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNsQixNQUFNLElBQUkscUJBQWEsQ0FDdEIscUJBQXFCLEVBQ3JCLHdDQUF3QyxDQUN4QyxDQUFBO1FBQ0YsQ0FBQztRQUVELElBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDakIsTUFBTSxJQUFJLHFCQUFhLENBQ3RCLHFCQUFxQixFQUNyQixvREFBb0QsQ0FDcEQsQ0FBQTtRQUNGLENBQUM7UUFFRCxNQUFNLEdBQUcsR0FBRyxJQUFBLHVCQUFlLEVBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQTtRQUNwQyxNQUFNLEtBQUssR0FBRyxpQkFBVyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQTtRQUU5QyxJQUFHLGFBQWEsSUFBSSxJQUFJLENBQUMsTUFBTSxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDNUQsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNyQyxDQUFDO2FBQU0sQ0FBQztZQUNQLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3hCLENBQUM7UUFFRCxPQUFPLEdBQUcsQ0FBQTtJQUNYLENBQUM7SUFFRCxnQkFBZ0IsQ0FBOEIsSUFBTyxFQUFFLElBQW9CO1FBQzFFLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVksRUFBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFDdEMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDdEMsQ0FBQztJQUVELGdCQUFnQixDQUE4QixJQUFPLEVBQUUsUUFBcUM7UUFDM0YsSUFBSSxDQUFDLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUE7SUFDbEQsQ0FBQztJQUVELG1CQUFtQixDQUE4QixJQUFPLEVBQUUsUUFBcUM7UUFDOUYsSUFBSSxDQUFDLFdBQVcsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUE7SUFDckQsQ0FBQztJQUVELEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxHQUFXOztRQUNwQyw0QkFBNEI7UUFDNUIsSUFBRyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDbEIsT0FBTTtRQUNQLENBQUM7UUFFRCxJQUFJLENBQUM7WUFDSixNQUFNLE1BQU0sR0FBRyxHQUFHO2dCQUNqQixDQUFDLENBQUMscUJBQWEsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDO2dCQUM5QixDQUFDLENBQUMsSUFBSSxxQkFBYSxDQUFDLGdCQUFnQixFQUFFLEVBQUUsQ0FBQyxDQUFBO1lBQzFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyx1QkFBdUIsRUFBRSxNQUFNLENBQUMsQ0FBQTtZQUN0RCxJQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDaEIsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDO29CQUN0QiwwQkFBMEIsRUFBRSxNQUFNLENBQUMsT0FBTyxFQUFFO2lCQUM1QyxDQUFDLENBQUE7WUFDSCxDQUFDO1FBQ0YsQ0FBQztRQUFDLE9BQU0sR0FBRyxFQUFFLENBQUM7WUFDYixNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLEtBQUssQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLDhCQUE4QixDQUFDLENBQUE7UUFDNUQsQ0FBQztnQkFBUyxDQUFDO1lBQ1YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNwQixDQUFDO0lBQ0YsQ0FBQztDQUNEO0FBL0dELHdDQStHQyJ9
package/lib/utils/ws.d.ts CHANGED
@@ -1,12 +1,12 @@
1
- import { AnyWebSocketConstructor } from '../types';
1
+ import type { WebSocket as WSWebSocket } from 'ws';
2
2
  /**
3
3
  * Default WebSocket implementation, uses `ws` package
4
4
  * for Node.js and the native WebSocket for the browser & other
5
5
  * environments.
6
6
  */
7
- export declare let Websocket: AnyWebSocketConstructor;
7
+ export declare function makeWebSocket(url: string): WebSocket | WSWebSocket;
8
8
  /**
9
- * Replace the default WebSocket implementation utilised
10
- * by the Attestor client.
9
+ * Adds the "sendPromise" fn to the given WebSocket instance,
10
+ * if not already present.
11
11
  */
12
- export declare function setWebsocket(ws: AnyWebSocketConstructor): void;
12
+ export declare function promisifySend(ws: WSWebSocket): WSWebSocket;
package/lib/utils/ws.js CHANGED
@@ -1,21 +1,38 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Websocket = void 0;
4
- exports.setWebsocket = setWebsocket;
3
+ exports.makeWebSocket = makeWebSocket;
4
+ exports.promisifySend = promisifySend;
5
+ const config_1 = require("../config");
5
6
  const env_1 = require("../utils/env");
6
7
  /**
7
8
  * Default WebSocket implementation, uses `ws` package
8
9
  * for Node.js and the native WebSocket for the browser & other
9
10
  * environments.
10
11
  */
11
- exports.Websocket = ((0, env_1.detectEnvironment)() === 'node'
12
- ? require('ws').WebSocket
13
- : WebSocket);
12
+ function makeWebSocket(url) {
13
+ if ((0, env_1.detectEnvironment)() === 'node') {
14
+ const ws = require('ws');
15
+ return promisifySend(new ws.WebSocket(url, { maxPayload: config_1.MAX_PAYLOAD_SIZE }));
16
+ }
17
+ return new WebSocket(url);
18
+ }
14
19
  /**
15
- * Replace the default WebSocket implementation utilised
16
- * by the Attestor client.
20
+ * Adds the "sendPromise" fn to the given WebSocket instance,
21
+ * if not already present.
17
22
  */
18
- function setWebsocket(ws) {
19
- exports.Websocket = ws;
23
+ function promisifySend(ws) {
24
+ if (ws.sendPromise) {
25
+ return ws;
26
+ }
27
+ ws.sendPromise = (data) => (new Promise((resolve, reject) => {
28
+ ws.send(data, err => {
29
+ if (err) {
30
+ reject(err);
31
+ return;
32
+ }
33
+ resolve();
34
+ });
35
+ }));
36
+ return ws;
20
37
  }
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvd3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBa0JBLG9DQUVDO0FBbkJELHVDQUFpRDtBQUVqRDs7OztHQUlHO0FBQ1EsUUFBQSxTQUFTLEdBQTRCLENBQy9DLElBQUEsdUJBQWlCLEdBQUUsS0FBSyxNQUFNO0lBQzdCLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsU0FBUztJQUN6QixDQUFDLENBQUMsU0FBUyxDQUNaLENBQUE7QUFFRDs7O0dBR0c7QUFDSCxTQUFnQixZQUFZLENBQUMsRUFBMkI7SUFDdkQsaUJBQVMsR0FBRyxFQUFFLENBQUE7QUFDZixDQUFDIn0=
38
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvd3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFTQSxzQ0FTQztBQU1ELHNDQW1CQztBQTNDRCx1Q0FBNkM7QUFDN0MsdUNBQWlEO0FBR2pEOzs7O0dBSUc7QUFDSCxTQUFnQixhQUFhLENBQUMsR0FBVztJQUN4QyxJQUFHLElBQUEsdUJBQWlCLEdBQUUsS0FBSyxNQUFNLEVBQUUsQ0FBQztRQUNuQyxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUF3QixDQUFBO1FBQy9DLE9BQU8sYUFBYSxDQUNuQixJQUFJLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsVUFBVSxFQUFFLHlCQUFnQixFQUFFLENBQUMsQ0FDdkQsQ0FBQTtJQUNGLENBQUM7SUFFRCxPQUFPLElBQUksU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQzFCLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxTQUFnQixhQUFhLENBQUMsRUFBZTtJQUM1QyxJQUFHLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNuQixPQUFPLEVBQUUsQ0FBQTtJQUNWLENBQUM7SUFFRCxFQUFFLENBQUMsV0FBVyxHQUFHLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUMxQixJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUMvQixFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsRUFBRTtZQUNuQixJQUFHLEdBQUcsRUFBRSxDQUFDO2dCQUNSLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDWCxPQUFNO1lBQ1AsQ0FBQztZQUVELE9BQU8sRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FDRixDQUFBO0lBRUQsT0FBTyxFQUFFLENBQUE7QUFDVixDQUFDIn0=
package/lib/utils/zk.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { CipherSuite } from '@reclaimprotocol/tls';
2
- import { EncryptionAlgorithm, PrivateInput, PublicInput, ZKEngine, ZKOperator } from '@reclaimprotocol/zk-symmetric-crypto';
3
- import { MessageReveal_MessageRevealZk as ZKReveal, MessageReveal_ZKProof as ZKProof } from '../proto/api';
4
- import { CompleteTLSPacket, Logger, PrepareZKProofsBaseOpts, ZKOperators, ZKRevealInfo } from '../types';
2
+ import { EncryptionAlgorithm, OPRFOperator, PrivateInput, PublicInput, ZKEngine, ZKOperator } from '@reclaimprotocol/zk-symmetric-crypto';
3
+ import { MessageReveal_MessageRevealZk as ZKReveal, MessageReveal_ZKProof as ZKProof, ZKProofEngine } from '../proto/api';
4
+ import { CompleteTLSPacket, Logger, OPRFOperators, PrepareZKProofsBaseOpts, TOPRFProofParams, ZKOperators, ZKRevealInfo } from '../types';
5
5
  type PrepareZKProofsOpts = {
6
6
  logger?: Logger;
7
7
  cipherSuite: CipherSuite;
@@ -13,6 +13,7 @@ type ZKVerifyOpts = {
13
13
  logger?: Logger;
14
14
  /** get ZK operator for specified algorithm */
15
15
  zkOperators?: ZKOperators;
16
+ oprfOperators?: OPRFOperators;
16
17
  zkEngine?: ZKEngine;
17
18
  iv: Uint8Array;
18
19
  recordNumber: number;
@@ -22,6 +23,7 @@ type ZKProofToGenerate = {
22
23
  redactedPlaintext: Uint8Array;
23
24
  privateInput: PrivateInput;
24
25
  publicInput: PublicInput;
26
+ toprf?: TOPRFProofParams;
25
27
  };
26
28
  type ZKPacketToProve = {
27
29
  onGeneratedProofs(proofs: ZKProof[]): void;
@@ -29,22 +31,25 @@ type ZKPacketToProve = {
29
31
  proofsToGenerate: ZKProofToGenerate[];
30
32
  iv: Uint8Array;
31
33
  };
32
- export declare function makeZkProofGenerator({ zkOperators, logger, zkProofConcurrency, maxZkChunks, cipherSuite, zkEngine }: PrepareZKProofsOpts): Promise<{
34
+ export declare function makeZkProofGenerator({ zkOperators, oprfOperators, logger, zkProofConcurrency, maxZkChunks, cipherSuite, zkEngine }: PrepareZKProofsOpts): Promise<{
33
35
  /**
34
36
  * Adds the given packet to the list of packets to
35
37
  * generate ZK proofs for.
36
38
  *
37
39
  * Call `generateProofs()` to finally generate the proofs
38
40
  */
39
- addPacketToProve(packet: CompleteTLSPacket, reveal: ZKRevealInfo, onGeneratedProofs: ZKPacketToProve["onGeneratedProofs"]): Promise<void>;
41
+ addPacketToProve(packet: CompleteTLSPacket, { redactedPlaintext, toprfs }: ZKRevealInfo, onGeneratedProofs: ZKPacketToProve["onGeneratedProofs"]): Promise<void>;
40
42
  getTotalChunksToProve(): number;
41
43
  generateProofs(onChunkDone?: () => void): Promise<void>;
42
44
  }>;
43
45
  /**
44
46
  * Verify the given ZK proof
45
47
  */
46
- export declare function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators, logger, zkEngine, iv, recordNumber }: ZKVerifyOpts): Promise<{
47
- redactedPlaintext: Uint8Array;
48
+ export declare function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators, oprfOperators, logger, zkEngine, iv, recordNumber }: ZKVerifyOpts): Promise<{
49
+ redactedPlaintext: Uint8Array<ArrayBuffer>;
48
50
  }>;
49
51
  export declare function makeDefaultZkOperator(algorithm: EncryptionAlgorithm, zkEngine: ZKEngine, logger: Logger): ZKOperator;
52
+ export declare function makeDefaultOPRFOperator(algorithm: EncryptionAlgorithm, zkEngine: ZKEngine, logger: Logger): OPRFOperator;
53
+ export declare function getEngineString(engine: ZKProofEngine): "snarkjs" | "gnark";
54
+ export declare function getEngineProto(engine: ZKEngine): ZKProofEngine.ZK_ENGINE_SNARKJS | ZKProofEngine.ZK_ENGINE_GNARK;
50
55
  export {};
package/lib/utils/zk.js CHANGED
@@ -3,16 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makeZkProofGenerator = makeZkProofGenerator;
4
4
  exports.verifyZkPacket = verifyZkPacket;
5
5
  exports.makeDefaultZkOperator = makeDefaultZkOperator;
6
+ exports.makeDefaultOPRFOperator = makeDefaultOPRFOperator;
7
+ exports.getEngineString = getEngineString;
8
+ exports.getEngineProto = getEngineProto;
6
9
  const tls_1 = require("@reclaimprotocol/tls");
7
10
  const zk_symmetric_crypto_1 = require("@reclaimprotocol/zk-symmetric-crypto");
8
11
  const config_1 = require("../config");
12
+ const api_1 = require("../proto/api");
9
13
  const env_1 = require("../utils/env");
14
+ const error_1 = require("../utils/error");
10
15
  const generics_1 = require("../utils/generics");
11
16
  const logger_1 = require("../utils/logger");
12
17
  const redactions_1 = require("../utils/redactions");
13
18
  const ZK_CONCURRENCY = +((0, env_1.getEnvVariable)('ZK_CONCURRENCY')
14
19
  || config_1.DEFAULT_ZK_CONCURRENCY);
15
- async function makeZkProofGenerator({ zkOperators, logger = logger_1.logger, zkProofConcurrency = ZK_CONCURRENCY, maxZkChunks = config_1.MAX_ZK_CHUNKS, cipherSuite, zkEngine = 'snarkjs' }) {
20
+ async function makeZkProofGenerator({ zkOperators, oprfOperators, logger = logger_1.logger, zkProofConcurrency = ZK_CONCURRENCY, maxZkChunks = config_1.MAX_ZK_CHUNKS, cipherSuite, zkEngine = 'snarkjs' }) {
16
21
  const { default: PQueue } = await import('p-queue');
17
22
  const zkQueue = new PQueue({
18
23
  concurrency: zkProofConcurrency,
@@ -28,13 +33,13 @@ async function makeZkProofGenerator({ zkOperators, logger = logger_1.logger, zkP
28
33
  *
29
34
  * Call `generateProofs()` to finally generate the proofs
30
35
  */
31
- async addPacketToProve(packet, reveal, onGeneratedProofs) {
36
+ async addPacketToProve(packet, { redactedPlaintext, toprfs }, onGeneratedProofs) {
32
37
  if (packet.type === 'plaintext') {
33
38
  throw new Error('Cannot generate proof for plaintext');
34
39
  }
35
40
  const alg = (0, generics_1.getZkAlgorithmForCipherSuite)(cipherSuite);
36
41
  const chunkSizeBytes = getChunkSizeBytes(alg);
37
- const { redactedPlaintext } = reveal;
42
+ //const { redactedPlaintext } = reveal
38
43
  const key = await tls_1.crypto.exportKey(packet.encKey);
39
44
  const iv = packet.iv;
40
45
  const ciphertext = (0, generics_1.getPureCiphertext)(packet.ciphertext, cipherSuite);
@@ -43,26 +48,57 @@ async function makeZkProofGenerator({ zkOperators, logger = logger_1.logger, zkP
43
48
  onGeneratedProofs,
44
49
  algorithm: alg,
45
50
  proofsToGenerate: [],
46
- iv: packet.fixedIv
51
+ iv: packet.fixedIv,
47
52
  };
53
+ const chunksDone = new Set();
54
+ // first we'll handle all TOPRF blocks
55
+ // we do these first, because they can span multiple chunks
56
+ // & we need to be able to span the right chunks
57
+ for (const toprf of toprfs || []) {
58
+ const startChunk = Math.floor(toprf.dataLocation.fromIndex / chunkSizeBytes);
59
+ if (chunksDone.has(startChunk)) {
60
+ throw new error_1.AttestorError('ERROR_BAD_REQUEST', `Chunk ${startChunk} contains more than one TOPRF,`
61
+ + ' which is not supported');
62
+ }
63
+ addProofToGenerate(startChunk, {
64
+ ...toprf,
65
+ dataLocation: {
66
+ ...toprf.dataLocation,
67
+ fromIndex: toprf.dataLocation.fromIndex % chunkSizeBytes
68
+ }
69
+ });
70
+ }
48
71
  for (let i = 0; i < chunks; i++) {
49
- const proof = getProofGenerationParamsForChunk(alg, {
72
+ // ignore any TOPRF chunks
73
+ if (chunksDone.has(i)) {
74
+ continue;
75
+ }
76
+ addProofToGenerate(i);
77
+ }
78
+ // generate proofs in order of start index
79
+ packetToProve.proofsToGenerate
80
+ .sort((a, b) => a.startIdx - b.startIdx);
81
+ packetsToProve.push(packetToProve);
82
+ function addProofToGenerate(offsetChunks, toprf) {
83
+ chunksDone.add(offsetChunks);
84
+ const proofParams = getProofGenerationParamsForChunk(alg, {
50
85
  key,
51
86
  iv,
52
87
  ciphertext,
53
88
  redactedPlaintext,
54
- offsetChunks: i,
89
+ offsetChunks,
90
+ toprf,
55
91
  });
56
- if (!proof) {
57
- continue;
92
+ if (!proofParams) {
93
+ return;
58
94
  }
59
- packetToProve.proofsToGenerate.push(proof);
95
+ packetToProve.proofsToGenerate.push(proofParams);
60
96
  zkChunksToProve += 1;
61
97
  if (zkChunksToProve > maxZkChunks) {
62
- throw new Error(`Too many chunks to prove: ${zkChunksToProve} > ${maxZkChunks}`);
98
+ throw new Error('Too many chunks to prove:'
99
+ + ` ${zkChunksToProve} > ${maxZkChunks}`);
63
100
  }
64
101
  }
65
- packetsToProve.push(packetToProve);
66
102
  },
67
103
  getTotalChunksToProve() {
68
104
  return zkChunksToProve;
@@ -103,39 +139,60 @@ async function makeZkProofGenerator({ zkOperators, logger = logger_1.logger, zkP
103
139
  (_a = zkOperator.release) === null || _a === void 0 ? void 0 : _a.call(zkOperator);
104
140
  },
105
141
  };
106
- async function generateProofForChunk(algorithm, { startIdx, redactedPlaintext, privateInput, publicInput }) {
107
- const operator = await getZkOperatorForAlgorithm(algorithm);
142
+ async function generateProofForChunk(algorithm, { startIdx, redactedPlaintext, privateInput, publicInput, toprf, }) {
143
+ const operator = toprf
144
+ ? getOprfOperatorForAlgorithm(algorithm)
145
+ : getZkOperatorForAlgorithm(algorithm);
108
146
  const proof = await (0, zk_symmetric_crypto_1.generateProof)({
109
147
  algorithm,
110
148
  privateInput,
111
149
  publicInput,
112
150
  operator,
113
- logger
151
+ logger,
152
+ ...(toprf
153
+ ? {
154
+ toprf: {
155
+ pos: toprf.dataLocation.fromIndex,
156
+ len: toprf.dataLocation.length,
157
+ output: toprf.nullifier,
158
+ responses: toprf.responses,
159
+ domainSeparator: config_1.TOPRF_DOMAIN_SEPARATOR
160
+ },
161
+ mask: toprf.mask,
162
+ }
163
+ : {})
114
164
  });
115
165
  logger === null || logger === void 0 ? void 0 : logger.debug({ startIdx }, 'generated proof for chunk');
116
166
  return {
117
- proofJson: proof.proofJson,
167
+ // backwards compatibility
168
+ proofJson: '',
169
+ proofData: typeof proof.proofData === 'string'
170
+ ? (0, tls_1.strToUint8Array)(proof.proofData)
171
+ : proof.proofData,
172
+ toprf,
118
173
  decryptedRedactedCiphertext: proof.plaintext,
119
174
  redactedPlaintext,
120
175
  startIdx
121
176
  };
122
177
  }
123
- async function getZkOperatorForAlgorithm(algorithm) {
178
+ function getZkOperatorForAlgorithm(algorithm) {
124
179
  return (zkOperators === null || zkOperators === void 0 ? void 0 : zkOperators[algorithm])
125
- || await makeDefaultZkOperator(algorithm, zkEngine, logger);
180
+ || makeDefaultZkOperator(algorithm, zkEngine, logger);
181
+ }
182
+ function getOprfOperatorForAlgorithm(algorithm) {
183
+ return (oprfOperators === null || oprfOperators === void 0 ? void 0 : oprfOperators[algorithm])
184
+ || makeDefaultOPRFOperator(algorithm, zkEngine, logger);
126
185
  }
127
186
  }
128
187
  /**
129
188
  * Verify the given ZK proof
130
189
  */
131
- async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators, logger = logger_1.logger, zkEngine = 'snarkjs', iv, recordNumber }) {
190
+ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators, oprfOperators, logger = logger_1.logger, zkEngine = 'snarkjs', iv, recordNumber }) {
132
191
  if (!zkReveal) {
133
192
  throw new Error('No ZK reveal');
134
193
  }
135
194
  const { proofs } = zkReveal;
136
195
  const algorithm = (0, generics_1.getZkAlgorithmForCipherSuite)(cipherSuite);
137
- const operator = (zkOperators === null || zkOperators === void 0 ? void 0 : zkOperators[algorithm])
138
- || await makeDefaultZkOperator(algorithm, zkEngine, logger);
139
196
  const recordIV = (0, generics_1.getRecordIV)(ciphertext, cipherSuite);
140
197
  ciphertext = (0, generics_1.getPureCiphertext)(ciphertext, cipherSuite);
141
198
  /**
@@ -148,8 +205,18 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
148
205
  const realRedactedPlaintext = new Uint8Array(ciphertext.length).fill(redactions_1.REDACTION_CHAR_CODE);
149
206
  const alg = (0, generics_1.getZkAlgorithmForCipherSuite)(cipherSuite);
150
207
  const chunkSizeBytes = getChunkSizeBytes(alg);
151
- const { blocksPerChunk } = zk_symmetric_crypto_1.CONFIG[algorithm];
152
- await Promise.all(proofs.map(async ({ proofJson, decryptedRedactedCiphertext, redactedPlaintext, startIdx }, i) => {
208
+ await Promise.all(proofs.map(async (proof, i) => {
209
+ try {
210
+ await verifyProofPacket(proof);
211
+ }
212
+ catch (e) {
213
+ e.message += ` (chunk ${i}, startIdx ${proof.startIdx})`;
214
+ throw e;
215
+ }
216
+ }));
217
+ return { redactedPlaintext: realRedactedPlaintext };
218
+ async function verifyProofPacket({ proofData, proofJson, decryptedRedactedCiphertext, redactedPlaintext, startIdx, toprf, }) {
219
+ var _a, _b, _c;
153
220
  // get the ciphertext chunk we received from the server
154
221
  // the ZK library, will verify that the decrypted redacted
155
222
  // ciphertext matches the ciphertext received from the server
@@ -163,10 +230,30 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
163
230
  ciphertextChunk[i] = redactions_1.REDACTION_CHAR_CODE;
164
231
  }
165
232
  }
166
- if (!(0, redactions_1.isRedactionCongruent)(redactedPlaintext, decryptedRedactedCiphertext)) {
167
- throw new Error(`redacted ciphertext (${i}) not congruent`);
233
+ // redact OPRF indices -- because they'll incorrectly
234
+ // be marked as incongruent
235
+ let comparePlaintext = redactedPlaintext;
236
+ if (toprf) {
237
+ comparePlaintext = new Uint8Array(redactedPlaintext);
238
+ for (let i = 0; i < toprf.dataLocation.length; i++) {
239
+ comparePlaintext[i + toprf.dataLocation.fromIndex] = redactions_1.REDACTION_CHAR_CODE;
240
+ }
241
+ // the transcript will contain only the stringified
242
+ // nullifier. So here, we'll compare the provable
243
+ // binary nullifier with the stringified nullifier
244
+ // that the user has provided
245
+ const nulliferStr = (0, redactions_1.binaryHashToStr)(toprf.nullifier, toprf.dataLocation.length);
246
+ const txtHash = redactedPlaintext.slice((_a = toprf.dataLocation) === null || _a === void 0 ? void 0 : _a.fromIndex, ((_b = toprf.dataLocation) === null || _b === void 0 ? void 0 : _b.fromIndex)
247
+ + ((_c = toprf.dataLocation) === null || _c === void 0 ? void 0 : _c.length));
248
+ if ((0, generics_1.uint8ArrayToStr)(txtHash) !== nulliferStr
249
+ .slice(0, txtHash.length)) {
250
+ throw new Error('OPRF nullifier not congruent');
251
+ }
252
+ }
253
+ if (!(0, redactions_1.isRedactionCongruent)(comparePlaintext, decryptedRedactedCiphertext)) {
254
+ throw new Error('redacted ciphertext not congruent');
168
255
  }
169
- const chunkIndex = startIdx / chunkSizeBytes * blocksPerChunk;
256
+ const chunkIndex = startIdx / chunkSizeBytes;
170
257
  let nonce = (0, tls_1.concatenateUint8Arrays)([iv, recordIV]);
171
258
  if (!recordIV.length) {
172
259
  nonce = (0, tls_1.generateIV)(nonce, recordNumber);
@@ -174,26 +261,54 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
174
261
  await (0, zk_symmetric_crypto_1.verifyProof)({
175
262
  proof: {
176
263
  algorithm,
177
- proofJson,
264
+ proofData: proofData.length
265
+ ? proofData
266
+ : (0, tls_1.strToUint8Array)(proofJson),
178
267
  plaintext: decryptedRedactedCiphertext,
179
268
  },
180
- publicInput: { ciphertext: ciphertextChunk, iv: nonce, offset: chunkIndex },
181
- operator,
269
+ publicInput: {
270
+ ciphertext: ciphertextChunk,
271
+ iv: nonce,
272
+ offset: chunkIndex
273
+ },
182
274
  logger,
275
+ ...(toprf
276
+ ? {
277
+ operator: getOprfOperator(),
278
+ toprf: {
279
+ pos: toprf.dataLocation.fromIndex,
280
+ len: toprf.dataLocation.length,
281
+ domainSeparator: config_1.TOPRF_DOMAIN_SEPARATOR,
282
+ output: toprf.nullifier,
283
+ responses: toprf.responses,
284
+ }
285
+ }
286
+ : { operator: getZkOperator() })
183
287
  });
184
288
  logger === null || logger === void 0 ? void 0 : logger.debug({ startIdx, endIdx: startIdx + redactedPlaintext.length }, 'verified proof');
185
289
  realRedactedPlaintext.set(redactedPlaintext, startIdx);
186
- }));
187
- return { redactedPlaintext: realRedactedPlaintext };
290
+ }
291
+ function getZkOperator() {
292
+ return (zkOperators === null || zkOperators === void 0 ? void 0 : zkOperators[algorithm])
293
+ || makeDefaultZkOperator(algorithm, zkEngine, logger);
294
+ }
295
+ function getOprfOperator() {
296
+ return (oprfOperators === null || oprfOperators === void 0 ? void 0 : oprfOperators[algorithm])
297
+ || makeDefaultOPRFOperator(algorithm, zkEngine, logger);
298
+ }
188
299
  }
189
300
  function getChunkSizeBytes(alg) {
190
301
  const { chunkSize, bitsPerWord } = zk_symmetric_crypto_1.CONFIG[alg];
191
302
  return chunkSize * bitsPerWord / 8;
192
303
  }
193
304
  const zkEngines = {};
305
+ const oprfEngines = {};
194
306
  const operatorMakers = {
195
307
  'snarkjs': zk_symmetric_crypto_1.makeSnarkJsZKOperator,
196
- 'gnark': zk_symmetric_crypto_1.makeGnarkZkOperator
308
+ 'gnark': zk_symmetric_crypto_1.makeGnarkZkOperator,
309
+ };
310
+ const OPRF_OPERATOR_MAKERS = {
311
+ 'gnark': zk_symmetric_crypto_1.makeGnarkOPRFOperator
197
312
  };
198
313
  function makeDefaultZkOperator(algorithm, zkEngine, logger) {
199
314
  let zkOperators = zkEngines[zkEngine];
@@ -204,23 +319,62 @@ function makeDefaultZkOperator(algorithm, zkEngine, logger) {
204
319
  if (!zkOperators[algorithm]) {
205
320
  const isNode = (0, env_1.detectEnvironment)() === 'node';
206
321
  const opType = isNode ? 'local' : 'remote';
207
- logger === null || logger === void 0 ? void 0 : logger.info({
208
- type: opType,
209
- algorithm
210
- }, 'fetching zk operator');
322
+ logger === null || logger === void 0 ? void 0 : logger.info({ type: opType, algorithm }, 'fetching zk operator');
211
323
  const fetcher = opType === 'local'
212
324
  ? (0, zk_symmetric_crypto_1.makeLocalFileFetch)()
213
325
  : (0, zk_symmetric_crypto_1.makeRemoteFileFetch)({
214
326
  baseUrl: config_1.DEFAULT_REMOTE_FILE_FETCH_BASE_URL,
215
327
  });
216
- zkOperators[algorithm] = operatorMakers[zkEngine]({
217
- algorithm,
218
- fetcher
219
- });
328
+ const maker = operatorMakers[zkEngine];
329
+ if (!maker) {
330
+ throw new Error(`No ZK operator maker for ${zkEngine}`);
331
+ }
332
+ zkOperators[algorithm] = maker({ algorithm, fetcher });
220
333
  }
221
334
  return zkOperators[algorithm];
222
335
  }
223
- function getProofGenerationParamsForChunk(algorithm, { key, iv, ciphertext, redactedPlaintext, offsetChunks, }) {
336
+ function makeDefaultOPRFOperator(algorithm, zkEngine, logger) {
337
+ let operators = oprfEngines[zkEngine];
338
+ if (!operators) {
339
+ oprfEngines[zkEngine] = {};
340
+ operators = oprfEngines[zkEngine];
341
+ }
342
+ if (!operators[algorithm]) {
343
+ const isNode = (0, env_1.detectEnvironment)() === 'node';
344
+ const type = isNode ? 'local' : 'remote';
345
+ logger === null || logger === void 0 ? void 0 : logger.info({ type, algorithm }, 'fetching oprf operator');
346
+ const fetcher = type === 'local'
347
+ ? (0, zk_symmetric_crypto_1.makeLocalFileFetch)()
348
+ : (0, zk_symmetric_crypto_1.makeRemoteFileFetch)({
349
+ baseUrl: config_1.DEFAULT_REMOTE_FILE_FETCH_BASE_URL,
350
+ });
351
+ const maker = OPRF_OPERATOR_MAKERS[zkEngine];
352
+ if (!maker) {
353
+ throw new Error(`No OPRF operator maker for ${zkEngine}`);
354
+ }
355
+ operators[algorithm] = maker({ algorithm, fetcher });
356
+ }
357
+ return operators[algorithm];
358
+ }
359
+ function getEngineString(engine) {
360
+ if (engine === api_1.ZKProofEngine.ZK_ENGINE_GNARK) {
361
+ return 'gnark';
362
+ }
363
+ if (engine === api_1.ZKProofEngine.ZK_ENGINE_SNARKJS) {
364
+ return 'snarkjs';
365
+ }
366
+ throw new Error(`Unknown ZK engine: ${engine}`);
367
+ }
368
+ function getEngineProto(engine) {
369
+ if (engine === 'gnark') {
370
+ return api_1.ZKProofEngine.ZK_ENGINE_GNARK;
371
+ }
372
+ if (engine === 'snarkjs') {
373
+ return api_1.ZKProofEngine.ZK_ENGINE_SNARKJS;
374
+ }
375
+ throw new Error(`Unknown ZK engine: ${engine}`);
376
+ }
377
+ function getProofGenerationParamsForChunk(algorithm, { key, iv, ciphertext, redactedPlaintext, offsetChunks, toprf, }) {
224
378
  const chunkSize = getChunkSizeBytes(algorithm);
225
379
  const startIdx = offsetChunks * chunkSize;
226
380
  const endIdx = (offsetChunks + 1) * chunkSize;
@@ -244,7 +398,8 @@ function getProofGenerationParamsForChunk(algorithm, { key, iv, ciphertext, reda
244
398
  startIdx,
245
399
  redactedPlaintext: plaintextChunk,
246
400
  privateInput: { key },
247
- publicInput: { ciphertext: ciphertextChunk, iv, offset: offsetChunks }
401
+ publicInput: { ciphertext: ciphertextChunk, iv, offset: offsetChunks },
402
+ toprf
248
403
  };
249
404
  }
250
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zk.js","sourceRoot":"","sources":["../../src/utils/zk.ts"],"names":[],"mappings":"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"}
405
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zk.js","sourceRoot":"","sources":["../../src/utils/zk.ts"],"names":[],"mappings":"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"}