@bsv/wallet-toolbox 1.1.51 → 1.1.52

package/package.json

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

package/src/storage/schema/entities/Transaction.ts

@@ -242,7 +242,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
       (ei.provenTxId &&
         eo.provenTxId !==
           (syncMap
-            ? syncMap.transaction.idMap[verifyId(ei.provenTxId)]
+            ? syncMap.provenTx.idMap[verifyId(ei.provenTxId)]
             : ei.provenTxId))
     )
       return false
@@ -303,7 +303,7 @@ export class EntityTransaction extends EntityBase<TableTransaction> {
       this.isOutgoing = ei.isOutgoing
       this.status = ei.status
       this.provenTxId = ei.provenTxId
-        ? syncMap.transaction.idMap[ei.provenTxId]
+        ? syncMap.provenTx.idMap[ei.provenTxId]
         : undefined
       this.satoshis = ei.satoshis
       this.txid = ei.txid

package/test/Wallet/local/localWallet.man.test.ts

@@ -163,7 +163,8 @@ async function createSetup(chain: sdk.Chain): Promise<TestWalletNoSetup> {
     rootKeyHex: env.devKeys[env.testIdentityKey],
     filePath: env.testFilePath,
     setActiveClient: false,
-    addLocalBackup: false
+    addLocalBackup: false,
+    useMySQLConnectionForClient: false
   })
 
   console.log(`ACTIVE STORAGE: ${setup.storage.getActiveStoreName()}`)

package/test/utils/TestUtilsWalletStorage.ts

@@ -352,6 +352,7 @@ export abstract class TestUtilsWalletStorage {
     let filePath: string
     let addLocalBackup = false
     let setActiveClient = false
+    let useMySQLConnectionForClient = false
     if (typeof args === 'string') {
       chain = args
       const env = _tu.getEnv(chain)
@@ -369,6 +370,7 @@ export abstract class TestUtilsWalletStorage {
       filePath = args.filePath
       addLocalBackup = args.addLocalBackup === true
       setActiveClient = args.setActiveClient === true
+      useMySQLConnectionForClient = args.useMySQLConnectionForClient === true
     }
 
     const databaseName = path.parse(filePath).name
@@ -380,12 +382,28 @@ export abstract class TestUtilsWalletStorage {
     })
     setup.localStorageIdentityKey = setup.storage.getActiveStore()
 
-    const endpointUrl =
-      chain === 'main'
-        ? 'https://storage.babbage.systems'
-        : 'https://staging-storage.babbage.systems'
+    let client: sdk.WalletStorageProvider
+    if (useMySQLConnectionForClient) {
+      const env = _tu.getEnv(chain)
+      if (!env.cloudMySQLConnection)
+        throw new sdk.WERR_INVALID_PARAMETER(
+          'env.cloundMySQLConnection',
+          'valid'
+        )
+      const connection = JSON.parse(env.cloudMySQLConnection)
+      client = new StorageKnex({
+        ...StorageKnex.defaultOptions(),
+        knex: _tu.createMySQLFromConnection(connection),
+        chain: env.chain
+      })
+    } else {
+      const endpointUrl =
+        chain === 'main'
+          ? 'https://storage.babbage.systems'
+          : 'https://staging-storage.babbage.systems'
 
-    const client = new StorageClient(setup.wallet, endpointUrl)
+      client = new StorageClient(setup.wallet, endpointUrl)
+    }
     setup.clientStorageIdentityKey = (
       await client.makeAvailable()
     ).storageIdentityKey
@@ -2515,4 +2533,5 @@ export interface CreateTestWalletArgs {
   filePath: string
   addLocalBackup?: boolean
   setActiveClient?: boolean
+  useMySQLConnectionForClient?: boolean
 }