@xyo-network/boundwitness-builder 4.1.7 → 4.2.1

package/dist/browser/Builder.d.ts

@@ -1,4 +1,4 @@
-import type { Address, Hash } from '@xylabs/hex';
+import type { Address, Hash, Hex } from '@xylabs/hex';
 import type { AccountInstance } from '@xyo-network/account-model';
 import type { BoundWitness, Signed, UnsignedBoundWitness } from '@xyo-network/boundwitness-model';
 import type { PayloadBuilderOptions } from '@xyo-network/payload-builder';
@@ -22,15 +22,15 @@ export declare class BoundWitnessBuilder<TBoundWitness extends UnsignedBoundWitn
     static addressIndex<T extends BoundWitness>(payload: T, address: Address): number;
     static previousHash<T extends BoundWitness>(boundWitness: T, address: Address): string | undefined;
     protected static linkingFields<T extends BoundWitness>(accounts: AccountInstance[], payloads?: Payload[]): Promise<Pick<T, GeneratedBoundWitnessFields>>;
-    protected static signature<T extends BoundWitness>(payload: T, address: Address): Lowercase<string>;
+    protected static signature<T extends BoundWitness>(payload: T, address: Address): Hex;
     protected static signatures(accounts: AccountInstance[], dataHash: Hash): Promise<string[]>;
     private static validateGeneratedFields;
     build(): Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]>;
-    dataHash(): Promise<Lowercase<string>>;
+    dataHash(): Promise<Hash>;
     dataHashableFields(): Promise<WithoutMeta<TBoundWitness>>;
     error(payload?: ModuleError): this;
     errors(errors?: (ModuleError | null)[]): this;
-    fields(fields: WithoutStorageMeta<WithoutClientMeta<WithoutSchema<Omit<TBoundWitness, GeneratedBoundWitnessFields>>>>): this;
+    fields(fields: WithoutSchema<Omit<WithoutStorageMeta<WithoutClientMeta<TBoundWitness>>, 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'>>): this;
     hashes(hashes: Hash[], schema: Schema[]): this;
     payload(payload?: TPayload): this;
     payloads(payloads?: (TPayload | null)[]): this;
@@ -41,7 +41,7 @@ export declare class BoundWitnessBuilder<TBoundWitness extends UnsignedBoundWitn
     witness(account: AccountInstance): this;
     /** @deprecated use signers instead */
     witnesses(accounts: AccountInstance[]): this;
-    protected sign(): Promise<string[]>;
+    protected sign(): Promise<Hex[]>;
     private generatedFields;
     private missingSchemaMessage;
 }

package/dist/browser/Builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/Builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/Builder.ts"],"names":[],"mappings":"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"}

package/dist/browser/index.mjs

@@ -1,7 +1,11 @@
 // src/Builder.ts
 import { toArrayBuffer } from "@xylabs/arraybuffer";
 import { assertEx } from "@xylabs/assert";
-import { hexFromArrayBuffer } from "@xylabs/hex";
+import {
+  asAddress,
+  asHash,
+  hexFromArrayBuffer
+} from "@xylabs/hex";
 import { BoundWitnessSchema } from "@xyo-network/boundwitness-model";
 import {
   ObjectHasher,
@@ -58,10 +62,10 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder extends PayloadBuilder {
     return index;
   }
   static previousHash(boundWitness, address) {
-    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase();
+    return asHash(boundWitness.previous_hashes[this.addressIndex(boundWitness, address)])?.toLowerCase();
   }
   static async linkingFields(accounts, payloads) {
-    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }));
+    const addresses = accounts.map((account) => asAddress(hexFromArrayBuffer(account.addressBytes, { prefix: false }), true));
     const previous_hashes = accounts.map((account) => account.previousHash ?? null);
     const payload_hashes = payloads ? await _BoundWitnessBuilder.hashes(payloads) : [];
     const payload_schemas = payloads?.map(({ schema }) => schema) ?? [];

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { hexFromArrayBuffer } from '@xylabs/hex'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type {\n  BoundWitness,\n  Signed,\n  UnsignedBoundWitness,\n} from '@xyo-network/boundwitness-model'\nimport { BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport {\n  ObjectHasher, removeEmptyFields, sortFields,\n} from '@xyo-network/hash'\nimport type { PayloadBuilderOptions } from '@xyo-network/payload-builder'\nimport { omitSchema, PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n  ModuleError, Payload, Schema,\n  WithoutClientMeta,\n  WithoutMeta,\n  WithoutSchema,\n  WithoutStorageMeta,\n} from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport const GeneratedBoundWitnessFields = ['addresses', 'payload_hashes', 'payload_schemas', 'previous_hashes'] as const\nexport type GeneratedBoundWitnessFields = typeof GeneratedBoundWitnessFields[number]\n\nconst uniqueAccounts = (accounts: AccountInstance[], throwOnFalse = false) => {\n  const addresses = new Set<Address>()\n  for (const account of accounts) {\n    if (addresses.has(account.address)) {\n      if (throwOnFalse) {\n        throw new Error('Duplicate address')\n      }\n      return false\n    }\n    addresses.add(account.address)\n  }\n  return true\n}\n\nexport class BoundWitnessBuilder<\n  TBoundWitness extends UnsignedBoundWitness = UnsignedBoundWitness,\n  TPayload extends Payload = Payload>\n  extends PayloadBuilder<\n    TBoundWitness,\n    Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]>\n  > {\n  private static readonly _buildMutex = new Mutex()\n\n  private _accounts: AccountInstance[] = []\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[] = []\n\n  constructor(options?: Omit<PayloadBuilderOptions, 'schema'>) {\n    super({ ...options, schema: BoundWitnessSchema })\n  }\n\n  protected get addresses(): Address[] {\n    uniqueAccounts(this._accounts, true)\n    return this._accounts.map(account => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas\n      ?? this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBytes(): (ArrayBufferLike | null)[] {\n    return this._accounts.map(account => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map(account => account.previousHash ?? null)\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n  ): Promise<Pick<T, GeneratedBoundWitnessFields>> {\n    const addresses = accounts.map(account => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map(account => account.previousHash ?? null)\n    const payload_hashes = payloads ? await BoundWitnessBuilder.hashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema) ?? []\n    return {\n      addresses, payload_hashes, payload_schemas, previous_hashes,\n    }\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], dataHash: Hash): Promise<string[]> {\n    const hashBytes = toArrayBuffer(dataHash)\n    const previousHashesBytes = accounts?.map(account => account.previousHashBytes)\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer((await account.sign(hashBytes, previousHashesBytes[index]))[0])))\n  }\n\n  private static validateGeneratedFields(fields: Pick<BoundWitness, GeneratedBoundWitnessFields>) {\n    assertEx(fields.payload_hashes?.length === fields.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!fields.payload_hashes.some(hash => !hash), () => 'nulls found in hashes')\n    assertEx(!fields.payload_schemas.some(schema => !schema), () => 'nulls found in schemas')\n  }\n\n  override async build(): Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = await this.dataHashableFields()\n      const $signatures = await this.sign()\n\n      const ret = {\n        ...this._meta, ...dataHashableFields, ...this._fields, $signatures,\n      } as Signed<TBoundWitness>\n      return [\n        ret,\n        this._payloads,\n        this._errors,\n      ]\n    })\n  }\n\n  async dataHash() {\n    const dataHashableFields = await this.dataHashableFields()\n    const hash = await ObjectHasher.hash(dataHashableFields)\n    return hash\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const generatedFields: Pick<TBoundWitness, GeneratedBoundWitnessFields> = await this.generatedFields()\n    BoundWitnessBuilder.validateGeneratedFields(generatedFields)\n    const fields: WithoutSchema<TBoundWitness> = {\n      ...PayloadBuilder.omitMeta(this._fields ?? {}),\n      ...generatedFields,\n    } as WithoutSchema<TBoundWitness>\n    return await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      for (const error of errors) {\n        if (error !== null) {\n          this.error(error)\n        }\n      }\n    }\n    return this\n  }\n\n  override fields(fields: WithoutStorageMeta<WithoutClientMeta<WithoutSchema<Omit<TBoundWitness, GeneratedBoundWitnessFields>>>>): this {\n    // clean it up just incase\n    const clone = structuredClone(fields) as unknown as Partial<TBoundWitness>\n    for (const field of GeneratedBoundWitnessFields) {\n      delete clone[field]\n    }\n    // we need to do the cast here since ts seems to not like nested, yet same, generics\n    this._fields\n      = BoundWitnessBuilder.omitStorageMeta(\n        BoundWitnessBuilder.omitClientMeta(\n          omitSchema(removeEmptyFields(clone)),\n        ),\n      ) as unknown as WithoutStorageMeta<WithoutClientMeta<WithoutSchema<TBoundWitness>>>\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\n    assertEx(this.payloads.length === 0, () => 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      for (const payload of payloads) {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      }\n    return this\n  }\n\n  signer(account: AccountInstance) {\n    uniqueAccounts([...this._accounts, account], true)\n    this._accounts?.push(account)\n    return this\n  }\n\n  signers(accounts: AccountInstance[]) {\n    uniqueAccounts([...this._accounts, ...accounts], true)\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  sourceQuery(sourceQuery: Hash) {\n    this._meta = {\n      ...this._meta,\n      $sourceQuery: sourceQuery,\n    } as typeof this._meta\n    return this\n  }\n\n  /** @deprecated use signer instead */\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  /** @deprecated use signers instead */\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async sign(): Promise<string[]> {\n    uniqueAccounts(this._accounts, true)\n    const hashBytes = toArrayBuffer(await this.dataHash())\n    return await Promise.all(this._accounts.map(async account => hexFromArrayBuffer((await account.sign(hashBytes))[0])))\n  }\n\n  private async generatedFields(): Promise<Pick<TBoundWitness, GeneratedBoundWitnessFields>> {\n    return await BoundWitnessBuilder.linkingFields(this._accounts, this._payloads)\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport type { Query, WithoutMeta } from '@xyo-network/payload-model'\n\nimport { BoundWitnessBuilder } from '../Builder.ts'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: TQuery | undefined\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: await PayloadBuilder.dataHash(assertEx(this._query, () => 'No Query Specified')),\n    } as TBoundWitness\n    return { ...fields } as WithoutMeta<TBoundWitness>\n  }\n\n  query<T extends TQuery>(query: T) {\n    this.payload(query)\n    this._query = query\n    return this\n  }\n}\n"],"mappings":"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","names":["assertEx","PayloadBuilder","PayloadBuilder","assertEx"]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport type {\n  Address, Hash, Hex,\n} from '@xylabs/hex'\nimport {\n  asAddress, asHash, hexFromArrayBuffer,\n} from '@xylabs/hex'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type {\n  BoundWitness,\n  Signed,\n  UnsignedBoundWitness,\n} from '@xyo-network/boundwitness-model'\nimport { BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport {\n  ObjectHasher, removeEmptyFields, sortFields,\n} from '@xyo-network/hash'\nimport type { PayloadBuilderOptions } from '@xyo-network/payload-builder'\nimport { omitSchema, PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n  ModuleError, Payload, Schema,\n  WithoutClientMeta,\n  WithoutMeta,\n  WithoutSchema,\n  WithoutStorageMeta,\n} from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport const GeneratedBoundWitnessFields = ['addresses', 'payload_hashes', 'payload_schemas', 'previous_hashes'] as const\nexport type GeneratedBoundWitnessFields = typeof GeneratedBoundWitnessFields[number]\n\nconst uniqueAccounts = (accounts: AccountInstance[], throwOnFalse = false) => {\n  const addresses = new Set<Address>()\n  for (const account of accounts) {\n    if (addresses.has(account.address)) {\n      if (throwOnFalse) {\n        throw new Error('Duplicate address')\n      }\n      return false\n    }\n    addresses.add(account.address)\n  }\n  return true\n}\n\nexport class BoundWitnessBuilder<\n  TBoundWitness extends UnsignedBoundWitness = UnsignedBoundWitness,\n  TPayload extends Payload = Payload>\n  extends PayloadBuilder<\n    TBoundWitness,\n    Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]>\n  > {\n  private static readonly _buildMutex = new Mutex()\n\n  private _accounts: AccountInstance[] = []\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[] = []\n\n  constructor(options?: Omit<PayloadBuilderOptions, 'schema'>) {\n    super({ ...options, schema: BoundWitnessSchema })\n  }\n\n  protected get addresses(): Address[] {\n    uniqueAccounts(this._accounts, true)\n    return this._accounts.map(account => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas\n      ?? this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBytes(): (ArrayBufferLike | null)[] {\n    return this._accounts.map(account => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map(account => account.previousHash ?? null)\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return asHash(boundWitness.previous_hashes[this.addressIndex(boundWitness, address)])?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n  ): Promise<Pick<T, GeneratedBoundWitnessFields>> {\n    const addresses = accounts.map(account => asAddress(hexFromArrayBuffer(account.addressBytes, { prefix: false }), true))\n    const previous_hashes = accounts.map(account => account.previousHash ?? null)\n    const payload_hashes = payloads ? await BoundWitnessBuilder.hashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema) ?? []\n    return {\n      addresses, payload_hashes, payload_schemas, previous_hashes,\n    }\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], dataHash: Hash): Promise<string[]> {\n    const hashBytes = toArrayBuffer(dataHash)\n    const previousHashesBytes = accounts?.map(account => account.previousHashBytes)\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer((await account.sign(hashBytes, previousHashesBytes[index]))[0])))\n  }\n\n  private static validateGeneratedFields(fields: Pick<BoundWitness, GeneratedBoundWitnessFields>) {\n    assertEx(fields.payload_hashes?.length === fields.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!fields.payload_hashes.some(hash => !hash), () => 'nulls found in hashes')\n    assertEx(!fields.payload_schemas.some(schema => !schema), () => 'nulls found in schemas')\n  }\n\n  override async build(): Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = await this.dataHashableFields()\n      const $signatures = await this.sign()\n\n      const ret = {\n        ...this._meta, ...dataHashableFields, ...this._fields, $signatures,\n      } as Signed<TBoundWitness>\n      return [\n        ret,\n        this._payloads,\n        this._errors,\n      ]\n    })\n  }\n\n  async dataHash() {\n    const dataHashableFields = await this.dataHashableFields()\n    const hash = await ObjectHasher.hash(dataHashableFields)\n    return hash\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const generatedFields: Pick<TBoundWitness, GeneratedBoundWitnessFields> = await this.generatedFields()\n    BoundWitnessBuilder.validateGeneratedFields(generatedFields)\n    const fields: WithoutSchema<TBoundWitness> = {\n      ...PayloadBuilder.omitMeta(this._fields ?? {}),\n      ...generatedFields,\n    } as WithoutSchema<TBoundWitness>\n    return await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      for (const error of errors) {\n        if (error !== null) {\n          this.error(error)\n        }\n      }\n    }\n    return this\n  }\n\n  override fields(fields: WithoutSchema<Omit<WithoutStorageMeta<WithoutClientMeta<TBoundWitness>>,\n    'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'>>): this {\n    // clean it up just incase\n    const clone = structuredClone(fields) as unknown as Partial<TBoundWitness>\n    for (const field of GeneratedBoundWitnessFields) {\n      delete clone[field]\n    }\n    // we need to do the cast here since ts seems to not like nested, yet same, generics\n    this._fields\n      = BoundWitnessBuilder.omitStorageMeta(\n        BoundWitnessBuilder.omitClientMeta(\n          omitSchema(removeEmptyFields(clone)),\n        ),\n      ) as unknown as WithoutStorageMeta<WithoutClientMeta<WithoutSchema<TBoundWitness>>>\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\n    assertEx(this.payloads.length === 0, () => 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      for (const payload of payloads) {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      }\n    return this\n  }\n\n  signer(account: AccountInstance) {\n    uniqueAccounts([...this._accounts, account], true)\n    this._accounts?.push(account)\n    return this\n  }\n\n  signers(accounts: AccountInstance[]) {\n    uniqueAccounts([...this._accounts, ...accounts], true)\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  sourceQuery(sourceQuery: Hash) {\n    this._meta = {\n      ...this._meta,\n      $sourceQuery: sourceQuery,\n    } as typeof this._meta\n    return this\n  }\n\n  /** @deprecated use signer instead */\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  /** @deprecated use signers instead */\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async sign(): Promise<Hex[]> {\n    uniqueAccounts(this._accounts, true)\n    const hashBytes = toArrayBuffer(await this.dataHash())\n    return await Promise.all(this._accounts.map(async account => hexFromArrayBuffer((await account.sign(hashBytes))[0])))\n  }\n\n  private async generatedFields(): Promise<Pick<TBoundWitness, GeneratedBoundWitnessFields>> {\n    return await BoundWitnessBuilder.linkingFields(this._accounts, this._payloads)\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport type { Query, WithoutMeta } from '@xyo-network/payload-model'\n\nimport { BoundWitnessBuilder } from '../Builder.ts'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: TQuery | undefined\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: await PayloadBuilder.dataHash(assertEx(this._query, () => 'No Query Specified')),\n    } as TBoundWitness\n    return { ...fields } as WithoutMeta<TBoundWitness>\n  }\n\n  query<T extends TQuery>(query: T) {\n    this.payload(query)\n    this._query = query\n    return this\n  }\n}\n"],"mappings":"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","names":["assertEx","PayloadBuilder","PayloadBuilder","assertEx"]}

package/dist/neutral/Builder.d.ts

@@ -1,4 +1,4 @@
-import type { Address, Hash } from '@xylabs/hex';
+import type { Address, Hash, Hex } from '@xylabs/hex';
 import type { AccountInstance } from '@xyo-network/account-model';
 import type { BoundWitness, Signed, UnsignedBoundWitness } from '@xyo-network/boundwitness-model';
 import type { PayloadBuilderOptions } from '@xyo-network/payload-builder';
@@ -22,15 +22,15 @@ export declare class BoundWitnessBuilder<TBoundWitness extends UnsignedBoundWitn
     static addressIndex<T extends BoundWitness>(payload: T, address: Address): number;
     static previousHash<T extends BoundWitness>(boundWitness: T, address: Address): string | undefined;
     protected static linkingFields<T extends BoundWitness>(accounts: AccountInstance[], payloads?: Payload[]): Promise<Pick<T, GeneratedBoundWitnessFields>>;
-    protected static signature<T extends BoundWitness>(payload: T, address: Address): Lowercase<string>;
+    protected static signature<T extends BoundWitness>(payload: T, address: Address): Hex;
     protected static signatures(accounts: AccountInstance[], dataHash: Hash): Promise<string[]>;
     private static validateGeneratedFields;
     build(): Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]>;
-    dataHash(): Promise<Lowercase<string>>;
+    dataHash(): Promise<Hash>;
     dataHashableFields(): Promise<WithoutMeta<TBoundWitness>>;
     error(payload?: ModuleError): this;
     errors(errors?: (ModuleError | null)[]): this;
-    fields(fields: WithoutStorageMeta<WithoutClientMeta<WithoutSchema<Omit<TBoundWitness, GeneratedBoundWitnessFields>>>>): this;
+    fields(fields: WithoutSchema<Omit<WithoutStorageMeta<WithoutClientMeta<TBoundWitness>>, 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'>>): this;
     hashes(hashes: Hash[], schema: Schema[]): this;
     payload(payload?: TPayload): this;
     payloads(payloads?: (TPayload | null)[]): this;
@@ -41,7 +41,7 @@ export declare class BoundWitnessBuilder<TBoundWitness extends UnsignedBoundWitn
     witness(account: AccountInstance): this;
     /** @deprecated use signers instead */
     witnesses(accounts: AccountInstance[]): this;
-    protected sign(): Promise<string[]>;
+    protected sign(): Promise<Hex[]>;
     private generatedFields;
     private missingSchemaMessage;
 }

package/dist/neutral/Builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/Builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/Builder.ts"],"names":[],"mappings":"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"}

package/dist/neutral/index.mjs

@@ -1,7 +1,11 @@
 // src/Builder.ts
 import { toArrayBuffer } from "@xylabs/arraybuffer";
 import { assertEx } from "@xylabs/assert";
-import { hexFromArrayBuffer } from "@xylabs/hex";
+import {
+  asAddress,
+  asHash,
+  hexFromArrayBuffer
+} from "@xylabs/hex";
 import { BoundWitnessSchema } from "@xyo-network/boundwitness-model";
 import {
   ObjectHasher,
@@ -58,10 +62,10 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder extends PayloadBuilder {
     return index;
   }
   static previousHash(boundWitness, address) {
-    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase();
+    return asHash(boundWitness.previous_hashes[this.addressIndex(boundWitness, address)])?.toLowerCase();
   }
   static async linkingFields(accounts, payloads) {
-    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }));
+    const addresses = accounts.map((account) => asAddress(hexFromArrayBuffer(account.addressBytes, { prefix: false }), true));
     const previous_hashes = accounts.map((account) => account.previousHash ?? null);
     const payload_hashes = payloads ? await _BoundWitnessBuilder.hashes(payloads) : [];
     const payload_schemas = payloads?.map(({ schema }) => schema) ?? [];

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { hexFromArrayBuffer } from '@xylabs/hex'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type {\n  BoundWitness,\n  Signed,\n  UnsignedBoundWitness,\n} from '@xyo-network/boundwitness-model'\nimport { BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport {\n  ObjectHasher, removeEmptyFields, sortFields,\n} from '@xyo-network/hash'\nimport type { PayloadBuilderOptions } from '@xyo-network/payload-builder'\nimport { omitSchema, PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n  ModuleError, Payload, Schema,\n  WithoutClientMeta,\n  WithoutMeta,\n  WithoutSchema,\n  WithoutStorageMeta,\n} from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport const GeneratedBoundWitnessFields = ['addresses', 'payload_hashes', 'payload_schemas', 'previous_hashes'] as const\nexport type GeneratedBoundWitnessFields = typeof GeneratedBoundWitnessFields[number]\n\nconst uniqueAccounts = (accounts: AccountInstance[], throwOnFalse = false) => {\n  const addresses = new Set<Address>()\n  for (const account of accounts) {\n    if (addresses.has(account.address)) {\n      if (throwOnFalse) {\n        throw new Error('Duplicate address')\n      }\n      return false\n    }\n    addresses.add(account.address)\n  }\n  return true\n}\n\nexport class BoundWitnessBuilder<\n  TBoundWitness extends UnsignedBoundWitness = UnsignedBoundWitness,\n  TPayload extends Payload = Payload>\n  extends PayloadBuilder<\n    TBoundWitness,\n    Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]>\n  > {\n  private static readonly _buildMutex = new Mutex()\n\n  private _accounts: AccountInstance[] = []\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[] = []\n\n  constructor(options?: Omit<PayloadBuilderOptions, 'schema'>) {\n    super({ ...options, schema: BoundWitnessSchema })\n  }\n\n  protected get addresses(): Address[] {\n    uniqueAccounts(this._accounts, true)\n    return this._accounts.map(account => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas\n      ?? this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBytes(): (ArrayBufferLike | null)[] {\n    return this._accounts.map(account => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map(account => account.previousHash ?? null)\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n  ): Promise<Pick<T, GeneratedBoundWitnessFields>> {\n    const addresses = accounts.map(account => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map(account => account.previousHash ?? null)\n    const payload_hashes = payloads ? await BoundWitnessBuilder.hashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema) ?? []\n    return {\n      addresses, payload_hashes, payload_schemas, previous_hashes,\n    }\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], dataHash: Hash): Promise<string[]> {\n    const hashBytes = toArrayBuffer(dataHash)\n    const previousHashesBytes = accounts?.map(account => account.previousHashBytes)\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer((await account.sign(hashBytes, previousHashesBytes[index]))[0])))\n  }\n\n  private static validateGeneratedFields(fields: Pick<BoundWitness, GeneratedBoundWitnessFields>) {\n    assertEx(fields.payload_hashes?.length === fields.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!fields.payload_hashes.some(hash => !hash), () => 'nulls found in hashes')\n    assertEx(!fields.payload_schemas.some(schema => !schema), () => 'nulls found in schemas')\n  }\n\n  override async build(): Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = await this.dataHashableFields()\n      const $signatures = await this.sign()\n\n      const ret = {\n        ...this._meta, ...dataHashableFields, ...this._fields, $signatures,\n      } as Signed<TBoundWitness>\n      return [\n        ret,\n        this._payloads,\n        this._errors,\n      ]\n    })\n  }\n\n  async dataHash() {\n    const dataHashableFields = await this.dataHashableFields()\n    const hash = await ObjectHasher.hash(dataHashableFields)\n    return hash\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const generatedFields: Pick<TBoundWitness, GeneratedBoundWitnessFields> = await this.generatedFields()\n    BoundWitnessBuilder.validateGeneratedFields(generatedFields)\n    const fields: WithoutSchema<TBoundWitness> = {\n      ...PayloadBuilder.omitMeta(this._fields ?? {}),\n      ...generatedFields,\n    } as WithoutSchema<TBoundWitness>\n    return await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      for (const error of errors) {\n        if (error !== null) {\n          this.error(error)\n        }\n      }\n    }\n    return this\n  }\n\n  override fields(fields: WithoutStorageMeta<WithoutClientMeta<WithoutSchema<Omit<TBoundWitness, GeneratedBoundWitnessFields>>>>): this {\n    // clean it up just incase\n    const clone = structuredClone(fields) as unknown as Partial<TBoundWitness>\n    for (const field of GeneratedBoundWitnessFields) {\n      delete clone[field]\n    }\n    // we need to do the cast here since ts seems to not like nested, yet same, generics\n    this._fields\n      = BoundWitnessBuilder.omitStorageMeta(\n        BoundWitnessBuilder.omitClientMeta(\n          omitSchema(removeEmptyFields(clone)),\n        ),\n      ) as unknown as WithoutStorageMeta<WithoutClientMeta<WithoutSchema<TBoundWitness>>>\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\n    assertEx(this.payloads.length === 0, () => 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      for (const payload of payloads) {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      }\n    return this\n  }\n\n  signer(account: AccountInstance) {\n    uniqueAccounts([...this._accounts, account], true)\n    this._accounts?.push(account)\n    return this\n  }\n\n  signers(accounts: AccountInstance[]) {\n    uniqueAccounts([...this._accounts, ...accounts], true)\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  sourceQuery(sourceQuery: Hash) {\n    this._meta = {\n      ...this._meta,\n      $sourceQuery: sourceQuery,\n    } as typeof this._meta\n    return this\n  }\n\n  /** @deprecated use signer instead */\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  /** @deprecated use signers instead */\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async sign(): Promise<string[]> {\n    uniqueAccounts(this._accounts, true)\n    const hashBytes = toArrayBuffer(await this.dataHash())\n    return await Promise.all(this._accounts.map(async account => hexFromArrayBuffer((await account.sign(hashBytes))[0])))\n  }\n\n  private async generatedFields(): Promise<Pick<TBoundWitness, GeneratedBoundWitnessFields>> {\n    return await BoundWitnessBuilder.linkingFields(this._accounts, this._payloads)\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport type { Query, WithoutMeta } from '@xyo-network/payload-model'\n\nimport { BoundWitnessBuilder } from '../Builder.ts'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: TQuery | undefined\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: await PayloadBuilder.dataHash(assertEx(this._query, () => 'No Query Specified')),\n    } as TBoundWitness\n    return { ...fields } as WithoutMeta<TBoundWitness>\n  }\n\n  query<T extends TQuery>(query: T) {\n    this.payload(query)\n    this._query = query\n    return this\n  }\n}\n"],"mappings":"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","names":["assertEx","PayloadBuilder","PayloadBuilder","assertEx"]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport type {\n  Address, Hash, Hex,\n} from '@xylabs/hex'\nimport {\n  asAddress, asHash, hexFromArrayBuffer,\n} from '@xylabs/hex'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type {\n  BoundWitness,\n  Signed,\n  UnsignedBoundWitness,\n} from '@xyo-network/boundwitness-model'\nimport { BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport {\n  ObjectHasher, removeEmptyFields, sortFields,\n} from '@xyo-network/hash'\nimport type { PayloadBuilderOptions } from '@xyo-network/payload-builder'\nimport { omitSchema, PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n  ModuleError, Payload, Schema,\n  WithoutClientMeta,\n  WithoutMeta,\n  WithoutSchema,\n  WithoutStorageMeta,\n} from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport const GeneratedBoundWitnessFields = ['addresses', 'payload_hashes', 'payload_schemas', 'previous_hashes'] as const\nexport type GeneratedBoundWitnessFields = typeof GeneratedBoundWitnessFields[number]\n\nconst uniqueAccounts = (accounts: AccountInstance[], throwOnFalse = false) => {\n  const addresses = new Set<Address>()\n  for (const account of accounts) {\n    if (addresses.has(account.address)) {\n      if (throwOnFalse) {\n        throw new Error('Duplicate address')\n      }\n      return false\n    }\n    addresses.add(account.address)\n  }\n  return true\n}\n\nexport class BoundWitnessBuilder<\n  TBoundWitness extends UnsignedBoundWitness = UnsignedBoundWitness,\n  TPayload extends Payload = Payload>\n  extends PayloadBuilder<\n    TBoundWitness,\n    Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]>\n  > {\n  private static readonly _buildMutex = new Mutex()\n\n  private _accounts: AccountInstance[] = []\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[] = []\n\n  constructor(options?: Omit<PayloadBuilderOptions, 'schema'>) {\n    super({ ...options, schema: BoundWitnessSchema })\n  }\n\n  protected get addresses(): Address[] {\n    uniqueAccounts(this._accounts, true)\n    return this._accounts.map(account => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas\n      ?? this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBytes(): (ArrayBufferLike | null)[] {\n    return this._accounts.map(account => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map(account => account.previousHash ?? null)\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return asHash(boundWitness.previous_hashes[this.addressIndex(boundWitness, address)])?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n  ): Promise<Pick<T, GeneratedBoundWitnessFields>> {\n    const addresses = accounts.map(account => asAddress(hexFromArrayBuffer(account.addressBytes, { prefix: false }), true))\n    const previous_hashes = accounts.map(account => account.previousHash ?? null)\n    const payload_hashes = payloads ? await BoundWitnessBuilder.hashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema) ?? []\n    return {\n      addresses, payload_hashes, payload_schemas, previous_hashes,\n    }\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], dataHash: Hash): Promise<string[]> {\n    const hashBytes = toArrayBuffer(dataHash)\n    const previousHashesBytes = accounts?.map(account => account.previousHashBytes)\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer((await account.sign(hashBytes, previousHashesBytes[index]))[0])))\n  }\n\n  private static validateGeneratedFields(fields: Pick<BoundWitness, GeneratedBoundWitnessFields>) {\n    assertEx(fields.payload_hashes?.length === fields.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!fields.payload_hashes.some(hash => !hash), () => 'nulls found in hashes')\n    assertEx(!fields.payload_schemas.some(schema => !schema), () => 'nulls found in schemas')\n  }\n\n  override async build(): Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = await this.dataHashableFields()\n      const $signatures = await this.sign()\n\n      const ret = {\n        ...this._meta, ...dataHashableFields, ...this._fields, $signatures,\n      } as Signed<TBoundWitness>\n      return [\n        ret,\n        this._payloads,\n        this._errors,\n      ]\n    })\n  }\n\n  async dataHash() {\n    const dataHashableFields = await this.dataHashableFields()\n    const hash = await ObjectHasher.hash(dataHashableFields)\n    return hash\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const generatedFields: Pick<TBoundWitness, GeneratedBoundWitnessFields> = await this.generatedFields()\n    BoundWitnessBuilder.validateGeneratedFields(generatedFields)\n    const fields: WithoutSchema<TBoundWitness> = {\n      ...PayloadBuilder.omitMeta(this._fields ?? {}),\n      ...generatedFields,\n    } as WithoutSchema<TBoundWitness>\n    return await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      for (const error of errors) {\n        if (error !== null) {\n          this.error(error)\n        }\n      }\n    }\n    return this\n  }\n\n  override fields(fields: WithoutSchema<Omit<WithoutStorageMeta<WithoutClientMeta<TBoundWitness>>,\n    'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'>>): this {\n    // clean it up just incase\n    const clone = structuredClone(fields) as unknown as Partial<TBoundWitness>\n    for (const field of GeneratedBoundWitnessFields) {\n      delete clone[field]\n    }\n    // we need to do the cast here since ts seems to not like nested, yet same, generics\n    this._fields\n      = BoundWitnessBuilder.omitStorageMeta(\n        BoundWitnessBuilder.omitClientMeta(\n          omitSchema(removeEmptyFields(clone)),\n        ),\n      ) as unknown as WithoutStorageMeta<WithoutClientMeta<WithoutSchema<TBoundWitness>>>\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\n    assertEx(this.payloads.length === 0, () => 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      for (const payload of payloads) {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      }\n    return this\n  }\n\n  signer(account: AccountInstance) {\n    uniqueAccounts([...this._accounts, account], true)\n    this._accounts?.push(account)\n    return this\n  }\n\n  signers(accounts: AccountInstance[]) {\n    uniqueAccounts([...this._accounts, ...accounts], true)\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  sourceQuery(sourceQuery: Hash) {\n    this._meta = {\n      ...this._meta,\n      $sourceQuery: sourceQuery,\n    } as typeof this._meta\n    return this\n  }\n\n  /** @deprecated use signer instead */\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  /** @deprecated use signers instead */\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async sign(): Promise<Hex[]> {\n    uniqueAccounts(this._accounts, true)\n    const hashBytes = toArrayBuffer(await this.dataHash())\n    return await Promise.all(this._accounts.map(async account => hexFromArrayBuffer((await account.sign(hashBytes))[0])))\n  }\n\n  private async generatedFields(): Promise<Pick<TBoundWitness, GeneratedBoundWitnessFields>> {\n    return await BoundWitnessBuilder.linkingFields(this._accounts, this._payloads)\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport type { Query, WithoutMeta } from '@xyo-network/payload-model'\n\nimport { BoundWitnessBuilder } from '../Builder.ts'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: TQuery | undefined\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: await PayloadBuilder.dataHash(assertEx(this._query, () => 'No Query Specified')),\n    } as TBoundWitness\n    return { ...fields } as WithoutMeta<TBoundWitness>\n  }\n\n  query<T extends TQuery>(query: T) {\n    this.payload(query)\n    this._query = query\n    return this\n  }\n}\n"],"mappings":"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","names":["assertEx","PayloadBuilder","PayloadBuilder","assertEx"]}

package/dist/node/Builder.d.ts

@@ -1,4 +1,4 @@
-import type { Address, Hash } from '@xylabs/hex';
+import type { Address, Hash, Hex } from '@xylabs/hex';
 import type { AccountInstance } from '@xyo-network/account-model';
 import type { BoundWitness, Signed, UnsignedBoundWitness } from '@xyo-network/boundwitness-model';
 import type { PayloadBuilderOptions } from '@xyo-network/payload-builder';
@@ -22,15 +22,15 @@ export declare class BoundWitnessBuilder<TBoundWitness extends UnsignedBoundWitn
     static addressIndex<T extends BoundWitness>(payload: T, address: Address): number;
     static previousHash<T extends BoundWitness>(boundWitness: T, address: Address): string | undefined;
     protected static linkingFields<T extends BoundWitness>(accounts: AccountInstance[], payloads?: Payload[]): Promise<Pick<T, GeneratedBoundWitnessFields>>;
-    protected static signature<T extends BoundWitness>(payload: T, address: Address): Lowercase<string>;
+    protected static signature<T extends BoundWitness>(payload: T, address: Address): Hex;
     protected static signatures(accounts: AccountInstance[], dataHash: Hash): Promise<string[]>;
     private static validateGeneratedFields;
     build(): Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]>;
-    dataHash(): Promise<Lowercase<string>>;
+    dataHash(): Promise<Hash>;
     dataHashableFields(): Promise<WithoutMeta<TBoundWitness>>;
     error(payload?: ModuleError): this;
     errors(errors?: (ModuleError | null)[]): this;
-    fields(fields: WithoutStorageMeta<WithoutClientMeta<WithoutSchema<Omit<TBoundWitness, GeneratedBoundWitnessFields>>>>): this;
+    fields(fields: WithoutSchema<Omit<WithoutStorageMeta<WithoutClientMeta<TBoundWitness>>, 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'>>): this;
     hashes(hashes: Hash[], schema: Schema[]): this;
     payload(payload?: TPayload): this;
     payloads(payloads?: (TPayload | null)[]): this;
@@ -41,7 +41,7 @@ export declare class BoundWitnessBuilder<TBoundWitness extends UnsignedBoundWitn
     witness(account: AccountInstance): this;
     /** @deprecated use signers instead */
     witnesses(accounts: AccountInstance[]): this;
-    protected sign(): Promise<string[]>;
+    protected sign(): Promise<Hex[]>;
     private generatedFields;
     private missingSchemaMessage;
 }

package/dist/node/Builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/Builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/Builder.ts"],"names":[],"mappings":"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"}

package/dist/node/index.mjs

@@ -1,7 +1,11 @@
 // src/Builder.ts
 import { toArrayBuffer } from "@xylabs/arraybuffer";
 import { assertEx } from "@xylabs/assert";
-import { hexFromArrayBuffer } from "@xylabs/hex";
+import {
+  asAddress,
+  asHash,
+  hexFromArrayBuffer
+} from "@xylabs/hex";
 import { BoundWitnessSchema } from "@xyo-network/boundwitness-model";
 import {
   ObjectHasher,
@@ -58,10 +62,10 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder extends PayloadBuilder {
     return index;
   }
   static previousHash(boundWitness, address) {
-    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase();
+    return asHash(boundWitness.previous_hashes[this.addressIndex(boundWitness, address)])?.toLowerCase();
   }
   static async linkingFields(accounts, payloads) {
-    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }));
+    const addresses = accounts.map((account) => asAddress(hexFromArrayBuffer(account.addressBytes, { prefix: false }), true));
     const previous_hashes = accounts.map((account) => account.previousHash ?? null);
     const payload_hashes = payloads ? await _BoundWitnessBuilder.hashes(payloads) : [];
     const payload_schemas = payloads?.map(({ schema }) => schema) ?? [];

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { hexFromArrayBuffer } from '@xylabs/hex'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type {\n  BoundWitness,\n  Signed,\n  UnsignedBoundWitness,\n} from '@xyo-network/boundwitness-model'\nimport { BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport {\n  ObjectHasher, removeEmptyFields, sortFields,\n} from '@xyo-network/hash'\nimport type { PayloadBuilderOptions } from '@xyo-network/payload-builder'\nimport { omitSchema, PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n  ModuleError, Payload, Schema,\n  WithoutClientMeta,\n  WithoutMeta,\n  WithoutSchema,\n  WithoutStorageMeta,\n} from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport const GeneratedBoundWitnessFields = ['addresses', 'payload_hashes', 'payload_schemas', 'previous_hashes'] as const\nexport type GeneratedBoundWitnessFields = typeof GeneratedBoundWitnessFields[number]\n\nconst uniqueAccounts = (accounts: AccountInstance[], throwOnFalse = false) => {\n  const addresses = new Set<Address>()\n  for (const account of accounts) {\n    if (addresses.has(account.address)) {\n      if (throwOnFalse) {\n        throw new Error('Duplicate address')\n      }\n      return false\n    }\n    addresses.add(account.address)\n  }\n  return true\n}\n\nexport class BoundWitnessBuilder<\n  TBoundWitness extends UnsignedBoundWitness = UnsignedBoundWitness,\n  TPayload extends Payload = Payload>\n  extends PayloadBuilder<\n    TBoundWitness,\n    Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]>\n  > {\n  private static readonly _buildMutex = new Mutex()\n\n  private _accounts: AccountInstance[] = []\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[] = []\n\n  constructor(options?: Omit<PayloadBuilderOptions, 'schema'>) {\n    super({ ...options, schema: BoundWitnessSchema })\n  }\n\n  protected get addresses(): Address[] {\n    uniqueAccounts(this._accounts, true)\n    return this._accounts.map(account => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas\n      ?? this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBytes(): (ArrayBufferLike | null)[] {\n    return this._accounts.map(account => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map(account => account.previousHash ?? null)\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n  ): Promise<Pick<T, GeneratedBoundWitnessFields>> {\n    const addresses = accounts.map(account => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map(account => account.previousHash ?? null)\n    const payload_hashes = payloads ? await BoundWitnessBuilder.hashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema) ?? []\n    return {\n      addresses, payload_hashes, payload_schemas, previous_hashes,\n    }\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], dataHash: Hash): Promise<string[]> {\n    const hashBytes = toArrayBuffer(dataHash)\n    const previousHashesBytes = accounts?.map(account => account.previousHashBytes)\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer((await account.sign(hashBytes, previousHashesBytes[index]))[0])))\n  }\n\n  private static validateGeneratedFields(fields: Pick<BoundWitness, GeneratedBoundWitnessFields>) {\n    assertEx(fields.payload_hashes?.length === fields.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!fields.payload_hashes.some(hash => !hash), () => 'nulls found in hashes')\n    assertEx(!fields.payload_schemas.some(schema => !schema), () => 'nulls found in schemas')\n  }\n\n  override async build(): Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = await this.dataHashableFields()\n      const $signatures = await this.sign()\n\n      const ret = {\n        ...this._meta, ...dataHashableFields, ...this._fields, $signatures,\n      } as Signed<TBoundWitness>\n      return [\n        ret,\n        this._payloads,\n        this._errors,\n      ]\n    })\n  }\n\n  async dataHash() {\n    const dataHashableFields = await this.dataHashableFields()\n    const hash = await ObjectHasher.hash(dataHashableFields)\n    return hash\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const generatedFields: Pick<TBoundWitness, GeneratedBoundWitnessFields> = await this.generatedFields()\n    BoundWitnessBuilder.validateGeneratedFields(generatedFields)\n    const fields: WithoutSchema<TBoundWitness> = {\n      ...PayloadBuilder.omitMeta(this._fields ?? {}),\n      ...generatedFields,\n    } as WithoutSchema<TBoundWitness>\n    return await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      for (const error of errors) {\n        if (error !== null) {\n          this.error(error)\n        }\n      }\n    }\n    return this\n  }\n\n  override fields(fields: WithoutStorageMeta<WithoutClientMeta<WithoutSchema<Omit<TBoundWitness, GeneratedBoundWitnessFields>>>>): this {\n    // clean it up just incase\n    const clone = structuredClone(fields) as unknown as Partial<TBoundWitness>\n    for (const field of GeneratedBoundWitnessFields) {\n      delete clone[field]\n    }\n    // we need to do the cast here since ts seems to not like nested, yet same, generics\n    this._fields\n      = BoundWitnessBuilder.omitStorageMeta(\n        BoundWitnessBuilder.omitClientMeta(\n          omitSchema(removeEmptyFields(clone)),\n        ),\n      ) as unknown as WithoutStorageMeta<WithoutClientMeta<WithoutSchema<TBoundWitness>>>\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\n    assertEx(this.payloads.length === 0, () => 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      for (const payload of payloads) {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      }\n    return this\n  }\n\n  signer(account: AccountInstance) {\n    uniqueAccounts([...this._accounts, account], true)\n    this._accounts?.push(account)\n    return this\n  }\n\n  signers(accounts: AccountInstance[]) {\n    uniqueAccounts([...this._accounts, ...accounts], true)\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  sourceQuery(sourceQuery: Hash) {\n    this._meta = {\n      ...this._meta,\n      $sourceQuery: sourceQuery,\n    } as typeof this._meta\n    return this\n  }\n\n  /** @deprecated use signer instead */\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  /** @deprecated use signers instead */\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async sign(): Promise<string[]> {\n    uniqueAccounts(this._accounts, true)\n    const hashBytes = toArrayBuffer(await this.dataHash())\n    return await Promise.all(this._accounts.map(async account => hexFromArrayBuffer((await account.sign(hashBytes))[0])))\n  }\n\n  private async generatedFields(): Promise<Pick<TBoundWitness, GeneratedBoundWitnessFields>> {\n    return await BoundWitnessBuilder.linkingFields(this._accounts, this._payloads)\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport type { Query, WithoutMeta } from '@xyo-network/payload-model'\n\nimport { BoundWitnessBuilder } from '../Builder.ts'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: TQuery | undefined\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: await PayloadBuilder.dataHash(assertEx(this._query, () => 'No Query Specified')),\n    } as TBoundWitness\n    return { ...fields } as WithoutMeta<TBoundWitness>\n  }\n\n  query<T extends TQuery>(query: T) {\n    this.payload(query)\n    this._query = query\n    return this\n  }\n}\n"],"mappings":"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","names":["assertEx","PayloadBuilder","PayloadBuilder","assertEx"]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport type {\n  Address, Hash, Hex,\n} from '@xylabs/hex'\nimport {\n  asAddress, asHash, hexFromArrayBuffer,\n} from '@xylabs/hex'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type {\n  BoundWitness,\n  Signed,\n  UnsignedBoundWitness,\n} from '@xyo-network/boundwitness-model'\nimport { BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport {\n  ObjectHasher, removeEmptyFields, sortFields,\n} from '@xyo-network/hash'\nimport type { PayloadBuilderOptions } from '@xyo-network/payload-builder'\nimport { omitSchema, PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n  ModuleError, Payload, Schema,\n  WithoutClientMeta,\n  WithoutMeta,\n  WithoutSchema,\n  WithoutStorageMeta,\n} from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport const GeneratedBoundWitnessFields = ['addresses', 'payload_hashes', 'payload_schemas', 'previous_hashes'] as const\nexport type GeneratedBoundWitnessFields = typeof GeneratedBoundWitnessFields[number]\n\nconst uniqueAccounts = (accounts: AccountInstance[], throwOnFalse = false) => {\n  const addresses = new Set<Address>()\n  for (const account of accounts) {\n    if (addresses.has(account.address)) {\n      if (throwOnFalse) {\n        throw new Error('Duplicate address')\n      }\n      return false\n    }\n    addresses.add(account.address)\n  }\n  return true\n}\n\nexport class BoundWitnessBuilder<\n  TBoundWitness extends UnsignedBoundWitness = UnsignedBoundWitness,\n  TPayload extends Payload = Payload>\n  extends PayloadBuilder<\n    TBoundWitness,\n    Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]>\n  > {\n  private static readonly _buildMutex = new Mutex()\n\n  private _accounts: AccountInstance[] = []\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[] = []\n\n  constructor(options?: Omit<PayloadBuilderOptions, 'schema'>) {\n    super({ ...options, schema: BoundWitnessSchema })\n  }\n\n  protected get addresses(): Address[] {\n    uniqueAccounts(this._accounts, true)\n    return this._accounts.map(account => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas\n      ?? this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBytes(): (ArrayBufferLike | null)[] {\n    return this._accounts.map(account => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map(account => account.previousHash ?? null)\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return asHash(boundWitness.previous_hashes[this.addressIndex(boundWitness, address)])?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n  ): Promise<Pick<T, GeneratedBoundWitnessFields>> {\n    const addresses = accounts.map(account => asAddress(hexFromArrayBuffer(account.addressBytes, { prefix: false }), true))\n    const previous_hashes = accounts.map(account => account.previousHash ?? null)\n    const payload_hashes = payloads ? await BoundWitnessBuilder.hashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema) ?? []\n    return {\n      addresses, payload_hashes, payload_schemas, previous_hashes,\n    }\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], dataHash: Hash): Promise<string[]> {\n    const hashBytes = toArrayBuffer(dataHash)\n    const previousHashesBytes = accounts?.map(account => account.previousHashBytes)\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer((await account.sign(hashBytes, previousHashesBytes[index]))[0])))\n  }\n\n  private static validateGeneratedFields(fields: Pick<BoundWitness, GeneratedBoundWitnessFields>) {\n    assertEx(fields.payload_hashes?.length === fields.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!fields.payload_hashes.some(hash => !hash), () => 'nulls found in hashes')\n    assertEx(!fields.payload_schemas.some(schema => !schema), () => 'nulls found in schemas')\n  }\n\n  override async build(): Promise<[Signed<TBoundWitness>, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = await this.dataHashableFields()\n      const $signatures = await this.sign()\n\n      const ret = {\n        ...this._meta, ...dataHashableFields, ...this._fields, $signatures,\n      } as Signed<TBoundWitness>\n      return [\n        ret,\n        this._payloads,\n        this._errors,\n      ]\n    })\n  }\n\n  async dataHash() {\n    const dataHashableFields = await this.dataHashableFields()\n    const hash = await ObjectHasher.hash(dataHashableFields)\n    return hash\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const generatedFields: Pick<TBoundWitness, GeneratedBoundWitnessFields> = await this.generatedFields()\n    BoundWitnessBuilder.validateGeneratedFields(generatedFields)\n    const fields: WithoutSchema<TBoundWitness> = {\n      ...PayloadBuilder.omitMeta(this._fields ?? {}),\n      ...generatedFields,\n    } as WithoutSchema<TBoundWitness>\n    return await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      for (const error of errors) {\n        if (error !== null) {\n          this.error(error)\n        }\n      }\n    }\n    return this\n  }\n\n  override fields(fields: WithoutSchema<Omit<WithoutStorageMeta<WithoutClientMeta<TBoundWitness>>,\n    'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'>>): this {\n    // clean it up just incase\n    const clone = structuredClone(fields) as unknown as Partial<TBoundWitness>\n    for (const field of GeneratedBoundWitnessFields) {\n      delete clone[field]\n    }\n    // we need to do the cast here since ts seems to not like nested, yet same, generics\n    this._fields\n      = BoundWitnessBuilder.omitStorageMeta(\n        BoundWitnessBuilder.omitClientMeta(\n          omitSchema(removeEmptyFields(clone)),\n        ),\n      ) as unknown as WithoutStorageMeta<WithoutClientMeta<WithoutSchema<TBoundWitness>>>\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\n    assertEx(this.payloads.length === 0, () => 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      for (const payload of payloads) {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      }\n    return this\n  }\n\n  signer(account: AccountInstance) {\n    uniqueAccounts([...this._accounts, account], true)\n    this._accounts?.push(account)\n    return this\n  }\n\n  signers(accounts: AccountInstance[]) {\n    uniqueAccounts([...this._accounts, ...accounts], true)\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  sourceQuery(sourceQuery: Hash) {\n    this._meta = {\n      ...this._meta,\n      $sourceQuery: sourceQuery,\n    } as typeof this._meta\n    return this\n  }\n\n  /** @deprecated use signer instead */\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  /** @deprecated use signers instead */\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async sign(): Promise<Hex[]> {\n    uniqueAccounts(this._accounts, true)\n    const hashBytes = toArrayBuffer(await this.dataHash())\n    return await Promise.all(this._accounts.map(async account => hexFromArrayBuffer((await account.sign(hashBytes))[0])))\n  }\n\n  private async generatedFields(): Promise<Pick<TBoundWitness, GeneratedBoundWitnessFields>> {\n    return await BoundWitnessBuilder.linkingFields(this._accounts, this._payloads)\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport type { Query, WithoutMeta } from '@xyo-network/payload-model'\n\nimport { BoundWitnessBuilder } from '../Builder.ts'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: TQuery | undefined\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: await PayloadBuilder.dataHash(assertEx(this._query, () => 'No Query Specified')),\n    } as TBoundWitness\n    return { ...fields } as WithoutMeta<TBoundWitness>\n  }\n\n  query<T extends TQuery>(query: T) {\n    this.payload(query)\n    this._query = query\n    return this\n  }\n}\n"],"mappings":"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","names":["assertEx","PayloadBuilder","PayloadBuilder","assertEx"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/boundwitness-builder",
-  "version": "4.1.7",
+  "version": "4.2.1",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,24 +29,24 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/neutral/index.d.ts",
   "dependencies": {
-    "@xylabs/arraybuffer": "^4.13.23",
-    "@xylabs/assert": "^4.13.23",
-    "@xylabs/hex": "^4.13.23",
-    "@xyo-network/account-model": "^4.1.7",
-    "@xyo-network/boundwitness-model": "^4.1.7",
-    "@xyo-network/hash": "^4.1.7",
-    "@xyo-network/payload": "^4.1.7",
-    "@xyo-network/payload-builder": "^4.1.7",
-    "@xyo-network/payload-model": "^4.1.7",
+    "@xylabs/arraybuffer": "^4.14.1",
+    "@xylabs/assert": "^4.14.1",
+    "@xylabs/hex": "^4.14.1",
+    "@xyo-network/account-model": "^4.2.1",
+    "@xyo-network/boundwitness-model": "^4.2.1",
+    "@xyo-network/hash": "^4.2.1",
+    "@xyo-network/payload": "^4.2.1",
+    "@xyo-network/payload-builder": "^4.2.1",
+    "@xyo-network/payload-model": "^4.2.1",
     "async-mutex": "^0.5.0"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^7.0.0",
-    "@xylabs/tsconfig": "^7.0.0",
-    "@xylabs/vitest-extended": "^4.13.23",
-    "@xyo-network/account": "^4.1.7",
-    "@xyo-network/elliptic": "^4.1.7",
-    "@xyo-network/wallet": "^4.1.7",
+    "@xylabs/ts-scripts-yarn3": "^7.0.1",
+    "@xylabs/tsconfig": "^7.0.1",
+    "@xylabs/vitest-extended": "^4.14.1",
+    "@xyo-network/account": "^4.2.1",
+    "@xyo-network/elliptic": "^4.2.1",
+    "@xyo-network/wallet": "^4.2.1",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4"
   },

package/src/Builder.ts

@@ -1,7 +1,11 @@
 import { toArrayBuffer } from '@xylabs/arraybuffer'
 import { assertEx } from '@xylabs/assert'
-import type { Address, Hash } from '@xylabs/hex'
-import { hexFromArrayBuffer } from '@xylabs/hex'
+import type {
+  Address, Hash, Hex,
+} from '@xylabs/hex'
+import {
+  asAddress, asHash, hexFromArrayBuffer,
+} from '@xylabs/hex'
 import type { AccountInstance } from '@xyo-network/account-model'
 import type {
   BoundWitness,
@@ -91,14 +95,14 @@ export class BoundWitnessBuilder<
   }
 
   static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {
-    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()
+    return asHash(boundWitness.previous_hashes[this.addressIndex(boundWitness, address)])?.toLowerCase()
   }
 
   protected static async linkingFields<T extends BoundWitness>(
     accounts: AccountInstance[],
     payloads?: Payload[],
   ): Promise<Pick<T, GeneratedBoundWitnessFields>> {
-    const addresses = accounts.map(account => hexFromArrayBuffer(account.addressBytes, { prefix: false }))
+    const addresses = accounts.map(account => asAddress(hexFromArrayBuffer(account.addressBytes, { prefix: false }), true))
     const previous_hashes = accounts.map(account => account.previousHash ?? null)
     const payload_hashes = payloads ? await BoundWitnessBuilder.hashes(payloads) : []
     const payload_schemas = payloads?.map(({ schema }) => schema) ?? []
@@ -174,7 +178,8 @@ export class BoundWitnessBuilder<
     return this
   }
 
-  override fields(fields: WithoutStorageMeta<WithoutClientMeta<WithoutSchema<Omit<TBoundWitness, GeneratedBoundWitnessFields>>>>): this {
+  override fields(fields: WithoutSchema<Omit<WithoutStorageMeta<WithoutClientMeta<TBoundWitness>>,
+    'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'>>): this {
     // clean it up just incase
     const clone = structuredClone(fields) as unknown as Partial<TBoundWitness>
     for (const field of GeneratedBoundWitnessFields) {
@@ -247,7 +252,7 @@ export class BoundWitnessBuilder<
     return this
   }
 
-  protected async sign(): Promise<string[]> {
+  protected async sign(): Promise<Hex[]> {
     uniqueAccounts(this._accounts, true)
     const hashBytes = toArrayBuffer(await this.dataHash())
     return await Promise.all(this._accounts.map(async account => hexFromArrayBuffer((await account.sign(hashBytes))[0])))