@aztec/sequencer-client 0.23.0 → 0.26.1
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/solo_block_builder.d.ts +9 -9
- package/dest/block_builder/solo_block_builder.d.ts.map +1 -1
- package/dest/block_builder/solo_block_builder.js +26 -48
- package/dest/global_variable_builder/viem-reader.js +2 -2
- package/dest/prover/empty.d.ts +2 -2
- package/dest/prover/empty.d.ts.map +1 -1
- package/dest/prover/empty.js +1 -1
- package/dest/prover/index.d.ts +2 -2
- package/dest/prover/index.d.ts.map +1 -1
- package/dest/publisher/l1-publisher.d.ts +0 -2
- package/dest/publisher/l1-publisher.d.ts.map +1 -1
- package/dest/publisher/l1-publisher.js +2 -3
- package/dest/publisher/viem-tx-sender.d.ts.map +1 -1
- package/dest/publisher/viem-tx-sender.js +6 -10
- package/dest/sequencer/abstract_phase_manager.d.ts +23 -30
- package/dest/sequencer/abstract_phase_manager.d.ts.map +1 -1
- package/dest/sequencer/abstract_phase_manager.js +151 -98
- package/dest/sequencer/{fee_distribution_phase_manager.d.ts → app_logic_phase_manager.d.ts} +9 -11
- package/dest/sequencer/app_logic_phase_manager.d.ts.map +1 -0
- package/dest/sequencer/app_logic_phase_manager.js +44 -0
- package/dest/sequencer/phase_manager_factory.d.ts +19 -0
- package/dest/sequencer/phase_manager_factory.d.ts.map +1 -0
- package/dest/sequencer/phase_manager_factory.js +51 -0
- package/dest/sequencer/processed_tx.d.ts +4 -4
- package/dest/sequencer/processed_tx.d.ts.map +1 -1
- package/dest/sequencer/processed_tx.js +8 -8
- package/dest/sequencer/public_processor.d.ts +1 -1
- package/dest/sequencer/public_processor.d.ts.map +1 -1
- package/dest/sequencer/public_processor.js +13 -11
- package/dest/sequencer/sequencer.d.ts +3 -3
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +23 -16
- package/dest/sequencer/{fee_preparation_phase_manager.d.ts → setup_phase_manager.d.ts} +9 -11
- package/dest/sequencer/setup_phase_manager.d.ts.map +1 -0
- package/dest/sequencer/setup_phase_manager.js +37 -0
- package/dest/sequencer/{application_logic_phase_manager.d.ts → teardown_phase_manager.d.ts} +9 -12
- package/dest/sequencer/teardown_phase_manager.d.ts.map +1 -0
- package/dest/sequencer/teardown_phase_manager.js +36 -0
- package/dest/simulator/index.d.ts +11 -5
- package/dest/simulator/index.d.ts.map +1 -1
- package/dest/simulator/public_executor.d.ts +8 -3
- package/dest/simulator/public_executor.d.ts.map +1 -1
- package/dest/simulator/public_executor.js +64 -11
- package/dest/simulator/public_kernel.d.ts +11 -5
- package/dest/simulator/public_kernel.d.ts.map +1 -1
- package/dest/simulator/public_kernel.js +35 -16
- package/dest/simulator/rollup.js +2 -2
- package/package.json +14 -24
- package/src/block_builder/index.ts +24 -0
- package/src/block_builder/solo_block_builder.ts +726 -0
- package/src/block_builder/types.ts +8 -0
- package/src/client/index.ts +1 -0
- package/src/client/sequencer-client.ts +97 -0
- package/src/config.ts +86 -0
- package/src/global_variable_builder/config.ts +20 -0
- package/src/global_variable_builder/global_builder.ts +95 -0
- package/src/global_variable_builder/index.ts +16 -0
- package/src/global_variable_builder/viem-reader.ts +61 -0
- package/src/index.ts +15 -0
- package/src/mocks/verification_keys.ts +36 -0
- package/src/prover/empty.ts +74 -0
- package/src/prover/index.ts +53 -0
- package/src/publisher/config.ts +41 -0
- package/src/publisher/index.ts +14 -0
- package/src/publisher/l1-publisher.ts +362 -0
- package/src/publisher/viem-tx-sender.ts +235 -0
- package/src/receiver.ts +13 -0
- package/src/sequencer/abstract_phase_manager.ts +489 -0
- package/src/sequencer/app_logic_phase_manager.ts +75 -0
- package/src/sequencer/config.ts +1 -0
- package/src/sequencer/index.ts +2 -0
- package/src/sequencer/phase_manager_factory.ts +122 -0
- package/src/sequencer/processed_tx.ts +94 -0
- package/src/sequencer/public_processor.ts +153 -0
- package/src/sequencer/sequencer.ts +469 -0
- package/src/sequencer/setup_phase_manager.ts +68 -0
- package/src/sequencer/teardown_phase_manager.ts +67 -0
- package/src/simulator/index.ts +57 -0
- package/src/simulator/public_executor.ts +267 -0
- package/src/simulator/public_kernel.ts +84 -0
- package/src/simulator/rollup.ts +76 -0
- package/src/utils.ts +16 -0
- package/dest/sequencer/application_logic_phase_manager.d.ts.map +0 -1
- package/dest/sequencer/application_logic_phase_manager.js +0 -64
- package/dest/sequencer/fee_distribution_phase_manager.d.ts.map +0 -1
- package/dest/sequencer/fee_distribution_phase_manager.js +0 -42
- package/dest/sequencer/fee_preparation_phase_manager.d.ts.map +0 -1
- package/dest/sequencer/fee_preparation_phase_manager.js +0 -43
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { L2Block, MerkleTreeId } from '@aztec/circuit-types';
|
|
2
|
-
import { AppendOnlyTreeSnapshot, BaseOrMergeRollupPublicInputs, BaseRollupInputs, ConstantRollupData, GlobalVariables, MembershipWitness, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PartialStateReference,
|
|
2
|
+
import { AppendOnlyTreeSnapshot, BaseOrMergeRollupPublicInputs, BaseRollupInputs, ConstantRollupData, GlobalVariables, MembershipWitness, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PartialStateReference, PreviousRollupData, Proof, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, RollupKernelData, RollupTypes, RootRollupInputs, RootRollupPublicInputs, StateReference, VerificationKey } from '@aztec/circuits.js';
|
|
3
3
|
import { Fr } from '@aztec/foundation/fields';
|
|
4
4
|
import { Tuple } from '@aztec/foundation/serialize';
|
|
5
5
|
import { MerkleTreeOperations } from '@aztec/world-state';
|
|
@@ -42,7 +42,7 @@ export declare class SoloBlockBuilder implements BlockBuilder {
|
|
|
42
42
|
protected validateSimulatedTree(localTree: AppendOnlyTreeSnapshot, simulatedTree: AppendOnlyTreeSnapshot, name: TreeNames, label?: string): void;
|
|
43
43
|
protected getRootRollupInput(rollupOutputLeft: BaseOrMergeRollupPublicInputs, rollupProofLeft: Proof, rollupOutputRight: BaseOrMergeRollupPublicInputs, rollupProofRight: Proof, newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>): Promise<RootRollupInputs>;
|
|
44
44
|
protected getPreviousRollupDataFromPublicInputs(rollupOutput: BaseOrMergeRollupPublicInputs, rollupProof: Proof, vk: VerificationKey): PreviousRollupData;
|
|
45
|
-
protected getKernelDataFor(tx: ProcessedTx):
|
|
45
|
+
protected getKernelDataFor(tx: ProcessedTx): RollupKernelData;
|
|
46
46
|
protected getMembershipWitnessFor<N extends number>(value: Fr, treeId: MerkleTreeId, height: N): Promise<MembershipWitness<N>>;
|
|
47
47
|
protected getConstantRollupData(globalVariables: GlobalVariables): Promise<ConstantRollupData>;
|
|
48
48
|
protected getLowNullifierInfo(nullifier: Fr): Promise<{
|
|
@@ -59,15 +59,15 @@ export declare class SoloBlockBuilder implements BlockBuilder {
|
|
|
59
59
|
}>;
|
|
60
60
|
protected getSubtreeSiblingPath(treeId: MerkleTreeId, subtreeHeight: number): Promise<Fr[]>;
|
|
61
61
|
protected processPublicDataUpdateRequests(tx: ProcessedTx): Promise<{
|
|
62
|
-
lowPublicDataWritesPreimages: [PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage];
|
|
63
|
-
lowPublicDataWritesMembershipWitnesses: [MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>];
|
|
64
|
-
newPublicDataSubtreeSiblingPath: [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr
|
|
65
|
-
sortedPublicDataWrites: [PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf];
|
|
66
|
-
sortedPublicDataWritesIndexes: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number];
|
|
62
|
+
lowPublicDataWritesPreimages: [PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage];
|
|
63
|
+
lowPublicDataWritesMembershipWitnesses: [MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>];
|
|
64
|
+
newPublicDataSubtreeSiblingPath: [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr];
|
|
65
|
+
sortedPublicDataWrites: [PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf, PublicDataTreeLeaf];
|
|
66
|
+
sortedPublicDataWritesIndexes: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number];
|
|
67
67
|
}>;
|
|
68
68
|
protected getPublicDataReadsInfo(tx: ProcessedTx): Promise<{
|
|
69
|
-
newPublicDataReadsWitnesses: [MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>];
|
|
70
|
-
newPublicDataReadsPreimages: [PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage];
|
|
69
|
+
newPublicDataReadsWitnesses: [MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>];
|
|
70
|
+
newPublicDataReadsPreimages: [PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage, PublicDataTreeLeafPreimage];
|
|
71
71
|
}>;
|
|
72
72
|
protected buildBaseRollupInput(tx: ProcessedTx, globalVariables: GlobalVariables): Promise<BaseRollupInputs>;
|
|
73
73
|
protected makeEmptyMembershipWitness<N extends number>(height: N): MembershipWitness<N>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solo_block_builder.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"solo_block_builder.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { ContractData, L2Block,
|
|
2
|
-
import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, BaseRollupInputs, CONTRACT_SUBTREE_HEIGHT, CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, ConstantRollupData, L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, MergeRollupInputs, NOTE_HASH_SUBTREE_HEIGHT, NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference,
|
|
3
|
-
import {
|
|
4
|
-
import { makeTuple } from '@aztec/foundation/array';
|
|
1
|
+
import { Body, ContractData, L2Block, MerkleTreeId, PublicDataWrite, TxEffect, TxL2Logs } from '@aztec/circuit-types';
|
|
2
|
+
import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, BaseRollupInputs, CONTRACT_SUBTREE_HEIGHT, CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, CombinedAccumulatedData, ConstantRollupData, L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, MergeRollupInputs, NOTE_HASH_SUBTREE_HEIGHT, NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PreviousRollupData, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, ROLLUP_VK_TREE_HEIGHT, RollupKernelCircuitPublicInputs, RollupKernelData, RollupTypes, RootRollupInputs, StateDiffHints, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
|
|
3
|
+
import { assertPermutation, makeTuple } from '@aztec/foundation/array';
|
|
5
4
|
import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
|
|
6
5
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
7
6
|
import { Fr } from '@aztec/foundation/fields';
|
|
@@ -40,42 +39,17 @@ export class SoloBlockBuilder {
|
|
|
40
39
|
// We fill the tx batch with empty txs, we process only one tx at a time for now
|
|
41
40
|
const [circuitsOutput, proof] = await this.runCircuits(globalVariables, txs, newL1ToL2Messages);
|
|
42
41
|
// Collect all new nullifiers, commitments, and contracts from all txs in this block
|
|
43
|
-
const
|
|
44
|
-
const
|
|
45
|
-
const newContracts = txs.flatMap(tx => tx.data.end.newContracts).map(cd => computeContractLeaf(cd));
|
|
46
|
-
const newContractData = txs
|
|
47
|
-
.flatMap(tx => tx.data.end.newContracts)
|
|
48
|
-
.map(n => new ContractData(n.contractAddress, n.portalContractAddress));
|
|
49
|
-
const newPublicDataWrites = txs.flatMap(tx => tx.data.end.publicDataUpdateRequests.map(t => new PublicDataWrite(t.leafSlot, t.newValue)));
|
|
50
|
-
const newL2ToL1Msgs = txs.flatMap(tx => tx.data.end.newL2ToL1Msgs);
|
|
51
|
-
// Consolidate logs data from all txs
|
|
52
|
-
const encryptedLogsArr = [];
|
|
53
|
-
const unencryptedLogsArr = [];
|
|
54
|
-
for (const tx of txs) {
|
|
55
|
-
const encryptedLogs = tx.encryptedLogs || new TxL2Logs([]);
|
|
56
|
-
encryptedLogsArr.push(encryptedLogs);
|
|
57
|
-
const unencryptedLogs = tx.unencryptedLogs || new TxL2Logs([]);
|
|
58
|
-
unencryptedLogsArr.push(unencryptedLogs);
|
|
59
|
-
}
|
|
60
|
-
const newEncryptedLogs = new L2BlockL2Logs(encryptedLogsArr);
|
|
61
|
-
const newUnencryptedLogs = new L2BlockL2Logs(unencryptedLogsArr);
|
|
42
|
+
const txEffects = txs.map(tx => new TxEffect(tx.data.combinedData.newNoteHashes.map((c) => c.value), tx.data.combinedData.newNullifiers.map((n) => n.value), tx.data.combinedData.newL2ToL1Msgs, tx.data.combinedData.publicDataUpdateRequests.map(t => new PublicDataWrite(t.leafSlot, t.newValue)), tx.data.combinedData.newContracts.map(cd => cd.hash()), tx.data.combinedData.newContracts.map(cd => new ContractData(cd.contractAddress, cd.portalContractAddress)), tx.encryptedLogs || new TxL2Logs([]), tx.unencryptedLogs || new TxL2Logs([])));
|
|
43
|
+
const blockBody = new Body(padArrayEnd(newL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP), txEffects);
|
|
62
44
|
const l2Block = L2Block.fromFields({
|
|
63
45
|
archive: circuitsOutput.archive,
|
|
64
46
|
header: circuitsOutput.header,
|
|
65
|
-
|
|
66
|
-
newNullifiers: newNullifiers.map((n) => n.value),
|
|
67
|
-
newL2ToL1Msgs,
|
|
68
|
-
newContracts,
|
|
69
|
-
newContractData,
|
|
70
|
-
newPublicDataWrites,
|
|
71
|
-
newL1ToL2Messages,
|
|
72
|
-
newEncryptedLogs,
|
|
73
|
-
newUnencryptedLogs,
|
|
47
|
+
body: blockBody,
|
|
74
48
|
});
|
|
75
|
-
if (!l2Block.getCalldataHash().equals(circuitsOutput.header.
|
|
76
|
-
throw new Error(`Calldata hash mismatch, ${l2Block
|
|
49
|
+
if (!l2Block.body.getCalldataHash().equals(circuitsOutput.header.contentCommitment.txsHash)) {
|
|
50
|
+
throw new Error(`Calldata hash mismatch, ${l2Block.body
|
|
77
51
|
.getCalldataHash()
|
|
78
|
-
.toString('hex')} == ${circuitsOutput.header.
|
|
52
|
+
.toString('hex')} == ${circuitsOutput.header.contentCommitment.txsHash.toString('hex')} `);
|
|
79
53
|
}
|
|
80
54
|
return [l2Block, proof];
|
|
81
55
|
}
|
|
@@ -239,7 +213,8 @@ export class SoloBlockBuilder {
|
|
|
239
213
|
FUTURE_NUM, new MembershipWitness(ROLLUP_VK_TREE_HEIGHT, BigInt(FUTURE_NUM), makeTuple(ROLLUP_VK_TREE_HEIGHT, () => FUTURE_FR)));
|
|
240
214
|
}
|
|
241
215
|
getKernelDataFor(tx) {
|
|
242
|
-
|
|
216
|
+
const inputs = new RollupKernelCircuitPublicInputs(tx.data.aggregationObject, CombinedAccumulatedData.recombine(tx.data.endNonRevertibleData, tx.data.end), tx.data.constants);
|
|
217
|
+
return new RollupKernelData(inputs, tx.proof,
|
|
243
218
|
// VK for the kernel circuit
|
|
244
219
|
this.vks.privateKernelCircuit,
|
|
245
220
|
// MembershipWitness for a VK tree to be implemented in the future
|
|
@@ -297,11 +272,12 @@ export class SoloBlockBuilder {
|
|
|
297
272
|
return fullSiblingPath.getSubtreeSiblingPath(subtreeHeight).toFields();
|
|
298
273
|
}
|
|
299
274
|
async processPublicDataUpdateRequests(tx) {
|
|
300
|
-
const
|
|
275
|
+
const combinedPublicDataUpdateRequests = tx.data.combinedData.publicDataUpdateRequests.map(updateRequest => {
|
|
276
|
+
return new PublicDataTreeLeaf(updateRequest.leafSlot, updateRequest.newValue);
|
|
277
|
+
});
|
|
278
|
+
const { lowLeavesWitnessData, newSubtreeSiblingPath, sortedNewLeaves, sortedNewLeavesIndexes } = await this.db.batchInsert(MerkleTreeId.PUBLIC_DATA_TREE, combinedPublicDataUpdateRequests.map(x => x.toBuffer()),
|
|
301
279
|
// TODO(#3675) remove oldValue from update requests
|
|
302
|
-
|
|
303
|
-
return new PublicDataTreeLeaf(updateRequest.leafSlot, updateRequest.newValue).toBuffer();
|
|
304
|
-
}), PUBLIC_DATA_SUBTREE_HEIGHT);
|
|
280
|
+
PUBLIC_DATA_SUBTREE_HEIGHT);
|
|
305
281
|
if (lowLeavesWitnessData === undefined) {
|
|
306
282
|
throw new Error(`Could not craft public data batch insertion proofs`);
|
|
307
283
|
}
|
|
@@ -322,6 +298,9 @@ export class SoloBlockBuilder {
|
|
|
322
298
|
const lowPublicDataWritesPreimages = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
|
|
323
299
|
return lowLeavesWitnessData[i].leafPreimage;
|
|
324
300
|
});
|
|
301
|
+
// validate that the sortedPublicDataWrites and sortedPublicDataWritesIndexes are in the correct order
|
|
302
|
+
// otherwise it will just fail in the circuit
|
|
303
|
+
assertPermutation(combinedPublicDataUpdateRequests, sortedPublicDataWrites, sortedPublicDataWritesIndexes, (a, b) => a.equals(b));
|
|
325
304
|
return {
|
|
326
305
|
lowPublicDataWritesPreimages,
|
|
327
306
|
lowPublicDataWritesMembershipWitnesses,
|
|
@@ -333,8 +312,8 @@ export class SoloBlockBuilder {
|
|
|
333
312
|
async getPublicDataReadsInfo(tx) {
|
|
334
313
|
const newPublicDataReadsWitnesses = makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT, 0n));
|
|
335
314
|
const newPublicDataReadsPreimages = makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => PublicDataTreeLeafPreimage.empty());
|
|
336
|
-
for (const i in tx.data.
|
|
337
|
-
const leafSlot = tx.data.
|
|
315
|
+
for (const i in tx.data.combinedData.publicDataReads) {
|
|
316
|
+
const leafSlot = tx.data.combinedData.publicDataReads[i].leafSlot.value;
|
|
338
317
|
const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
|
|
339
318
|
if (!lowLeafResult) {
|
|
340
319
|
throw new Error(`Public data tree should have one initial leaf`);
|
|
@@ -361,17 +340,16 @@ export class SoloBlockBuilder {
|
|
|
361
340
|
const contractSubtreeSiblingPath = makeTuple(CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, i => i < contractSubtreeSiblingPathArray.length ? contractSubtreeSiblingPathArray[i] : Fr.ZERO);
|
|
362
341
|
// Update the contract and note hash trees with the new items being inserted to get the new roots
|
|
363
342
|
// that will be used by the next iteration of the base rollup circuit, skipping the empty ones
|
|
364
|
-
const newContracts = tx.data.
|
|
365
|
-
const
|
|
343
|
+
const newContracts = tx.data.combinedData.newContracts.map(cd => cd.hash());
|
|
344
|
+
const newNoteHashes = tx.data.combinedData.newNoteHashes.map(x => x.value.toBuffer());
|
|
366
345
|
await this.db.appendLeaves(MerkleTreeId.CONTRACT_TREE, newContracts.map(x => x.toBuffer()));
|
|
367
|
-
await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE,
|
|
346
|
+
await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, newNoteHashes);
|
|
368
347
|
// The read witnesses for a given TX should be generated before the writes of the same TX are applied.
|
|
369
348
|
// All reads that refer to writes in the same tx are transient and can be simplified out.
|
|
370
349
|
const txPublicDataReadsInfo = await this.getPublicDataReadsInfo(tx);
|
|
371
350
|
const txPublicDataUpdateRequestInfo = await this.processPublicDataUpdateRequests(tx);
|
|
372
351
|
// Update the nullifier tree, capturing the low nullifier info for each individual operation
|
|
373
|
-
const
|
|
374
|
-
const { lowLeavesWitnessData: nullifierWitnessLeaves, newSubtreeSiblingPath: newNullifiersSubtreeSiblingPath, sortedNewLeaves: sortedNewNullifiers, sortedNewLeavesIndexes, } = await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, newNullifiers.map(sideEffectLinkedToNoteHash => sideEffectLinkedToNoteHash.value.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
|
|
352
|
+
const { lowLeavesWitnessData: nullifierWitnessLeaves, newSubtreeSiblingPath: newNullifiersSubtreeSiblingPath, sortedNewLeaves: sortedNewNullifiers, sortedNewLeavesIndexes, } = await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, tx.data.combinedData.newNullifiers.map(sideEffectLinkedToNoteHash => sideEffectLinkedToNoteHash.value.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
|
|
375
353
|
if (nullifierWitnessLeaves === undefined) {
|
|
376
354
|
throw new Error(`Could not craft nullifier batch insertion proofs`);
|
|
377
355
|
}
|
|
@@ -414,4 +392,4 @@ export class SoloBlockBuilder {
|
|
|
414
392
|
return new MembershipWitness(height, 0n, makeTuple(height, () => Fr.ZERO));
|
|
415
393
|
}
|
|
416
394
|
}
|
|
417
|
-
//# 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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"}
|
|
395
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"solo_block_builder.js","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACtH,OAAO,EACL,cAAc,EACd,sBAAsB,EAEtB,gBAAgB,EAChB,uBAAuB,EACvB,oCAAoC,EACpC,uBAAuB,EACvB,kBAAkB,EAElB,2BAA2B,EAC3B,wCAAwC,EAGxC,yBAAyB,EACzB,4BAA4B,EAC5B,sCAAsC,EACtC,iBAAiB,EACjB,iBAAiB,EACjB,wBAAwB,EACxB,qCAAqC,EACrC,wBAAwB,EACxB,qCAAqC,EACrC,qBAAqB,EACrB,mCAAmC,EACnC,qBAAqB,EACrB,0BAA0B,EAC1B,uCAAuC,EACvC,uBAAuB,EACvB,qBAAqB,EACrB,kBAAkB,EAElB,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EACrB,+BAA+B,EAC/B,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAIhB,cAAc,EAEd,cAAc,GAEf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAS,YAAY,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGlF,OAAO,KAAK,MAAM,cAAc,CAAC;AASjC,MAAM,UAAU,GAAG,CAAC,EAAM,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;AAEzD,kEAAkE;AAClE,MAAM,SAAS,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;AAC7B,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,wCAAwC;AACxC,MAAM,SAAS,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;AAE7B;;;GAGG;AACH,MAAM,OAAO,gBAAgB;IAC3B,YACY,EAAwB,EACxB,GAAqB,EACrB,SAA0B,EAC1B,MAAoB,EACpB,QAAQ,iBAAiB,CAAC,oCAAoC,CAAC;QAJ/D,OAAE,GAAF,EAAE,CAAsB;QACxB,QAAG,GAAH,GAAG,CAAkB;QACrB,cAAS,GAAT,SAAS,CAAiB;QAC1B,WAAM,GAAN,MAAM,CAAc;QACpB,UAAK,GAAL,KAAK,CAA0D;IACxE,CAAC;IAEJ;;;;;;;OAOG;IACI,KAAK,CAAC,YAAY,CACvB,eAAgC,EAChC,GAAkB,EAClB,iBAAuB;QAEvB,kGAAkG;QAClG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAEtB,gFAAgF;QAChF,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;QAEhG,oFAAoF;QACpF,MAAM,SAAS,GAAe,GAAG,CAAC,GAAG,CACnC,EAAE,CAAC,EAAE,CACH,IAAI,QAAQ,CACV,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAGhE,EACD,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAA6B,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAGhF,EACD,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAClC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAGjG,EACD,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAA+C,EACpG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CACnC,EAAE,CAAC,EAAE,CAAC,IAAI,YAAY,CAAC,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC,qBAAqB,CAAC,CACb,EACzD,EAAE,CAAC,aAAa,IAAI,IAAI,QAAQ,CAAC,EAAE,CAAC,EACpC,EAAE,CAAC,eAAe,IAAI,IAAI,QAAQ,CAAC,EAAE,CAAC,CACvC,CACJ,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,CAAC,IAAI,EAAE,mCAAmC,CAAC,EAAE,SAAS,CAAC,CAAC;QAEpH,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;YACjC,OAAO,EAAE,cAAc,CAAC,OAAO;YAC/B,MAAM,EAAE,cAAc,CAAC,MAAM;YAC7B,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5F,MAAM,IAAI,KAAK,CACb,2BAA2B,OAAO,CAAC,IAAI;iBACpC,eAAe,EAAE;iBACjB,QAAQ,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAC5F,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAES,WAAW,CAAC,GAAkB;QACtC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,QAAQ,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC;YACpD,IAAI,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC9C,MAAM,IAAI,KAAK,CAAC,uCAAuC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAC/E,CAAC;YACD,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;gBACjD,MAAM,IAAI,KAAK,CAAC,+BAA+B,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACvE,CAAC;YACD,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC;gBAClD,MAAM,IAAI,KAAK,CAAC,+BAA+B,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACvE,CAAC;YACD,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;gBACjD,MAAM,IAAI,KAAK,CAAC,8BAA8B,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACtE,CAAC;YACD,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;gBACnD,MAAM,IAAI,KAAK,CAAC,iCAAiC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;IACH,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,EAAgB;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC/C,OAAO,IAAI,sBAAsB,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACzF,CAAC;IAES,KAAK,CAAC,WAAW,CACzB,eAAgC,EAChC,GAAkB,EAClB,iBAAuB;QAEvB,8DAA8D;QAC9D,+EAA+E;QAC/E,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,8EAA8E,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/G,CAAC;QAED,qGAAqG;QACrG,MAAM,sBAAsB,GAAG,WAAW,CAAC,iBAAiB,EAAE,EAAE,CAAC,IAAI,EAAE,mCAAmC,CAAC,CAAC;QAE5G,2CAA2C;QAC3C,MAAM,iBAAiB,GAA6C,EAAE,CAAC;QACvE,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,iBAAiB,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;QAC5E,CAAC;QAED,6DAA6D;QAC7D,IAAI,iBAAiB,GAA6C,iBAAiB,CAAC;QACpF,IAAI,kBAAkB,GAA6C,EAAE,CAAC;QACtE,OAAO,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC/C,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC;gBACtB,kBAAkB,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,iBAAiB,GAAG,kBAAkB,CAAC;YACvC,kBAAkB,GAAG,EAAE,CAAC;QAC1B,CAAC;QAED,oFAAoF;QACpF,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC,GAAG,iBAAiB,CAAC;QAC9D,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,CAAC,CAAC;IAC3F,CAAC;IAES,KAAK,CAAC,iBAAiB,CAC/B,EAAe,EACf,eAAgC;QAEhC,IAAI,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QACzE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACzE,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAC9E,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC;IAES,KAAK,CAAC,kBAAkB,CAChC,IAA4C,EAC5C,KAA6C;QAE7C,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,IAAI,iBAAiB,CAAC;YACxC,IAAI,CAAC,qCAAqC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAChE,IAAI,CAAC,qCAAqC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;SACnE,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACzE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACzB,CAAC;IAES,kBAAkB,CAAC,IAAiB;QAC5C,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,WAAW,CAAC,IAAI;gBACnB,OAAO,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC;YACpC,KAAK,WAAW,CAAC,KAAK;gBACpB,OAAO,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC;YACrC;gBACE,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAES,KAAK,CAAC,iBAAiB,CAC/B,IAA4C,EAC5C,KAA6C,EAC7C,iBAAwE;QAExE,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAEtF,8DAA8D;QAC9D,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CACxB,YAAY,CAAC,qBAAqB,EAClC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CACzC,CAAC;QAEF,8CAA8C;QAC9C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAErE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAE9E,kDAAkD;QAClD,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAE/C,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAE1C,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,YAAmC;QACtE,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,qBAAqB,CACxB,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,EACvD,YAAY,CAAC,YAAY,EACzB,cAAc,CACf;YACD,IAAI,CAAC,qBAAqB,CACxB,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,EACvD,YAAY,CAAC,aAAa,EAC1B,eAAe,CAChB;YACD,IAAI,CAAC,qBAAqB,CACxB,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,aAAa,CAAC,EACtD,YAAY,CAAC,YAAY,EACzB,cAAc,CACf;YACD,IAAI,CAAC,qBAAqB,CACxB,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,gBAAgB,CAAC,EACzD,YAAY,CAAC,cAAc,EAC3B,gBAAgB,CACjB;SACF,CAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,KAAqB;QACjD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,qBAAqB,CACxB,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAC9D,KAAK,CAAC,iBAAiB,EACvB,mBAAmB,CACpB;YACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC;SACzC,CAAC,CAAC;IACL,CAAC;IAED,6FAA6F;IACnF,KAAK,CAAC,kBAAkB,CAAC,UAAkC;QACnE,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;YAC3C,IAAI,CAAC,qBAAqB,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC;SAC5G,CAAC,CAAC;IACL,CAAC;IAED,2CAA2C;IACjC,qBAAqB,CAC7B,SAAiC,EACjC,aAAqC,EACrC,IAAe,EACf,KAAc;QAEd,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,IAAI,8BAA8B,SAAS,CAAC,IAAI,eAAe,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC;QACpH,CAAC;QACD,IAAI,aAAa,CAAC,sBAAsB,KAAK,SAAS,CAAC,sBAAsB,EAAE,CAAC;YAC9E,MAAM,IAAI,KAAK,CACb,GAAG,KAAK,IAAI,IAAI,mDACd,SAAS,CAAC,sBACZ,eAAe,aAAa,CAAC,sBAAsB,GAAG,CACvD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,qFAAqF;IAC3E,KAAK,CAAC,kBAAkB,CAChC,gBAA+C,EAC/C,eAAsB,EACtB,iBAAgD,EAChD,gBAAuB,EACvB,iBAAwE;QAExE,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAChE,MAAM,kBAAkB,GAA2C;YACjE,IAAI,CAAC,qCAAqC,CAAC,gBAAgB,EAAE,eAAe,EAAE,EAAE,CAAC;YACjF,IAAI,CAAC,qCAAqC,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,EAAE,CAAC;SACpF,CAAC;QAEF,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAoB,EAAE,EAAE;YAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC,CAAC;QAEF,MAAM,wCAAwC,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAC/E,YAAY,CAAC,qBAAqB,EAClC,2BAA2B,CAC5B,CAAC;QAEF,MAAM,mCAAmC,GAAG,SAAS,CACnD,wCAAwC,EACxC,CAAC,CAAC,EAAE,CACF,CAAC,GAAG,wCAAwC,CAAC,MAAM,CAAC,CAAC,CAAC,wCAAwC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAC7G,CAAC,CACF,CAAC;QAEF,qBAAqB;QACrB,MAAM,8BAA8B,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAC;QAEtG,kBAAkB;QAClB,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC9E,MAAM,0BAA0B,GAAG,MAAM,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAEtF,MAAM,qBAAqB,GAAG,SAAS,CACrC,cAAc,EACd,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,EACtF,CAAC,CACF,CAAC;QAEF,OAAO,gBAAgB,CAAC,IAAI,CAAC;YAC3B,kBAAkB;YAClB,iBAAiB;YACjB,mCAAmC;YACnC,8BAA8B;YAC9B,oBAAoB;YACpB,qBAAqB;SACtB,CAAC,CAAC;IACL,CAAC;IAES,qCAAqC,CAC7C,YAA2C,EAC3C,WAAkB,EAClB,EAAmB;QAEnB,OAAO,IAAI,kBAAkB,CAC3B,YAAY,EACZ,WAAW,EACX,EAAE;QAEF,kEAAkE;QAClE,UAAU,EACV,IAAI,iBAAiB,CACnB,qBAAqB,EACrB,MAAM,CAAC,UAAU,CAAC,EAClB,SAAS,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAClD,CACF,CAAC;IACJ,CAAC;IAES,gBAAgB,CAAC,EAAe;QACxC,MAAM,MAAM,GAAG,IAAI,+BAA+B,CAChD,EAAE,CAAC,IAAI,CAAC,iBAAiB,EACzB,uBAAuB,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAC5E,EAAE,CAAC,IAAI,CAAC,SAAS,CAClB,CAAC;QACF,OAAO,IAAI,gBAAgB,CACzB,MAAM,EACN,EAAE,CAAC,KAAK;QAER,4BAA4B;QAC5B,IAAI,CAAC,GAAG,CAAC,oBAAoB;QAE7B,kEAAkE;QAClE,UAAU,EACV,YAAY,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,CACpE,CAAC;IACJ,CAAC;IAED,0FAA0F;IAChF,KAAK,CAAC,uBAAuB,CACrC,KAAS,EACT,MAAoB,EACpB,MAAS;QAET,kDAAkD;QAClD,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,mBAAmB,KAAK,sBAAsB,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxF,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACzD,OAAO,IAAI,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IACrF,CAAC;IAES,KAAK,CAAC,qBAAqB,CAAC,eAAgC;QACpE,OAAO,kBAAkB,CAAC,IAAI,CAAC;YAC7B,gBAAgB,EAAE,SAAS;YAC3B,iBAAiB,EAAE,SAAS;YAC5B,uBAAuB,EAAE,SAAS;YAClC,sBAAsB,EAAE,SAAS;YACjC,WAAW,EAAE,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC;YAC7D,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,SAAa;QAC/C,8CAA8C;QAC9C,IAAI,SAAS,CAAC,KAAK,KAAK,EAAE,EAAE,CAAC;YAC3B,OAAO;gBACL,KAAK,EAAE,CAAC;gBACR,YAAY,EAAE,qBAAqB,CAAC,KAAK,EAAE;gBAC3C,OAAO,EAAE,IAAI,CAAC,0BAA0B,CAAC,qBAAqB,CAAC;aAChE,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC;QACzC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC,CAAE,CAAC;QAEvF,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;QAE9F,OAAO;YACL,KAAK,EAAE,cAAc;YACrB,YAAY,EAAE,iBAAiB;YAC/B,OAAO,EAAE,IAAI,iBAAiB,CAC5B,qBAAqB,EACrB,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAC5B,YAAY,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,qBAAqB,CAAC,CACrE;SACF,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,qBAAqB,CAAC,MAAoB,EAAE,aAAqB;QAC/E,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACnF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;QAErF,2FAA2F;QAC3F,OAAO,eAAe,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC;IACzE,CAAC;IAES,KAAK,CAAC,+BAA+B,CAAC,EAAe;QAC7D,MAAM,gCAAgC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,wBAAwB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YACzG,OAAO,IAAI,kBAAkB,CAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QACH,MAAM,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,EAAE,sBAAsB,EAAE,GAC5F,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CACvB,YAAY,CAAC,gBAAgB,EAC7B,gCAAgC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvD,mDAAmD;QACnD,0BAA0B,CAC3B,CAAC;QAEJ,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,sBAAsB,GAAG,SAAS,CAAC,sCAAsC,EAAE,CAAC,CAAC,EAAE;YACnF,OAAO,kBAAkB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,MAAM,6BAA6B,GAAG,SAAS,CAAC,sCAAsC,EAAE,CAAC,CAAC,EAAE;YAC1F,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,MAAM,0BAA0B,GAAG,qBAAqB,CAAC,QAAQ,EAAE,CAAC;QACpE,MAAM,+BAA+B,GAAG,SAAS,CAAC,uCAAuC,EAAE,CAAC,CAAC,EAAE;YAC7F,OAAO,0BAA0B,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,MAAM,sCAAsC,GAGxC,SAAS,CAAC,sCAAsC,EAAE,CAAC,CAAC,EAAE;YACxD,MAAM,OAAO,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;YACxC,OAAO,iBAAiB,CAAC,eAAe,CACtC,OAAO,CAAC,KAAK,EACb,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE,uBAAuB,CAAC,CAC3E,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,4BAA4B,GAG9B,SAAS,CAAC,sCAAsC,EAAE,CAAC,CAAC,EAAE;YACxD,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,YAA0C,CAAC;QAC5E,CAAC,CAAC,CAAC;QAEH,sGAAsG;QACtG,6CAA6C;QAC7C,iBAAiB,CAAC,gCAAgC,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAClH,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CACZ,CAAC;QAEF,OAAO;YACL,4BAA4B;YAC5B,sCAAsC;YACtC,+BAA+B;YAC/B,sBAAsB;YACtB,6BAA6B;SAC9B,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,sBAAsB,CAAC,EAAe;QACpD,MAAM,2BAA2B,GAG7B,SAAS,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC,CAAC;QAExG,MAAM,2BAA2B,GAC/B,SAAS,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAAC,0BAA0B,CAAC,KAAK,EAAE,CAAC,CAAC;QAEpF,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YACxE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC,YAAY,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;YACnG,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACnE,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;YACnG,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;YAC9F,2BAA2B,CAAC,CAAC,CAAC,GAAG,IAAI,iBAAiB,CACpD,uBAAuB,EACvB,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,EAC3B,IAAI,CAAC,OAAO,EAAkC,CAC/C,CAAC;YACF,2BAA2B,CAAC,CAAC,CAAC,GAAG,QAAuC,CAAC;QAC3E,CAAC;QACD,OAAO;YACL,2BAA2B;YAC3B,2BAA2B;SAC5B,CAAC;IACJ,CAAC;IAED,iGAAiG;IACvF,KAAK,CAAC,oBAAoB,CAAC,EAAe,EAAE,eAAgC;QACpF,wCAAwC;QACxC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;QACpE,MAAM,KAAK,GAAG,IAAI,qBAAqB,CACrC,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,EACvD,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,EACvD,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,aAAa,CAAC,EACtD,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAC1D,CAAC;QAEF,gDAAgD;QAChD,MAAM,+BAA+B,GAAG,MAAM,IAAI,CAAC,qBAAqB,CACtE,YAAY,CAAC,cAAc,EAC3B,wBAAwB,CACzB,CAAC;QAEF,MAAM,0BAA0B,GAAG,SAAS,CAAC,qCAAqC,EAAE,CAAC,CAAC,EAAE,CACtF,CAAC,GAAG,+BAA+B,CAAC,MAAM,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAC1F,CAAC;QAEF,MAAM,+BAA+B,GAAG,MAAM,IAAI,CAAC,qBAAqB,CACtE,YAAY,CAAC,aAAa,EAC1B,uBAAuB,CACxB,CAAC;QAEF,MAAM,0BAA0B,GAAG,SAAS,CAAC,oCAAoC,EAAE,CAAC,CAAC,EAAE,CACrF,CAAC,GAAG,+BAA+B,CAAC,MAAM,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAC1F,CAAC;QAEF,iGAAiG;QACjG,8FAA8F;QAC9F,MAAM,YAAY,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtF,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CACxB,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CACpC,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAEvE,sGAAsG;QACtG,yFAAyF;QACzF,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QACpE,MAAM,6BAA6B,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;QAErF,4FAA4F;QAC5F,MAAM,EACJ,oBAAoB,EAAE,sBAAsB,EAC5C,qBAAqB,EAAE,+BAA+B,EACtD,eAAe,EAAE,mBAAmB,EACpC,sBAAsB,GACvB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAC3B,YAAY,CAAC,cAAc,EAC3B,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,CAAC,0BAA0B,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EACjH,wBAAwB,CACzB,CAAC;QACF,IAAI,sBAAsB,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QAED,6CAA6C;QAC7C,MAAM,qDAAqD,GACzD,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAC7B,iBAAiB,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAC/G,CAAC;QAEJ,MAAM,gCAAgC,GAAG,+BAA+B,CAAC,QAAQ,EAAE,CAAC;QAEpF,MAAM,2BAA2B,GAAG,SAAS,CAAC,qCAAqC,EAAE,CAAC,CAAC,EAAE,CACvF,CAAC,GAAG,gCAAgC,CAAC,MAAM,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAC5F,CAAC;QAEF,MAAM,qBAAqB,GAAG,6BAA6B,CAAC,+BAA+B,CAAC;QAE5F,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC;YACzC,6BAA6B,EAAE,SAAS,CAAC,yBAAyB,EAAE,CAAC,CAAC,EAAE,CACtE,CAAC,GAAG,sBAAsB,CAAC,MAAM;gBAC/B,CAAC,CAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC,YAAsC;gBACnE,CAAC,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAClC;YACD,uCAAuC,EAAE,SAAS,CAAC,yBAAyB,EAAE,CAAC,CAAC,EAAE,CAChF,CAAC,GAAG,qDAAqD,CAAC,MAAM;gBAC9D,CAAC,CAAC,qDAAqD,CAAC,CAAC,CAAC;gBAC1D,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,qBAAqB,CAAC,CAC3D;YACD,gBAAgB,EAAE,SAAS,CAAC,yBAAyB,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;YAClG,sBAAsB,EAAE,SAAS,CAAC,yBAAyB,EAAE,CAAC,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;YAC5F,0BAA0B;YAC1B,2BAA2B;YAC3B,0BAA0B;YAC1B,qBAAqB;SACtB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,4BAA4B,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACrE,SAAS,EACT,YAAY,CAAC,OAAO,EACpB,cAAc,CACf,CAAC;QAEF,OAAO,gBAAgB,CAAC,IAAI,CAAC;YAC3B,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrC,KAAK;YACL,cAAc;YAEd,sBAAsB,EAAE,6BAA6B,CAAC,sBAAsB;YAC5E,6BAA6B,EAAE,6BAA6B,CAAC,6BAA6B;YAC1F,4BAA4B,EAAE,6BAA6B,CAAC,4BAA4B;YACxF,sCAAsC,EAAE,6BAA6B,CAAC,sCAAsC;YAC5G,wBAAwB,EAAE,qBAAqB,CAAC,2BAA2B;YAC3E,kCAAkC,EAAE,qBAAqB,CAAC,2BAA2B;YAErF,4BAA4B;YAE5B,SAAS;SACV,CAAC,CAAC;IACL,CAAC;IAES,0BAA0B,CAAmB,MAAS;QAC9D,OAAO,IAAI,iBAAiB,CAC1B,MAAM,EACN,EAAE,EACF,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CACjC,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -15,7 +15,7 @@ export class ViemReader {
|
|
|
15
15
|
this.rollupContract = getContract({
|
|
16
16
|
address: getAddress(l1Contracts.rollupAddress.toString()),
|
|
17
17
|
abi: RollupAbi,
|
|
18
|
-
|
|
18
|
+
client: this.publicClient,
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
async getLastTimestamp() {
|
|
@@ -34,4 +34,4 @@ export class ViemReader {
|
|
|
34
34
|
return BigInt(await this.rollupContract.read.lastWarpedBlockTs());
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmllbS1yZWFkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZ2xvYmFsX3ZhcmlhYmxlX2J1aWxkZXIvdmllbS1yZWFkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRWhELE9BQU8sRUFJTCxrQkFBa0IsRUFDbEIsVUFBVSxFQUNWLFdBQVcsRUFDWCxJQUFJLEdBQ0wsTUFBTSxNQUFNLENBQUM7QUFNZDs7R0FFRztBQUNILE1BQU0sT0FBTyxVQUFVO0lBSXJCLFlBQVksTUFBMEI7UUFDcEMsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEdBQUcsTUFBTSxDQUFDO1FBRS9DLE1BQU0sS0FBSyxHQUFHLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVsRCxJQUFJLENBQUMsWUFBWSxHQUFHLGtCQUFrQixDQUFDO1lBQ3JDLEtBQUssRUFBRSxLQUFLLENBQUMsU0FBUztZQUN0QixTQUFTLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUM7U0FDOUIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGNBQWMsR0FBRyxXQUFXLENBQUM7WUFDaEMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ3pELEdBQUcsRUFBRSxTQUFTO1lBQ2QsTUFBTSxFQUFFLElBQUksQ0FBQyxZQUFZO1NBQzFCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTSxLQUFLLENBQUMsZ0JBQWdCO1FBQzNCLE9BQU8sTUFBTSxDQUFDLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztJQUM5RCxDQUFDO0lBRU0sS0FBSyxDQUFDLFVBQVU7UUFDckIsT0FBTyxNQUFNLENBQUMsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQzFELENBQUM7SUFFTSxLQUFLLENBQUMsVUFBVTtRQUNyQixPQUFPLE1BQU0sT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRU0sS0FBSyxDQUFDLGdCQUFnQjtRQUMzQixPQUFPLE1BQU0sT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQy9FLENBQUM7SUFFTSxLQUFLLENBQUMsb0JBQW9CO1FBQy9CLE9BQU8sTUFBTSxDQUFDLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7Q0FDRiJ9
|
package/dest/prover/empty.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BaseOrMergeRollupPublicInputs, BaseRollupInputs, MergeRollupInputs, Proof, PublicCircuitPublicInputs,
|
|
1
|
+
import { BaseOrMergeRollupPublicInputs, BaseRollupInputs, MergeRollupInputs, Proof, PublicCircuitPublicInputs, PublicKernelCircuitPublicInputs, RootRollupInputs, RootRollupPublicInputs } from '@aztec/circuits.js';
|
|
2
2
|
import { PublicProver, RollupProver } from './index.js';
|
|
3
3
|
/**
|
|
4
4
|
* Prover implementation that returns empty proofs and overrides aggregation objects.
|
|
@@ -36,6 +36,6 @@ export declare class EmptyPublicProver implements PublicProver {
|
|
|
36
36
|
* Creates an empty proof for the given input.
|
|
37
37
|
* @param _publicInputs - Public inputs obtained via simulation.
|
|
38
38
|
*/
|
|
39
|
-
getPublicKernelCircuitProof(_publicInputs:
|
|
39
|
+
getPublicKernelCircuitProof(_publicInputs: PublicKernelCircuitPublicInputs): Promise<Proof>;
|
|
40
40
|
}
|
|
41
41
|
//# sourceMappingURL=empty.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"empty.d.ts","sourceRoot":"","sources":["../../src/prover/empty.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,6BAA6B,EAC7B,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,EACL,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"empty.d.ts","sourceRoot":"","sources":["../../src/prover/empty.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,6BAA6B,EAC7B,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAOxD;;GAEG;AACH,qBAAa,iBAAkB,YAAW,YAAY;IACpD;;;;OAIG;IACG,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,6BAA6B,GAAG,OAAO,CAAC,KAAK,CAAC;IAK/G;;;;OAIG;IACG,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,6BAA6B,GAAG,OAAO,CAAC,KAAK,CAAC;IAIjH;;;;OAIG;IACG,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,GAAG,OAAO,CAAC,KAAK,CAAC;CAIzG;AAED;;GAEG;AACH,qBAAa,iBAAkB,YAAW,YAAY;IACpD;;;OAGG;IACG,qBAAqB,CAAC,aAAa,EAAE,yBAAyB,GAAG,OAAO,CAAC,KAAK,CAAC;IAIrF;;;OAGG;IACG,2BAA2B,CAAC,aAAa,EAAE,+BAA+B,GAAG,OAAO,CAAC,KAAK,CAAC;CAGlG"}
|
package/dest/prover/empty.js
CHANGED
|
@@ -54,4 +54,4 @@ export class EmptyPublicProver {
|
|
|
54
54
|
return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1wdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmVyL2VtcHR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGtDQUFrQztBQUNsQyxPQUFPLEVBQ0wsaUJBQWlCLEVBSWpCLEtBQUssR0FLTixNQUFNLG9CQUFvQixDQUFDO0FBSTVCLE1BQU0sZ0JBQWdCLEdBQUcsRUFBRSxDQUFDO0FBRTVCLDJGQUEyRjtBQUMzRixzQ0FBc0M7QUFFdEM7O0dBRUc7QUFDSCxNQUFNLE9BQU8saUJBQWlCO0lBQzVCOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsa0JBQWtCLENBQUMsTUFBd0IsRUFBRSxZQUEyQztRQUM1RixZQUFZLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDOUQsT0FBTyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsbUJBQW1CLENBQUMsTUFBeUIsRUFBRSxZQUEyQztRQUM5RixZQUFZLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDOUQsT0FBTyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUNEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsa0JBQWtCLENBQUMsTUFBd0IsRUFBRSxZQUFvQztRQUNyRixZQUFZLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDOUQsT0FBTyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8saUJBQWlCO0lBQzVCOzs7T0FHRztJQUNILEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxhQUF3QztRQUNsRSxPQUFPLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLDJCQUEyQixDQUFDLGFBQThDO1FBQzlFLE9BQU8sSUFBSSxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3RELENBQUM7Q0FDRiJ9
|
package/dest/prover/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BaseOrMergeRollupPublicInputs, BaseRollupInputs, MergeRollupInputs, Proof, PublicCircuitPublicInputs,
|
|
1
|
+
import { BaseOrMergeRollupPublicInputs, BaseRollupInputs, MergeRollupInputs, Proof, PublicCircuitPublicInputs, PublicKernelCircuitPublicInputs, RootRollupInputs, RootRollupPublicInputs } from '@aztec/circuits.js';
|
|
2
2
|
/**
|
|
3
3
|
* Generates proofs for the base, merge, and root rollup circuits.
|
|
4
4
|
*/
|
|
@@ -35,6 +35,6 @@ export interface PublicProver {
|
|
|
35
35
|
* Creates a proof for the given input.
|
|
36
36
|
* @param publicInputs - Public inputs obtained via simulation.
|
|
37
37
|
*/
|
|
38
|
-
getPublicKernelCircuitProof(publicInputs:
|
|
38
|
+
getPublicKernelCircuitProof(publicInputs: PublicKernelCircuitPublicInputs): Promise<Proof>;
|
|
39
39
|
}
|
|
40
40
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/prover/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,EACL,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/prover/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAE5B;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,6BAA6B,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAEzG;;;;OAIG;IACH,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,6BAA6B,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAE3G;;;;OAIG;IACH,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;CACnG;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,qBAAqB,CAAC,YAAY,EAAE,yBAAyB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAE/E;;;OAGG;IACH,2BAA2B,CAAC,YAAY,EAAE,+BAA+B,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;CAC5F"}
|
|
@@ -86,8 +86,6 @@ export type L1ProcessArgs = {
|
|
|
86
86
|
header: Buffer;
|
|
87
87
|
/** A root of the archive tree after the L2 block is applied. */
|
|
88
88
|
archive: Buffer;
|
|
89
|
-
/** Transactions hash. */
|
|
90
|
-
txsHash: Buffer;
|
|
91
89
|
/** L2 block body. */
|
|
92
90
|
body: Buffer;
|
|
93
91
|
/** Root rollup proof of the L2 block. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAOrE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,wDAAwD;IACxD,MAAM,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,IAAI,EAAE,GAAG,EAAE,CAAC;CACb,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEhE;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEvE;;;;;;;;;OASG;IACH,4BAA4B,CAC1B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,oBAAoB,EAAE,GAC9C,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAAC;IAEtF;;;OAGG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IAE3E;;;OAGG;IACH,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1D;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAChB,
|
|
1
|
+
{"version":3,"file":"l1-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAOrE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,wDAAwD;IACxD,MAAM,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,IAAI,EAAE,GAAG,EAAE,CAAC;CACb,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEhE;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEvE;;;;;;;;;OASG;IACH,4BAA4B,CAC1B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,oBAAoB,EAAE,GAC9C,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAAC;IAEtF;;;OAGG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IAE3E;;;OAGG;IACH,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1D;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAChB,qBAAqB;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAYF;;;;;;;GAOG;AACH,qBAAa,WAAY,YAAW,eAAe;IAMrC,OAAO,CAAC,QAAQ;IAL5B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,GAAG,CAAkD;gBAEzC,QAAQ,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,eAAe;IAI3E;;;;OAIG;IACU,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA0F7D;;;;;;OAMG;IACU,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE;IAoCjH;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;IAId;;;;OAIG;YACW,oBAAoB;YAUpB,aAAa;YAWb,aAAa;YAWb,yBAAyB;YAezB,qBAAqB;cAWnB,kBAAkB;CAGnC"}
|
|
@@ -38,7 +38,7 @@ export class L1Publisher {
|
|
|
38
38
|
this.log(`Detected different last archive prior to publishing a block, aborting publish...`);
|
|
39
39
|
return false;
|
|
40
40
|
}
|
|
41
|
-
const encodedBody = block.
|
|
41
|
+
const encodedBody = block.body.toBuffer();
|
|
42
42
|
// Publish block transaction effects
|
|
43
43
|
while (!this.interrupted) {
|
|
44
44
|
if (await this.txSender.checkIfTxsAreAvailable(block)) {
|
|
@@ -71,7 +71,6 @@ export class L1Publisher {
|
|
|
71
71
|
const processTxArgs = {
|
|
72
72
|
header: block.header.toBuffer(),
|
|
73
73
|
archive: block.archive.root.toBuffer(),
|
|
74
|
-
txsHash: block.getCalldataHash(),
|
|
75
74
|
body: encodedBody,
|
|
76
75
|
proof: Buffer.alloc(0),
|
|
77
76
|
};
|
|
@@ -218,4 +217,4 @@ export class L1Publisher {
|
|
|
218
217
|
await this.interruptibleSleep.sleep(this.sleepTimeMs);
|
|
219
218
|
}
|
|
220
219
|
}
|
|
221
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
220
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1-publisher.js","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viem-tx-sender.d.ts","sourceRoot":"","sources":["../../src/publisher/viem-tx-sender.ts"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"viem-tx-sender.d.ts","sourceRoot":"","sources":["../../src/publisher/viem-tx-sender.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAsBrE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,aAAa,IAAI,aAAa,EAC9B,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAE3B;;GAEG;AACH,qBAAa,YAAa,YAAW,mBAAmB;IACtD,OAAO,CAAC,0BAA0B,CAGhC;IACF,OAAO,CAAC,cAAc,CAGpB;IACF,OAAO,CAAC,iCAAiC,CAGvC;IAEF,OAAO,CAAC,GAAG,CAAuD;IAClE,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,OAAO,CAAoB;gBAEvB,MAAM,EAAE,cAAc;IAgC5B,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAK1C,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlD,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAahF;;;;OAIG;IACG,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAmB3F;;;;OAIG;IACG,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAarE;;;;OAIG;IACG,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAkB5E;;;;;;OAMG;IACG,4BAA4B,CAChC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,oBAAoB,EAAE,GAC9C,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IA6BlC;;;;OAIG;IACH,OAAO,CAAC,QAAQ;CASjB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BLOB_SIZE_IN_BYTES } from '@aztec/
|
|
1
|
+
import { BLOB_SIZE_IN_BYTES } from '@aztec/circuits.js/constants';
|
|
2
2
|
import { createEthereumChain } from '@aztec/ethereum';
|
|
3
3
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { AvailabilityOracleAbi, ContractDeploymentEmitterAbi, RollupAbi } from '@aztec/l1-artifacts';
|
|
@@ -26,20 +26,17 @@ export class ViemTxSender {
|
|
|
26
26
|
this.availabilityOracleContract = getContract({
|
|
27
27
|
address: getAddress(l1Contracts.availabilityOracleAddress.toString()),
|
|
28
28
|
abi: AvailabilityOracleAbi,
|
|
29
|
-
|
|
30
|
-
walletClient,
|
|
29
|
+
client: walletClient,
|
|
31
30
|
});
|
|
32
31
|
this.rollupContract = getContract({
|
|
33
32
|
address: getAddress(l1Contracts.rollupAddress.toString()),
|
|
34
33
|
abi: RollupAbi,
|
|
35
|
-
|
|
36
|
-
walletClient,
|
|
34
|
+
client: walletClient,
|
|
37
35
|
});
|
|
38
36
|
this.contractDeploymentEmitterContract = getContract({
|
|
39
37
|
address: getAddress(l1Contracts.contractDeploymentEmitterAddress.toString()),
|
|
40
38
|
abi: ContractDeploymentEmitterAbi,
|
|
41
|
-
|
|
42
|
-
walletClient,
|
|
39
|
+
client: walletClient,
|
|
43
40
|
});
|
|
44
41
|
}
|
|
45
42
|
async getCurrentArchive() {
|
|
@@ -47,7 +44,7 @@ export class ViemTxSender {
|
|
|
47
44
|
return Buffer.from(archive.replace('0x', ''), 'hex');
|
|
48
45
|
}
|
|
49
46
|
checkIfTxsAreAvailable(block) {
|
|
50
|
-
const args = [`0x${block.getCalldataHash().toString('hex')}`];
|
|
47
|
+
const args = [`0x${block.body.getCalldataHash().toString('hex')}`];
|
|
51
48
|
return this.availabilityOracleContract.read.isAvailable(args);
|
|
52
49
|
}
|
|
53
50
|
async getTransactionStats(txHash) {
|
|
@@ -108,7 +105,6 @@ export class ViemTxSender {
|
|
|
108
105
|
const args = [
|
|
109
106
|
`0x${encodedData.header.toString('hex')}`,
|
|
110
107
|
`0x${encodedData.archive.toString('hex')}`,
|
|
111
|
-
`0x${encodedData.txsHash.toString('hex')}`,
|
|
112
108
|
`0x${encodedData.body.toString('hex')}`,
|
|
113
109
|
`0x${encodedData.proof.toString('hex')}`,
|
|
114
110
|
];
|
|
@@ -176,4 +172,4 @@ export class ViemTxSender {
|
|
|
176
172
|
function getCalldataGasUsage(data) {
|
|
177
173
|
return data.filter(byte => byte === 0).length * 4 + data.filter(byte => byte !== 0).length * 16;
|
|
178
174
|
}
|
|
179
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
175
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmllbS10eC1zZW5kZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3ZpZW0tdHgtc2VuZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSw0QkFBNEIsRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVyRyxPQUFPLEVBTUwsa0JBQWtCLEVBQ2xCLGtCQUFrQixFQUNsQixVQUFVLEVBQ1YsV0FBVyxFQUNYLFVBQVUsRUFDVixJQUFJLEdBQ0wsTUFBTSxNQUFNLENBQUM7QUFDZCxPQUFPLEVBQXFCLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3ZFLE9BQU8sS0FBSyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBVXRDOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFrQnZCLFlBQVksTUFBc0I7UUFKMUIsUUFBRyxHQUFHLGlCQUFpQixDQUFDLGdDQUFnQyxDQUFDLENBQUM7UUFLaEUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsbUJBQW1CLEVBQUUsV0FBVyxFQUFFLEdBQUcsTUFBTSxDQUFDO1FBQ3BFLE1BQU0sS0FBSyxHQUFHLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztRQUNsRCxJQUFJLENBQUMsT0FBTyxHQUFHLG1CQUFtQixDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFDeEQsTUFBTSxZQUFZLEdBQUcsa0JBQWtCLENBQUM7WUFDdEMsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPO1lBQ3JCLEtBQUssRUFBRSxLQUFLLENBQUMsU0FBUztZQUN0QixTQUFTLEVBQUUs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
|