@aztec/archiver 3.0.0-nightly.20251202 → 3.0.0-nightly.20251204

package/dest/archiver/archiver_store_test_suite.js

@@ -1,6 +1,6 @@
 import { INITIAL_L2_BLOCK_NUM, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
-import { EpochNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { times, timesParallel } from '@aztec/foundation/collection';
 import { randomInt } from '@aztec/foundation/crypto';
@@ -74,7 +74,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
         };
         beforeEach(async ()=>{
             store = await getStore();
-            blocks = await timesParallel(10, async (i)=>makePublished(await L2Block.random(i + 1), i + 10));
+            blocks = await timesParallel(10, async (i)=>makePublished(await L2Block.random(BlockNumber(i + 1)), i + 10));
         });
         describe('addBlocks', ()=>{
             it('returns success when adding blocks', async ()=>{
@@ -85,19 +85,19 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 await expect(store.addBlocks(blocks)).resolves.toBe(true);
             });
             it('throws an error if the previous block does not exist in the store', async ()=>{
-                const block = makePublished(await L2Block.random(2), 2);
+                const block = makePublished(await L2Block.random(BlockNumber(2)), 2);
                 await expect(store.addBlocks([
                     block
                 ])).rejects.toThrow(InitialBlockNumberNotSequentialError);
-                await expect(store.getPublishedBlocks(1, 10)).resolves.toEqual([]);
+                await expect(store.getPublishedBlocks(BlockNumber(1), 10)).resolves.toEqual([]);
             });
             it('throws an error if there is a gap in the blocks being added', async ()=>{
                 const blocks = [
-                    makePublished(await L2Block.random(1), 1),
-                    makePublished(await L2Block.random(3), 3)
+                    makePublished(await L2Block.random(BlockNumber(1)), 1),
+                    makePublished(await L2Block.random(BlockNumber(3)), 3)
                 ];
                 await expect(store.addBlocks(blocks)).rejects.toThrow(BlockNumberNotSequentialError);
-                await expect(store.getPublishedBlocks(1, 10)).resolves.toEqual([]);
+                await expect(store.getPublishedBlocks(BlockNumber(1), 10)).resolves.toEqual([]);
             });
         });
         describe('unwindBlocks', ()=>{
@@ -112,12 +112,12 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 expect(await store.getPublishedBlocks(blockNumber, 1)).toEqual([]);
             });
             it('can unwind multiple empty blocks', async ()=>{
-                const emptyBlocks = await timesParallel(10, async (i)=>makePublished(await L2Block.random(i + 1, 0), i + 10));
+                const emptyBlocks = await timesParallel(10, async (i)=>makePublished(await L2Block.random(BlockNumber(i + 1), 0), i + 10));
                 await store.addBlocks(emptyBlocks);
                 expect(await store.getSynchedL2BlockNumber()).toBe(10);
-                await store.unwindBlocks(10, 3);
+                await store.unwindBlocks(BlockNumber(10), 3);
                 expect(await store.getSynchedL2BlockNumber()).toBe(7);
-                expect((await store.getPublishedBlocks(1, 10)).map((b)=>b.block.number)).toEqual([
+                expect((await store.getPublishedBlocks(BlockNumber(1), 10)).map((b)=>b.block.number)).toEqual([
                     1,
                     2,
                     3,
@@ -129,7 +129,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
             });
             it('refuses to unwind blocks if the tip is not the last block', async ()=>{
                 await store.addBlocks(blocks);
-                await expect(store.unwindBlocks(5, 1)).rejects.toThrow(/can only unwind blocks from the tip/i);
+                await expect(store.unwindBlocks(BlockNumber(5), 1)).rejects.toThrow(/can only unwind blocks from the tip/i);
             });
             it('unwound blocks and headers cannot be retrieved by hash or archive', async ()=>{
                 await store.addBlocks(blocks);
@@ -155,33 +155,33 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 await store.addBlocks(blocks);
             });
             it.each(blockTests)('retrieves previously stored blocks', async (start, limit, getExpectedBlocks)=>{
-                expectBlocksEqual(await store.getPublishedBlocks(start, limit), getExpectedBlocks());
+                expectBlocksEqual(await store.getPublishedBlocks(BlockNumber(start), limit), getExpectedBlocks());
             });
             it('returns an empty array if no blocks are found', async ()=>{
-                await expect(store.getPublishedBlocks(12, 1)).resolves.toEqual([]);
+                await expect(store.getPublishedBlocks(BlockNumber(12), 1)).resolves.toEqual([]);
             });
             it('throws an error if limit is invalid', async ()=>{
-                await expect(store.getPublishedBlocks(1, 0)).rejects.toThrow('Invalid limit: 0');
+                await expect(store.getPublishedBlocks(BlockNumber(1), 0)).rejects.toThrow('Invalid limit: 0');
             });
             it('throws an error if `from` it is out of range', async ()=>{
                 await expect(store.getPublishedBlocks(INITIAL_L2_BLOCK_NUM - 100, 1)).rejects.toThrow('Invalid start: -99');
             });
             it('throws an error if unexpected initial block number is found', async ()=>{
                 await store.addBlocks([
-                    makePublished(await L2Block.random(21), 31)
+                    makePublished(await L2Block.random(BlockNumber(21)), 31)
                 ], {
                     force: true
                 });
-                await expect(store.getPublishedBlocks(20, 1)).rejects.toThrow(`mismatch`);
+                await expect(store.getPublishedBlocks(BlockNumber(20), 1)).rejects.toThrow(`mismatch`);
             });
             it('throws an error if a gap is found', async ()=>{
                 await store.addBlocks([
-                    makePublished(await L2Block.random(20), 30),
-                    makePublished(await L2Block.random(22), 32)
+                    makePublished(await L2Block.random(BlockNumber(20)), 30),
+                    makePublished(await L2Block.random(BlockNumber(22)), 32)
                 ], {
                     force: true
                 });
-                await expect(store.getPublishedBlocks(20, 2)).rejects.toThrow(`mismatch`);
+                await expect(store.getPublishedBlocks(BlockNumber(20), 2)).rejects.toThrow(`mismatch`);
             });
         });
         describe('getPublishedBlockByHash', ()=>{
@@ -340,17 +340,17 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 await expect(store.addLogs([
                     block
                 ])).resolves.toEqual(true);
-                expect((await store.getPrivateLogs(1, 1)).length).toEqual(block.body.txEffects.map((txEffect)=>txEffect.privateLogs).flat().length);
+                expect((await store.getPrivateLogs(BlockNumber(1), 1)).length).toEqual(block.body.txEffects.map((txEffect)=>txEffect.privateLogs).flat().length);
                 expect((await store.getPublicLogs({
-                    fromBlock: 1
+                    fromBlock: BlockNumber(1)
                 })).logs.length).toEqual(block.body.txEffects.map((txEffect)=>txEffect.publicLogs).flat().length);
                 // This one is a pain for memory as we would never want to just delete memory in the middle.
                 await store.deleteLogs([
                     block
                 ]);
-                expect((await store.getPrivateLogs(1, 1)).length).toEqual(0);
+                expect((await store.getPrivateLogs(BlockNumber(1), 1)).length).toEqual(0);
                 expect((await store.getPublicLogs({
-                    fromBlock: 1
+                    fromBlock: BlockNumber(1)
                 })).logs.length).toEqual(0);
             });
         });
@@ -363,7 +363,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 await store.addLogs([
                     block
                 ]);
-                const privateLogs = await store.getPrivateLogs(1, 1);
+                const privateLogs = await store.getPrivateLogs(BlockNumber(1), 1);
                 expect(privateLogs).toEqual(block.body.txEffects.map((txEffect)=>txEffect.privateLogs).flat());
             });
         });
@@ -419,7 +419,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 ()=>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);
+                await store.unwindBlocks(BlockNumber(blocks.length), blocks.length);
                 const expectedTx = await getExpectedTx();
                 const actualTx = await store.getTxEffect(expectedTx.data.txHash);
                 expect(actualTx).toEqual(undefined);
@@ -436,7 +436,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                         await sleep(1);
                     }
                 })();
-                await store.unwindBlocks(blocks.length, blocks.length);
+                await store.unwindBlocks(BlockNumber(blocks.length), blocks.length);
                 done = true;
                 expect(await store.getTxEffect(expectedTx.data.txHash)).toEqual(undefined);
             });
@@ -450,7 +450,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
             };
             const makeInboxMessagesWithFullBlocks = (blockCount, opts = {})=>makeInboxMessages(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * blockCount, {
                     overrideFn: (msg, i)=>{
-                        const l2BlockNumber = (opts.initialL2BlockNumber ?? initialL2BlockNumber) + Math.floor(i / NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+                        const l2BlockNumber = BlockNumber((opts.initialL2BlockNumber ?? initialL2BlockNumber) + Math.floor(i / NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
                         const index = InboxLeaf.smallestIndexFromL2Block(l2BlockNumber) + BigInt(i % NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
                         return {
                             ...msg,
@@ -462,7 +462,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
             it('stores first message ever', async ()=>{
                 const msg = makeInboxMessage(Buffer16.ZERO, {
                     index: 0n,
-                    l2BlockNumber: 1
+                    l2BlockNumber: BlockNumber(1)
                 });
                 await store.addL1ToL2Messages([
                     msg
@@ -470,13 +470,13 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 await checkMessages([
                     msg
                 ]);
-                expect(await store.getL1ToL2Messages(1)).toEqual([
+                expect(await store.getL1ToL2Messages(BlockNumber(1))).toEqual([
                     msg.leaf
                 ]);
             });
             it('stores single message', async ()=>{
                 const msg = makeInboxMessage(Buffer16.ZERO, {
-                    l2BlockNumber: 2
+                    l2BlockNumber: BlockNumber(2)
                 });
                 await store.addL1ToL2Messages([
                     msg
@@ -484,7 +484,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 await checkMessages([
                     msg
                 ]);
-                expect(await store.getL1ToL2Messages(2)).toEqual([
+                expect(await store.getL1ToL2Messages(BlockNumber(2))).toEqual([
                     msg.leaf
                 ]);
             });
@@ -494,7 +494,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 });
                 await store.addL1ToL2Messages(msgs);
                 await checkMessages(msgs);
-                expect(await store.getL1ToL2Messages(initialL2BlockNumber + 2)).toEqual([
+                expect(await store.getL1ToL2Messages(BlockNumber(initialL2BlockNumber + 2))).toEqual([
                     msgs[2]
                 ].map((m)=>m.leaf));
             });
@@ -520,14 +520,14 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                     ...msgs1,
                     ...msgs2
                 ]);
-                expect(await store.getL1ToL2Messages(1)).toEqual([
+                expect(await store.getL1ToL2Messages(BlockNumber(1))).toEqual([
                     msgs1[0].leaf
                 ]);
-                expect(await store.getL1ToL2Messages(4)).toEqual([]);
-                expect(await store.getL1ToL2Messages(20)).toEqual([
+                expect(await store.getL1ToL2Messages(BlockNumber(4))).toEqual([]);
+                expect(await store.getL1ToL2Messages(BlockNumber(20))).toEqual([
                     msgs2[0].leaf
                 ]);
-                expect(await store.getL1ToL2Messages(24)).toEqual([]);
+                expect(await store.getL1ToL2Messages(BlockNumber(24))).toEqual([]);
             });
             it('stores and returns messages with block numbers larger than a byte', async ()=>{
                 const msgs = makeInboxMessages(5, {
@@ -535,7 +535,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 });
                 await store.addL1ToL2Messages(msgs);
                 await checkMessages(msgs);
-                expect(await store.getL1ToL2Messages(1002)).toEqual([
+                expect(await store.getL1ToL2Messages(BlockNumber(1002))).toEqual([
                     msgs[2]
                 ].map((m)=>m.leaf));
             });
@@ -543,7 +543,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 const msgs = makeInboxMessagesWithFullBlocks(4);
                 await store.addL1ToL2Messages(msgs);
                 await checkMessages(msgs);
-                const blockMessages = await store.getL1ToL2Messages(initialL2BlockNumber + 1);
+                const blockMessages = await store.getL1ToL2Messages(BlockNumber(initialL2BlockNumber + 1));
                 expect(blockMessages).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
                 expect(blockMessages).toEqual(msgs.slice(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2).map((m)=>m.leaf));
             });
@@ -553,10 +553,10 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 });
                 await store.addL1ToL2Messages(msgs.slice(0, 10));
                 await store.addL1ToL2Messages(msgs.slice(10, 20));
-                expect(await store.getL1ToL2Messages(initialL2BlockNumber + 2)).toEqual([
+                expect(await store.getL1ToL2Messages(BlockNumber(initialL2BlockNumber + 2))).toEqual([
                     msgs[2]
                 ].map((m)=>m.leaf));
-                expect(await store.getL1ToL2Messages(initialL2BlockNumber + 12)).toEqual([
+                expect(await store.getL1ToL2Messages(BlockNumber(initialL2BlockNumber + 12))).toEqual([
                     msgs[12]
                 ].map((m)=>m.leaf));
                 await checkMessages(msgs);
@@ -595,7 +595,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 const msgs = makeInboxMessages(4, {
                     initialL2BlockNumber
                 });
-                msgs[2].l2BlockNumber = initialL2BlockNumber - 1;
+                msgs[2].l2BlockNumber = BlockNumber(initialL2BlockNumber - 1);
                 await store.addL1ToL2Messages(msgs.slice(0, 2));
                 await expect(store.addL1ToL2Messages(msgs.slice(2, 4))).rejects.toThrow(MessageStoreError);
             });
@@ -607,7 +607,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
             it('throws if rolling hash for first message is not correct', async ()=>{
                 const msgs = makeInboxMessages(4);
                 msgs[2].rollingHash = Buffer16.random();
-                await store.addL1ToL2Messages(msgs.slice(0, 2));
+                await store.addL1ToL2Messages(msgs.slice(0, BlockNumber(2)));
                 await expect(store.addL1ToL2Messages(msgs.slice(2, 4))).rejects.toThrow(MessageStoreError);
             });
             it('throws if index is not in the correct range', async ()=>{
@@ -629,7 +629,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                     initialL2BlockNumber,
                     overrideFn: (msg, i)=>({
                             ...msg,
-                            l2BlockNumber: 2,
+                            l2BlockNumber: BlockNumber(2),
                             index: BigInt(i + NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2)
                         })
                 });
@@ -642,15 +642,15 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 });
                 await store.addL1ToL2Messages(msgs);
                 await checkMessages(msgs);
-                expect(await store.getL1ToL2Messages(1)).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-                expect(await store.getL1ToL2Messages(2)).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-                expect(await store.getL1ToL2Messages(3)).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-                expect(await store.getL1ToL2Messages(4)).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-                await store.rollbackL1ToL2MessagesToL2Block(2);
-                expect(await store.getL1ToL2Messages(1)).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-                expect(await store.getL1ToL2Messages(2)).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-                expect(await store.getL1ToL2Messages(3)).toHaveLength(0);
-                expect(await store.getL1ToL2Messages(4)).toHaveLength(0);
+                expect(await store.getL1ToL2Messages(BlockNumber(1))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+                expect(await store.getL1ToL2Messages(BlockNumber(2))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+                expect(await store.getL1ToL2Messages(BlockNumber(3))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+                expect(await store.getL1ToL2Messages(BlockNumber(4))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+                await store.rollbackL1ToL2MessagesToL2Block(BlockNumber(2));
+                expect(await store.getL1ToL2Messages(BlockNumber(1))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+                expect(await store.getL1ToL2Messages(BlockNumber(2))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+                expect(await store.getL1ToL2Messages(BlockNumber(3))).toHaveLength(0);
+                expect(await store.getL1ToL2Messages(BlockNumber(4))).toHaveLength(0);
                 await checkMessages(msgs.slice(0, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2));
             });
             it('removes messages starting with the given index', async ()=>{
@@ -678,7 +678,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 };
                 await store.addContractInstances([
                     contractInstance
-                ], blockNum);
+                ], BlockNumber(blockNum));
             });
             it('returns previously stored contract instances', async ()=>{
                 await expect(store.getContractInstance(contractInstance.address, timestamp)).resolves.toMatchObject(contractInstance);
@@ -689,7 +689,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
             it('returns undefined if previously stored contract instances was deleted', async ()=>{
                 await store.deleteContractInstances([
                     contractInstance
-                ], blockNum);
+                ], BlockNumber(blockNum));
                 await expect(store.getContractInstance(contractInstance.address, timestamp)).resolves.toBeUndefined();
             });
         });
@@ -711,7 +711,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 };
                 await store.addContractInstances([
                     contractInstance
-                ], 1);
+                ], BlockNumber(1));
                 await store.addContractInstanceUpdates([
                     {
                         prevContractClassId: classId,
@@ -748,7 +748,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 };
                 await store.addContractInstances([
                     otherContractInstance
-                ], 1);
+                ], BlockNumber(1));
                 const fetchedInstance = await store.getContractInstance(otherContractInstance.address, timestampOfChange + 1n);
                 expect(fetchedInstance?.originalContractClassId).toEqual(otherClassId);
                 expect(fetchedInstance?.currentContractClassId).toEqual(otherClassId);
@@ -766,7 +766,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 };
                 await store.addContractInstances([
                     otherContractInstance
-                ], 1);
+                ], BlockNumber(1));
                 await store.addContractInstanceUpdates([
                     {
                         prevContractClassId: otherClassId,
@@ -789,7 +789,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                     contractClass
                 ], [
                     await computePublicBytecodeCommitment(contractClass.packedBytecode)
-                ], blockNum);
+                ], BlockNumber(blockNum));
             });
             it('returns previously stored contract class', async ()=>{
                 await expect(store.getContractClass(contractClass.id)).resolves.toMatchObject(contractClass);
@@ -797,7 +797,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
             it('returns undefined if the initial deployed contract class was deleted', async ()=>{
                 await store.deleteContractClasses([
                     contractClass
-                ], blockNum);
+                ], BlockNumber(blockNum));
                 await expect(store.getContractClass(contractClass.id)).resolves.toBeUndefined();
             });
             it('returns contract class if later "deployment" class was deleted', async ()=>{
@@ -805,10 +805,10 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                     contractClass
                 ], [
                     await computePublicBytecodeCommitment(contractClass.packedBytecode)
-                ], blockNum + 1);
+                ], BlockNumber(blockNum + 1));
                 await store.deleteContractClasses([
                     contractClass
-                ], blockNum + 1);
+                ], BlockNumber(blockNum + 1));
                 await expect(store.getContractClass(contractClass.id)).resolves.toMatchObject(contractClass);
             });
             it('returns undefined if contract class is not found', async ()=>{
@@ -871,8 +871,8 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 });
             };
             const mockBlockWithLogs = async (blockNumber)=>{
-                const block = await L2Block.random(blockNumber);
-                block.header.globalVariables.blockNumber = blockNumber;
+                const block = await L2Block.random(BlockNumber(blockNumber));
+                block.header.globalVariables.blockNumber = BlockNumber(blockNumber);
                 block.body.txEffects = await timesParallel(numTxsPerBlock, async (txIndex)=>{
                     const txEffect = await TxEffect.random();
                     txEffect.privateLogs = mockPrivateLogs(blockNumber, txIndex);
@@ -996,7 +996,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
             let blocks;
             beforeEach(async ()=>{
                 blocks = await timesParallel(numBlocks, async (index)=>PublishedL2Block.fromFields({
-                        block: await L2Block.random(index + 1, txsPerBlock, numPublicFunctionCalls, numPublicLogs),
+                        block: await L2Block.random(BlockNumber(index + 1), txsPerBlock, numPublicFunctionCalls, numPublicLogs),
                         l1: {
                             blockNumber: BigInt(index),
                             blockHash: makeBlockHash(index),
@@ -1013,7 +1013,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 const targetTxIndex = randomInt(txsPerBlock);
                 const targetTxHash = blocks[targetBlockIndex].block.body.txEffects[targetTxIndex].txHash;
                 await Promise.all([
-                    store.unwindBlocks(blocks.length, blocks.length),
+                    store.unwindBlocks(BlockNumber(blocks.length), blocks.length),
                     store.deleteLogs(blocks.map((b)=>b.block))
                 ]);
                 const response = await store.getPublicLogs({
@@ -1078,7 +1078,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 const targetBlockIndex = randomInt(numBlocks);
                 const targetTxIndex = randomInt(txsPerBlock);
                 const targetLogIndex = randomInt(numPublicLogs);
-                const afterLog = new LogId(targetBlockIndex + INITIAL_L2_BLOCK_NUM, targetTxIndex, targetLogIndex);
+                const afterLog = new LogId(BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM), targetTxIndex, targetLogIndex);
                 const response = await store.getPublicLogs({
                     afterLog
                 });
@@ -1098,7 +1098,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
             it('"txHash" filter param is ignored when "afterLog" is set', async ()=>{
                 // Get random txHash
                 const txHash = TxHash.random();
-                const afterLog = new LogId(1, 0, 0);
+                const afterLog = new LogId(BlockNumber(1), 0, 0);
                 const response = await store.getPublicLogs({
                     txHash,
                     afterLog
@@ -1114,7 +1114,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 // "fromBlock" gets correctly trimmed to range and "toBlock" is exclusive
                 logs = (await store.getPublicLogs({
                     fromBlock: -10,
-                    toBlock: 5
+                    toBlock: BlockNumber(5)
                 })).logs;
                 let blockNumbers = new Set(logs.map((log)=>log.id.blockNumber));
                 expect(blockNumbers).toEqual(new Set([
@@ -1125,13 +1125,13 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 ]));
                 // "toBlock" should be exclusive
                 logs = (await store.getPublicLogs({
-                    fromBlock: 1,
-                    toBlock: 1
+                    fromBlock: BlockNumber(1),
+                    toBlock: BlockNumber(1)
                 })).logs;
                 expect(logs.length).toBe(0);
                 logs = (await store.getPublicLogs({
-                    fromBlock: 10,
-                    toBlock: 5
+                    fromBlock: BlockNumber(10),
+                    toBlock: BlockNumber(5)
                 })).logs;
                 expect(logs.length).toBe(0);
                 // both "fromBlock" and "toBlock" get correctly capped to range and logs from all blocks are returned
@@ -1143,23 +1143,23 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 expect(blockNumbers.size).toBe(numBlocks);
                 // intersecting with "afterLog" works
                 logs = (await store.getPublicLogs({
-                    fromBlock: 2,
-                    toBlock: 5,
-                    afterLog: new LogId(4, 0, 0)
+                    fromBlock: BlockNumber(2),
+                    toBlock: BlockNumber(5),
+                    afterLog: new LogId(BlockNumber(4), 0, 0)
                 })).logs;
                 blockNumbers = new Set(logs.map((log)=>log.id.blockNumber));
                 expect(blockNumbers).toEqual(new Set([
                     4
                 ]));
                 logs = (await store.getPublicLogs({
-                    toBlock: 5,
-                    afterLog: new LogId(5, 1, 0)
+                    toBlock: BlockNumber(5),
+                    afterLog: new LogId(BlockNumber(5), 1, 0)
                 })).logs;
                 expect(logs.length).toBe(0);
                 logs = (await store.getPublicLogs({
-                    fromBlock: 2,
-                    toBlock: 5,
-                    afterLog: new LogId(100, 0, 0)
+                    fromBlock: BlockNumber(2),
+                    toBlock: BlockNumber(5),
+                    afterLog: new LogId(BlockNumber(100), 0, 0)
                 })).logs;
                 expect(logs.length).toBe(0);
             });
@@ -1168,7 +1168,7 @@ import { MessageStoreError } from './kv_archiver_store/message_store.js';
                 const targetBlockIndex = randomInt(numBlocks);
                 const targetTxIndex = randomInt(txsPerBlock);
                 const targetLogIndex = randomInt(numPublicLogs);
-                const afterLog = new LogId(targetBlockIndex + INITIAL_L2_BLOCK_NUM, targetTxIndex, targetLogIndex);
+                const afterLog = new LogId(BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM), targetTxIndex, targetLogIndex);
                 const response = await store.getPublicLogs({
                     afterLog,
                     fromBlock: afterLog.blockNumber

package/dest/archiver/data_retrieval.d.ts

@@ -77,4 +77,4 @@ export type SubmitEpochProof = {
  * @returns Epoch proof metadata from the calldata, deserialized.
  */
 export declare function getProofFromSubmitProofTx(publicClient: ViemPublicClient, txHash: `0x${string}`, expectedProverId: Fr): Promise<SubmitEpochProof>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcmNoaXZlci9kYXRhX3JldHJpZXZhbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBRUwsS0FBSyxrQkFBa0IsRUFJeEIsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZFLE9BQU8sS0FBSyxFQUVWLFVBQVUsRUFHVixnQkFBZ0IsRUFDakIsTUFBTSxpQkFBaUIsQ0FBQztBQUV6QixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVuRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxLQUFLLFFBQVEsRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUMvRCxPQUFPLEVBQVEsb0JBQW9CLEVBQWMsTUFBTSxxQkFBcUIsQ0FBQztBQUM3RSxPQUFPLEVBQWMsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDN0MsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFJeEQsT0FBTyxFQUVMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssR0FBRyxFQUtULE1BQU0sTUFBTSxDQUFDO0FBR2QsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsZUFBZSxF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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcmNoaXZlci9kYXRhX3JldHJpZXZhbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBRUwsS0FBSyxrQkFBa0IsRUFJeEIsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZFLE9BQU8sS0FBSyxFQUVWLFVBQVUsRUFHVixnQkFBZ0IsRUFDakIsTUFBTSxpQkFBaUIsQ0FBQztBQUV6QixPQUFPLEVBQWUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVoRixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxLQUFLLFFBQVEsRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUMvRCxPQUFPLEVBQVEsb0JBQW9CLEVBQWMsTUFBTSxxQkFBcUIsQ0FBQztBQUM3RSxPQUFPLEVBQWMsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDN0MsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFJeEQsT0FBTyxFQUVMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssR0FBRyxFQUtULE1BQU0sTUFBTSxDQUFDO0FBR2QsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsZUFBZSxF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

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":"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,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,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,EAAc,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAc,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,GAAG,EAKT,MAAM,MAAM,CAAC;AAGd,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,MAAM,mBAAmB,GAAG;IAChC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,WAAW,EAAE,EAAE,CAAC;IAChB,MAAM,EAAE,gBAAgB,CAAC;IACzB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,EAAE,EAAE,eAAe,CAAC;IACpB,OAAO,EAAE,EAAE,CAAC;IACZ,OAAO,EAAE,EAAE,CAAC;IACZ,YAAY,EAAE,oBAAoB,EAAE,CAAC;CACtC,CAAC;AAEF,wBAAsB,8BAA8B,CAAC,EACnD,gBAAgB,EAChB,WAAW,EACX,MAAM,EAAE,gBAAgB,EACxB,kBAAkB,EAClB,EAAE,EACF,OAAO,EACP,OAAO,EACP,YAAY,EACb,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA4EpD;AAED;;;;;;;;GAQG;AACH,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,qBAAqB,CAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,EACjE,YAAY,EAAE,gBAAgB,EAC9B,cAAc,EAAE,uBAAuB,EACvC,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,EACtB,MAAM,GAAE,MAAiC,GACxC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAuDhC;AA6DD,wBAAsB,cAAc,CAAC,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGzG;AA8ID,iHAAiH;AACjH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,qBAAqB,CAAC,OAAO,QAAQ,EAAE,UAAU,CAAC,EACzD,IAAI,EAAE,EAAE,EACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAKnC;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,qBAAqB,CAAC,OAAO,QAAQ,EAAE,UAAU,CAAC,EACzD,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,YAAY,EAAE,CAAC,CAgBzB;AAgBD,iEAAiE;AACjE,wBAAsB,6BAA6B,CACjD,YAAY,EAAE,gBAAgB,EAC9B,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,MAAM,EACxB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAAC,QAAQ,EAAE,EAAE,CAAC;IAAC,MAAM,EAAE,GAAG,CAAA;CAAE,EAAE,CAAC,CAerG;AAED,yDAAyD;AACzD,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,gBAAgB,EAC9B,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,MAAM,EACxB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,aAAa,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,EAAE,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,KAAK,MAAM,EAAE,CAAA;CAAE,CAAC,CAAC,CAazG;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,EAAE,CAAC;IAChB,QAAQ,EAAE,EAAE,CAAC;IACb,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,gBAAgB,EAC9B,MAAM,EAAE,KAAK,MAAM,EAAE,EACrB,gBAAgB,EAAE,EAAE,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAmC3B"}
+{"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,6 +1,6 @@
 import { BlobDeserializationError, SpongeBlob, decodeCheckpointBlobDataFromBlobs, encodeBlockBlobData } from '@aztec/blob-lib';
 import { asyncPool } from '@aztec/foundation/async-pool';
-import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
@@ -308,7 +308,7 @@ function mapLogsInboxMessage(logs) {
             leaf: Fr.fromHexString(hash),
             l1BlockNumber: log.blockNumber,
             l1BlockHash: Buffer32.fromString(log.blockHash),
-            l2BlockNumber: Number(checkpointNumber),
+            l2BlockNumber: BlockNumber(Number(checkpointNumber)),
             rollingHash: Buffer16.fromString(rollingHash)
         };
     });

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

@@ -1,3 +1,4 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/fields';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -26,20 +27,20 @@ export declare class BlockStore {
      * @param blocksToUnwind - The number of blocks we are to unwind
      * @returns True if the operation is successful
      */
-    unwindBlocks(from: number, blocksToUnwind: number): Promise<boolean>;
+    unwindBlocks(from: BlockNumber, blocksToUnwind: number): Promise<boolean>;
     /**
      * Gets up to `limit` amount of L2 blocks starting from `from`.
      * @param start - Number of the first block to return (inclusive).
      * @param limit - The number of blocks to return.
      * @returns The requested L2 blocks
      */
-    getBlocks(start: number, limit: number): AsyncIterableIterator<PublishedL2Block>;
+    getBlocks(start: BlockNumber, 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<PublishedL2Block | undefined>;
+    getBlock(blockNumber: BlockNumber): Promise<PublishedL2Block | undefined>;
     /**
      * Gets an L2 block by its hash.
      * @param blockHash - The hash of the block to return.
@@ -70,7 +71,7 @@ export declare class BlockStore {
      * @param limit - The number of blocks to return.
      * @returns The requested L2 block headers
      */
-    getBlockHeaders(start: number, limit: number): AsyncIterableIterator<BlockHeader>;
+    getBlockHeaders(start: BlockNumber, limit: number): AsyncIterableIterator<BlockHeader>;
     private getBlockStorages;
     private getBlockFromBlockStorage;
     /**
@@ -101,15 +102,15 @@ export declare class BlockStore {
      * Gets the number of the latest L2 block processed.
      * @returns The number of the latest L2 block processed.
      */
-    getSynchedL2BlockNumber(): Promise<number>;
+    getSynchedL2BlockNumber(): Promise<BlockNumber>;
     /**
      * Gets the most recent L1 block processed.
      * @returns The L1 block that published the latest L2 block
      */
     getSynchedL1BlockNumber(): Promise<bigint | undefined>;
     setSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<boolean>;
-    getProvenL2BlockNumber(): Promise<number>;
-    setProvenL2BlockNumber(blockNumber: number): Promise<boolean>;
+    getProvenL2BlockNumber(): Promise<BlockNumber>;
+    setProvenL2BlockNumber(blockNumber: BlockNumber): Promise<boolean>;
     /**
      * Gets the pending chain validation status.
      * @returns The validation status or undefined if not set.
@@ -121,4 +122,4 @@ export declare class BlockStore {
      */
     setPendingChainValidationStatus(status: ValidateBlockResult | undefined): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9ibG9ja19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFLOUMsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQTZDLE1BQU0saUJBQWlCLENBQUM7QUFDcEcsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUlMLFdBQVcsRUFDWCxnQkFBZ0IsRUFDaEIsS0FBSyxtQkFBbUIsRUFDekIsTUFBTSxxQkFBcUIsQ0FBQztBQUc3QixPQUFPLEVBQ0wsV0FBVyxFQUNYLEtBQUssZUFBZSxFQUVwQixNQUFNLEVBQ04sU0FBUyxFQUdWLE1BQU0sa0JBQWtCLENBQUM7QUFLMUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBWXpFOztHQUVHO0FBQ0gscUJBQWEsVUFBVTs7SUE4QlQsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQVV4QztJQUVEOzs7O09BSUc7SUFDRyxTQUFTLENBQUMsTUFBTSxFQUFFLGdCQUFnQixFQUFFLEVBQUUsSUFBSSxHQUFFO1FBQUUsS0FBSyxDQUFDLEVBQUUsT0FBTyxDQUFBO0tBQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBMEQ1RjtJQUVEOzs7Ozs7T0FNRztJQUNHLFlBQVksQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQWtDdEQ7SUFFRDs7Ozs7T0FLRztJQUNJLFNBQVMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcscUJBQXFCLENBQUMsZ0JBQWdCLENBQUMsQ0FPdEY7SUFFRDs7OztPQUlHO0lBQ0csUUFBUSxDQUFDLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQU16RTtJQUVEOzs7O09BSUc7SUFDRyxjQUFjLENBQUMsU0FBUyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBTWxGO0lBRUQ7Ozs7T0FJRztJQUNHLGlCQUFpQixDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQU0xRTtJQUVEOzs7O09BSUc7SUFDRyxvQkFBb0IsQ0FBQyxTQUFTLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxXQUFXLEdBQUcsU0FBUyxDQUFDLENBVW5GO0lBRUQ7Ozs7T0FJRztJQUNHLHVCQUF1QixDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFdBQVcsR0FBRyxTQUFTLENBQUMsQ0FVM0U7SUFFRDs7Ozs7T0FLRztJQUNJLGVBQWUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcscUJBQXFCLENBQUMsV0FBVyxDQUFDLENBVXZGO1lBRWMsZ0JBQWdCO1lBYWpCLHdCQUF3QjtJQXVDdEM7Ozs7T0FJRztJQUNHLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxlQUFlLEdBQUcsU0FBUyxDQUFDLENBTXRFO0lBRUQ7Ozs7T0FJRztJQUNHLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FjeEU7SUFFRDs7OztPQUlHO0lBQ1UsYUFBYSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxDQUFDLEdBQUcsU0FBUyxDQUFDLENBT3RHO0lBRUQ7Ozs7T0FJRztJQUNILG1CQUFtQixDQUFDLGVBQWUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFDLEdBQUcsU0FBUyxDQUFDLENBRTVHO0lBRUQ7OztPQUdHO0lBQ0csdUJBQXVCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUcvQztJQUVEOzs7T0FHRztJQUNILHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRXJEO0lBRUQsdUJBQXVCLENBQUMsYUFBYSxFQUFFLE1BQU0sb0JBRTVDO0lBRUssc0JBQXNCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQU05QztJQUVELHNCQUFzQixDQUFDLFdBQVcsRUFBRSxNQUFNLG9CQUV6QztJQWNEOzs7T0FHRztJQUNHLCtCQUErQixJQUFJLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FNaEY7SUFFRDs7O09BR0c7SUFDRywrQkFBK0IsQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPNUY7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9ibG9ja19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBSzlDLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUE2QyxNQUFNLGlCQUFpQixDQUFDO0FBQ3BHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFJTCxXQUFXLEVBQ1gsZ0JBQWdCLEVBQ2hCLEtBQUssbUJBQW1CLEVBQ3pCLE1BQU0scUJBQXFCLENBQUM7QUFHN0IsT0FBTyxFQUNMLFdBQVcsRUFDWCxLQUFLLGVBQWUsRUFFcEIsTUFBTSxFQUNOLFNBQVMsRUFHVixNQUFNLGtCQUFrQixDQUFDO0FBSzFCLE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxRQUFRLEVBQUUsS0FBSyxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQVl6RTs7R0FFRztBQUNILHFCQUFhLFVBQVU7O0lBOEJULE9BQU8sQ0FBQyxFQUFFO0lBQXRCLFlBQW9CLEVBQUUsRUFBRSxpQkFBaUIsRUFVeEM7SUFFRDs7OztPQUlHO0lBQ0csU0FBUyxDQUFDLE1BQU0sRUFBRSxnQkFBZ0IsRUFBRSxFQUFFLElBQUksR0FBRTtRQUFFLEtBQUssQ0FBQyxFQUFFLE9BQU8sQ0FBQTtLQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTBENUY7SUFFRDs7Ozs7O09BTUc7SUFDRyxZQUFZLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFrQzNEO0lBRUQ7Ozs7O09BS0c7SUFDSSxTQUFTLENBQUMsS0FBSyxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLHFCQUFxQixDQUFDLGdCQUFnQixDQUFDLENBTzNGO0lBRUQ7Ozs7T0FJRztJQUNHLFFBQVEsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsR0FBRyxTQUFTLENBQUMsQ0FNOUU7SUFFRDs7OztPQUlHO0lBQ0csY0FBYyxDQUFDLFNBQVMsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQU1sRjtJQUVEOzs7O09BSUc7SUFDRyxpQkFBaUIsQ0FBQyxPQUFPLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsR0FBRyxTQUFTLENBQUMsQ0FNMUU7SUFFRDs7OztPQUlHO0lBQ0csb0JBQW9CLENBQUMsU0FBUyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsV0FBVyxHQUFHLFNBQVMsQ0FBQyxDQVVuRjtJQUVEOzs7O09BSUc7SUFDRyx1QkFBdUIsQ0FBQyxPQUFPLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxXQUFXLEdBQUcsU0FBUyxDQUFDLENBVTNFO0lBRUQ7Ozs7O09BS0c7SUFDSSxlQUFlLENBQUMsS0FBSyxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLHFCQUFxQixDQUFDLFdBQVcsQ0FBQyxDQVU1RjtZQUVjLGdCQUFnQjtZQWFqQix3QkFBd0I7SUF1Q3RDOzs7O09BSUc7SUFDRyxXQUFXLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZUFBZSxHQUFHLFNBQVMsQ0FBQyxDQU10RTtJQUVEOzs7O09BSUc7SUFDRyxtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDLENBY3hFO0lBRUQ7Ozs7T0FJRztJQUNVLGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQU90RztJQUVEOzs7O09BSUc7SUFDSCxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQUU1RztJQUVEOzs7T0FHRztJQUNHLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FHcEQ7SUFFRDs7O09BR0c7SUFDSCx1QkFBdUIsSUFBSSxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVyRDtJQUVELHVCQUF1QixDQUFDLGFBQWEsRUFBRSxNQUFNLG9CQUU1QztJQUVLLHNCQUFzQixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FNbkQ7SUFFRCxzQkFBc0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxvQkFFOUM7SUFjRDs7O09BR0c7SUFDRywrQkFBK0IsSUFBSSxPQUFPLENBQUMsbUJBQW1CLEdBQUcsU0FBUyxDQUFDLENBTWhGO0lBRUQ7OztPQUdHO0lBQ0csK0JBQStCLENBQUMsTUFBTSxFQUFFLG1CQUFtQixHQUFHLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTzVGO0NBQ0YifQ==