diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json
index 65c618f5fe1..6dd220c05b7 100644
--- a/yarn-project/aztec-node/package.json
+++ b/yarn-project/aztec-node/package.json
@@ -37,6 +37,7 @@
     "@aztec/circuits.js": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/kv-store": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
     "@aztec/merkle-tree": "workspace:^",
     "@aztec/p2p": "workspace:^",
diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
index ee0e7fb0b79..cf0952abb42 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -16,7 +16,8 @@ import { computeGlobalsHash, computePublicDataTreeLeafSlot } from '@aztec/circui
 import { L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { InMemoryTxPool, P2P, createP2PClient } from '@aztec/p2p';
+import { AztecLmdbStore } from '@aztec/kv-store';
+import { AztecKVTxPool, P2P, createP2PClient } from '@aztec/p2p';
 import {
   GlobalVariableBuilder,
   PublicProcessorFactory,
@@ -105,6 +106,7 @@ export class AztecNodeService implements AztecNode {
     }
 
     const log = createDebugLogger('aztec:node');
+    const store = await AztecLmdbStore.create(config.l1Contracts.rollupAddress, config.dataDirectory);
     const [nodeDb, worldStateDb] = await openDb(config, log);
 
     // first create and sync the archiver
@@ -116,7 +118,7 @@ export class AztecNodeService implements AztecNode {
     config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
 
     // create the tx pool and the p2p client, which will need the l2 block source
-    const p2pClient = await createP2PClient(config, new InMemoryTxPool(), archiver);
+    const p2pClient = await createP2PClient(store, config, new AztecKVTxPool(store), archiver);
 
     // now create the merkle trees and the world state synchronizer
     const merkleTrees = await MerkleTrees.new(worldStateDb);
diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json
index 47573e6ef0d..3c938379585 100644
--- a/yarn-project/aztec-node/tsconfig.json
+++ b/yarn-project/aztec-node/tsconfig.json
@@ -35,6 +35,9 @@
     },
     {
       "path": "../world-state"
+    },
+    {
+      "path": "../kv-store"
     }
   ],
   "include": ["src"]
diff --git a/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts b/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts
index b1c22f60e7f..79038eb7021 100644
--- a/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts
+++ b/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts
@@ -43,7 +43,7 @@ describe('benchmarks/process_history', () => {
         // Send enough txs to move the chain to the next block number checkpoint
         const txCount = (chainLength - lastBlock) * BLOCK_SIZE;
         const sentTxs = await sendTxs(txCount, context, contract);
-        await sentTxs[sentTxs.length - 1].wait({ timeout: 5 * 60_000 });
+        await Promise.all(sentTxs.map(tx => tx.wait({ timeout: 5 * 60_000 })));
         await sleep(100);
 
         // Create a new node and measure how much time it takes it to sync
diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts
index 9dd4e9beb79..caaac6a4804 100644
--- a/yarn-project/end-to-end/src/e2e_block_building.test.ts
+++ b/yarn-project/end-to-end/src/e2e_block_building.test.ts
@@ -6,6 +6,8 @@ import {
   DebugLogger,
   Fr,
   PXE,
+  SentTx,
+  TxReceipt,
   TxStatus,
   Wallet,
   isContractDeployed,
@@ -72,7 +74,7 @@ describe('e2e_block_building', () => {
       expect(areDeployed).toEqual(times(TX_COUNT, () => true));
     }, 60_000);
 
-    it('can call public function from different tx in same block', async () => {
+    it.skip('can call public function from different tx in same block', async () => {
       // Ensure both txs will land on the same block
       await aztecNode.setConfig({ minTxsPerBlock: 2 });
 
@@ -125,8 +127,7 @@ describe('e2e_block_building', () => {
         await call.simulate();
       }
       const [tx1, tx2] = calls.map(call => call.send());
-      await tx1.wait();
-      await expect(tx2.wait()).rejects.toThrowError(/dropped/);
+      await expectXorTx(tx1, tx2);
     }, 30_000);
 
     it('drops tx with public nullifier already emitted on the same block', async () => {
@@ -136,8 +137,7 @@ describe('e2e_block_building', () => {
         await call.simulate();
       }
       const [tx1, tx2] = calls.map(call => call.send());
-      await tx1.wait();
-      await expect(tx2.wait()).rejects.toThrowError(/dropped/);
+      await expectXorTx(tx1, tx2);
     }, 30_000);
 
     it('drops tx with two equal nullifiers', async () => {
@@ -160,8 +160,22 @@ describe('e2e_block_building', () => {
         await call.simulate();
       }
       const [tx1, tx2] = calls.map(call => call.send());
-      await tx1.wait();
-      await expect(tx2.wait()).rejects.toThrowError(/dropped/);
+      await expectXorTx(tx1, tx2);
     });
   });
 });
+
+/**
+ * Checks that only one of the two provided transactions succeeds.
+ * @param tx1 - A transaction.
+ * @param tx2 - Another transaction.
+ */
+async function expectXorTx(tx1: SentTx, tx2: SentTx) {
+  const receipts = await Promise.allSettled([tx1.wait(), tx2.wait()]);
+  const succeeded = receipts.find((r): r is PromiseSettledResult<TxReceipt> => r.status === 'fulfilled');
+  const failed = receipts.find((r): r is PromiseRejectedResult => r.status === 'rejected');
+
+  expect(succeeded).toBeDefined();
+  expect(failed).toBeDefined();
+  expect((failed?.reason as Error).message).toMatch(/dropped/);
+}
diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json
index e4d18baa732..931eacd4167 100644
--- a/yarn-project/p2p/package.json
+++ b/yarn-project/p2p/package.json
@@ -34,6 +34,7 @@
   "dependencies": {
     "@aztec/circuits.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/kv-store": "workspace:^",
     "@aztec/types": "workspace:^",
     "@chainsafe/libp2p-noise": "^13.0.0",
     "@chainsafe/libp2p-yamux": "^5.0.0",
diff --git a/yarn-project/p2p/src/client/index.ts b/yarn-project/p2p/src/client/index.ts
index 95dbff55049..6789fa2aa1f 100644
--- a/yarn-project/p2p/src/client/index.ts
+++ b/yarn-project/p2p/src/client/index.ts
@@ -1,3 +1,4 @@
+import { AztecKVStore } from '@aztec/kv-store';
 import { L2BlockSource } from '@aztec/types';
 
 import { P2PClient } from '../client/p2p_client.js';
@@ -8,7 +9,12 @@ import { TxPool } from '../tx_pool/index.js';
 
 export * from './p2p_client.js';
 
-export const createP2PClient = async (config: P2PConfig, txPool: TxPool, l2BlockSource: L2BlockSource) => {
+export const createP2PClient = async (
+  store: AztecKVStore,
+  config: P2PConfig,
+  txPool: TxPool,
+  l2BlockSource: L2BlockSource,
+) => {
   const p2pService = config.p2pEnabled ? await LibP2PService.new(config, txPool) : new DummyP2PService();
-  return new P2PClient(l2BlockSource, txPool, p2pService);
+  return new P2PClient(store, l2BlockSource, txPool, p2pService);
 };
diff --git a/yarn-project/p2p/src/client/p2p_client.test.ts b/yarn-project/p2p/src/client/p2p_client.test.ts
index 0726ab56e6d..2b7d32e512b 100644
--- a/yarn-project/p2p/src/client/p2p_client.test.ts
+++ b/yarn-project/p2p/src/client/p2p_client.test.ts
@@ -1,3 +1,5 @@
+import { EthAddress } from '@aztec/circuits.js';
+import { AztecKVStore, AztecLmdbStore } from '@aztec/kv-store';
 import { L2BlockSource, mockTx } from '@aztec/types';
 
 import { expect, jest } from '@jest/globals';
@@ -18,8 +20,10 @@ describe('In-Memory P2P Client', () => {
   let txPool: Mockify<TxPool>;
   let blockSource: L2BlockSource;
   let p2pService: Mockify<P2PService>;
+  let kvStore: AztecKVStore;
+  let client: P2PClient;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     txPool = {
       addTxs: jest.fn(),
       getTxByHash: jest.fn().mockReturnValue(undefined),
@@ -37,10 +41,12 @@ describe('In-Memory P2P Client', () => {
     };
 
     blockSource = new MockBlockSource();
+
+    kvStore = await AztecLmdbStore.create(EthAddress.random());
+    client = new P2PClient(kvStore, blockSource, txPool, p2pService);
   });
 
   it('can start & stop', async () => {
-    const client = new P2PClient(blockSource, txPool, p2pService);
     expect(await client.isReady()).toEqual(false);
 
     await client.start();
@@ -51,7 +57,6 @@ describe('In-Memory P2P Client', () => {
   });
 
   it('adds txs to pool', async () => {
-    const client = new P2PClient(blockSource, txPool, p2pService);
     await client.start();
     const tx1 = mockTx();
     const tx2 = mockTx();
@@ -63,7 +68,6 @@ describe('In-Memory P2P Client', () => {
   });
 
   it('rejects txs after being stopped', async () => {
-    const client = new P2PClient(blockSource, txPool, p2pService);
     await client.start();
     const tx1 = mockTx();
     const tx2 = mockTx();
@@ -76,4 +80,23 @@ describe('In-Memory P2P Client', () => {
     await expect(client.sendTx(tx3)).rejects.toThrow();
     expect(txPool.addTxs).toHaveBeenCalledTimes(2);
   });
+
+  it('republishes previously stored txs on start', async () => {
+    const tx1 = mockTx();
+    const tx2 = mockTx();
+    txPool.getAllTxs.mockReturnValue([tx1, tx2]);
+
+    await client.start();
+    expect(p2pService.propagateTx).toHaveBeenCalledTimes(2);
+    expect(p2pService.propagateTx).toHaveBeenCalledWith(tx1);
+    expect(p2pService.propagateTx).toHaveBeenCalledWith(tx2);
+  });
+
+  it('restores the previous block number it was at', async () => {
+    await client.start();
+    await client.stop();
+
+    const client2 = new P2PClient(kvStore, blockSource, txPool, p2pService);
+    expect(client2.getSyncedBlockNum()).toEqual(client.getSyncedBlockNum());
+  });
 });
diff --git a/yarn-project/p2p/src/client/p2p_client.ts b/yarn-project/p2p/src/client/p2p_client.ts
index d8baeb7ac8f..99798622e1d 100644
--- a/yarn-project/p2p/src/client/p2p_client.ts
+++ b/yarn-project/p2p/src/client/p2p_client.ts
@@ -1,5 +1,14 @@
 import { createDebugLogger } from '@aztec/foundation/log';
-import { L2Block, L2BlockContext, L2BlockDownloader, L2BlockSource, Tx, TxHash } from '@aztec/types';
+import { AztecKVStore, AztecSingleton } from '@aztec/kv-store';
+import {
+  INITIAL_L2_BLOCK_NUM,
+  L2Block,
+  L2BlockContext,
+  L2BlockDownloader,
+  L2BlockSource,
+  Tx,
+  TxHash,
+} from '@aztec/types';
 
 import { getP2PConfigEnvVars } from '../config.js';
 import { P2PService } from '../service/service.js';
@@ -102,24 +111,22 @@ export class P2PClient implements P2P {
    */
   private runningPromise!: Promise<void>;
 
-  /**
-   * Store the ID of the latest block the client has synced to.
-   */
-  private currentL2BlockNum = 0;
-
   private currentState = P2PClientState.IDLE;
   private syncPromise = Promise.resolve();
   private latestBlockNumberAtStart = -1;
   private syncResolve?: () => void = undefined;
+  private synchedBlockNumber: AztecSingleton<number>;
 
   /**
    * In-memory P2P client constructor.
+   * @param store - The client's instance of the KV store.
    * @param l2BlockSource - P2P client's source for fetching existing blocks.
    * @param txPool - The client's instance of a transaction pool. Defaults to in-memory implementation.
    * @param p2pService - The concrete instance of p2p networking to use.
    * @param log - A logger.
    */
   constructor(
+    store: AztecKVStore,
     private l2BlockSource: L2BlockSource,
     private txPool: TxPool,
     private p2pService: P2PService,
@@ -127,6 +134,7 @@ export class P2PClient implements P2P {
   ) {
     const { p2pBlockCheckIntervalMS: checkInterval, l2QueueSize } = getP2PConfigEnvVars();
     this.blockDownloader = new L2BlockDownloader(l2BlockSource, l2QueueSize, checkInterval);
+    this.synchedBlockNumber = store.createSingleton('p2p_pool_last_l2_block');
   }
 
   /**
@@ -144,7 +152,7 @@ export class P2PClient implements P2P {
     // get the current latest block number
     this.latestBlockNumberAtStart = await this.l2BlockSource.getBlockNumber();
 
-    const blockToDownloadFrom = this.currentL2BlockNum + 1;
+    const blockToDownloadFrom = this.getSyncedBlockNum() + 1;
 
     // if there are blocks to be retrieved, go to a synching state
     if (blockToDownloadFrom <= this.latestBlockNumberAtStart) {
@@ -161,6 +169,9 @@ export class P2PClient implements P2P {
       this.log(`Next block ${blockToDownloadFrom} already beyond latest block at ${this.latestBlockNumberAtStart}`);
     }
 
+    // publish any txs in TxPool after its doing initial sync
+    this.syncPromise = this.syncPromise.then(() => this.publishStoredTxs());
+
     // start looking for further blocks
     const blockProcess = async () => {
       while (!this.stopping) {
@@ -171,6 +182,7 @@ export class P2PClient implements P2P {
     this.runningPromise = blockProcess();
     this.blockDownloader.start(blockToDownloadFrom);
     this.log(`Started block downloader from block ${blockToDownloadFrom}`);
+
     return this.syncPromise;
   }
 
@@ -229,7 +241,7 @@ export class P2PClient implements P2P {
     if (!ready) {
       throw new Error('P2P client not ready');
     }
-    this.txPool.deleteTxs(txHashes);
+    await this.txPool.deleteTxs(txHashes);
   }
 
   /**
@@ -245,7 +257,7 @@ export class P2PClient implements P2P {
    * @returns Block number of latest L2 Block we've synced with.
    */
   public getSyncedBlockNum() {
-    return this.currentL2BlockNum;
+    return this.synchedBlockNumber.get() ?? INITIAL_L2_BLOCK_NUM - 1;
   }
 
   /**
@@ -255,7 +267,7 @@ export class P2PClient implements P2P {
   public getStatus(): Promise<P2PSyncState> {
     return Promise.resolve({
       state: this.currentState,
-      syncedToL2Block: this.currentL2BlockNum,
+      syncedToL2Block: this.getSyncedBlockNum(),
     } as P2PSyncState);
   }
 
@@ -264,14 +276,13 @@ export class P2PClient implements P2P {
    * @param blocks - A list of existing blocks with txs that the P2P client needs to ensure the tx pool is reconciled with.
    * @returns Empty promise.
    */
-  private reconcileTxPool(blocks: L2Block[]): Promise<void> {
+  private async reconcileTxPool(blocks: L2Block[]): Promise<void> {
     for (let i = 0; i < blocks.length; i++) {
       const blockContext = new L2BlockContext(blocks[i]);
       const txHashes = blockContext.getTxHashes();
-      this.txPool.deleteTxs(txHashes);
+      await this.txPool.deleteTxs(txHashes);
       this.p2pService.settledTxs(txHashes);
     }
-    return Promise.resolve();
   }
 
   /**
@@ -284,9 +295,11 @@ export class P2PClient implements P2P {
       return Promise.resolve();
     }
     await this.reconcileTxPool(blocks);
-    this.currentL2BlockNum = blocks[blocks.length - 1].number;
-    this.log(`Synched to block ${this.currentL2BlockNum}`);
-    if (this.currentState === P2PClientState.SYNCHING && this.currentL2BlockNum >= this.latestBlockNumberAtStart) {
+    const lastBlockNum = blocks[blocks.length - 1].number;
+    await this.synchedBlockNumber.set(lastBlockNum);
+    this.log(`Synched to block ${lastBlockNum}`);
+
+    if (this.currentState === P2PClientState.SYNCHING && lastBlockNum >= this.latestBlockNumberAtStart) {
       this.setCurrentState(P2PClientState.RUNNING);
       if (this.syncResolve !== undefined) {
         this.syncResolve();
@@ -303,4 +316,16 @@ export class P2PClient implements P2P {
     this.currentState = newState;
     this.log(`Moved to state ${P2PClientState[this.currentState]}`);
   }
+
+  private async publishStoredTxs() {
+    if (!this.isReady()) {
+      return;
+    }
+
+    const txs = this.txPool.getAllTxs();
+    if (txs.length > 0) {
+      this.log(`Publishing ${txs.length} previously stored txs`);
+      await Promise.all(txs.map(tx => this.p2pService.propagateTx(tx)));
+    }
+  }
 }
diff --git a/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.test.ts b/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.test.ts
new file mode 100644
index 00000000000..126779f9dd5
--- /dev/null
+++ b/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.test.ts
@@ -0,0 +1,14 @@
+import { EthAddress } from '@aztec/circuits.js';
+import { AztecLmdbStore } from '@aztec/kv-store';
+
+import { AztecKVTxPool } from './aztec_kv_tx_pool.js';
+import { describeTxPool } from './tx_pool_test_suite.js';
+
+describe('In-Memory TX pool', () => {
+  let txPool: AztecKVTxPool;
+  beforeEach(async () => {
+    txPool = new AztecKVTxPool(await AztecLmdbStore.create(EthAddress.random()));
+  });
+
+  describeTxPool(() => txPool);
+});
diff --git a/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.ts b/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.ts
new file mode 100644
index 00000000000..bb2e0b9fbee
--- /dev/null
+++ b/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.ts
@@ -0,0 +1,99 @@
+import { Logger, createDebugLogger } from '@aztec/foundation/log';
+import { AztecKVStore, AztecMap } from '@aztec/kv-store';
+import { Tx, TxHash } from '@aztec/types';
+import { TxAddedToPoolStats } from '@aztec/types/stats';
+
+import { TxPool } from './tx_pool.js';
+
+/**
+ * In-memory implementation of the Transaction Pool.
+ */
+export class AztecKVTxPool implements TxPool {
+  #store: AztecKVStore;
+
+  /**
+   * Our tx pool, stored as a Map in-memory, with K: tx hash and V: the transaction.
+   */
+  #txs: AztecMap<string, Buffer>;
+
+  #log: Logger;
+
+  /**
+   * Class constructor for in-memory TxPool. Initiates our transaction pool as a JS Map.
+   * @param store - A KV store.
+   * @param log - A logger.
+   */
+  constructor(store: AztecKVStore, log = createDebugLogger('aztec:tx_pool')) {
+    this.#txs = store.createMap('txs');
+    this.#store = store;
+    this.#log = log;
+  }
+
+  /**
+   * Checks if a transaction exists in the pool and returns it.
+   * @param txHash - The generated tx hash.
+   * @returns The transaction, if found, 'undefined' otherwise.
+   */
+  public getTxByHash(txHash: TxHash): Tx | undefined {
+    const buffer = this.#txs.get(txHash.toString());
+    return buffer ? Tx.fromBuffer(buffer) : undefined;
+  }
+
+  /**
+   * Adds a list of transactions to the pool. Duplicates are ignored.
+   * @param txs - An array of txs to be added to the pool.
+   * @returns Empty promise.
+   */
+  public async addTxs(txs: Tx[]): Promise<void> {
+    const txHashes = await Promise.all(txs.map(tx => tx.getTxHash()));
+    return this.#store.transaction(() => {
+      for (const [i, tx] of txs.entries()) {
+        const txHash = txHashes[i];
+        this.#log.info(`Adding tx with id ${txHash.toString()}`, {
+          eventName: 'tx-added-to-pool',
+          ...tx.getStats(),
+        } satisfies TxAddedToPoolStats);
+
+        void this.#txs.set(txHash.toString(), tx.toBuffer());
+      }
+    });
+  }
+
+  /**
+   * Deletes transactions from the pool. Tx hashes that are not present are ignored.
+   * @param txHashes - An array of tx hashes to be removed from the tx pool.
+   * @returns The number of transactions that was deleted from the pool.
+   */
+  public deleteTxs(txHashes: TxHash[]): Promise<void> {
+    return this.#store.transaction(() => {
+      for (const hash of txHashes) {
+        void this.#txs.delete(hash.toString());
+      }
+    });
+  }
+
+  /**
+   * Gets all the transactions stored in the pool.
+   * @returns Array of tx objects in the order they were added to the pool.
+   */
+  public getAllTxs(): Tx[] {
+    return Array.from(this.#txs.values()).map(buffer => Tx.fromBuffer(buffer));
+  }
+
+  /**
+   * Gets the hashes of all transactions currently in the tx pool.
+   * @returns An array of transaction hashes found in the tx pool.
+   */
+  public getAllTxHashes(): TxHash[] {
+    return Array.from(this.#txs.keys()).map(x => TxHash.fromString(x));
+  }
+
+  /**
+   * Returns a boolean indicating if the transaction is present in the pool.
+   * @param txHash - The hash of the transaction to be queried.
+   * @returns True if the transaction present, false otherwise.
+   */
+  public hasTx(txHash: TxHash): boolean {
+    return this.#txs.has(txHash.toString());
+  }
+}
diff --git a/yarn-project/p2p/src/tx_pool/index.ts b/yarn-project/p2p/src/tx_pool/index.ts
index 07d1496cc01..7e4b45ecdd1 100644
--- a/yarn-project/p2p/src/tx_pool/index.ts
+++ b/yarn-project/p2p/src/tx_pool/index.ts
@@ -1,2 +1,3 @@
 export * from './tx_pool.js';
 export * from './memory_tx_pool.js';
+export * from './aztec_kv_tx_pool.js';
diff --git a/yarn-project/p2p/src/tx_pool/memory_tx_pool.test.ts b/yarn-project/p2p/src/tx_pool/memory_tx_pool.test.ts
new file mode 100644
index 00000000000..fb910b4755c
--- /dev/null
+++ b/yarn-project/p2p/src/tx_pool/memory_tx_pool.test.ts
@@ -0,0 +1,11 @@
+import { InMemoryTxPool } from './index.js';
+import { describeTxPool } from './tx_pool_test_suite.js';
+
+describe('In-Memory TX pool', () => {
+  let inMemoryTxPool: InMemoryTxPool;
+  beforeEach(() => {
+    inMemoryTxPool = new InMemoryTxPool();
+  });
+
+  describeTxPool(() => inMemoryTxPool);
+});
diff --git a/yarn-project/p2p/src/tx_pool/memory_tx_pool.ts b/yarn-project/p2p/src/tx_pool/memory_tx_pool.ts
index 5016d687512..be6de982e19 100644
--- a/yarn-project/p2p/src/tx_pool/memory_tx_pool.ts
+++ b/yarn-project/p2p/src/tx_pool/memory_tx_pool.ts
@@ -52,11 +52,11 @@ export class InMemoryTxPool implements TxPool {
    * @param txHashes - An array of tx hashes to be removed from the tx pool.
    * @returns The number of transactions that was deleted from the pool.
    */
-  public deleteTxs(txHashes: TxHash[]): number {
-    const numTxsRemoved = txHashes
-      .map(txHash => this.txs.delete(txHash.toBigInt()))
-      .filter(result => result === true).length;
-    return numTxsRemoved;
+  public deleteTxs(txHashes: TxHash[]): Promise<void> {
+    for (const txHash of txHashes) {
+      this.txs.delete(txHash.toBigInt());
+    }
+    return Promise.resolve();
   }
 
   /**
diff --git a/yarn-project/p2p/src/tx_pool/tx_pool.test.ts b/yarn-project/p2p/src/tx_pool/tx_pool.test.ts
deleted file mode 100644
index be88190d729..00000000000
--- a/yarn-project/p2p/src/tx_pool/tx_pool.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { mockTx } from '@aztec/types';
-
-import { InMemoryTxPool } from './index.js';
-
-describe('In-Memory TX pool', () => {
-  it('Adds txs to the pool', async () => {
-    const pool = new InMemoryTxPool();
-    const tx1 = mockTx();
-
-    await pool.addTxs([tx1]);
-    const poolTx = pool.getTxByHash(await tx1.getTxHash());
-    expect(await poolTx!.getTxHash()).toEqual(await tx1.getTxHash());
-  });
-
-  it('Removes txs from the pool', async () => {
-    const pool = new InMemoryTxPool();
-    const tx1 = mockTx();
-
-    await pool.addTxs([tx1]);
-    pool.deleteTxs([await tx1.getTxHash()]);
-
-    const poolTx = pool.getTxByHash(await tx1.getTxHash());
-    expect(poolTx).toBeFalsy();
-  });
-});
diff --git a/yarn-project/p2p/src/tx_pool/tx_pool.ts b/yarn-project/p2p/src/tx_pool/tx_pool.ts
index 3faf3688075..dced0c45674 100644
--- a/yarn-project/p2p/src/tx_pool/tx_pool.ts
+++ b/yarn-project/p2p/src/tx_pool/tx_pool.ts
@@ -21,7 +21,7 @@ export interface TxPool {
    * Deletes transactions from the pool. Tx hashes that are not present are ignored.
    * @param txHashes - An array of tx hashes to be removed from the tx pool.
    */
-  deleteTxs(txHashes: TxHash[]): void;
+  deleteTxs(txHashes: TxHash[]): Promise<void>;
 
   /**
    * Gets all transactions currently in the tx pool.
diff --git a/yarn-project/p2p/src/tx_pool/tx_pool_test_suite.ts b/yarn-project/p2p/src/tx_pool/tx_pool_test_suite.ts
new file mode 100644
index 00000000000..457f2b4ba56
--- /dev/null
+++ b/yarn-project/p2p/src/tx_pool/tx_pool_test_suite.ts
@@ -0,0 +1,59 @@
+import { mockTx } from '@aztec/types';
+
+import { TxPool } from './tx_pool.js';
+
+/**
+ * Tests a TxPool implementation.
+ * @param getTxPool - Gets a fresh TxPool
+ */
+export function describeTxPool(getTxPool: () => TxPool) {
+  let pool: TxPool;
+
+  beforeEach(() => {
+    pool = getTxPool();
+  });
+
+  it('Adds txs to the pool', async () => {
+    const tx1 = mockTx();
+
+    await pool.addTxs([tx1]);
+    const poolTx = pool.getTxByHash(await tx1.getTxHash());
+    expect(await poolTx!.getTxHash()).toEqual(await tx1.getTxHash());
+  });
+
+  it('Removes txs from the pool', async () => {
+    const tx1 = mockTx();
+
+    await pool.addTxs([tx1]);
+    await pool.deleteTxs([await tx1.getTxHash()]);
+
+    const poolTx = pool.getTxByHash(await tx1.getTxHash());
+    expect(poolTx).toBeFalsy();
+  });
+
+  it('Returns all transactions in the pool', async () => {
+    const tx1 = mockTx(1);
+    const tx2 = mockTx(2);
+    const tx3 = mockTx(3);
+
+    await pool.addTxs([tx1, tx2, tx3]);
+
+    const poolTxs = pool.getAllTxs();
+    expect(poolTxs).toHaveLength(3);
+    expect(poolTxs).toEqual(expect.arrayContaining([tx1, tx2, tx3]));
+  });
+
+  it('Returns all txHashes in the pool', async () => {
+    const tx1 = mockTx(1);
+    const tx2 = mockTx(2);
+    const tx3 = mockTx(3);
+
+    await pool.addTxs([tx1, tx2, tx3]);
+
+    const poolTxHashes = pool.getAllTxHashes();
+    expect(poolTxHashes).toHaveLength(3);
+    expect(poolTxHashes).toEqual(
+      expect.arrayContaining([await tx1.getTxHash(), await tx2.getTxHash(), await tx3.getTxHash()]),
+    );
+  });
+}
diff --git a/yarn-project/p2p/tsconfig.json b/yarn-project/p2p/tsconfig.json
index 1820488d409..b780dee9f30 100644
--- a/yarn-project/p2p/tsconfig.json
+++ b/yarn-project/p2p/tsconfig.json
@@ -14,6 +14,9 @@
     },
     {
       "path": "../types"
+    },
+    {
+      "path": "../kv-store"
     }
   ],
   "include": ["src"]
diff --git a/yarn-project/types/src/stats/index.ts b/yarn-project/types/src/stats/index.ts
index 5bf1e142616..a706353358f 100644
--- a/yarn-project/types/src/stats/index.ts
+++ b/yarn-project/types/src/stats/index.ts
@@ -14,5 +14,5 @@ export const BENCHMARK_HISTORY_BLOCK_SIZE = process.env.BENCHMARK_HISTORY_BLOCK_
 
 /** Chain lengths to test for history processing benchmarks. */
 export const BENCHMARK_HISTORY_CHAIN_LENGTHS = process.env.BENCHMARK_HISTORY_CHAIN_LENGTHS
-  ? process.env.BENCHMARK_HISTORY_CHAIN_LENGTHS.split(',').map(Number)
+  ? process.env.BENCHMARK_HISTORY_CHAIN_LENGTHS.split(',').map(x => Number(x))
   : [5, 10];
diff --git a/yarn-project/types/src/tx/tx.ts b/yarn-project/types/src/tx/tx.ts
index 0e21ec98bd0..da93669f451 100644
--- a/yarn-project/types/src/tx/tx.ts
+++ b/yarn-project/types/src/tx/tx.ts
@@ -1,10 +1,4 @@
-import {
-  MAX_NEW_CONTRACTS_PER_TX,
-  MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  PrivateKernelPublicInputsFinal,
-  Proof,
-  PublicCallRequest,
-} from '@aztec/circuits.js';
+import { MAX_NEW_CONTRACTS_PER_TX, PrivateKernelPublicInputsFinal, Proof, PublicCallRequest } from '@aztec/circuits.js';
 import { serializeToBuffer } from '@aztec/circuits.js/utils';
 import { arrayNonEmptyLength } from '@aztec/foundation/collection';
 import { BufferReader, Tuple } from '@aztec/foundation/serialize';
@@ -81,8 +75,8 @@ export class Tx {
       reader.readObject(Proof),
       reader.readObject(TxL2Logs),
       reader.readObject(TxL2Logs),
-      reader.readArray(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, PublicCallRequest),
-      reader.readArray(MAX_NEW_CONTRACTS_PER_TX, ExtendedContractData),
+      reader.readArray(reader.readNumber(), PublicCallRequest),
+      reader.readArray(reader.readNumber(), ExtendedContractData) as [ExtendedContractData],
     );
   }
 
@@ -96,7 +90,9 @@ export class Tx {
       this.proof,
       this.encryptedLogs,
       this.unencryptedLogs,
+      this.enqueuedPublicFunctionCalls.length,
       this.enqueuedPublicFunctionCalls,
+      this.newContracts.length,
       this.newContracts,
     ]);
   }
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
index 0b46ca39560..2f7b27d8744 100644
--- a/yarn-project/yarn.lock
+++ b/yarn-project/yarn.lock
@@ -146,6 +146,7 @@ __metadata:
     "@aztec/circuits.js": "workspace:^"
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
+    "@aztec/kv-store": "workspace:^"
     "@aztec/l1-artifacts": "workspace:^"
     "@aztec/merkle-tree": "workspace:^"
     "@aztec/p2p": "workspace:^"
@@ -660,6 +661,7 @@ __metadata:
   dependencies:
     "@aztec/circuits.js": "workspace:^"
     "@aztec/foundation": "workspace:^"
+    "@aztec/kv-store": "workspace:^"
     "@aztec/types": "workspace:^"
     "@chainsafe/libp2p-noise": ^13.0.0
     "@chainsafe/libp2p-yamux": ^5.0.0