@aztec/archiver 3.0.0-nightly.20251219 → 3.0.0-nightly.20251220
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/archiver/archiver_store_test_suite.js +17 -17
- package/dest/archiver/kv_archiver_store/block_store.d.ts +1 -1
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/block_store.js +1 -2
- package/package.json +13 -13
- package/src/archiver/archiver_store_test_suite.ts +17 -17
- package/src/archiver/kv_archiver_store/block_store.ts +0 -1
|
@@ -620,8 +620,8 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
|
|
|
620
620
|
// getBlock should work for both checkpointed and uncheckpointed blocks
|
|
621
621
|
expect((await store.getBlock(1))?.number).toBe(1);
|
|
622
622
|
expect((await store.getBlock(2))?.number).toBe(2);
|
|
623
|
-
expect(await store.getBlock(3))
|
|
624
|
-
expect(await store.getBlock(4))
|
|
623
|
+
expect((await store.getBlock(3))?.equals(block3)).toBe(true);
|
|
624
|
+
expect((await store.getBlock(4))?.equals(block4)).toBe(true);
|
|
625
625
|
expect(await store.getBlock(5)).toBeUndefined();
|
|
626
626
|
const block5 = await L2BlockNew.random(BlockNumber(5), {
|
|
627
627
|
checkpointNumber: CheckpointNumber(2),
|
|
@@ -634,13 +634,13 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
|
|
|
634
634
|
// Verify the uncheckpointed blocks have correct data
|
|
635
635
|
const retrieved3 = await store.getBlock(3);
|
|
636
636
|
expect(retrieved3.number).toBe(3);
|
|
637
|
-
expect(retrieved3
|
|
637
|
+
expect(retrieved3.equals(block3)).toBe(true);
|
|
638
638
|
const retrieved4 = await store.getBlock(4);
|
|
639
639
|
expect(retrieved4.number).toBe(4);
|
|
640
|
-
expect(retrieved4
|
|
640
|
+
expect(retrieved4.equals(block4)).toBe(true);
|
|
641
641
|
const retrieved5 = await store.getBlock(5);
|
|
642
642
|
expect(retrieved5.number).toBe(5);
|
|
643
|
-
expect(retrieved5
|
|
643
|
+
expect(retrieved5.equals(block5)).toBe(true);
|
|
644
644
|
});
|
|
645
645
|
it('getBlockByHash retrieves uncheckpointed blocks', async ()=>{
|
|
646
646
|
// Add uncheckpointed blocks (no checkpoints at all) for initial checkpoint 1, chaining archive roots
|
|
@@ -661,9 +661,9 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
|
|
|
661
661
|
const hash1 = await block1.header.hash();
|
|
662
662
|
const hash2 = await block2.header.hash();
|
|
663
663
|
const retrieved1 = await store.getBlockByHash(hash1);
|
|
664
|
-
expect(retrieved1
|
|
664
|
+
expect(retrieved1.equals(block1)).toBe(true);
|
|
665
665
|
const retrieved2 = await store.getBlockByHash(hash2);
|
|
666
|
-
expect(retrieved2
|
|
666
|
+
expect(retrieved2.equals(block2)).toBe(true);
|
|
667
667
|
});
|
|
668
668
|
it('getBlockByArchive retrieves uncheckpointed blocks', async ()=>{
|
|
669
669
|
// Add uncheckpointed blocks for initial checkpoint 1, chaining archive roots
|
|
@@ -684,9 +684,9 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
|
|
|
684
684
|
const archive1 = block1.archive.root;
|
|
685
685
|
const archive2 = block2.archive.root;
|
|
686
686
|
const retrieved1 = await store.getBlockByArchive(archive1);
|
|
687
|
-
expect(retrieved1
|
|
687
|
+
expect(retrieved1.equals(block1)).toBe(true);
|
|
688
688
|
const retrieved2 = await store.getBlockByArchive(archive2);
|
|
689
|
-
expect(retrieved2
|
|
689
|
+
expect(retrieved2.equals(block2)).toBe(true);
|
|
690
690
|
});
|
|
691
691
|
it('getCheckpointedBlock returns undefined for uncheckpointed blocks', async ()=>{
|
|
692
692
|
// Add a checkpoint with blocks 1-2
|
|
@@ -720,8 +720,8 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
|
|
|
720
720
|
expect(await store.getCheckpointedBlock(3)).toBeUndefined();
|
|
721
721
|
expect(await store.getCheckpointedBlock(4)).toBeUndefined();
|
|
722
722
|
// But getBlock should work for all blocks
|
|
723
|
-
expect(await store.getBlock(3))
|
|
724
|
-
expect(await store.getBlock(4))
|
|
723
|
+
expect((await store.getBlock(3))?.equals(block3)).toBe(true);
|
|
724
|
+
expect((await store.getBlock(4))?.equals(block4)).toBe(true);
|
|
725
725
|
});
|
|
726
726
|
it('getCheckpointedBlockByHash returns undefined for uncheckpointed blocks', async ()=>{
|
|
727
727
|
// Add uncheckpointed blocks for initial checkpoint 1
|
|
@@ -736,7 +736,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
|
|
|
736
736
|
// getCheckpointedBlockByHash should return undefined
|
|
737
737
|
expect(await store.getCheckpointedBlockByHash(hash)).toBeUndefined();
|
|
738
738
|
// But getBlockByHash should work
|
|
739
|
-
expect(await store.getBlockByHash(hash))
|
|
739
|
+
expect((await store.getBlockByHash(hash))?.equals(block1)).toBe(true);
|
|
740
740
|
});
|
|
741
741
|
it('getCheckpointedBlockByArchive returns undefined for uncheckpointed blocks', async ()=>{
|
|
742
742
|
// Add uncheckpointed blocks for initial checkpoint 1
|
|
@@ -751,7 +751,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
|
|
|
751
751
|
// getCheckpointedBlockByArchive should return undefined
|
|
752
752
|
expect(await store.getCheckpointedBlockByArchive(archive)).toBeUndefined();
|
|
753
753
|
// But getBlockByArchive should work
|
|
754
|
-
expect(await store.getBlockByArchive(archive))
|
|
754
|
+
expect((await store.getBlockByArchive(archive))?.equals(block1)).toBe(true);
|
|
755
755
|
});
|
|
756
756
|
it('checkpoint adopts previously added uncheckpointed blocks', async ()=>{
|
|
757
757
|
// Add blocks 1-3 without a checkpoint (for initial checkpoint 1), chaining archive roots
|
|
@@ -975,8 +975,8 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
|
|
|
975
975
|
block4
|
|
976
976
|
])).resolves.toBe(true);
|
|
977
977
|
// Verify blocks were added
|
|
978
|
-
expect(await store.getBlock(3))
|
|
979
|
-
expect(await store.getBlock(4))
|
|
978
|
+
expect((await store.getBlock(3))?.equals(block3)).toBe(true);
|
|
979
|
+
expect((await store.getBlock(4))?.equals(block4)).toBe(true);
|
|
980
980
|
});
|
|
981
981
|
it('allows blocks for the initial checkpoint when store is empty', async ()=>{
|
|
982
982
|
// Add blocks for the initial checkpoint (1), chaining archive roots
|
|
@@ -994,8 +994,8 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
|
|
|
994
994
|
block2
|
|
995
995
|
])).resolves.toBe(true);
|
|
996
996
|
// Verify blocks were added
|
|
997
|
-
expect(await store.getBlock(1))
|
|
998
|
-
expect(await store.getBlock(2))
|
|
997
|
+
expect((await store.getBlock(1))?.equals(block1)).toBe(true);
|
|
998
|
+
expect((await store.getBlock(2))?.equals(block2)).toBe(true);
|
|
999
999
|
expect(await store.getLatestBlockNumber()).toBe(2);
|
|
1000
1000
|
});
|
|
1001
1001
|
it('throws if initial block is duplicated across calls', async ()=>{
|
|
@@ -154,4 +154,4 @@ export declare class BlockStore {
|
|
|
154
154
|
*/
|
|
155
155
|
setPendingChainValidationStatus(status: ValidateBlockResult | undefined): Promise<void>;
|
|
156
156
|
}
|
|
157
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9ibG9ja19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDaEYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBTXBELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUE2QyxNQUFNLGlCQUFpQixDQUFDO0FBQ3BHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFFTCxtQkFBbUIsRUFFbkIsV0FBVyxFQUNYLFVBQVUsRUFDVixLQUFLLG1CQUFtQixFQUd6QixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFBRSxlQUFlLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNoRixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM3RCxPQUFPLEVBQ0wsV0FBVyxFQUNYLEtBQUssZUFBZSxFQUVwQixNQUFNLEVBQ04sU0FBUyxFQUdWLE1BQU0sa0JBQWtCLENBQUM7QUFjMUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBc0J6RSxNQUFNLE1BQU0sY0FBYyxHQUFHO0lBQzNCLGdCQUFnQixFQUFFLGdCQUFnQixDQUFDO0lBQ25DLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQztJQUN6QixPQUFPLEVBQUUsc0JBQXNCLENBQUM7SUFDaEMsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLEVBQUUs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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"block_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { INITIAL_CHECKPOINT_NUMBER, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
2
2
|
import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
3
|
-
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
3
|
import { toArray } from '@aztec/foundation/iterable';
|
|
5
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
5
|
import { BufferReader } from '@aztec/foundation/serialize';
|
|
@@ -484,7 +483,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
|
|
|
484
483
|
txEffects.push(deserializeIndexedTxEffect(txEffect).data);
|
|
485
484
|
}
|
|
486
485
|
const body = new Body(txEffects);
|
|
487
|
-
const block = new L2BlockNew(archive, header, body, CheckpointNumber(blockStorage.checkpointNumber), blockStorage.indexWithinCheckpoint
|
|
486
|
+
const block = new L2BlockNew(archive, header, body, CheckpointNumber(blockStorage.checkpointNumber), blockStorage.indexWithinCheckpoint);
|
|
488
487
|
if (block.number !== blockNumber) {
|
|
489
488
|
throw new Error(`Block number mismatch when retrieving block from archive (expected ${blockNumber} but got ${block.number} with hash ${blockHashString})`);
|
|
490
489
|
}
|
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.20251220",
|
|
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.20251220",
|
|
70
|
+
"@aztec/blob-sink": "3.0.0-nightly.20251220",
|
|
71
|
+
"@aztec/constants": "3.0.0-nightly.20251220",
|
|
72
|
+
"@aztec/epoch-cache": "3.0.0-nightly.20251220",
|
|
73
|
+
"@aztec/ethereum": "3.0.0-nightly.20251220",
|
|
74
|
+
"@aztec/foundation": "3.0.0-nightly.20251220",
|
|
75
|
+
"@aztec/kv-store": "3.0.0-nightly.20251220",
|
|
76
|
+
"@aztec/l1-artifacts": "3.0.0-nightly.20251220",
|
|
77
|
+
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251220",
|
|
78
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20251220",
|
|
79
|
+
"@aztec/stdlib": "3.0.0-nightly.20251220",
|
|
80
|
+
"@aztec/telemetry-client": "3.0.0-nightly.20251220",
|
|
81
81
|
"lodash.groupby": "^4.6.0",
|
|
82
82
|
"lodash.omit": "^4.5.0",
|
|
83
83
|
"tslib": "^2.5.0",
|
|
@@ -709,8 +709,8 @@ export function describeArchiverDataStore(
|
|
|
709
709
|
// getBlock should work for both checkpointed and uncheckpointed blocks
|
|
710
710
|
expect((await store.getBlock(1))?.number).toBe(1);
|
|
711
711
|
expect((await store.getBlock(2))?.number).toBe(2);
|
|
712
|
-
expect(await store.getBlock(3))
|
|
713
|
-
expect(await store.getBlock(4))
|
|
712
|
+
expect((await store.getBlock(3))?.equals(block3)).toBe(true);
|
|
713
|
+
expect((await store.getBlock(4))?.equals(block4)).toBe(true);
|
|
714
714
|
expect(await store.getBlock(5)).toBeUndefined();
|
|
715
715
|
|
|
716
716
|
const block5 = await L2BlockNew.random(BlockNumber(5), {
|
|
@@ -723,13 +723,13 @@ export function describeArchiverDataStore(
|
|
|
723
723
|
// Verify the uncheckpointed blocks have correct data
|
|
724
724
|
const retrieved3 = await store.getBlock(3);
|
|
725
725
|
expect(retrieved3!.number).toBe(3);
|
|
726
|
-
expect(retrieved3).
|
|
726
|
+
expect(retrieved3!.equals(block3)).toBe(true);
|
|
727
727
|
const retrieved4 = await store.getBlock(4);
|
|
728
728
|
expect(retrieved4!.number).toBe(4);
|
|
729
|
-
expect(retrieved4).
|
|
729
|
+
expect(retrieved4!.equals(block4)).toBe(true);
|
|
730
730
|
const retrieved5 = await store.getBlock(5);
|
|
731
731
|
expect(retrieved5!.number).toBe(5);
|
|
732
|
-
expect(retrieved5).
|
|
732
|
+
expect(retrieved5!.equals(block5)).toBe(true);
|
|
733
733
|
});
|
|
734
734
|
|
|
735
735
|
it('getBlockByHash retrieves uncheckpointed blocks', async () => {
|
|
@@ -750,10 +750,10 @@ export function describeArchiverDataStore(
|
|
|
750
750
|
const hash2 = await block2.header.hash();
|
|
751
751
|
|
|
752
752
|
const retrieved1 = await store.getBlockByHash(hash1);
|
|
753
|
-
expect(retrieved1).
|
|
753
|
+
expect(retrieved1!.equals(block1)).toBe(true);
|
|
754
754
|
|
|
755
755
|
const retrieved2 = await store.getBlockByHash(hash2);
|
|
756
|
-
expect(retrieved2).
|
|
756
|
+
expect(retrieved2!.equals(block2)).toBe(true);
|
|
757
757
|
});
|
|
758
758
|
|
|
759
759
|
it('getBlockByArchive retrieves uncheckpointed blocks', async () => {
|
|
@@ -774,10 +774,10 @@ export function describeArchiverDataStore(
|
|
|
774
774
|
const archive2 = block2.archive.root;
|
|
775
775
|
|
|
776
776
|
const retrieved1 = await store.getBlockByArchive(archive1);
|
|
777
|
-
expect(retrieved1).
|
|
777
|
+
expect(retrieved1!.equals(block1)).toBe(true);
|
|
778
778
|
|
|
779
779
|
const retrieved2 = await store.getBlockByArchive(archive2);
|
|
780
|
-
expect(retrieved2).
|
|
780
|
+
expect(retrieved2!.equals(block2)).toBe(true);
|
|
781
781
|
});
|
|
782
782
|
|
|
783
783
|
it('getCheckpointedBlock returns undefined for uncheckpointed blocks', async () => {
|
|
@@ -811,8 +811,8 @@ export function describeArchiverDataStore(
|
|
|
811
811
|
expect(await store.getCheckpointedBlock(4)).toBeUndefined();
|
|
812
812
|
|
|
813
813
|
// But getBlock should work for all blocks
|
|
814
|
-
expect(await store.getBlock(3))
|
|
815
|
-
expect(await store.getBlock(4))
|
|
814
|
+
expect((await store.getBlock(3))?.equals(block3)).toBe(true);
|
|
815
|
+
expect((await store.getBlock(4))?.equals(block4)).toBe(true);
|
|
816
816
|
});
|
|
817
817
|
|
|
818
818
|
it('getCheckpointedBlockByHash returns undefined for uncheckpointed blocks', async () => {
|
|
@@ -829,7 +829,7 @@ export function describeArchiverDataStore(
|
|
|
829
829
|
expect(await store.getCheckpointedBlockByHash(hash)).toBeUndefined();
|
|
830
830
|
|
|
831
831
|
// But getBlockByHash should work
|
|
832
|
-
expect(await store.getBlockByHash(hash))
|
|
832
|
+
expect((await store.getBlockByHash(hash))?.equals(block1)).toBe(true);
|
|
833
833
|
});
|
|
834
834
|
|
|
835
835
|
it('getCheckpointedBlockByArchive returns undefined for uncheckpointed blocks', async () => {
|
|
@@ -846,7 +846,7 @@ export function describeArchiverDataStore(
|
|
|
846
846
|
expect(await store.getCheckpointedBlockByArchive(archive)).toBeUndefined();
|
|
847
847
|
|
|
848
848
|
// But getBlockByArchive should work
|
|
849
|
-
expect(await store.getBlockByArchive(archive))
|
|
849
|
+
expect((await store.getBlockByArchive(archive))?.equals(block1)).toBe(true);
|
|
850
850
|
});
|
|
851
851
|
|
|
852
852
|
it('checkpoint adopts previously added uncheckpointed blocks', async () => {
|
|
@@ -1064,8 +1064,8 @@ export function describeArchiverDataStore(
|
|
|
1064
1064
|
await expect(store.addBlocks([block3, block4])).resolves.toBe(true);
|
|
1065
1065
|
|
|
1066
1066
|
// Verify blocks were added
|
|
1067
|
-
expect(await store.getBlock(3))
|
|
1068
|
-
expect(await store.getBlock(4))
|
|
1067
|
+
expect((await store.getBlock(3))?.equals(block3)).toBe(true);
|
|
1068
|
+
expect((await store.getBlock(4))?.equals(block4)).toBe(true);
|
|
1069
1069
|
});
|
|
1070
1070
|
|
|
1071
1071
|
it('allows blocks for the initial checkpoint when store is empty', async () => {
|
|
@@ -1083,8 +1083,8 @@ export function describeArchiverDataStore(
|
|
|
1083
1083
|
await expect(store.addBlocks([block1, block2])).resolves.toBe(true);
|
|
1084
1084
|
|
|
1085
1085
|
// Verify blocks were added
|
|
1086
|
-
expect(await store.getBlock(1))
|
|
1087
|
-
expect(await store.getBlock(2))
|
|
1086
|
+
expect((await store.getBlock(1))?.equals(block1)).toBe(true);
|
|
1087
|
+
expect((await store.getBlock(2))?.equals(block2)).toBe(true);
|
|
1088
1088
|
expect(await store.getLatestBlockNumber()).toBe(2);
|
|
1089
1089
|
});
|
|
1090
1090
|
|