@aztec/archiver 3.0.0-nightly.20251120 → 3.0.0-nightly.20251122
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,kBAAkB,EAIxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAEV,UAAU,EAGV,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,KAAK,QAAQ,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAQ,oBAAoB,EAA0B,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC3G,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,
|
|
1
|
+
{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,11 +8,11 @@ import { Body, CommitteeAttestation, L2Block, L2BlockHeader, PublishedL2Block }
|
|
|
8
8
|
import { Proof } from '@aztec/stdlib/proofs';
|
|
9
9
|
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
10
10
|
import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
|
|
11
|
-
import { GlobalVariables, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
|
|
11
|
+
import { BlockHeader, GlobalVariables, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
|
|
12
12
|
import { decodeFunctionData, getAbiItem, hexToBytes, multicall3Abi } from 'viem';
|
|
13
13
|
import { NoBlobBodiesFoundError } from './errors.js';
|
|
14
14
|
export async function retrievedBlockToPublishedL2Block({ archiveRoot, stateReference, header: checkpointHeader, checkpointBlobData, l1, chainId, version, attestations }) {
|
|
15
|
-
const {
|
|
15
|
+
const { blocks: blocksBlobData } = checkpointBlobData;
|
|
16
16
|
// The lastArchiveRoot of a block is the new archive for the previous block.
|
|
17
17
|
const newArchiveRoots = blocksBlobData.map((b)=>b.lastArchiveRoot).slice(1).concat([
|
|
18
18
|
archiveRoot
|
|
@@ -20,7 +20,7 @@ export async function retrievedBlockToPublishedL2Block({ archiveRoot, stateRefer
|
|
|
20
20
|
// `blocksBlobData` is created from `decodeCheckpointBlobDataFromBlobs`. An error will be thrown if it can't read a
|
|
21
21
|
// field for the `l1ToL2MessageRoot` of the first block. So below we can safely assume it exists:
|
|
22
22
|
const l1toL2MessageTreeRoot = blocksBlobData[0].l1ToL2MessageRoot;
|
|
23
|
-
const spongeBlob =
|
|
23
|
+
const spongeBlob = SpongeBlob.init();
|
|
24
24
|
const l2Blocks = [];
|
|
25
25
|
for(let i = 0; i < blocksBlobData.length; i++){
|
|
26
26
|
const blockBlobData = blocksBlobData[i];
|
|
@@ -49,14 +49,18 @@ export async function retrievedBlockToPublishedL2Block({ archiveRoot, stateRefer
|
|
|
49
49
|
await spongeBlob.absorb(blobFields);
|
|
50
50
|
const clonedSpongeBlob = spongeBlob.clone();
|
|
51
51
|
const spongeBlobHash = await clonedSpongeBlob.squeeze();
|
|
52
|
-
const
|
|
52
|
+
const blockHeader = BlockHeader.from({
|
|
53
53
|
lastArchive: new AppendOnlyTreeSnapshot(lastArchiveRoot, l2BlockNumber),
|
|
54
|
-
contentCommitment: checkpointHeader.contentCommitment,
|
|
55
54
|
state,
|
|
55
|
+
spongeBlobHash,
|
|
56
56
|
globalVariables,
|
|
57
57
|
totalFees: body.txEffects.reduce((accum, txEffect)=>accum.add(txEffect.transactionFee), Fr.ZERO),
|
|
58
|
-
totalManaUsed: new Fr(blockEndStateField.totalManaUsed)
|
|
59
|
-
|
|
58
|
+
totalManaUsed: new Fr(blockEndStateField.totalManaUsed)
|
|
59
|
+
});
|
|
60
|
+
const header = L2BlockHeader.from({
|
|
61
|
+
...blockHeader,
|
|
62
|
+
blockHeadersHash: checkpointHeader.blockHeadersHash,
|
|
63
|
+
contentCommitment: checkpointHeader.contentCommitment
|
|
60
64
|
});
|
|
61
65
|
const newArchive = new AppendOnlyTreeSnapshot(newArchiveRoots[i], l2BlockNumber + 1);
|
|
62
66
|
l2Blocks.push(new L2Block(newArchive, header, body));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/archiver",
|
|
3
|
-
"version": "3.0.0-nightly.
|
|
3
|
+
"version": "3.0.0-nightly.20251122",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -66,18 +66,18 @@
|
|
|
66
66
|
]
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@aztec/blob-lib": "3.0.0-nightly.
|
|
70
|
-
"@aztec/blob-sink": "3.0.0-nightly.
|
|
71
|
-
"@aztec/constants": "3.0.0-nightly.
|
|
72
|
-
"@aztec/epoch-cache": "3.0.0-nightly.
|
|
73
|
-
"@aztec/ethereum": "3.0.0-nightly.
|
|
74
|
-
"@aztec/foundation": "3.0.0-nightly.
|
|
75
|
-
"@aztec/kv-store": "3.0.0-nightly.
|
|
76
|
-
"@aztec/l1-artifacts": "3.0.0-nightly.
|
|
77
|
-
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.
|
|
78
|
-
"@aztec/protocol-contracts": "3.0.0-nightly.
|
|
79
|
-
"@aztec/stdlib": "3.0.0-nightly.
|
|
80
|
-
"@aztec/telemetry-client": "3.0.0-nightly.
|
|
69
|
+
"@aztec/blob-lib": "3.0.0-nightly.20251122",
|
|
70
|
+
"@aztec/blob-sink": "3.0.0-nightly.20251122",
|
|
71
|
+
"@aztec/constants": "3.0.0-nightly.20251122",
|
|
72
|
+
"@aztec/epoch-cache": "3.0.0-nightly.20251122",
|
|
73
|
+
"@aztec/ethereum": "3.0.0-nightly.20251122",
|
|
74
|
+
"@aztec/foundation": "3.0.0-nightly.20251122",
|
|
75
|
+
"@aztec/kv-store": "3.0.0-nightly.20251122",
|
|
76
|
+
"@aztec/l1-artifacts": "3.0.0-nightly.20251122",
|
|
77
|
+
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251122",
|
|
78
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20251122",
|
|
79
|
+
"@aztec/stdlib": "3.0.0-nightly.20251122",
|
|
80
|
+
"@aztec/telemetry-client": "3.0.0-nightly.20251122",
|
|
81
81
|
"lodash.groupby": "^4.6.0",
|
|
82
82
|
"lodash.omit": "^4.5.0",
|
|
83
83
|
"tsc-watch": "^6.0.0",
|
|
@@ -25,7 +25,7 @@ import { Body, CommitteeAttestation, L2Block, L2BlockHeader, PublishedL2Block }
|
|
|
25
25
|
import { Proof } from '@aztec/stdlib/proofs';
|
|
26
26
|
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
27
27
|
import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
|
|
28
|
-
import { GlobalVariables, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
|
|
28
|
+
import { BlockHeader, GlobalVariables, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
|
|
29
29
|
|
|
30
30
|
import {
|
|
31
31
|
type GetContractEventsReturnType,
|
|
@@ -63,7 +63,7 @@ export async function retrievedBlockToPublishedL2Block({
|
|
|
63
63
|
version,
|
|
64
64
|
attestations,
|
|
65
65
|
}: RetrievedL2Block): Promise<PublishedL2Block> {
|
|
66
|
-
const {
|
|
66
|
+
const { blocks: blocksBlobData } = checkpointBlobData;
|
|
67
67
|
|
|
68
68
|
// The lastArchiveRoot of a block is the new archive for the previous block.
|
|
69
69
|
const newArchiveRoots = blocksBlobData
|
|
@@ -75,7 +75,7 @@ export async function retrievedBlockToPublishedL2Block({
|
|
|
75
75
|
// field for the `l1ToL2MessageRoot` of the first block. So below we can safely assume it exists:
|
|
76
76
|
const l1toL2MessageTreeRoot = blocksBlobData[0].l1ToL2MessageRoot!;
|
|
77
77
|
|
|
78
|
-
const spongeBlob =
|
|
78
|
+
const spongeBlob = SpongeBlob.init();
|
|
79
79
|
const l2Blocks: L2Block[] = [];
|
|
80
80
|
for (let i = 0; i < blocksBlobData.length; i++) {
|
|
81
81
|
const blockBlobData = blocksBlobData[i];
|
|
@@ -115,14 +115,19 @@ export async function retrievedBlockToPublishedL2Block({
|
|
|
115
115
|
const clonedSpongeBlob = spongeBlob.clone();
|
|
116
116
|
const spongeBlobHash = await clonedSpongeBlob.squeeze();
|
|
117
117
|
|
|
118
|
-
const
|
|
118
|
+
const blockHeader = BlockHeader.from({
|
|
119
119
|
lastArchive: new AppendOnlyTreeSnapshot(lastArchiveRoot, l2BlockNumber),
|
|
120
|
-
contentCommitment: checkpointHeader.contentCommitment,
|
|
121
120
|
state,
|
|
121
|
+
spongeBlobHash,
|
|
122
122
|
globalVariables,
|
|
123
123
|
totalFees: body.txEffects.reduce((accum, txEffect) => accum.add(txEffect.transactionFee), Fr.ZERO),
|
|
124
124
|
totalManaUsed: new Fr(blockEndStateField.totalManaUsed),
|
|
125
|
-
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
const header = L2BlockHeader.from({
|
|
128
|
+
...blockHeader,
|
|
129
|
+
blockHeadersHash: checkpointHeader.blockHeadersHash,
|
|
130
|
+
contentCommitment: checkpointHeader.contentCommitment,
|
|
126
131
|
});
|
|
127
132
|
|
|
128
133
|
const newArchive = new AppendOnlyTreeSnapshot(newArchiveRoots[i], l2BlockNumber + 1);
|