@bsv/wallet-toolbox 1.3.21 → 1.3.23

package/package.json

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

package/src/WalletPermissionsManager.ts

@@ -1,4 +1,13 @@
-import { WalletInterface, Utils, PushDrop, LockingScript, Transaction, WalletProtocol, Base64String, PubKeyHex } from '@bsv/sdk'
+import {
+  WalletInterface,
+  Utils,
+  PushDrop,
+  LockingScript,
+  Transaction,
+  WalletProtocol,
+  Base64String,
+  PubKeyHex
+} from '@bsv/sdk'
 import { validateCreateActionArgs } from './sdk'
 
 ////// TODO: ADD SUPPORT FOR ADMIN COUNTERPARTIES BASED ON WALLET STORAGE
@@ -1576,7 +1585,7 @@ export class WalletPermissionsManager implements WalletInterface {
    * @param params.basket Optional basket name to filter by
    * @returns Array of permission tokens that match the filter criteria
    */
-  public async listBasketAccess(params: { originator?: string, basket?: string } = {}): Promise<PermissionToken[]> {
+  public async listBasketAccess(params: { originator?: string; basket?: string } = {}): Promise<PermissionToken[]> {
     const basketName = BASKET_MAP.basket
     const tags: string[] = []
 
@@ -1708,12 +1717,14 @@ export class WalletPermissionsManager implements WalletInterface {
    * @param verifier Optional verifier to filter by
    * @returns Array of permission tokens that match the filter criteria
    */
-  public async listCertificateAccess(params: {
-    originator?: string,
-    privileged?: boolean,
-    certType?: Base64String,
-    verifier?: PubKeyHex
-  } = {}): Promise<PermissionToken[]> {
+  public async listCertificateAccess(
+    params: {
+      originator?: string
+      privileged?: boolean
+      certType?: Base64String
+      verifier?: PubKeyHex
+    } = {}
+  ): Promise<PermissionToken[]> {
     const basketName = BASKET_MAP.certificate
     const tags: string[] = []
 

package/src/index.mobile.ts

@@ -1,7 +1,5 @@
 export * as sdk from './sdk/index'
 export * from './utility/index.client'
-export * from './SetupClient'
-export * from './SetupWallet'
 export * from './signer/WalletSigner'
 export * from './WalletPermissionsManager'
 export * from './CWIStyleWalletManager'

package/src/storage/StorageIdb.ts

@@ -1,7 +1,6 @@
 import { deleteDB, IDBPCursorWithValue, IDBPDatabase, IDBPTransaction, openDB } from 'idb'
 import { ListActionsResult, ListOutputsResult } from '@bsv/sdk'
 import {
-  sdk,
   TableCertificate,
   TableCertificateField,
   TableCertificateX,
@@ -18,10 +17,10 @@ import {
   TableTransaction,
   TableTxLabel,
   TableTxLabelMap,
-  TableUser,
-  verifyOne,
-  verifyOneOrNone
-} from '../index.client'
+  TableUser
+} from './schema/tables'
+import * as sdk from '../sdk/index'
+import { verifyOne, verifyOneOrNone } from '../utility/utilityHelpers'
 import { StorageAdminStats, StorageProvider, StorageProviderOptions } from './StorageProvider'
 import { StorageIdbSchema } from './schema/StorageIdbSchema'
 import { DBType } from './StorageReader'

package/src/storage/StorageKnex.ts

@@ -1,7 +1,6 @@
-import { ListActionsResult, ListOutputsResult, Transaction } from '@bsv/sdk'
+import { ListActionsResult, ListOutputsResult } from '@bsv/sdk'
 import { sdk, verifyOne, verifyOneOrNone, verifyTruthy } from '../index.all'
 import {
-  KnexMigrations,
   outputColumnsWithoutLockingScript,
   TableCertificate,
   TableCertificateField,
@@ -12,7 +11,6 @@ import {
   TableOutputBasket,
   TableOutputTag,
   TableOutputTagMap,
-  TableOutputX,
   TableProvenTx,
   TableProvenTxReq,
   TableSettings,
@@ -22,8 +20,8 @@ import {
   TableTxLabelMap,
   TableUser,
   transactionColumnsWithoutRawTx
-} from './index.all'
-
+} from './schema/tables'
+import { KnexMigrations } from './schema/KnexMigrations'
 import { Knex } from 'knex'
 import { StorageAdminStats, StorageProvider, StorageProviderOptions } from './StorageProvider'
 import { purgeData } from './methods/purgeData'
@@ -797,7 +795,10 @@ export class StorageKnex extends StorageProvider implements sdk.WalletStoragePro
     for (let i = 0; i < count; i++) {
       try {
         const r = await this.knex.migrate.down(config)
-        expect(r).toBeTruthy()
+        if (!r) {
+          console.error(`Migration returned falsy result await this.knex.migrate.down(config)`)
+          break
+        }
       } catch (eu: unknown) {
         break
       }

package/src/storage/StorageProvider.ts

@@ -14,9 +14,6 @@ import {
   AbortActionArgs
 } from '@bsv/sdk'
 import {
-  asArray,
-  asString,
-  sdk,
   TableCertificateX,
   TableMonitorEvent,
   TableOutput,
@@ -26,12 +23,11 @@ import {
   TableProvenTxReq,
   TableProvenTxReqDynamics,
   TableTransaction,
-  TableTxLabel,
-  verifyId,
-  verifyOne,
-  verifyOneOrNone,
-  verifyTruthy
-} from '../index.client'
+  TableTxLabel
+} from './schema/tables'
+import { verifyId, verifyOne, verifyOneOrNone, verifyTruthy } from '../utility/utilityHelpers'
+import * as sdk from '../sdk/index'
+import { asArray, asString } from '../utility/utilityHelpers.noBuffer'
 import { getBeefForTransaction } from './methods/getBeefForTransaction'
 import { GetReqsAndBeefDetail, GetReqsAndBeefResult, processAction } from './methods/processAction'
 import { attemptToPostReqsToNetwork, PostReqsToNetworkResult } from './methods/attemptToPostReqsToNetwork'

package/src/storage/StorageReader.ts

@@ -1,6 +1,4 @@
 import {
-  sdk,
-  TableCertificate,
   TableCertificateField,
   TableCertificateX,
   TableCommission,
@@ -16,11 +14,10 @@ import {
   TableTransaction,
   TableTxLabel,
   TableTxLabelMap,
-  TableUser,
-  validateSecondsSinceEpoch,
-  verifyOneOrNone,
-  verifyTruthy
-} from '../index.client'
+  TableUser
+} from './schema/tables'
+import * as sdk from '../sdk/index'
+import { validateSecondsSinceEpoch, verifyOneOrNone, verifyTruthy } from '../utility/utilityHelpers'
 import { getSyncChunk } from './methods/getSyncChunk'
 
 /**

package/src/storage/StorageReaderWriter.ts

@@ -1,6 +1,4 @@
 import {
-  randomBytesBase64,
-  sdk,
   TableCertificate,
   TableCertificateField,
   TableCommission,
@@ -15,12 +13,10 @@ import {
   TableTransaction,
   TableTxLabel,
   TableTxLabelMap,
-  TableUser,
-  verifyId,
-  verifyOne,
-  verifyOneOrNone,
-  verifyTruthy
-} from '../index.client'
+  TableUser
+} from './schema/tables'
+import { randomBytesBase64, verifyOneOrNone, verifyId, verifyOne } from '../utility/utilityHelpers'
+import * as sdk from '../sdk/index'
 import { createSyncMap } from './schema/entities'
 import { StorageReader, StorageReaderOptions } from './StorageReader'
 

package/src/storage/StorageSyncReader.ts

@@ -1,22 +1,5 @@
-import {
-  sdk,
-  TableCertificate,
-  TableCertificateField,
-  TableCertificateX,
-  TableCommission,
-  TableOutput,
-  TableOutputBasket,
-  TableOutputTag,
-  TableOutputTagMap,
-  TableProvenTx,
-  TableProvenTxReq,
-  TableSettings,
-  TableSyncState,
-  TableTransaction,
-  TableTxLabel,
-  TableTxLabelMap,
-  TableUser
-} from '../index.client'
+import * as sdk from '../sdk/index'
+import { TableSettings } from '../storage/schema/tables/TableSettings'
 import { StorageReader } from './StorageReader'
 
 /**

package/src/storage/index.mobile.ts

@@ -3,4 +3,4 @@ export * from './StorageProvider'
 export * from './StorageSyncReader'
 export * from './schema/tables/index'
 export * from './schema/entities/index'
-export * from './remoting/StorageClient'
+export * from './remoting/StorageMobile'

package/src/storage/remoting/StorageClient.ts

@@ -13,7 +13,6 @@ import {
 } from '@bsv/sdk'
 import {
   sdk,
-  TableCertificate,
   TableCertificateX,
   TableOutput,
   TableOutputBasket,