@bsv/wallet-toolbox 1.7.0 → 1.7.1

package/package.json

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

package/src/sdk/WalletStorage.interfaces.ts

@@ -390,6 +390,8 @@ export interface StorageGetBeefOptions {
   minProofLevel?: number
   /** optional. If valid, any merkleRoot that fails to validate will result in an exception without merging to `mergeToBeef`. */
   chainTracker?: ChainTracker
+  /** optional. Default is false. If chainTracker is valid and an invalid proof is found: if true, pursues deeper beef. If false, throws WERR_INVALID_MERKLE_ROOT. */
+  skipInvalidProofs?: boolean
 }
 
 export interface StorageSyncReaderOptions {

package/src/storage/methods/getBeefForTransaction.ts

@@ -107,12 +107,18 @@ async function mergeBeefForTransactionRecurse(
       const root = mp.computeRoot()
       const isValid = await options.chainTracker.isValidRootForHeight(root, r.proven.height)
       if (!isValid) {
-        throw new WERR_INVALID_MERKLE_ROOT(r.proven.blockHash, r.proven.height, root, txid)
+        if (!options.skipInvalidProofs) {
+          throw new WERR_INVALID_MERKLE_ROOT(r.proven.blockHash, r.proven.height, root, txid)
+        }
+        // ignore this currently invalid proof and try to recurse deeper
+        r.proven = undefined
       }
     }
-    beef.mergeRawTx(r.proven.rawTx)
-    beef.mergeBump(mp)
-    return beef
+    if (r.proven) {
+      beef.mergeRawTx(r.proven.rawTx)
+      beef.mergeBump(mp)
+      return beef
+    }
   }
 
   if (!r.rawTx) throw new WERR_INVALID_PARAMETER(`txid ${txid}`, `valid transaction on chain ${storage.chain}`)