Fixed payload builder to consume meta

XYOracleNetwork · Jan 26, 2024 · 826d4c0 · 826d4c0
1 parent 0fe7537
commit 826d4c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/protocol/packages/boundwitness/packages/validator/src/Validator.ts b/packages/protocol/packages/boundwitness/packages/validator/src/Validator.ts
@@ -72,7 +72,7 @@ export class BoundWitnessValidator<T extends BoundWitness<{ schema: string }> =
 
   async signatures(): Promise<Error[]> {
     return [
-      ...validateArraysSameLength(this.obj.$meta?.signatures ?? [], this.obj.addresses ?? [], 'Length mismatch: address/_signature'),
+      ...validateArraysSameLength(this.obj.$meta?.signatures ?? [], this.obj.addresses ?? [], 'Length mismatch: address/signature'),
       ...(
         await Promise.all(
           this.obj.addresses?.map<Promise<Error[]>>(async (address, index) =>

diff --git a/packages/protocol/packages/payload/packages/builder/src/Builder.ts b/packages/protocol/packages/payload/packages/builder/src/Builder.ts
@@ -27,8 +27,9 @@ export class PayloadBuilder<T extends Payload = Payload<AnyObject>> {
   }
 
   static async build<T extends Payload>(payload: T) {
-    const builder = new PayloadBuilder<T>({ schema: payload.schema })
-    builder.fields(payload)
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { schema, $hash, $meta, ...fields } = payload as WithMeta<T>
+    const builder = new PayloadBuilder<T>({ fields: fields as T, meta: $meta, schema: payload.schema })
     return await builder.build()
   }
 
@@ -117,8 +118,8 @@ export class PayloadBuilder<T extends Payload = Payload<AnyObject>> {
     return result
   }
 
-  $meta(fields?: JsonObject) {
-    this._$meta = fields
+  $meta(meta?: JsonObject) {
+    this._$meta = meta
     return this
   }