@aztec/p2p 0.37.0 → 0.39.0

package/src/service/tx_messages.ts

@@ -1,34 +1,26 @@
-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 enum Messages {
-  POOLED_TRANSACTIONS = 1,
-  POOLED_TRANSACTION_HASHES = 2,
-  GET_TRANSACTIONS = 3,
-}
+import { type SemVer } from 'semver';
 
-/**
- * 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: Messages, messageData: Buffer) {
-  return Buffer.concat([numToUInt32BE(type), messageData]);
-}
+export const TX_MESSAGE_TOPIC = '';
 
-/**
- * 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: Tx[]) {
-  const messageData = txs.map(toTxMessage);
-  return createMessage(Messages.POOLED_TRANSACTIONS, Buffer.concat(messageData));
+export class AztecTxMessageCreator {
+  private readonly topic: string;
+  constructor(version: SemVer) {
+    this.topic = `/aztec/tx/${version.toString()}`;
+  }
+
+  createTxMessage(tx: Tx) {
+    const messageData = toTxMessage(tx);
+
+    return { topic: this.topic, data: messageData };
+  }
+
+  getTopic() {
+    return this.topic;
+  }
 }
 
 /**
@@ -49,73 +41,6 @@ export function decodeTransactionsMessage(message: Buffer) {
   return txs;
 }
 
-/**
- * Create a POOLED_TRANSACTION_HASHES message.
- * @param hashes - The transaction hashes to be sent.
- * @returns The encoded message.
- */
-export function createTransactionHashesMessage(hashes: TxHash[]) {
-  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: Buffer) {
-  let offset = 0;
-  const txHashes: TxHash[] = [];
-  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: TxHash[]) {
-  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: Buffer) {
-  // 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: Buffer) {
-  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: Buffer) {
-  return message.subarray(4);
-}
-
 /**
  * Creates a tx 'message' for sending to a peer.
  * @param tx - The transaction to convert to a message.
@@ -146,6 +71,7 @@ export function toTxMessage(tx: Tx): Buffer {
     createMessageComponent(tx.encryptedLogs),
     createMessageComponent(tx.unencryptedLogs),
     createMessageComponents(tx.enqueuedPublicFunctionCalls),
+    createMessageComponent(tx.publicTeardownFunctionCall),
   ]);
   const messageLength = numToUInt32BE(messageBuffer.length);
   return Buffer.concat([messageLength, messageBuffer]);
@@ -198,5 +124,14 @@ export function fromTxMessage(buffer: Buffer): Tx {
   }
 
   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!,
+  );
 }