@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
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,
|
|
34
|
+
export declare function makeZkProofGenerator({ zkOperators, oprfOperators, logger, zkProofConcurrency, 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,
|
|
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,
|
|
20
|
+
async function makeZkProofGenerator({ zkOperators, oprfOperators, logger = logger_1.logger, zkProofConcurrency = ZK_CONCURRENCY, cipherSuite, zkEngine = 'snarkjs' }) {
|
|
16
21
|
const { default: PQueue } = await import('p-queue');
|
|
17
22
|
const zkQueue = new PQueue({
|
|
18
23
|
concurrency: zkProofConcurrency,
|
|
@@ -20,7 +25,7 @@ async function makeZkProofGenerator({ zkOperators, logger = logger_1.logger, zkP
|
|
|
20
25
|
});
|
|
21
26
|
const packetsToProve = [];
|
|
22
27
|
logger = (logger || logger_1.logger).child({ module: 'zk', zkEngine: zkEngine });
|
|
23
|
-
let
|
|
28
|
+
let zkProofsToGen = 0;
|
|
24
29
|
return {
|
|
25
30
|
/**
|
|
26
31
|
* Adds the given packet to the list of packets to
|
|
@@ -28,44 +33,97 @@ 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,
|
|
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;
|
|
38
42
|
const key = await tls_1.crypto.exportKey(packet.encKey);
|
|
39
43
|
const iv = packet.iv;
|
|
40
44
|
const ciphertext = (0, generics_1.getPureCiphertext)(packet.ciphertext, cipherSuite);
|
|
41
|
-
const chunks = Math.ceil(ciphertext.length / chunkSizeBytes);
|
|
42
45
|
const packetToProve = {
|
|
43
46
|
onGeneratedProofs,
|
|
44
47
|
algorithm: alg,
|
|
45
48
|
proofsToGenerate: [],
|
|
46
|
-
iv: packet.fixedIv
|
|
49
|
+
iv: packet.fixedIv,
|
|
47
50
|
};
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
const slicesDone = [];
|
|
52
|
+
// first we'll handle all TOPRF blocks
|
|
53
|
+
// we do these first, because they can span multiple chunks
|
|
54
|
+
// & we need to be able to span the right chunks
|
|
55
|
+
for (const toprf of toprfs || []) {
|
|
56
|
+
const fromIndex = getIdealOffsetForToprfBlock(alg, toprf);
|
|
57
|
+
const toIndex = Math.min(fromIndex + chunkSizeBytes, ciphertext.length);
|
|
58
|
+
// ensure this OPRF block doesn't overlap with any other OPRF block
|
|
59
|
+
const slice = { fromIndex, toIndex };
|
|
60
|
+
assertNoOverlapOprf(slice);
|
|
61
|
+
addProofsToGenerate(slice, {
|
|
62
|
+
...toprf,
|
|
63
|
+
dataLocation: {
|
|
64
|
+
...toprf.dataLocation,
|
|
65
|
+
fromIndex: toprf.dataLocation.fromIndex - fromIndex
|
|
66
|
+
}
|
|
55
67
|
});
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
68
|
+
}
|
|
69
|
+
// now we'll go through the rest of the ciphertext, and add proofs
|
|
70
|
+
// for the sections that haven't been covered by the TOPRF blocks
|
|
71
|
+
const slicesCp = sortSlices(slicesDone.slice());
|
|
72
|
+
let fromIndex = 0;
|
|
73
|
+
for (const done of slicesCp) {
|
|
74
|
+
if (done.fromIndex > fromIndex) {
|
|
75
|
+
addProofsToGenerate({
|
|
76
|
+
fromIndex,
|
|
77
|
+
toIndex: done.fromIndex
|
|
78
|
+
});
|
|
63
79
|
}
|
|
80
|
+
fromIndex = done.toIndex;
|
|
81
|
+
}
|
|
82
|
+
if (fromIndex < ciphertext.length) {
|
|
83
|
+
addProofsToGenerate({
|
|
84
|
+
fromIndex,
|
|
85
|
+
toIndex: ciphertext.length
|
|
86
|
+
});
|
|
64
87
|
}
|
|
88
|
+
// generate proofs in order of start index
|
|
89
|
+
packetToProve.proofsToGenerate
|
|
90
|
+
.sort((a, b) => a.startIdx - b.startIdx);
|
|
65
91
|
packetsToProve.push(packetToProve);
|
|
92
|
+
function assertNoOverlapOprf(slice) {
|
|
93
|
+
for (const done of slicesDone) {
|
|
94
|
+
if (
|
|
95
|
+
// 1d box overlap
|
|
96
|
+
slice.fromIndex < done.toIndex
|
|
97
|
+
&& slice.toIndex > done.fromIndex) {
|
|
98
|
+
throw new error_1.AttestorError('ERROR_BAD_REQUEST', 'Single chunk has multiple OPRFs');
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
function addProofsToGenerate({ fromIndex, toIndex }, toprf) {
|
|
103
|
+
for (let i = fromIndex; i < toIndex; i += chunkSizeBytes) {
|
|
104
|
+
const slice = {
|
|
105
|
+
fromIndex: i,
|
|
106
|
+
toIndex: Math.min(i + chunkSizeBytes, toIndex)
|
|
107
|
+
};
|
|
108
|
+
slicesDone.push(slice);
|
|
109
|
+
const proofParams = getProofGenerationParamsForSlice({
|
|
110
|
+
key,
|
|
111
|
+
iv,
|
|
112
|
+
ciphertext,
|
|
113
|
+
redactedPlaintext,
|
|
114
|
+
slice,
|
|
115
|
+
toprf,
|
|
116
|
+
});
|
|
117
|
+
if (!proofParams) {
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
120
|
+
packetToProve.proofsToGenerate.push(proofParams);
|
|
121
|
+
zkProofsToGen += 1;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
66
124
|
},
|
|
67
125
|
getTotalChunksToProve() {
|
|
68
|
-
return
|
|
126
|
+
return zkProofsToGen;
|
|
69
127
|
},
|
|
70
128
|
async generateProofs(onChunkDone) {
|
|
71
129
|
var _a;
|
|
@@ -90,52 +148,70 @@ async function makeZkProofGenerator({ zkOperators, logger = logger_1.logger, zkP
|
|
|
90
148
|
}
|
|
91
149
|
}
|
|
92
150
|
await Promise.all(tasks);
|
|
93
|
-
logger === null || logger === void 0 ? void 0 : logger.info({
|
|
94
|
-
durationMs: Date.now() - start,
|
|
95
|
-
chunks: zkChunksToProve,
|
|
96
|
-
}, 'generated ZK proofs');
|
|
151
|
+
logger === null || logger === void 0 ? void 0 : logger.info({ durationMs: Date.now() - start, zkProofsToGen }, 'generated ZK proofs');
|
|
97
152
|
// reset the packets to prove
|
|
98
153
|
packetsToProve.splice(0, packetsToProve.length);
|
|
99
|
-
|
|
154
|
+
zkProofsToGen = 0;
|
|
100
155
|
// release ZK resources to free up memory
|
|
101
156
|
const alg = (0, generics_1.getZkAlgorithmForCipherSuite)(cipherSuite);
|
|
102
157
|
const zkOperator = await getZkOperatorForAlgorithm(alg);
|
|
103
158
|
(_a = zkOperator.release) === null || _a === void 0 ? void 0 : _a.call(zkOperator);
|
|
104
159
|
},
|
|
105
160
|
};
|
|
106
|
-
async function generateProofForChunk(algorithm, { startIdx, redactedPlaintext, privateInput, publicInput }) {
|
|
107
|
-
const operator =
|
|
161
|
+
async function generateProofForChunk(algorithm, { startIdx, redactedPlaintext, privateInput, publicInput, toprf, }) {
|
|
162
|
+
const operator = toprf
|
|
163
|
+
? getOprfOperatorForAlgorithm(algorithm)
|
|
164
|
+
: getZkOperatorForAlgorithm(algorithm);
|
|
108
165
|
const proof = await (0, zk_symmetric_crypto_1.generateProof)({
|
|
109
166
|
algorithm,
|
|
110
167
|
privateInput,
|
|
111
168
|
publicInput,
|
|
112
169
|
operator,
|
|
113
|
-
logger
|
|
170
|
+
logger,
|
|
171
|
+
...(toprf
|
|
172
|
+
? {
|
|
173
|
+
toprf: {
|
|
174
|
+
pos: toprf.dataLocation.fromIndex,
|
|
175
|
+
len: toprf.dataLocation.length,
|
|
176
|
+
output: toprf.nullifier,
|
|
177
|
+
responses: toprf.responses,
|
|
178
|
+
domainSeparator: config_1.TOPRF_DOMAIN_SEPARATOR
|
|
179
|
+
},
|
|
180
|
+
mask: toprf.mask,
|
|
181
|
+
}
|
|
182
|
+
: {})
|
|
114
183
|
});
|
|
115
184
|
logger === null || logger === void 0 ? void 0 : logger.debug({ startIdx }, 'generated proof for chunk');
|
|
116
185
|
return {
|
|
117
|
-
|
|
186
|
+
// backwards compatibility
|
|
187
|
+
proofJson: '',
|
|
188
|
+
proofData: typeof proof.proofData === 'string'
|
|
189
|
+
? (0, tls_1.strToUint8Array)(proof.proofData)
|
|
190
|
+
: proof.proofData,
|
|
191
|
+
toprf,
|
|
118
192
|
decryptedRedactedCiphertext: proof.plaintext,
|
|
119
193
|
redactedPlaintext,
|
|
120
194
|
startIdx
|
|
121
195
|
};
|
|
122
196
|
}
|
|
123
|
-
|
|
197
|
+
function getZkOperatorForAlgorithm(algorithm) {
|
|
124
198
|
return (zkOperators === null || zkOperators === void 0 ? void 0 : zkOperators[algorithm])
|
|
125
|
-
||
|
|
199
|
+
|| makeDefaultZkOperator(algorithm, zkEngine, logger);
|
|
200
|
+
}
|
|
201
|
+
function getOprfOperatorForAlgorithm(algorithm) {
|
|
202
|
+
return (oprfOperators === null || oprfOperators === void 0 ? void 0 : oprfOperators[algorithm])
|
|
203
|
+
|| makeDefaultOPRFOperator(algorithm, zkEngine, logger);
|
|
126
204
|
}
|
|
127
205
|
}
|
|
128
206
|
/**
|
|
129
207
|
* Verify the given ZK proof
|
|
130
208
|
*/
|
|
131
|
-
async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators, logger = logger_1.logger, zkEngine = 'snarkjs', iv, recordNumber }) {
|
|
209
|
+
async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators, oprfOperators, logger = logger_1.logger, zkEngine = 'snarkjs', iv, recordNumber }) {
|
|
132
210
|
if (!zkReveal) {
|
|
133
211
|
throw new Error('No ZK reveal');
|
|
134
212
|
}
|
|
135
213
|
const { proofs } = zkReveal;
|
|
136
214
|
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
215
|
const recordIV = (0, generics_1.getRecordIV)(ciphertext, cipherSuite);
|
|
140
216
|
ciphertext = (0, generics_1.getPureCiphertext)(ciphertext, cipherSuite);
|
|
141
217
|
/**
|
|
@@ -146,10 +222,18 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
|
|
|
146
222
|
* in the proofs
|
|
147
223
|
*/
|
|
148
224
|
const realRedactedPlaintext = new Uint8Array(ciphertext.length).fill(redactions_1.REDACTION_CHAR_CODE);
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
225
|
+
await Promise.all(proofs.map(async (proof, i) => {
|
|
226
|
+
try {
|
|
227
|
+
await verifyProofPacket(proof);
|
|
228
|
+
}
|
|
229
|
+
catch (e) {
|
|
230
|
+
e.message += ` (chunk ${i}, startIdx ${proof.startIdx})`;
|
|
231
|
+
throw e;
|
|
232
|
+
}
|
|
233
|
+
}));
|
|
234
|
+
return { redactedPlaintext: realRedactedPlaintext };
|
|
235
|
+
async function verifyProofPacket({ proofData, proofJson, decryptedRedactedCiphertext, redactedPlaintext, startIdx, toprf, }) {
|
|
236
|
+
var _a, _b, _c;
|
|
153
237
|
// get the ciphertext chunk we received from the server
|
|
154
238
|
// the ZK library, will verify that the decrypted redacted
|
|
155
239
|
// ciphertext matches the ciphertext received from the server
|
|
@@ -163,10 +247,29 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
|
|
|
163
247
|
ciphertextChunk[i] = redactions_1.REDACTION_CHAR_CODE;
|
|
164
248
|
}
|
|
165
249
|
}
|
|
166
|
-
|
|
167
|
-
|
|
250
|
+
// redact OPRF indices -- because they'll incorrectly
|
|
251
|
+
// be marked as incongruent
|
|
252
|
+
let comparePlaintext = redactedPlaintext;
|
|
253
|
+
if (toprf) {
|
|
254
|
+
comparePlaintext = new Uint8Array(redactedPlaintext);
|
|
255
|
+
for (let i = 0; i < toprf.dataLocation.length; i++) {
|
|
256
|
+
comparePlaintext[i + toprf.dataLocation.fromIndex] = redactions_1.REDACTION_CHAR_CODE;
|
|
257
|
+
}
|
|
258
|
+
// the transcript will contain only the stringified
|
|
259
|
+
// nullifier. So here, we'll compare the provable
|
|
260
|
+
// binary nullifier with the stringified nullifier
|
|
261
|
+
// that the user has provided
|
|
262
|
+
const nulliferStr = (0, redactions_1.binaryHashToStr)(toprf.nullifier, toprf.dataLocation.length);
|
|
263
|
+
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)
|
|
264
|
+
+ ((_c = toprf.dataLocation) === null || _c === void 0 ? void 0 : _c.length));
|
|
265
|
+
if ((0, generics_1.uint8ArrayToStr)(txtHash) !== nulliferStr
|
|
266
|
+
.slice(0, txtHash.length)) {
|
|
267
|
+
throw new Error('OPRF nullifier not congruent');
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
if (!(0, redactions_1.isRedactionCongruent)(comparePlaintext, decryptedRedactedCiphertext)) {
|
|
271
|
+
throw new Error('redacted ciphertext not congruent');
|
|
168
272
|
}
|
|
169
|
-
const chunkIndex = startIdx / chunkSizeBytes * blocksPerChunk;
|
|
170
273
|
let nonce = (0, tls_1.concatenateUint8Arrays)([iv, recordIV]);
|
|
171
274
|
if (!recordIV.length) {
|
|
172
275
|
nonce = (0, tls_1.generateIV)(nonce, recordNumber);
|
|
@@ -174,26 +277,56 @@ async function verifyZkPacket({ cipherSuite, ciphertext, zkReveal, zkOperators,
|
|
|
174
277
|
await (0, zk_symmetric_crypto_1.verifyProof)({
|
|
175
278
|
proof: {
|
|
176
279
|
algorithm,
|
|
177
|
-
|
|
280
|
+
proofData: proofData.length
|
|
281
|
+
? proofData
|
|
282
|
+
: (0, tls_1.strToUint8Array)(proofJson),
|
|
178
283
|
plaintext: decryptedRedactedCiphertext,
|
|
179
284
|
},
|
|
180
|
-
publicInput: {
|
|
181
|
-
|
|
285
|
+
publicInput: {
|
|
286
|
+
ciphertext: ciphertextChunk,
|
|
287
|
+
iv: nonce,
|
|
288
|
+
offsetBytes: startIdx
|
|
289
|
+
},
|
|
182
290
|
logger,
|
|
291
|
+
...(toprf
|
|
292
|
+
? {
|
|
293
|
+
operator: getOprfOperator(),
|
|
294
|
+
toprf: {
|
|
295
|
+
pos: toprf.dataLocation.fromIndex,
|
|
296
|
+
len: toprf.dataLocation.length,
|
|
297
|
+
domainSeparator: config_1.TOPRF_DOMAIN_SEPARATOR,
|
|
298
|
+
output: toprf.nullifier,
|
|
299
|
+
responses: toprf.responses,
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
: { operator: getZkOperator() })
|
|
183
303
|
});
|
|
184
304
|
logger === null || logger === void 0 ? void 0 : logger.debug({ startIdx, endIdx: startIdx + redactedPlaintext.length }, 'verified proof');
|
|
185
305
|
realRedactedPlaintext.set(redactedPlaintext, startIdx);
|
|
186
|
-
}
|
|
187
|
-
|
|
306
|
+
}
|
|
307
|
+
function getZkOperator() {
|
|
308
|
+
return (zkOperators === null || zkOperators === void 0 ? void 0 : zkOperators[algorithm])
|
|
309
|
+
|| makeDefaultZkOperator(algorithm, zkEngine, logger);
|
|
310
|
+
}
|
|
311
|
+
function getOprfOperator() {
|
|
312
|
+
return (oprfOperators === null || oprfOperators === void 0 ? void 0 : oprfOperators[algorithm])
|
|
313
|
+
|| makeDefaultOPRFOperator(algorithm, zkEngine, logger);
|
|
314
|
+
}
|
|
188
315
|
}
|
|
316
|
+
// the chunk size of the ZK circuit in bytes
|
|
317
|
+
// this will be >= the block size
|
|
189
318
|
function getChunkSizeBytes(alg) {
|
|
190
319
|
const { chunkSize, bitsPerWord } = zk_symmetric_crypto_1.CONFIG[alg];
|
|
191
320
|
return chunkSize * bitsPerWord / 8;
|
|
192
321
|
}
|
|
193
322
|
const zkEngines = {};
|
|
323
|
+
const oprfEngines = {};
|
|
194
324
|
const operatorMakers = {
|
|
195
325
|
'snarkjs': zk_symmetric_crypto_1.makeSnarkJsZKOperator,
|
|
196
|
-
'gnark': zk_symmetric_crypto_1.makeGnarkZkOperator
|
|
326
|
+
'gnark': zk_symmetric_crypto_1.makeGnarkZkOperator,
|
|
327
|
+
};
|
|
328
|
+
const OPRF_OPERATOR_MAKERS = {
|
|
329
|
+
'gnark': zk_symmetric_crypto_1.makeGnarkOPRFOperator
|
|
197
330
|
};
|
|
198
331
|
function makeDefaultZkOperator(algorithm, zkEngine, logger) {
|
|
199
332
|
let zkOperators = zkEngines[zkEngine];
|
|
@@ -204,30 +337,64 @@ function makeDefaultZkOperator(algorithm, zkEngine, logger) {
|
|
|
204
337
|
if (!zkOperators[algorithm]) {
|
|
205
338
|
const isNode = (0, env_1.detectEnvironment)() === 'node';
|
|
206
339
|
const opType = isNode ? 'local' : 'remote';
|
|
207
|
-
logger === null || logger === void 0 ? void 0 : logger.info({
|
|
208
|
-
type: opType,
|
|
209
|
-
algorithm
|
|
210
|
-
}, 'fetching zk operator');
|
|
340
|
+
logger === null || logger === void 0 ? void 0 : logger.info({ type: opType, algorithm }, 'fetching zk operator');
|
|
211
341
|
const fetcher = opType === 'local'
|
|
212
342
|
? (0, zk_symmetric_crypto_1.makeLocalFileFetch)()
|
|
213
343
|
: (0, zk_symmetric_crypto_1.makeRemoteFileFetch)({
|
|
214
344
|
baseUrl: config_1.DEFAULT_REMOTE_FILE_FETCH_BASE_URL,
|
|
215
345
|
});
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
}
|
|
346
|
+
const maker = operatorMakers[zkEngine];
|
|
347
|
+
if (!maker) {
|
|
348
|
+
throw new Error(`No ZK operator maker for ${zkEngine}`);
|
|
349
|
+
}
|
|
350
|
+
zkOperators[algorithm] = maker({ algorithm, fetcher });
|
|
220
351
|
}
|
|
221
352
|
return zkOperators[algorithm];
|
|
222
353
|
}
|
|
223
|
-
function
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
354
|
+
function makeDefaultOPRFOperator(algorithm, zkEngine, logger) {
|
|
355
|
+
let operators = oprfEngines[zkEngine];
|
|
356
|
+
if (!operators) {
|
|
357
|
+
oprfEngines[zkEngine] = {};
|
|
358
|
+
operators = oprfEngines[zkEngine];
|
|
359
|
+
}
|
|
360
|
+
if (!operators[algorithm]) {
|
|
361
|
+
const isNode = (0, env_1.detectEnvironment)() === 'node';
|
|
362
|
+
const type = isNode ? 'local' : 'remote';
|
|
363
|
+
logger === null || logger === void 0 ? void 0 : logger.info({ type, algorithm }, 'fetching oprf operator');
|
|
364
|
+
const fetcher = type === 'local'
|
|
365
|
+
? (0, zk_symmetric_crypto_1.makeLocalFileFetch)()
|
|
366
|
+
: (0, zk_symmetric_crypto_1.makeRemoteFileFetch)({
|
|
367
|
+
baseUrl: config_1.DEFAULT_REMOTE_FILE_FETCH_BASE_URL,
|
|
368
|
+
});
|
|
369
|
+
const maker = OPRF_OPERATOR_MAKERS[zkEngine];
|
|
370
|
+
if (!maker) {
|
|
371
|
+
throw new Error(`No OPRF operator maker for ${zkEngine}`);
|
|
372
|
+
}
|
|
373
|
+
operators[algorithm] = maker({ algorithm, fetcher });
|
|
374
|
+
}
|
|
375
|
+
return operators[algorithm];
|
|
376
|
+
}
|
|
377
|
+
function getEngineString(engine) {
|
|
378
|
+
if (engine === api_1.ZKProofEngine.ZK_ENGINE_GNARK) {
|
|
379
|
+
return 'gnark';
|
|
380
|
+
}
|
|
381
|
+
if (engine === api_1.ZKProofEngine.ZK_ENGINE_SNARKJS) {
|
|
382
|
+
return 'snarkjs';
|
|
383
|
+
}
|
|
384
|
+
throw new Error(`Unknown ZK engine: ${engine}`);
|
|
385
|
+
}
|
|
386
|
+
function getEngineProto(engine) {
|
|
387
|
+
if (engine === 'gnark') {
|
|
388
|
+
return api_1.ZKProofEngine.ZK_ENGINE_GNARK;
|
|
389
|
+
}
|
|
390
|
+
if (engine === 'snarkjs') {
|
|
391
|
+
return api_1.ZKProofEngine.ZK_ENGINE_SNARKJS;
|
|
392
|
+
}
|
|
393
|
+
throw new Error(`Unknown ZK engine: ${engine}`);
|
|
394
|
+
}
|
|
395
|
+
function getProofGenerationParamsForSlice({ key, iv, ciphertext, redactedPlaintext, slice: { fromIndex, toIndex }, toprf, }) {
|
|
396
|
+
const ciphertextChunk = ciphertext.slice(fromIndex, toIndex);
|
|
397
|
+
const plaintextChunk = redactedPlaintext.slice(fromIndex, toIndex);
|
|
231
398
|
if ((0, redactions_1.isFullyRedacted)(plaintextChunk)) {
|
|
232
399
|
return;
|
|
233
400
|
}
|
|
@@ -241,10 +408,37 @@ function getProofGenerationParamsForChunk(algorithm, { key, iv, ciphertext, reda
|
|
|
241
408
|
}
|
|
242
409
|
}
|
|
243
410
|
return {
|
|
244
|
-
startIdx,
|
|
411
|
+
startIdx: fromIndex,
|
|
245
412
|
redactedPlaintext: plaintextChunk,
|
|
246
413
|
privateInput: { key },
|
|
247
|
-
publicInput: { ciphertext: ciphertextChunk, iv,
|
|
414
|
+
publicInput: { ciphertext: ciphertextChunk, iv, offsetBytes: fromIndex },
|
|
415
|
+
toprf
|
|
248
416
|
};
|
|
249
417
|
}
|
|
250
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zk.js","sourceRoot":"","sources":["../../src/utils/zk.ts"],"names":[],"mappings":"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"}
|
|
418
|
+
/**
|
|
419
|
+
* Get the ideal location to generate a ZK proof for a TOPRF block.
|
|
420
|
+
* Ideally it should be put into a slice that's a divisor of the chunk size,
|
|
421
|
+
* as that'll minimize the number of proofs that need to be generated.
|
|
422
|
+
* @returns the offset in bytes
|
|
423
|
+
*/
|
|
424
|
+
function getIdealOffsetForToprfBlock(alg, { dataLocation }) {
|
|
425
|
+
const chunkSizeBytes = getChunkSizeBytes(alg);
|
|
426
|
+
const offsetChunks = Math.floor(dataLocation.fromIndex / chunkSizeBytes) * chunkSizeBytes;
|
|
427
|
+
const endOffsetChunks = Math.floor((dataLocation.fromIndex + dataLocation.length) / chunkSizeBytes);
|
|
428
|
+
// happy case -- the OPRF block fits into a single chunk, that's a
|
|
429
|
+
// divisor of the chunk size
|
|
430
|
+
if (endOffsetChunks === offsetChunks) {
|
|
431
|
+
return offsetChunks * chunkSizeBytes;
|
|
432
|
+
}
|
|
433
|
+
const blockSizeBytes = (0, zk_symmetric_crypto_1.getBlockSizeBytes)(alg);
|
|
434
|
+
const offsetBytes = Math.floor(dataLocation.fromIndex / blockSizeBytes) * blockSizeBytes;
|
|
435
|
+
if ((dataLocation.fromIndex + dataLocation.length) - offsetBytes
|
|
436
|
+
> chunkSizeBytes) {
|
|
437
|
+
throw new error_1.AttestorError('ERROR_BAD_REQUEST', 'OPRF data cannot fit into a single chunk');
|
|
438
|
+
}
|
|
439
|
+
return offsetBytes;
|
|
440
|
+
}
|
|
441
|
+
function sortSlices(slices) {
|
|
442
|
+
return slices.sort((a, b) => a.fromIndex - b.fromIndex);
|
|
443
|
+
}
|
|
444
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zk.js","sourceRoot":"","sources":["../../src/utils/zk.ts"],"names":[],"mappings":"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"}
|