@aztec/prover-client 0.0.0-test.1 → 0.0.1-commit.5476d83
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/block-factory/index.d.ts +2 -0
- package/dest/block-factory/index.d.ts.map +1 -0
- package/dest/block-factory/light.d.ts +38 -0
- package/dest/block-factory/light.d.ts.map +1 -0
- package/dest/block-factory/light.js +108 -0
- package/dest/config.d.ts +7 -7
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +11 -1
- package/dest/index.d.ts +1 -1
- package/dest/light/lightweight_checkpoint_builder.d.ts +28 -0
- package/dest/light/lightweight_checkpoint_builder.d.ts.map +1 -0
- package/dest/light/lightweight_checkpoint_builder.js +107 -0
- package/dest/mocks/fixtures.d.ts +8 -8
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +32 -14
- package/dest/mocks/test_context.d.ts +40 -31
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +134 -86
- package/dest/orchestrator/block-building-helpers.d.ts +36 -29
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +168 -188
- package/dest/orchestrator/block-proving-state.d.ts +68 -47
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +281 -176
- package/dest/orchestrator/checkpoint-proving-state.d.ts +62 -0
- package/dest/orchestrator/checkpoint-proving-state.d.ts.map +1 -0
- package/dest/orchestrator/checkpoint-proving-state.js +208 -0
- package/dest/orchestrator/epoch-proving-state.d.ts +40 -26
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +143 -73
- package/dest/orchestrator/index.d.ts +1 -1
- package/dest/orchestrator/orchestrator.d.ts +35 -32
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +389 -239
- package/dest/orchestrator/orchestrator_metrics.d.ts +3 -1
- package/dest/orchestrator/orchestrator_metrics.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator_metrics.js +9 -0
- package/dest/orchestrator/tx-proving-state.d.ts +13 -11
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/tx-proving-state.js +23 -40
- package/dest/prover-client/factory.d.ts +1 -1
- package/dest/prover-client/index.d.ts +1 -1
- package/dest/prover-client/prover-client.d.ts +4 -4
- package/dest/prover-client/prover-client.d.ts.map +1 -1
- package/dest/prover-client/prover-client.js +5 -4
- package/dest/prover-client/server-epoch-prover.d.ts +15 -11
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -1
- package/dest/prover-client/server-epoch-prover.js +11 -11
- package/dest/proving_broker/broker_prover_facade.d.ts +23 -16
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +67 -41
- package/dest/proving_broker/config.d.ts +18 -9
- package/dest/proving_broker/config.d.ts.map +1 -1
- package/dest/proving_broker/config.js +22 -5
- package/dest/proving_broker/factory.d.ts +2 -2
- package/dest/proving_broker/factory.d.ts.map +1 -1
- package/dest/proving_broker/factory.js +5 -1
- package/dest/proving_broker/fixtures.d.ts +3 -2
- package/dest/proving_broker/fixtures.d.ts.map +1 -1
- package/dest/proving_broker/fixtures.js +2 -1
- package/dest/proving_broker/index.d.ts +1 -1
- package/dest/proving_broker/proof_store/factory.d.ts +2 -2
- package/dest/proving_broker/proof_store/factory.js +1 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts +1 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.js +1 -0
- package/dest/proving_broker/proof_store/index.d.ts +2 -1
- package/dest/proving_broker/proof_store/index.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/index.js +1 -0
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts +1 -1
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/proof_store.d.ts +1 -1
- package/dest/proving_broker/proving_agent.d.ts +4 -4
- package/dest/proving_broker/proving_agent.d.ts.map +1 -1
- package/dest/proving_broker/proving_agent.js +83 -47
- package/dest/proving_broker/proving_agent_instrumentation.d.ts +1 -1
- package/dest/proving_broker/proving_agent_instrumentation.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.d.ts +13 -4
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +36 -23
- package/dest/proving_broker/proving_broker_database/memory.d.ts +3 -2
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/memory.js +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +3 -2
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +12 -10
- package/dest/proving_broker/proving_broker_database.d.ts +3 -2
- package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_instrumentation.d.ts +1 -1
- package/dest/proving_broker/proving_broker_instrumentation.d.ts.map +1 -1
- package/dest/proving_broker/proving_job_controller.d.ts +9 -9
- package/dest/proving_broker/proving_job_controller.d.ts.map +1 -1
- package/dest/proving_broker/proving_job_controller.js +89 -61
- package/dest/proving_broker/rpc.d.ts +4 -6
- package/dest/proving_broker/rpc.d.ts.map +1 -1
- package/dest/proving_broker/rpc.js +1 -4
- package/dest/test/mock_proof_store.d.ts +9 -0
- package/dest/test/mock_proof_store.d.ts.map +1 -0
- package/dest/test/mock_proof_store.js +10 -0
- package/dest/test/mock_prover.d.ts +23 -17
- package/dest/test/mock_prover.d.ts.map +1 -1
- package/dest/test/mock_prover.js +38 -20
- package/package.json +32 -31
- package/src/block-factory/index.ts +1 -0
- package/src/block-factory/light.ts +137 -0
- package/src/config.ts +24 -8
- package/src/light/lightweight_checkpoint_builder.ts +142 -0
- package/src/mocks/fixtures.ts +42 -37
- package/src/mocks/test_context.ts +207 -115
- package/src/orchestrator/block-building-helpers.ts +256 -333
- package/src/orchestrator/block-proving-state.ts +323 -230
- package/src/orchestrator/checkpoint-proving-state.ts +301 -0
- package/src/orchestrator/epoch-proving-state.ts +187 -112
- package/src/orchestrator/orchestrator.ts +592 -299
- package/src/orchestrator/orchestrator_metrics.ts +20 -1
- package/src/orchestrator/tx-proving-state.ts +50 -64
- package/src/prover-client/prover-client.ts +16 -14
- package/src/prover-client/server-epoch-prover.ts +39 -21
- package/src/proving_broker/broker_prover_facade.ts +214 -126
- package/src/proving_broker/config.ts +24 -6
- package/src/proving_broker/factory.ts +2 -1
- package/src/proving_broker/fixtures.ts +7 -2
- package/src/proving_broker/proof_store/factory.ts +1 -1
- package/src/proving_broker/proof_store/gcs_proof_store.ts +5 -1
- package/src/proving_broker/proof_store/index.ts +1 -0
- package/src/proving_broker/proof_store/inline_proof_store.ts +1 -1
- package/src/proving_broker/proving_agent.ts +89 -47
- package/src/proving_broker/proving_broker.ts +53 -33
- package/src/proving_broker/proving_broker_database/memory.ts +3 -2
- package/src/proving_broker/proving_broker_database/persisted.ts +14 -12
- package/src/proving_broker/proving_broker_database.ts +2 -1
- package/src/proving_broker/proving_job_controller.ts +94 -82
- package/src/proving_broker/rpc.ts +1 -6
- package/src/test/mock_proof_store.ts +14 -0
- package/src/test/mock_prover.ts +164 -60
- package/dest/bin/get-proof-inputs.d.ts +0 -2
- package/dest/bin/get-proof-inputs.d.ts.map +0 -1
- package/dest/bin/get-proof-inputs.js +0 -51
- package/dest/block_builder/index.d.ts +0 -6
- package/dest/block_builder/index.d.ts.map +0 -1
- package/dest/block_builder/light.d.ts +0 -33
- package/dest/block_builder/light.d.ts.map +0 -1
- package/dest/block_builder/light.js +0 -82
- package/src/bin/get-proof-inputs.ts +0 -59
- package/src/block_builder/index.ts +0 -6
- package/src/block_builder/light.ts +0 -101
- /package/dest/{block_builder → block-factory}/index.js +0 -0
|
@@ -1,62 +1,60 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TestCircuitProver } from '@aztec/bb-prover';
|
|
2
|
+
import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
|
|
3
|
+
import { padArrayEnd, times, timesAsync } from '@aztec/foundation/collection';
|
|
2
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
3
|
-
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
4
5
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
5
|
-
import {
|
|
6
|
+
import { ProtocolContractsList } from '@aztec/protocol-contracts';
|
|
6
7
|
import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
|
|
7
|
-
import { PublicProcessor, PublicTxSimulationTester, PublicTxSimulator, SimpleContractDataSource, WorldStateDB } from '@aztec/simulator/server';
|
|
8
8
|
import { PublicDataWrite } from '@aztec/stdlib/avm';
|
|
9
9
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
10
|
+
import { EthAddress } from '@aztec/stdlib/block';
|
|
11
|
+
import { mockProcessedTx } from '@aztec/stdlib/testing';
|
|
12
|
+
import { MerkleTreeId, PublicDataTreeLeaf } from '@aztec/stdlib/trees';
|
|
12
13
|
import { TreeSnapshots } from '@aztec/stdlib/tx';
|
|
13
14
|
import { NativeWorldStateService } from '@aztec/world-state/native';
|
|
14
15
|
import { promises as fs } from 'fs';
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
16
|
+
import { LightweightCheckpointBuilder } from '../light/lightweight_checkpoint_builder.js';
|
|
17
|
+
import { buildFinalBlobChallenges, getTreeSnapshot, insertSideEffects } from '../orchestrator/block-building-helpers.js';
|
|
17
18
|
import { ProvingOrchestrator } from '../orchestrator/index.js';
|
|
18
19
|
import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
|
|
19
20
|
import { TestBroker } from '../test/mock_prover.js';
|
|
20
|
-
import { getEnvironmentConfig,
|
|
21
|
+
import { getEnvironmentConfig, getSimulator, makeCheckpointConstants, makeGlobals } from './fixtures.js';
|
|
21
22
|
export class TestContext {
|
|
22
|
-
publicTxSimulator;
|
|
23
23
|
worldState;
|
|
24
|
-
publicProcessor;
|
|
25
|
-
globalVariables;
|
|
26
24
|
prover;
|
|
27
25
|
broker;
|
|
28
26
|
brokerProverFacade;
|
|
29
27
|
orchestrator;
|
|
30
|
-
blockNumber;
|
|
31
28
|
feePayer;
|
|
32
29
|
directoriesToCleanup;
|
|
33
|
-
tester;
|
|
34
30
|
logger;
|
|
35
31
|
headers;
|
|
32
|
+
checkpoints;
|
|
33
|
+
nextCheckpointIndex;
|
|
34
|
+
nextBlockNumber;
|
|
35
|
+
epochNumber;
|
|
36
36
|
feePayerBalance;
|
|
37
|
-
constructor(
|
|
38
|
-
this.publicTxSimulator = publicTxSimulator;
|
|
37
|
+
constructor(worldState, prover, broker, brokerProverFacade, orchestrator, feePayer, initialFeePayerBalance, directoriesToCleanup, logger){
|
|
39
38
|
this.worldState = worldState;
|
|
40
|
-
this.publicProcessor = publicProcessor;
|
|
41
|
-
this.globalVariables = globalVariables;
|
|
42
39
|
this.prover = prover;
|
|
43
40
|
this.broker = broker;
|
|
44
41
|
this.brokerProverFacade = brokerProverFacade;
|
|
45
42
|
this.orchestrator = orchestrator;
|
|
46
|
-
this.blockNumber = blockNumber;
|
|
47
43
|
this.feePayer = feePayer;
|
|
48
44
|
this.directoriesToCleanup = directoriesToCleanup;
|
|
49
|
-
this.tester = tester;
|
|
50
45
|
this.logger = logger;
|
|
51
46
|
this.headers = new Map();
|
|
47
|
+
this.checkpoints = [];
|
|
48
|
+
this.nextCheckpointIndex = 0;
|
|
49
|
+
this.nextBlockNumber = 1;
|
|
50
|
+
this.epochNumber = 1;
|
|
52
51
|
this.feePayerBalance = initialFeePayerBalance;
|
|
53
52
|
}
|
|
54
53
|
get epochProver() {
|
|
55
54
|
return this.orchestrator;
|
|
56
55
|
}
|
|
57
|
-
static async new(logger, proverCount = 4, createProver = async (bbConfig)=>new TestCircuitProver(await
|
|
56
|
+
static async new(logger, { proverCount = 4, createProver = async (bbConfig)=>new TestCircuitProver(await getSimulator(bbConfig, logger)) } = {}) {
|
|
58
57
|
const directoriesToCleanup = [];
|
|
59
|
-
const globalVariables = makeGlobals(blockNumber);
|
|
60
58
|
const feePayer = AztecAddress.fromNumber(42222);
|
|
61
59
|
const initialFeePayerBalance = new Fr(10n ** 20n);
|
|
62
60
|
const feePayerSlot = await computeFeePayerBalanceLeafSlot(feePayer);
|
|
@@ -64,13 +62,7 @@ export class TestContext {
|
|
|
64
62
|
new PublicDataTreeLeaf(feePayerSlot, initialFeePayerBalance)
|
|
65
63
|
];
|
|
66
64
|
// Separated dbs for public processor and prover - see public_processor for context
|
|
67
|
-
const ws = await NativeWorldStateService.tmp(
|
|
68
|
-
const publicDb = await ws.fork();
|
|
69
|
-
const contractDataSource = new SimpleContractDataSource();
|
|
70
|
-
const worldStateDB = new WorldStateDB(publicDb, contractDataSource);
|
|
71
|
-
const tester = new PublicTxSimulationTester(worldStateDB, contractDataSource, publicDb);
|
|
72
|
-
const publicTxSimulator = new PublicTxSimulator(publicDb, worldStateDB, globalVariables, true);
|
|
73
|
-
const processor = new PublicProcessor(publicDb, globalVariables, worldStateDB, publicTxSimulator, new TestDateProvider());
|
|
65
|
+
const ws = await NativeWorldStateService.tmp(/*rollupAddress=*/ undefined, /*cleanupTmpDir=*/ true, prefilledPublicData);
|
|
74
66
|
let localProver;
|
|
75
67
|
const config = await getEnvironmentConfig(logger);
|
|
76
68
|
if (!config) {
|
|
@@ -81,7 +73,9 @@ export class TestContext {
|
|
|
81
73
|
acvmWorkingDirectory: config.acvmWorkingDirectory,
|
|
82
74
|
bbBinaryPath: config.expectedBBPath,
|
|
83
75
|
bbWorkingDirectory: config.bbWorkingDirectory,
|
|
84
|
-
bbSkipCleanup: config.bbSkipCleanup
|
|
76
|
+
bbSkipCleanup: config.bbSkipCleanup,
|
|
77
|
+
numConcurrentIVCVerifiers: 2,
|
|
78
|
+
bbIVCConcurrency: 1
|
|
85
79
|
};
|
|
86
80
|
localProver = await createProver(bbConfig);
|
|
87
81
|
}
|
|
@@ -90,20 +84,14 @@ export class TestContext {
|
|
|
90
84
|
}
|
|
91
85
|
const broker = new TestBroker(proverCount, localProver);
|
|
92
86
|
const facade = new BrokerCircuitProverFacade(broker);
|
|
93
|
-
const orchestrator = new TestProvingOrchestrator(ws, facade,
|
|
87
|
+
const orchestrator = new TestProvingOrchestrator(ws, facade, EthAddress.ZERO);
|
|
94
88
|
await broker.start();
|
|
95
89
|
facade.start();
|
|
96
|
-
return new this(
|
|
90
|
+
return new this(ws, localProver, broker, facade, orchestrator, feePayer, initialFeePayerBalance, directoriesToCleanup, logger);
|
|
97
91
|
}
|
|
98
92
|
getFork() {
|
|
99
93
|
return this.worldState.fork();
|
|
100
94
|
}
|
|
101
|
-
getBlockHeader(blockNumber = 0) {
|
|
102
|
-
return blockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(blockNumber);
|
|
103
|
-
}
|
|
104
|
-
getPreviousBlockHeader(currentBlockNumber = this.blockNumber) {
|
|
105
|
-
return this.getBlockHeader(currentBlockNumber - 1);
|
|
106
|
-
}
|
|
107
95
|
async cleanup() {
|
|
108
96
|
await this.brokerProverFacade.stop();
|
|
109
97
|
await this.broker.stop();
|
|
@@ -119,74 +107,134 @@ export class TestContext {
|
|
|
119
107
|
}
|
|
120
108
|
}
|
|
121
109
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
110
|
+
startNewEpoch() {
|
|
111
|
+
this.checkpoints = [];
|
|
112
|
+
this.nextCheckpointIndex = 0;
|
|
113
|
+
this.epochNumber++;
|
|
114
|
+
}
|
|
115
|
+
// Return blob fields of all checkpoints in the epoch.
|
|
116
|
+
getBlobFields() {
|
|
117
|
+
return this.checkpoints.map((checkpoint)=>checkpoint.toBlobFields());
|
|
118
|
+
}
|
|
119
|
+
async getFinalBlobChallenges() {
|
|
120
|
+
const blobFields = this.getBlobFields();
|
|
121
|
+
return await buildFinalBlobChallenges(blobFields);
|
|
122
|
+
}
|
|
123
|
+
async makeCheckpoint(numBlocks, { numTxsPerBlock = 0, numL1ToL2Messages = 0, makeProcessedTxOpts = ()=>({}), ...constantOpts } = {}) {
|
|
124
|
+
if (numBlocks === 0) {
|
|
125
|
+
throw new Error('Cannot make a checkpoint with 0 blocks. Crate an empty block (numTxsPerBlock = 0) if there are no txs.');
|
|
126
|
+
}
|
|
127
|
+
const checkpointIndex = this.nextCheckpointIndex++;
|
|
128
|
+
const checkpointNumber = checkpointIndex + 1;
|
|
129
|
+
const slotNumber = checkpointNumber * 15; // times an arbitrary number to make it different to the checkpoint number
|
|
130
|
+
const constants = makeCheckpointConstants(slotNumber, constantOpts);
|
|
131
|
+
const fork = await this.worldState.fork();
|
|
132
|
+
// Build l1 to l2 messages.
|
|
133
|
+
const l1ToL2Messages = times(numL1ToL2Messages, (i)=>new Fr(slotNumber * 100 + i));
|
|
134
|
+
await fork.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
|
|
135
|
+
const newL1ToL2Snapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, fork);
|
|
136
|
+
const startBlockNumber = this.nextBlockNumber;
|
|
137
|
+
const previousBlockHeader = this.getBlockHeader(startBlockNumber - 1);
|
|
138
|
+
// Build global variables.
|
|
139
|
+
const blockGlobalVariables = times(numBlocks, (i)=>makeGlobals(startBlockNumber + i, slotNumber, {
|
|
140
|
+
coinbase: constants.coinbase,
|
|
141
|
+
feeRecipient: constants.feeRecipient,
|
|
142
|
+
gasFees: constants.gasFees
|
|
143
|
+
}));
|
|
144
|
+
this.nextBlockNumber += numBlocks;
|
|
145
|
+
// Build txs.
|
|
146
|
+
let totalTxs = 0;
|
|
147
|
+
const blockEndStates = [];
|
|
148
|
+
const blockTxs = await timesAsync(numBlocks, async (blockIndex)=>{
|
|
149
|
+
const txIndexOffset = totalTxs;
|
|
150
|
+
const numTxs = typeof numTxsPerBlock === 'number' ? numTxsPerBlock : numTxsPerBlock[blockIndex];
|
|
151
|
+
totalTxs += numTxs;
|
|
152
|
+
const txs = await timesAsync(numTxs, (txIndex)=>this.makeProcessedTx({
|
|
153
|
+
seed: (txIndexOffset + txIndex + 1) * 321 + (checkpointIndex + 1) * 123456 + this.epochNumber * 0x99999,
|
|
154
|
+
globalVariables: blockGlobalVariables[blockIndex],
|
|
155
|
+
anchorBlockHeader: previousBlockHeader,
|
|
156
|
+
newL1ToL2Snapshot,
|
|
157
|
+
...makeProcessedTxOpts(blockGlobalVariables[blockIndex], txIndexOffset + txIndex)
|
|
158
|
+
}));
|
|
159
|
+
// Insert side effects into the trees.
|
|
160
|
+
const endState = await this.updateTrees(txs, fork);
|
|
161
|
+
blockEndStates.push(endState);
|
|
162
|
+
return txs;
|
|
163
|
+
});
|
|
164
|
+
const cleanFork = await this.worldState.fork();
|
|
165
|
+
const builder = await LightweightCheckpointBuilder.startNewCheckpoint(checkpointNumber, constants, l1ToL2Messages, cleanFork);
|
|
166
|
+
// Add tx effects to db and build block headers.
|
|
167
|
+
const blocks = [];
|
|
168
|
+
for(let i = 0; i < numBlocks; i++){
|
|
169
|
+
const isFirstBlock = i === 0;
|
|
170
|
+
const txs = blockTxs[i];
|
|
171
|
+
const state = blockEndStates[i];
|
|
172
|
+
const block = await builder.addBlock(blockGlobalVariables[i], state, txs);
|
|
173
|
+
const header = block.header;
|
|
174
|
+
this.headers.set(block.number, header);
|
|
175
|
+
const blockMsgs = isFirstBlock ? l1ToL2Messages : [];
|
|
176
|
+
await this.worldState.handleL2BlockAndMessages(block, blockMsgs, isFirstBlock);
|
|
177
|
+
blocks.push({
|
|
178
|
+
header,
|
|
179
|
+
txs
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
const checkpoint = await builder.completeCheckpoint();
|
|
183
|
+
this.checkpoints.push(checkpoint);
|
|
184
|
+
return {
|
|
185
|
+
constants,
|
|
186
|
+
header: checkpoint.header,
|
|
187
|
+
blocks,
|
|
188
|
+
l1ToL2Messages,
|
|
189
|
+
previousBlockHeader
|
|
190
|
+
};
|
|
191
|
+
}
|
|
192
|
+
async makeProcessedTx(opts = {}) {
|
|
193
|
+
const tx = await mockProcessedTx({
|
|
130
194
|
vkTreeRoot: getVKTreeRoot(),
|
|
131
|
-
|
|
132
|
-
globalVariables: this.globalVariables,
|
|
195
|
+
protocolContracts: ProtocolContractsList,
|
|
133
196
|
feePayer: this.feePayer,
|
|
134
197
|
...opts
|
|
135
198
|
});
|
|
136
199
|
this.feePayerBalance = new Fr(this.feePayerBalance.toBigInt() - tx.txEffect.transactionFee.toBigInt());
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
200
|
+
const feePayerSlot = await computeFeePayerBalanceLeafSlot(this.feePayer);
|
|
201
|
+
const feePaymentPublicDataWrite = new PublicDataWrite(feePayerSlot, this.feePayerBalance);
|
|
202
|
+
tx.txEffect.publicDataWrites[0] = feePaymentPublicDataWrite;
|
|
203
|
+
if (tx.avmProvingRequest) {
|
|
204
|
+
tx.avmProvingRequest.inputs.publicInputs.accumulatedData.publicDataWrites[0] = feePaymentPublicDataWrite;
|
|
140
205
|
}
|
|
141
206
|
return tx;
|
|
142
207
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
const txs = await timesParallel(numTxs, (i)=>this.makeProcessedTx({
|
|
149
|
-
seed: i + blockNum * 1000,
|
|
150
|
-
globalVariables,
|
|
151
|
-
...makeProcessedTxOpts(i)
|
|
152
|
-
}));
|
|
153
|
-
await this.setTreeRoots(txs);
|
|
154
|
-
const block = await buildBlock(txs, globalVariables, msgs, db);
|
|
155
|
-
this.headers.set(blockNum, block.header);
|
|
156
|
-
await this.worldState.handleL2BlockAndMessages(block, msgs);
|
|
157
|
-
return {
|
|
158
|
-
block,
|
|
159
|
-
txs,
|
|
160
|
-
msgs
|
|
161
|
-
};
|
|
162
|
-
}
|
|
163
|
-
async processPublicFunctions(txs, maxTransactions) {
|
|
164
|
-
return await this.publicProcessor.process(txs, {
|
|
165
|
-
maxTransactions
|
|
166
|
-
});
|
|
208
|
+
getBlockHeader(blockNumber) {
|
|
209
|
+
if (blockNumber > 0 && blockNumber >= this.nextBlockNumber) {
|
|
210
|
+
throw new Error(`Block header not built for block number ${blockNumber}.`);
|
|
211
|
+
}
|
|
212
|
+
return blockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(blockNumber);
|
|
167
213
|
}
|
|
168
|
-
async
|
|
169
|
-
|
|
214
|
+
async updateTrees(txs, fork) {
|
|
215
|
+
let startStateReference = await fork.getStateReference();
|
|
216
|
+
let endStateReference = startStateReference;
|
|
170
217
|
for (const tx of txs){
|
|
171
|
-
|
|
172
|
-
await
|
|
173
|
-
tx
|
|
174
|
-
]);
|
|
175
|
-
const endStateReference = await db.getStateReference();
|
|
218
|
+
await insertSideEffects(tx, fork);
|
|
219
|
+
endStateReference = await fork.getStateReference();
|
|
176
220
|
if (tx.avmProvingRequest) {
|
|
177
|
-
|
|
178
|
-
tx.avmProvingRequest.inputs.publicInputs.
|
|
221
|
+
// Update the trees in the avm public inputs so that the proof won't fail.
|
|
222
|
+
const l1ToL2MessageTree = tx.avmProvingRequest.inputs.publicInputs.startTreeSnapshots.l1ToL2MessageTree;
|
|
223
|
+
tx.avmProvingRequest.inputs.publicInputs.startTreeSnapshots = new TreeSnapshots(l1ToL2MessageTree, startStateReference.partial.noteHashTree, startStateReference.partial.nullifierTree, startStateReference.partial.publicDataTree);
|
|
224
|
+
tx.avmProvingRequest.inputs.publicInputs.endTreeSnapshots = new TreeSnapshots(l1ToL2MessageTree, endStateReference.partial.noteHashTree, endStateReference.partial.nullifierTree, endStateReference.partial.publicDataTree);
|
|
179
225
|
}
|
|
226
|
+
startStateReference = endStateReference;
|
|
180
227
|
}
|
|
228
|
+
return endStateReference;
|
|
181
229
|
}
|
|
182
230
|
}
|
|
183
231
|
class TestProvingOrchestrator extends ProvingOrchestrator {
|
|
184
232
|
isVerifyBuiltBlockAgainstSyncedStateEnabled = false;
|
|
185
233
|
// Disable this check by default, since it requires seeding world state with the block being built
|
|
186
234
|
// This is only enabled in some tests with multiple blocks that populate the pending chain via makePendingBlock
|
|
187
|
-
verifyBuiltBlockAgainstSyncedState(
|
|
235
|
+
verifyBuiltBlockAgainstSyncedState(provingState) {
|
|
188
236
|
if (this.isVerifyBuiltBlockAgainstSyncedStateEnabled) {
|
|
189
|
-
return super.verifyBuiltBlockAgainstSyncedState(
|
|
237
|
+
return super.verifyBuiltBlockAgainstSyncedState(provingState);
|
|
190
238
|
}
|
|
191
239
|
return Promise.resolve();
|
|
192
240
|
}
|
|
@@ -1,17 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
-
import { Blob, type SpongeBlob } from '@aztec/blob-lib';
|
|
1
|
+
import { BatchedBlobAccumulator, SpongeBlob } from '@aztec/blob-lib';
|
|
4
2
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
|
-
import type
|
|
6
|
-
import { type Tuple } from '@aztec/foundation/serialize';
|
|
3
|
+
import { type Bufferable } from '@aztec/foundation/serialize';
|
|
7
4
|
import { MembershipWitness } from '@aztec/foundation/trees';
|
|
8
|
-
import { PublicDataHint } from '@aztec/stdlib/avm';
|
|
9
5
|
import { Body } from '@aztec/stdlib/block';
|
|
10
|
-
import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
|
|
11
|
-
import
|
|
12
|
-
import {
|
|
6
|
+
import type { MerkleTreeWriteOperations, PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
|
|
7
|
+
import { ProofData, RecursiveProof } from '@aztec/stdlib/proofs';
|
|
8
|
+
import { BlockRollupPublicInputs, PrivateBaseRollupHints, PublicBaseRollupHints, PublicChonkVerifierPrivateInputs } from '@aztec/stdlib/rollup';
|
|
13
9
|
import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
|
|
14
|
-
import { BlockHeader,
|
|
10
|
+
import { BlockHeader, GlobalVariables, PartialStateReference, type ProcessedTx, StateReference, Tx } from '@aztec/stdlib/tx';
|
|
15
11
|
import type { MerkleTreeReadOperations } from '@aztec/world-state';
|
|
16
12
|
/**
|
|
17
13
|
* Type representing the names of the trees for the base rollup.
|
|
@@ -21,35 +17,46 @@ type BaseTreeNames = 'NoteHashTree' | 'ContractTree' | 'NullifierTree' | 'Public
|
|
|
21
17
|
* Type representing the names of the trees.
|
|
22
18
|
*/
|
|
23
19
|
export type TreeNames = BaseTreeNames | 'L1ToL2MessageTree' | 'Archive';
|
|
24
|
-
export declare const
|
|
25
|
-
export declare
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
blobCommitments: [Fr, Fr][];
|
|
29
|
-
blobs: Blob[];
|
|
30
|
-
blobsHash: Fr;
|
|
20
|
+
export declare const insertSideEffectsAndBuildBaseRollupHints: (tx: ProcessedTx, lastArchive: AppendOnlyTreeSnapshot, newL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot, startSpongeBlob: SpongeBlob, proverId: Fr, db: MerkleTreeWriteOperations) => Promise<PrivateBaseRollupHints | PublicBaseRollupHints>;
|
|
21
|
+
export declare const insertSideEffects: (tx: ProcessedTx, db: MerkleTreeWriteOperations) => Promise<{
|
|
22
|
+
nullifierInsertionResult: import("@aztec/stdlib/trees").BatchInsertionResult<number, number>;
|
|
23
|
+
publicDataInsertionResult: import("@aztec/stdlib/trees").SequentialInsertionResult<number>;
|
|
31
24
|
}>;
|
|
32
|
-
export declare
|
|
33
|
-
export declare
|
|
25
|
+
export declare function getChonkProofFromTx(tx: Tx | ProcessedTx): RecursiveProof<2049>;
|
|
26
|
+
export declare function getPublicChonkVerifierPrivateInputsFromTx(tx: Tx | ProcessedTx, proverId: Fr): PublicChonkVerifierPrivateInputs;
|
|
27
|
+
export declare const buildBlobHints: (blobFields: Fr[]) => {
|
|
28
|
+
blobCommitments: import("@aztec/foundation/fields").BLS12Point[];
|
|
29
|
+
blobs: import("@aztec/blob-lib").Blob[];
|
|
30
|
+
blobsHash: Fr;
|
|
31
|
+
};
|
|
32
|
+
export declare const buildFinalBlobChallenges: (blobFieldsPerCheckpoint: Fr[][]) => Promise<import("@aztec/blob-lib").FinalBlobBatchingChallenges>;
|
|
33
|
+
export declare const accumulateBlobs: (blobFields: Fr[], startBlobAccumulator: BatchedBlobAccumulator) => Promise<BatchedBlobAccumulator>;
|
|
34
|
+
export declare const buildHeaderFromCircuitOutputs: (blockRootRollupOutput: BlockRollupPublicInputs) => Promise<BlockHeader>;
|
|
35
|
+
export declare const buildHeaderAndBodyFromTxs: (txs: ProcessedTx[], lastArchive: AppendOnlyTreeSnapshot, endState: StateReference, globalVariables: GlobalVariables, startSpongeBlob: SpongeBlob, isFirstBlock: boolean) => Promise<{
|
|
34
36
|
header: BlockHeader;
|
|
35
37
|
body: Body;
|
|
38
|
+
blockBlobFields: Fr[];
|
|
36
39
|
}>;
|
|
37
|
-
export declare function
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
readonly
|
|
42
|
-
readonly
|
|
43
|
-
|
|
44
|
-
|
|
40
|
+
export declare function getLastSiblingPath<TID extends MerkleTreeId>(treeId: TID, db: MerkleTreeReadOperations): Promise<import("@aztec/foundation/serialize").Tuple<Fr, {
|
|
41
|
+
readonly 1: 42;
|
|
42
|
+
readonly 4: 30;
|
|
43
|
+
readonly 3: 36;
|
|
44
|
+
readonly 0: 42;
|
|
45
|
+
readonly 2: 40;
|
|
46
|
+
}[TID]>>;
|
|
47
|
+
export declare function getRootTreeSiblingPath<TID extends MerkleTreeId>(treeId: TID, db: MerkleTreeReadOperations): Promise<import("@aztec/foundation/serialize").Tuple<Fr, {
|
|
48
|
+
readonly 1: 42;
|
|
49
|
+
readonly 4: 30;
|
|
50
|
+
readonly 3: 36;
|
|
51
|
+
readonly 0: 42;
|
|
45
52
|
readonly 2: 40;
|
|
46
53
|
}[TID]>>;
|
|
47
|
-
export declare const getConstantRollupData: (globalVariables: GlobalVariables, db: MerkleTreeReadOperations) => Promise<ConstantRollupData>;
|
|
48
54
|
export declare function getTreeSnapshot(id: MerkleTreeId, db: MerkleTreeReadOperations): Promise<AppendOnlyTreeSnapshot>;
|
|
49
55
|
export declare function makeEmptyMembershipWitness<N extends number>(height: N): MembershipWitness<N>;
|
|
50
56
|
export declare function getSubtreeSiblingPath(treeId: MerkleTreeId, subtreeHeight: number, db: MerkleTreeReadOperations): Promise<Fr[]>;
|
|
51
57
|
export declare function getMembershipWitnessFor<N extends number>(value: Fr, treeId: MerkleTreeId, height: N, db: MerkleTreeReadOperations): Promise<MembershipWitness<N>>;
|
|
52
58
|
export declare function validatePartialState(partialState: PartialStateReference, treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot>): void;
|
|
53
59
|
export declare function validateTx(tx: ProcessedTx): void;
|
|
60
|
+
export declare function toProofData<T extends Bufferable, PROOF_LENGTH extends number>({ inputs, proof, verificationKey }: PublicInputsAndRecursiveProof<T, PROOF_LENGTH>, vkIndex?: number): ProofData<T, PROOF_LENGTH>;
|
|
54
61
|
export {};
|
|
55
|
-
//# sourceMappingURL=
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2stYnVpbGRpbmctaGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yY2hlc3RyYXRvci9ibG9jay1idWlsZGluZy1oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxzQkFBc0IsRUFDdEIsVUFBVSxFQUtYLE1BQU0saUJBQWlCLENBQUM7QUFnQnpCLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsS0FBSyxVQUFVLEVBQWdDLE1BQU0sNkJBQTZCLENBQUM7QUFDNUYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFJNUQsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzNDLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLDZCQUE2QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFaEgsT0FBTyxFQUFTLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RSxPQUFPLEVBRUwsdUJBQXVCLEVBQ3ZCLHNCQUFzQixFQUN0QixxQkFBcUIsRUFDckIsZ0NBQWdDLEVBRWpDLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUNMLHNCQUFzQixFQUN0QixZQUFZLEVBSWIsTUFBTSxxQkFBcUIsQ0FBQztBQUM3QixPQUFPLEVBQ0wsV0FBVyxFQUNYLGVBQWUsRUFDZixxQkFBcUIsRUFDckIsS0FBSyxXQUFXLEVBQ2hCLGNBQWMsRUFDZCxFQUFFLEVBQ0gsTUFBTSxrQkFBa0IsQ0FBQztBQUcxQixPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5FOztHQUVHO0FBQ0gsS0FBSyxhQUFhLEdBQUcsY0FBYyxHQUFHLGNBQWMsR0FBRyxlQUFlLEdBQUcsZ0JBQWdCLENBQUM7QUFDMUY7O0dBRUc7QUFDSCxNQUFNLE1BQU0sU0FBUyxHQUFHLGFBQWEsR0FBRyxtQkFBbUIsR0FBRyxTQUFTLENBQUM7QUFHeEUsZUFBTyxNQUFNLHdDQUF3QyxtUEEwSHBELENBQUM7QUFFRixlQUFPLE1BQU0saUJBQWlCOzs7RUFvQzdCLENBQUM7QUFFRix3QkFBZ0IsbUJBQW1CLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLHdCQVF2RDtBQUVELHdCQUFnQix5Q0FBeUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsRUFBRSxRQUFRLEVBQUUsRUFBRSxvQ0FPM0Y7QUFLRCxlQUFPLE1BQU0sY0FBYzs7OztDQUsxQixDQUFDO0FBRUYsZUFBTyxNQUFNLHdCQUF3QixxR0FFcEMsQ0FBQztBQUVGLGVBQU8sTUFBTSxlQUFlLHFHQU8zQixDQUFDO0FBRUYsZUFBTyxNQUFNLDZCQUE2QiwwRUEyQnpDLENBQUM7QUFFRixlQUFPLE1BQU0seUJBQXlCOzs7O0VBMERyQyxDQUFDO0FBRUYsd0JBQXNCLGtCQUFrQixDQUFDLEdBQUcsU0FBUyxZQUFZLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsd0JBQXdCOzs7Ozs7U0FJM0c7QUFFRCx3QkFBc0Isc0JBQXNCLENBQUMsR0FBRyxTQUFTLFlBQVksRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSx3QkFBd0I7Ozs7OztTQUkvRztBQUVELHdCQUFzQixlQUFlLENBQUMsRUFBRSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsd0JBQXdCLEdBQUcsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBR3JIO0FBRUQsd0JBQWdCLDBCQUEwQixDQUFDLENBQUMsU0FBUyxNQUFNLEVBQUUsTUFBTSxFQUFFLENBQUMsd0JBTXJFO0FBRUQsd0JBQXNCLHFCQUFxQixDQUN6QyxNQUFNLEVBQUUsWUFBWSxFQUNwQixhQUFhLEVBQUUsTUFBTSxFQUNyQixFQUFFLEVBQUUsd0JBQXdCLEdBQzNCLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQU1mO0FBR0Qsd0JBQXNCLHVCQUF1QixDQUFDLENBQUMsU0FBUyxNQUFNLEVBQzVELEtBQUssRUFBRSxFQUFFLEVBQ1QsTUFBTSxFQUFFLFlBQVksRUFDcEIsTUFBTSxFQUFFLENBQUMsRUFDVCxFQUFFLEVBQUUsd0JBQXdCLEdBQzNCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQVkvQjtBQUVELHdCQUFnQixvQkFBb0IsQ0FDbEMsWUFBWSxFQUFFLHFCQUFxQixFQUNuQyxhQUFhLEVBQUUsR0FBRyxDQUFDLFlBQVksRUFBRSxzQkFBc0IsQ0FBQyxRQVN6RDtBQXFCRCx3QkFBZ0IsVUFBVSxDQUFDLEVBQUUsRUFBRSxXQUFXLFFBY3pDO0FBRUQsd0JBQWdCLFdBQVcsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLFlBQVksU0FBUyxNQUFNLEVBQzNFLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxlQUFlLEVBQUUsRUFBRSw2QkFBNkIsQ0FBQyxDQUFDLEVBQUUsWUFBWSxDQUFDLEVBQ2xGLE9BQU8sQ0FBQyxFQUFFLE1BQU0sOEJBS2pCIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"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"}
|