@reclaimprotocol/attestor-core 3.1.1 → 4.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/avs/contracts/index.js +18 -8
- package/lib/avs/tests/test.operator.js +4 -4
- package/lib/avs/utils/tasks.d.ts +1 -1
- package/lib/client/create-claim.d.ts +2 -2
- package/lib/client/create-claim.js +100 -34
- package/lib/client/tunnels/make-rpc-tcp-tunnel.js +3 -3
- package/lib/client/tunnels/make-rpc-tls-tunnel.js +3 -3
- package/lib/client/utils/client-socket.d.ts +3 -1
- package/lib/client/utils/client-socket.js +25 -8
- package/lib/client/utils/message-handler.js +2 -2
- package/lib/config/index.d.ts +9 -2
- package/lib/config/index.js +10 -4
- package/lib/index.js +18 -8
- package/lib/proto/api.d.ts +81 -2
- package/lib/proto/api.js +859 -101
- package/lib/providers/http/index.js +220 -116
- package/lib/providers/http/utils.d.ts +3 -6
- package/lib/providers/http/utils.js +13 -11
- package/lib/providers/index.js +1 -3
- package/lib/scripts/check-avs-registration.js +2 -2
- package/lib/scripts/generate-provider-types.js +2 -2
- package/lib/scripts/generate-receipt.js +6 -3
- package/lib/scripts/generate-toprf-keys.d.ts +1 -0
- package/lib/scripts/generate-toprf-keys.js +23 -0
- package/lib/scripts/register-avs-operator.js +2 -2
- package/lib/scripts/start-server.js +10 -3
- package/lib/scripts/update-avs-metadata.js +2 -2
- package/lib/scripts/verify-root-ca.js +2 -2
- package/lib/scripts/whitelist-operator.js +2 -2
- package/lib/server/create-server.js +14 -7
- package/lib/server/handlers/claimTunnel.js +34 -11
- package/lib/server/handlers/createTunnel.js +45 -9
- package/lib/server/handlers/disconnectTunnel.js +2 -2
- package/lib/server/handlers/index.js +4 -2
- package/lib/server/handlers/init.js +17 -2
- package/lib/server/handlers/toprf.d.ts +2 -0
- package/lib/server/handlers/toprf.js +21 -0
- package/lib/server/socket.d.ts +5 -3
- package/lib/server/socket.js +28 -8
- package/lib/server/tunnels/make-tcp-tunnel.js +22 -29
- package/lib/server/utils/apm.js +9 -5
- package/lib/server/utils/assert-valid-claim-request.d.ts +3 -3
- package/lib/server/utils/assert-valid-claim-request.js +27 -16
- package/lib/server/utils/dns.d.ts +1 -0
- package/lib/server/utils/dns.js +22 -0
- package/lib/server/utils/generics.d.ts +1 -1
- package/lib/tests/describe-with-server.d.ts +0 -2
- package/lib/tests/describe-with-server.js +1 -4
- package/lib/tests/mock-provider-server.d.ts +1 -1
- package/lib/tests/test.auth.d.ts +1 -0
- package/lib/tests/test.auth.js +75 -0
- package/lib/tests/test.bgp-listener.d.ts +1 -0
- package/lib/tests/test.bgp-listener.js +169 -0
- package/lib/tests/test.claim-creation.js +101 -8
- package/lib/tests/test.http-parser.d.ts +1 -1
- package/lib/tests/test.http-parser.js +7 -5
- package/lib/tests/test.http-provider-utils.js +489 -211
- package/lib/tests/test.http-provider.js +77 -6
- package/lib/tests/test.rpc-tunnel.js +10 -6
- package/lib/tests/test.zk.d.ts +1 -1
- package/lib/tests/test.zk.js +180 -12
- package/lib/tests/utils.d.ts +6 -0
- package/lib/tests/utils.js +16 -1
- package/lib/types/bgp.d.ts +11 -0
- package/lib/types/bgp.js +3 -0
- package/lib/types/claims.d.ts +14 -5
- package/lib/types/client.d.ts +30 -3
- package/lib/types/general.d.ts +12 -0
- package/lib/types/handlers.d.ts +4 -4
- package/lib/types/index.d.ts +1 -0
- package/lib/types/index.js +2 -1
- package/lib/types/providers.d.ts +25 -10
- package/lib/types/providers.gen.d.ts +14 -155
- package/lib/types/providers.gen.js +2 -6
- package/lib/types/tunnel.d.ts +2 -2
- package/lib/types/zk.d.ts +11 -3
- package/lib/utils/auth.d.ts +7 -0
- package/lib/utils/auth.js +64 -0
- package/lib/utils/b64-json.d.ts +2 -0
- package/lib/utils/b64-json.js +23 -0
- package/lib/utils/bgp-listener.d.ts +7 -0
- package/lib/utils/bgp-listener.js +126 -0
- package/lib/utils/claims.js +3 -3
- package/lib/utils/generics.d.ts +5 -5
- package/lib/utils/generics.js +3 -3
- package/lib/utils/http-parser.d.ts +4 -0
- package/lib/utils/http-parser.js +4 -2
- package/lib/utils/index.d.ts +2 -0
- package/lib/utils/index.js +3 -1
- package/lib/utils/redactions.d.ts +19 -6
- package/lib/utils/redactions.js +41 -4
- package/lib/utils/socket-base.d.ts +3 -2
- package/lib/utils/socket-base.js +7 -2
- package/lib/utils/ws.d.ts +5 -5
- package/lib/utils/ws.js +27 -10
- package/lib/utils/zk.d.ts +12 -7
- package/lib/utils/zk.js +261 -67
- package/lib/window-rpc/setup-window-rpc.js +29 -8
- package/lib/window-rpc/types.d.ts +16 -21
- package/lib/window-rpc/utils.d.ts +2 -1
- package/lib/window-rpc/utils.js +28 -2
- package/lib/window-rpc/window-rpc-zk.d.ts +8 -3
- package/lib/window-rpc/window-rpc-zk.js +58 -45
- package/package.json +25 -22
- package/lib/providers/httpb64/index.d.ts +0 -3
- package/lib/providers/httpb64/index.js +0 -209
- package/lib/providers/httpb64/utils.d.ts +0 -77
- package/lib/providers/httpb64/utils.js +0 -358
- package/lib/server/utils/verify-server-certificates.d.ts +0 -7
- package/lib/server/utils/verify-server-certificates.js +0 -101
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const client_1 = require("../client");
|
|
4
4
|
const describe_with_server_1 = require("../tests/describe-with-server");
|
|
5
5
|
const utils_1 = require("../tests/utils");
|
|
6
|
+
const utils_2 = require("../utils");
|
|
6
7
|
jest.setTimeout(300000);
|
|
7
8
|
(0, describe_with_server_1.describeWithServer)('HTTP Provider', opts => {
|
|
8
9
|
afterEach(async () => {
|
|
@@ -13,19 +14,89 @@ jest.setTimeout(300000);
|
|
|
13
14
|
const resp = await (0, client_1.createClaimOnAttestor)({
|
|
14
15
|
name: 'http',
|
|
15
16
|
params: {
|
|
16
|
-
url: 'https://
|
|
17
|
+
url: 'https://news.ycombinator.{{param1}}/{{param6}}?token={{param4}}&token1={{param5}}',
|
|
17
18
|
method: 'GET',
|
|
18
19
|
responseMatches: [{
|
|
19
20
|
type: 'regex',
|
|
20
|
-
value: '<title.*?(?<domain>{{param2}}
|
|
21
|
+
value: '<title.*?(?<domain>{{param2}})<\\/title>',
|
|
21
22
|
}],
|
|
22
23
|
responseRedactions: [{
|
|
23
24
|
xPath: './html/head/{{param3}}',
|
|
24
25
|
}],
|
|
25
26
|
paramValues: {
|
|
26
27
|
param1: 'com',
|
|
27
|
-
param2: '
|
|
28
|
-
param3: 'title'
|
|
28
|
+
param2: 'Top Links | Hacker News',
|
|
29
|
+
param3: 'title',
|
|
30
|
+
}
|
|
31
|
+
},
|
|
32
|
+
secretParams: {
|
|
33
|
+
cookieStr: '<cookie-str>',
|
|
34
|
+
paramValues: {
|
|
35
|
+
param4: 'quhrfqiuherfqlireufh',
|
|
36
|
+
param5: 'sssbbbbr123',
|
|
37
|
+
param6: 'best',
|
|
38
|
+
}
|
|
39
|
+
},
|
|
40
|
+
ownerPrivateKey: opts.privateKeyHex,
|
|
41
|
+
client: opts.client,
|
|
42
|
+
zkEngine: 'gnark'
|
|
43
|
+
});
|
|
44
|
+
expect(resp.error).toBeUndefined();
|
|
45
|
+
expect((_a = resp.claim) === null || _a === void 0 ? void 0 : _a.context)
|
|
46
|
+
.toContain('0x5e3e976476ded7b58120d606b33b75be52adb8345a7979c181764f00763e7b2a');
|
|
47
|
+
});
|
|
48
|
+
it('should create claim with OPRF template params', async () => {
|
|
49
|
+
const resp = await (0, client_1.createClaimOnAttestor)({
|
|
50
|
+
name: 'http',
|
|
51
|
+
params: {
|
|
52
|
+
url: 'https://example.com/',
|
|
53
|
+
method: 'GET',
|
|
54
|
+
responseMatches: [
|
|
55
|
+
{
|
|
56
|
+
type: 'contains',
|
|
57
|
+
value: '<title>{{domain}}</title>',
|
|
58
|
+
}
|
|
59
|
+
],
|
|
60
|
+
responseRedactions: [
|
|
61
|
+
{
|
|
62
|
+
xPath: '/html/head/title',
|
|
63
|
+
regex: '<title>(?<domain>.*?)<\\/title>',
|
|
64
|
+
hash: 'oprf'
|
|
65
|
+
}
|
|
66
|
+
],
|
|
67
|
+
paramValues: { domain: 'Example Domain' }
|
|
68
|
+
},
|
|
69
|
+
secretParams: {
|
|
70
|
+
cookieStr: '<cookie-str>'
|
|
71
|
+
},
|
|
72
|
+
ownerPrivateKey: opts.privateKeyHex,
|
|
73
|
+
client: opts.client,
|
|
74
|
+
zkEngine: 'gnark',
|
|
75
|
+
});
|
|
76
|
+
expect(resp.error).toBeUndefined();
|
|
77
|
+
const ctx = JSON.parse(resp.claim.context);
|
|
78
|
+
const domainStr = ctx.extractedParameters.domain;
|
|
79
|
+
const toprf = (0, utils_1.getFirstTOprfBlock)(resp.request);
|
|
80
|
+
expect(toprf).toBeTruthy();
|
|
81
|
+
const toprfStr = (0, utils_2.binaryHashToStr)(toprf.nullifier, toprf.dataLocation.length);
|
|
82
|
+
expect(domainStr).toEqual(toprfStr.slice(0, domainStr.length));
|
|
83
|
+
});
|
|
84
|
+
it('should create claim with non 200 response', async () => {
|
|
85
|
+
var _a;
|
|
86
|
+
const resp = await (0, client_1.createClaimOnAttestor)({
|
|
87
|
+
name: 'http',
|
|
88
|
+
params: {
|
|
89
|
+
url: 'https://httpstat.us/201',
|
|
90
|
+
method: 'GET',
|
|
91
|
+
responseMatches: [{
|
|
92
|
+
type: 'contains',
|
|
93
|
+
value: 'Created',
|
|
94
|
+
}],
|
|
95
|
+
responseRedactions: [{
|
|
96
|
+
jsonPath: '$.description',
|
|
97
|
+
}],
|
|
98
|
+
headers: {
|
|
99
|
+
accept: 'application/json, text/plain, */*'
|
|
29
100
|
}
|
|
30
101
|
},
|
|
31
102
|
secretParams: {
|
|
@@ -37,7 +108,7 @@ jest.setTimeout(300000);
|
|
|
37
108
|
});
|
|
38
109
|
expect(resp.error).toBeUndefined();
|
|
39
110
|
expect((_a = resp.claim) === null || _a === void 0 ? void 0 : _a.context)
|
|
40
|
-
.toContain('
|
|
111
|
+
.toContain('0xd18ff964dfce6a3074791ec6a6c358f7f122c838b01c3e0565b33eac29515bc6');
|
|
41
112
|
});
|
|
42
113
|
});
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5odHRwLXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RzL3Rlc3QuaHR0cC1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHVDQUFrRDtBQUNsRCx5RUFBbUU7QUFDbkUsMkNBQStFO0FBQy9FLHFDQUEyQztBQUUzQyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU8sQ0FBQyxDQUFBO0FBRXhCLElBQUEseUNBQWtCLEVBQUMsZUFBZSxFQUFFLElBQUksQ0FBQyxFQUFFO0lBRTFDLFNBQVMsQ0FBQyxLQUFLLElBQUcsRUFBRTtRQUNuQixNQUFNLElBQUEsaUNBQXlCLEdBQUUsQ0FBQTtJQUNsQyxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQywwQ0FBMEMsRUFBRSxLQUFLLElBQUcsRUFBRTs7UUFDeEQsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFBLDhCQUFxQixFQUFDO1lBQ3hDLElBQUksRUFBRSxNQUFNO1lBQ1osTUFBTSxFQUFFO2dCQUNQLEdBQUcsRUFBRSxtRkFBbUY7Z0JBQ3hGLE1BQU0sRUFBRSxLQUFLO2dCQUNiLGVBQWUsRUFBRSxDQUFDO3dCQUNqQixJQUFJLEVBQUUsT0FBTzt3QkFDYixLQUFLLEVBQUUsMENBQTBDO3FCQUNqRCxDQUFDO2dCQUNGLGtCQUFrQixFQUFFLENBQUM7d0JBQ3BCLEtBQUssRUFBRSx3QkFBd0I7cUJBQy9CLENBQUM7Z0JBQ0YsV0FBVyxFQUFFO29CQUNaLE1BQU0sRUFBRSxLQUFLO29CQUNiLE1BQU0sRUFBRSx5QkFBeUI7b0JBQ2pDLE1BQU0sRUFBRSxPQUFPO2lCQUVmO2FBQ0Q7WUFDRCxZQUFZLEVBQUU7Z0JBQ2IsU0FBUyxFQUFFLGNBQWM7Z0JBQ3pCLFdBQVcsRUFBRTtvQkFDWixNQUFNLEVBQUUsc0JBQXNCO29CQUM5QixNQUFNLEVBQUUsYUFBYTtvQkFDckIsTUFBTSxFQUFFLE1BQU07aUJBQ2Q7YUFDRDtZQUNELGVBQWUs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
|
|
@@ -32,7 +32,7 @@ const utils_2 = require("../utils");
|
|
|
32
32
|
// check that the server actually closed the tunnel
|
|
33
33
|
// upon our request
|
|
34
34
|
await expect(socketTunnel === null || socketTunnel === void 0 ? void 0 : socketTunnel.write(Buffer.from('hello'))).rejects.toMatchObject({
|
|
35
|
-
code: '
|
|
35
|
+
code: 'ERR_STREAM_DESTROYED'
|
|
36
36
|
});
|
|
37
37
|
});
|
|
38
38
|
describe('TLS', () => {
|
|
@@ -49,7 +49,8 @@ const utils_2 = require("../utils");
|
|
|
49
49
|
},
|
|
50
50
|
logger: client.logger,
|
|
51
51
|
connect(initMessages) {
|
|
52
|
-
client.sendMessage(...initMessages)
|
|
52
|
+
client.sendMessage(...initMessages)
|
|
53
|
+
.catch(() => { });
|
|
53
54
|
// ensure that the client hello message
|
|
54
55
|
// was sent to the server along the
|
|
55
56
|
// "createTunnel" request -- that saves
|
|
@@ -103,7 +104,8 @@ const utils_2 = require("../utils");
|
|
|
103
104
|
},
|
|
104
105
|
logger: client.logger,
|
|
105
106
|
connect(initMessages) {
|
|
106
|
-
client.sendMessage(...initMessages)
|
|
107
|
+
client.sendMessage(...initMessages)
|
|
108
|
+
.catch(() => { });
|
|
107
109
|
return client;
|
|
108
110
|
},
|
|
109
111
|
onClose(err) {
|
|
@@ -133,7 +135,8 @@ const utils_2 = require("../utils");
|
|
|
133
135
|
},
|
|
134
136
|
logger: client.logger,
|
|
135
137
|
connect(initMessages) {
|
|
136
|
-
client.sendMessage(...initMessages)
|
|
138
|
+
client.sendMessage(...initMessages)
|
|
139
|
+
.catch(() => { });
|
|
137
140
|
return client;
|
|
138
141
|
},
|
|
139
142
|
})).rejects.toMatchObject({
|
|
@@ -156,7 +159,8 @@ const utils_2 = require("../utils");
|
|
|
156
159
|
},
|
|
157
160
|
logger: client.logger,
|
|
158
161
|
connect(initMessages) {
|
|
159
|
-
client.sendMessage(...initMessages)
|
|
162
|
+
client.sendMessage(...initMessages)
|
|
163
|
+
.catch(() => { });
|
|
160
164
|
return client;
|
|
161
165
|
},
|
|
162
166
|
})).rejects.toMatchObject({
|
|
@@ -165,4 +169,4 @@ const utils_2 = require("../utils");
|
|
|
165
169
|
});
|
|
166
170
|
});
|
|
167
171
|
});
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
172
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5ycGMtdHVubmVsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RzL3Rlc3QucnBjLXR1bm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHVDQUEyQztBQUMzQyxnRkFBeUU7QUFDekUsZ0ZBQXlFO0FBQ3pFLHlFQUFtRTtBQUNuRSwyQ0FBdUM7QUFDdkMscUNBQWtDO0FBR2xDLElBQUEseUNBQWtCLEVBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxFQUFFO0lBRXZDLE1BQU0sRUFBRSxlQUFlLEVBQUUsaUJBQWlCLEVBQUUsR0FBRyxJQUFJLENBQUE7SUFFbkQsSUFBSSxNQUFzQixDQUFBO0lBQzFCLFVBQVUsQ0FBQyxLQUFLLElBQUcsRUFBRTtRQUNwQixNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQTtJQUNyQixDQUFDLENBQUMsQ0FBQTtJQUVGLFNBQVMsQ0FBQyxLQUFLLElBQUcsRUFBRTtRQUNuQixNQUFNLE1BQU0sQ0FBQyxtQkFBbUIsRUFBRSxDQUFBO0lBQ25DLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDJDQUEyQyxFQUFFLEtBQUssSUFBRyxFQUFFO1FBQ3pELG9DQUFvQztRQUNwQyx3QkFBd0I7UUFDeEIsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFBLHNDQUFnQixFQUFDLEVBQUUsUUFBUSxFQUFFLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFBO1FBQzlELE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FDZixjQUFjLEVBQ2Q7WUFDQyxFQUFFLEVBQUUsQ0FBQztZQUNMLElBQUksRUFBRSxXQUFXO1lBQ2pCLElBQUksRUFBRSxJQUFJLENBQUMsbUJBQW1CO1lBQzlCLFdBQVcsRUFBRSxFQUFFO1NBQ2YsQ0FDRCxDQUFBO1FBRUQsTUFBTSxFQUFFLEdBQUcsaUJBQWlCLEVBQUUsQ0FBQTtRQUM5QixNQUFNLFlBQVksR0FBRyxFQUFFLGFBQUYsRUFBRSx1QkFBRixFQUFFLENB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
|
package/lib/tests/test.zk.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
import '../server/utils/config-env';
|
package/lib/tests/test.zk.js
CHANGED
|
@@ -1,7 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
const tls_1 = require("@reclaimprotocol/tls");
|
|
7
|
+
const assert_1 = __importDefault(require("assert"));
|
|
8
|
+
const config_1 = require("../config");
|
|
9
|
+
const api_1 = require("../proto/api");
|
|
10
|
+
const toprf_1 = require("../server/handlers/toprf");
|
|
4
11
|
const utils_1 = require("../utils");
|
|
12
|
+
require("../server/utils/config-env");
|
|
5
13
|
const ZK_CIPHER_SUITES = [
|
|
6
14
|
'TLS_CHACHA20_POLY1305_SHA256',
|
|
7
15
|
'TLS_AES_128_GCM_SHA256',
|
|
@@ -12,8 +20,8 @@ const ZK_ENGINES = [
|
|
|
12
20
|
'snarkjs'
|
|
13
21
|
];
|
|
14
22
|
jest.setTimeout(90000); // 90s
|
|
15
|
-
describe('
|
|
16
|
-
it('should correctly redact blocks', () => {
|
|
23
|
+
describe('Redaction Tests', () => {
|
|
24
|
+
it('should correctly redact blocks', async () => {
|
|
17
25
|
const vectors = [
|
|
18
26
|
{
|
|
19
27
|
input: [
|
|
@@ -65,7 +73,9 @@ describe('ZK Tests', () => {
|
|
|
65
73
|
}
|
|
66
74
|
];
|
|
67
75
|
for (const { input, output, redactions } of vectors) {
|
|
68
|
-
const realOutput = (0, utils_1.getBlocksToReveal)(input.map(i => ({ plaintext: Buffer.from(i) })), () => redactions)
|
|
76
|
+
const realOutput = await (0, utils_1.getBlocksToReveal)(input.map(i => ({ plaintext: Buffer.from(i) })), () => redactions, () => {
|
|
77
|
+
throw new Error('should not call this');
|
|
78
|
+
});
|
|
69
79
|
if (realOutput === 'all') {
|
|
70
80
|
fail('should not return "all"');
|
|
71
81
|
continue;
|
|
@@ -76,9 +86,171 @@ describe('ZK Tests', () => {
|
|
|
76
86
|
}
|
|
77
87
|
}
|
|
78
88
|
});
|
|
89
|
+
it('should correctly hash blocks', async () => {
|
|
90
|
+
const nullifer = (0, tls_1.strToUint8Array)('abcdefg');
|
|
91
|
+
const base64Nullifier = Buffer.from(nullifer).toString('base64');
|
|
92
|
+
const vectors = [
|
|
93
|
+
{
|
|
94
|
+
input: [
|
|
95
|
+
'hell',
|
|
96
|
+
'o world'
|
|
97
|
+
],
|
|
98
|
+
output: [
|
|
99
|
+
'h' + base64Nullifier.slice(0, 3),
|
|
100
|
+
base64Nullifier.slice(3, 4) + ' world'
|
|
101
|
+
],
|
|
102
|
+
redactions: [
|
|
103
|
+
{ fromIndex: 1, toIndex: 5, hash: 'oprf' }
|
|
104
|
+
]
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
input: [
|
|
108
|
+
'hell',
|
|
109
|
+
'o world'
|
|
110
|
+
],
|
|
111
|
+
output: [
|
|
112
|
+
base64Nullifier.slice(0, 4),
|
|
113
|
+
base64Nullifier.slice(4, 5) + ' world'
|
|
114
|
+
],
|
|
115
|
+
redactions: [
|
|
116
|
+
{ fromIndex: 0, toIndex: 5, hash: 'oprf' }
|
|
117
|
+
]
|
|
118
|
+
},
|
|
119
|
+
];
|
|
120
|
+
for (const { input, output, redactions } of vectors) {
|
|
121
|
+
const realOutput = await (0, utils_1.getBlocksToReveal)(input.map(i => ({ plaintext: Buffer.from(i) })), () => redactions, async () => ({
|
|
122
|
+
dataLocation: undefined,
|
|
123
|
+
nullifier: nullifer,
|
|
124
|
+
responses: [],
|
|
125
|
+
mask: (0, tls_1.strToUint8Array)('mask'),
|
|
126
|
+
plaintext: (0, tls_1.strToUint8Array)('abcdefg')
|
|
127
|
+
}));
|
|
128
|
+
if (realOutput === 'all') {
|
|
129
|
+
fail('should not return "all"');
|
|
130
|
+
}
|
|
131
|
+
expect(realOutput).toHaveLength(output.length);
|
|
132
|
+
for (const [i, element] of output.entries()) {
|
|
133
|
+
expect((0, utils_1.uint8ArrayToStr)(realOutput[i].redactedPlaintext)).toEqual(element);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
});
|
|
138
|
+
describe('OPRF Slicing Tests', () => {
|
|
139
|
+
const cipherSuite = 'TLS_CHACHA20_POLY1305_SHA256';
|
|
140
|
+
const alg = 'CHACHA20-POLY1305';
|
|
141
|
+
const zkEngine = 'gnark';
|
|
142
|
+
const keylength = 32;
|
|
143
|
+
it('should correctly demarcate blocks for OPRF', async () => {
|
|
144
|
+
var _a, _b;
|
|
145
|
+
const plaintext = `lorem ipsum dolor sit amet, consectetur adipiscing elit,
|
|
146
|
+
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
|
|
147
|
+
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
|
|
148
|
+
nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
|
|
149
|
+
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
|
|
150
|
+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim
|
|
151
|
+
id est laborum`;
|
|
152
|
+
const vectors = [
|
|
153
|
+
{
|
|
154
|
+
plaintext: plaintext,
|
|
155
|
+
redactions: [
|
|
156
|
+
{ fromIndex: 0, toIndex: 35, hash: 'oprf' },
|
|
157
|
+
]
|
|
158
|
+
},
|
|
159
|
+
{
|
|
160
|
+
plaintext: plaintext,
|
|
161
|
+
redactions: [
|
|
162
|
+
{ fromIndex: 128, toIndex: 138, hash: 'oprf' },
|
|
163
|
+
]
|
|
164
|
+
},
|
|
165
|
+
{
|
|
166
|
+
plaintext: plaintext,
|
|
167
|
+
redactions: [
|
|
168
|
+
{ fromIndex: 125, toIndex: 135, hash: 'oprf' },
|
|
169
|
+
]
|
|
170
|
+
}
|
|
171
|
+
];
|
|
172
|
+
const key = Buffer.alloc(keylength, 0);
|
|
173
|
+
key[0] = 1;
|
|
174
|
+
key[3] = 4;
|
|
175
|
+
const { ivLength: fixedIvLength, } = tls_1.SUPPORTED_CIPHER_SUITE_MAP[cipherSuite];
|
|
176
|
+
const fixedIv = Buffer.alloc(fixedIvLength, 0);
|
|
177
|
+
fixedIv[0] = 1;
|
|
178
|
+
fixedIv[3] = 4;
|
|
179
|
+
const encKey = await tls_1.crypto.importKey(alg, key);
|
|
180
|
+
for (const [i, { plaintext, redactions }] of vectors.entries()) {
|
|
181
|
+
const plaintextArr = Buffer.from(plaintext);
|
|
182
|
+
const { ciphertext, iv } = await (0, tls_1.encryptWrappedRecord)(plaintextArr, {
|
|
183
|
+
key: encKey,
|
|
184
|
+
iv: fixedIv,
|
|
185
|
+
recordNumber: 1234,
|
|
186
|
+
recordHeaderOpts: { type: 'WRAPPED_RECORD' },
|
|
187
|
+
cipherSuite,
|
|
188
|
+
version: cipherSuite.includes('ECDHE_')
|
|
189
|
+
? 'TLS1_2'
|
|
190
|
+
: 'TLS1_3',
|
|
191
|
+
});
|
|
192
|
+
const packet = {
|
|
193
|
+
type: 'ciphertext',
|
|
194
|
+
encKey,
|
|
195
|
+
iv,
|
|
196
|
+
recordNumber: 1234,
|
|
197
|
+
plaintext: plaintextArr,
|
|
198
|
+
ciphertext,
|
|
199
|
+
fixedIv: fixedIv,
|
|
200
|
+
data: ciphertext
|
|
201
|
+
};
|
|
202
|
+
const blocksToReveal = await (0, utils_1.getBlocksToReveal)([packet], () => redactions, performOprf);
|
|
203
|
+
(0, assert_1.default)(blocksToReveal !== 'all');
|
|
204
|
+
expect(blocksToReveal).toHaveLength(1);
|
|
205
|
+
expect(blocksToReveal[0].toprfs).toBeTruthy();
|
|
206
|
+
const revealsMap = new Map();
|
|
207
|
+
revealsMap.set(packet, {
|
|
208
|
+
type: 'zk',
|
|
209
|
+
redactedPlaintext: blocksToReveal[0].redactedPlaintext,
|
|
210
|
+
toprfs: blocksToReveal[0].toprfs
|
|
211
|
+
});
|
|
212
|
+
const revealedMessages = await (0, utils_1.preparePacketsForReveal)([{ sender: 'server', message: packet }], revealsMap, {
|
|
213
|
+
logger: utils_1.logger,
|
|
214
|
+
cipherSuite: cipherSuite,
|
|
215
|
+
zkEngine: zkEngine,
|
|
216
|
+
});
|
|
217
|
+
const proofs = (_b = (_a = revealedMessages[0].reveal) === null || _a === void 0 ? void 0 : _a.zkReveal) === null || _b === void 0 ? void 0 : _b.proofs;
|
|
218
|
+
expect(proofs === null || proofs === void 0 ? void 0 : proofs.length).toBeTruthy();
|
|
219
|
+
const x = await (0, utils_1.verifyZkPacket)({
|
|
220
|
+
ciphertext,
|
|
221
|
+
zkReveal: { proofs: proofs },
|
|
222
|
+
logger: utils_1.logger,
|
|
223
|
+
cipherSuite,
|
|
224
|
+
zkEngine: zkEngine,
|
|
225
|
+
recordNumber: 1234,
|
|
226
|
+
iv: fixedIv
|
|
227
|
+
});
|
|
228
|
+
expect(x.redactedPlaintext).toEqual(blocksToReveal[0].redactedPlaintext);
|
|
229
|
+
console.log(`done: ${i + 1}/${vectors.length}`);
|
|
230
|
+
}
|
|
231
|
+
});
|
|
232
|
+
async function performOprf(plaintext) {
|
|
233
|
+
utils_1.logger.info({ length: plaintext.length }, 'generating OPRF...');
|
|
234
|
+
const oprfOperator = (0, utils_1.makeDefaultOPRFOperator)('chacha20', zkEngine, utils_1.logger);
|
|
235
|
+
const reqData = await oprfOperator.generateOPRFRequestData(plaintext, config_1.TOPRF_DOMAIN_SEPARATOR, utils_1.logger);
|
|
236
|
+
const res = await (0, toprf_1.toprf)({
|
|
237
|
+
maskedData: reqData.maskedData,
|
|
238
|
+
engine: api_1.ZKProofEngine.ZK_ENGINE_GNARK
|
|
239
|
+
}, { logger: utils_1.logger });
|
|
240
|
+
const nullifier = await oprfOperator.finaliseOPRF(res.publicKeyShare, reqData, [res]);
|
|
241
|
+
const data = {
|
|
242
|
+
nullifier,
|
|
243
|
+
responses: [res],
|
|
244
|
+
mask: reqData.mask,
|
|
245
|
+
dataLocation: undefined,
|
|
246
|
+
plaintext
|
|
247
|
+
};
|
|
248
|
+
return data;
|
|
249
|
+
}
|
|
79
250
|
});
|
|
80
251
|
describe.each(ZK_CIPHER_SUITES)('[%s] should generate ZK proof for some ciphertext', (cipherSuite) => {
|
|
81
252
|
describe.each(ZK_ENGINES)('[%s]', (zkEngine) => {
|
|
253
|
+
const zkProofConcurrency = zkEngine === 'snarkjs' ? 1 : undefined;
|
|
82
254
|
it(zkEngine + '-' + cipherSuite, async () => {
|
|
83
255
|
const alg = cipherSuite.includes('CHACHA20')
|
|
84
256
|
? 'CHACHA20-POLY1305'
|
|
@@ -117,7 +289,8 @@ describe.each(ZK_CIPHER_SUITES)('[%s] should generate ZK proof for some cipherte
|
|
|
117
289
|
const proofGenerator = await (0, utils_1.makeZkProofGenerator)({
|
|
118
290
|
logger: utils_1.logger,
|
|
119
291
|
cipherSuite,
|
|
120
|
-
zkEngine
|
|
292
|
+
zkEngine,
|
|
293
|
+
zkProofConcurrency,
|
|
121
294
|
});
|
|
122
295
|
for (const { plaintext, redactions } of vectors) {
|
|
123
296
|
const plaintextArr = Buffer.from(plaintext);
|
|
@@ -128,9 +301,7 @@ describe.each(ZK_CIPHER_SUITES)('[%s] should generate ZK proof for some cipherte
|
|
|
128
301
|
key: encKey,
|
|
129
302
|
iv: fixedIv,
|
|
130
303
|
recordNumber: 1234,
|
|
131
|
-
recordHeaderOpts: {
|
|
132
|
-
type: 'WRAPPED_RECORD'
|
|
133
|
-
},
|
|
304
|
+
recordHeaderOpts: { type: 'WRAPPED_RECORD' },
|
|
134
305
|
cipherSuite,
|
|
135
306
|
version: cipherSuite.includes('ECDHE_')
|
|
136
307
|
? 'TLS1_2'
|
|
@@ -147,10 +318,7 @@ describe.each(ZK_CIPHER_SUITES)('[%s] should generate ZK proof for some cipherte
|
|
|
147
318
|
data: ciphertext
|
|
148
319
|
};
|
|
149
320
|
let proofs;
|
|
150
|
-
await proofGenerator.addPacketToProve(packet, {
|
|
151
|
-
type: 'zk',
|
|
152
|
-
redactedPlaintext,
|
|
153
|
-
}, p => proofs = p);
|
|
321
|
+
await proofGenerator.addPacketToProve(packet, { type: 'zk', redactedPlaintext }, p => proofs = p);
|
|
154
322
|
await proofGenerator.generateProofs();
|
|
155
323
|
const x = await (0, utils_1.verifyZkPacket)({
|
|
156
324
|
ciphertext,
|
|
@@ -166,4 +334,4 @@ describe.each(ZK_CIPHER_SUITES)('[%s] should generate ZK proof for some cipherte
|
|
|
166
334
|
});
|
|
167
335
|
});
|
|
168
336
|
});
|
|
169
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC56ay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0cy90ZXN0LnprLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsOENBQTRHO0FBSTVHLHFDQU9rQjtBQUVsQixNQUFNLGdCQUFnQixHQUFrQjtJQUN2Qyw4QkFBOEI7SUFDOUIsd0JBQXdCO0lBQ3hCLHlDQUF5QztDQUN6QyxDQUFBO0FBRUQsTUFBTSxVQUFVLEdBQWU7SUFDOUIsT0FBTztJQUNQLFNBQVM7Q0FDVCxDQUFBO0FBRUQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFNLENBQUMsQ0FBQSxDQUFDLE1BQU07QUFFOUIsUUFBUSxDQUFDLFVBQVUsRUFBRSxHQUFHLEVBQUU7SUFFekIsRUFBRSxDQUFDLGdDQUFnQyxFQUFFLEdBQUcsRUFBRTtRQUN6QyxNQUFNLE9BQU8sR0FBRztZQUNmO2dCQUNDLEtBQUssRUFBRTtvQkFDTixNQUFNO29CQUNOLFNBQVM7aUJBQ1Q7Z0JBQ0QsTUFBTSxFQUFFO29CQUNQLE1BQU07b0JBQ04sU0FBUztpQkFDVDtnQkFDRCxVQUFVLEVBQUU7b0JBQ1gsRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLEVBQUU7aUJBQzVCO2FBQ0Q7WUFDRDtnQkFDQyxLQUFLLEVBQUU7b0JBQ04sTUFBTTtvQkFDTixTQUFTO2lCQUNUO2dCQUNELE1BQU0sRUFBRTtvQkFDUCw0QkFBNEI7b0JBQzVCLG9DQUFvQztvQkFDcEMsU0FBUztpQkFDVDtnQkFDRCxVQUFVLEVBQUU7b0JBQ1gsRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLEVBQUU7aUJBQzVCO2FBQ0Q7WUFDRDtnQkFDQyxLQUFLLEVBQUU7b0JBQ04sT0FBTztvQkFDUCxLQUFLO29CQUNMLElBQUk7b0JBQ0osS0FBSztvQkFDTCxJQUFJO2lCQUNKO2dCQUNELE1BQU0sRUFBRTtvQkFDUCxPQUFPO29CQUNQLElBQUk7b0JBQ0osS0FB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
|
|
337
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.zk.js","sourceRoot":"","sources":["../../src/tests/test.zk.ts"],"names":[],"mappings":"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"}
|
package/lib/tests/utils.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ClaimTunnelRequest } from '../proto/api';
|
|
1
2
|
export declare function delay(ms: number): Promise<unknown>;
|
|
2
3
|
export declare function randomPrivateKey(): string;
|
|
3
4
|
export declare function getRandomPort(): number;
|
|
@@ -10,3 +11,8 @@ export declare function getRandomPort(): number;
|
|
|
10
11
|
* tls transcript and reveals map that was used.
|
|
11
12
|
*/
|
|
12
13
|
export declare function verifyNoDirectRevealLeaks(): void;
|
|
14
|
+
/**
|
|
15
|
+
* Gets the first TOPRF block from the transcript.
|
|
16
|
+
* Returns undefined if no TOPRF block is found.
|
|
17
|
+
*/
|
|
18
|
+
export declare function getFirstTOprfBlock({ transcript }: ClaimTunnelRequest): import("../proto/api").TOPRFPayload | undefined;
|
package/lib/tests/utils.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.delay = delay;
|
|
|
4
4
|
exports.randomPrivateKey = randomPrivateKey;
|
|
5
5
|
exports.getRandomPort = getRandomPort;
|
|
6
6
|
exports.verifyNoDirectRevealLeaks = verifyNoDirectRevealLeaks;
|
|
7
|
+
exports.getFirstTOprfBlock = getFirstTOprfBlock;
|
|
7
8
|
const crypto_1 = require("crypto");
|
|
8
9
|
const mocks_1 = require("../tests/mocks");
|
|
9
10
|
function delay(ms) {
|
|
@@ -46,4 +47,18 @@ function verifyNoDirectRevealLeaks() {
|
|
|
46
47
|
expect(otherPacketsWKey).toHaveLength(0);
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
|
-
|
|
50
|
+
/**
|
|
51
|
+
* Gets the first TOPRF block from the transcript.
|
|
52
|
+
* Returns undefined if no TOPRF block is found.
|
|
53
|
+
*/
|
|
54
|
+
function getFirstTOprfBlock({ transcript }) {
|
|
55
|
+
var _a;
|
|
56
|
+
for (const { reveal } of transcript) {
|
|
57
|
+
for (const proof of ((_a = reveal === null || reveal === void 0 ? void 0 : reveal.zkReveal) === null || _a === void 0 ? void 0 : _a.proofs) || []) {
|
|
58
|
+
if (proof.toprf) {
|
|
59
|
+
return proof.toprf;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdHMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFJQSxzQkFFQztBQUVELDRDQUVDO0FBRUQsc0NBRUM7QUFVRCw4REEyQkM7QUFNRCxnREFRQztBQWpFRCxtQ0FBb0M7QUFFcEMsMkNBQThDO0FBRTlDLFNBQWdCLEtBQUssQ0FBQyxFQUFVO0lBQy9CLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUN6RCxDQUFDO0FBRUQsU0FBZ0IsZ0JBQWdCO0lBQy9CLE9BQU8sSUFBSSxHQUFHLElBQUEsb0JBQVcsRUFBQyxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDOUMsQ0FBQztBQUVELFNBQWdCLGFBQWE7SUFDNUIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxJQUFJLEdBQUcsSUFBSSxDQUFDLENBQUE7QUFDL0MsQ0FBQztBQUVEOzs7Ozs7O0dBT0c7QUFDSCxTQUFnQix5QkFBeUI7SUFDeEMsSUFBRyxDQUFDLG9CQUFZLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNwQyxPQUFNO0lBQ1AsQ0FBQztJQUVELE1BQU0sQ0FBQyxhQUFhLEVBQUUsVUFBVSxDQUFDLEdBQUcsb0JBQVksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzlELEtBQUksTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsSUFBSSxVQUFVLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztRQUNwRCxJQUFHLE1BQU0sQ0FBQyxJQUFJLEtBQUssVUFBVSxFQUFFLENBQUM7WUFDL0IsU0FBUTtRQUNULENBQUM7UUFFRCxJQUFHLE1BQU0sQ0FBQyxJQUFJLEtBQUssV0FBVyxFQUFFLENBQUM7WUFDaEMsU0FBUTtRQUNULENBQUM7UUFFRCwyQ0FBMkM7UUFDM0MscURBQXFEO1FBQ3JELGdEQUFnRDtRQUNoRCxNQUFNLGdCQUFnQixHQUFHLGFBQWE7YUFDcEMsTUFBTSxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FDeEIsT0FBTyxDQUFDLElBQUksS0FBSyxZQUFZO2VBQzFCLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUM7ZUFDeEIsT0FBTyxDQUFDLE1BQU0sS0FBSyxNQUFNLENBQUMsTUFBTTtlQUNoQyxPQUFPLENBQUMsV0FBVyxLQUFLLGtCQUFrQixDQUM3QyxDQUFDLENBQUE7UUFDSCxNQUFNLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDekMsQ0FBQztBQUNGLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxTQUFnQixrQkFBa0IsQ0FBQyxFQUFFLFVBQVUsRUFBc0I7O0lBQ3BFLEtBQUksTUFBTSxFQUFFLE1BQU0sRUFBRSxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ3BDLEtBQUksTUFBTSxLQUFLLElBQUksQ0FBQSxNQUFBLE1BQU0sYUFBTixNQUFNLHVCQUFOLE1BQU0sQ0FBRSxRQUFRLDBDQUFFLE1BQU0sS0FBSSxFQUFFLEVBQUUsQ0FBQztZQUNuRCxJQUFHLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDaEIsT0FBTyxLQUFLLENBQUMsS0FBSyxDQUFBO1lBQ25CLENBQUM7UUFDRixDQUFDO0lBQ0YsQ0FBQztBQUNGLENBQUMifQ==
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export type BGPAnnouncementOverlapData = {
|
|
2
|
+
prefix: string;
|
|
3
|
+
};
|
|
4
|
+
export type BGPListener = {
|
|
5
|
+
/**
|
|
6
|
+
* Add an IP to listen for overlap,
|
|
7
|
+
* @returns a function to remove the IP from the listener
|
|
8
|
+
*/
|
|
9
|
+
onOverlap(ips: string[], callback: (event: BGPAnnouncementOverlapData) => void): (() => void);
|
|
10
|
+
close(): void;
|
|
11
|
+
};
|
package/lib/types/bgp.js
ADDED
package/lib/types/claims.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { ProviderClaimData } from '../proto/api';
|
|
2
|
-
import type { IAttestorClient } from '../types/client';
|
|
2
|
+
import type { IAttestorClient, IAttestorClientInitParams } from '../types/client';
|
|
3
3
|
import type { CompleteTLSPacket, Logger } from '../types/general';
|
|
4
4
|
import type { ProofGenerationStep, ProviderName, ProviderParams, ProviderSecretParams } from '../types/providers';
|
|
5
|
-
import { Transcript } from '../types/tunnel';
|
|
5
|
+
import type { Transcript } from '../types/tunnel';
|
|
6
6
|
import type { PrepareZKProofsBaseOpts } from '../types/zk';
|
|
7
7
|
/**
|
|
8
8
|
* Uniquely identifies a claim.
|
|
@@ -43,9 +43,7 @@ export type CreateClaimOnAttestorOpts<N extends ProviderName> = {
|
|
|
43
43
|
*
|
|
44
44
|
* The created client will go into the global client pool.
|
|
45
45
|
*/
|
|
46
|
-
client: IAttestorClient |
|
|
47
|
-
url: string | URL;
|
|
48
|
-
};
|
|
46
|
+
client: IAttestorClient | IAttestorClientInitParams;
|
|
49
47
|
/**
|
|
50
48
|
* Optionally set the timestamp of the claim
|
|
51
49
|
* in unix seconds. If not provided, the current
|
|
@@ -53,6 +51,11 @@ export type CreateClaimOnAttestorOpts<N extends ProviderName> = {
|
|
|
53
51
|
*/
|
|
54
52
|
timestampS?: number;
|
|
55
53
|
logger?: Logger;
|
|
54
|
+
/**
|
|
55
|
+
* Maximum number of retries to attempt
|
|
56
|
+
* @default 3
|
|
57
|
+
*/
|
|
58
|
+
maxRetries?: number;
|
|
56
59
|
/**
|
|
57
60
|
* Optionally update the provider parameters
|
|
58
61
|
* based on the transcript
|
|
@@ -61,4 +64,10 @@ export type CreateClaimOnAttestorOpts<N extends ProviderName> = {
|
|
|
61
64
|
params: Partial<ProviderParams<N>>;
|
|
62
65
|
secretParams: Partial<ProviderSecretParams<N>>;
|
|
63
66
|
}>;
|
|
67
|
+
/**
|
|
68
|
+
* Replaces paramValue with corresponding OPRF hash before proof is made
|
|
69
|
+
* Only if there's matching redaction exists
|
|
70
|
+
* For example: "domain.com" -> "dv4Nrgtr"
|
|
71
|
+
*/
|
|
72
|
+
updateParametersFromOprfData?: boolean;
|
|
64
73
|
} & PrepareZKProofsBaseOpts;
|