@aztec/sequencer-client 0.0.1-commit.7d4e6cd → 0.0.1-commit.7ffbba4

package/dest/test/mock_checkpoint_builder.js

@@ -1,7 +1,8 @@
+import { IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { Timer } from '@aztec/foundation/timer';
+import { unfreeze } from '@aztec/foundation/types';
+import { L2Block } from '@aztec/stdlib/block';
 import { Checkpoint } from '@aztec/stdlib/checkpoint';
-import { Gas } from '@aztec/stdlib/gas';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
 /**
@@ -16,6 +17,7 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
     blockIndex;
     /** Optional function to dynamically provide the block (alternative to seedBlocks) */ blockProvider;
     /** Track calls for assertions */ buildBlockCalls;
+    /** Track all consumed transaction hashes across buildBlock calls */ consumedTxHashes;
     completeCheckpointCalled;
     getCheckpointCalled;
     /** Set to an error to make buildBlock throw on next call */ errorOnBuild;
@@ -28,6 +30,7 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
         this.blockIndex = 0;
         this.blockProvider = undefined;
         this.buildBlockCalls = [];
+        this.consumedTxHashes = new Set();
         this.completeCheckpointCalled = false;
         this.getCheckpointCalled = false;
         this.errorOnBuild = undefined;
@@ -50,20 +53,22 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
     getConstantData() {
         return this.constants;
     }
-    buildBlock(_pendingTxs, blockNumber, timestamp, opts) {
+    async buildBlock(pendingTxs, blockNumber, timestamp, opts) {
         this.buildBlockCalls.push({
             blockNumber,
             timestamp,
             opts
         });
         if (this.errorOnBuild) {
-            return Promise.reject(this.errorOnBuild);
+            throw this.errorOnBuild;
         }
         let block;
         let usedTxs;
         if (this.blockProvider) {
-            // Dynamic mode: get block from provider
-            block = this.blockProvider();
+            // Dynamic mode: get block from provider, cloning to avoid shared references across multiple buildBlock calls
+            block = L2Block.fromBuffer(this.blockProvider().toBuffer());
+            block.header.globalVariables.blockNumber = blockNumber;
+            await block.header.recomputeHash();
             usedTxs = [];
             this.builtBlocks.push(block);
         } else {
@@ -73,62 +78,76 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
             this.blockIndex++;
             this.builtBlocks.push(block);
         }
-        return Promise.resolve({
+        // Check that no pending tx has already been consumed
+        for await (const tx of pendingTxs){
+            const hash = tx.getTxHash().toString();
+            if (this.consumedTxHashes.has(hash)) {
+                throw new Error(`Transaction ${hash} was already consumed in a previous block`);
+            }
+        }
+        // Add used txs to consumed set
+        for (const tx of usedTxs){
+            this.consumedTxHashes.add(tx.getTxHash().toString());
+        }
+        return {
             block,
-            publicGas: Gas.empty(),
             publicProcessorDuration: 0,
             numTxs: block?.body?.txEffects?.length ?? usedTxs.length,
-            blockBuildingTimer: new Timer(),
             usedTxs,
             failedTxs: []
-        });
+        };
     }
     completeCheckpoint() {
         this.completeCheckpointCalled = true;
         const allBlocks = this.blockProvider ? this.builtBlocks : this.blocks;
-        const lastBlock = allBlocks[allBlocks.length - 1];
-        // Create a CheckpointHeader from the last block's header for testing
-        const checkpointHeader = this.createCheckpointHeader(lastBlock);
-        return Promise.resolve(new Checkpoint(makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1), checkpointHeader, allBlocks, this.checkpointNumber));
+        return this.buildCheckpoint(allBlocks);
     }
     getCheckpoint() {
         this.getCheckpointCalled = true;
         const builtBlocks = this.blockProvider ? this.builtBlocks : this.blocks.slice(0, this.blockIndex);
-        const lastBlock = builtBlocks[builtBlocks.length - 1];
-        if (!lastBlock) {
+        if (builtBlocks.length === 0) {
             throw new Error('No blocks built yet');
         }
-        // Create a CheckpointHeader from the last block's header for testing
-        const checkpointHeader = this.createCheckpointHeader(lastBlock);
-        return Promise.resolve(new Checkpoint(makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1), checkpointHeader, builtBlocks, this.checkpointNumber));
-    }
-    /**
-   * Creates a CheckpointHeader from a block's header for testing.
-   * This is a simplified version that creates a minimal CheckpointHeader.
-   */ createCheckpointHeader(block) {
-        const header = block.header;
-        const gv = header.globalVariables;
-        return CheckpointHeader.empty({
-            lastArchiveRoot: header.lastArchive.root,
+        return this.buildCheckpoint(builtBlocks);
+    }
+    /** Builds a structurally valid Checkpoint from a list of blocks, fixing up indexes and archive chaining. */ async buildCheckpoint(blocks) {
+        // Fix up indexWithinCheckpoint and archive chaining so the checkpoint passes structural validation.
+        for(let i = 0; i < blocks.length; i++){
+            blocks[i].indexWithinCheckpoint = IndexWithinCheckpoint(i);
+            if (i > 0) {
+                unfreeze(blocks[i].header).lastArchive = blocks[i - 1].archive;
+                await blocks[i].header.recomputeHash();
+            }
+        }
+        const firstBlock = blocks[0];
+        const lastBlock = blocks[blocks.length - 1];
+        const gv = firstBlock.header.globalVariables;
+        const checkpointHeader = CheckpointHeader.empty({
+            lastArchiveRoot: firstBlock.header.lastArchive.root,
             blockHeadersHash: Fr.random(),
             slotNumber: gv.slotNumber,
             timestamp: gv.timestamp,
             coinbase: gv.coinbase,
             feeRecipient: gv.feeRecipient,
             gasFees: gv.gasFees,
-            totalManaUsed: header.totalManaUsed
+            totalManaUsed: lastBlock.header.totalManaUsed
         });
+        return new Checkpoint(makeAppendOnlyTreeSnapshot(lastBlock.header.globalVariables.blockNumber + 1), checkpointHeader, blocks, this.checkpointNumber);
     }
-    /** Reset for reuse in another test */ reset() {
-        this.blocks = [];
+    /** Resets per-checkpoint state (built blocks, consumed txs) while preserving config (blockProvider, seeded blocks). */ resetCheckpointState() {
         this.builtBlocks = [];
-        this.usedTxsPerBlock = [];
         this.blockIndex = 0;
-        this.buildBlockCalls = [];
+        this.consumedTxHashes.clear();
         this.completeCheckpointCalled = false;
         this.getCheckpointCalled = false;
+    }
+    /** Reset for reuse in another test */ reset() {
+        this.blocks = [];
+        this.usedTxsPerBlock = [];
+        this.buildBlockCalls = [];
         this.errorOnBuild = undefined;
         this.blockProvider = undefined;
+        this.resetCheckpointState();
     }
 }
 /**
@@ -162,30 +181,37 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
             l1GenesisTime: 0n,
             slotDuration: 24,
             l1ChainId: 1,
-            rollupVersion: 1
+            rollupVersion: 1,
+            rollupManaLimit: 200_000_000
         };
     }
     updateConfig(config) {
         this.updateConfigCalls.push(config);
     }
-    startCheckpoint(checkpointNumber, constants, l1ToL2Messages, _fork) {
+    startCheckpoint(checkpointNumber, constants, feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, _fork) {
         this.startCheckpointCalls.push({
             checkpointNumber,
             constants,
-            l1ToL2Messages
+            l1ToL2Messages,
+            previousCheckpointOutHashes,
+            feeAssetPriceModifier
         });
         if (!this.checkpointBuilder) {
             // Auto-create a builder if none was set
             this.checkpointBuilder = new MockCheckpointBuilder(constants, checkpointNumber);
+        } else {
+            this.checkpointBuilder.resetCheckpointState();
         }
         return Promise.resolve(this.checkpointBuilder);
     }
-    openCheckpoint(checkpointNumber, constants, l1ToL2Messages, _fork, existingBlocks = []) {
+    openCheckpoint(checkpointNumber, constants, feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, _fork, existingBlocks = []) {
         this.openCheckpointCalls.push({
             checkpointNumber,
             constants,
             l1ToL2Messages,
-            existingBlocks
+            previousCheckpointOutHashes,
+            existingBlocks,
+            feeAssetPriceModifier
         });
         if (!this.checkpointBuilder) {
             // Auto-create a builder if none was set
@@ -193,6 +219,9 @@ import { makeAppendOnlyTreeSnapshot } from '@aztec/stdlib/testing';
         }
         return Promise.resolve(this.checkpointBuilder);
     }
+    getFork(_blockNumber) {
+        throw new Error('MockCheckpointsBuilder.getFork not implemented');
+    }
     /** Reset for reuse in another test */ reset() {
         this.checkpointBuilder = undefined;
         this.startCheckpointCalls = [];

package/dest/test/utils.d.ts

@@ -3,7 +3,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import type { P2P } from '@aztec/p2p';
-import { CommitteeAttestation, L2BlockNew } from '@aztec/stdlib/block';
+import { CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
 import { BlockProposal, CheckpointAttestation, CheckpointProposal } from '@aztec/stdlib/p2p';
 import { GlobalVariables, type Tx } from '@aztec/stdlib/tx';
 import type { MockProxy } from 'jest-mock-extended';
@@ -13,9 +13,9 @@ export { MockCheckpointBuilder, MockCheckpointsBuilder } from './mock_checkpoint
  */
 export declare function makeTx(seed?: number, chainId?: Fr): Promise<Tx>;
 /**
- * Creates an L2BlockNew from transactions and global variables
+ * Creates an L2Block from transactions and global variables
  */
-export declare function makeBlock(txs: Tx[], globalVariables: GlobalVariables): Promise<L2BlockNew>;
+export declare function makeBlock(txs: Tx[], globalVariables: GlobalVariables): Promise<L2Block>;
 /**
  * Mocks the P2P client to return specific pending transactions
  */
@@ -31,23 +31,23 @@ export declare function createMockSignatures(signer: Secp256k1Signer): Committee
 /**
  * Creates a block proposal from a block and signature
  */
-export declare function createBlockProposal(block: L2BlockNew, signature: Signature): BlockProposal;
+export declare function createBlockProposal(block: L2Block, signature: Signature): BlockProposal;
 /**
  * Creates a checkpoint proposal from a block and signature
  */
-export declare function createCheckpointProposal(block: L2BlockNew, checkpointSignature: Signature, blockSignature?: Signature): CheckpointProposal;
+export declare function createCheckpointProposal(block: L2Block, checkpointSignature: Signature, blockSignature?: Signature, feeAssetPriceModifier?: bigint): CheckpointProposal;
 /**
  * Creates a checkpoint attestation from a block and signature.
  * Note: We manually set the sender since we use random signatures in tests.
  * In production, the sender is recovered from the signature.
  */
-export declare function createCheckpointAttestation(block: L2BlockNew, signature: Signature, sender: EthAddress): CheckpointAttestation;
+export declare function createCheckpointAttestation(block: L2Block, signature: Signature, sender: EthAddress, feeAssetPriceModifier?: bigint): CheckpointAttestation;
 /**
  * Creates transactions and a block, and mocks P2P to return them.
  * Helper for tests that need to set up a block with transactions.
  */
 export declare function setupTxsAndBlock(p2p: MockProxy<P2P>, globalVariables: GlobalVariables, txCount: number, chainId: Fr): Promise<{
     txs: Tx[];
-    block: L2BlockNew;
+    block: L2Block;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUM1RSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0QyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsVUFBVSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdkUsT0FBTyxFQUFFLGFBQWEsRUFBRSxxQkFBcUIsRUFBRSxrQkFBa0IsRUFBb0IsTUFBTSxtQkFBbUIsQ0FBQztBQUcvRyxPQUFPLEVBQWUsZUFBZSxFQUFFLEtBQUssRUFBRSxFQUFvQyxNQUFNLGtCQUFrQixDQUFDO0FBRTNHLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBR3BELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRTdGOztHQUVHO0FBQ0gsd0JBQXNCLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FNckU7QUFFRDs7R0FFRztBQUNILHdCQUFzQixTQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsRUFBRSxFQUFFLGVBQWUsRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQVVoRztBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLGNBQWMsQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsR0FBRyxJQUFJLENBR25FO0FBRUQ7O0dBRUc7QUFDSCx3QkFBdUIsY0FBYyxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxxQkFBcUIsQ0FBQyxFQUFFLENBQUMsQ0FJbkY7QUFFRDs7R0FFRztBQUNILHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsZUFBZSxHQUFHLG9CQUFvQixFQUFFLENBR3BGO0FBc0JEOztHQUVHO0FBQ0gsd0JBQWdCLG1CQUFtQixDQUFDLEtBQUssRUFBRSxVQUFVLEVBQUUsU0FBUyxFQUFFLFNBQVMsR0FBRyxhQUFhLENBVTFGO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0Isd0JBQXdCLENBQ3RDLEtBQUssRUFBRSxVQUFVLEVBQ2pCLG1CQUFtQixFQUFFLFNBQVMsRUFDOUIsY0FBYyxDQUFDLEVBQUUsU0FBUyxHQUN6QixrQkFBa0IsQ0FTcEI7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLDJCQUEyQixDQUN6QyxLQUFLLEVBQUUsVUFBVSxFQUNqQixTQUFTLEVBQUUsU0FBUyxFQUNwQixNQUFNLEVBQUUsVUFBVSxHQUNqQixxQkFBcUIsQ0FPdkI7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZ0JBQWdCLENBQ3BDLEdBQUcsRUFBRSxTQUFTLENBQUMsR0FBRyxDQUFDLEVBQ25CLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLE9BQU8sRUFBRSxNQUFNLEVBQ2YsT0FBTyxFQUFFLEVBQUUsR0FDVixPQUFPLENBQUM7SUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFBQyxLQUFLLEVBQUUsVUFBVSxDQUFBO0NBQUUsQ0FBQyxDQUszQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUM1RSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0QyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsT0FBTyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEUsT0FBTyxFQUFFLGFBQWEsRUFBRSxxQkFBcUIsRUFBRSxrQkFBa0IsRUFBb0IsTUFBTSxtQkFBbUIsQ0FBQztBQUcvRyxPQUFPLEVBQWUsZUFBZSxFQUFFLEtBQUssRUFBRSxFQUFvQyxNQUFNLGtCQUFrQixDQUFDO0FBRTNHLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBR3BELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRTdGOztHQUVHO0FBQ0gsd0JBQXNCLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FNckU7QUFFRDs7R0FFRztBQUNILHdCQUFzQixTQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsRUFBRSxFQUFFLGVBQWUsRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWdCN0Y7QUFFRDs7R0FFRztBQUNILHdCQUFnQixjQUFjLENBQUMsR0FBRyxFQUFFLFNBQVMsQ0FBQyxHQUFHLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUluRTtBQUVEOztHQUVHO0FBQ0gsd0JBQXVCLGNBQWMsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLEdBQUcscUJBQXFCLENBQUMsRUFBRSxDQUFDLENBSW5GO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0Isb0JBQW9CLENBQUMsTUFBTSxFQUFFLGVBQWUsR0FBRyxvQkFBb0IsRUFBRSxDQUdwRjtBQXVCRDs7R0FFRztBQUNILHdCQUFnQixtQkFBbUIsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxTQUFTLEdBQUcsYUFBYSxDQVV2RjtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLHdCQUF3QixDQUN0QyxLQUFLLEVBQUUsT0FBTyxFQUNkLG1CQUFtQixFQUFFLFNBQVMsRUFDOUIsY0FBYyxDQUFDLEVBQUUsU0FBUyxFQUMxQixxQkFBcUIsR0FBRSxNQUFXLEdBQ2pDLGtCQUFrQixDQVNwQjtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBZ0IsMkJBQTJCLENBQ3pDLEtBQUssRUFBRSxPQUFPLEVBQ2QsU0FBUyxFQUFFLFNBQVMsRUFDcEIsTUFBTSxFQUFFLFVBQVUsRUFDbEIscUJBQXFCLEdBQUUsTUFBVyxHQUNqQyxxQkFBcUIsQ0FPdkI7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZ0JBQWdCLENBQ3BDLEdBQUcsRUFBRSxTQUFTLENBQUMsR0FBRyxDQUFDLEVBQ25CLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLE9BQU8sRUFBRSxNQUFNLEVBQ2YsT0FBTyxFQUFFLEVBQUUsR0FDVixPQUFPLENBQUM7SUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFBQyxLQUFLLEVBQUUsT0FBTyxDQUFBO0NBQUUsQ0FBQyxDQUt4QyJ9

package/dest/test/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,kBAAkB,EAAoB,MAAM,mBAAmB,CAAC;AAG/G,OAAO,EAAe,eAAe,EAAE,KAAK,EAAE,EAAoC,MAAM,kBAAkB,CAAC;AAE3G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAE7F;;GAEG;AACH,wBAAsB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAMrE;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,CAUhG;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAGnE;AAED;;GAEG;AACH,wBAAuB,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,GAAG,qBAAqB,CAAC,EAAE,CAAC,CAInF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,GAAG,oBAAoB,EAAE,CAGpF;AAsBD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,aAAa,CAU1F;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,UAAU,EACjB,mBAAmB,EAAE,SAAS,EAC9B,cAAc,CAAC,EAAE,SAAS,GACzB,kBAAkB,CASpB;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,UAAU,GACjB,qBAAqB,CAOvB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,EACnB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,EAAE,GACV,OAAO,CAAC;IAAE,GAAG,EAAE,EAAE,EAAE,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAAC,CAK3C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,kBAAkB,EAAoB,MAAM,mBAAmB,CAAC;AAG/G,OAAO,EAAe,eAAe,EAAE,KAAK,EAAE,EAAoC,MAAM,kBAAkB,CAAC;AAE3G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAE7F;;GAEG;AACH,wBAAsB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAMrE;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAgB7F;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAInE;AAED;;GAEG;AACH,wBAAuB,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,GAAG,qBAAqB,CAAC,EAAE,CAAC,CAInF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,GAAG,oBAAoB,EAAE,CAGpF;AAuBD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,aAAa,CAUvF;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,EACd,mBAAmB,EAAE,SAAS,EAC9B,cAAc,CAAC,EAAE,SAAS,EAC1B,qBAAqB,GAAE,MAAW,GACjC,kBAAkB,CASpB;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,UAAU,EAClB,qBAAqB,GAAE,MAAW,GACjC,qBAAqB,CAOvB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,EACnB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,EAAE,GACV,OAAO,CAAC;IAAE,GAAG,EAAE,EAAE,EAAE,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAKxC"}

package/dest/test/utils.js

@@ -1,10 +1,10 @@
 import { Body } from '@aztec/aztec.js/block';
-import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { times } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
-import { CommitteeAttestation, L2BlockNew } from '@aztec/stdlib/block';
+import { CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
 import { BlockProposal, CheckpointAttestation, CheckpointProposal, ConsensusPayload } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { makeAppendOnlyTreeSnapshot, mockTxForRollup } from '@aztec/stdlib/testing';
@@ -21,7 +21,7 @@ export { MockCheckpointBuilder, MockCheckpointsBuilder } from './mock_checkpoint
     return tx;
 }
 /**
- * Creates an L2BlockNew from transactions and global variables
+ * Creates an L2Block from transactions and global variables
  */ export async function makeBlock(txs, globalVariables) {
     const processedTxs = await Promise.all(txs.map((tx)=>makeProcessedTxFromPrivateOnlyTx(tx, Fr.ZERO, new PublicDataWrite(Fr.random(), Fr.random()), globalVariables)));
     const body = new Body(processedTxs.map((tx)=>tx.txEffect));
@@ -29,13 +29,14 @@ export { MockCheckpointBuilder, MockCheckpointsBuilder } from './mock_checkpoint
         globalVariables
     });
     const archive = makeAppendOnlyTreeSnapshot(globalVariables.blockNumber + 1);
-    return new L2BlockNew(archive, header, body, CheckpointNumber(globalVariables.blockNumber), 0);
+    return new L2Block(archive, header, body, CheckpointNumber.fromBlockNumber(globalVariables.blockNumber), IndexWithinCheckpoint(0));
 }
 /**
  * Mocks the P2P client to return specific pending transactions
  */ export function mockPendingTxs(p2p, txs) {
     p2p.getPendingTxCount.mockResolvedValue(txs.length);
     p2p.iteratePendingTxs.mockImplementation(()=>mockTxIterator(Promise.resolve(txs)));
+    p2p.iterateEligiblePendingTxs.mockImplementation(()=>mockTxIterator(Promise.resolve(txs)));
 }
 /**
  * Creates an async iterator for transactions
@@ -53,11 +54,11 @@ export { MockCheckpointBuilder, MockCheckpointsBuilder } from './mock_checkpoint
     ];
 }
 /**
- * Creates a CheckpointHeader from an L2BlockNew for testing purposes.
- * Uses mock values for blockHeadersHash, blobsHash and inHash since L2BlockNew doesn't have these fields.
+ * Creates a CheckpointHeader from an L2Block for testing purposes.
+ * Uses mock values for blockHeadersHash, blobsHash and inHash since L2Block doesn't have these fields.
  */ function createCheckpointHeaderFromBlock(block) {
     const gv = block.header.globalVariables;
-    return new CheckpointHeader(block.header.lastArchive.root, Fr.random(), Fr.random(), Fr.random(), gv.slotNumber, gv.timestamp, gv.coinbase, gv.feeRecipient, gv.gasFees, block.header.totalManaUsed);
+    return new CheckpointHeader(block.header.lastArchive.root, Fr.random(), Fr.random(), Fr.random(), Fr.random(), gv.slotNumber, gv.timestamp, gv.coinbase, gv.feeRecipient, gv.gasFees, block.header.totalManaUsed);
 }
 /**
  * Creates a block proposal from a block and signature
@@ -67,10 +68,10 @@ export { MockCheckpointBuilder, MockCheckpointsBuilder } from './mock_checkpoint
 }
 /**
  * Creates a checkpoint proposal from a block and signature
- */ export function createCheckpointProposal(block, checkpointSignature, blockSignature) {
+ */ export function createCheckpointProposal(block, checkpointSignature, blockSignature, feeAssetPriceModifier = 0n) {
     const txHashes = block.body.txEffects.map((tx)=>tx.txHash);
     const checkpointHeader = createCheckpointHeaderFromBlock(block);
-    return new CheckpointProposal(checkpointHeader, block.archive.root, checkpointSignature, {
+    return new CheckpointProposal(checkpointHeader, block.archive.root, feeAssetPriceModifier, checkpointSignature, {
         blockHeader: block.header,
         indexWithinCheckpoint: block.indexWithinCheckpoint,
         txHashes,
@@ -81,9 +82,9 @@ export { MockCheckpointBuilder, MockCheckpointsBuilder } from './mock_checkpoint
  * Creates a checkpoint attestation from a block and signature.
  * Note: We manually set the sender since we use random signatures in tests.
  * In production, the sender is recovered from the signature.
- */ export function createCheckpointAttestation(block, signature, sender) {
+ */ export function createCheckpointAttestation(block, signature, sender, feeAssetPriceModifier = 0n) {
     const checkpointHeader = createCheckpointHeaderFromBlock(block);
-    const payload = new ConsensusPayload(checkpointHeader, block.archive.root);
+    const payload = new ConsensusPayload(checkpointHeader, block.archive.root, feeAssetPriceModifier);
     const attestation = new CheckpointAttestation(payload, signature, signature);
     // Set sender directly for testing (bypasses signature recovery)
     attestation.sender = sender;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.0.1-commit.7d4e6cd",
+  "version": "0.0.1-commit.7ffbba4",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -26,43 +26,45 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.0.1-commit.7d4e6cd",
-    "@aztec/bb-prover": "0.0.1-commit.7d4e6cd",
-    "@aztec/blob-client": "0.0.1-commit.7d4e6cd",
-    "@aztec/blob-lib": "0.0.1-commit.7d4e6cd",
-    "@aztec/constants": "0.0.1-commit.7d4e6cd",
-    "@aztec/epoch-cache": "0.0.1-commit.7d4e6cd",
-    "@aztec/ethereum": "0.0.1-commit.7d4e6cd",
-    "@aztec/foundation": "0.0.1-commit.7d4e6cd",
-    "@aztec/l1-artifacts": "0.0.1-commit.7d4e6cd",
-    "@aztec/merkle-tree": "0.0.1-commit.7d4e6cd",
-    "@aztec/node-keystore": "0.0.1-commit.7d4e6cd",
-    "@aztec/noir-acvm_js": "0.0.1-commit.7d4e6cd",
-    "@aztec/noir-contracts.js": "0.0.1-commit.7d4e6cd",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.7d4e6cd",
-    "@aztec/noir-types": "0.0.1-commit.7d4e6cd",
-    "@aztec/p2p": "0.0.1-commit.7d4e6cd",
-    "@aztec/protocol-contracts": "0.0.1-commit.7d4e6cd",
-    "@aztec/prover-client": "0.0.1-commit.7d4e6cd",
-    "@aztec/simulator": "0.0.1-commit.7d4e6cd",
-    "@aztec/slasher": "0.0.1-commit.7d4e6cd",
-    "@aztec/stdlib": "0.0.1-commit.7d4e6cd",
-    "@aztec/telemetry-client": "0.0.1-commit.7d4e6cd",
-    "@aztec/validator-client": "0.0.1-commit.7d4e6cd",
-    "@aztec/world-state": "0.0.1-commit.7d4e6cd",
+    "@aztec/aztec.js": "0.0.1-commit.7ffbba4",
+    "@aztec/bb-prover": "0.0.1-commit.7ffbba4",
+    "@aztec/blob-client": "0.0.1-commit.7ffbba4",
+    "@aztec/blob-lib": "0.0.1-commit.7ffbba4",
+    "@aztec/constants": "0.0.1-commit.7ffbba4",
+    "@aztec/epoch-cache": "0.0.1-commit.7ffbba4",
+    "@aztec/ethereum": "0.0.1-commit.7ffbba4",
+    "@aztec/foundation": "0.0.1-commit.7ffbba4",
+    "@aztec/l1-artifacts": "0.0.1-commit.7ffbba4",
+    "@aztec/merkle-tree": "0.0.1-commit.7ffbba4",
+    "@aztec/node-keystore": "0.0.1-commit.7ffbba4",
+    "@aztec/noir-acvm_js": "0.0.1-commit.7ffbba4",
+    "@aztec/noir-contracts.js": "0.0.1-commit.7ffbba4",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.7ffbba4",
+    "@aztec/noir-types": "0.0.1-commit.7ffbba4",
+    "@aztec/p2p": "0.0.1-commit.7ffbba4",
+    "@aztec/protocol-contracts": "0.0.1-commit.7ffbba4",
+    "@aztec/prover-client": "0.0.1-commit.7ffbba4",
+    "@aztec/simulator": "0.0.1-commit.7ffbba4",
+    "@aztec/slasher": "0.0.1-commit.7ffbba4",
+    "@aztec/stdlib": "0.0.1-commit.7ffbba4",
+    "@aztec/telemetry-client": "0.0.1-commit.7ffbba4",
+    "@aztec/validator-client": "0.0.1-commit.7ffbba4",
+    "@aztec/validator-ha-signer": "0.0.1-commit.7ffbba4",
+    "@aztec/world-state": "0.0.1-commit.7ffbba4",
     "lodash.chunk": "^4.2.0",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.0.1-commit.7d4e6cd",
-    "@aztec/kv-store": "0.0.1-commit.7d4e6cd",
+    "@aztec/archiver": "0.0.1-commit.7ffbba4",
+    "@aztec/kv-store": "0.0.1-commit.7ffbba4",
+    "@electric-sql/pglite": "^0.3.14",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.7",
     "@types/lodash.pick": "^4.4.7",
     "@types/node": "^22.15.17",
-    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "concurrently": "^7.6.0",
     "eslint": "^9.26.0",
     "express": "^4.21.2",