@aztec/sequencer-client 0.1.0-alpha23 → 0.1.0-alpha40
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/.tsbuildinfo +1 -1
- package/dest/block_builder/index.d.ts +2 -2
- package/dest/block_builder/index.d.ts.map +1 -1
- package/dest/block_builder/solo_block_builder.d.ts +7 -7
- package/dest/block_builder/solo_block_builder.d.ts.map +1 -1
- package/dest/block_builder/solo_block_builder.js +49 -53
- package/dest/block_builder/solo_block_builder.test.d.ts +2 -2
- package/dest/block_builder/solo_block_builder.test.d.ts.map +1 -1
- package/dest/block_builder/solo_block_builder.test.js +27 -26
- package/dest/block_builder/types.d.ts +1 -1
- package/dest/block_builder/types.d.ts.map +1 -1
- package/dest/client/sequencer-client.d.ts +1 -1
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +3 -3
- package/dest/config.d.ts +2 -2
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +8 -5
- package/dest/global_variable_builder/global_builder.d.ts +17 -0
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +1 -1
- package/dest/global_variable_builder/viem-reader.d.ts +0 -12
- package/dest/global_variable_builder/viem-reader.d.ts.map +1 -1
- package/dest/global_variable_builder/viem-reader.js +2 -14
- package/dest/prover/empty.d.ts.map +1 -1
- package/dest/prover/empty.js +1 -1
- package/dest/prover/index.d.ts +23 -0
- package/dest/prover/index.d.ts.map +1 -1
- package/dest/publisher/config.d.ts +3 -3
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/l1-publisher.d.ts +3 -3
- package/dest/publisher/l1-publisher.d.ts.map +1 -1
- package/dest/publisher/l1-publisher.js +5 -3
- package/dest/publisher/l1-publisher.test.js +2 -2
- package/dest/publisher/viem-tx-sender.d.ts +4 -4
- package/dest/publisher/viem-tx-sender.d.ts.map +1 -1
- package/dest/publisher/viem-tx-sender.js +11 -11
- package/dest/sequencer/config.d.ts +1 -1
- package/dest/sequencer/config.d.ts.map +1 -1
- package/dest/sequencer/processed_tx.d.ts +2 -2
- 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 +11 -10
- package/dest/sequencer/public_processor.d.ts.map +1 -1
- package/dest/sequencer/public_processor.js +24 -22
- package/dest/sequencer/public_processor.test.js +15 -17
- package/dest/sequencer/sequencer.d.ts +4 -4
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +18 -15
- package/dest/sequencer/sequencer.test.js +5 -5
- package/dest/sequencer/utils.d.ts +2 -2
- package/dest/sequencer/utils.d.ts.map +1 -1
- package/dest/sequencer/utils.js +8 -5
- package/dest/simulator/index.d.ts +2 -2
- package/dest/simulator/public_executor.d.ts +3 -20
- package/dest/simulator/public_executor.d.ts.map +1 -1
- package/dest/simulator/public_executor.js +16 -35
- package/dest/simulator/public_kernel.d.ts.map +1 -1
- package/dest/simulator/public_kernel.js +1 -1
- package/dest/simulator/rollup.d.ts.map +1 -1
- package/dest/simulator/rollup.js +1 -1
- package/package.json +10 -10
- package/src/block_builder/index.ts +3 -2
- package/src/block_builder/solo_block_builder.test.ts +46 -38
- package/src/block_builder/solo_block_builder.ts +79 -88
- package/src/block_builder/types.ts +1 -1
- package/src/client/sequencer-client.ts +3 -3
- package/src/config.ts +11 -7
- package/src/global_variable_builder/global_builder.ts +17 -0
- package/src/global_variable_builder/viem-reader.ts +5 -15
- package/src/prover/empty.ts +1 -0
- package/src/prover/index.ts +26 -0
- package/src/publisher/config.ts +3 -2
- package/src/publisher/l1-publisher.test.ts +3 -2
- package/src/publisher/l1-publisher.ts +18 -8
- package/src/publisher/viem-tx-sender.ts +14 -13
- package/src/sequencer/config.ts +1 -1
- package/src/sequencer/processed_tx.ts +3 -3
- package/src/sequencer/public_processor.test.ts +38 -18
- package/src/sequencer/public_processor.ts +33 -25
- package/src/sequencer/sequencer.test.ts +7 -5
- package/src/sequencer/sequencer.ts +20 -16
- package/src/sequencer/utils.ts +19 -11
- package/src/simulator/index.ts +2 -2
- package/src/simulator/public_executor.ts +15 -34
- package/src/simulator/public_kernel.ts +1 -0
- package/src/simulator/rollup.ts +1 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { L2Block } from '@aztec/types';
|
|
2
|
-
import { ProcessedTx } from '../sequencer/processed_tx.js';
|
|
3
1
|
import { GlobalVariables, Proof } from '@aztec/circuits.js';
|
|
4
2
|
import { Fr } from '@aztec/foundation/fields';
|
|
3
|
+
import { L2Block } from '@aztec/types';
|
|
4
|
+
import { ProcessedTx } from '../sequencer/processed_tx.js';
|
|
5
5
|
/**
|
|
6
6
|
* Assembles an L2Block from a set of processed transactions.
|
|
7
7
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block_builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block_builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,YAAY,CACV,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,WAAW,EAAE,EAClB,iBAAiB,EAAE,EAAE,EAAE,GACtB,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;CAC9B"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { AppendOnlyTreeSnapshot, BaseOrMergeRollupPublicInputs, BaseRollupInputs, ConstantBaseRollupData, GlobalVariables, MembershipWitness, NullifierLeafPreimage, PreviousKernelData, PreviousRollupData, Proof, RollupTypes, RootRollupInputs, RootRollupPublicInputs, VerificationKey } from '@aztec/circuits.js';
|
|
2
|
-
import {
|
|
2
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
3
|
+
import { L2Block, MerkleTreeId } from '@aztec/types';
|
|
3
4
|
import { MerkleTreeOperations } from '@aztec/world-state';
|
|
4
5
|
import { VerificationKeys } from '../mocks/verification_keys.js';
|
|
5
6
|
import { RollupProver } from '../prover/index.js';
|
|
6
|
-
import { RollupSimulator } from '../simulator/index.js';
|
|
7
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
8
7
|
import { ProcessedTx } from '../sequencer/processed_tx.js';
|
|
8
|
+
import { RollupSimulator } from '../simulator/index.js';
|
|
9
9
|
import { BlockBuilder } from './index.js';
|
|
10
10
|
import { AllowedTreeNames } from './types.js';
|
|
11
11
|
/**
|
|
@@ -35,6 +35,8 @@ export declare class SoloBlockBuilder implements BlockBuilder {
|
|
|
35
35
|
protected mergeRollupCircuit(left: [BaseOrMergeRollupPublicInputs, Proof], right: [BaseOrMergeRollupPublicInputs, Proof]): Promise<[BaseOrMergeRollupPublicInputs, Proof]>;
|
|
36
36
|
protected getVerificationKey(type: RollupTypes): VerificationKey;
|
|
37
37
|
protected rootRollupCircuit(left: [BaseOrMergeRollupPublicInputs, Proof], right: [BaseOrMergeRollupPublicInputs, Proof], newL1ToL2Messages: Fr[]): Promise<[RootRollupPublicInputs, Proof]>;
|
|
38
|
+
updateHistoricBlocksTree(globalVariables: GlobalVariables): Promise<void>;
|
|
39
|
+
protected calculateBlockHash(globals: GlobalVariables): Promise<Fr>;
|
|
38
40
|
protected validateTrees(rollupOutput: BaseOrMergeRollupPublicInputs | RootRollupPublicInputs): Promise<void>;
|
|
39
41
|
protected validateRootOutput(rootOutput: RootRollupPublicInputs): Promise<void>;
|
|
40
42
|
protected validateRootTree(rootOutput: RootRollupPublicInputs, treeId: MerkleTreeId, name: 'Contract' | 'PrivateData' | 'L1ToL2Message'): Promise<void>;
|
|
@@ -46,14 +48,12 @@ export declare class SoloBlockBuilder implements BlockBuilder {
|
|
|
46
48
|
*/
|
|
47
49
|
protected validatePublicDataTreeRoot(output: BaseOrMergeRollupPublicInputs | RootRollupPublicInputs): Promise<void>;
|
|
48
50
|
protected validateTree<T extends BaseOrMergeRollupPublicInputs | RootRollupPublicInputs>(output: T, treeId: MerkleTreeId, name: AllowedTreeNames<T>): Promise<void>;
|
|
49
|
-
protected validateSimulatedTree(localTree: AppendOnlyTreeSnapshot, simulatedTree: AppendOnlyTreeSnapshot, name: 'PrivateData' | 'Contract' | 'Nullifier' | 'L1ToL2Message', label?: string): void;
|
|
51
|
+
protected validateSimulatedTree(localTree: AppendOnlyTreeSnapshot, simulatedTree: AppendOnlyTreeSnapshot, name: 'PrivateData' | 'Contract' | 'Nullifier' | 'L1ToL2Message' | 'HistoricBlocks', label?: string): void;
|
|
50
52
|
protected getRootRollupInput(rollupOutputLeft: BaseOrMergeRollupPublicInputs, rollupProofLeft: Proof, rollupOutputRight: BaseOrMergeRollupPublicInputs, rollupProofRight: Proof, newL1ToL2Messages: Fr[]): Promise<RootRollupInputs>;
|
|
51
53
|
protected getPreviousRollupDataFromPublicInputs(rollupOutput: BaseOrMergeRollupPublicInputs, rollupProof: Proof, vk: VerificationKey): PreviousRollupData;
|
|
52
54
|
protected getKernelDataFor(tx: ProcessedTx): PreviousKernelData;
|
|
53
55
|
protected getMembershipWitnessFor<N extends number>(value: Fr, treeId: MerkleTreeId, height: N): Promise<MembershipWitness<N>>;
|
|
54
|
-
protected
|
|
55
|
-
protected getDataMembershipWitnessFor(tx: ProcessedTx): Promise<MembershipWitness<16>>;
|
|
56
|
-
protected getL1ToL2MessageMembershipWitnessFor(tx: ProcessedTx): Promise<MembershipWitness<16>>;
|
|
56
|
+
protected getHistoricTreesMembershipWitnessFor(tx: ProcessedTx): Promise<MembershipWitness<16>>;
|
|
57
57
|
protected getConstantBaseRollupData(globalVariables: GlobalVariables): Promise<ConstantBaseRollupData>;
|
|
58
58
|
protected getLowNullifierInfo(nullifier: Fr): Promise<{
|
|
59
59
|
index: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solo_block_builder.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAC7B,gBAAgB,
|
|
1
|
+
{"version":3,"file":"solo_block_builder.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAC7B,gBAAgB,EAEhB,sBAAsB,EACtB,eAAe,EAGf,iBAAiB,EAIjB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,KAAK,EAEL,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EAEtB,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EAAgB,OAAO,EAAiB,YAAY,EAA6B,MAAM,cAAc,CAAC;AAC7G,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,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAA0B,MAAM,YAAY,CAAC;AAatE;;;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,8CAAuC;IAGxD;;;;;;;OAOG;IACU,YAAY,CACvB,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,WAAW,EAAE,EAClB,iBAAiB,EAAE,EAAE,EAAE,GACtB,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAgG5B,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE;cAexB,eAAe,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,sBAAsB,CAAC;cAKlE,WAAW,CACzB,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,WAAW,EAAE,EAClB,iBAAiB,EAAE,EAAE,EAAE,GACtB,OAAO,CAAC,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;cAkC3B,iBAAiB,CAC/B,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,WAAW,EAChB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;cASlC,kBAAkB,CAChC,IAAI,EAAE,CAAC,6BAA6B,EAAE,KAAK,CAAC,EAC5C,KAAK,EAAE,CAAC,6BAA6B,EAAE,KAAK,CAAC,GAC5C,OAAO,CAAC,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;IAalD,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,WAAW;cAW9B,iBAAiB,CAC/B,IAAI,EAAE,CAAC,6BAA6B,EAAE,KAAK,CAAC,EAC5C,KAAK,EAAE,CAAC,6BAA6B,EAAE,KAAK,CAAC,EAC7C,iBAAiB,EAAE,EAAE,EAAE,GACtB,OAAO,CAAC,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;IAyBrC,wBAAwB,CAAC,eAAe,EAAE,eAAe;cAM/C,kBAAkB,CAAC,OAAO,EAAE,eAAe;cA2B3C,aAAa,CAAC,YAAY,EAAE,6BAA6B,GAAG,sBAAsB;cAUlF,kBAAkB,CAAC,UAAU,EAAE,sBAAsB;cASrD,gBAAgB,CAC9B,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,eAAe;IAOpD;;;;;OAKG;cACa,0BAA0B,CAAC,MAAM,EAAE,6BAA6B,GAAG,sBAAsB;cAUzF,YAAY,CAAC,CAAC,SAAS,6BAA6B,GAAG,sBAAsB,EAC3F,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAY3B,SAAS,CAAC,qBAAqB,CAC7B,SAAS,EAAE,sBAAsB,EACjC,aAAa,EAAE,sBAAsB,EACrC,IAAI,EAAE,aAAa,GAAG,UAAU,GAAG,WAAW,GAAG,eAAe,GAAG,gBAAgB,EACnF,KAAK,CAAC,EAAE,MAAM;cAeA,kBAAkB,CAChC,gBAAgB,EAAE,6BAA6B,EAC/C,eAAe,EAAE,KAAK,EACtB,iBAAiB,EAAE,6BAA6B,EAChD,gBAAgB,EAAE,KAAK,EACvB,iBAAiB,EAAE,EAAE,EAAE;IAsCzB,SAAS,CAAC,qCAAqC,CAC7C,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,KAAK,EAClB,EAAE,EAAE,eAAe;IAiBrB,SAAS,CAAC,gBAAgB,CAAC,EAAE,EAAE,WAAW;cAe1B,uBAAuB,CAAC,CAAC,SAAS,MAAM,EACtD,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;cAYhB,oCAAoC,CAAC,EAAE,EAAE,WAAW;cAiBpD,yBAAyB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,sBAAsB,CAAC;cAW5F,mBAAmB,CAAC,SAAS,EAAE,EAAE;;;;;;;;;;;;cA+BjC,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;cAQjF,+BAA+B,CAAC,EAAE,EAAE,WAAW;cAW/C,8BAA8B,CAAC,EAAE,EAAE,WAAW;cAW9C,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe;IA6F5G,SAAS,CAAC,0BAA0B,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC;CAOjE"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { AppendOnlyTreeSnapshot, BaseRollupInputs,
|
|
2
|
-
import { computeContractLeaf } from '@aztec/circuits.js/abis';
|
|
3
|
-
import { MerkleTreeId, ContractData, L2Block, PublicDataWrite, TxL2Logs, L2BlockL2Logs } from '@aztec/types';
|
|
4
|
-
import chunk from 'lodash.chunk';
|
|
5
|
-
import flatMap from 'lodash.flatmap';
|
|
1
|
+
import { AppendOnlyTreeSnapshot, BaseRollupInputs, CircuitsWasm, ConstantBaseRollupData, HISTORIC_BLOCKS_TREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_HEIGHT, MembershipWitness, MergeRollupInputs, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PreviousKernelData, PreviousRollupData, ROLLUP_VK_TREE_HEIGHT, RollupTypes, RootRollupInputs, RootRollupPublicInputs, VK_TREE_HEIGHT, makeTuple, } from '@aztec/circuits.js';
|
|
2
|
+
import { computeBlockHash, computeBlockHashWithGlobals, computeContractLeaf } from '@aztec/circuits.js/abis';
|
|
6
3
|
import { toFriendlyJSON } from '@aztec/circuits.js/utils';
|
|
7
4
|
import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
|
|
5
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
8
6
|
import { Fr } from '@aztec/foundation/fields';
|
|
9
7
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
10
8
|
import { assertLength } from '@aztec/foundation/serialize';
|
|
11
|
-
import {
|
|
9
|
+
import { ContractData, L2Block, L2BlockL2Logs, MerkleTreeId, PublicDataWrite, TxL2Logs } from '@aztec/types';
|
|
10
|
+
import chunk from 'lodash.chunk';
|
|
11
|
+
import flatMap from 'lodash.flatmap';
|
|
12
12
|
const frToBigInt = (fr) => toBigIntBE(fr.toBuffer());
|
|
13
13
|
const bigintToFr = (num) => new Fr(num);
|
|
14
14
|
const bigintToNum = (num) => Number(num);
|
|
@@ -38,21 +38,19 @@ export class SoloBlockBuilder {
|
|
|
38
38
|
* @returns The new L2 block and a correctness proof as returned by the root rollup circuit.
|
|
39
39
|
*/
|
|
40
40
|
async buildL2Block(globalVariables, txs, newL1ToL2Messages) {
|
|
41
|
-
const [startPrivateDataTreeSnapshot, startNullifierTreeSnapshot, startContractTreeSnapshot, startPublicDataTreeSnapshot,
|
|
41
|
+
const [startPrivateDataTreeSnapshot, startNullifierTreeSnapshot, startContractTreeSnapshot, startPublicDataTreeSnapshot, startL1ToL2MessageTreeSnapshot, startHistoricBlocksTreeSnapshot,] = await Promise.all([
|
|
42
42
|
MerkleTreeId.PRIVATE_DATA_TREE,
|
|
43
43
|
MerkleTreeId.NULLIFIER_TREE,
|
|
44
44
|
MerkleTreeId.CONTRACT_TREE,
|
|
45
45
|
MerkleTreeId.PUBLIC_DATA_TREE,
|
|
46
|
-
MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE,
|
|
47
|
-
MerkleTreeId.CONTRACT_TREE_ROOTS_TREE,
|
|
48
46
|
MerkleTreeId.L1_TO_L2_MESSAGES_TREE,
|
|
49
|
-
MerkleTreeId.
|
|
47
|
+
MerkleTreeId.BLOCKS_TREE,
|
|
50
48
|
].map(tree => this.getTreeSnapshot(tree)));
|
|
51
49
|
// Check txs are good for processing
|
|
52
50
|
this.validateTxs(txs);
|
|
53
51
|
// We fill the tx batch with empty txs, we process only one tx at a time for now
|
|
54
52
|
const [circuitsOutput, proof] = await this.runCircuits(globalVariables, txs, newL1ToL2Messages);
|
|
55
|
-
const { endPrivateDataTreeSnapshot, endNullifierTreeSnapshot, endContractTreeSnapshot, endPublicDataTreeRoot,
|
|
53
|
+
const { endPrivateDataTreeSnapshot, endNullifierTreeSnapshot, endContractTreeSnapshot, endPublicDataTreeRoot, endL1ToL2MessageTreeSnapshot, endHistoricBlocksTreeSnapshot, } = circuitsOutput;
|
|
56
54
|
// Collect all new nullifiers, commitments, and contracts from all txs in this block
|
|
57
55
|
const wasm = await CircuitsWasm.get();
|
|
58
56
|
const newNullifiers = flatMap(txs, tx => tx.data.end.newNullifiers);
|
|
@@ -83,14 +81,10 @@ export class SoloBlockBuilder {
|
|
|
83
81
|
endContractTreeSnapshot,
|
|
84
82
|
startPublicDataTreeRoot: startPublicDataTreeSnapshot.root,
|
|
85
83
|
endPublicDataTreeRoot,
|
|
86
|
-
startTreeOfHistoricPrivateDataTreeRootsSnapshot,
|
|
87
|
-
endTreeOfHistoricPrivateDataTreeRootsSnapshot,
|
|
88
|
-
startTreeOfHistoricContractTreeRootsSnapshot,
|
|
89
|
-
endTreeOfHistoricContractTreeRootsSnapshot,
|
|
90
84
|
startL1ToL2MessageTreeSnapshot,
|
|
91
85
|
endL1ToL2MessageTreeSnapshot,
|
|
92
|
-
|
|
93
|
-
|
|
86
|
+
startHistoricBlocksTreeSnapshot,
|
|
87
|
+
endHistoricBlocksTreeSnapshot,
|
|
94
88
|
newCommitments,
|
|
95
89
|
newNullifiers,
|
|
96
90
|
newL2ToL1Msgs,
|
|
@@ -116,7 +110,7 @@ export class SoloBlockBuilder {
|
|
|
116
110
|
'nullifierTreeRoot',
|
|
117
111
|
'l1ToL2MessagesTreeRoot',
|
|
118
112
|
]) {
|
|
119
|
-
if (tx.data.constants.
|
|
113
|
+
if (tx.data.constants.blockData[historicTreeRoot].isZero()) {
|
|
120
114
|
throw new Error(`Empty ${historicTreeRoot} for tx: ${toFriendlyJSON(tx)}`);
|
|
121
115
|
}
|
|
122
116
|
}
|
|
@@ -195,10 +189,27 @@ export class SoloBlockBuilder {
|
|
|
195
189
|
// Update the root trees with the latest data and contract tree roots,
|
|
196
190
|
// and validate them against the output of the root circuit simulation
|
|
197
191
|
this.debug(`Updating and validating root trees`);
|
|
198
|
-
await this.db.
|
|
192
|
+
await this.db.updateHistoricBlocksTree(left[0].constants.globalVariables);
|
|
199
193
|
await this.validateRootOutput(rootOutput);
|
|
200
194
|
return [rootOutput, rootProof];
|
|
201
195
|
}
|
|
196
|
+
async updateHistoricBlocksTree(globalVariables) {
|
|
197
|
+
// Calculate the block hash and add it to the historic block hashes tree
|
|
198
|
+
const blockHash = await this.calculateBlockHash(globalVariables);
|
|
199
|
+
await this.db.appendLeaves(MerkleTreeId.BLOCKS_TREE, [blockHash.toBuffer()]);
|
|
200
|
+
}
|
|
201
|
+
async calculateBlockHash(globals) {
|
|
202
|
+
const [privateDataTreeRoot, nullifierTreeRoot, contractTreeRoot, publicDataTreeRoot, l1ToL2MessageTreeRoot] = (await Promise.all([
|
|
203
|
+
MerkleTreeId.PRIVATE_DATA_TREE,
|
|
204
|
+
MerkleTreeId.NULLIFIER_TREE,
|
|
205
|
+
MerkleTreeId.CONTRACT_TREE,
|
|
206
|
+
MerkleTreeId.PUBLIC_DATA_TREE,
|
|
207
|
+
MerkleTreeId.L1_TO_L2_MESSAGES_TREE,
|
|
208
|
+
].map(tree => this.getTreeSnapshot(tree)))).map(r => r.root);
|
|
209
|
+
const wasm = await CircuitsWasm.get();
|
|
210
|
+
const blockHash = computeBlockHashWithGlobals(wasm, globals, privateDataTreeRoot, nullifierTreeRoot, contractTreeRoot, l1ToL2MessageTreeRoot, publicDataTreeRoot);
|
|
211
|
+
return blockHash;
|
|
212
|
+
}
|
|
202
213
|
// Validate that the new roots we calculated from manual insertions match the outputs of the simulation
|
|
203
214
|
async validateTrees(rollupOutput) {
|
|
204
215
|
await Promise.all([
|
|
@@ -212,9 +223,7 @@ export class SoloBlockBuilder {
|
|
|
212
223
|
async validateRootOutput(rootOutput) {
|
|
213
224
|
await Promise.all([
|
|
214
225
|
this.validateTrees(rootOutput),
|
|
215
|
-
this.
|
|
216
|
-
this.validateRootTree(rootOutput, MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE, 'PrivateData'),
|
|
217
|
-
this.validateRootTree(rootOutput, MerkleTreeId.L1_TO_L2_MESSAGES_ROOTS_TREE, 'L1ToL2Message'),
|
|
226
|
+
this.validateTree(rootOutput, MerkleTreeId.BLOCKS_TREE, 'HistoricBlocks'),
|
|
218
227
|
this.validateTree(rootOutput, MerkleTreeId.L1_TO_L2_MESSAGES_TREE, 'L1ToL2Message'),
|
|
219
228
|
]);
|
|
220
229
|
}
|
|
@@ -269,22 +278,19 @@ export class SoloBlockBuilder {
|
|
|
269
278
|
const path = await this.db.getSiblingPath(treeId, size);
|
|
270
279
|
return path.toFieldArray();
|
|
271
280
|
};
|
|
272
|
-
const newHistoricContractDataTreeRootSiblingPath = await getRootTreeSiblingPath(MerkleTreeId.CONTRACT_TREE_ROOTS_TREE);
|
|
273
|
-
const newHistoricPrivateDataTreeRootSiblingPath = await getRootTreeSiblingPath(MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE);
|
|
274
|
-
const newHistoricL1ToL2MessageTreeRootSiblingPath = await getRootTreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGES_ROOTS_TREE);
|
|
275
281
|
const newL1ToL2MessageTreeRootSiblingPath = await this.getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGES_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT);
|
|
276
282
|
// Get tree snapshots
|
|
277
283
|
const startL1ToL2MessageTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE);
|
|
278
|
-
|
|
284
|
+
// Get historic block tree roots
|
|
285
|
+
const startHistoricBlocksTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.BLOCKS_TREE);
|
|
286
|
+
const newHistoricBlocksTreeSiblingPath = await getRootTreeSiblingPath(MerkleTreeId.BLOCKS_TREE);
|
|
279
287
|
return RootRollupInputs.from({
|
|
280
288
|
previousRollupData,
|
|
281
|
-
newHistoricContractDataTreeRootSiblingPath,
|
|
282
|
-
newHistoricPrivateDataTreeRootSiblingPath,
|
|
283
289
|
newL1ToL2Messages,
|
|
284
|
-
newHistoricL1ToL2MessageTreeRootSiblingPath,
|
|
285
290
|
newL1ToL2MessageTreeRootSiblingPath,
|
|
286
291
|
startL1ToL2MessageTreeSnapshot,
|
|
287
|
-
|
|
292
|
+
startHistoricBlocksTreeSnapshot,
|
|
293
|
+
newHistoricBlocksTreeSiblingPath,
|
|
288
294
|
});
|
|
289
295
|
}
|
|
290
296
|
getPreviousRollupDataFromPublicInputs(rollupOutput, rollupProof, vk) {
|
|
@@ -311,14 +317,12 @@ export class SoloBlockBuilder {
|
|
|
311
317
|
const path = await this.db.getSiblingPath(treeId, index);
|
|
312
318
|
return new MembershipWitness(height, index, assertLength(path.toFieldArray(), height));
|
|
313
319
|
}
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
getL1ToL2MessageMembershipWitnessFor(tx) {
|
|
321
|
-
return this.getMembershipWitnessFor(tx.data.constants.historicTreeRoots.privateHistoricTreeRoots.l1ToL2MessagesTreeRoot, MerkleTreeId.L1_TO_L2_MESSAGES_ROOTS_TREE, L1_TO_L2_MSG_ROOTS_TREE_HEIGHT);
|
|
320
|
+
async getHistoricTreesMembershipWitnessFor(tx) {
|
|
321
|
+
const wasm = await CircuitsWasm.get();
|
|
322
|
+
const blockData = tx.data.constants.blockData;
|
|
323
|
+
const { privateDataTreeRoot, nullifierTreeRoot, contractTreeRoot, l1ToL2MessagesTreeRoot } = blockData;
|
|
324
|
+
const blockHash = computeBlockHash(wasm, blockData.globalVariablesHash, privateDataTreeRoot, nullifierTreeRoot, contractTreeRoot, l1ToL2MessagesTreeRoot, blockData.publicDataTreeRoot);
|
|
325
|
+
return this.getMembershipWitnessFor(blockHash, MerkleTreeId.BLOCKS_TREE, HISTORIC_BLOCKS_TREE_HEIGHT);
|
|
322
326
|
}
|
|
323
327
|
async getConstantBaseRollupData(globalVariables) {
|
|
324
328
|
return ConstantBaseRollupData.from({
|
|
@@ -326,9 +330,7 @@ export class SoloBlockBuilder {
|
|
|
326
330
|
mergeRollupVkHash: DELETE_FR,
|
|
327
331
|
privateKernelVkTreeRoot: FUTURE_FR,
|
|
328
332
|
publicKernelVkTreeRoot: FUTURE_FR,
|
|
329
|
-
|
|
330
|
-
startTreeOfHistoricPrivateDataTreeRootsSnapshot: await this.getTreeSnapshot(MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE),
|
|
331
|
-
startTreeOfHistoricL1ToL2MsgTreeRootsSnapshot: await this.getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGES_ROOTS_TREE),
|
|
333
|
+
startHistoricBlocksTreeRootsSnapshot: await this.getTreeSnapshot(MerkleTreeId.BLOCKS_TREE),
|
|
332
334
|
globalVariables,
|
|
333
335
|
});
|
|
334
336
|
}
|
|
@@ -387,6 +389,7 @@ export class SoloBlockBuilder {
|
|
|
387
389
|
const startContractTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.CONTRACT_TREE);
|
|
388
390
|
const startPrivateDataTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.PRIVATE_DATA_TREE);
|
|
389
391
|
const startPublicDataTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE);
|
|
392
|
+
const startHistoricBlocksTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.BLOCKS_TREE);
|
|
390
393
|
// Get the subtree sibling paths for the circuit
|
|
391
394
|
const newCommitmentsSubtreeSiblingPath = await this.getSubtreeSiblingPath(MerkleTreeId.PRIVATE_DATA_TREE, BaseRollupInputs.PRIVATE_DATA_SUBTREE_HEIGHT);
|
|
392
395
|
const newContractsSubtreeSiblingPath = await this.getSubtreeSiblingPath(MerkleTreeId.CONTRACT_TREE, BaseRollupInputs.CONTRACT_SUBTREE_HEIGHT);
|
|
@@ -424,6 +427,7 @@ export class SoloBlockBuilder {
|
|
|
424
427
|
startContractTreeSnapshot,
|
|
425
428
|
startPrivateDataTreeSnapshot,
|
|
426
429
|
startPublicDataTreeRoot: startPublicDataTreeSnapshot.root,
|
|
430
|
+
startHistoricBlocksTreeSnapshot,
|
|
427
431
|
newCommitmentsSubtreeSiblingPath,
|
|
428
432
|
newContractsSubtreeSiblingPath,
|
|
429
433
|
newNullifiersSubtreeSiblingPath: newNullifiersSubtreeSiblingPath.toFieldArray(),
|
|
@@ -432,17 +436,9 @@ export class SoloBlockBuilder {
|
|
|
432
436
|
lowNullifierLeafPreimages: nullifierWitnessLeaves.map(({ leafData }) => new NullifierLeafPreimage(new Fr(leafData.value), new Fr(leafData.nextValue), Number(leafData.nextIndex))),
|
|
433
437
|
lowNullifierMembershipWitness: lowNullifierMembershipWitnesses,
|
|
434
438
|
kernelData: [this.getKernelDataFor(left), this.getKernelDataFor(right)],
|
|
435
|
-
|
|
436
|
-
await this.
|
|
437
|
-
await this.
|
|
438
|
-
],
|
|
439
|
-
historicPrivateDataTreeRootMembershipWitnesses: [
|
|
440
|
-
await this.getDataMembershipWitnessFor(left),
|
|
441
|
-
await this.getDataMembershipWitnessFor(right),
|
|
442
|
-
],
|
|
443
|
-
historicL1ToL2MsgTreeRootMembershipWitnesses: [
|
|
444
|
-
await this.getL1ToL2MessageMembershipWitnessFor(left),
|
|
445
|
-
await this.getL1ToL2MessageMembershipWitnessFor(right),
|
|
439
|
+
historicBlocksTreeRootMembershipWitnesses: [
|
|
440
|
+
await this.getHistoricTreesMembershipWitnessFor(left),
|
|
441
|
+
await this.getHistoricTreesMembershipWitnessFor(right),
|
|
446
442
|
],
|
|
447
443
|
});
|
|
448
444
|
}
|
|
@@ -450,4 +446,4 @@ export class SoloBlockBuilder {
|
|
|
450
446
|
return new MembershipWitness(height, 0n, makeTuple(height, () => Fr.ZERO));
|
|
451
447
|
}
|
|
452
448
|
}
|
|
453
|
-
//# 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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"}
|
|
449
|
+
//# 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,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const createMemDown: () =>
|
|
1
|
+
import { type MemDown } from 'memdown';
|
|
2
|
+
export declare const createMemDown: () => MemDown<any, any>;
|
|
3
3
|
//# sourceMappingURL=solo_block_builder.test.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solo_block_builder.test.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"solo_block_builder.test.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.test.ts"],"names":[],"mappings":"AAiDA,OAAO,EAAE,KAAK,OAAO,EAAsB,MAAM,SAAS,CAAC;AAe3D,eAAO,MAAM,aAAa,yBAAgD,CAAC"}
|