@aztec/prover-client 0.72.1 → 0.74.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/bin/get-proof-inputs.js +3 -3
- package/dest/mocks/test_context.d.ts +2 -2
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +6 -6
- package/dest/orchestrator/block-building-helpers.d.ts +3 -3
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +14 -13
- package/dest/orchestrator/block-proving-state.d.ts +6 -6
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +27 -25
- package/dest/orchestrator/epoch-proving-state.d.ts +3 -3
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +11 -8
- package/dest/orchestrator/orchestrator.d.ts +1 -1
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +59 -59
- package/dest/orchestrator/tx-proving-state.d.ts +2 -2
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/tx-proving-state.js +14 -14
- package/dest/prover-client/server-epoch-prover.d.ts +1 -1
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -1
- package/dest/prover-client/server-epoch-prover.js +2 -2
- package/dest/proving_broker/broker_prover_facade.js +3 -3
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +3 -4
- package/dest/proving_broker/proving_broker_database/memory.d.ts +1 -1
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/memory.js +3 -3
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +12 -12
- package/dest/proving_broker/proving_broker_database.d.ts +1 -1
- package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
- package/package.json +11 -11
- package/src/bin/get-proof-inputs.ts +2 -2
- package/src/mocks/test_context.ts +9 -7
- package/src/orchestrator/block-building-helpers.ts +13 -14
- package/src/orchestrator/block-proving-state.ts +26 -24
- package/src/orchestrator/epoch-proving-state.ts +10 -7
- package/src/orchestrator/orchestrator.ts +65 -60
- package/src/orchestrator/tx-proving-state.ts +14 -14
- package/src/prover-client/server-epoch-prover.ts +2 -2
- package/src/proving_broker/broker_prover_facade.ts +3 -3
- package/src/proving_broker/proof_store/inline_proof_store.ts +1 -1
- package/src/proving_broker/proving_broker.ts +2 -4
- package/src/proving_broker/proving_broker_database/memory.ts +2 -2
- package/src/proving_broker/proving_broker_database/persisted.ts +15 -15
- package/src/proving_broker/proving_broker_database.ts +1 -1
|
@@ -26,13 +26,13 @@ async function main() {
|
|
|
26
26
|
const input = await proofStore.getProofInput(uri);
|
|
27
27
|
logger.info(`Found inputs for ${ProvingRequestType[input.type]}`);
|
|
28
28
|
writeProofInputs(input, outDir);
|
|
29
|
-
console.log(jsonParseWithSchema(jsonStringify(input), ProvingJobInputs).inputs);
|
|
29
|
+
console.log((await jsonParseWithSchema(jsonStringify(input), ProvingJobInputs)).inputs);
|
|
30
30
|
}
|
|
31
31
|
// This mimics the behavior of bb-prover/src/bb/execute.ts
|
|
32
32
|
function writeProofInputs(input, outDir) {
|
|
33
33
|
switch (input.type) {
|
|
34
34
|
case ProvingRequestType.PUBLIC_VM: {
|
|
35
|
-
writeFileSync(`${outDir}/${AVM_PUBLIC_INPUTS_FILENAME}`, input.inputs.
|
|
35
|
+
writeFileSync(`${outDir}/${AVM_PUBLIC_INPUTS_FILENAME}`, input.inputs.publicInputs.toBuffer());
|
|
36
36
|
logger.info(`Wrote AVM public inputs to ${AVM_PUBLIC_INPUTS_FILENAME}`);
|
|
37
37
|
writeFileSync(`${outDir}/${AVM_HINTS_FILENAME}`, input.inputs.avmHints.toBuffer());
|
|
38
38
|
logger.info(`Wrote AVM hints to ${AVM_HINTS_FILENAME}`);
|
|
@@ -47,4 +47,4 @@ main().catch(err => {
|
|
|
47
47
|
console.error(err);
|
|
48
48
|
process.exit(1);
|
|
49
49
|
});
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LXByb29mLWlucHV0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vZ2V0LXByb29mLWlucHV0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwrQkFBK0I7QUFDL0IsT0FBTyxFQUFFLGtCQUFrQixFQUFFLDBCQUEwQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbEYsT0FBTyxFQUFpQixnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzNGLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxhQUFhLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNoRixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFckQsT0FBTyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFFOUMsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFcEUsTUFBTSxNQUFNLEdBQUcsWUFBWSxDQUFDLGdDQUFnQyxDQUFDLENBQUM7QUFFOUQsU0FBUyxVQUFVO0lBQ2pCLE9BQU8sQ0FBQyxLQUFLLENBQUMsaURBQWlELENBQUMsQ0FBQztBQUNuRSxDQUFDO0FBRUQsS0FBSyxVQUFVLElBQUk7SUFDakIsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQ2pDLFVBQVUsRUFBRSxDQUFDO1FBQ2IsT0FBTztJQUNULENBQUM7SUFFRCxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVCLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxDQUFDO0lBQ3RDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNULFVBQVUsRUFBRSxDQUFDO1FBQ2IsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFFRCxTQUFTLENBQUMsTUFBTSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFFdkMsTUFBTSxVQUFVLEdBQUcsc0JBQXNCLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDL0MsTUFBTSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUNyQyxNQUFNLEtBQUssR0FBRyxNQUFNLFVBQVUsQ0FBQyxhQUFhLENBQUMsR0FBZSxDQUFDLENBQUM7SUFDOUQsTUFBTSxDQUFDLElBQUksQ0FBQyxvQkFBb0Isa0JBQWtCLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUNsRSxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFFaEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sbUJBQW1CLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUMxRixDQUFDO0FBRUQsMERBQTBEO0FBQzFELFNBQVMsZ0JBQWdCLENBQUMsS0FBdUIsRUFBRSxNQUFjO0lBQy9ELFFBQVEsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ25CLEtBQUssa0JBQWtCLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztZQUNsQyxhQUFhLENBQUMsR0FBRyxNQUFNLElBQUksMEJBQTBCLEVBQUUsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1lBQy9GLE1BQU0sQ0FBQyxJQUFJLENBQUMsOEJBQThCLDBCQUEwQixFQUFFLENBQUMsQ0FBQztZQUN4RSxhQUFhLENBQUMsR0FBRyxNQUFNLElBQUksa0JBQWtCLEVBQUUsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1lBQ25GLE1BQU0sQ0FBQyxJQUFJLENBQUMsc0JBQXNCLGtCQUFrQixFQUFFLENBQUMsQ0FBQztZQUN4RCxNQUFNO1FBQ1IsQ0FBQztRQUNELE9BQU8sQ0FBQyxDQUFDLENBQUM7WUFDUixNQUFNLElBQUksS0FBSyxDQUFDLHVDQUF1QyxrQkFBa0IsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQzNGLENBQUM7SUFDSCxDQUFDO0FBQ0gsQ0FBQztBQUVELElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtJQUNqQixPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ25CLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbEIsQ0FBQyxDQUFDLENBQUMifQ==
|
|
@@ -29,8 +29,8 @@ export declare class TestContext {
|
|
|
29
29
|
getBlockHeader(blockNumber: number): BlockHeader | undefined;
|
|
30
30
|
getPreviousBlockHeader(currentBlockNumber?: number): BlockHeader;
|
|
31
31
|
cleanup(): Promise<void>;
|
|
32
|
-
makeProcessedTx(opts?: Parameters<typeof makeBloatedProcessedTx>[0]): ProcessedTx
|
|
33
|
-
makeProcessedTx(seed?: number): ProcessedTx
|
|
32
|
+
makeProcessedTx(opts?: Parameters<typeof makeBloatedProcessedTx>[0]): Promise<ProcessedTx>;
|
|
33
|
+
makeProcessedTx(seed?: number): Promise<ProcessedTx>;
|
|
34
34
|
/** Creates a block with the given number of txs and adds it to world-state */
|
|
35
35
|
makePendingBlock(numTxs: number, numMsgs?: number, blockNumOrGlobals?: GlobalVariables | number, makeProcessedTxOpts?: (index: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]>): Promise<{
|
|
36
36
|
block: L2Block;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,WAAW,EAEhB,KAAK,mBAAmB,EACxB,KAAK,EAAE,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,WAAW,EAEhB,KAAK,eAAe,EAErB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,KAAK,kBAAkB,EAGxB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAWlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,qBAAa,WAAW;IAIb,iBAAiB,EAAE,iBAAiB;IACpC,UAAU,EAAE,uBAAuB;IACnC,eAAe,EAAE,eAAe;IAChC,kBAAkB,EAAE,kBAAkB;IACtC,eAAe,EAAE,eAAe;IAChC,MAAM,EAAE,mBAAmB;IAC3B,WAAW,EAAE,WAAW;IACxB,YAAY,EAAE,uBAAuB;IACrC,WAAW,EAAE,MAAM;IACnB,oBAAoB,EAAE,MAAM,EAAE;IAC9B,MAAM,EAAE,MAAM;IAbvB,OAAO,CAAC,OAAO,CAAuC;gBAG7C,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,uBAAuB,EACnC,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,uBAAuB,EACrC,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,EAAE,EAC9B,MAAM,EAAE,MAAM;IAGvB,IAAW,WAAW,4BAErB;WAEY,GAAG,CACd,MAAM,EAAE,MAAM,EACd,WAAW,SAAI,EACf,YAAY,GAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,mBAAmB,CACD,EACtE,WAAW,SAAI;IAmEV,OAAO;IAIP,cAAc,CAAC,WAAW,EAAE,CAAC,GAAG,WAAW;IAC3C,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAK5D,sBAAsB,CAAC,kBAAkB,SAAmB,GAAG,WAAW;IAI3E,OAAO;IAON,eAAe,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW;
|
|
1
|
+
{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { makeBloatedProcessedTx } from '@aztec/circuit-types/test';
|
|
2
2
|
import { TreeSnapshots, } from '@aztec/circuits.js';
|
|
3
|
-
import { times } from '@aztec/foundation/collection';
|
|
3
|
+
import { times, timesParallel } from '@aztec/foundation/collection';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
6
6
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
|
|
@@ -90,13 +90,13 @@ export class TestContext {
|
|
|
90
90
|
await fs.rm(dir, { recursive: true, force: true });
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
|
-
makeProcessedTx(seedOrOpts) {
|
|
93
|
+
async makeProcessedTx(seedOrOpts) {
|
|
94
94
|
const opts = typeof seedOrOpts === 'number' ? { seed: seedOrOpts } : seedOrOpts;
|
|
95
95
|
const blockNum = (opts?.globalVariables ?? this.globalVariables).blockNumber.toNumber();
|
|
96
96
|
const header = this.getBlockHeader(blockNum - 1);
|
|
97
97
|
return makeBloatedProcessedTx({
|
|
98
98
|
header,
|
|
99
|
-
vkTreeRoot: getVKTreeRoot(),
|
|
99
|
+
vkTreeRoot: await getVKTreeRoot(),
|
|
100
100
|
protocolContractTreeRoot,
|
|
101
101
|
globalVariables: this.globalVariables,
|
|
102
102
|
...opts,
|
|
@@ -108,7 +108,7 @@ export class TestContext {
|
|
|
108
108
|
const blockNum = globalVariables.blockNumber.toNumber();
|
|
109
109
|
const db = await this.worldState.fork();
|
|
110
110
|
const msgs = times(numMsgs, i => new Fr(blockNum * 100 + i));
|
|
111
|
-
const txs =
|
|
111
|
+
const txs = await timesParallel(numTxs, i => this.makeProcessedTx({ seed: i + blockNum * 1000, globalVariables, ...makeProcessedTxOpts(i) }));
|
|
112
112
|
await this.setEndTreeRoots(txs);
|
|
113
113
|
const block = await buildBlock(txs, globalVariables, msgs, db);
|
|
114
114
|
this.headers.set(blockNum, block.header);
|
|
@@ -137,7 +137,7 @@ export class TestContext {
|
|
|
137
137
|
await updateExpectedTreesFromTxs(db, [tx]);
|
|
138
138
|
const stateReference = await db.getStateReference();
|
|
139
139
|
if (tx.avmProvingRequest) {
|
|
140
|
-
tx.avmProvingRequest.inputs.
|
|
140
|
+
tx.avmProvingRequest.inputs.publicInputs.endTreeSnapshots = new TreeSnapshots(stateReference.l1ToL2MessageTree, stateReference.partial.noteHashTree, stateReference.partial.nullifierTree, stateReference.partial.publicDataTree);
|
|
141
141
|
}
|
|
142
142
|
}
|
|
143
143
|
}
|
|
@@ -164,4 +164,4 @@ class TestProvingOrchestrator extends ProvingOrchestrator {
|
|
|
164
164
|
return Promise.resolve();
|
|
165
165
|
}
|
|
166
166
|
}
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
167
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_context.js","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,13 +18,13 @@ type BaseTreeNames = 'NoteHashTree' | 'ContractTree' | 'NullifierTree' | 'Public
|
|
|
18
18
|
export type TreeNames = BaseTreeNames | 'L1ToL2MessageTree' | 'Archive';
|
|
19
19
|
export declare const buildBaseRollupHints: (tx: ProcessedTx, globalVariables: GlobalVariables, db: MerkleTreeWriteOperations, startSpongeBlob: SpongeBlob) => Promise<PublicBaseRollupHints | PrivateBaseRollupHints>;
|
|
20
20
|
export declare function getPublicDataHint(db: MerkleTreeWriteOperations, leafSlot: bigint): Promise<PublicDataHint>;
|
|
21
|
-
export declare const buildBlobHints: (txEffects: TxEffect[]) => {
|
|
21
|
+
export declare const buildBlobHints: (txEffects: TxEffect[]) => Promise<{
|
|
22
22
|
blobFields: Fr[];
|
|
23
23
|
blobCommitments: [Fr, Fr][];
|
|
24
24
|
blobs: Blob[];
|
|
25
25
|
blobsHash: Fr;
|
|
26
|
-
}
|
|
27
|
-
export declare const buildHeaderFromCircuitOutputs: (previousRollupData: BaseOrMergeRollupPublicInputs[], parityPublicInputs: ParityPublicInputs, rootRollupOutputs: BlockRootOrBlockMergePublicInputs, endState: StateReference, logger?: Logger | undefined) => BlockHeader
|
|
26
|
+
}>;
|
|
27
|
+
export declare const buildHeaderFromCircuitOutputs: (previousRollupData: BaseOrMergeRollupPublicInputs[], parityPublicInputs: ParityPublicInputs, rootRollupOutputs: BlockRootOrBlockMergePublicInputs, endState: StateReference, logger?: Logger | undefined) => Promise<BlockHeader>;
|
|
28
28
|
export declare const buildHeaderAndBodyFromTxs: (txs: ProcessedTx[], globalVariables: GlobalVariables, l1ToL2Messages: Fr[], db: MerkleTreeReadOperations) => Promise<{
|
|
29
29
|
header: BlockHeader;
|
|
30
30
|
body: Body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,KAAK,yBAAyB,EAC9B,KAAK,WAAW,EAChB,QAAQ,EAET,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,sBAAsB,EACtB,WAAW,EAEX,EAAE,EACF,KAAK,eAAe,EAIpB,iBAAiB,EAUjB,KAAK,kBAAkB,EACvB,qBAAqB,EACrB,cAAc,EAGd,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,iCAAiC,EACtC,kBAAkB,EAClB,sBAAsB,EAEtB,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAmD,MAAM,6BAA6B,CAAC;AAM1G,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAInE;;GAEG;AACH,KAAK,aAAa,GAAG,cAAc,GAAG,cAAc,GAAG,eAAe,GAAG,gBAAgB,CAAC;AAC1F;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAGxE,eAAO,MAAM,oBAAoB,4KAsLhC,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,2BAkBtF;AAED,eAAO,MAAM,cAAc;;;;;
|
|
1
|
+
{"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,KAAK,yBAAyB,EAC9B,KAAK,WAAW,EAChB,QAAQ,EAET,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,sBAAsB,EACtB,WAAW,EAEX,EAAE,EACF,KAAK,eAAe,EAIpB,iBAAiB,EAUjB,KAAK,kBAAkB,EACvB,qBAAqB,EACrB,cAAc,EAGd,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,iCAAiC,EACtC,kBAAkB,EAClB,sBAAsB,EAEtB,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAmD,MAAM,6BAA6B,CAAC;AAM1G,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAInE;;GAEG;AACH,KAAK,aAAa,GAAG,cAAc,GAAG,cAAc,GAAG,eAAe,GAAG,gBAAgB,CAAC;AAC1F;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAGxE,eAAO,MAAM,oBAAoB,4KAsLhC,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,2BAkBtF;AAED,eAAO,MAAM,cAAc;;;;;EAU1B,CAAC;AAEF,eAAO,MAAM,6BAA6B,oOAoDzC,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;EAoDrC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAG5D;AAGD,wBAAsB,uBAAuB,CAC3C,eAAe,EAAE,iCAAiC,EAClD,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,wBAAwB,iBAM7B;AAED,eAAO,MAAM,aAAa,wEAmBzB,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,GAAG,SAAS,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,wBAAwB;;;;;;SAI/G;AAED,eAAO,MAAM,qBAAqB,iGAWjC,CAAC;AAEF,wBAAsB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,wBAAwB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAGrH;AAED,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,wBAMrE;AA4CD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,wBAAwB,GAC3B,OAAO,CAAC,EAAE,EAAE,CAAC,CAMf;AAGD,wBAAsB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAC5D,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,wBAAwB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAY/B;AAED,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,qBAAqB,EACnC,aAAa,EAAE,GAAG,CAAC,YAAY,EAAE,sBAAsB,CAAC,QASzD;AAqBD,wBAAgB,UAAU,CAAC,EAAE,EAAE,WAAW,QAczC"}
|
|
@@ -39,7 +39,7 @@ export const buildBaseRollupHints = runInSpan('BlockBuilderHelpers', 'buildBaseR
|
|
|
39
39
|
const nullifierSubtreeSiblingPath = makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, i => i < nullifierSubtreeSiblingPathArray.length ? nullifierSubtreeSiblingPathArray[i] : Fr.ZERO);
|
|
40
40
|
// Append new data to startSpongeBlob
|
|
41
41
|
const inputSpongeBlob = startSpongeBlob.clone();
|
|
42
|
-
startSpongeBlob.absorb(tx.txEffect.toBlobFields());
|
|
42
|
+
await startSpongeBlob.absorb(tx.txEffect.toBlobFields());
|
|
43
43
|
if (tx.avmProvingRequest) {
|
|
44
44
|
// Build public base rollup hints
|
|
45
45
|
const stateDiffHints = PublicBaseStateDiffHints.from({
|
|
@@ -57,7 +57,7 @@ export const buildBaseRollupHints = runInSpan('BlockBuilderHelpers', 'buildBaseR
|
|
|
57
57
|
lowPublicDataWritesMembershipWitnesses: padArrayEnd(txPublicDataUpdateRequestInfo.lowPublicDataWritesMembershipWitnesses, MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX),
|
|
58
58
|
publicDataTreeSiblingPaths: padArrayEnd(txPublicDataUpdateRequestInfo.publicDataWritesSiblingPaths, makeTuple(PUBLIC_DATA_TREE_HEIGHT, () => Fr.ZERO), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX),
|
|
59
59
|
});
|
|
60
|
-
const blockHash = tx.constants.historicalHeader.hash();
|
|
60
|
+
const blockHash = await tx.constants.historicalHeader.hash();
|
|
61
61
|
const archiveRootMembershipWitness = await getMembershipWitnessFor(blockHash, MerkleTreeId.ARCHIVE, ARCHIVE_HEIGHT, db);
|
|
62
62
|
return PublicBaseRollupHints.from({
|
|
63
63
|
start,
|
|
@@ -75,7 +75,7 @@ export const buildBaseRollupHints = runInSpan('BlockBuilderHelpers', 'buildBaseR
|
|
|
75
75
|
}
|
|
76
76
|
// Create data hint for reading fee payer initial balance in Fee Juice
|
|
77
77
|
// If no fee payer is set, read hint should be empty
|
|
78
|
-
const leafSlot = computeFeePayerBalanceLeafSlot(tx.data.feePayer);
|
|
78
|
+
const leafSlot = await computeFeePayerBalanceLeafSlot(tx.data.feePayer);
|
|
79
79
|
const feePayerFeeJuiceBalanceReadHint = tx.data.feePayer.isZero()
|
|
80
80
|
? PublicDataHint.empty()
|
|
81
81
|
: await getPublicDataHint(db, leafSlot.toBigInt());
|
|
@@ -99,7 +99,7 @@ export const buildBaseRollupHints = runInSpan('BlockBuilderHelpers', 'buildBaseR
|
|
|
99
99
|
feeWriteLowLeafMembershipWitness,
|
|
100
100
|
feeWriteSiblingPath,
|
|
101
101
|
});
|
|
102
|
-
const blockHash = tx.constants.historicalHeader.hash();
|
|
102
|
+
const blockHash = await tx.constants.historicalHeader.hash();
|
|
103
103
|
const archiveRootMembershipWitness = await getMembershipWitnessFor(blockHash, MerkleTreeId.ARCHIVE, ARCHIVE_HEIGHT, db);
|
|
104
104
|
return PrivateBaseRollupHints.from({
|
|
105
105
|
start,
|
|
@@ -126,14 +126,14 @@ export async function getPublicDataHint(db, leafSlot) {
|
|
|
126
126
|
const value = exists ? leafPreimage.value : Fr.ZERO;
|
|
127
127
|
return new PublicDataHint(new Fr(leafSlot), value, membershipWitness, leafPreimage);
|
|
128
128
|
}
|
|
129
|
-
export const buildBlobHints = runInSpan('BlockBuilderHelpers', 'buildBlobHints', (_span, txEffects) => {
|
|
129
|
+
export const buildBlobHints = runInSpan('BlockBuilderHelpers', 'buildBlobHints', async (_span, txEffects) => {
|
|
130
130
|
const blobFields = txEffects.flatMap(tx => tx.toBlobFields());
|
|
131
|
-
const blobs = Blob.getBlobs(blobFields);
|
|
131
|
+
const blobs = await Blob.getBlobs(blobFields);
|
|
132
132
|
const blobCommitments = blobs.map(b => b.commitmentToFields());
|
|
133
133
|
const blobsHash = new Fr(getBlobsHashFromBlobs(blobs));
|
|
134
134
|
return { blobFields, blobCommitments, blobs, blobsHash };
|
|
135
135
|
});
|
|
136
|
-
export const buildHeaderFromCircuitOutputs = runInSpan('BlockBuilderHelpers', 'buildHeaderFromCircuitOutputs', (_span, previousRollupData, parityPublicInputs, rootRollupOutputs, endState, logger) => {
|
|
136
|
+
export const buildHeaderFromCircuitOutputs = runInSpan('BlockBuilderHelpers', 'buildHeaderFromCircuitOutputs', async (_span, previousRollupData, parityPublicInputs, rootRollupOutputs, endState, logger) => {
|
|
137
137
|
if (previousRollupData.length > 2) {
|
|
138
138
|
throw new Error(`There can't be more than 2 previous rollups. Received ${previousRollupData.length}.`);
|
|
139
139
|
}
|
|
@@ -148,7 +148,7 @@ export const buildHeaderFromCircuitOutputs = runInSpan('BlockBuilderHelpers', 'b
|
|
|
148
148
|
const accumulatedFees = previousRollupData.reduce((sum, d) => sum.add(d.accumulatedFees), Fr.ZERO);
|
|
149
149
|
const accumulatedManaUsed = previousRollupData.reduce((sum, d) => sum.add(d.accumulatedManaUsed), Fr.ZERO);
|
|
150
150
|
const header = new BlockHeader(rootRollupOutputs.previousArchive, contentCommitment, endState, rootRollupOutputs.endGlobalVariables, accumulatedFees, accumulatedManaUsed);
|
|
151
|
-
if (!header.hash().equals(rootRollupOutputs.endBlockHash)) {
|
|
151
|
+
if (!(await header.hash()).equals(rootRollupOutputs.endBlockHash)) {
|
|
152
152
|
logger?.error(`Block header mismatch when building header from circuit outputs.` +
|
|
153
153
|
`\n\nHeader: ${inspect(header)}` +
|
|
154
154
|
`\n\nCircuit: ${toFriendlyJSON(rootRollupOutputs)}`);
|
|
@@ -169,10 +169,11 @@ export const buildHeaderAndBodyFromTxs = runInSpan('BlockBuilderHelpers', 'build
|
|
|
169
169
|
? body.txEffects[0].txOutHash()
|
|
170
170
|
: computeUnbalancedMerkleRoot(body.txEffects.map(tx => tx.txOutHash()), TxEffect.empty().txOutHash());
|
|
171
171
|
l1ToL2Messages = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
|
|
172
|
-
const hasher = (left, right) => sha256Trunc(Buffer.concat([left, right]));
|
|
172
|
+
const hasher = (left, right) => Promise.resolve(sha256Trunc(Buffer.concat([left, right])));
|
|
173
173
|
const parityHeight = Math.ceil(Math.log2(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
|
|
174
|
-
const
|
|
175
|
-
const
|
|
174
|
+
const parityCalculator = await MerkleTreeCalculator.create(parityHeight, Fr.ZERO.toBuffer(), hasher);
|
|
175
|
+
const parityShaRoot = await parityCalculator.computeTreeRoot(l1ToL2Messages.map(msg => msg.toBuffer()));
|
|
176
|
+
const blobsHash = getBlobsHashFromBlobs(await Blob.getBlobs(body.toBlobFields()));
|
|
176
177
|
const contentCommitment = new ContentCommitment(new Fr(numTxs), blobsHash, parityShaRoot, outHash);
|
|
177
178
|
const fees = body.txEffects.reduce((acc, tx) => acc.add(tx.transactionFee), Fr.ZERO);
|
|
178
179
|
const manaUsed = txs.reduce((acc, tx) => acc.add(new Fr(tx.gasUsed.totalGas.l2Gas)), Fr.ZERO);
|
|
@@ -205,7 +206,7 @@ export async function getRootTreeSiblingPath(treeId, db) {
|
|
|
205
206
|
}
|
|
206
207
|
export const getConstantRollupData = runInSpan('BlockBuilderHelpers', 'getConstantRollupData', async (_span, globalVariables, db) => {
|
|
207
208
|
return ConstantRollupData.from({
|
|
208
|
-
vkTreeRoot: getVKTreeRoot(),
|
|
209
|
+
vkTreeRoot: await getVKTreeRoot(),
|
|
209
210
|
protocolContractTreeRoot,
|
|
210
211
|
lastArchive: await getTreeSnapshot(MerkleTreeId.ARCHIVE, db),
|
|
211
212
|
globalVariables,
|
|
@@ -288,4 +289,4 @@ export function validateTx(tx) {
|
|
|
288
289
|
throw new Error(`Empty public data tree in tx: ${toFriendlyJSON(tx)}`);
|
|
289
290
|
}
|
|
290
291
|
}
|
|
291
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"block-building-helpers.js","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"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"}
|
|
292
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"block-building-helpers.js","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,8 +46,8 @@ export declare class BlockProvingState {
|
|
|
46
46
|
/** Returns the block number as an epoch number. Used for prioritizing proof requests. */
|
|
47
47
|
get epochNumber(): number;
|
|
48
48
|
getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
|
|
49
|
-
getMergeRollupInputs(mergeLocation: TreeNodeLocation): MergeRollupInputs
|
|
50
|
-
getBlockRootRollupTypeAndInputs(proverId: Fr): {
|
|
49
|
+
getMergeRollupInputs(mergeLocation: TreeNodeLocation): Promise<MergeRollupInputs>;
|
|
50
|
+
getBlockRootRollupTypeAndInputs(proverId: Fr): Promise<{
|
|
51
51
|
rollupType: string;
|
|
52
52
|
inputs: EmptyBlockRootRollupInputs;
|
|
53
53
|
} | {
|
|
@@ -56,11 +56,11 @@ export declare class BlockProvingState {
|
|
|
56
56
|
} | {
|
|
57
57
|
rollupType: string;
|
|
58
58
|
inputs: BlockRootRollupInputs;
|
|
59
|
-
}
|
|
60
|
-
getPaddingBlockRootInputs(proverId: Fr): EmptyBlockRootRollupInputs
|
|
61
|
-
getRootParityInputs(): RootParityInputs
|
|
59
|
+
}>;
|
|
60
|
+
getPaddingBlockRootInputs(proverId: Fr): Promise<EmptyBlockRootRollupInputs>;
|
|
61
|
+
getRootParityInputs(): Promise<RootParityInputs>;
|
|
62
62
|
getTxProvingState(txIndex: number): TxProvingState;
|
|
63
|
-
buildHeaderFromProvingOutputs(logger?: Logger): BlockHeader
|
|
63
|
+
buildHeaderFromProvingOutputs(logger?: Logger): Promise<BlockHeader>;
|
|
64
64
|
isReadyForMergeRollup(location: TreeNodeLocation): boolean;
|
|
65
65
|
isReadyForBlockRootRollup(): boolean;
|
|
66
66
|
isReadyForRootParity(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"block-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"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"}
|