More buffer serialization fixes

yarn-project/circuit-types/src/logs/l1_payload/payload.test.ts

@@ -1,13 +1,23 @@
 import { Fr } from '@aztec/foundation/fields';
+import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
+
+import times from 'lodash.times';
 
 import { Event, Note } from './payload.js';
 
 describe('note', () => {
+  let note: Note;
+
+  beforeEach(() => {
+    note = new Note(times(5, Fr.random));
+  });
+
   it('convert to and from buffer', () => {
-    const fields = Array.from({ length: 5 }).map(() => Fr.random());
-    const note = new Note(fields);
-    const buf = note.toBuffer();
-    expect(Note.fromBuffer(buf)).toEqual(note);
+    expect(Note.fromBuffer(note.toBuffer())).toEqual(note);
+  });
+
+  it('converts to and from json', () => {
+    expect(jsonParseWithSchema(jsonStringify(note), Note.schema)).toEqual(note);
   });
 });
 

yarn-project/foundation/src/json-rpc/convert.ts

@@ -25,6 +25,8 @@ export function jsonStringify(obj: object, prettify?: boolean): string {
         return value.toString();
       } else if (typeof value === 'object' && value && value.type === 'Buffer' && Array.isArray(value.data)) {
         return Buffer.from(value.data).toString('base64');
+      } else if (typeof value === 'object' && value && Buffer.isBuffer(value)) {
+        return value.toString('base64');
       } else if (typeof value === 'object' && value instanceof Map) {
         return Array.from(value.entries());
       } else if (typeof value === 'object' && value instanceof Set) {