WIP

AztecProtocol · May 7, 2024 · 3fda5de · 3fda5de
1 parent aa1b9c8
commit 3fda5de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts b/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts
@@ -5,6 +5,7 @@ import {
   L2Block,
   LogId,
   NullifierMembershipWitness,
+  PublicDataWitness,
   SiblingPath,
   Tx,
   TxEffect,
@@ -37,6 +38,7 @@ export function createAztecNodeRpcServer(node: AztecNode) {
       TxEffect,
       LogId,
       TxHash,
+      PublicDataWitness,
       SiblingPath,
     },
     { Tx, TxReceipt, EncryptedL2BlockL2Logs, UnencryptedL2BlockL2Logs, NullifierMembershipWitness },

diff --git a/yarn-project/circuit-types/src/interfaces/public_data_witness.ts b/yarn-project/circuit-types/src/interfaces/public_data_witness.ts
@@ -1,8 +1,8 @@
-import { Fr, type PUBLIC_DATA_TREE_HEIGHT, PublicDataTreeLeafPreimage } from '@aztec/circuits.js';
-
-import { type SiblingPath } from '../sibling_path/index.js';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { Fr, PUBLIC_DATA_TREE_HEIGHT, PublicDataTreeLeafPreimage } from '@aztec/circuits.js';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { SiblingPath } from '../sibling_path/index.js';
 
 /**
  * Public data witness.
@@ -43,11 +43,7 @@ export class PublicDataWitness {
   }
 
   toBuffer(): Buffer {
-    return serializeToBuffer([
-      this.index,
-      this.leafPreimage,
-      this.siblingPath,
-    ]);
+    return serializeToBuffer([this.index, this.leafPreimage, this.siblingPath]);
   }
 
   /**
@@ -59,7 +55,7 @@ export class PublicDataWitness {
 
   /**
    * Deserializes an PublicDataWitness object from a buffer.
-   * @param buf - Buffer to deserialize.
+   * @param buf - Buffer or BufferReader to deserialize.
    * @returns An instance of PublicDataWitness.
    */
   static fromBuffer(buffer: Buffer | BufferReader): PublicDataWitness {
@@ -68,7 +64,7 @@ export class PublicDataWitness {
     return new PublicDataWitness(
       toBigIntBE(reader.readBytes(32)),
       reader.readObject(PublicDataTreeLeafPreimage),
-      reader.readObject(SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>),
+      SiblingPath.fromBuffer(reader.readBytes(4 + 32 * PUBLIC_DATA_TREE_HEIGHT)),
     );
   }