using EventSelector class more

AztecProtocol · Jun 18, 2024 · d221bbc · d221bbc
1 parent dad50a4
commit d221bbc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 22 deletions.
diff --git a/yarn-project/builder/src/contract-interface-gen/typescript.ts b/yarn-project/builder/src/contract-interface-gen/typescript.ts
@@ -281,9 +281,10 @@ function generateEvents(events: any[] | undefined) {
       if (payload === undefined) {
         return undefined;
       }
+      // TODO(#7089): Remove this conversion from EventSelector to FunctionSelector once event metadata is changed
       if (
         !functionSelector.equals(
-          FunctionSelector.fromField(payload.eventTypeId),
+          FunctionSelector.fromField(payload.eventTypeId.toField()),
         )
       ) {
         return undefined;

diff --git a/yarn-project/circuit-types/src/logs/l1_payload/l1_event_payload.test.ts b/yarn-project/circuit-types/src/logs/l1_payload/l1_event_payload.test.ts
@@ -30,10 +30,7 @@ describe('L1 Event Payload', () => {
       randomness = Fr.random();
       maskedContractAddress = pedersenHash([contractAddress, randomness], 0);
 
-      const eventTypeId = Fr.fromBuffer(
-        Buffer.concat([Buffer.alloc(Fr.SIZE_IN_BYTES - EventSelector.SIZE), randomBytes(EventSelector.SIZE)]),
-      );
-      payload = new L1EventPayload(Event.random(), contractAddress, randomness, eventTypeId);
+      payload = new L1EventPayload(Event.random(), contractAddress, randomness, EventSelector.random());
 
       ovskM = GrumpkinScalar.random();
       ivskM = GrumpkinScalar.random();

diff --git a/yarn-project/circuit-types/src/logs/l1_payload/l1_event_payload.ts b/yarn-project/circuit-types/src/logs/l1_payload/l1_event_payload.ts
@@ -1,6 +1,5 @@
 import { AztecAddress, type GrumpkinPrivateKey, type KeyValidationRequest, type PublicKey } from '@aztec/circuits.js';
 import { EventSelector } from '@aztec/foundation/abi';
-import { randomBytes } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
@@ -35,7 +34,7 @@ export class L1EventPayload extends L1Payload {
     /**
      * Type identifier for the underlying event, (calculated as a function selector).
      */
-    public eventTypeId: Fr,
+    public eventTypeId: EventSelector,
   ) {
     super();
   }
@@ -51,7 +50,7 @@ export class L1EventPayload extends L1Payload {
       reader.readObject(Event),
       reader.readObject(AztecAddress),
       Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
+      reader.readObject(EventSelector),
     );
   }
 
@@ -68,10 +67,7 @@ export class L1EventPayload extends L1Payload {
    * @returns A random L1EventPayload object.
    */
   static random() {
-    const eventTypeId = Fr.fromBuffer(
-      Buffer.concat([Buffer.alloc(Fr.SIZE_IN_BYTES - EventSelector.SIZE), randomBytes(EventSelector.SIZE)]),
-    );
-    return new L1EventPayload(Event.random(), AztecAddress.random(), Fr.random(), eventTypeId);
+    return new L1EventPayload(Event.random(), AztecAddress.random(), Fr.random(), EventSelector.random());
   }
 
   public encrypt(ephSk: GrumpkinPrivateKey, recipient: AztecAddress, ivpk: PublicKey, ovKeys: KeyValidationRequest) {
@@ -81,7 +77,7 @@ export class L1EventPayload extends L1Payload {
       recipient,
       ivpk,
       ovKeys,
-      new EncryptedEventLogIncomingBody(this.randomness, this.eventTypeId, this.event),
+      new EncryptedEventLogIncomingBody(this.randomness, this.eventTypeId.toField(), this.event),
     );
   }
 
@@ -117,7 +113,7 @@ export class L1EventPayload extends L1Payload {
 
     this.ensureMatchedMaskedContractAddress(address, incomingBody.randomness, encryptedLog.maskedContractAddress);
 
-    return new L1EventPayload(incomingBody.event, address, incomingBody.randomness, incomingBody.eventTypeId);
+    return new L1EventPayload(incomingBody.event, address, incomingBody.randomness, EventSelector.fromField(incomingBody.eventTypeId));
   }
 
   /**
@@ -152,7 +148,7 @@ export class L1EventPayload extends L1Payload {
 
     this.ensureMatchedMaskedContractAddress(address, incomingBody.randomness, encryptedLog.maskedContractAddress);
 
-    return new L1EventPayload(incomingBody.event, address, incomingBody.randomness, incomingBody.eventTypeId);
+    return new L1EventPayload(incomingBody.event, address, incomingBody.randomness, EventSelector.fromField(incomingBody.eventTypeId));
   }
 }
 

diff --git a/yarn-project/circuit-types/src/logs/l1_payload/tagged_log.test.ts b/yarn-project/circuit-types/src/logs/l1_payload/tagged_log.test.ts
@@ -87,10 +87,7 @@ describe('L1 Event Payload', () => {
       randomness = Fr.random();
       maskedContractAddress = pedersenHash([contractAddress, randomness], 0);
 
-      const eventTypeId = Fr.fromBuffer(
-        Buffer.concat([Buffer.alloc(Fr.SIZE_IN_BYTES - EventSelector.SIZE), randomBytes(EventSelector.SIZE)]),
-      );
-      const payload = new L1EventPayload(Event.random(), contractAddress, randomness, eventTypeId);
+      const payload = new L1EventPayload(Event.random(), contractAddress, randomness, EventSelector.random());
 
       ovskM = GrumpkinScalar.random();
       ivskM = GrumpkinScalar.random();

diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts
@@ -853,7 +853,8 @@ export class PXEService implements PXE {
         if (visibleEvent.payload === undefined) {
           return undefined;
         }
-        if (!FunctionSelector.fromField(visibleEvent.payload.eventTypeId).equals(eventMetadata.functionSelector)) {
+        // TODO(#7089): Remove this conversion from EventSelector to FunctionSelector once event metadata is changed
+        if (!FunctionSelector.fromField(visibleEvent.payload.eventTypeId.toField()).equals(eventMetadata.functionSelector)) {
           return undefined;
         }
         if (visibleEvent.payload.event.items.length !== eventMetadata.fieldNames.length) {

diff --git a/yarn-project/simulator/src/client/client_execution_context.ts b/yarn-project/simulator/src/client/client_execution_context.ts
@@ -22,7 +22,7 @@ import {
 } from '@aztec/circuits.js';
 import { Aes128 } from '@aztec/circuits.js/barretenberg';
 import { computeUniqueNoteHash, siloNoteHash } from '@aztec/circuits.js/hash';
-import { type FunctionAbi, type FunctionArtifact, countArgumentsSize } from '@aztec/foundation/abi';
+import { EventSelector, type FunctionAbi, type FunctionArtifact, countArgumentsSize } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import { Fr, GrumpkinScalar, type Point } from '@aztec/foundation/fields';
@@ -382,7 +382,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     preimage: Fr[],
   ) {
     const event = new Event(preimage);
-    const l1EventPayload = new L1EventPayload(event, contractAddress, randomness, eventTypeId);
+    const l1EventPayload = new L1EventPayload(event, contractAddress, randomness, EventSelector.fromField(eventTypeId));
     const taggedEvent = new TaggedLog(l1EventPayload);
 
     const ephSk = GrumpkinScalar.random();