Serialization fixes

yarn-project/circuit-types/src/logs/encrypted_l2_log.ts

@@ -1,5 +1,4 @@
 import { randomBytes } from '@aztec/foundation/crypto';
-import { BufferReader } from '@aztec/foundation/serialize';
 
 /**
  * Represents an individual encrypted log entry.
@@ -36,12 +35,10 @@ export class EncryptedL2Log {
 
   /**
    * Deserializes log from a buffer.
-   * @param buffer - The buffer or buffer reader containing the log.
+   * @param buffer - The buffer containing the log.
    * @returns Deserialized instance of `Log`.
    */
-  public static fromBuffer(buffer: Buffer | BufferReader): EncryptedL2Log {
-    const reader = BufferReader.asReader(buffer);
-    const data = reader.readBuffer();
+  public static fromBuffer(data: Buffer): EncryptedL2Log {
     return new EncryptedL2Log(data);
   }
 

yarn-project/circuit-types/src/logs/function_l2_logs.ts

@@ -79,7 +79,7 @@ export class EncryptedFunctionL2Logs extends FunctionL2Logs<EncryptedL2Log> {
     const logsBufLength = isLengthPrefixed ? reader.readNumber() : -1;
     const logs = reader.readBufferArray(logsBufLength);
 
-    return new EncryptedFunctionL2Logs(logs.map(UnencryptedL2Log.fromBuffer));
+    return new EncryptedFunctionL2Logs(logs.map(EncryptedL2Log.fromBuffer));
   }
 
   /**

yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts

@@ -24,7 +24,7 @@ export class UnencryptedL2Log {
   ) {}
 
   get length(): number {
-    return EventSelector.SIZE + this.data.length;
+    return EventSelector.SIZE + this.data.length + AztecAddress.SIZE_IN_BYTES + 4;
   }
 
   /**