@aztec/archiver 0.80.0 → 0.82.0

package/dest/archiver/archiver_store_test_suite.js

@@ -1,6 +1,7 @@
-import { INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT, MAX_NULLIFIERS_PER_TX, PRIVATE_LOG_SIZE_IN_FIELDS, PUBLIC_LOG_DATA_SIZE_IN_FIELDS } from '@aztec/constants';
+import { INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT, PRIVATE_LOG_SIZE_IN_FIELDS, PUBLIC_LOG_DATA_SIZE_IN_FIELDS } from '@aztec/constants';
 import { times, timesParallel } from '@aztec/foundation/collection';
 import { randomInt } from '@aztec/foundation/crypto';
+import { Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { L2Block, wrapInBlock } from '@aztec/stdlib/block';
@@ -44,17 +45,28 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                 ()=>blocks.slice(4, 6)
             ]
         ];
-        const makeL1Published = (block, l1BlockNumber)=>({
-                data: block,
+        const makePublished = (block, l1BlockNumber)=>({
+                block: block,
                 l1: {
                     blockNumber: BigInt(l1BlockNumber),
                     blockHash: `0x${l1BlockNumber}`,
                     timestamp: BigInt(l1BlockNumber * 1000)
-                }
-            });
+                },
+                signatures: times(3, Signature.random)
+            });
+        const expectBlocksEqual = (actual, expected)=>{
+            expect(actual.length).toEqual(expected.length);
+            for(let i = 0; i < expected.length; i++){
+                const expectedBlock = expected[i];
+                const actualBlock = actual[i];
+                expect(actualBlock.l1).toEqual(expectedBlock.l1);
+                expect(actualBlock.block.equals(expectedBlock.block)).toBe(true);
+                expect(actualBlock.signatures.every((s, i)=>s.equals(expectedBlock.signatures[i]))).toBe(true);
+            }
+        };
         beforeEach(async ()=>{
             store = await getStore();
-            blocks = await timesParallel(10, async (i)=>makeL1Published(await L2Block.random(i + 1), i + 10));
+            blocks = await timesParallel(10, async (i)=>makePublished(await L2Block.random(i + 1), i + 10));
         });
         describe('addBlocks', ()=>{
             it('returns success when adding blocks', async ()=>{
@@ -69,7 +81,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
             it('unwinding blocks will remove blocks from the chain', async ()=>{
                 await store.addBlocks(blocks);
                 const blockNumber = await store.getSynchedL2BlockNumber();
-                expect(await store.getBlocks(blockNumber, 1)).toEqual([
+                expectBlocksEqual(await store.getBlocks(blockNumber, 1), [
                     blocks[blocks.length - 1]
                 ]);
                 await store.unwindBlocks(blockNumber, 1);
@@ -77,12 +89,12 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                 expect(await store.getBlocks(blockNumber, 1)).toEqual([]);
             });
             it('can unwind multiple empty blocks', async ()=>{
-                const emptyBlocks = await timesParallel(10, async (i)=>makeL1Published(await L2Block.random(i + 1, 0), i + 10));
+                const emptyBlocks = await timesParallel(10, async (i)=>makePublished(await L2Block.random(i + 1, 0), i + 10));
                 await store.addBlocks(emptyBlocks);
                 expect(await store.getSynchedL2BlockNumber()).toBe(10);
                 await store.unwindBlocks(10, 3);
                 expect(await store.getSynchedL2BlockNumber()).toBe(7);
-                expect((await store.getBlocks(1, 10)).map((b)=>b.data.number)).toEqual([
+                expect((await store.getBlocks(1, 10)).map((b)=>b.block.number)).toEqual([
                     1,
                     2,
                     3,
@@ -102,7 +114,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                 await store.addBlocks(blocks);
             });
             it.each(blockTests)('retrieves previously stored blocks', async (start, limit, getExpectedBlocks)=>{
-                await expect(store.getBlocks(start, limit)).resolves.toEqual(getExpectedBlocks());
+                expectBlocksEqual(await store.getBlocks(start, limit), getExpectedBlocks());
             });
             it('returns an empty array if no blocks are found', async ()=>{
                 await expect(store.getBlocks(12, 1)).resolves.toEqual([]);
@@ -120,7 +132,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
             });
             it("returns the most recently added block's number", async ()=>{
                 await store.addBlocks(blocks);
-                await expect(store.getSynchedL2BlockNumber()).resolves.toEqual(blocks.at(-1).data.number);
+                await expect(store.getSynchedL2BlockNumber()).resolves.toEqual(blocks.at(-1).block.number);
             });
         });
         describe('getSynchPoint', ()=>{
@@ -152,7 +164,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
         });
         describe('addLogs', ()=>{
             it('adds private & public logs', async ()=>{
-                const block = blocks[0].data;
+                const block = blocks[0].block;
                 await expect(store.addLogs([
                     block
                 ])).resolves.toEqual(true);
@@ -160,7 +172,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
         });
         describe('deleteLogs', ()=>{
             it('deletes private & public logs', async ()=>{
-                const block = blocks[0].data;
+                const block = blocks[0].block;
                 await store.addBlocks([
                     blocks[0]
                 ]);
@@ -183,7 +195,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
         });
         describe('getPrivateLogs', ()=>{
             it('gets added private logs', async ()=>{
-                const block = blocks[0].data;
+                const block = blocks[0].block;
                 await store.addBlocks([
                     blocks[0]
                 ]);
@@ -196,15 +208,15 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
         });
         describe('getTxEffect', ()=>{
             beforeEach(async ()=>{
-                await store.addLogs(blocks.map((b)=>b.data));
+                await store.addLogs(blocks.map((b)=>b.block));
                 await store.addBlocks(blocks);
             });
             it.each([
-                ()=>wrapInBlock(blocks[0].data.body.txEffects[0], blocks[0].data),
-                ()=>wrapInBlock(blocks[9].data.body.txEffects[3], blocks[9].data),
-                ()=>wrapInBlock(blocks[3].data.body.txEffects[1], blocks[3].data),
-                ()=>wrapInBlock(blocks[5].data.body.txEffects[2], blocks[5].data),
-                ()=>wrapInBlock(blocks[1].data.body.txEffects[0], blocks[1].data)
+                ()=>wrapInBlock(blocks[0].block.body.txEffects[0], blocks[0].block),
+                ()=>wrapInBlock(blocks[9].block.body.txEffects[3], blocks[9].block),
+                ()=>wrapInBlock(blocks[3].block.body.txEffects[1], blocks[3].block),
+                ()=>wrapInBlock(blocks[5].block.body.txEffects[2], blocks[5].block),
+                ()=>wrapInBlock(blocks[1].block.body.txEffects[0], blocks[1].block)
             ])('retrieves a previously stored transaction', async (getExpectedTx)=>{
                 const expectedTx = await getExpectedTx();
                 const actualTx = await store.getTxEffect(expectedTx.data.txHash);
@@ -214,11 +226,11 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                 await expect(store.getTxEffect(TxHash.random())).resolves.toBeUndefined();
             });
             it.each([
-                ()=>wrapInBlock(blocks[0].data.body.txEffects[0], blocks[0].data),
-                ()=>wrapInBlock(blocks[9].data.body.txEffects[3], blocks[9].data),
-                ()=>wrapInBlock(blocks[3].data.body.txEffects[1], blocks[3].data),
-                ()=>wrapInBlock(blocks[5].data.body.txEffects[2], blocks[5].data),
-                ()=>wrapInBlock(blocks[1].data.body.txEffects[0], blocks[1].data)
+                ()=>wrapInBlock(blocks[0].block.body.txEffects[0], blocks[0].block),
+                ()=>wrapInBlock(blocks[9].block.body.txEffects[3], blocks[9].block),
+                ()=>wrapInBlock(blocks[3].block.body.txEffects[1], blocks[3].block),
+                ()=>wrapInBlock(blocks[5].block.body.txEffects[2], blocks[5].block),
+                ()=>wrapInBlock(blocks[1].block.body.txEffects[0], blocks[1].block)
             ])('tries to retrieves a previously stored transaction after deleted', async (getExpectedTx)=>{
                 await store.unwindBlocks(blocks.length, blocks.length);
                 const expectedTx = await getExpectedTx();
@@ -279,16 +291,60 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                 ], blockNum);
             });
             it('returns previously stored contract instances', async ()=>{
-                await expect(store.getContractInstance(contractInstance.address)).resolves.toMatchObject(contractInstance);
+                await expect(store.getContractInstance(contractInstance.address, blockNum)).resolves.toMatchObject(contractInstance);
             });
             it('returns undefined if contract instance is not found', async ()=>{
-                await expect(store.getContractInstance(await AztecAddress.random())).resolves.toBeUndefined();
+                await expect(store.getContractInstance(await AztecAddress.random(), blockNum)).resolves.toBeUndefined();
             });
             it('returns undefined if previously stored contract instances was deleted', async ()=>{
                 await store.deleteContractInstances([
                     contractInstance
                 ], blockNum);
-                await expect(store.getContractInstance(contractInstance.address)).resolves.toBeUndefined();
+                await expect(store.getContractInstance(contractInstance.address, blockNum)).resolves.toBeUndefined();
+            });
+        });
+        describe('contractInstanceUpdates', ()=>{
+            let contractInstance;
+            let classId;
+            let nextClassId;
+            const blockOfChange = 10;
+            beforeEach(async ()=>{
+                classId = Fr.random();
+                nextClassId = Fr.random();
+                const randomInstance = await SerializableContractInstance.random({
+                    currentContractClassId: classId,
+                    originalContractClassId: classId
+                });
+                contractInstance = {
+                    ...randomInstance,
+                    address: await AztecAddress.random()
+                };
+                await store.addContractInstances([
+                    contractInstance
+                ], 1);
+                await store.addContractInstanceUpdates([
+                    {
+                        prevContractClassId: classId,
+                        newContractClassId: nextClassId,
+                        blockOfChange,
+                        address: contractInstance.address
+                    }
+                ], blockOfChange - 1);
+            });
+            it('gets the correct current class id for a contract not updated yet', async ()=>{
+                const fetchedInstance = await store.getContractInstance(contractInstance.address, blockOfChange - 1);
+                expect(fetchedInstance?.originalContractClassId).toEqual(classId);
+                expect(fetchedInstance?.currentContractClassId).toEqual(classId);
+            });
+            it('gets the correct current class id for a contract that has just been updated', async ()=>{
+                const fetchedInstance = await store.getContractInstance(contractInstance.address, blockOfChange);
+                expect(fetchedInstance?.originalContractClassId).toEqual(classId);
+                expect(fetchedInstance?.currentContractClassId).toEqual(nextClassId);
+            });
+            it('gets the correct current class id for a contract that was updated in the past', async ()=>{
+                const fetchedInstance = await store.getContractInstance(contractInstance.address, blockOfChange + 1);
+                expect(fetchedInstance?.originalContractClassId).toEqual(classId);
+                expect(fetchedInstance?.currentContractClassId).toEqual(nextClassId);
             });
         });
         describe('contractClasses', ()=>{
@@ -359,23 +415,12 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
             const numPublicLogsPerTx = 2;
             let blocks;
             const makeTag = (blockNumber, txIndex, logIndex, isPublic = false)=>new Fr((blockNumber * 100 + txIndex * 10 + logIndex) * (isPublic ? 123 : 1));
-            // See parseLogFromPublic
-            // Search the codebase for "disgusting encoding" to see other hardcoded instances of this encoding, that you might need to change if you ever find yourself here.
-            const makeLengthsField = (publicValuesLen, privateValuesLen)=>{
-                const buf = Buffer.alloc(32);
-                buf.writeUint16BE(publicValuesLen, 27);
-                buf.writeUint16BE(privateValuesLen, 30);
-                return Fr.fromBuffer(buf);
-            };
             const makePrivateLog = (tag)=>PrivateLog.fromFields([
                     tag,
                     ...times(PRIVATE_LOG_SIZE_IN_FIELDS - 1, (i)=>new Fr(tag.toNumber() + i))
                 ]);
-            // The tag lives in field 1, not 0, of a public log
-            // See extractTaggedLogsFromPublic and noir-projects/aztec-nr/aztec/src/macros/notes/mod.nr -> emit_log
             const makePublicLog = (tag)=>PublicLog.fromFields([
                     AztecAddress.fromNumber(1).toField(),
-                    makeLengthsField(2, PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 3),
                     tag,
                     ...times(PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 1, (i)=>new Fr(tag.toNumber() + i))
                 ]);
@@ -401,7 +446,8 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                     return txEffect;
                 });
                 return {
-                    data: block,
+                    block: block,
+                    signatures: times(3, Signature.random),
                     l1: {
                         blockNumber: BigInt(blockNumber),
                         blockHash: `0x${blockNumber}`,
@@ -412,7 +458,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
             beforeEach(async ()=>{
                 blocks = await timesParallel(numBlocks, (index)=>mockBlockWithLogs(index));
                 await store.addBlocks(blocks);
-                await store.addLogs(blocks.map((b)=>b.data));
+                await store.addLogs(blocks.map((b)=>b.block));
             });
             it('is possible to batch request private logs via tags', async ()=>{
                 const tags = [
@@ -424,14 +470,14 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                     [
                         expect.objectContaining({
                             blockNumber: 1,
-                            logData: makePrivateLog(tags[0]).toBuffer(),
+                            log: makePrivateLog(tags[0]),
                             isFromPublic: false
                         })
                     ],
                     [
                         expect.objectContaining({
                             blockNumber: 0,
-                            logData: makePrivateLog(tags[1]).toBuffer(),
+                            log: makePrivateLog(tags[1]),
                             isFromPublic: false
                         })
                     ]
@@ -447,12 +493,12 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                     [
                         expect.objectContaining({
                             blockNumber: 0,
-                            logData: makePrivateLog(tags[0]).toBuffer(),
+                            log: makePrivateLog(tags[0]),
                             isFromPublic: false
                         }),
                         expect.objectContaining({
                             blockNumber: 0,
-                            logData: makePublicLog(tags[0]).toBuffer(),
+                            log: makePublicLog(tags[0]),
                             isFromPublic: true
                         })
                     ]
@@ -465,26 +511,26 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                 // Create a block containing logs that have the same tag as the blocks before.
                 const newBlockNumber = numBlocks;
                 const newBlock = await mockBlockWithLogs(newBlockNumber);
-                const newLog = newBlock.data.body.txEffects[1].privateLogs[1];
+                const newLog = newBlock.block.body.txEffects[1].privateLogs[1];
                 newLog.fields[0] = tags[0];
-                newBlock.data.body.txEffects[1].privateLogs[1] = newLog;
+                newBlock.block.body.txEffects[1].privateLogs[1] = newLog;
                 await store.addBlocks([
                     newBlock
                 ]);
                 await store.addLogs([
-                    newBlock.data
+                    newBlock.block
                 ]);
                 const logsByTags = await store.getLogsByTags(tags);
                 expect(logsByTags).toEqual([
                     [
                         expect.objectContaining({
                             blockNumber: 1,
-                            logData: makePrivateLog(tags[0]).toBuffer(),
+                            log: makePrivateLog(tags[0]),
                             isFromPublic: false
                         }),
                         expect.objectContaining({
                             blockNumber: newBlockNumber,
-                            logData: newLog.toBuffer(),
+                            log: newLog,
                             isFromPublic: false
                         })
                     ]
@@ -501,46 +547,12 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                     [
                         expect.objectContaining({
                             blockNumber: 1,
-                            logData: makePrivateLog(tags[1]).toBuffer(),
+                            log: makePrivateLog(tags[1]),
                             isFromPublic: false
                         })
                     ]
                 ]);
             });
-            it('is not possible to add public logs by tag if they are invalid', async ()=>{
-                const tag = makeTag(99, 88, 77);
-                const invalidLogs = [
-                    PublicLog.fromFields([
-                        AztecAddress.fromNumber(1).toField(),
-                        makeLengthsField(2, 3),
-                        tag,
-                        ...times(PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 1, (i)=>new Fr(tag.toNumber() + i))
-                    ]),
-                    PublicLog.fromFields([
-                        AztecAddress.fromNumber(1).toField(),
-                        makeLengthsField(2, PUBLIC_LOG_DATA_SIZE_IN_FIELDS),
-                        tag,
-                        ...times(PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 1, (i)=>new Fr(tag.toNumber() + i))
-                    ])
-                ];
-                // Create a block containing these invalid logs
-                const newBlockNumber = numBlocks;
-                const newBlock = await mockBlockWithLogs(newBlockNumber);
-                newBlock.data.body.txEffects[0].publicLogs = invalidLogs;
-                await store.addBlocks([
-                    newBlock
-                ]);
-                await store.addLogs([
-                    newBlock.data
-                ]);
-                const logsByTags = await store.getLogsByTags([
-                    tag
-                ]);
-                // Neither of the logs should have been added:
-                expect(logsByTags).toEqual([
-                    []
-                ]);
-            });
         });
         describe('getPublicLogs', ()=>{
             const txsPerBlock = 4;
@@ -550,24 +562,25 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
             let blocks;
             beforeEach(async ()=>{
                 blocks = await timesParallel(numBlocks, async (index)=>({
-                        data: await L2Block.random(index + 1, txsPerBlock, numPublicFunctionCalls, numPublicLogs),
+                        block: await L2Block.random(index + 1, txsPerBlock, numPublicFunctionCalls, numPublicLogs),
                         l1: {
                             blockNumber: BigInt(index),
                             blockHash: `0x${index}`,
                             timestamp: BigInt(index)
-                        }
+                        },
+                        signatures: times(3, Signature.random)
                     }));
                 await store.addBlocks(blocks);
-                await store.addLogs(blocks.map((b)=>b.data));
+                await store.addLogs(blocks.map((b)=>b.block));
             });
             it('no logs returned if deleted ("txHash" filter param is respected variant)', async ()=>{
                 // get random tx
                 const targetBlockIndex = randomInt(numBlocks);
                 const targetTxIndex = randomInt(txsPerBlock);
-                const targetTxHash = blocks[targetBlockIndex].data.body.txEffects[targetTxIndex].txHash;
+                const targetTxHash = blocks[targetBlockIndex].block.body.txEffects[targetTxIndex].txHash;
                 await Promise.all([
                     store.unwindBlocks(blocks.length, blocks.length),
-                    store.deleteLogs(blocks.map((b)=>b.data))
+                    store.deleteLogs(blocks.map((b)=>b.block))
                 ]);
                 const response = await store.getPublicLogs({
                     txHash: targetTxHash
@@ -580,7 +593,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                 // get random tx
                 const targetBlockIndex = randomInt(numBlocks);
                 const targetTxIndex = randomInt(txsPerBlock);
-                const targetTxHash = blocks[targetBlockIndex].data.body.txEffects[targetTxIndex].txHash;
+                const targetTxHash = blocks[targetBlockIndex].block.body.txEffects[targetTxIndex].txHash;
                 const response = await store.getPublicLogs({
                     txHash: targetTxHash
                 });
@@ -617,7 +630,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                 const targetBlockIndex = randomInt(numBlocks);
                 const targetTxIndex = randomInt(txsPerBlock);
                 const targetLogIndex = randomInt(numPublicLogs * numPublicFunctionCalls);
-                const targetContractAddress = blocks[targetBlockIndex].data.body.txEffects[targetTxIndex].publicLogs[targetLogIndex].contractAddress;
+                const targetContractAddress = blocks[targetBlockIndex].block.body.txEffects[targetTxIndex].publicLogs[targetLogIndex].contractAddress;
                 const response = await store.getPublicLogs({
                     contractAddress: targetContractAddress
                 });
@@ -740,55 +753,5 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
                 }
             });
         });
-        describe('findNullifiersIndexesWithBlock', ()=>{
-            let blocks;
-            const numBlocks = 10;
-            const nullifiersPerBlock = new Map();
-            beforeEach(async ()=>{
-                blocks = await timesParallel(numBlocks, (index)=>L2Block.random(index + 1, 1));
-                blocks.forEach((block, blockIndex)=>{
-                    nullifiersPerBlock.set(blockIndex, block.body.txEffects.flatMap((txEffect)=>txEffect.nullifiers));
-                });
-            });
-            it('returns wrapped nullifiers with blocks if they exist', async ()=>{
-                await store.addNullifiers(blocks);
-                const nullifiersToRetrieve = [
-                    ...nullifiersPerBlock.get(0),
-                    ...nullifiersPerBlock.get(5),
-                    Fr.random()
-                ];
-                const blockScopedNullifiers = await store.findNullifiersIndexesWithBlock(10, nullifiersToRetrieve);
-                expect(blockScopedNullifiers).toHaveLength(nullifiersToRetrieve.length);
-                const [undefinedNullifier] = blockScopedNullifiers.slice(-1);
-                const realNullifiers = blockScopedNullifiers.slice(0, -1);
-                realNullifiers.forEach((blockScopedNullifier, index)=>{
-                    expect(blockScopedNullifier).not.toBeUndefined();
-                    const { data, l2BlockNumber } = blockScopedNullifier;
-                    expect(data).toEqual(expect.any(BigInt));
-                    expect(l2BlockNumber).toEqual(index < MAX_NULLIFIERS_PER_TX ? 1 : 6);
-                });
-                expect(undefinedNullifier).toBeUndefined();
-            });
-            it('returns wrapped nullifiers filtering by blockNumber', async ()=>{
-                await store.addNullifiers(blocks);
-                const nullifiersToRetrieve = [
-                    ...nullifiersPerBlock.get(0),
-                    ...nullifiersPerBlock.get(5)
-                ];
-                const blockScopedNullifiers = await store.findNullifiersIndexesWithBlock(5, nullifiersToRetrieve);
-                expect(blockScopedNullifiers).toHaveLength(nullifiersToRetrieve.length);
-                const undefinedNullifiers = blockScopedNullifiers.slice(-MAX_NULLIFIERS_PER_TX);
-                const realNullifiers = blockScopedNullifiers.slice(0, -MAX_NULLIFIERS_PER_TX);
-                realNullifiers.forEach((blockScopedNullifier)=>{
-                    expect(blockScopedNullifier).not.toBeUndefined();
-                    const { data, l2BlockNumber } = blockScopedNullifier;
-                    expect(data).toEqual(expect.any(BigInt));
-                    expect(l2BlockNumber).toEqual(1);
-                });
-                undefinedNullifiers.forEach((undefinedNullifier)=>{
-                    expect(undefinedNullifier).toBeUndefined();
-                });
-            });
-        });
     });
 }

package/dest/archiver/config.d.ts

@@ -26,6 +26,8 @@ export type ArchiverConfig = {
     l1Contracts: L1ContractAddresses;
     /** The max number of logs that can be obtained in 1 "getPublicLogs" call. */
     maxLogs?: number;
+    /** The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKB. */
+    archiverStoreMapSizeKb?: number;
 } & L1ReaderConfig & L1ContractsConfig & BlobSinkConfig & ChainConfig;
 export declare const archiverConfigMappings: ConfigMappingsType<ArchiverConfig>;
 /**

package/dest/archiver/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/archiver/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,yBAAyB,CAAC;AACrF,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAE7E;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,4GAA4G;IAC5G,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,qCAAqC;IACrC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,cAAc,GAChB,iBAAiB,GACjB,cAAc,GACd,WAAW,CAAC;AAEd,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAmCrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/archiver/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,yBAAyB,CAAC;AACrF,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAE7E;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,4GAA4G;IAC5G,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,qCAAqC;IACrC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qGAAqG;IACrG,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC,GAAG,cAAc,GAChB,iBAAiB,GACjB,cAAc,GACd,WAAW,CAAC;AAEd,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAwCrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}

package/dest/archiver/config.js

@@ -28,6 +28,11 @@ export const archiverConfigMappings = {
         description: 'The max number of logs that can be obtained in 1 "getPublicLogs" call.',
         ...numberConfigHelper(1_000)
     },
+    archiverStoreMapSizeKb: {
+        env: 'ARCHIVER_STORE_MAP_SIZE_KB',
+        parseEnv: (val)=>val ? +val : undefined,
+        description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKB.'
+    },
     ...chainConfigMappings,
     ...l1ReaderConfigMappings,
     viemPollingIntervalMS: {

package/dest/archiver/data_retrieval.d.ts

@@ -6,12 +6,11 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger } from '@aztec/foundation/log';
 import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
-import { L2Block } from '@aztec/stdlib/block';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
 import { Proof } from '@aztec/stdlib/proofs';
 import { type GetContractEventsReturnType, type GetContractReturnType, type Hex } from 'viem';
 import type { DataRetrieval } from './structs/data_retrieval.js';
-import type { L1Published } from './structs/published.js';
+import type { PublishedL2Block } from './structs/published.js';
 /**
  * Fetches new L2 blocks.
  * @param publicClient - The viem public client to use for transaction retrieval.
@@ -21,7 +20,7 @@ import type { L1Published } from './structs/published.js';
  * @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
  * @returns An array of block; as well as the next eth block to search from.
  */
-export declare function retrieveBlocksFromRollup(rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>, publicClient: ViemPublicClient, blobSinkClient: BlobSinkClientInterface, searchStartBlock: bigint, searchEndBlock: bigint, logger?: Logger): Promise<L1Published<L2Block>[]>;
+export declare function retrieveBlocksFromRollup(rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>, publicClient: ViemPublicClient, blobSinkClient: BlobSinkClientInterface, searchStartBlock: bigint, searchEndBlock: bigint, logger?: Logger): Promise<PublishedL2Block[]>;
 /**
  * Processes newly received L2BlockProposed logs.
  * @param rollup - The rollup contract
@@ -29,7 +28,7 @@ export declare function retrieveBlocksFromRollup(rollup: GetContractReturnType<t
  * @param logs - L2BlockProposed logs.
  * @returns - An array blocks.
  */
-export declare function processL2BlockProposedLogs(rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>, publicClient: ViemPublicClient, blobSinkClient: BlobSinkClientInterface, logs: GetContractEventsReturnType<typeof RollupAbi, 'L2BlockProposed'>, logger: Logger): Promise<L1Published<L2Block>[]>;
+export declare function processL2BlockProposedLogs(rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>, publicClient: ViemPublicClient, blobSinkClient: BlobSinkClientInterface, logs: GetContractEventsReturnType<typeof RollupAbi, 'L2BlockProposed'>, logger: Logger): Promise<PublishedL2Block[]>;
 export declare function getL1BlockTime(publicClient: ViemPublicClient, blockNumber: bigint): Promise<bigint>;
 /**
  * Fetch L1 to L2 messages.

package/dest/archiver/data_retrieval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}

package/dest/archiver/data_retrieval.js

@@ -1,5 +1,6 @@
 import { Blob, BlobDeserializationError } from '@aztec/blob-lib';
 import { asyncPool } from '@aztec/foundation/async-pool';
+import { Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { numToUInt32BE } from '@aztec/foundation/serialize';
@@ -65,7 +66,7 @@ import { NoBlobBodiesFoundError } from './errors.js';
                 timestamp: await getL1BlockTime(publicClient, log.blockNumber)
             };
             retrievedBlocks.push({
-                data: block,
+                ...block,
                 l1
             });
         } else {
@@ -144,7 +145,7 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     if (rollupFunctionName !== 'propose') {
         throw new Error(`Unexpected rollup method called ${rollupFunctionName}`);
     }
-    const [decodedArgs] = rollupArgs;
+    const [decodedArgs, signatures] = rollupArgs;
     const header = BlockHeader.fromBuffer(Buffer.from(hexToBytes(decodedArgs.header)));
     const blobBodies = await blobSinkClient.getBlobSidecar(blockHash, blobHashes);
     if (blobBodies.length === 0) {
@@ -171,7 +172,11 @@ export async function getL1BlockTime(publicClient, blockNumber) {
         Buffer.from(hexToBytes(decodedArgs.archive)),
         numToUInt32BE(Number(l2BlockNum + 1n))
     ]));
-    return new L2Block(archive, header, blockBody);
+    const block = new L2Block(archive, header, blockBody);
+    return {
+        block,
+        signatures: signatures.map(Signature.fromViemSignature)
+    };
 }
 /**
  * Fetch L1 to L2 messages.

package/dest/archiver/index.d.ts

@@ -1,7 +1,6 @@
 export * from './archiver.js';
 export * from './config.js';
-export { type L1Published, type L1PublishedData } from './structs/published.js';
-export { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
+export { type PublishedL2Block, type L1PublishedData } from './structs/published.js';
 export type { ArchiverDataStore } from './archiver_store.js';
 export { KVArchiverDataStore } from './kv_archiver_store/kv_archiver_store.js';
 export { ContractInstanceStore } from './kv_archiver_store/contract_instance_store.js';

package/dest/archiver/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/archiver/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/archiver/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACrF,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC"}

package/dest/archiver/index.js

@@ -1,5 +1,4 @@
 export * from './archiver.js';
 export * from './config.js';
-export { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
 export { KVArchiverDataStore } from './kv_archiver_store/kv_archiver_store.js';
 export { ContractInstanceStore } from './kv_archiver_store/contract_instance_store.js';

package/dest/archiver/kv_archiver_store/block_store.d.ts

@@ -1,9 +1,9 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type InBlock, L2Block } from '@aztec/stdlib/block';
+import { type InBlock } from '@aztec/stdlib/block';
 import { BlockHeader, TxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx';
-import type { L1Published } from '../structs/published.js';
-export { type TxEffect, type TxHash, TxReceipt } from '@aztec/stdlib/tx';
+import type { PublishedL2Block } from '../structs/published.js';
+export { TxReceipt, type TxEffect, type TxHash } from '@aztec/stdlib/tx';
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */
@@ -16,7 +16,7 @@ export declare class BlockStore {
      * @param blocks - The L2 blocks to be added to the store.
      * @returns True if the operation is successful.
      */
-    addBlocks(blocks: L1Published<L2Block>[]): Promise<boolean>;
+    addBlocks(blocks: PublishedL2Block[]): Promise<boolean>;
     /**
      * Unwinds blocks from the database
      * @param from -  The tip of the chain, passed for verification purposes,
@@ -31,13 +31,13 @@ export declare class BlockStore {
      * @param limit - The number of blocks to return.
      * @returns The requested L2 blocks
      */
-    getBlocks(start: number, limit: number): AsyncIterableIterator<L1Published<L2Block>>;
+    getBlocks(start: number, limit: number): AsyncIterableIterator<PublishedL2Block>;
     /**
      * Gets an L2 block.
      * @param blockNumber - The number of the block to return.
      * @returns The requested L2 block.
      */
-    getBlock(blockNumber: number): Promise<L1Published<L2Block> | undefined>;
+    getBlock(blockNumber: number): Promise<PublishedL2Block | undefined>;
     /**
      * Gets the headers for a sequence of L2 blocks.
      * @param start - Number of the first block to return (inclusive).