@aztec/p2p 0.37.0 → 0.39.0

package/dest/service/tx_messages.d.ts

@@ -1,68 +1,22 @@
 /// <reference types="node" resolution-mode="require"/>
-import { Tx, TxHash } from '@aztec/circuit-types';
-/**
- * Enumeration of P2P message types.
- */
-export declare enum Messages {
-    POOLED_TRANSACTIONS = 1,
-    POOLED_TRANSACTION_HASHES = 2,
-    GET_TRANSACTIONS = 3
+import { Tx } from '@aztec/circuit-types';
+import { type SemVer } from 'semver';
+export declare const TX_MESSAGE_TOPIC = "";
+export declare class AztecTxMessageCreator {
+    private readonly topic;
+    constructor(version: SemVer);
+    createTxMessage(tx: Tx): {
+        topic: string;
+        data: Buffer;
+    };
+    getTopic(): string;
 }
-/**
- * Create a P2P message from the message type and message data.
- * @param type - The type of the message.
- * @param messageData - The binary message data.
- * @returns The encoded message.
- */
-export declare function createMessage(type: Messages, messageData: Buffer): Buffer;
-/**
- * Create a POOLED_TRANSACTIONS message from an array of transactions.
- * @param txs - The transactions to encoded into a message.
- * @returns The encoded message.
- */
-export declare function createTransactionsMessage(txs: Tx[]): Buffer;
 /**
  * Decode a POOLED_TRANSACTIONS message into the original transaction objects.
  * @param message - The binary message to be decoded.
  * @returns - The array of transactions originally encoded into the message.
  */
 export declare function decodeTransactionsMessage(message: Buffer): Tx[];
-/**
- * Create a POOLED_TRANSACTION_HASHES message.
- * @param hashes - The transaction hashes to be sent.
- * @returns The encoded message.
- */
-export declare function createTransactionHashesMessage(hashes: TxHash[]): Buffer;
-/**
- * Decode a POOLED_TRANSACTION_HASHESs message ito the original transaction hash objects.
- * @param message - The binary message to be decoded.
- * @returns - The array of transaction hashes originally encoded into the message.
- */
-export declare function decodeTransactionHashesMessage(message: Buffer): TxHash[];
-/**
- * Create a GET_TRANSACTIONS message from an array of transaction hashes.
- * @param hashes - The hashes of the transactions to be requested.
- * @returns The encoded message.
- */
-export declare function createGetTransactionsRequestMessage(hashes: TxHash[]): Buffer;
-/**
- * Decode a GET_TRANSACTIONS message into the original transaction hash objects.
- * @param message - The binary message to be decoded.
- * @returns - The array of transaction hashes originally encoded into the message.
- */
-export declare function decodeGetTransactionsRequestMessage(message: Buffer): TxHash[];
-/**
- * Decode the message type from a received message.
- * @param message - The received message.
- * @returns The decoded MessageType.
- */
-export declare function decodeMessageType(message: Buffer): number;
-/**
- * Return the encoded message (minus the header) from received message buffer.
- * @param message - The complete received message.
- * @returns The encoded message, without the header.
- */
-export declare function getEncodedMessage(message: Buffer): Buffer;
 /**
  * Creates a tx 'message' for sending to a peer.
  * @param tx - The transaction to convert to a message.

package/dest/service/tx_messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_messages.d.ts","sourceRoot":"","sources":["../../src/service/tx_messages.ts"],"names":[],"mappings":";AAAA,OAAO,EAAqB,EAAE,EAAE,MAAM,EAAuB,MAAM,sBAAsB,CAAC;AAI1F;;GAEG;AACH,oBAAY,QAAQ;IAClB,mBAAmB,IAAI;IACvB,yBAAyB,IAAI;IAC7B,gBAAgB,IAAI;CACrB;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAEhE;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,EAAE,EAAE,UAGlD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,QAWxD;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,EAAE,UAG9D;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,MAAM,YAY7D;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,MAAM,EAAE,UAGnE;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,MAAM,YAGlE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,UAEhD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,UAEhD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CA4B1C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,CA2ChD"}
+{"version":3,"file":"tx_messages.d.ts","sourceRoot":"","sources":["../../src/service/tx_messages.ts"],"names":[],"mappings":";AAAA,OAAO,EAAqB,EAAE,EAAuB,MAAM,sBAAsB,CAAC;AAIlF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;gBACnB,OAAO,EAAE,MAAM;IAI3B,eAAe,CAAC,EAAE,EAAE,EAAE;;;;IAMtB,QAAQ;CAGT;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,QAWxD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CA6B1C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,CAoDhD"}

package/dest/service/tx_messages.js

@@ -1,32 +1,18 @@
-import { EncryptedTxL2Logs, Tx, TxHash, UnencryptedTxL2Logs } from '@aztec/circuit-types';
+import { EncryptedTxL2Logs, Tx, UnencryptedTxL2Logs } from '@aztec/circuit-types';
 import { PrivateKernelTailCircuitPublicInputs, Proof, PublicCallRequest } from '@aztec/circuits.js';
 import { numToUInt32BE } from '@aztec/foundation/serialize';
-/**
- * Enumeration of P2P message types.
- */
-export var Messages;
-(function (Messages) {
-    Messages[Messages["POOLED_TRANSACTIONS"] = 1] = "POOLED_TRANSACTIONS";
-    Messages[Messages["POOLED_TRANSACTION_HASHES"] = 2] = "POOLED_TRANSACTION_HASHES";
-    Messages[Messages["GET_TRANSACTIONS"] = 3] = "GET_TRANSACTIONS";
-})(Messages || (Messages = {}));
-/**
- * Create a P2P message from the message type and message data.
- * @param type - The type of the message.
- * @param messageData - The binary message data.
- * @returns The encoded message.
- */
-export function createMessage(type, messageData) {
-    return Buffer.concat([numToUInt32BE(type), messageData]);
-}
-/**
- * Create a POOLED_TRANSACTIONS message from an array of transactions.
- * @param txs - The transactions to encoded into a message.
- * @returns The encoded message.
- */
-export function createTransactionsMessage(txs) {
-    const messageData = txs.map(toTxMessage);
-    return createMessage(Messages.POOLED_TRANSACTIONS, Buffer.concat(messageData));
+export const TX_MESSAGE_TOPIC = '';
+export class AztecTxMessageCreator {
+    constructor(version) {
+        this.topic = `/aztec/tx/${version.toString()}`;
+    }
+    createTxMessage(tx) {
+        const messageData = toTxMessage(tx);
+        return { topic: this.topic, data: messageData };
+    }
+    getTopic() {
+        return this.topic;
+    }
 }
 /**
  * Decode a POOLED_TRANSACTIONS message into the original transaction objects.
@@ -45,67 +31,6 @@ export function decodeTransactionsMessage(message) {
     }
     return txs;
 }
-/**
- * Create a POOLED_TRANSACTION_HASHES message.
- * @param hashes - The transaction hashes to be sent.
- * @returns The encoded message.
- */
-export function createTransactionHashesMessage(hashes) {
-    const messageData = hashes.map(x => x.buffer);
-    return createMessage(Messages.POOLED_TRANSACTION_HASHES, Buffer.concat(messageData));
-}
-/**
- * Decode a POOLED_TRANSACTION_HASHESs message ito the original transaction hash objects.
- * @param message - The binary message to be decoded.
- * @returns - The array of transaction hashes originally encoded into the message.
- */
-export function decodeTransactionHashesMessage(message) {
-    let offset = 0;
-    const txHashes = [];
-    while (offset < message.length) {
-        const slice = message.subarray(offset, offset + TxHash.SIZE);
-        if (slice.length < TxHash.SIZE) {
-            throw new Error(`Invalid message size when processing transaction hashes message`);
-        }
-        txHashes.push(new TxHash(slice));
-        offset += TxHash.SIZE;
-    }
-    return txHashes;
-}
-/**
- * Create a GET_TRANSACTIONS message from an array of transaction hashes.
- * @param hashes - The hashes of the transactions to be requested.
- * @returns The encoded message.
- */
-export function createGetTransactionsRequestMessage(hashes) {
-    const messageData = hashes.map(x => x.buffer);
-    return createMessage(Messages.GET_TRANSACTIONS, Buffer.concat(messageData));
-}
-/**
- * Decode a GET_TRANSACTIONS message into the original transaction hash objects.
- * @param message - The binary message to be decoded.
- * @returns - The array of transaction hashes originally encoded into the message.
- */
-export function decodeGetTransactionsRequestMessage(message) {
-    // for the time being this payload is effectively the same as the POOLED_TRANSACTION_HASHES message
-    return decodeTransactionHashesMessage(message);
-}
-/**
- * Decode the message type from a received message.
- * @param message - The received message.
- * @returns The decoded MessageType.
- */
-export function decodeMessageType(message) {
-    return message.readUInt32BE(0);
-}
-/**
- * Return the encoded message (minus the header) from received message buffer.
- * @param message - The complete received message.
- * @returns The encoded message, without the header.
- */
-export function getEncodedMessage(message) {
-    return message.subarray(4);
-}
 /**
  * Creates a tx 'message' for sending to a peer.
  * @param tx - The transaction to convert to a message.
@@ -136,6 +61,7 @@ export function toTxMessage(tx) {
         createMessageComponent(tx.encryptedLogs),
         createMessageComponent(tx.unencryptedLogs),
         createMessageComponents(tx.enqueuedPublicFunctionCalls),
+        createMessageComponent(tx.publicTeardownFunctionCall),
     ]);
     const messageLength = numToUInt32BE(messageBuffer.length);
     return Buffer.concat([messageLength, messageBuffer]);
@@ -184,6 +110,7 @@ export function fromTxMessage(buffer) {
         unencryptedLogs.obj = new UnencryptedTxL2Logs([]);
     }
     const publicCalls = toObjectArray(unencryptedLogs.remainingData, PublicCallRequest);
-    return new Tx(publicInputs.obj, proof.obj, encryptedLogs.obj, unencryptedLogs.obj, publicCalls.objects);
+    const publicTeardownCall = toObject(publicCalls.remainingData, PublicCallRequest);
+    return new Tx(publicInputs.obj, proof.obj, encryptedLogs.obj, unencryptedLogs.obj, publicCalls.objects, publicTeardownCall.obj);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfbWVzc2FnZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZS90eF9tZXNzYWdlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzFGLE9BQU8sRUFBRSxvQ0FBb0MsRUFBRSxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFNUQ7O0dBRUc7QUFDSCxNQUFNLENBQU4sSUFBWSxRQUlYO0FBSkQsV0FBWSxRQUFRO0lBQ2xCLHFFQUF1QixDQUFBO0lBQ3ZCLGlGQUE2QixDQUFBO0lBQzdCLCtEQUFvQixDQUFBO0FBQ3RCLENBQUMsRUFKVyxRQUFRLEtBQVIsUUFBUSxRQUluQjtBQUVEOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGFBQWEsQ0FBQyxJQUFjLEVBQUUsV0FBbUI7SUFDL0QsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUM7QUFDM0QsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUseUJBQXlCLENBQUMsR0FBUztJQUNqRCxNQUFNLFdBQVcsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3pDLE9BQU8sYUFBYSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7QUFDakYsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUseUJBQXlCLENBQUMsT0FBZTtJQUN2RCxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQUM7SUFDckIsSUFBSSxNQUFNLEdBQUcsQ0FBQyxDQUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfbWVzc2FnZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZS90eF9tZXNzYWdlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsRUFBRSxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEYsT0FBTyxFQUFFLG9DQUFvQyxFQUFFLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BHLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUk1RCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxFQUFFLENBQUM7QUFFbkMsTUFBTSxPQUFPLHFCQUFxQjtJQUVoQyxZQUFZLE9BQWU7UUFDekIsSUFBSSxDQUFDLEtBQUssR0FBRyxhQUFhLE9BQU8sQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDO0lBQ2pELENBQUM7SUFFRCxlQUFlLENBQUMsRUFBTTtRQUNwQixNQUFNLFdBQVcsR0FBRyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFcEMsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsQ0FBQztJQUNsRCxDQUFDO0lBRUQsUUFBUTtRQUNOLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLHlCQUF5QixDQUFDLE9BQWU7SUFDdkQsTUFBTSxVQUFVLEdBQUcsQ0FBQyxDQUFDO0lBQ3JCLElBQUksTUFBTSxHQUFHLENBQUMsQ0FBQztJQUNmLE1BQU0sR0FBRyxHQUFTLEVBQUUsQ0FBQztJQUNyQixPQUFPLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDL0IsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM5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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/p2p",
-  "version": "0.37.0",
+  "version": "0.39.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -47,27 +47,31 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.37.0",
-    "@aztec/circuits.js": "0.37.0",
-    "@aztec/foundation": "0.37.0",
-    "@aztec/kv-store": "0.37.0",
-    "@chainsafe/discv5": "^9.0.0",
-    "@chainsafe/enr": "^3.0.0",
+    "@aztec/circuit-types": "0.39.0",
+    "@aztec/circuits.js": "0.39.0",
+    "@aztec/foundation": "0.39.0",
+    "@aztec/kv-store": "0.39.0",
+    "@chainsafe/discv5": "9.0.0",
+    "@chainsafe/enr": "3.0.0",
+    "@chainsafe/libp2p-gossipsub": "13.0.0",
     "@chainsafe/libp2p-noise": "^15.0.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
-    "@libp2p/bootstrap": "^9.0.4",
-    "@libp2p/crypto": "^4.0.3",
-    "@libp2p/identify": "^1.0.15",
-    "@libp2p/interface": "^1.1.4",
-    "@libp2p/interface-libp2p": "^3.2.0",
-    "@libp2p/kad-dht": "^10.0.4",
-    "@libp2p/mplex": "^10.0.16",
-    "@libp2p/peer-id": "^4.0.7",
-    "@libp2p/peer-id-factory": "^4.0.7",
-    "@libp2p/tcp": "^9.0.16",
-    "@multiformats/multiaddr": "^12.1.14",
+    "@libp2p/bootstrap": "10.0.0",
+    "@libp2p/crypto": "4.0.3",
+    "@libp2p/identify": "1.0.18",
+    "@libp2p/interface": "1.3.1",
+    "@libp2p/kad-dht": "10.0.4",
+    "@libp2p/mplex": "10.0.16",
+    "@libp2p/peer-id": "4.0.7",
+    "@libp2p/peer-id-factory": "4.1.1",
+    "@libp2p/peer-store": "10.0.16",
+    "@libp2p/tcp": "9.0.24",
+    "@multiformats/multiaddr": "12.1.14",
+    "interface-datastore": "^8.2.11",
+    "interface-store": "^5.1.8",
     "it-pipe": "^3.0.1",
-    "libp2p": "^1.2.4",
+    "libp2p": "1.5.0",
+    "semver": "^7.6.0",
     "sha3": "^2.1.4",
     "tslib": "^2.4.0"
   },
@@ -75,10 +79,13 @@
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^18.14.6",
+    "it-drain": "^3.0.5",
+    "it-length": "^3.0.6",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.4",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.0.4",
+    "uint8arrays": "^5.0.3"
   },
   "files": [
     "dest",

package/src/bootstrap/bootstrap.ts

@@ -6,6 +6,7 @@ import type { PeerId } from '@libp2p/interface';
 import { type Multiaddr, multiaddr } from '@multiformats/multiaddr';
 
 import { type P2PConfig } from '../config.js';
+import { AZTEC_ENR_KEY, AZTEC_NET } from '../service/discV5_service.js';
 import { createLibP2PPeerId } from '../service/index.js';
 
 /**
@@ -38,6 +39,7 @@ export class BootstrapNode {
     const listenAddrUdp = multiaddr(`/ip4/${udpListenIp}/udp/${udpListenPort}`);
     const publicAddr = multiaddr(`${announceHostname}/udp/${announcePort}`);
     enr.setLocationMultiaddr(publicAddr);
+    enr.set(AZTEC_ENR_KEY, Uint8Array.from([AZTEC_NET]));
 
     this.logger.info(`Starting bootstrap node ${peerId}, listening on ${listenAddrUdp.toString()}`);
 

package/src/client/mocks.ts

@@ -78,7 +78,16 @@ export class MockBlockSource implements L2BlockSource {
     for (const block of this.l2Blocks) {
       for (const txEffect of block.body.txEffects) {
         if (txEffect.txHash.equals(txHash)) {
-          return Promise.resolve(new TxReceipt(txHash, TxStatus.MINED, '', block.hash().toBuffer(), block.number));
+          return Promise.resolve(
+            new TxReceipt(
+              txHash,
+              TxStatus.MINED,
+              '',
+              txEffect.transactionFee.toBigInt(),
+              block.hash().toBuffer(),
+              block.number,
+            ),
+          );
         }
       }
     }

package/src/config.ts

@@ -1,3 +1,5 @@
+import { SemVer } from 'semver';
+
 /**
  * P2P client configuration values.
  */
@@ -86,6 +88,11 @@ export interface P2PConfig {
    * Data directory for peer & tx databases.
    */
   dataDirectory?: string;
+
+  /**
+   * The transaction gossiping message version.
+   */
+  txGossipVersion: SemVer;
 }
 
 /**
@@ -110,6 +117,7 @@ export function getP2PConfigEnvVars(): P2PConfig {
     P2P_MIN_PEERS,
     P2P_MAX_PEERS,
     DATA_DIRECTORY,
+    TX_GOSSIP_VERSION,
   } = process.env;
   const envVars: P2PConfig = {
     p2pEnabled: P2P_ENABLED === 'true',
@@ -129,6 +137,7 @@ export function getP2PConfigEnvVars(): P2PConfig {
     minPeerCount: P2P_MIN_PEERS ? +P2P_MIN_PEERS : 10,
     maxPeerCount: P2P_MAX_PEERS ? +P2P_MAX_PEERS : 100,
     dataDirectory: DATA_DIRECTORY,
+    txGossipVersion: TX_GOSSIP_VERSION ? new SemVer(TX_GOSSIP_VERSION) : new SemVer('0.1.0'),
   };
   return envVars;
 }

package/src/service/data_store.ts

@@ -0,0 +1,235 @@
+import { filter, map, sort, take } from '@aztec/foundation/iterable';
+import type { AztecKVStore, AztecMap } from '@aztec/kv-store';
+
+import { type Batch, type Datastore, Key, type KeyQuery, type Pair, type Query } from 'interface-datastore';
+import type { AwaitIterable } from 'interface-store';
+
+type MemoryItem = {
+  lastAccessedMs: number;
+  data: Uint8Array;
+};
+
+type BatchOp = {
+  type: 'put' | 'del';
+  key: Key;
+  value?: Uint8Array;
+};
+
+class KeyNotFoundError extends Error {
+  code: string;
+  constructor(message: string) {
+    super(message);
+    this.code = 'ERR_NOT_FOUND';
+  }
+}
+
+export class AztecDatastore implements Datastore {
+  #memoryDatastore: Map<string, MemoryItem>;
+  #dbDatastore: AztecMap<string, Uint8Array>;
+
+  #batchOps: BatchOp[] = [];
+
+  private maxMemoryItems: number;
+
+  constructor(db: AztecKVStore, { maxMemoryItems } = { maxMemoryItems: 50 }) {
+    this.#memoryDatastore = new Map();
+    this.#dbDatastore = db.openMap('p2p_datastore');
+
+    this.maxMemoryItems = maxMemoryItems;
+  }
+
+  has(key: Key): boolean {
+    return this.#memoryDatastore.has(key.toString()) || this.#dbDatastore.has(key.toString());
+  }
+
+  get(key: Key): Uint8Array {
+    const keyStr = key.toString();
+    const memoryItem = this.#memoryDatastore.get(keyStr);
+    if (memoryItem) {
+      memoryItem.lastAccessedMs = Date.now();
+      return memoryItem.data;
+    }
+    const dbItem = this.#dbDatastore.get(keyStr);
+
+    if (!dbItem) {
+      throw new KeyNotFoundError(`Key not found`);
+    }
+
+    return Uint8Array.from(dbItem);
+  }
+
+  put(key: Key, val: Uint8Array): Promise<Key> {
+    return this._put(key, val);
+  }
+
+  async *putMany(source: AwaitIterable<Pair>): AwaitIterable<Key> {
+    for await (const { key, value } of source) {
+      await this.put(key, value);
+      yield key;
+    }
+  }
+
+  async *getMany(source: AwaitIterable<Key>): AwaitIterable<Pair> {
+    for await (const key of source) {
+      yield {
+        key,
+        value: this.get(key),
+      };
+    }
+  }
+
+  async *deleteMany(source: AwaitIterable<Key>): AwaitIterable<Key> {
+    for await (const key of source) {
+      await this.delete(key);
+      yield key;
+    }
+  }
+
+  async delete(key: Key): Promise<void> {
+    this.#memoryDatastore.delete(key.toString());
+    await this.#dbDatastore.delete(key.toString());
+  }
+
+  batch(): Batch {
+    return {
+      put: (key, value) => {
+        this.#batchOps.push({
+          type: 'put',
+          key,
+          value,
+        });
+      },
+      delete: key => {
+        this.#batchOps.push({
+          type: 'del',
+          key,
+        });
+      },
+      commit: async () => {
+        for (const op of this.#batchOps) {
+          if (op.type === 'put' && op.value) {
+            await this.put(op.key, op.value);
+          } else if (op.type === 'del') {
+            await this.delete(op.key);
+          }
+        }
+        this.#batchOps = []; // Clear operations after commit
+      },
+    };
+  }
+
+  query(q: Query): AwaitIterable<Pair> {
+    let it = this.all(); //
+    const { prefix, filters, orders, offset, limit } = q;
+
+    if (prefix != null) {
+      it = filter(it, e => e.key.toString().startsWith(`${prefix}`));
+    }
+
+    if (Array.isArray(filters)) {
+      it = filters.reduce((it, f) => filter(it, f), it);
+    }
+
+    if (Array.isArray(orders)) {
+      it = orders.reduce((it, f) => sort(it, f), it);
+    }
+
+    if (offset != null) {
+      let i = 0;
+      it = filter(it, () => i++ >= offset);
+    }
+
+    if (limit != null) {
+      it = take(it, limit);
+    }
+
+    return it;
+  }
+
+  queryKeys(q: KeyQuery): AsyncIterable<Key> {
+    let it = map(this.all(), ({ key }) => key);
+    const { prefix, filters, orders, offset, limit } = q;
+    if (prefix != null) {
+      it = filter(it, e => e.toString().startsWith(`${prefix}`));
+    }
+
+    if (Array.isArray(filters)) {
+      it = filters.reduce((it, f) => filter(it, f), it);
+    }
+
+    if (Array.isArray(orders)) {
+      it = orders.reduce((it, f) => sort(it, f), it);
+    }
+
+    if (offset != null) {
+      let i = 0;
+      it = filter(it, () => i++ >= offset);
+    }
+
+    if (limit != null) {
+      it = take(it, limit);
+    }
+
+    return it;
+  }
+
+  private async _put(key: Key, val: Uint8Array): Promise<Key> {
+    const keyStr = key.toString();
+    while (this.#memoryDatastore.size >= this.maxMemoryItems) {
+      this.pruneMemoryDatastore();
+    }
+    const memoryItem = this.#memoryDatastore.get(keyStr);
+    if (memoryItem) {
+      // update existing
+      memoryItem.lastAccessedMs = Date.now();
+      memoryItem.data = val;
+    } else {
+      // new entry
+      this.#memoryDatastore.set(keyStr, { data: val, lastAccessedMs: Date.now() });
+    }
+
+    // Always add to DB
+    await this.#dbDatastore.set(keyStr, val);
+
+    return key;
+  }
+
+  private async *all(): AsyncIterable<Pair> {
+    for (const [key, value] of this.#memoryDatastore.entries()) {
+      yield {
+        key: new Key(key),
+        value: value.data,
+      };
+    }
+
+    for (const [key, value] of this.#dbDatastore.entries()) {
+      if (!this.#memoryDatastore.has(key)) {
+        yield {
+          key: new Key(key),
+          value,
+        };
+      }
+    }
+  }
+
+  /**
+   * Prune memory store
+   */
+  private pruneMemoryDatastore(): void {
+    let oldestAccessedMs = Date.now() + 1000;
+    let oldestKey: string | undefined = undefined;
+    let oldestValue: Uint8Array | undefined = undefined;
+
+    for (const [key, value] of this.#memoryDatastore) {
+      if (value.lastAccessedMs < oldestAccessedMs) {
+        oldestAccessedMs = value.lastAccessedMs;
+        oldestKey = key;
+        oldestValue = value.data;
+      }
+    }
+
+    if (oldestKey && oldestValue) {
+      this.#memoryDatastore.delete(oldestKey);
+    }
+  }
+}