@bsv/wallet-toolbox 1.3.29 → 1.3.30

package/package.json

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

package/src/services/ServiceCollection.ts

@@ -40,19 +40,21 @@ export class ServiceCollection<T> {
     return this.services[this._index].service
   }
 
-  get serviceToCall(): ServiceToCall<T> {
-    const i = this._index
+  getServiceToCall(i: number): ServiceToCall<T> {
     const name = this.services[i].name
     const service = this.services[i].service
     const call = { name, when: new Date(), msecs: 0, success: false, result: undefined, error: undefined }
     return { serviceName: this.serviceName, providerName: name, service, call }
   }
 
+  get serviceToCall(): ServiceToCall<T> {
+    return this.getServiceToCall(this._index)
+  }
+
   get allServicesToCall(): ServiceToCall<T>[] {
     const all: ServiceToCall<T>[] = []
     for (let i = 0; i < this.services.length; i++) {
-      all.push(this.serviceToCall)
-      this.next()
+      all.push(this.getServiceToCall(i))
     }
     return all
   }

package/src/services/Services.ts

@@ -1,6 +1,6 @@
 import { Transaction as BsvTransaction, Beef, ChainTracker, Utils } from '@bsv/sdk'
 import { asArray, asString, doubleSha256BE, sdk, sha256Hash, TableOutput, wait } from '../index.client'
-import { ServiceCollection } from './ServiceCollection'
+import { ServiceCollection, ServiceToCall } from './ServiceCollection'
 import { createDefaultWalletServicesOptions } from './createDefaultWalletServicesOptions'
 import { ChaintracksChainTracker } from './chaintracker'
 import { WhatsOnChain } from './providers/WhatsOnChain'
@@ -40,7 +40,7 @@ export class Services implements sdk.WalletServices {
 
     this.arcTaal = new ARC(this.options.arcUrl, this.options.arcConfig, 'arcTaal')
     if (this.options.arcGorillaPoolUrl) {
-      //this.arcGorillaPool = new ARC(this.options.arcGorillaPoolUrl, this.options.arcGorillaPoolConfig, 'arcGorillaPool')
+      this.arcGorillaPool = new ARC(this.options.arcGorillaPoolUrl, this.options.arcGorillaPoolConfig, 'arcGorillaPool')
     }
 
     this.bitails = new Bitails(this.chain)
@@ -57,13 +57,13 @@ export class Services implements sdk.WalletServices {
     this.postBeefServices = new ServiceCollection<sdk.PostBeefService>('postBeef')
     if (this.arcGorillaPool) {
       //prettier-ignore
-      this.postBeefServices.add({ name: 'GorillaPool', service: this.arcGorillaPool.postBeef.bind(this.arcGorillaPool) })
+      this.postBeefServices.add({ name: 'GorillaPoolArcBeef', service: this.arcGorillaPool.postBeef.bind(this.arcGorillaPool) })
     }
     //prettier-ignore
     this.postBeefServices
       .add({ name: 'TaalArcBeef', service: this.arcTaal.postBeef.bind(this.arcTaal) })
-      .add({ name: 'WhatsOnChain', service: this.whatsonchain.postBeef.bind(this.whatsonchain) })
       .add({ name: 'Bitails', service: this.bitails.postBeef.bind(this.bitails) })
+      .add({ name: 'WhatsOnChain', service: this.whatsonchain.postBeef.bind(this.whatsonchain) })
       ;
 
     //prettier-ignore
@@ -261,6 +261,8 @@ export class Services implements sdk.WalletServices {
     return r0
   }
 
+  postBeefMode: 'PromiseAll' | 'UntilSuccess' = 'UntilSuccess'
+
   /**
    *
    * @param beef
@@ -268,24 +270,45 @@ export class Services implements sdk.WalletServices {
    * @returns
    */
   async postBeef(beef: Beef, txids: string[]): Promise<sdk.PostBeefResult[]> {
+    let rs: sdk.PostBeefResult[] = []
     const services = this.postBeefServices
     const stcs = services.allServicesToCall
-    let rs = await Promise.all(
-      stcs.map(async stc => {
-        const r = await stc.service(beef, txids)
-        if (r.status === 'success') {
-          services.addServiceCallSuccess(stc)
-        } else {
-          if (r.error) {
-            services.addServiceCallError(stc, r.error)
-          } else {
-            services.addServiceCallFailure(stc)
+    switch (this.postBeefMode) {
+      case 'UntilSuccess':
+        {
+          for (const stc of stcs) {
+            const r = await callService(stc)
+            rs.push(r)
+            if (r.status === 'success') break
           }
         }
-        return r
-      })
-    )
+        break
+      case 'PromiseAll':
+        {
+          rs = await Promise.all(
+            stcs.map(async stc => {
+              const r = await callService(stc)
+              return r
+            })
+          )
+        }
+        break
+    }
     return rs
+
+    async function callService(stc: ServiceToCall<sdk.PostBeefService>) {
+      const r = await stc.service(beef, txids)
+      if (r.status === 'success') {
+        services.addServiceCallSuccess(stc)
+      } else {
+        if (r.error) {
+          services.addServiceCallError(stc, r.error)
+        } else {
+          services.addServiceCallFailure(stc)
+        }
+      }
+      return r
+    }
   }
 
   async getRawTx(txid: string, useNext?: boolean): Promise<sdk.GetRawTxResult> {

package/src/signer/methods/completeSignedTransaction.ts

@@ -104,9 +104,9 @@ export function verifyUnlockScripts(txid: string, beef: Beef): void {
     })
 
     try {
-    const spendValid = spend.validate()
+      const spendValid = spend.validate()
 
-    if (!spendValid) throw new WERR_INVALID_PARAMETER(`inputs[${i}].unlockScript`, `valid`)
+      if (!spendValid) throw new WERR_INVALID_PARAMETER(`inputs[${i}].unlockScript`, `valid`)
     } catch (eu: unknown) {
       const e = WalletError.fromUnknown(eu)
       throw new WERR_INVALID_PARAMETER(`inputs[${i}].unlockScript`, `valid. ${e.message}`)