fixes after merge

Author: benesjan

yarn-project/pxe/src/tagging/sync/sync_sender_tagging_indexes.test.ts

@@ -2,6 +2,7 @@ import { BlockNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { L2BlockHash } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import { PrivateLog, TxScopedL2Log } from '@aztec/stdlib/logs';
 import { TxHash, TxStatus } from '@aztec/stdlib/tx';
@@ -26,7 +27,7 @@ describe('syncSenderTaggingIndexes', () => {
   }
 
   function makeLog(txHash: TxHash, tag: Fr) {
-    return new TxScopedL2Log(txHash, 0, 0, BlockNumber(0), PrivateLog.random(tag));
+    return new TxScopedL2Log(txHash, 0, 0, BlockNumber(0), L2BlockHash.random(), PrivateLog.random(tag));
   }
 
   async function setUp() {

yarn-project/pxe/src/tagging/sync/utils/load_and_store_new_tagging_indexes.test.ts

@@ -2,6 +2,7 @@ import { BlockNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { L2BlockHash } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/server';
 import { DirectionalAppTaggingSecret, PrivateLog, TxScopedL2Log } from '@aztec/stdlib/logs';
 import { TxHash } from '@aztec/stdlib/tx';
@@ -27,7 +28,7 @@ describe('loadAndStoreNewTaggingIndexes', () => {
   }
 
   function makeLog(txHash: TxHash, tag: Fr) {
-    return new TxScopedL2Log(txHash, 0, 0, BlockNumber(0), PrivateLog.random(tag));
+    return new TxScopedL2Log(txHash, 0, 0, BlockNumber(0), L2BlockHash.random(), PrivateLog.random(tag));
   }
 
   beforeAll(async () => {

yarn-project/txe/src/state_machine/archiver.ts

@@ -9,6 +9,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {
   CommitteeAttestation,
   L2Block,
+  type L2BlockId,
   type L2BlockSource,
   type L2Tips,
   PublishedL2Block,