@aztec/prover-client 0.69.1 → 0.71.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.d.ts +2 -0
- package/dest/bin/get-proof-inputs.d.ts.map +1 -0
- package/dest/bin/get-proof-inputs.js +50 -0
- package/dest/block_builder/light.d.ts +3 -5
- package/dest/block_builder/light.d.ts.map +1 -1
- package/dest/block_builder/light.js +9 -22
- package/dest/config.d.ts +2 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +3 -2
- package/dest/mocks/fixtures.d.ts +1 -1
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +2 -2
- package/dest/mocks/test_context.d.ts +1 -1
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +11 -12
- package/dest/orchestrator/block-building-helpers.d.ts +15 -29
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +51 -58
- package/dest/orchestrator/block-proving-state.d.ts +40 -44
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +149 -85
- package/dest/orchestrator/epoch-proving-state.d.ts +23 -30
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +92 -65
- package/dest/orchestrator/orchestrator.d.ts +17 -48
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +208 -351
- package/dest/orchestrator/tx-proving-state.d.ts +10 -6
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/tx-proving-state.js +57 -46
- package/dest/prover-agent/memory-proving-queue.d.ts +4 -4
- package/dest/prover-agent/memory-proving-queue.d.ts.map +1 -1
- package/dest/prover-agent/memory-proving-queue.js +5 -5
- package/dest/prover-agent/prover-agent.d.ts +0 -2
- package/dest/prover-agent/prover-agent.d.ts.map +1 -1
- package/dest/prover-agent/prover-agent.js +7 -9
- package/dest/prover-client/factory.d.ts.map +1 -1
- package/dest/prover-client/factory.js +3 -3
- package/dest/prover-client/prover-client.d.ts +4 -2
- package/dest/prover-client/prover-client.d.ts.map +1 -1
- package/dest/prover-client/prover-client.js +16 -15
- package/dest/prover-client/server-epoch-prover.d.ts +25 -0
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -0
- package/dest/prover-client/server-epoch-prover.js +40 -0
- package/dest/proving_broker/broker_prover_facade.d.ts +19 -7
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +271 -49
- package/dest/proving_broker/config.d.ts +61 -0
- package/dest/proving_broker/config.d.ts.map +1 -0
- package/dest/proving_broker/config.js +83 -0
- package/dest/proving_broker/factory.d.ts +1 -1
- package/dest/proving_broker/factory.d.ts.map +1 -1
- package/dest/proving_broker/factory.js +4 -7
- package/dest/proving_broker/fixtures.d.ts +5 -0
- package/dest/proving_broker/fixtures.d.ts.map +1 -0
- package/dest/proving_broker/fixtures.js +12 -0
- package/dest/proving_broker/index.d.ts +2 -1
- package/dest/proving_broker/index.d.ts.map +1 -1
- package/dest/proving_broker/index.js +3 -2
- package/dest/proving_broker/proof_store/factory.d.ts +6 -0
- package/dest/proving_broker/proof_store/factory.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/factory.js +39 -0
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts +13 -0
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/gcs_proof_store.js +46 -0
- package/dest/proving_broker/proof_store/index.d.ts +4 -0
- package/dest/proving_broker/proof_store/index.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/index.js +4 -0
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts +14 -0
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/inline_proof_store.js +37 -0
- package/dest/proving_broker/{proof_store.d.ts → proof_store/proof_store.d.ts} +1 -12
- package/dest/proving_broker/proof_store/proof_store.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/proof_store.js +2 -0
- 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 +5 -5
- package/dest/proving_broker/proving_broker.d.ts +16 -12
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +307 -274
- package/dest/proving_broker/proving_broker_database/memory.d.ts +4 -2
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/memory.js +17 -4
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +10 -6
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +106 -14
- package/dest/proving_broker/proving_broker_database.d.ts +7 -3
- package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
- package/dest/proving_broker/proving_job_controller.js +4 -4
- package/dest/proving_broker/rpc.d.ts.map +1 -1
- package/dest/proving_broker/rpc.js +4 -4
- package/dest/test/mock_prover.d.ts +8 -8
- package/dest/test/mock_prover.d.ts.map +1 -1
- package/dest/test/mock_prover.js +9 -10
- package/package.json +14 -12
- package/src/bin/get-proof-inputs.ts +60 -0
- package/src/block_builder/light.ts +7 -31
- package/src/config.ts +4 -4
- package/src/mocks/fixtures.ts +1 -1
- package/src/mocks/test_context.ts +9 -11
- package/src/orchestrator/block-building-helpers.ts +360 -402
- package/src/orchestrator/block-proving-state.ts +251 -121
- package/src/orchestrator/epoch-proving-state.ts +159 -88
- package/src/orchestrator/orchestrator.ts +262 -542
- package/src/orchestrator/tx-proving-state.ts +30 -18
- package/src/prover-agent/memory-proving-queue.ts +12 -16
- package/src/prover-agent/prover-agent.ts +14 -8
- package/src/prover-client/factory.ts +2 -3
- package/src/prover-client/prover-client.ts +17 -20
- package/src/prover-client/server-epoch-prover.ts +44 -0
- package/src/proving_broker/broker_prover_facade.ts +347 -67
- package/src/proving_broker/config.ts +93 -0
- package/src/proving_broker/factory.ts +11 -10
- package/src/proving_broker/fixtures.ts +14 -0
- package/src/proving_broker/index.ts +2 -1
- package/src/proving_broker/proof_store/factory.ts +42 -0
- package/src/proving_broker/proof_store/gcs_proof_store.ts +72 -0
- package/src/proving_broker/proof_store/index.ts +3 -0
- package/src/proving_broker/{proof_store.ts → proof_store/inline_proof_store.ts} +1 -44
- package/src/proving_broker/proof_store/proof_store.ts +54 -0
- package/src/proving_broker/proving_agent.ts +11 -5
- package/src/proving_broker/proving_broker.ts +122 -73
- package/src/proving_broker/proving_broker_database/memory.ts +24 -4
- package/src/proving_broker/proving_broker_database/persisted.ts +142 -20
- package/src/proving_broker/proving_broker_database.ts +8 -3
- package/src/proving_broker/proving_job_controller.ts +5 -5
- package/src/proving_broker/rpc.ts +2 -3
- package/src/test/mock_prover.ts +12 -18
- package/dest/proving_broker/proof_store.d.ts.map +0 -1
- package/dest/proving_broker/proof_store.js +0 -37
|
@@ -1,11 +1,20 @@
|
|
|
1
|
-
|
|
1
|
+
var _BlockProvingState_instances, _BlockProvingState_getEmptyBlockRootInputs, _BlockProvingState_getBlockRootRollupData, _BlockProvingState_getChildProofsForBlockRoot, _BlockProvingState_getPreviousRollupData, _BlockProvingState_getRootParityInputFromProvingOutput;
|
|
2
|
+
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
+
import { BLOBS_PER_BLOCK, FIELDS_PER_BLOB, Fr, MembershipWitness, NUM_BASE_PARITY_PER_ROOT_PARITY, RootParityInput, RootParityInputs, StateReference, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
|
|
2
4
|
import { SpongeBlob } from '@aztec/circuits.js/blobs';
|
|
5
|
+
import { BlockRootRollupData, BlockRootRollupInputs, ConstantRollupData, EmptyBlockRootRollupInputs, MergeRollupInputs, PreviousRollupData, SingleTxBlockRootRollupInputs, } from '@aztec/circuits.js/rollup';
|
|
6
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
7
|
+
import { UnbalancedTreeStore } from '@aztec/foundation/trees';
|
|
8
|
+
import { getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
|
|
9
|
+
import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
|
|
10
|
+
import { buildBlobHints, buildHeaderFromCircuitOutputs } from './block-building-helpers.js';
|
|
3
11
|
/**
|
|
4
12
|
* The current state of the proving schedule for a given block. Managed by ProvingState.
|
|
5
13
|
* Contains the raw inputs and intermediate state to generate every constituent proof in the tree.
|
|
6
14
|
*/
|
|
7
15
|
export class BlockProvingState {
|
|
8
|
-
constructor(index, globalVariables, newL1ToL2Messages, messageTreeSnapshot, messageTreeRootSiblingPath, messageTreeSnapshotAfterInsertion, archiveTreeSnapshot, archiveTreeRootSiblingPath, previousBlockHash, parentEpoch) {
|
|
16
|
+
constructor(index, globalVariables, newL1ToL2Messages, messageTreeSnapshot, messageTreeRootSiblingPath, messageTreeSnapshotAfterInsertion, archiveTreeSnapshot, archiveTreeRootSiblingPath, previousBlockHeader, previousBlockHash, parentEpoch) {
|
|
17
|
+
_BlockProvingState_instances.add(this);
|
|
9
18
|
this.index = index;
|
|
10
19
|
this.globalVariables = globalVariables;
|
|
11
20
|
this.newL1ToL2Messages = newL1ToL2Messages;
|
|
@@ -14,51 +23,23 @@ export class BlockProvingState {
|
|
|
14
23
|
this.messageTreeSnapshotAfterInsertion = messageTreeSnapshotAfterInsertion;
|
|
15
24
|
this.archiveTreeSnapshot = archiveTreeSnapshot;
|
|
16
25
|
this.archiveTreeRootSiblingPath = archiveTreeRootSiblingPath;
|
|
26
|
+
this.previousBlockHeader = previousBlockHeader;
|
|
17
27
|
this.previousBlockHash = previousBlockHash;
|
|
18
28
|
this.parentEpoch = parentEpoch;
|
|
19
|
-
this.
|
|
20
|
-
this.rootParityInputs = [];
|
|
29
|
+
this.baseOrMergeProvingOutputs = new UnbalancedTreeStore(0);
|
|
21
30
|
this.blockRootRollupStarted = false;
|
|
22
31
|
this.txs = [];
|
|
23
|
-
this.
|
|
32
|
+
this.baseParityProvingOutputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }).map(_ => undefined);
|
|
24
33
|
this.totalNumTxs = 0;
|
|
25
34
|
}
|
|
26
35
|
get blockNumber() {
|
|
27
36
|
return this.globalVariables.blockNumber.toNumber();
|
|
28
37
|
}
|
|
29
|
-
// Returns the number of levels of merge rollups
|
|
30
|
-
get numMergeLevels() {
|
|
31
|
-
return BigInt(Math.ceil(Math.log2(this.totalNumTxs)) - 1);
|
|
32
|
-
}
|
|
33
|
-
// Calculates the index and level of the parent rollup circuit
|
|
34
|
-
// Based on tree implementation in unbalanced_tree.ts -> batchInsert()
|
|
35
|
-
findMergeLevel(currentLevel, currentIndex) {
|
|
36
|
-
const moveUpMergeLevel = (levelSize, index, nodeToShift) => {
|
|
37
|
-
levelSize /= 2;
|
|
38
|
-
if (levelSize & 1) {
|
|
39
|
-
[levelSize, nodeToShift] = nodeToShift ? [levelSize + 1, false] : [levelSize - 1, true];
|
|
40
|
-
}
|
|
41
|
-
index >>= 1n;
|
|
42
|
-
return { thisLevelSize: levelSize, thisIndex: index, shiftUp: nodeToShift };
|
|
43
|
-
};
|
|
44
|
-
let [thisLevelSize, shiftUp] = this.totalNumTxs & 1 ? [this.totalNumTxs - 1, true] : [this.totalNumTxs, false];
|
|
45
|
-
const maxLevel = this.numMergeLevels + 1n;
|
|
46
|
-
let placeholder = currentIndex;
|
|
47
|
-
for (let i = 0; i < maxLevel - currentLevel; i++) {
|
|
48
|
-
({ thisLevelSize, thisIndex: placeholder, shiftUp } = moveUpMergeLevel(thisLevelSize, placeholder, shiftUp));
|
|
49
|
-
}
|
|
50
|
-
let thisIndex = currentIndex;
|
|
51
|
-
let mergeLevel = currentLevel;
|
|
52
|
-
while (thisIndex >= thisLevelSize && mergeLevel != 0n) {
|
|
53
|
-
mergeLevel -= 1n;
|
|
54
|
-
({ thisLevelSize, thisIndex, shiftUp } = moveUpMergeLevel(thisLevelSize, thisIndex, shiftUp));
|
|
55
|
-
}
|
|
56
|
-
return [mergeLevel - 1n, thisIndex >> 1n, thisIndex & 1n];
|
|
57
|
-
}
|
|
58
38
|
startNewBlock(numTxs, numBlobFields) {
|
|
59
39
|
if (this.spongeBlobState) {
|
|
60
40
|
throw new Error(`Block ${this.blockNumber} already initalised.`);
|
|
61
41
|
}
|
|
42
|
+
this.baseOrMergeProvingOutputs = new UnbalancedTreeStore(numTxs);
|
|
62
43
|
// Initialise the sponge which will eventually absorb all tx effects to be added to the blob.
|
|
63
44
|
// Like l1 to l2 messages, we need to know beforehand how many effects will be absorbed.
|
|
64
45
|
this.spongeBlobState = SpongeBlob.init(numBlobFields);
|
|
@@ -69,24 +50,28 @@ export class BlockProvingState {
|
|
|
69
50
|
if (!this.spongeBlobState) {
|
|
70
51
|
throw new Error(`Invalid block proving state, call startNewBlock before adding transactions.`);
|
|
71
52
|
}
|
|
72
|
-
this.txs.
|
|
73
|
-
|
|
53
|
+
const txIndex = this.txs.length;
|
|
54
|
+
this.txs[txIndex] = tx;
|
|
55
|
+
return txIndex;
|
|
56
|
+
}
|
|
57
|
+
setBaseRollupProof(txIndex, provingOutput) {
|
|
58
|
+
return this.baseOrMergeProvingOutputs.setLeaf(txIndex, provingOutput);
|
|
74
59
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
return this.txs.length;
|
|
60
|
+
setMergeRollupProof(location, provingOutput) {
|
|
61
|
+
this.baseOrMergeProvingOutputs.setNode(location, provingOutput);
|
|
78
62
|
}
|
|
79
|
-
//
|
|
80
|
-
|
|
81
|
-
|
|
63
|
+
// Stores a set of root parity inputs at the given index
|
|
64
|
+
setBaseParityProof(index, provingOutput) {
|
|
65
|
+
if (index >= NUM_BASE_PARITY_PER_ROOT_PARITY) {
|
|
66
|
+
throw new Error(`Unable to set a base parity proofs at index ${index}. Expected at most ${NUM_BASE_PARITY_PER_ROOT_PARITY} proofs.`);
|
|
67
|
+
}
|
|
68
|
+
this.baseParityProvingOutputs[index] = provingOutput;
|
|
82
69
|
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
this.finalRootParityInputs = input;
|
|
70
|
+
setRootParityProof(provingOutput) {
|
|
71
|
+
this.rootParityProvingOutput = provingOutput;
|
|
86
72
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
return this.rootParityInputs;
|
|
73
|
+
setBlockRootRollupProof(provingOutput) {
|
|
74
|
+
this.blockRootProvingOutput = provingOutput;
|
|
90
75
|
}
|
|
91
76
|
// Returns the complete set of transaction proving state objects
|
|
92
77
|
get allTxs() {
|
|
@@ -96,54 +81,85 @@ export class BlockProvingState {
|
|
|
96
81
|
get epochNumber() {
|
|
97
82
|
return this.parentEpoch.epochNumber;
|
|
98
83
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
84
|
+
getParentLocation(location) {
|
|
85
|
+
return this.baseOrMergeProvingOutputs.getParentLocation(location);
|
|
86
|
+
}
|
|
87
|
+
getMergeRollupInputs(mergeLocation) {
|
|
88
|
+
const [left, right] = this.baseOrMergeProvingOutputs.getChildren(mergeLocation);
|
|
89
|
+
if (!left || !right) {
|
|
90
|
+
throw new Error('At lease one child is not ready.');
|
|
91
|
+
}
|
|
92
|
+
return new MergeRollupInputs([__classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, left), __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, right)]);
|
|
93
|
+
}
|
|
94
|
+
getBlockRootRollupTypeAndInputs(proverId) {
|
|
95
|
+
if (this.totalNumTxs === 0) {
|
|
96
|
+
return {
|
|
97
|
+
rollupType: 'empty-block-root-rollup',
|
|
98
|
+
inputs: __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getEmptyBlockRootInputs).call(this, proverId),
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
const proofs = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getChildProofsForBlockRoot).call(this);
|
|
102
|
+
const nonEmptyProofs = proofs.filter(p => !!p);
|
|
103
|
+
if (proofs.length !== nonEmptyProofs.length) {
|
|
104
|
+
throw new Error('At lease one child is not ready for the block root.');
|
|
105
|
+
}
|
|
106
|
+
const previousRollupData = nonEmptyProofs.map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, p));
|
|
107
|
+
const data = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getBlockRootRollupData).call(this, proverId);
|
|
108
|
+
if (previousRollupData.length === 1) {
|
|
109
|
+
return {
|
|
110
|
+
rollupType: 'single-tx-block-root-rollup',
|
|
111
|
+
inputs: new SingleTxBlockRootRollupInputs(previousRollupData, data),
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
return {
|
|
116
|
+
rollupType: 'block-root-rollup',
|
|
117
|
+
inputs: new BlockRootRollupInputs(previousRollupData, data),
|
|
112
118
|
};
|
|
113
|
-
mergeInputData.inputs[indexWithinMerge] = mergeInputs[0];
|
|
114
|
-
mergeInputData.proofs[indexWithinMerge] = mergeInputs[1];
|
|
115
|
-
mergeInputData.verificationKeys[indexWithinMerge] = mergeInputs[2];
|
|
116
|
-
this.mergeRollupInputs[indexOfMerge] = mergeInputData;
|
|
117
|
-
return false;
|
|
118
119
|
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
120
|
+
}
|
|
121
|
+
getRootParityInputs() {
|
|
122
|
+
if (!this.baseParityProvingOutputs.every(p => !!p)) {
|
|
123
|
+
throw new Error('At lease one base parity is not ready.');
|
|
124
|
+
}
|
|
125
|
+
const children = this.baseParityProvingOutputs.map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getRootParityInputFromProvingOutput).call(this, p));
|
|
126
|
+
return new RootParityInputs(children);
|
|
127
|
+
}
|
|
128
|
+
getL1ToL2Roots() {
|
|
129
|
+
if (!this.rootParityProvingOutput) {
|
|
130
|
+
throw new Error('Root parity is not ready.');
|
|
131
|
+
}
|
|
132
|
+
return __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getRootParityInputFromProvingOutput).call(this, this.rootParityProvingOutput);
|
|
124
133
|
}
|
|
125
134
|
// Returns a specific transaction proving state
|
|
126
135
|
getTxProvingState(txIndex) {
|
|
127
136
|
return this.txs[txIndex];
|
|
128
137
|
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
138
|
+
buildHeaderFromProvingOutputs(logger) {
|
|
139
|
+
const previousRollupData = this.totalNumTxs === 0 ? [] : __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getChildProofsForBlockRoot).call(this).map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, p));
|
|
140
|
+
let endPartialState = this.previousBlockHeader.state.partial;
|
|
141
|
+
if (this.totalNumTxs !== 0) {
|
|
142
|
+
const previousRollupData = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getChildProofsForBlockRoot).call(this);
|
|
143
|
+
const lastRollup = previousRollupData[previousRollupData.length - 1];
|
|
144
|
+
if (!lastRollup) {
|
|
145
|
+
throw new Error('End state of the block is not available. Last rollup is not ready yet.');
|
|
146
|
+
}
|
|
147
|
+
endPartialState = lastRollup.inputs.end;
|
|
148
|
+
}
|
|
149
|
+
const endState = new StateReference(this.messageTreeSnapshotAfterInsertion, endPartialState);
|
|
150
|
+
return buildHeaderFromCircuitOutputs(previousRollupData.map(d => d.baseOrMergeRollupPublicInputs), this.rootParityProvingOutput.inputs, this.blockRootProvingOutput.inputs, endState, logger);
|
|
151
|
+
}
|
|
152
|
+
isReadyForMergeRollup(location) {
|
|
153
|
+
return this.baseOrMergeProvingOutputs.getSibling(location) !== undefined;
|
|
132
154
|
}
|
|
133
155
|
// Returns true if we have sufficient inputs to execute the block root rollup
|
|
134
156
|
isReadyForBlockRootRollup() {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
this.finalRootParityInput === undefined ||
|
|
138
|
-
this.mergeRollupInputs[0].inputs.findIndex(p => !p) !== -1);
|
|
139
|
-
}
|
|
140
|
-
// Stores a set of root parity inputs at the given index
|
|
141
|
-
setRootParityInputs(inputs, index) {
|
|
142
|
-
this.rootParityInputs[index] = inputs;
|
|
157
|
+
const childProofs = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getChildProofsForBlockRoot).call(this);
|
|
158
|
+
return this.block !== undefined && this.rootParityProvingOutput !== undefined && childProofs.every(p => !!p);
|
|
143
159
|
}
|
|
144
160
|
// Returns true if we have sufficient root parity inputs to execute the root parity circuit
|
|
145
|
-
|
|
146
|
-
return this.
|
|
161
|
+
isReadyForRootParity() {
|
|
162
|
+
return this.baseParityProvingOutputs.every(p => !!p);
|
|
147
163
|
}
|
|
148
164
|
// Returns whether the proving state is still valid
|
|
149
165
|
verifyState() {
|
|
@@ -154,4 +170,52 @@ export class BlockProvingState {
|
|
|
154
170
|
this.parentEpoch.reject(reason);
|
|
155
171
|
}
|
|
156
172
|
}
|
|
157
|
-
|
|
173
|
+
_BlockProvingState_instances = new WeakSet(), _BlockProvingState_getEmptyBlockRootInputs = function _BlockProvingState_getEmptyBlockRootInputs(proverId) {
|
|
174
|
+
const l1ToL2Roots = this.getL1ToL2Roots();
|
|
175
|
+
const constants = ConstantRollupData.from({
|
|
176
|
+
lastArchive: this.archiveTreeSnapshot,
|
|
177
|
+
globalVariables: this.globalVariables,
|
|
178
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
179
|
+
protocolContractTreeRoot,
|
|
180
|
+
});
|
|
181
|
+
return EmptyBlockRootRollupInputs.from({
|
|
182
|
+
l1ToL2Roots,
|
|
183
|
+
newL1ToL2MessageTreeRootSiblingPath: this.messageTreeRootSiblingPath,
|
|
184
|
+
startL1ToL2MessageTreeSnapshot: this.messageTreeSnapshot,
|
|
185
|
+
newArchiveSiblingPath: this.archiveTreeRootSiblingPath,
|
|
186
|
+
previousBlockHash: this.previousBlockHash,
|
|
187
|
+
previousPartialState: this.previousBlockHeader.state.partial,
|
|
188
|
+
constants,
|
|
189
|
+
proverId,
|
|
190
|
+
isPadding: false,
|
|
191
|
+
});
|
|
192
|
+
}, _BlockProvingState_getBlockRootRollupData = function _BlockProvingState_getBlockRootRollupData(proverId) {
|
|
193
|
+
const txEffects = this.txs.map(txProvingState => txProvingState.processedTx.txEffect);
|
|
194
|
+
const { blobFields, blobCommitments, blobsHash } = buildBlobHints(txEffects);
|
|
195
|
+
return BlockRootRollupData.from({
|
|
196
|
+
l1ToL2Roots: this.getL1ToL2Roots(),
|
|
197
|
+
newL1ToL2MessageTreeRootSiblingPath: this.messageTreeRootSiblingPath,
|
|
198
|
+
startL1ToL2MessageTreeSnapshot: this.messageTreeSnapshot,
|
|
199
|
+
newArchiveSiblingPath: this.archiveTreeRootSiblingPath,
|
|
200
|
+
previousBlockHash: this.previousBlockHash,
|
|
201
|
+
proverId,
|
|
202
|
+
blobFields: padArrayEnd(blobFields, Fr.ZERO, FIELDS_PER_BLOB * BLOBS_PER_BLOCK),
|
|
203
|
+
blobCommitments: padArrayEnd(blobCommitments, [Fr.ZERO, Fr.ZERO], BLOBS_PER_BLOCK),
|
|
204
|
+
blobsHash,
|
|
205
|
+
});
|
|
206
|
+
}, _BlockProvingState_getChildProofsForBlockRoot = function _BlockProvingState_getChildProofsForBlockRoot() {
|
|
207
|
+
if (this.totalNumTxs === 0) {
|
|
208
|
+
return [];
|
|
209
|
+
}
|
|
210
|
+
const rootLocation = { level: 0, index: 0 };
|
|
211
|
+
// If there's only 1 tx, its base rollup proof will be stored at the root.
|
|
212
|
+
return this.totalNumTxs === 1
|
|
213
|
+
? [this.baseOrMergeProvingOutputs.getNode(rootLocation)]
|
|
214
|
+
: this.baseOrMergeProvingOutputs.getChildren(rootLocation);
|
|
215
|
+
}, _BlockProvingState_getPreviousRollupData = function _BlockProvingState_getPreviousRollupData({ inputs, proof, verificationKey, }) {
|
|
216
|
+
const leafIndex = getVKIndex(verificationKey.keyAsFields);
|
|
217
|
+
return new PreviousRollupData(inputs, proof, verificationKey.keyAsFields, new MembershipWitness(VK_TREE_HEIGHT, BigInt(leafIndex), getVKSiblingPath(leafIndex)));
|
|
218
|
+
}, _BlockProvingState_getRootParityInputFromProvingOutput = function _BlockProvingState_getRootParityInputFromProvingOutput({ inputs, proof, verificationKey, }) {
|
|
219
|
+
return new RootParityInput(proof, verificationKey.keyAsFields, getVKSiblingPath(getVKIndex(verificationKey)), inputs);
|
|
220
|
+
};
|
|
221
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"block-proving-state.js","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,10 @@
|
|
|
1
|
-
import { type MerkleTreeId } from '@aztec/circuit-types';
|
|
2
|
-
import {
|
|
3
|
-
import { type BlockRootOrBlockMergePublicInputs, type RootRollupPublicInputs } from '@aztec/circuits.js/rollup';
|
|
1
|
+
import { type MerkleTreeId, type ProofAndVerificationKey, type PublicInputsAndRecursiveProof } from '@aztec/circuit-types';
|
|
2
|
+
import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, type BlockHeader, Fr, type GlobalVariables, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/circuits.js';
|
|
3
|
+
import { BlockMergeRollupInputs, type BlockRootOrBlockMergePublicInputs, EmptyBlockRootRollupInputs, RootRollupInputs, type RootRollupPublicInputs } from '@aztec/circuits.js/rollup';
|
|
4
4
|
import { type Tuple } from '@aztec/foundation/serialize';
|
|
5
|
+
import { type TreeNodeLocation } from '@aztec/foundation/trees';
|
|
5
6
|
import { BlockProvingState } from './block-proving-state.js';
|
|
6
7
|
export type TreeSnapshots = Map<MerkleTreeId, AppendOnlyTreeSnapshot>;
|
|
7
|
-
export type BlockMergeRollupInputData = {
|
|
8
|
-
inputs: [BlockRootOrBlockMergePublicInputs | undefined, BlockRootOrBlockMergePublicInputs | undefined];
|
|
9
|
-
proofs: [
|
|
10
|
-
RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH> | undefined,
|
|
11
|
-
RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH> | undefined
|
|
12
|
-
];
|
|
13
|
-
verificationKeys: [VerificationKeyAsFields | undefined, VerificationKeyAsFields | undefined];
|
|
14
|
-
};
|
|
15
8
|
export type ProvingResult = {
|
|
16
9
|
status: 'success';
|
|
17
10
|
} | {
|
|
@@ -25,36 +18,36 @@ export type ProvingResult = {
|
|
|
25
18
|
* Captures resolve and reject callbacks to provide a promise base interface to the consumer of our proving.
|
|
26
19
|
*/
|
|
27
20
|
export declare class EpochProvingState {
|
|
21
|
+
#private;
|
|
28
22
|
readonly epochNumber: number;
|
|
29
23
|
readonly firstBlockNumber: number;
|
|
30
24
|
readonly totalNumBlocks: number;
|
|
31
25
|
private completionCallback;
|
|
32
26
|
private rejectionCallback;
|
|
27
|
+
private blockRootOrMergeProvingOutputs;
|
|
28
|
+
private paddingBlockRootProvingOutput;
|
|
29
|
+
private rootRollupProvingOutput;
|
|
33
30
|
private provingStateLifecycle;
|
|
34
|
-
|
|
35
|
-
rootRollupPublicInputs: RootRollupPublicInputs | undefined;
|
|
36
|
-
finalProof: Proof | undefined;
|
|
31
|
+
readonly cachedTubeProofs: Map<string, Promise<ProofAndVerificationKey<534>>>;
|
|
37
32
|
blocks: (BlockProvingState | undefined)[];
|
|
38
33
|
constructor(epochNumber: number, firstBlockNumber: number, totalNumBlocks: number, completionCallback: (result: ProvingResult) => void, rejectionCallback: (reason: string) => void);
|
|
39
|
-
|
|
40
|
-
findMergeLevel(currentLevel: bigint, currentIndex: bigint): bigint[];
|
|
41
|
-
startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[], messageTreeSnapshot: AppendOnlyTreeSnapshot, messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, messageTreeSnapshotAfterInsertion: AppendOnlyTreeSnapshot, archiveTreeSnapshot: AppendOnlyTreeSnapshot, archiveTreeRootSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, previousBlockHash: Fr): BlockProvingState;
|
|
34
|
+
startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[], messageTreeSnapshot: AppendOnlyTreeSnapshot, messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, messageTreeSnapshotAfterInsertion: AppendOnlyTreeSnapshot, archiveTreeSnapshot: AppendOnlyTreeSnapshot, archiveTreeRootSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, previousBlockHeader: BlockHeader, previousBlockHash: Fr): BlockProvingState;
|
|
42
35
|
verifyState(): boolean;
|
|
43
36
|
isAcceptingBlocks(): boolean;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
BlockRootOrBlockMergePublicInputs,
|
|
53
|
-
RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>,
|
|
54
|
-
VerificationKeyAsFields
|
|
55
|
-
], indexWithinMerge: number, indexOfMerge: number): boolean;
|
|
37
|
+
setBlockRootRollupProof(blockIndex: number, proof: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): TreeNodeLocation;
|
|
38
|
+
setBlockMergeRollupProof(location: TreeNodeLocation, proof: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
|
|
39
|
+
setRootRollupProof(proof: PublicInputsAndRecursiveProof<RootRollupPublicInputs>): void;
|
|
40
|
+
setPaddingBlockRootProof(proof: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
|
|
41
|
+
getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
|
|
42
|
+
getBlockMergeRollupInputs(mergeLocation: TreeNodeLocation): BlockMergeRollupInputs;
|
|
43
|
+
getRootRollupInputs(proverId: Fr): RootRollupInputs;
|
|
44
|
+
getPaddingBlockRootInputs(proverId: Fr): EmptyBlockRootRollupInputs;
|
|
56
45
|
getBlockProvingStateByBlockNumber(blockNumber: number): BlockProvingState | undefined;
|
|
57
|
-
|
|
46
|
+
getEpochProofResult(): {
|
|
47
|
+
proof: import("@aztec/circuits.js").Proof;
|
|
48
|
+
publicInputs: RootRollupPublicInputs;
|
|
49
|
+
};
|
|
50
|
+
isReadyForBlockMerge(location: TreeNodeLocation): boolean;
|
|
58
51
|
isReadyForRootRollup(): boolean;
|
|
59
52
|
cancel(): void;
|
|
60
53
|
reject(reason: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epoch-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/epoch-proving-state.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"epoch-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/epoch-proving-state.ts"],"names":[],"mappings":"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"}
|