Merge branch 'nextVersion'

Author: tonesnotes

client/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox-client",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "Client only Wallet Storage",
   "main": "./out/src/index.client.js",
   "types": "./out/src/index.client.d.ts",

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",

docs/client.md

@@ -2,6 +2,7 @@ import {
   sdk,
   TableCertificate,
   TableCertificateField,
+  TableCertificateX,
   TableCommission,
   TableOutput,
   TableOutputBasket,
@@ -41,7 +42,7 @@ export interface StorageSyncReader {
   findCertificateFields(
     args: sdk.FindCertificateFieldsArgs
   ): Promise<TableCertificateField[]>
-  findCertificates(args: sdk.FindCertificatesArgs): Promise<TableCertificate[]>
+  findCertificates(args: sdk.FindCertificatesArgs): Promise<TableCertificateX[]>
   findCommissions(args: sdk.FindCommissionsArgs): Promise<TableCommission[]>
   findOutputBaskets(
     args: sdk.FindOutputBasketsArgs

docs/storage.md

@@ -73,7 +73,7 @@ export interface WalletStorage {
     args: InternalizeActionArgs
   ): Promise<InternalizeActionResult>
 
-  findCertificates(args: sdk.FindCertificatesArgs): Promise<TableCertificate[]>
+  findCertificates(args: sdk.FindCertificatesArgs): Promise<TableCertificateX[]>
   findOutputBaskets(
     args: sdk.FindOutputBasketsArgs
   ): Promise<TableOutputBasket[]>
@@ -173,7 +173,7 @@ export interface WalletStorageReader {
   findCertificatesAuth(
     auth: sdk.AuthId,
     args: sdk.FindCertificatesArgs
-  ): Promise<TableCertificate[]>
+  ): Promise<TableCertificateX[]>
   findOutputBasketsAuth(
     auth: sdk.AuthId,
     args: sdk.FindOutputBasketsArgs

docs/wallet.md

@@ -799,7 +799,7 @@ export class StorageKnex
   override async findCertificatesAuth(
     auth: sdk.AuthId,
     args: sdk.FindCertificatesArgs
-  ): Promise<TableCertificate[]> {
+  ): Promise<TableCertificateX[]> {
     if (
       !auth.userId ||
       (args.partial.userId && args.partial.userId !== auth.userId)
@@ -840,10 +840,21 @@ export class StorageKnex
   }
   override async findCertificates(
     args: sdk.FindCertificatesArgs
-  ): Promise<TableCertificate[]> {
+  ): Promise<TableCertificateX[]> {
     const q = this.findCertificatesQuery(args)
-    const r = await q
-    return this.validateEntities(r, undefined, ['isDeleted'])
+    let r: TableCertificateX[] = await q
+    r = this.validateEntities(r, undefined, ['isDeleted'])
+    if (args.includeFields) {
+      for (const c of r) {
+        c.fields = this.validateEntities(
+          await this.findCertificateFields({
+            partial: { certificateId: c.certificateId, userId: c.userId },
+            trx: args.trx
+          })
+        )
+      }
+    }
+    return r
   }
   override async findCommissions(
     args: sdk.FindCommissionsArgs