@aztec/sequencer-client 0.28.1 → 0.30.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/block_builder/index.d.ts +2 -4
- package/dest/block_builder/index.d.ts.map +1 -1
- package/dest/block_builder/solo_block_builder.d.ts +4 -7
- package/dest/block_builder/solo_block_builder.d.ts.map +1 -1
- package/dest/block_builder/solo_block_builder.js +18 -20
- package/dest/client/sequencer-client.d.ts +4 -3
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +2 -2
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +6 -2
- package/dest/sequencer/abstract_phase_manager.d.ts.map +1 -1
- package/dest/sequencer/abstract_phase_manager.js +10 -11
- package/dest/sequencer/hints_builder.d.ts +1 -1
- package/dest/sequencer/hints_builder.d.ts.map +1 -1
- package/dest/sequencer/hints_builder.js +4 -4
- package/dest/sequencer/processed_tx.d.ts.map +1 -1
- package/dest/sequencer/processed_tx.js +3 -3
- package/dest/sequencer/public_processor.d.ts +2 -1
- package/dest/sequencer/public_processor.d.ts.map +1 -1
- package/dest/sequencer/public_processor.js +1 -1
- package/dest/sequencer/sequencer.d.ts +6 -26
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +26 -101
- package/dest/sequencer/tx_validator.d.ts +22 -0
- package/dest/sequencer/tx_validator.d.ts.map +1 -0
- package/dest/sequencer/tx_validator.js +125 -0
- package/dest/simulator/public_executor.d.ts +3 -5
- package/dest/simulator/public_executor.d.ts.map +1 -1
- package/dest/simulator/public_executor.js +18 -34
- package/package.json +13 -13
- package/src/block_builder/index.ts +2 -8
- package/src/block_builder/solo_block_builder.ts +18 -29
- package/src/client/sequencer-client.ts +3 -1
- package/src/config.ts +6 -0
- package/src/sequencer/abstract_phase_manager.ts +9 -12
- package/src/sequencer/hints_builder.ts +2 -8
- package/src/sequencer/processed_tx.ts +2 -0
- package/src/sequencer/public_processor.ts +2 -1
- package/src/sequencer/sequencer.ts +31 -117
- package/src/sequencer/tx_validator.ts +189 -0
- package/src/simulator/public_executor.ts +15 -42
|
@@ -11,11 +11,9 @@ export interface BlockBuilder {
|
|
|
11
11
|
* Note that the number of txs need to be a power of two.
|
|
12
12
|
* @param globalVariables - Global variables to include in the block.
|
|
13
13
|
* @param txs - Processed txs to include.
|
|
14
|
-
* @param
|
|
15
|
-
* @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
|
|
14
|
+
* @param l1ToL2Messages - L1 to L2 messages to be part of the block.
|
|
16
15
|
* @returns The new L2 block along with its proof from the root circuit.
|
|
17
16
|
*/
|
|
18
|
-
buildL2Block(globalVariables: GlobalVariables, txs: ProcessedTx[],
|
|
19
|
-
newL1ToL2Messages: Fr[]): Promise<[L2Block, Proof]>;
|
|
17
|
+
buildL2Block(globalVariables: GlobalVariables, txs: ProcessedTx[], l1ToL2Messages: Fr[]): Promise<[L2Block, Proof]>;
|
|
20
18
|
}
|
|
21
19
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block_builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block_builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;CACrH"}
|
|
@@ -24,24 +24,21 @@ export declare class SoloBlockBuilder implements BlockBuilder {
|
|
|
24
24
|
* Builds an L2 block with the given number containing the given txs, updating state trees.
|
|
25
25
|
* @param globalVariables - Global variables to be used in the block.
|
|
26
26
|
* @param txs - Processed transactions to include in the block.
|
|
27
|
-
* @param
|
|
28
|
-
* @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
|
|
27
|
+
* @param l1ToL2Messages - L1 to L2 messages to be part of the block.
|
|
29
28
|
* @param timestamp - Timestamp of the block.
|
|
30
29
|
* @returns The new L2 block and a correctness proof as returned by the root rollup circuit.
|
|
31
30
|
*/
|
|
32
|
-
buildL2Block(globalVariables: GlobalVariables, txs: ProcessedTx[],
|
|
33
|
-
newL1ToL2Messages: Fr[]): Promise<[L2Block, Proof]>;
|
|
31
|
+
buildL2Block(globalVariables: GlobalVariables, txs: ProcessedTx[], l1ToL2Messages: Fr[]): Promise<[L2Block, Proof]>;
|
|
34
32
|
protected validateTxs(txs: ProcessedTx[]): void;
|
|
35
33
|
protected getTreeSnapshot(id: MerkleTreeId): Promise<AppendOnlyTreeSnapshot>;
|
|
36
|
-
protected runCircuits(globalVariables: GlobalVariables, txs: ProcessedTx[],
|
|
37
|
-
newL1ToL2Messages: Fr[]): Promise<[RootRollupPublicInputs, Proof]>;
|
|
34
|
+
protected runCircuits(globalVariables: GlobalVariables, txs: ProcessedTx[], l1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>): Promise<[RootRollupPublicInputs, Proof]>;
|
|
38
35
|
protected baseParityCircuit(inputs: BaseParityInputs): Promise<RootParityInput>;
|
|
39
36
|
protected rootParityCircuit(inputs: RootParityInputs): Promise<RootParityInput>;
|
|
40
37
|
protected baseRollupCircuit(tx: ProcessedTx, inputs: BaseRollupInputs, treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot>): Promise<[BaseOrMergeRollupPublicInputs, Proof]>;
|
|
41
38
|
protected createMergeRollupInputs(left: [BaseOrMergeRollupPublicInputs, Proof], right: [BaseOrMergeRollupPublicInputs, Proof]): MergeRollupInputs;
|
|
42
39
|
protected mergeRollupCircuit(mergeInputs: MergeRollupInputs): Promise<[BaseOrMergeRollupPublicInputs, Proof]>;
|
|
43
40
|
protected getVerificationKey(type: RollupTypes): VerificationKey;
|
|
44
|
-
protected rootRollupCircuit(left: [BaseOrMergeRollupPublicInputs, Proof], right: [BaseOrMergeRollupPublicInputs, Proof], l1ToL2Roots: RootParityInput,
|
|
41
|
+
protected rootRollupCircuit(left: [BaseOrMergeRollupPublicInputs, Proof], right: [BaseOrMergeRollupPublicInputs, Proof], l1ToL2Roots: RootParityInput, l1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>): Promise<[RootRollupPublicInputs, Proof]>;
|
|
45
42
|
protected validatePartialState(partialState: PartialStateReference, treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot>): void;
|
|
46
43
|
protected validateState(state: StateReference): Promise<void>;
|
|
47
44
|
protected validateRootOutput(rootOutput: RootRollupPublicInputs): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solo_block_builder.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,YAAY,EAAY,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAEL,sBAAsB,EACtB,6BAA6B,EAC7B,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAMf,iBAAiB,EACjB,iBAAiB,EAMjB,mCAAmC,EAEnC,qBAAqB,EAIrB,qBAAqB,EACrB,kBAAkB,EAClB,KAAK,EACL,kBAAkB,EAClB,0BAA0B,EAG1B,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,sBAAsB,EAEtB,cAAc,EAEd,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,EAAgC,MAAM,6BAA6B,CAAC;AAElF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAK1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAc,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAWvC;;;GAGG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IAEjD,SAAS,CAAC,EAAE,EAAE,oBAAoB;IAClC,SAAS,CAAC,GAAG,EAAE,gBAAgB;IAC/B,SAAS,CAAC,SAAS,EAAE,eAAe;IACpC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,KAAK;gBAJL,EAAE,EAAE,oBAAoB,EACxB,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,eAAe,EAC1B,MAAM,EAAE,YAAY,EACpB,KAAK,8CAA0D;IAG3E
|
|
1
|
+
{"version":3,"file":"solo_block_builder.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,20 +32,20 @@ export class SoloBlockBuilder {
|
|
|
32
32
|
* Builds an L2 block with the given number containing the given txs, updating state trees.
|
|
33
33
|
* @param globalVariables - Global variables to be used in the block.
|
|
34
34
|
* @param txs - Processed transactions to include in the block.
|
|
35
|
-
* @param
|
|
36
|
-
* @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
|
|
35
|
+
* @param l1ToL2Messages - L1 to L2 messages to be part of the block.
|
|
37
36
|
* @param timestamp - Timestamp of the block.
|
|
38
37
|
* @returns The new L2 block and a correctness proof as returned by the root rollup circuit.
|
|
39
38
|
*/
|
|
40
|
-
async buildL2Block(globalVariables, txs,
|
|
41
|
-
newL1ToL2Messages) {
|
|
39
|
+
async buildL2Block(globalVariables, txs, l1ToL2Messages) {
|
|
42
40
|
// Check txs are good for processing by checking if all the tree snapshots in header are non-empty
|
|
43
41
|
this.validateTxs(txs);
|
|
42
|
+
// We pad the messages as the circuits expect that.
|
|
43
|
+
const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
|
|
44
44
|
// We fill the tx batch with empty txs, we process only one tx at a time for now
|
|
45
|
-
const [circuitsOutput, proof] = await this.runCircuits(globalVariables, txs,
|
|
45
|
+
const [circuitsOutput, proof] = await this.runCircuits(globalVariables, txs, l1ToL2MessagesPadded);
|
|
46
46
|
// Collect all new nullifiers, commitments, and contracts from all txs in this block
|
|
47
47
|
const txEffects = txs.map(tx => toTxEffect(tx));
|
|
48
|
-
const blockBody = new Body(
|
|
48
|
+
const blockBody = new Body(l1ToL2MessagesPadded, txEffects);
|
|
49
49
|
const l2Block = L2Block.fromFields({
|
|
50
50
|
archive: circuitsOutput.archive,
|
|
51
51
|
header: circuitsOutput.header,
|
|
@@ -80,27 +80,25 @@ export class SoloBlockBuilder {
|
|
|
80
80
|
const treeInfo = await this.db.getTreeInfo(id);
|
|
81
81
|
return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
|
|
82
82
|
}
|
|
83
|
-
async runCircuits(globalVariables, txs,
|
|
84
|
-
newL1ToL2Messages) {
|
|
83
|
+
async runCircuits(globalVariables, txs, l1ToL2Messages) {
|
|
85
84
|
// Check that the length of the array of txs is a power of two
|
|
86
85
|
// See https://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2
|
|
87
86
|
if (txs.length < 2 || (txs.length & (txs.length - 1)) !== 0) {
|
|
88
87
|
throw new Error(`Length of txs for the block should be a power of two and at least two (got ${txs.length})`);
|
|
89
88
|
}
|
|
90
89
|
// BASE PARITY CIRCUIT (run in parallel)
|
|
90
|
+
// Note: In the future we will want to cache the results of empty base and root parity circuits so that we don't
|
|
91
|
+
// have to run them. (It will most likely be quite common that some base parity circuits will be "empty")
|
|
91
92
|
let baseParityInputs = [];
|
|
92
93
|
let elapsedBaseParityOutputsPromise;
|
|
93
94
|
{
|
|
94
|
-
|
|
95
|
-
baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) => BaseParityInputs.fromSlice(newModelL1ToL2MessagesTuple, i));
|
|
95
|
+
baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) => BaseParityInputs.fromSlice(l1ToL2Messages, i));
|
|
96
96
|
const baseParityOutputs = [];
|
|
97
97
|
for (const inputs of baseParityInputs) {
|
|
98
98
|
baseParityOutputs.push(this.baseParityCircuit(inputs));
|
|
99
99
|
}
|
|
100
100
|
elapsedBaseParityOutputsPromise = elapsed(() => Promise.all(baseParityOutputs));
|
|
101
101
|
}
|
|
102
|
-
// padArrayEnd throws if the array is already full. Otherwise it pads till we reach the required size
|
|
103
|
-
const newL1ToL2MessagesTuple = padArrayEnd(newL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
|
|
104
102
|
// BASE ROLLUP CIRCUIT (run in parallel)
|
|
105
103
|
let elapsedBaseRollupOutputsPromise;
|
|
106
104
|
const baseRollupInputs = [];
|
|
@@ -190,7 +188,7 @@ export class SoloBlockBuilder {
|
|
|
190
188
|
inputSize: rootParityInputs.toBuffer().length,
|
|
191
189
|
outputSize: rootParityOutput.toBuffer().length,
|
|
192
190
|
});
|
|
193
|
-
return this.rootRollupCircuit(mergeOutputLeft, mergeOutputRight, rootParityOutput,
|
|
191
|
+
return this.rootRollupCircuit(mergeOutputLeft, mergeOutputRight, rootParityOutput, l1ToL2Messages);
|
|
194
192
|
}
|
|
195
193
|
async baseParityCircuit(inputs) {
|
|
196
194
|
this.debug(`Running base parity circuit`);
|
|
@@ -235,11 +233,11 @@ export class SoloBlockBuilder {
|
|
|
235
233
|
throw new Error(`No verification key available for ${type}`);
|
|
236
234
|
}
|
|
237
235
|
}
|
|
238
|
-
async rootRollupCircuit(left, right, l1ToL2Roots,
|
|
236
|
+
async rootRollupCircuit(left, right, l1ToL2Roots, l1ToL2Messages) {
|
|
239
237
|
this.debug(`Running root rollup circuit`);
|
|
240
|
-
const rootInput = await this.getRootRollupInput(...left, ...right, l1ToL2Roots,
|
|
241
|
-
// Update the local trees to include the
|
|
242
|
-
await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
|
|
238
|
+
const rootInput = await this.getRootRollupInput(...left, ...right, l1ToL2Roots, l1ToL2Messages);
|
|
239
|
+
// Update the local trees to include the l1 to l2 messages
|
|
240
|
+
await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2Messages.map(m => m.toBuffer()));
|
|
243
241
|
// Simulate and get proof for the root circuit
|
|
244
242
|
const rootOutput = await this.simulator.rootRollupCircuit(rootInput);
|
|
245
243
|
const rootProof = await this.prover.getRootRollupProof(rootInput, rootOutput);
|
|
@@ -413,8 +411,8 @@ export class SoloBlockBuilder {
|
|
|
413
411
|
async getPublicDataReadsInfo(tx) {
|
|
414
412
|
const newPublicDataReadsWitnesses = makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT, 0n));
|
|
415
413
|
const newPublicDataReadsPreimages = makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => PublicDataTreeLeafPreimage.empty());
|
|
416
|
-
for (const i in tx.data.
|
|
417
|
-
const leafSlot = tx.data.
|
|
414
|
+
for (const i in tx.data.validationRequests.publicDataReads) {
|
|
415
|
+
const leafSlot = tx.data.validationRequests.publicDataReads[i].leafSlot.value;
|
|
418
416
|
const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
|
|
419
417
|
if (!lowLeafResult) {
|
|
420
418
|
throw new Error(`Public data tree should have one initial leaf`);
|
|
@@ -488,4 +486,4 @@ export class SoloBlockBuilder {
|
|
|
488
486
|
return new MembershipWitness(height, 0n, makeTuple(height, () => Fr.ZERO));
|
|
489
487
|
}
|
|
490
488
|
}
|
|
491
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"solo_block_builder.js","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"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"}
|
|
489
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"solo_block_builder.js","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { L1ToL2MessageSource, L2BlockSource } from '@aztec/circuit-types';
|
|
2
2
|
import { P2P } from '@aztec/p2p';
|
|
3
|
+
import { ContractDataSource } from '@aztec/types/contracts';
|
|
3
4
|
import { WorldStateSynchronizer } from '@aztec/world-state';
|
|
4
5
|
import { SequencerClientConfig } from '../config.js';
|
|
5
6
|
import { Sequencer, SequencerConfig } from '../sequencer/index.js';
|
|
@@ -33,7 +34,7 @@ export declare class SequencerClient {
|
|
|
33
34
|
* Restarts the sequencer after being stopped.
|
|
34
35
|
*/
|
|
35
36
|
restart(): void;
|
|
36
|
-
get coinbase(): import("@aztec/
|
|
37
|
-
get feeRecipient(): import("@aztec/
|
|
37
|
+
get coinbase(): import("@aztec/circuits.js").EthAddress;
|
|
38
|
+
get feeRecipient(): import("@aztec/circuits.js").AztecAddress;
|
|
38
39
|
}
|
|
39
40
|
//# sourceMappingURL=sequencer-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAK5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAKrD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AA6BnE;;GAEG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAExC;;;;;;;;;OASG;WACiB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,GAAG,EACd,sBAAsB,EAAE,sBAAsB,EAC9C,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB;IAuC1C;;;OAGG;IACI,qBAAqB,CAAC,MAAM,EAAE,eAAe;IAIpD;;OAEG;IACU,IAAI;IAIjB;;OAEG;IACI,OAAO;IAId,IAAI,QAAQ,4CAEX;IAED,IAAI,YAAY,8CAEf;CACF"}
|
|
@@ -55,7 +55,7 @@ export class SequencerClient {
|
|
|
55
55
|
const simulationProvider = await getSimulationProvider(config);
|
|
56
56
|
const blockBuilder = new SoloBlockBuilder(merkleTreeDb, getVerificationKeys(), new RealRollupCircuitSimulator(simulationProvider), new EmptyRollupProver());
|
|
57
57
|
const publicProcessorFactory = new PublicProcessorFactory(merkleTreeDb, contractDataSource, l1ToL2MessageSource, simulationProvider);
|
|
58
|
-
const sequencer = new Sequencer(publisher, globalsBuilder, p2pClient, worldStateSynchronizer, blockBuilder, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, config);
|
|
58
|
+
const sequencer = new Sequencer(publisher, globalsBuilder, p2pClient, worldStateSynchronizer, blockBuilder, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, config, config.l1Contracts.gasPortalAddress);
|
|
59
59
|
await sequencer.start();
|
|
60
60
|
return new SequencerClient(sequencer);
|
|
61
61
|
}
|
|
@@ -85,4 +85,4 @@ export class SequencerClient {
|
|
|
85
85
|
return this.sequencer.feeRecipient;
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvc2VxdWVuY2VyLWNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUsxRCxPQUFPLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUUxRSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNwRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN2RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFNBQVMsRUFBbUIsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUMxRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDMUQsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHcEUsTUFBTSxNQUFNLEdBQUcsaUJBQWlCLENBQUMsd0JBQXdCLENBQUMsQ0FBQztBQUUzRDs7OztHQUlHO0FBQ0gsS0FBSyxVQUFVLHFCQUFxQixDQUFDLE1BQTZCO0lBQ2hFLElBQUksTUFBTSxDQUFDLGNBQWMsSUFBSSxNQUFNLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztRQUN6RCxJQUFJLENBQUM7WUFDSCxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsU0FBUyxDQUFDLElB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
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,2BAA2B;AAC3B,KAAK,WAAW,GAAG;IACjB,yCAAyC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,iCAAiC;IACjC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,cAAc,GACd,eAAe,GACf,kBAAkB,GAClB,WAAW,CAAC;AAEd;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,2BAA2B;AAC3B,KAAK,WAAW,GAAG;IACjB,yCAAyC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,iCAAiC;IACjC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,cAAc,GACd,eAAe,GACf,kBAAkB,GAClB,WAAW,CAAC;AAEd;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CA6DxD"}
|
package/dest/config.js
CHANGED
|
@@ -5,7 +5,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
|
|
|
5
5
|
* Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
|
|
6
6
|
*/
|
|
7
7
|
export function getConfigEnvVars() {
|
|
8
|
-
const { SEQ_PUBLISHER_PRIVATE_KEY, ETHEREUM_HOST, CHAIN_ID, VERSION, API_KEY, SEQ_REQUIRED_CONFIRMATIONS, SEQ_PUBLISH_RETRY_INTERVAL_MS, SEQ_TX_POLLING_INTERVAL_MS, SEQ_MAX_TX_PER_BLOCK, SEQ_MIN_TX_PER_BLOCK, AVAILABILITY_ORACLE_CONTRACT_ADDRESS, ROLLUP_CONTRACT_ADDRESS, REGISTRY_CONTRACT_ADDRESS, INBOX_CONTRACT_ADDRESS, OUTBOX_CONTRACT_ADDRESS, COINBASE, FEE_RECIPIENT, ACVM_WORKING_DIRECTORY, ACVM_BINARY_PATH, } = process.env;
|
|
8
|
+
const { SEQ_PUBLISHER_PRIVATE_KEY, ETHEREUM_HOST, CHAIN_ID, VERSION, API_KEY, SEQ_REQUIRED_CONFIRMATIONS, SEQ_PUBLISH_RETRY_INTERVAL_MS, SEQ_TX_POLLING_INTERVAL_MS, SEQ_MAX_TX_PER_BLOCK, SEQ_MIN_TX_PER_BLOCK, AVAILABILITY_ORACLE_CONTRACT_ADDRESS, ROLLUP_CONTRACT_ADDRESS, REGISTRY_CONTRACT_ADDRESS, INBOX_CONTRACT_ADDRESS, OUTBOX_CONTRACT_ADDRESS, GAS_TOKEN_CONTRACT_ADDRESS, GAS_PORTAL_CONTRACT_ADDRESS, COINBASE, FEE_RECIPIENT, ACVM_WORKING_DIRECTORY, ACVM_BINARY_PATH, } = process.env;
|
|
9
9
|
const publisherPrivateKey = SEQ_PUBLISHER_PRIVATE_KEY
|
|
10
10
|
? `0x${SEQ_PUBLISHER_PRIVATE_KEY.replace('0x', '')}`
|
|
11
11
|
: NULL_KEY;
|
|
@@ -18,6 +18,10 @@ export function getConfigEnvVars() {
|
|
|
18
18
|
registryAddress: REGISTRY_CONTRACT_ADDRESS ? EthAddress.fromString(REGISTRY_CONTRACT_ADDRESS) : EthAddress.ZERO,
|
|
19
19
|
inboxAddress: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
|
|
20
20
|
outboxAddress: OUTBOX_CONTRACT_ADDRESS ? EthAddress.fromString(OUTBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
|
|
21
|
+
gasTokenAddress: GAS_TOKEN_CONTRACT_ADDRESS ? EthAddress.fromString(GAS_TOKEN_CONTRACT_ADDRESS) : EthAddress.ZERO,
|
|
22
|
+
gasPortalAddress: GAS_PORTAL_CONTRACT_ADDRESS
|
|
23
|
+
? EthAddress.fromString(GAS_PORTAL_CONTRACT_ADDRESS)
|
|
24
|
+
: EthAddress.ZERO,
|
|
21
25
|
};
|
|
22
26
|
return {
|
|
23
27
|
rpcUrl: ETHEREUM_HOST ? ETHEREUM_HOST : '',
|
|
@@ -38,4 +42,4 @@ export function getConfigEnvVars() {
|
|
|
38
42
|
acvmBinaryPath: ACVM_BINARY_PATH ? ACVM_BINARY_PATH : undefined,
|
|
39
43
|
};
|
|
40
44
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUF1QixRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUF5QjNEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGdCQUFnQjtJQUM5QixNQUFNLEVBQ0oseUJBQXlCLEVBQ3pCLGFBQWEsRUFDYixRQUFRLEVBQ1IsT0FBTyxFQUNQLE9BQU8sRUFDUCwwQkFBMEIsRUFDMUIsNkJBQTZCLEVBQzdCLDBCQUEwQixFQUMxQixvQkFBb0IsRUFDcEIsb0JBQW9CLEVBQ3BCLG9DQUFvQyxFQUNwQyx1QkFBdUIsRUFDdkIseUJBQXlCLEVBQ3pCLHNCQUFzQixFQUN0Qix1QkFBdUIsRUFDdkIsMEJBQTBCLEVBQzFCLDJCQUEyQixFQUMzQixRQUFRLEVBQ1IsYUFBYSxFQUNiLHNCQUFzQixFQUN0QixnQkFBZ0IsR0FDakIsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO0lBRWhCLE1BQU0sbUJBQW1CLEdBQVEseUJBQXlCO1FBQ3hELENBQUMsQ0FBQyxLQUFLLHlCQUF5QixDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLEVBQUU7UUFDcEQsQ0FBQyxDQUFDLFFBQVEsQ0FBQztJQUNiLDJEQUEyRDtJQUMzRCxNQUFNLFNBQVMsR0FBd0I7UUFDckMseUJBQXlCLEVBQUUsb0NBQW9DO1lBQzdELENBQUMsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLG9DQUFvQyxDQUFDO1lBQzdELENBQUMsQ0FBQyxVQUFVLENBQUMsSUFBSTtRQUNuQixhQUFhLEVBQUUsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxD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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract_phase_manager.d.ts","sourceRoot":"","sources":["../../src/sequencer/abstract_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,eAAe,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAKL,EAAE,EACF,eAAe,EACf,MAAM,
|
|
1
|
+
{"version":3,"file":"abstract_phase_manager.d.ts","sourceRoot":"","sources":["../../src/sequencer/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MerkleTreeId } from '@aztec/circuit-types';
|
|
2
|
-
import { AztecAddress, CallRequest, ContractStorageRead, ContractStorageUpdateRequest, Fr, L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL,
|
|
2
|
+
import { AztecAddress, CallRequest, ContractStorageRead, ContractStorageUpdateRequest, Fr, L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicDataRead, PublicDataUpdateRequest, PublicKernelCircuitPrivateInputs, PublicKernelData, PublicKernelTailCircuitPrivateInputs, RETURN_VALUES_LENGTH, ReadRequest, SideEffect, SideEffectLinkedToNoteHash, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
|
|
3
3
|
import { computeVarArgsHash } from '@aztec/circuits.js/hash';
|
|
4
4
|
import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection';
|
|
5
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
@@ -151,9 +151,9 @@ export class AbstractPhaseManager {
|
|
|
151
151
|
async getKernelCircuitOutput(previousOutput, previousProof, callData) {
|
|
152
152
|
const previousKernel = this.getPreviousKernelData(previousOutput, previousProof);
|
|
153
153
|
if (this.phase === PublicKernelPhase.TAIL) {
|
|
154
|
-
const { endNonRevertibleData, end } = previousOutput;
|
|
155
|
-
const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(
|
|
156
|
-
const nullifierNonExistentReadRequestHints = await this.hintsBuilder.getNullifierNonExistentReadRequestHints(
|
|
154
|
+
const { validationRequests, endNonRevertibleData, end } = previousOutput;
|
|
155
|
+
const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(validationRequests.nullifierReadRequests, endNonRevertibleData.newNullifiers, end.newNullifiers);
|
|
156
|
+
const nullifierNonExistentReadRequestHints = await this.hintsBuilder.getNullifierNonExistentReadRequestHints(validationRequests.nullifierNonExistentReadRequests, endNonRevertibleData.newNullifiers, end.newNullifiers);
|
|
157
157
|
const inputs = new PublicKernelTailCircuitPrivateInputs(previousKernel, nullifierReadRequestHints, nullifierNonExistentReadRequestHints);
|
|
158
158
|
return this.publicKernel.publicKernelCircuitTail(inputs);
|
|
159
159
|
}
|
|
@@ -266,9 +266,8 @@ function removeRedundantPublicDataWrites(publicInputs) {
|
|
|
266
266
|
* @param execResult - result of the top/first execution for this enqueued public call
|
|
267
267
|
*/
|
|
268
268
|
function patchPublicStorageActionOrdering(publicInputs, execResult, phase) {
|
|
269
|
-
const {
|
|
270
|
-
|
|
271
|
-
: publicInputs.endNonRevertibleData;
|
|
269
|
+
const { publicDataUpdateRequests } = PhaseIsRevertible[phase] ? publicInputs.end : publicInputs.endNonRevertibleData;
|
|
270
|
+
const { publicDataReads } = publicInputs.validationRequests;
|
|
272
271
|
// Convert ContractStorage* objects to PublicData* objects and sort them in execution order.
|
|
273
272
|
// Note, this only pulls simulated reads/writes from the current phase,
|
|
274
273
|
// so the returned result will be a subset of the public kernel output.
|
|
@@ -296,11 +295,11 @@ function patchPublicStorageActionOrdering(publicInputs, execResult, phase) {
|
|
|
296
295
|
const effectSet = PhaseIsRevertible[phase] ? 'end' : 'endNonRevertibleData';
|
|
297
296
|
const numReadsInKernel = arrayNonEmptyLength(publicDataReads, f => f.isEmpty());
|
|
298
297
|
const numReadsBeforeThisEnqueuedCall = numReadsInKernel - simPublicDataReads.length;
|
|
299
|
-
publicInputs
|
|
298
|
+
publicInputs.validationRequests.publicDataReads = padArrayEnd([
|
|
300
299
|
// do not mess with items from previous top/enqueued calls in kernel output
|
|
301
|
-
...publicInputs
|
|
300
|
+
...publicInputs.validationRequests.publicDataReads.slice(0, numReadsBeforeThisEnqueuedCall),
|
|
302
301
|
...simPublicDataReads,
|
|
303
|
-
], PublicDataRead.empty(),
|
|
302
|
+
], PublicDataRead.empty(), MAX_PUBLIC_DATA_READS_PER_TX);
|
|
304
303
|
const numUpdatesInKernel = arrayNonEmptyLength(publicDataUpdateRequests, f => f.isEmpty());
|
|
305
304
|
const numUpdatesBeforeThisEnqueuedCall = numUpdatesInKernel - simPublicDataUpdateRequests.length;
|
|
306
305
|
publicInputs[effectSet].publicDataUpdateRequests = padArrayEnd([
|
|
@@ -310,4 +309,4 @@ function patchPublicStorageActionOrdering(publicInputs, execResult, phase) {
|
|
|
310
309
|
? MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
|
|
311
310
|
: MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
312
311
|
}
|
|
313
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract_phase_manager.js","sourceRoot":"","sources":["../../src/sequencer/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
|
|
312
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract_phase_manager.js","sourceRoot":"","sources":["../../src/sequencer/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { MerkleTreeOperations } from '@aztec/world-state';
|
|
|
4
4
|
export declare class HintsBuilder {
|
|
5
5
|
private db;
|
|
6
6
|
constructor(db: MerkleTreeOperations);
|
|
7
|
-
getNullifierReadRequestHints(
|
|
7
|
+
getNullifierReadRequestHints(nullifierReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>, nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierReadRequestHints>;
|
|
8
8
|
getNullifierNonExistentReadRequestHints(nullifierNonExistentReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>, nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>, nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierNonExistentReadRequestHints>;
|
|
9
9
|
getNullifierMembershipWitness(nullifier: Fr): Promise<{
|
|
10
10
|
membershipWitness: MembershipWitness<20>;
|