@aztec/stdlib 0.82.3 → 0.83.1-alpha-testnet.0

package/dest/logs/l1_payload/encrypted_log_payload.js

@@ -1,140 +0,0 @@
-import { PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
-import { randomBytes } from '@aztec/foundation/crypto';
-import { Fr, NotOnCurveError, Point } from '@aztec/foundation/fields';
-import { BufferReader, numToUInt16BE, serializeToBuffer } from '@aztec/foundation/serialize';
-import { AztecAddress } from '../../aztec-address/index.js';
-import { derivePublicKeyFromSecretKey } from '../../keys/derivation.js';
-import { PrivateLog } from '../private_log.js';
-import { aes128Decrypt, aes128Encrypt, deriveAesSymmetricKeyAndIvFromEcdhSharedSecretUsingSha256 } from './encryption_util.js';
-import { deriveEcdhSharedSecret, deriveEcdhSharedSecretUsingAztecAddress } from './shared_secret_derivation.js';
-// Below constants should match the values defined in aztec-nr/aztec/src/encrypted_logs/log_assembly_strategies/default_aes128/note.nr.
-// Note: we will soon be 'abstracting' log processing: apps will process their own logs, instead of the PXE processing all apps' logs. Therefore, this file will imminently change considerably.
-const TAG_SIZE_IN_FIELDS = 1;
-const EPK_SIZE_IN_FIELDS = 1;
-const USABLE_PRIVATE_LOG_SIZE_IN_FIELDS = PRIVATE_LOG_SIZE_IN_FIELDS - TAG_SIZE_IN_FIELDS - EPK_SIZE_IN_FIELDS;
-const USABLE_PRIVATE_LOG_SIZE_IN_BYTES = USABLE_PRIVATE_LOG_SIZE_IN_FIELDS * 31 / 16 * 16;
-// The incoming header ciphertext is 48 bytes
-// 32 bytes for the address, and 16 bytes padding to follow PKCS#7
-const HEADER_CIPHERTEXT_SIZE_IN_BYTES = 48;
-const USABLE_PLAINTEXT_SIZE_IN_BYTES = USABLE_PRIVATE_LOG_SIZE_IN_BYTES - HEADER_CIPHERTEXT_SIZE_IN_BYTES;
-const CONTRACT_ADDRESS_SIZE_IN_BYTES = 32;
-const SIZE_OF_ENCODING_OF_CIPHERTEXT_SIZE_IN_BYTES = 2;
-function beBytes31ToFields(bytes) {
-    const fields = [];
-    const numFields = Math.ceil(bytes.length / 31);
-    for(let i = 0; i < numFields; i++){
-        fields.push(new Fr(bytes.subarray(i * 31, (i + 1) * 31)));
-    }
-    return fields;
-}
-function fieldsToBEBytes31(fields) {
-    return Buffer.concat(fields.map((f)=>f.toBuffer().subarray(1)));
-}
-/**
- * Encrypted log payload with a tag used for retrieval by clients.
- */ export class EncryptedLogPayload {
-    tag;
-    contractAddress;
-    incomingBodyPlaintext;
-    constructor(/**
-     * Note discovery tag.
-     */ tag, /**
-     * Address of a contract that emitted the log.
-     */ contractAddress, /**
-     * Decrypted incoming body.
-     */ incomingBodyPlaintext){
-        this.tag = tag;
-        this.contractAddress = contractAddress;
-        this.incomingBodyPlaintext = incomingBodyPlaintext;
-    }
-    // NB: Only appears to be used in tests
-    // See noir-projects/aztec-nr/aztec/src/encrypted_logs/log_assembly_strategies/default_aes128/note.nr
-    async generatePayload(ephSk, recipient, rand = randomBytes) {
-        const ephPk = await derivePublicKeyFromSecretKey(ephSk);
-        const [ephPkX, ephPkSignBool] = ephPk.toXAndSign();
-        const ephPkSignU8 = Buffer.from([
-            Number(ephPkSignBool)
-        ]);
-        const ciphertextSharedSecret = await deriveEcdhSharedSecretUsingAztecAddress(ephSk, recipient); // not to be confused with the tagging shared secret
-        const [symKey, iv] = deriveAesSymmetricKeyAndIvFromEcdhSharedSecretUsingSha256(ciphertextSharedSecret);
-        if (this.incomingBodyPlaintext.length > USABLE_PLAINTEXT_SIZE_IN_BYTES) {
-            throw new Error(`Incoming body plaintext cannot be more than ${USABLE_PLAINTEXT_SIZE_IN_BYTES} bytes.`);
-        }
-        const finalPlaintext = this.incomingBodyPlaintext;
-        const ciphertextBytes = await aes128Encrypt(finalPlaintext, iv, symKey);
-        const headerPlaintext = serializeToBuffer(this.contractAddress.toBuffer(), numToUInt16BE(ciphertextBytes.length));
-        // TODO: it is unsafe to re-use the same iv and symKey. We'll need to do something cleverer.
-        const headerCiphertextBytes = await aes128Encrypt(headerPlaintext, iv, symKey);
-        if (headerCiphertextBytes.length !== HEADER_CIPHERTEXT_SIZE_IN_BYTES) {
-            throw new Error(`Invalid header ciphertext size: ${headerCiphertextBytes.length}`);
-        }
-        const properLogBytesLength = 1 /* ephPkSignU8 */  + HEADER_CIPHERTEXT_SIZE_IN_BYTES + ciphertextBytes.length;
-        const logBytesPaddingToMult31 = rand(31 * Math.ceil(properLogBytesLength / 31) - properLogBytesLength);
-        const logBytes = serializeToBuffer(ephPkSignU8, headerCiphertextBytes, ciphertextBytes, logBytesPaddingToMult31);
-        if (logBytes.length % 31 !== 0) {
-            throw new Error(`logBytes.length should be divisible by 31, got: ${logBytes.length}`);
-        }
-        const fieldsPadding = Array.from({
-            length: USABLE_PRIVATE_LOG_SIZE_IN_FIELDS - logBytes.length / 31
-        }, ()=>Fr.fromBuffer(rand(32))); // we use the randomBytes function instead of `Fr.random()`, so that we can use deterministic randomness in tests, through the rand() function.
-        const logFields = [
-            this.tag,
-            ephPkX,
-            ...beBytes31ToFields(logBytes),
-            ...fieldsPadding
-        ];
-        if (logFields.length !== PRIVATE_LOG_SIZE_IN_FIELDS) {
-            throw new Error(`Expected private log payload to have ${PRIVATE_LOG_SIZE_IN_FIELDS} fields. Got ${logFields.length}.`);
-        }
-        return new PrivateLog(logFields);
-    }
-    /**
-   * Decrypts a ciphertext as an incoming log.
-   *
-   * This is executable by the recipient of the note, and uses the addressSecret to decrypt the payload.
-   *
-   * @param payload - The payload for the log
-   * @param addressSecret - The address secret, used to decrypt the logs
-   * @param ciphertextLength - Optionally supply the ciphertext length (see trimCiphertext())
-   * @returns The decrypted log payload
-   */ static async decryptAsIncoming(payload, addressSecret) {
-        try {
-            const logFields = payload;
-            const tag = logFields[0];
-            const ephPkX = logFields[1];
-            const reader = BufferReader.asReader(fieldsToBEBytes31(logFields.slice(TAG_SIZE_IN_FIELDS + EPK_SIZE_IN_FIELDS)));
-            const ephPkSigBuf = reader.readBytes(1);
-            const ephPkSignBool = !!ephPkSigBuf[0];
-            const ephPk = await Point.fromXAndSign(ephPkX, ephPkSignBool);
-            const headerCiphertextBytes = reader.readBytes(HEADER_CIPHERTEXT_SIZE_IN_BYTES);
-            let contractAddress = AztecAddress.ZERO;
-            if (!addressSecret) {
-                throw new Error('Cannot decrypt without an address secret.');
-            }
-            const ciphertextSharedSecret = await deriveEcdhSharedSecret(addressSecret, ephPk);
-            const [symKey, iv] = deriveAesSymmetricKeyAndIvFromEcdhSharedSecretUsingSha256(ciphertextSharedSecret);
-            const headerPlaintextBytes = await aes128Decrypt(headerCiphertextBytes, iv, symKey);
-            const headerReader = BufferReader.asReader(headerPlaintextBytes);
-            const contractAddressBuf = headerReader.readBytes(CONTRACT_ADDRESS_SIZE_IN_BYTES);
-            contractAddress = AztecAddress.fromBuffer(contractAddressBuf);
-            const ciphertextBytesLengthBuf = headerReader.readBytes(SIZE_OF_ENCODING_OF_CIPHERTEXT_SIZE_IN_BYTES);
-            const ciphertextBytesLength = (ciphertextBytesLengthBuf[0] << 8) + ciphertextBytesLengthBuf[1];
-            const ciphertextBytes = reader.readBytes(ciphertextBytesLength);
-            const plaintextBytes = await aes128Decrypt(ciphertextBytes, iv, symKey);
-            return new EncryptedLogPayload(tag, contractAddress, plaintextBytes);
-        } catch (e) {
-            // Following error messages are expected to occur when decryption fails
-            if (!this.isAcceptableError(e)) {
-                // If we encounter an unexpected error, we rethrow it
-                throw e;
-            }
-            return;
-        }
-    }
-    static isAcceptableError(e) {
-        return e instanceof NotOnCurveError || e.message.endsWith('is greater or equal to field modulus.') || e.message.startsWith('Invalid AztecAddress length') || e.message.startsWith('Selector must fit in') || e.message.startsWith('Attempted to read beyond buffer length') || e.message.startsWith('RangeError [ERR_BUFFER_OUT_OF_BOUNDS]:');
-    }
-    toBuffer() {
-        return serializeToBuffer(this.tag, this.contractAddress.toBuffer(), this.incomingBodyPlaintext);
-    }
-}

package/dest/logs/l1_payload/encryption_util.d.ts

@@ -1,24 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import type { Point } from '@aztec/foundation/fields';
-export declare function deriveAesSymmetricKeyAndIvFromEcdhSharedSecretUsingSha256(sharedSecret: Point): [Buffer, Buffer];
-/**
- * Encrypts the plaintext using the secret key and public key
- *
- * @param plaintext - The plaintext buffer
- * @param secret - The secret key used to derive the AES secret
- * @param publicKey - Public key used to derived the AES secret
- * @param deriveSecret - Function to derive the AES secret from the ephemeral secret key and public key
- * @returns The ciphertext
- */
-export declare function aes128Encrypt(plaintext: Buffer, iv: Buffer, symKey: Buffer): Promise<Buffer>;
-/**
- * Decrypts the ciphertext using the secret key and public key
- * @param ciphertext - The ciphertext buffer
- * @param secret - The secret key used to derive the AES secret
- * @param publicKey - The public key used to derive the AES secret
- * @param deriveSecret - Function to derive the AES secret from the ephemeral secret key and public key
- * @returns
- */
-export declare function aes128Decrypt(ciphertext: Buffer, iv: Buffer, symKey: Buffer): Promise<Buffer>;
-//# sourceMappingURL=encryption_util.d.ts.map

package/dest/logs/l1_payload/encryption_util.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"encryption_util.d.ts","sourceRoot":"","sources":["../../../src/logs/l1_payload/encryption_util.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAmBtD,wBAAgB,yDAAyD,CAAC,YAAY,EAAE,KAAK,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAK/G;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG5F;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7F"}

package/dest/logs/l1_payload/encryption_util.js

@@ -1,46 +0,0 @@
-import { GeneratorIndex } from '@aztec/constants';
-import { Aes128, sha256 } from '@aztec/foundation/crypto';
-import { numToUInt8 } from '@aztec/foundation/serialize';
-function extractCloseToUniformlyRandom256BitsFromEcdhSharedSecretUsingSha256(sharedSecret) {
-    const secretBuffer = Buffer.concat([
-        sharedSecret.toCompressedBuffer(),
-        numToUInt8(GeneratorIndex.SYMMETRIC_KEY)
-    ]);
-    const hash = sha256(secretBuffer);
-    return hash;
-}
-function deriveAesSymmetricKeyAndIvFromEcdhSharedSecret(sharedSecret, randomnessExtractionFunction) {
-    const random256Bits = randomnessExtractionFunction(sharedSecret);
-    const symKey = random256Bits.subarray(0, 16);
-    const iv = random256Bits.subarray(16, 32);
-    return [
-        symKey,
-        iv
-    ];
-}
-export function deriveAesSymmetricKeyAndIvFromEcdhSharedSecretUsingSha256(sharedSecret) {
-    return deriveAesSymmetricKeyAndIvFromEcdhSharedSecret(sharedSecret, extractCloseToUniformlyRandom256BitsFromEcdhSharedSecretUsingSha256);
-}
-/**
- * Encrypts the plaintext using the secret key and public key
- *
- * @param plaintext - The plaintext buffer
- * @param secret - The secret key used to derive the AES secret
- * @param publicKey - Public key used to derived the AES secret
- * @param deriveSecret - Function to derive the AES secret from the ephemeral secret key and public key
- * @returns The ciphertext
- */ export function aes128Encrypt(plaintext, iv, symKey) {
-    const aes128 = new Aes128();
-    return aes128.encryptBufferCBC(plaintext, iv, symKey);
-}
-/**
- * Decrypts the ciphertext using the secret key and public key
- * @param ciphertext - The ciphertext buffer
- * @param secret - The secret key used to derive the AES secret
- * @param publicKey - The public key used to derive the AES secret
- * @param deriveSecret - Function to derive the AES secret from the ephemeral secret key and public key
- * @returns
- */ export function aes128Decrypt(ciphertext, iv, symKey) {
-    const aes128 = new Aes128();
-    return aes128.decryptBufferCBC(ciphertext, iv, symKey);
-}

package/dest/logs/l1_payload/index.d.ts

@@ -1,3 +0,0 @@
-export * from './encrypted_log_payload.js';
-export * from './shared_secret_derivation.js';
-//# sourceMappingURL=index.d.ts.map

package/dest/logs/l1_payload/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/logs/l1_payload/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC"}

package/dest/logs/l1_payload/index.js

@@ -1,2 +0,0 @@
-export * from './encrypted_log_payload.js';
-export * from './shared_secret_derivation.js';

package/dest/logs/l1_payload/payload.d.ts

@@ -1,60 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-import { Vector } from '../../types/index.js';
-/**
- * The Note class represents a Note emitted from a Noir contract as a vector of Fr (finite field) elements.
- * This data also represents a preimage to a note hash. This class extends the Vector class, which allows for
- * additional operations on the underlying field elements.
- */
-export declare class Payload extends Vector<Fr> {
-    toJSON(): Buffer;
-    static get schema(): import("zod").ZodEffects<import("zod").ZodUnion<[import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, Buffer, string>, import("zod").ZodEffects<import("zod").ZodObject<{
-        type: import("zod").ZodLiteral<"Buffer">;
-        data: import("zod").ZodArray<import("zod").ZodNumber, "many">;
-    }, "strip", import("zod").ZodTypeAny, {
-        type: "Buffer";
-        data: number[];
-    }, {
-        type: "Buffer";
-        data: number[];
-    }>, Buffer, {
-        type: "Buffer";
-        data: number[];
-    }>]>, Payload, string | {
-        type: "Buffer";
-        data: number[];
-    }>;
-    /**
-     * Create a Note instance from a Buffer or BufferReader.
-     * The input 'buffer' can be either a Buffer containing the serialized Fr elements or a BufferReader instance.
-     * This function reads the Fr elements in the buffer and constructs a Note with them.
-     *
-     * @param buffer - The Buffer or BufferReader containing the serialized Fr elements.
-     * @returns A Note instance containing the deserialized Fr elements.
-     */
-    static fromBuffer(buffer: Buffer | BufferReader): Payload;
-    /**
-     * Generates a random Note instance with a variable number of items.
-     * The number of items is determined by a random value between 1 and 10 (inclusive).
-     * Each item in the Note is generated using the Fr.random() method.
-     *
-     * @returns A randomly generated Note instance.
-     */
-    static random(): Payload;
-    /**
-     * Returns a hex representation of the note.
-     * @returns A hex string with the vector length as first element.
-     */
-    toString(): `0x${string}`;
-    /**
-     * Creates a new Note instance from a hex string.
-     * @param str - Hex representation.
-     * @returns A Note instance.
-     */
-    static fromString(str: string): Payload;
-    get length(): number;
-    equals(other: Payload): boolean;
-}
-//# sourceMappingURL=payload.d.ts.map

package/dest/logs/l1_payload/payload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../../src/logs/l1_payload/payload.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C;;;;GAIG;AACH,qBAAa,OAAQ,SAAQ,MAAM,CAAC,EAAE,CAAC;IACrC,MAAM;IAIN,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;OAEhB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C;;;;;;OAMG;IACH,MAAM,CAAC,MAAM;IAMb;;;OAGG;IACM,QAAQ;IAIjB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,IAAI,MAAM,WAET;IAED,MAAM,CAAC,KAAK,EAAE,OAAO;CAGtB"}

package/dest/logs/l1_payload/payload.js

@@ -1,61 +0,0 @@
-import { randomInt } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { schemas } from '../../schemas/index.js';
-import { Vector } from '../../types/index.js';
-/**
- * The Note class represents a Note emitted from a Noir contract as a vector of Fr (finite field) elements.
- * This data also represents a preimage to a note hash. This class extends the Vector class, which allows for
- * additional operations on the underlying field elements.
- */ export class Payload extends Vector {
-    toJSON() {
-        return this.toBuffer();
-    }
-    static get schema() {
-        return schemas.Buffer.transform(Payload.fromBuffer);
-    }
-    /**
-   * Create a Note instance from a Buffer or BufferReader.
-   * The input 'buffer' can be either a Buffer containing the serialized Fr elements or a BufferReader instance.
-   * This function reads the Fr elements in the buffer and constructs a Note with them.
-   *
-   * @param buffer - The Buffer or BufferReader containing the serialized Fr elements.
-   * @returns A Note instance containing the deserialized Fr elements.
-   */ static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new Payload(reader.readVector(Fr));
-    }
-    /**
-   * Generates a random Note instance with a variable number of items.
-   * The number of items is determined by a random value between 1 and 10 (inclusive).
-   * Each item in the Note is generated using the Fr.random() method.
-   *
-   * @returns A randomly generated Note instance.
-   */ static random() {
-        const numItems = randomInt(10) + 1;
-        const items = Array.from({
-            length: numItems
-        }, ()=>Fr.random());
-        return new Payload(items);
-    }
-    /**
-   * Returns a hex representation of the note.
-   * @returns A hex string with the vector length as first element.
-   */ toString() {
-        return bufferToHex(this.toBuffer());
-    }
-    /**
-   * Creates a new Note instance from a hex string.
-   * @param str - Hex representation.
-   * @returns A Note instance.
-   */ static fromString(str) {
-        return Payload.fromBuffer(hexToBuffer(str));
-    }
-    get length() {
-        return this.items.length;
-    }
-    equals(other) {
-        return this.items.every((item, index)=>item.equals(other.items[index]));
-    }
-}

package/dest/logs/l1_payload/shared_secret_derivation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shared_secret_derivation.d.ts","sourceRoot":"","sources":["../../../src/logs/l1_payload/shared_secret_derivation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,CAS5G;AAED,wBAAsB,uCAAuC,CAC3D,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,KAAK,CAAC,CAIhB"}

package/src/event/event.ts

@@ -1,16 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-
-import { Payload } from '../logs/l1_payload/payload.js';
-import { schemas } from '../schemas/schemas.js';
-
-export class Event extends Payload {
-  static override get schema() {
-    return schemas.Buffer.transform(Event.fromBuffer);
-  }
-
-  static override fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-    return new Event(reader.readVector(Fr));
-  }
-}

package/src/event/event_metadata.ts

@@ -1,56 +0,0 @@
-import { z } from 'zod';
-
-import { type AbiType, AbiTypeSchema } from '../abi/abi.js';
-import { decodeFromAbi } from '../abi/decoder.js';
-import type { EventSelector } from '../abi/event_selector.js';
-import type { PublicLog } from '../logs/public_log.js';
-import { schemas } from '../schemas/index.js';
-import { L1EventPayload } from './l1_event_payload.js';
-
-/**
- * Represents metadata for an event decoder, including all information needed to reconstruct it.
- */
-export class EventMetadata<T> {
-  public readonly decode: (payload: L1EventPayload | PublicLog) => T | undefined;
-
-  public readonly eventSelector: EventSelector;
-  public readonly abiType: AbiType;
-  public readonly fieldNames: string[];
-
-  constructor(event: { eventSelector: EventSelector; abiType: AbiType; fieldNames: string[] }) {
-    this.eventSelector = event.eventSelector;
-    this.abiType = event.abiType;
-    this.fieldNames = event.fieldNames;
-    this.decode = EventMetadata.decodeEvent<T>(event.eventSelector, event.abiType);
-  }
-
-  public static decodeEvent<T>(
-    eventSelector: EventSelector,
-    abiType: AbiType,
-  ): (payload: L1EventPayload | PublicLog | undefined) => T | undefined {
-    return (payload: L1EventPayload | PublicLog | undefined): T | undefined => {
-      if (payload === undefined) {
-        return undefined;
-      }
-
-      if (payload instanceof L1EventPayload) {
-        if (!eventSelector.equals(payload.eventTypeId)) {
-          return undefined;
-        }
-        return decodeFromAbi([abiType], payload.event.items) as T;
-      } else {
-        return decodeFromAbi([abiType], payload.log) as T;
-      }
-    };
-  }
-
-  static get schema() {
-    return z
-      .object({
-        eventSelector: schemas.EventSelector,
-        abiType: AbiTypeSchema,
-        fieldNames: z.array(z.string()),
-      })
-      .transform(obj => new EventMetadata(obj));
-  }
-}

package/src/event/index.ts

@@ -1,3 +0,0 @@
-export * from './event.js';
-export * from './event_metadata.js';
-export * from './l1_event_payload.js';

package/src/event/l1_event_payload.ts

@@ -1,87 +0,0 @@
-import { type Fq, Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-
-import { EventSelector } from '../abi/event_selector.js';
-import { AztecAddress } from '../aztec-address/index.js';
-import { EncryptedLogPayload } from '../logs/l1_payload/encrypted_log_payload.js';
-import type { PrivateLog } from '../logs/private_log.js';
-import { Event } from './event.js';
-
-/**
- * A class which wraps event data which is pushed on L1.
- */
-export class L1EventPayload {
-  constructor(
-    /**
-     * A event as emitted from Noir contract. Can be used along with private key to compute nullifier.
-     */
-    public event: Event,
-    /**
-     * Address of the contract this tx is interacting with.
-     */
-    public contractAddress: AztecAddress,
-    /**
-     * Type identifier for the underlying event, required to determine how to compute its hash and nullifier.
-     */
-    public eventTypeId: EventSelector,
-  ) {}
-
-  static #fromIncomingBodyPlaintextAndContractAddress(
-    plaintext: Buffer,
-    contractAddress: AztecAddress,
-  ): L1EventPayload | undefined {
-    let payload: L1EventPayload;
-    try {
-      const reader = BufferReader.asReader(plaintext);
-      const fields = reader.readArray(plaintext.length / Fr.SIZE_IN_BYTES, Fr);
-
-      const eventTypeId = EventSelector.fromField(fields[0]);
-
-      const event = new Event(fields.slice(1));
-
-      payload = new L1EventPayload(event, contractAddress, eventTypeId);
-    } catch (e) {
-      return undefined;
-    }
-
-    return payload;
-  }
-
-  static async decryptAsIncoming(log: PrivateLog, sk: Fq): Promise<L1EventPayload | undefined> {
-    const decryptedLog = await EncryptedLogPayload.decryptAsIncoming(log.fields, sk);
-    if (!decryptedLog) {
-      return undefined;
-    }
-
-    return this.#fromIncomingBodyPlaintextAndContractAddress(
-      decryptedLog.incomingBodyPlaintext,
-      decryptedLog.contractAddress,
-    );
-  }
-
-  /**
-   * Serializes the L1EventPayload object into a Buffer.
-   * @returns Buffer representation of the L1EventPayload object.
-   */
-  toIncomingBodyPlaintext() {
-    const fields = [this.eventTypeId.toField(), ...this.event.items];
-    return serializeToBuffer(fields);
-  }
-
-  /**
-   * Create a random L1EventPayload object (useful for testing purposes).
-   * @param contract - The address of a contract the event was emitted from.
-   * @returns A random L1EventPayload object.
-   */
-  static async random(contract?: AztecAddress) {
-    return new L1EventPayload(Event.random(), contract ?? (await AztecAddress.random()), EventSelector.random());
-  }
-
-  public equals(other: L1EventPayload) {
-    return (
-      this.event.equals(other.event) &&
-      this.contractAddress.equals(other.contractAddress) &&
-      this.eventTypeId.equals(other.eventTypeId)
-    );
-  }
-}