@aztec/bb-prover 0.49.2 → 0.50.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/dest/prover/bb_private_kernel_prover.d.ts +4 -1
- package/dest/prover/bb_private_kernel_prover.d.ts.map +1 -1
- package/dest/prover/bb_private_kernel_prover.js +5 -1
- package/dest/prover/bb_prover.d.ts +14 -2
- package/dest/prover/bb_prover.d.ts.map +1 -1
- package/dest/prover/bb_prover.js +27 -2
- package/dest/stats.d.ts.map +1 -1
- package/dest/stats.js +5 -1
- package/dest/test/test_circuit_prover.d.ts +13 -1
- package/dest/test/test_circuit_prover.d.ts.map +1 -1
- package/dest/test/test_circuit_prover.js +38 -2
- package/dest/verifier/bb_verifier.d.ts.map +1 -1
- package/dest/verifier/bb_verifier.js +2 -1
- package/package.json +7 -7
- package/src/prover/bb_private_kernel_prover.ts +8 -2
- package/src/prover/bb_prover.ts +56 -0
- package/src/stats.ts +4 -0
- package/src/test/test_circuit_prover.ts +77 -0
- package/src/verifier/bb_verifier.ts +1 -0
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import { type AppCircuitSimulateOutput, type PrivateKernelProver, type PrivateKernelSimulateOutput } from '@aztec/circuit-types';
|
|
3
3
|
import { ClientIvcProof, Fr, type PrivateCircuitPublicInputs, type PrivateKernelCircuitPublicInputs, type PrivateKernelInitCircuitPrivateInputs, type PrivateKernelInnerCircuitPrivateInputs, type PrivateKernelResetCircuitPrivateInputsVariants, type PrivateKernelTailCircuitPrivateInputs, type PrivateKernelTailCircuitPublicInputs, Proof } from '@aztec/circuits.js';
|
|
4
|
+
import { type DebugLogger } from '@aztec/foundation/log';
|
|
4
5
|
import { type ClientProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
|
|
5
6
|
import { type WitnessMap } from '@noir-lang/types';
|
|
7
|
+
import { type BBConfig } from '../config.js';
|
|
6
8
|
/**
|
|
7
9
|
* This proof creator implementation uses the native bb binary.
|
|
8
10
|
* This is a temporary implementation until we make the WASM version work.
|
|
@@ -15,7 +17,8 @@ export declare class BBNativePrivateKernelProver implements PrivateKernelProver
|
|
|
15
17
|
private log;
|
|
16
18
|
private simulator;
|
|
17
19
|
private verificationKeys;
|
|
18
|
-
constructor(
|
|
20
|
+
private constructor();
|
|
21
|
+
static new(config: BBConfig, log?: DebugLogger): Promise<BBNativePrivateKernelProver>;
|
|
19
22
|
private _createClientIvcProof;
|
|
20
23
|
createClientIvcProof(acirs: Buffer[], witnessStack: WitnessMap[]): Promise<ClientIvcProof>;
|
|
21
24
|
getSiloedCommitments(publicInputs: PrivateCircuitPublicInputs): Promise<Fr[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bb_private_kernel_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_private_kernel_prover.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EACjC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,cAAc,EACd,EAAE,EACF,KAAK,0BAA0B,EAC/B,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAC1C,KAAK,sCAAsC,EAC3C,KAAK,8CAA8C,EACnD,KAAK,qCAAqC,EAC1C,KAAK,oCAAoC,EACzC,KAAK,EAIN,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"bb_private_kernel_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_private_kernel_prover.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EACjC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,cAAc,EACd,EAAE,EACF,KAAK,0BAA0B,EAC/B,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAC1C,KAAK,sCAAsC,EAC3C,KAAK,8CAA8C,EACnD,KAAK,qCAAqC,EAC1C,KAAK,oCAAoC,EACzC,KAAK,EAIN,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AAE5E,OAAO,EAEL,KAAK,sBAAsB,EAa5B,MAAM,qCAAqC,CAAC;AAM7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAYnD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI7C;;;;GAIG;AACH,qBAAa,2BAA4B,YAAW,mBAAmB;IASnE,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,GAAG;IAXb,OAAO,CAAC,SAAS,CAAuB;IAExC,OAAO,CAAC,gBAAgB,CAGpB;IAEJ,OAAO;WAOa,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,WAAW;YAK7C,qBAAqB;IAmC7B,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAQzF,oBAAoB,CAAC,YAAY,EAAE,0BAA0B;IAMvD,iBAAiB,CAC5B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAS5D,kBAAkB,CAC7B,MAAM,EAAE,sCAAsC,GAC7C,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAS5D,kBAAkB,CAC7B,MAAM,EAAE,8CAA8C,GACrD,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAS5D,iBAAiB,CAC5B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,2BAA2B,CAAC,oCAAoC,CAAC,CAAC;IAiBhE,gCAAgC,CAC3C,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC;IASpC;;;;OAIG;IACU,6BAA6B,CAAC,WAAW,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;YAmB9E,kBAAkB;IAgBhC;;;;OAIG;YACW,oCAAoC;YAUpC,QAAQ;YAkCR,sBAAsB;IAqDpC;;;;;OAKG;YACW,iBAAiB;IAwB/B,OAAO,CAAC,cAAc;CAYvB"}
|
|
@@ -26,6 +26,10 @@ export class BBNativePrivateKernelProver {
|
|
|
26
26
|
this.simulator = new WASMSimulator();
|
|
27
27
|
this.verificationKeys = new Map();
|
|
28
28
|
}
|
|
29
|
+
static async new(config, log) {
|
|
30
|
+
await fs.mkdir(config.bbWorkingDirectory, { recursive: true });
|
|
31
|
+
return new BBNativePrivateKernelProver(config.bbBinaryPath, config.bbWorkingDirectory, !!config.bbSkipCleanup, log);
|
|
32
|
+
}
|
|
29
33
|
async _createClientIvcProof(directory, acirs, witnessStack) {
|
|
30
34
|
// TODO(#7371): Longer term we won't use this hacked together msgpack format
|
|
31
35
|
// and instead properly create the bincode serialization from rust
|
|
@@ -203,4 +207,4 @@ export class BBNativePrivateKernelProver {
|
|
|
203
207
|
}), this.skipCleanup);
|
|
204
208
|
}
|
|
205
209
|
}
|
|
206
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_private_kernel_prover.js","sourceRoot":"","sources":["../../src/prover/bb_private_kernel_prover.ts"],"names":[],"mappings":"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"}
|
|
210
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_private_kernel_prover.js","sourceRoot":"","sources":["../../src/prover/bb_private_kernel_prover.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ProofAndVerificationKey, type PublicInputsAndRecursiveProof, type PublicKernelNonTailRequest, type PublicKernelTailRequest, type ServerCircuitProver } from '@aztec/circuit-types';
|
|
2
|
-
import { type AvmCircuitInputs, type BaseOrMergeRollupPublicInputs, type BaseParityInputs, type BaseRollupInputs, type KernelCircuitPublicInputs, type MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, type PrivateKernelEmptyInputData, Proof, type PublicKernelCircuitPublicInputs, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, type RootParityInputs, type RootRollupInputs, type RootRollupPublicInputs, TUBE_PROOF_LENGTH, type TubeInputs, type VerificationKeyAsFields, type VerificationKeyData } from '@aztec/circuits.js';
|
|
2
|
+
import { type AvmCircuitInputs, type BaseOrMergeRollupPublicInputs, type BaseParityInputs, type BaseRollupInputs, type BlockMergeRollupInputs, type BlockRootOrBlockMergePublicInputs, type BlockRootRollupInputs, type KernelCircuitPublicInputs, type MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, type PrivateKernelEmptyInputData, Proof, type PublicKernelCircuitPublicInputs, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, type RootParityInputs, type RootRollupInputs, type RootRollupPublicInputs, TUBE_PROOF_LENGTH, type TubeInputs, type VerificationKeyAsFields, type VerificationKeyData } from '@aztec/circuits.js';
|
|
3
3
|
import { type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
|
|
4
4
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
5
5
|
import type { ACVMConfig, BBConfig } from '../config.js';
|
|
@@ -58,6 +58,18 @@ export declare class BBNativeRollupProver implements ServerCircuitProver {
|
|
|
58
58
|
* @returns The public inputs as outputs of the simulation.
|
|
59
59
|
*/
|
|
60
60
|
getMergeRollupProof(input: MergeRollupInputs): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>>;
|
|
61
|
+
/**
|
|
62
|
+
* Simulates the block root rollup circuit from its inputs.
|
|
63
|
+
* @param input - Inputs to the circuit.
|
|
64
|
+
* @returns The public inputs as outputs of the simulation.
|
|
65
|
+
*/
|
|
66
|
+
getBlockRootRollupProof(input: BlockRootRollupInputs): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
67
|
+
/**
|
|
68
|
+
* Simulates the block merge rollup circuit from its inputs.
|
|
69
|
+
* @param input - Inputs to the circuit.
|
|
70
|
+
* @returns The public inputs as outputs of the simulation.
|
|
71
|
+
*/
|
|
72
|
+
getBlockMergeRollupProof(input: BlockMergeRollupInputs): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
61
73
|
/**
|
|
62
74
|
* Simulates the root rollup circuit from its inputs.
|
|
63
75
|
* @param input - Inputs to the circuit.
|
|
@@ -108,7 +120,7 @@ export declare class BBNativeRollupProver implements ServerCircuitProver {
|
|
|
108
120
|
* @param proof - The input proof that may need converting
|
|
109
121
|
* @returns - The valid proof
|
|
110
122
|
*/
|
|
111
|
-
ensureValidProof(proof: RecursiveProof<typeof NESTED_RECURSIVE_PROOF_LENGTH>, circuit: ServerProtocolArtifact, vk: VerificationKeyData): Promise<RecursiveProof<
|
|
123
|
+
ensureValidProof(proof: RecursiveProof<typeof NESTED_RECURSIVE_PROOF_LENGTH>, circuit: ServerProtocolArtifact, vk: VerificationKeyData): Promise<RecursiveProof<439>>;
|
|
112
124
|
/**
|
|
113
125
|
* Returns the verification key data for a circuit, will generate and cache it if not cached internally
|
|
114
126
|
* @param circuitType - The type of circuit for which the verification key is required
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,6BAA6B,EAClC,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAClC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,
|
|
1
|
+
{"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
|
package/dest/prover/bb_prover.js
CHANGED
|
@@ -5,7 +5,7 @@ import { AGGREGATION_OBJECT_LENGTH, EmptyNestedCircuitInputs, EmptyNestedData, F
|
|
|
5
5
|
import { runInDirectory } from '@aztec/foundation/fs';
|
|
6
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
7
7
|
import { Timer } from '@aztec/foundation/timer';
|
|
8
|
-
import { ProtocolCircuitVkIndexes, ServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertBaseRollupInputsToWitnessMap, convertBaseRollupOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap, convertPublicTailInputsToWitnessMap, convertPublicTailOutputFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, getVKSiblingPath, } from '@aztec/noir-protocol-circuits-types';
|
|
8
|
+
import { ProtocolCircuitVkIndexes, ServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertBaseRollupInputsToWitnessMap, convertBaseRollupOutputsFromWitnessMap, convertBlockMergeRollupInputsToWitnessMap, convertBlockMergeRollupOutputsFromWitnessMap, convertBlockRootRollupInputsToWitnessMap, convertBlockRootRollupOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap, convertPublicTailInputsToWitnessMap, convertPublicTailOutputFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, getVKSiblingPath, } from '@aztec/noir-protocol-circuits-types';
|
|
9
9
|
import { NativeACVMSimulator } from '@aztec/simulator';
|
|
10
10
|
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
11
11
|
import { abiEncode } from '@noir-lang/noirc_abi';
|
|
@@ -139,6 +139,31 @@ let BBNativeRollupProver = (() => {
|
|
|
139
139
|
await this.verifyProof('MergeRollupArtifact', proof.binaryProof);
|
|
140
140
|
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
141
141
|
}
|
|
142
|
+
/**
|
|
143
|
+
* Simulates the block root rollup circuit from its inputs.
|
|
144
|
+
* @param input - Inputs to the circuit.
|
|
145
|
+
* @returns The public inputs as outputs of the simulation.
|
|
146
|
+
*/
|
|
147
|
+
async getBlockRootRollupProof(input) {
|
|
148
|
+
// TODO(#7346): When batch rollups are integrated, we probably want the below to be this.createRecursiveProof
|
|
149
|
+
// since we will no longer be verifying it directly on L1
|
|
150
|
+
const { circuitOutput, proof } = await this.createProof(input, 'BlockRootRollupArtifact', convertBlockRootRollupInputsToWitnessMap, convertBlockRootRollupOutputsFromWitnessMap);
|
|
151
|
+
const recursiveProof = makeRecursiveProofFromBinary(proof, NESTED_RECURSIVE_PROOF_LENGTH);
|
|
152
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('BlockRootRollupArtifact');
|
|
153
|
+
await this.verifyProof('BlockRootRollupArtifact', proof);
|
|
154
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, recursiveProof, verificationKey);
|
|
155
|
+
}
|
|
156
|
+
/**
|
|
157
|
+
* Simulates the block merge rollup circuit from its inputs.
|
|
158
|
+
* @param input - Inputs to the circuit.
|
|
159
|
+
* @returns The public inputs as outputs of the simulation.
|
|
160
|
+
*/
|
|
161
|
+
async getBlockMergeRollupProof(input) {
|
|
162
|
+
const { circuitOutput, proof } = await this.createRecursiveProof(input, 'BlockMergeRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertBlockMergeRollupInputsToWitnessMap, convertBlockMergeRollupOutputsFromWitnessMap);
|
|
163
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('BlockMergeRollupArtifact');
|
|
164
|
+
await this.verifyProof('BlockMergeRollupArtifact', proof.binaryProof);
|
|
165
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
166
|
+
}
|
|
142
167
|
/**
|
|
143
168
|
* Simulates the root rollup circuit from its inputs.
|
|
144
169
|
* @param input - Inputs to the circuit.
|
|
@@ -561,4 +586,4 @@ let BBNativeRollupProver = (() => {
|
|
|
561
586
|
_a;
|
|
562
587
|
})();
|
|
563
588
|
export { BBNativeRollupProver };
|
|
564
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_prover.js","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
|
|
589
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_prover.js","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
|
package/dest/stats.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../src/stats.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAE/G,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,sBAAsB,GAAG,sBAAsB,GACxD,WAAW,
|
|
1
|
+
{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../src/stats.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAE/G,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,sBAAsB,GAAG,sBAAsB,GACxD,WAAW,CAqDb"}
|
package/dest/stats.js
CHANGED
|
@@ -9,6 +9,10 @@ export function mapProtocolArtifactNameToCircuitName(artifact) {
|
|
|
9
9
|
return 'base-rollup';
|
|
10
10
|
case 'MergeRollupArtifact':
|
|
11
11
|
return 'merge-rollup';
|
|
12
|
+
case 'BlockRootRollupArtifact':
|
|
13
|
+
return 'block-root-rollup';
|
|
14
|
+
case 'BlockMergeRollupArtifact':
|
|
15
|
+
return 'block-merge-rollup';
|
|
12
16
|
case 'RootRollupArtifact':
|
|
13
17
|
return 'root-rollup';
|
|
14
18
|
case 'PublicKernelSetupArtifact':
|
|
@@ -49,4 +53,4 @@ export function mapProtocolArtifactNameToCircuitName(artifact) {
|
|
|
49
53
|
}
|
|
50
54
|
}
|
|
51
55
|
}
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc3RhdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFcEUsTUFBTSxVQUFVLG9DQUFvQyxDQUNsRCxRQUF5RDtJQUV6RCxRQUFRLFFBQVEsRUFBRSxDQUFDO1FBQ2pCLEtBQUssb0JBQW9CO1lBQ3ZCLE9BQU8sYUFBYSxDQUFDO1FBQ3ZCLEtBQUssb0JBQW9CO1lBQ3ZCLE9BQU8sYUFBYSxDQUFDO1FBQ3ZCLEtBQUssb0JBQW9CO1lBQ3ZCLE9BQU8sYUFBYSxDQUFDO1FBQ3ZCLEtBQUsscUJBQXFCO1lBQ3hCLE9BQU8sY0FBYyxDQUFDO1FBQ3hCLEtBQUsseUJBQXlCO1lBQzVCLE9BQU8sbUJBQW1CLENBQUM7UUFDN0IsS0FBSywwQkFBMEI7WUFDN0IsT0FBTyxvQkFBb0IsQ0FBQztRQUM5QixLQUFLLG9CQUFvQjtZQUN2QixPQUFPLGFBQWEsQ0FBQztRQUN2QixLQUFLLDJCQUEyQjtZQUM5QixPQUFPLHFCQUFxQixDQUFDO1FBQy9CLEtBQUssOEJBQThCO1lBQ2pDLE9BQU8seUJBQXlCLENBQUM7UUFDbkMsS0FBSyw4QkFBOEI7WUFDakMsT0FBTyx3QkFBd0IsQ0FBQztRQUNsQyxLQUFLLDBCQUEwQjtZQUM3QixPQUFPLG9CQUFvQixDQUFDO1FBQzlCLEtBQUssMkJBQTJCO1lBQzlCLE9BQU8scUJBQXFCLENBQUM7UUFDL0IsS0FBSyw0QkFBNEI7WUFDL0IsT0FBTyxzQkFBc0IsQ0FBQztRQUNoQyxLQUFLLDJCQUEyQjtZQUM5QixPQUFPLHFCQUFxQixDQUFDO1FBQy9CLEtBQUssbUNBQW1DO1lBQ3RDLE9BQU8sK0JBQStCLENBQUM7UUFDekMsS0FBSyxnQ0FBZ0M7WUFDbkMsT0FBTywyQkFBMkIsQ0FBQztRQUNyQyxLQUFLLHFDQUFxQztZQUN4QyxPQUFPLGlDQUFpQyxDQUFDO1FBQzNDLEtBQUssK0JBQStCO1lBQ2xDLE9BQU8sMEJBQTBCLENBQUM7UUFDcEMsS0FBSyxrQ0FBa0M7WUFDckMsT0FBTyw2QkFBNkIsQ0FBQztRQUN2QyxLQUFLLGlDQUFpQztZQUNwQyxPQUFPLDRCQUE0QixDQUFDO1FBQ3RDLEtBQUssZ0NBQWdDO1lBQ25DLE9BQU8sMkJBQTJCLENBQUM7UUFDckMsS0FBSyxxQkFBcUI7WUFDeEIsT0FBTyxjQUFjLENBQUM7UUFDeEIsS0FBSyw0QkFBNEI7WUFDL0IsT0FBTyxzQkFBc0IsQ0FBQztRQUNoQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ1IsTUFBTSxJQUFJLEdBQVUsUUFBUSxDQUFDO1lBQzdCLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDdkQsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ProofAndVerificationKey, type PublicInputsAndRecursiveProof, type PublicKernelNonTailRequest, type PublicKernelTailRequest, type ServerCircuitProver } from '@aztec/circuit-types';
|
|
2
|
-
import { type AvmCircuitInputs, type BaseOrMergeRollupPublicInputs, type BaseParityInputs, type BaseRollupInputs, type KernelCircuitPublicInputs, type MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, type PrivateKernelEmptyInputData, type Proof, type PublicKernelCircuitPublicInputs, RECURSIVE_PROOF_LENGTH, type RecursiveProof, RootParityInput, type RootParityInputs, type RootRollupInputs, type RootRollupPublicInputs, TUBE_PROOF_LENGTH, type TubeInputs, VerificationKeyData } from '@aztec/circuits.js';
|
|
2
|
+
import { type AvmCircuitInputs, type BaseOrMergeRollupPublicInputs, type BaseParityInputs, type BaseRollupInputs, type BlockMergeRollupInputs, type BlockRootOrBlockMergePublicInputs, type BlockRootRollupInputs, type KernelCircuitPublicInputs, type MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, type PrivateKernelEmptyInputData, type Proof, type PublicKernelCircuitPublicInputs, RECURSIVE_PROOF_LENGTH, type RecursiveProof, RootParityInput, type RootParityInputs, type RootRollupInputs, type RootRollupPublicInputs, TUBE_PROOF_LENGTH, type TubeInputs, VerificationKeyData } from '@aztec/circuits.js';
|
|
3
3
|
import { type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
|
|
4
4
|
import { type SimulationProvider } from '@aztec/simulator';
|
|
5
5
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
@@ -47,6 +47,18 @@ export declare class TestCircuitProver implements ServerCircuitProver {
|
|
|
47
47
|
* @returns The public inputs as outputs of the simulation.
|
|
48
48
|
*/
|
|
49
49
|
getMergeRollupProof(input: MergeRollupInputs): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>>;
|
|
50
|
+
/**
|
|
51
|
+
* Simulates the block root rollup circuit from its inputs.
|
|
52
|
+
* @param input - Inputs to the circuit.
|
|
53
|
+
* @returns The public inputs as outputs of the simulation.
|
|
54
|
+
*/
|
|
55
|
+
getBlockRootRollupProof(input: BlockRootRollupInputs): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
56
|
+
/**
|
|
57
|
+
* Simulates the block merge rollup circuit from its inputs.
|
|
58
|
+
* @param input - Inputs to the circuit.
|
|
59
|
+
* @returns The public inputs as outputs of the simulation.
|
|
60
|
+
*/
|
|
61
|
+
getBlockMergeRollupProof(input: BlockMergeRollupInputs): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
50
62
|
/**
|
|
51
63
|
* Simulates the root rollup circuit from its inputs.
|
|
52
64
|
* @param input - Inputs to the circuit.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test_circuit_prover.d.ts","sourceRoot":"","sources":["../../src/test/test_circuit_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,6BAA6B,EAClC,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAClC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,
|
|
1
|
+
{"version":3,"file":"test_circuit_prover.d.ts","sourceRoot":"","sources":["../../src/test/test_circuit_prover.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { EmptyNestedData, NESTED_RECURSIVE_PROOF_LENGTH, PrivateKernelEmptyInput
|
|
|
4
4
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
5
5
|
import { sleep } from '@aztec/foundation/sleep';
|
|
6
6
|
import { Timer } from '@aztec/foundation/timer';
|
|
7
|
-
import { ProtocolCircuitVkIndexes, ProtocolCircuitVks, SimulatedServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, convertSimulatedBaseRollupInputsToWitnessMap, convertSimulatedBaseRollupOutputsFromWitnessMap, convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap, convertSimulatedPublicTailInputsToWitnessMap, convertSimulatedPublicTailOutputFromWitnessMap, getVKSiblingPath, } from '@aztec/noir-protocol-circuits-types';
|
|
7
|
+
import { ProtocolCircuitVkIndexes, ProtocolCircuitVks, SimulatedServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertBlockMergeRollupInputsToWitnessMap, convertBlockMergeRollupOutputsFromWitnessMap, convertBlockRootRollupInputsToWitnessMap, convertBlockRootRollupOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, convertSimulatedBaseRollupInputsToWitnessMap, convertSimulatedBaseRollupOutputsFromWitnessMap, convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap, convertSimulatedPublicTailInputsToWitnessMap, convertSimulatedPublicTailOutputFromWitnessMap, getVKSiblingPath, } from '@aztec/noir-protocol-circuits-types';
|
|
8
8
|
import { WASMSimulator, emitCircuitSimulationStats } from '@aztec/simulator';
|
|
9
9
|
import { trackSpan } from '@aztec/telemetry-client';
|
|
10
10
|
import { ProverInstrumentation } from '../instrumentation.js';
|
|
@@ -21,6 +21,8 @@ let TestCircuitProver = (() => {
|
|
|
21
21
|
let _getRootParityProof_decorators;
|
|
22
22
|
let _getBaseRollupProof_decorators;
|
|
23
23
|
let _getMergeRollupProof_decorators;
|
|
24
|
+
let _getBlockRootRollupProof_decorators;
|
|
25
|
+
let _getBlockMergeRollupProof_decorators;
|
|
24
26
|
let _getRootRollupProof_decorators;
|
|
25
27
|
let _getPublicKernelProof_decorators;
|
|
26
28
|
let _getPublicTailProof_decorators;
|
|
@@ -126,6 +128,36 @@ let TestCircuitProver = (() => {
|
|
|
126
128
|
await this.delay();
|
|
127
129
|
return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['MergeRollupArtifact']);
|
|
128
130
|
}
|
|
131
|
+
/**
|
|
132
|
+
* Simulates the block root rollup circuit from its inputs.
|
|
133
|
+
* @param input - Inputs to the circuit.
|
|
134
|
+
* @returns The public inputs as outputs of the simulation.
|
|
135
|
+
*/
|
|
136
|
+
async getBlockRootRollupProof(input) {
|
|
137
|
+
const timer = new Timer();
|
|
138
|
+
const witnessMap = convertBlockRootRollupInputsToWitnessMap(input);
|
|
139
|
+
// use WASM here as it is faster for small circuits
|
|
140
|
+
const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BlockRootRollupArtifact);
|
|
141
|
+
const result = convertBlockRootRollupOutputsFromWitnessMap(witness);
|
|
142
|
+
this.instrumentation.recordDuration('simulationDuration', 'block-root-rollup', timer);
|
|
143
|
+
emitCircuitSimulationStats('block-root-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
|
|
144
|
+
return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['BlockRootRollupArtifact']);
|
|
145
|
+
}
|
|
146
|
+
/**
|
|
147
|
+
* Simulates the block merge rollup circuit from its inputs.
|
|
148
|
+
* @param input - Inputs to the circuit.
|
|
149
|
+
* @returns The public inputs as outputs of the simulation.
|
|
150
|
+
*/
|
|
151
|
+
async getBlockMergeRollupProof(input) {
|
|
152
|
+
const timer = new Timer();
|
|
153
|
+
const witnessMap = convertBlockMergeRollupInputsToWitnessMap(input);
|
|
154
|
+
// use WASM here as it is faster for small circuits
|
|
155
|
+
const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BlockMergeRollupArtifact);
|
|
156
|
+
const result = convertBlockMergeRollupOutputsFromWitnessMap(witness);
|
|
157
|
+
this.instrumentation.recordDuration('simulationDuration', 'block-merge-rollup', timer);
|
|
158
|
+
emitCircuitSimulationStats('block-merge-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
|
|
159
|
+
return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['BlockMergeRollupArtifact']);
|
|
160
|
+
}
|
|
129
161
|
/**
|
|
130
162
|
* Simulates the root rollup circuit from its inputs.
|
|
131
163
|
* @param input - Inputs to the circuit.
|
|
@@ -191,6 +223,8 @@ let TestCircuitProver = (() => {
|
|
|
191
223
|
_getRootParityProof_decorators = [trackSpan('TestCircuitProver.getRootParityProof')];
|
|
192
224
|
_getBaseRollupProof_decorators = [trackSpan('TestCircuitProver.getBaseRollupProof')];
|
|
193
225
|
_getMergeRollupProof_decorators = [trackSpan('TestCircuitProver.getMergeRollupProof')];
|
|
226
|
+
_getBlockRootRollupProof_decorators = [trackSpan('TestCircuitProver.getBlockRootRollupProof')];
|
|
227
|
+
_getBlockMergeRollupProof_decorators = [trackSpan('TestCircuitProver.getBlockMergeRollupProof')];
|
|
194
228
|
_getRootRollupProof_decorators = [trackSpan('TestCircuitProver.getRootRollupProof')];
|
|
195
229
|
_getPublicKernelProof_decorators = [trackSpan('TestCircuitProver.getPublicKernelProof')];
|
|
196
230
|
_getPublicTailProof_decorators = [trackSpan('TestCircuitProver.getPublicTailProof')];
|
|
@@ -198,6 +232,8 @@ let TestCircuitProver = (() => {
|
|
|
198
232
|
__esDecorate(_a, null, _getRootParityProof_decorators, { kind: "method", name: "getRootParityProof", static: false, private: false, access: { has: obj => "getRootParityProof" in obj, get: obj => obj.getRootParityProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
199
233
|
__esDecorate(_a, null, _getBaseRollupProof_decorators, { kind: "method", name: "getBaseRollupProof", static: false, private: false, access: { has: obj => "getBaseRollupProof" in obj, get: obj => obj.getBaseRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
200
234
|
__esDecorate(_a, null, _getMergeRollupProof_decorators, { kind: "method", name: "getMergeRollupProof", static: false, private: false, access: { has: obj => "getMergeRollupProof" in obj, get: obj => obj.getMergeRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
235
|
+
__esDecorate(_a, null, _getBlockRootRollupProof_decorators, { kind: "method", name: "getBlockRootRollupProof", static: false, private: false, access: { has: obj => "getBlockRootRollupProof" in obj, get: obj => obj.getBlockRootRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
236
|
+
__esDecorate(_a, null, _getBlockMergeRollupProof_decorators, { kind: "method", name: "getBlockMergeRollupProof", static: false, private: false, access: { has: obj => "getBlockMergeRollupProof" in obj, get: obj => obj.getBlockMergeRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
201
237
|
__esDecorate(_a, null, _getRootRollupProof_decorators, { kind: "method", name: "getRootRollupProof", static: false, private: false, access: { has: obj => "getRootRollupProof" in obj, get: obj => obj.getRootRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
202
238
|
__esDecorate(_a, null, _getPublicKernelProof_decorators, { kind: "method", name: "getPublicKernelProof", static: false, private: false, access: { has: obj => "getPublicKernelProof" in obj, get: obj => obj.getPublicKernelProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
203
239
|
__esDecorate(_a, null, _getPublicTailProof_decorators, { kind: "method", name: "getPublicTailProof", static: false, private: false, access: { has: obj => "getPublicTailProof" in obj, get: obj => obj.getPublicTailProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
@@ -206,4 +242,4 @@ let TestCircuitProver = (() => {
|
|
|
206
242
|
_a;
|
|
207
243
|
})();
|
|
208
244
|
export { TestCircuitProver };
|
|
209
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_circuit_prover.js","sourceRoot":"","sources":["../../src/test/test_circuit_prover.ts"],"names":[],"mappings":"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"}
|
|
245
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_circuit_prover.js","sourceRoot":"","sources":["../../src/test/test_circuit_prover.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bb_verifier.d.ts","sourceRoot":"","sources":["../../src/verifier/bb_verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,6BAA6B,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAE9E,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG1E,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,qCAAqC,CAAC;AAc7C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI7C,qBAAa,iBAAkB,YAAW,6BAA6B;IAEnE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,MAAM;IAHhB,OAAO;WAMa,GAAG,CACrB,MAAM,EAAE,QAAQ,EAChB,eAAe,GAAE,gBAAgB,EAAO,EACxC,MAAM,yCAAyC;
|
|
1
|
+
{"version":3,"file":"bb_verifier.d.ts","sourceRoot":"","sources":["../../src/verifier/bb_verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,6BAA6B,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAE9E,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG1E,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,qCAAqC,CAAC;AAc7C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI7C,qBAAa,iBAAkB,YAAW,6BAA6B;IAEnE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,MAAM;IAHhB,OAAO;WAMa,GAAG,CACrB,MAAM,EAAE,QAAQ,EAChB,eAAe,GAAE,gBAAgB,EAAO,EACxC,MAAM,yCAAyC;mBAgB5B,uBAAuB;IAsB/B,sBAAsB,CAAC,OAAO,EAAE,gBAAgB;IAehD,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK;IAgC7D,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM;IAiBxE,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAuCnD"}
|
|
@@ -14,6 +14,7 @@ export class BBCircuitVerifier {
|
|
|
14
14
|
this.logger = logger;
|
|
15
15
|
}
|
|
16
16
|
static async new(config, initialCircuits = [], logger = createDebugLogger('aztec:bb-verifier')) {
|
|
17
|
+
await fs.mkdir(config.bbWorkingDirectory, { recursive: true });
|
|
17
18
|
const keys = new Map();
|
|
18
19
|
for (const circuit of initialCircuits) {
|
|
19
20
|
const vkData = await this.generateVerificationKey(circuit, config.bbBinaryPath, config.bbWorkingDirectory, logger.debug);
|
|
@@ -107,4 +108,4 @@ export class BBCircuitVerifier {
|
|
|
107
108
|
}
|
|
108
109
|
}
|
|
109
110
|
}
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmJfdmVyaWZpZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmVyaWZpZXIvYmJfdmVyaWZpZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFzQyxFQUFFLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUc5RSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFnQyxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3hGLE9BQU8sRUFHTCx3QkFBd0IsR0FDekIsTUFBTSxxQ0FBcUMsQ0FBQztBQUU3QyxPQUFPLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsQyxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUU3QixPQUFPLEVBQ0wsU0FBUyxFQUNULGNBQWMsRUFDZCxXQUFXLEVBQ1gsMEJBQTBCLEVBQzFCLHlCQUF5QixFQUN6QixvQkFBb0IsRUFDcEIsV0FBVyxHQUNaLE1BQU0sa0JBQWtCLENBQUM7QUFFMUIsT0FBTyxFQUFFLG9DQUFvQyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ25FLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUU3RSxNQUFNLE9BQU8saUJBQWlCO0lBQzVCLFlBQ1UsTUFBZ0IsRUFDaEIsbUJBQW1CLElBQUksR0FBRyxFQUFrRCxFQUM1RSxNQUFtQjtRQUZuQixXQUFNLEdBQU4sTUFBTSxDQUFVO1FBQ2hCLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBNEQ7UUFDNUUsV0FBTSxHQUFOLE1BQU0sQ0FBYTtJQUMxQixDQUFDO0lBRUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQ3JCLE1BQWdCLEVBQ2hCLGtCQUFzQyxFQUFFLEVBQ3hDLE1BQU0sR0FBRyxpQkFBaUIsQ0FBQyxtQkFBbUIsQ0FBQztRQUUvQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLGtCQUFrQixFQUFF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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/bb-prover",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.50.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js"
|
|
@@ -59,12 +59,12 @@
|
|
|
59
59
|
]
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@aztec/circuit-types": "0.
|
|
63
|
-
"@aztec/circuits.js": "0.
|
|
64
|
-
"@aztec/foundation": "0.
|
|
65
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
66
|
-
"@aztec/simulator": "0.
|
|
67
|
-
"@aztec/telemetry-client": "0.
|
|
62
|
+
"@aztec/circuit-types": "0.50.1",
|
|
63
|
+
"@aztec/circuits.js": "0.50.1",
|
|
64
|
+
"@aztec/foundation": "0.50.1",
|
|
65
|
+
"@aztec/noir-protocol-circuits-types": "0.50.1",
|
|
66
|
+
"@aztec/simulator": "0.50.1",
|
|
67
|
+
"@aztec/telemetry-client": "0.50.1",
|
|
68
68
|
"@msgpack/msgpack": "^3.0.0-beta2",
|
|
69
69
|
"@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
|
|
70
70
|
"@noir-lang/types": "portal:../../noir/packages/types",
|
|
@@ -22,7 +22,7 @@ import {
|
|
|
22
22
|
} from '@aztec/circuits.js';
|
|
23
23
|
import { siloNoteHash } from '@aztec/circuits.js/hash';
|
|
24
24
|
import { runInDirectory } from '@aztec/foundation/fs';
|
|
25
|
-
import { createDebugLogger } from '@aztec/foundation/log';
|
|
25
|
+
import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
|
|
26
26
|
import { Timer } from '@aztec/foundation/timer';
|
|
27
27
|
import {
|
|
28
28
|
ClientCircuitArtifacts,
|
|
@@ -57,6 +57,7 @@ import {
|
|
|
57
57
|
executeBbClientIvcProof,
|
|
58
58
|
verifyProof,
|
|
59
59
|
} from '../bb/execute.js';
|
|
60
|
+
import { type BBConfig } from '../config.js';
|
|
60
61
|
import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
|
|
61
62
|
import { extractVkData } from '../verification_key/verification_key_data.js';
|
|
62
63
|
|
|
@@ -73,13 +74,18 @@ export class BBNativePrivateKernelProver implements PrivateKernelProver {
|
|
|
73
74
|
Promise<VerificationKeyData>
|
|
74
75
|
>();
|
|
75
76
|
|
|
76
|
-
constructor(
|
|
77
|
+
private constructor(
|
|
77
78
|
private bbBinaryPath: string,
|
|
78
79
|
private bbWorkingDirectory: string,
|
|
79
80
|
private skipCleanup: boolean,
|
|
80
81
|
private log = createDebugLogger('aztec:bb-native-prover'),
|
|
81
82
|
) {}
|
|
82
83
|
|
|
84
|
+
public static async new(config: BBConfig, log?: DebugLogger) {
|
|
85
|
+
await fs.mkdir(config.bbWorkingDirectory, { recursive: true });
|
|
86
|
+
return new BBNativePrivateKernelProver(config.bbBinaryPath, config.bbWorkingDirectory, !!config.bbSkipCleanup, log);
|
|
87
|
+
}
|
|
88
|
+
|
|
83
89
|
private async _createClientIvcProof(
|
|
84
90
|
directory: string,
|
|
85
91
|
acirs: Buffer[],
|
package/src/prover/bb_prover.ts
CHANGED
|
@@ -14,6 +14,9 @@ import {
|
|
|
14
14
|
type BaseOrMergeRollupPublicInputs,
|
|
15
15
|
type BaseParityInputs,
|
|
16
16
|
type BaseRollupInputs,
|
|
17
|
+
type BlockMergeRollupInputs,
|
|
18
|
+
type BlockRootOrBlockMergePublicInputs,
|
|
19
|
+
type BlockRootRollupInputs,
|
|
17
20
|
EmptyNestedCircuitInputs,
|
|
18
21
|
EmptyNestedData,
|
|
19
22
|
Fr,
|
|
@@ -47,6 +50,10 @@ import {
|
|
|
47
50
|
convertBaseParityOutputsFromWitnessMap,
|
|
48
51
|
convertBaseRollupInputsToWitnessMap,
|
|
49
52
|
convertBaseRollupOutputsFromWitnessMap,
|
|
53
|
+
convertBlockMergeRollupInputsToWitnessMap,
|
|
54
|
+
convertBlockMergeRollupOutputsFromWitnessMap,
|
|
55
|
+
convertBlockRootRollupInputsToWitnessMap,
|
|
56
|
+
convertBlockRootRollupOutputsFromWitnessMap,
|
|
50
57
|
convertMergeRollupInputsToWitnessMap,
|
|
51
58
|
convertMergeRollupOutputsFromWitnessMap,
|
|
52
59
|
convertPrivateKernelEmptyInputsToWitnessMap,
|
|
@@ -324,6 +331,55 @@ export class BBNativeRollupProver implements ServerCircuitProver {
|
|
|
324
331
|
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
325
332
|
}
|
|
326
333
|
|
|
334
|
+
/**
|
|
335
|
+
* Simulates the block root rollup circuit from its inputs.
|
|
336
|
+
* @param input - Inputs to the circuit.
|
|
337
|
+
* @returns The public inputs as outputs of the simulation.
|
|
338
|
+
*/
|
|
339
|
+
public async getBlockRootRollupProof(
|
|
340
|
+
input: BlockRootRollupInputs,
|
|
341
|
+
): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
|
|
342
|
+
// TODO(#7346): When batch rollups are integrated, we probably want the below to be this.createRecursiveProof
|
|
343
|
+
// since we will no longer be verifying it directly on L1
|
|
344
|
+
const { circuitOutput, proof } = await this.createProof(
|
|
345
|
+
input,
|
|
346
|
+
'BlockRootRollupArtifact',
|
|
347
|
+
convertBlockRootRollupInputsToWitnessMap,
|
|
348
|
+
convertBlockRootRollupOutputsFromWitnessMap,
|
|
349
|
+
);
|
|
350
|
+
|
|
351
|
+
const recursiveProof = makeRecursiveProofFromBinary(proof, NESTED_RECURSIVE_PROOF_LENGTH);
|
|
352
|
+
|
|
353
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('BlockRootRollupArtifact');
|
|
354
|
+
|
|
355
|
+
await this.verifyProof('BlockRootRollupArtifact', proof);
|
|
356
|
+
|
|
357
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, recursiveProof, verificationKey);
|
|
358
|
+
}
|
|
359
|
+
|
|
360
|
+
/**
|
|
361
|
+
* Simulates the block merge rollup circuit from its inputs.
|
|
362
|
+
* @param input - Inputs to the circuit.
|
|
363
|
+
* @returns The public inputs as outputs of the simulation.
|
|
364
|
+
*/
|
|
365
|
+
public async getBlockMergeRollupProof(
|
|
366
|
+
input: BlockMergeRollupInputs,
|
|
367
|
+
): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
|
|
368
|
+
const { circuitOutput, proof } = await this.createRecursiveProof(
|
|
369
|
+
input,
|
|
370
|
+
'BlockMergeRollupArtifact',
|
|
371
|
+
NESTED_RECURSIVE_PROOF_LENGTH,
|
|
372
|
+
convertBlockMergeRollupInputsToWitnessMap,
|
|
373
|
+
convertBlockMergeRollupOutputsFromWitnessMap,
|
|
374
|
+
);
|
|
375
|
+
|
|
376
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('BlockMergeRollupArtifact');
|
|
377
|
+
|
|
378
|
+
await this.verifyProof('BlockMergeRollupArtifact', proof.binaryProof);
|
|
379
|
+
|
|
380
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
381
|
+
}
|
|
382
|
+
|
|
327
383
|
/**
|
|
328
384
|
* Simulates the root rollup circuit from its inputs.
|
|
329
385
|
* @param input - Inputs to the circuit.
|
package/src/stats.ts
CHANGED
|
@@ -15,6 +15,10 @@ export function mapProtocolArtifactNameToCircuitName(
|
|
|
15
15
|
return 'base-rollup';
|
|
16
16
|
case 'MergeRollupArtifact':
|
|
17
17
|
return 'merge-rollup';
|
|
18
|
+
case 'BlockRootRollupArtifact':
|
|
19
|
+
return 'block-root-rollup';
|
|
20
|
+
case 'BlockMergeRollupArtifact':
|
|
21
|
+
return 'block-merge-rollup';
|
|
18
22
|
case 'RootRollupArtifact':
|
|
19
23
|
return 'root-rollup';
|
|
20
24
|
case 'PublicKernelSetupArtifact':
|
|
@@ -11,6 +11,9 @@ import {
|
|
|
11
11
|
type BaseOrMergeRollupPublicInputs,
|
|
12
12
|
type BaseParityInputs,
|
|
13
13
|
type BaseRollupInputs,
|
|
14
|
+
type BlockMergeRollupInputs,
|
|
15
|
+
type BlockRootOrBlockMergePublicInputs,
|
|
16
|
+
type BlockRootRollupInputs,
|
|
14
17
|
EmptyNestedData,
|
|
15
18
|
type KernelCircuitPublicInputs,
|
|
16
19
|
type MergeRollupInputs,
|
|
@@ -42,6 +45,10 @@ import {
|
|
|
42
45
|
SimulatedServerCircuitArtifacts,
|
|
43
46
|
convertBaseParityInputsToWitnessMap,
|
|
44
47
|
convertBaseParityOutputsFromWitnessMap,
|
|
48
|
+
convertBlockMergeRollupInputsToWitnessMap,
|
|
49
|
+
convertBlockMergeRollupOutputsFromWitnessMap,
|
|
50
|
+
convertBlockRootRollupInputsToWitnessMap,
|
|
51
|
+
convertBlockRootRollupOutputsFromWitnessMap,
|
|
45
52
|
convertMergeRollupInputsToWitnessMap,
|
|
46
53
|
convertMergeRollupOutputsFromWitnessMap,
|
|
47
54
|
convertPrivateKernelEmptyInputsToWitnessMap,
|
|
@@ -299,6 +306,76 @@ export class TestCircuitProver implements ServerCircuitProver {
|
|
|
299
306
|
);
|
|
300
307
|
}
|
|
301
308
|
|
|
309
|
+
/**
|
|
310
|
+
* Simulates the block root rollup circuit from its inputs.
|
|
311
|
+
* @param input - Inputs to the circuit.
|
|
312
|
+
* @returns The public inputs as outputs of the simulation.
|
|
313
|
+
*/
|
|
314
|
+
@trackSpan('TestCircuitProver.getBlockRootRollupProof')
|
|
315
|
+
public async getBlockRootRollupProof(
|
|
316
|
+
input: BlockRootRollupInputs,
|
|
317
|
+
): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
|
|
318
|
+
const timer = new Timer();
|
|
319
|
+
const witnessMap = convertBlockRootRollupInputsToWitnessMap(input);
|
|
320
|
+
|
|
321
|
+
// use WASM here as it is faster for small circuits
|
|
322
|
+
const witness = await this.wasmSimulator.simulateCircuit(
|
|
323
|
+
witnessMap,
|
|
324
|
+
SimulatedServerCircuitArtifacts.BlockRootRollupArtifact,
|
|
325
|
+
);
|
|
326
|
+
|
|
327
|
+
const result = convertBlockRootRollupOutputsFromWitnessMap(witness);
|
|
328
|
+
|
|
329
|
+
this.instrumentation.recordDuration('simulationDuration', 'block-root-rollup', timer);
|
|
330
|
+
emitCircuitSimulationStats(
|
|
331
|
+
'block-root-rollup',
|
|
332
|
+
timer.ms(),
|
|
333
|
+
input.toBuffer().length,
|
|
334
|
+
result.toBuffer().length,
|
|
335
|
+
this.logger,
|
|
336
|
+
);
|
|
337
|
+
return makePublicInputsAndRecursiveProof(
|
|
338
|
+
result,
|
|
339
|
+
makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
|
|
340
|
+
ProtocolCircuitVks['BlockRootRollupArtifact'],
|
|
341
|
+
);
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
/**
|
|
345
|
+
* Simulates the block merge rollup circuit from its inputs.
|
|
346
|
+
* @param input - Inputs to the circuit.
|
|
347
|
+
* @returns The public inputs as outputs of the simulation.
|
|
348
|
+
*/
|
|
349
|
+
@trackSpan('TestCircuitProver.getBlockMergeRollupProof')
|
|
350
|
+
public async getBlockMergeRollupProof(
|
|
351
|
+
input: BlockMergeRollupInputs,
|
|
352
|
+
): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
|
|
353
|
+
const timer = new Timer();
|
|
354
|
+
const witnessMap = convertBlockMergeRollupInputsToWitnessMap(input);
|
|
355
|
+
|
|
356
|
+
// use WASM here as it is faster for small circuits
|
|
357
|
+
const witness = await this.wasmSimulator.simulateCircuit(
|
|
358
|
+
witnessMap,
|
|
359
|
+
SimulatedServerCircuitArtifacts.BlockMergeRollupArtifact,
|
|
360
|
+
);
|
|
361
|
+
|
|
362
|
+
const result = convertBlockMergeRollupOutputsFromWitnessMap(witness);
|
|
363
|
+
|
|
364
|
+
this.instrumentation.recordDuration('simulationDuration', 'block-merge-rollup', timer);
|
|
365
|
+
emitCircuitSimulationStats(
|
|
366
|
+
'block-merge-rollup',
|
|
367
|
+
timer.ms(),
|
|
368
|
+
input.toBuffer().length,
|
|
369
|
+
result.toBuffer().length,
|
|
370
|
+
this.logger,
|
|
371
|
+
);
|
|
372
|
+
return makePublicInputsAndRecursiveProof(
|
|
373
|
+
result,
|
|
374
|
+
makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
|
|
375
|
+
ProtocolCircuitVks['BlockMergeRollupArtifact'],
|
|
376
|
+
);
|
|
377
|
+
}
|
|
378
|
+
|
|
302
379
|
/**
|
|
303
380
|
* Simulates the root rollup circuit from its inputs.
|
|
304
381
|
* @param input - Inputs to the circuit.
|
|
@@ -37,6 +37,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
|
|
|
37
37
|
initialCircuits: ProtocolArtifact[] = [],
|
|
38
38
|
logger = createDebugLogger('aztec:bb-verifier'),
|
|
39
39
|
) {
|
|
40
|
+
await fs.mkdir(config.bbWorkingDirectory, { recursive: true });
|
|
40
41
|
const keys = new Map<ProtocolArtifact, Promise<VerificationKeyData>>();
|
|
41
42
|
for (const circuit of initialCircuits) {
|
|
42
43
|
const vkData = await this.generateVerificationKey(
|