@bsv/wallet-toolbox 1.6.42 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.6.42",
+  "version": "1.7.0",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@bsv/auth-express-middleware": "^1.2.3",
     "@bsv/payment-express-middleware": "^1.2.3",
-    "@bsv/sdk": "^1.8.11",
+    "@bsv/sdk": "^1.9.3",
     "express": "^4.21.2",
     "idb": "^8.0.2",
     "knex": "^3.1.0",

package/src/sdk/WERR_errors.ts

@@ -56,11 +56,37 @@ export class WERR_INVALID_PARAMETER extends WalletError {
   }
   override toJson(): string {
     const obj = JSON.parse(super.toJson())
+    obj.code = 6 // Must match HTTPWalletJSON.ts code
     obj.parameter = this.parameter
     return JSON.stringify(obj)
   }
 }
 
+/**
+ * Invalid merkleRoot ${merkleRoot} for block ${blockHash} at height ${blockHeight}${txid ? ` for txid ${txid}` : ''}.
+ * 
+ * Typically thrown when a chain tracker fails to validate a merkle root.
+ */
+export class WERR_INVALID_MERKLE_ROOT extends WalletError {
+  constructor(
+    public blockHash: string,
+    public blockHeight: number,
+    public merkleRoot: string,
+    public txid?: string,
+  ) {
+    super('WERR_INVALID_MERKLE_ROOT', `Invalid merkleRoot ${merkleRoot} for block ${blockHash} at height ${blockHeight}${txid ? ` for txid ${txid}` : ''}.`)
+  }
+  override toJson(): string {
+    const obj = JSON.parse(super.toJson())
+    obj.code = 8 // Must match HTTPWalletJSON.ts code
+    obj.blockHash = this.blockHash
+    obj.blockHeight = this.blockHeight
+    obj.merkleRoot = this.merkleRoot
+    obj.txid = this.txid
+    return JSON.stringify(obj)
+  }
+}
+
 /**
  * The required ${parameter} parameter is missing.
  *
@@ -139,6 +165,7 @@ export class WERR_INSUFFICIENT_FUNDS extends WalletError {
   }
   override toJson(): string {
     const obj = JSON.parse(super.toJson())
+    obj.code = 7 // Must match HTTPWalletJSON.ts code
     obj.totalSatoshisNeeded = this.totalSatoshisNeeded
     obj.moreSatoshisNeeded = this.moreSatoshisNeeded
     return JSON.stringify(obj)
@@ -189,6 +216,7 @@ export class WERR_REVIEW_ACTIONS extends WalletError {
   }
   override toJson(): string {
     const obj = JSON.parse(super.toJson())
+    obj.code = 5 // Must match HTTPWalletJSON.ts code
     obj.reviewActionResults = this.reviewActionResults
     obj.sendWithResults = this.sendWithResults
     obj.txid = this.txid

package/src/sdk/WalletStorage.interfaces.ts

@@ -2,6 +2,7 @@ import {
   AbortActionArgs,
   AbortActionResult,
   Beef,
+  ChainTracker,
   InternalizeActionArgs,
   InternalizeActionResult,
   ListActionsArgs,
@@ -387,6 +388,8 @@ export interface StorageGetBeefOptions {
   ignoreNewProven?: boolean
   /** optional. Default is zero. Ignores available merkle paths until recursion detpth equals or exceeds value  */
   minProofLevel?: number
+  /** optional. If valid, any merkleRoot that fails to validate will result in an exception without merging to `mergeToBeef`. */
+  chainTracker?: ChainTracker
 }
 
 export interface StorageSyncReaderOptions {

package/src/storage/methods/__test/offsetKey.test.ts

@@ -0,0 +1,274 @@
+import {
+  Beef,
+  BigNumber,
+  CreateActionArgs,
+  CreateActionInput,
+  CreateActionOptions,
+  Curve,
+  P2PKH,
+  PositiveIntegerOrZero,
+  PrivateKey,
+  SignActionArgs,
+  SignActionSpend,
+  Utils
+} from '@bsv/sdk'
+import { keyOffsetToHashedSecret, lockScriptWithKeyOffsetFromPubKey, offsetPrivKey, offsetPubKey } from '../offsetKey'
+import { _tu, TestWalletOnly } from '../../../../test/utils/TestUtilsWalletStorage'
+import { Setup } from '../../../Setup'
+import { StorageKnex } from '../../StorageKnex'
+import { FindCommissionsArgs, FindTransactionsArgs } from '../../../sdk'
+import { verifyOne, verifyTruthy } from '../../../utility/utilityHelpers'
+import { TableCommission } from '../../schema/tables/TableCommission'
+import { WalletStorageManager } from '../../WalletStorageManager'
+
+describe('offsetKey tests', () => {
+  jest.setTimeout(99999999)
+
+  test('1_offsetPrivKey', async () => {
+    const bn2 = BigNumber.fromHex('FFF0000000000000000000000000000000000000000000000000000000000100', 'big')
+
+    const priv2 = new PrivateKey(bn2)
+
+    const privKey2 = priv2.toWif()
+
+    const keyOffset = 'KyaVZ1AnxYN4oB8JnxYVyZ8xYC9ySpq2Umzx6jwzQGVo71k1EgSt'
+    const oPrivKey = 'KyMYVLNeyF4qQsgHW3N1eJv9WcRd2aZC8hw7iLgCojQsyizqKsV4'
+
+    const r12 = offsetPrivKey(privKey2, keyOffset)
+
+    expect(r12.keyOffset).toBe(keyOffset)
+
+    expect(r12.offsetPrivKey).toBe(oPrivKey)
+  })
+
+  test('2_offsetPubKey', async () => {
+    const bn2 = BigNumber.fromHex('FFF0000000000000000000000000000000000000000000000000000000000100', 'big')
+
+    const priv2 = new PrivateKey(bn2)
+
+    const pub2 = priv2.toPublicKey()
+
+    const keyOffset = 'KyaVZ1AnxYN4oB8JnxYVyZ8xYC9ySpq2Umzx6jwzQGVo71k1EgSt'
+    const oPrivKey = 'KyMYVLNeyF4qQsgHW3N1eJv9WcRd2aZC8hw7iLgCojQsyizqKsV4'
+    const oPubKey = '024b4362ce98e0afd22bf3319831cfaf691ad2f08471a3386bcda98d65435a0f24'
+
+    const r22 = offsetPubKey(pub2.toString(), keyOffset)
+
+    expect(r22.keyOffset).toBe(keyOffset)
+
+    expect(r22.offsetPubKey).toBe(oPubKey)
+
+    const pubKey2 = PrivateKey.fromWif(oPrivKey).toPublicKey().toString()
+
+    expect(pubKey2).toBe(oPubKey)
+  })
+
+  test('3_lockScriptWithKeyOffsetFromPubKey', async () => {
+    const pubKey = '0397742eaef6c7f08c4aa057397d45529f93ab90345b84ce5a5aac06ea9cdd132e'
+
+    const ko = 'Kx9MjojdkjL3bEo5tQwHpwT1voKN1z56NjpATsa2Sx6QTrVjgMQJ'
+    const script = '76a9149d09d0ee09b212c548f6b1a7835641f33654246788ac'
+
+    const r1 = lockScriptWithKeyOffsetFromPubKey(pubKey, ko)
+
+    expect(r1.script).toBe(script)
+    expect(r1.keyOffset).toBe(ko)
+
+    // And with a random keyOffset...
+    const r2 = lockScriptWithKeyOffsetFromPubKey(pubKey)
+
+    expect(r2.script).not.toBe(script)
+    expect(r2.keyOffset).not.toBe(ko)
+  })
+
+  test('4a_check keyOffset address', async () => {
+    if (_tu.noEnv('main')) return
+
+    const env = _tu.getEnv('main')
+    const privHex = env.devKeys[env.commissionsIdentity]!
+    const priv = PrivateKey.fromHex(privHex)
+    const pub = priv.toPublicKey()
+
+    const keyOffset = 'L2hMY5uW6Vh46DEFMzrYiKSFWDRSMGDTsaeDvhiKNNJGihwKD17w'
+
+    const r = offsetPrivKey(priv.toWif(), keyOffset)
+    const privO = PrivateKey.fromWif(r.offsetPrivKey)
+    const address = privO.toAddress()
+    expect(address).toBe('1EZz5oxwXoG6LgGLxeYPeg1NfzQrP1vL6M')
+  })
+
+  test('4_redeemServiceCharges', async () => {
+    if (_tu.noEnv('main')) return
+
+    const env = _tu.getEnv('main')
+    if (!env.devKeys[env.commissionsIdentity]) {
+      throw new Error('No dev key for commissions identity')
+    }
+
+    const knex = Setup.createMySQLKnex(process.env.MAIN_CLOUD_MYSQL_CONNECTION!)
+    const storage = new StorageKnex({
+      chain: env.chain,
+      knex: knex,
+      commissionSatoshis: 0,
+      commissionPubKeyHex: undefined,
+      feeModel: { model: 'sat/kb', value: 1 }
+    })
+
+    let setup: TestWalletOnly
+    await storage.makeAvailable()
+
+    setup = await _tu.createTestWalletWithStorageClient({
+      chain: 'main',
+      rootKeyHex: env.devKeys[env.commissionsIdentity]
+    })
+    storage.setServices(setup.services)
+
+    try {
+      // await setup.wallet.abortAction({ reference: 'e9c03bdf603e90ebe482044e8d0f7afbf2d6fe480a13dbd8689e2e5e5183bed4' })
+
+      // txid b6f72df4224efbacab42a16e1e88f48c217f03929c36987b9067d2556de47c10
+      // height 922107
+      // hash 00000000000000001957bfadf841d1709d5039b3243c33ba58e4a6a97b44d2a8
+      const sm = new WalletStorageManager(setup.identityKey, storage)
+      sm.setServices(setup.services)
+      await sm.reproveHeader('000000000000000014d97d19bf82956c1f7ce3977da10b7fbdab9a10653c02e7')
+
+      const comms: TableCommission[] = []
+      const beef = new Beef()
+      const chainTracker = await setup.services.getChainTracker()
+      const inputs: CreateActionInput[] = []
+
+      const fca: FindCommissionsArgs = {
+        partial: { isRedeemed: false },
+        paged: { limit: 200, offset: 0 }
+      }
+
+      for (; comms.length < fca.paged!.limit; ) {
+        const unredeemedComms = await storage.findCommissions(fca)
+        if (unredeemedComms.length === 0) break
+        for (const comm of unredeemedComms) {
+          const tt = verifyTruthy(await storage.findTransactionById(comm.transactionId, undefined, true))
+          if (tt.provenTxId && tt.txid) {
+            // Only add merge valid beefs...
+            try {
+              await storage.getBeefForTransaction(tt.txid, { mergeToBeef: beef, chainTracker })
+            } catch (e) {
+              // Ignore errors in merging beefs
+            }
+            const tx = verifyTruthy(beef.findTxid(tt.txid)).tx!
+            const commVOut = tx.outputs.findIndex(
+              o => o.satoshis === comm.satoshis && o.lockingScript.toHex() === Utils.toHex(comm.lockingScript)
+            )
+            const commOut = tx.outputs[commVOut]
+            const input: CreateActionInput = {
+              outpoint: `${tt.txid}.${commVOut}`,
+              inputDescription: `commId:${comm.commissionId}`,
+              unlockingScriptLength: 108
+            }
+            inputs.push(input)
+            comms.push(comm)
+            if (comms.length >= fca.paged!.limit) break
+          }
+        }
+        fca.paged!.offset! += unredeemedComms.length
+      }
+
+      if (comms.length > 0) {
+        console.log(beef.toLogString())
+        const verified = await beef.verify(await setup.services.getChainTracker(), false)
+        expect(verified).toBe(true)
+
+        const cao: CreateActionOptions = {
+          randomizeOutputs: false,
+          //signAndProcess: false,
+          noSend: true
+        }
+        const ca: CreateActionArgs = {
+          description: 'redeem commissions',
+          inputs: inputs,
+          inputBEEF: beef.toBinary(),
+          options: cao
+        }
+
+        const car = await setup.wallet.createAction(ca)
+        expect(car.signableTransaction).toBeTruthy()
+
+        const st = car.signableTransaction!
+        expect(st.reference).toBeTruthy()
+        const atomicBeef = Beef.fromBinary(st.tx)
+        const txid = atomicBeef.txs[atomicBeef.txs.length - 1].txid!
+        const tx = atomicBeef.findTransactionForSigning(txid)!
+
+        const priv = PrivateKey.fromHex(env.devKeys[env.commissionsIdentity])
+        const pub = priv.toPublicKey()
+        const curve = new Curve()
+        const p2pkh = new P2PKH()
+        const spends: Record<PositiveIntegerOrZero, SignActionSpend> = {}
+        let vin = 0
+        // set an unlockingScriptTemplate for each commission input being redeemed in unsigned tx
+        for (const comm of comms) {
+          const { hashedSecret } = keyOffsetToHashedSecret(pub, comm.keyOffset)
+          const bn = priv.add(hashedSecret).mod(curve.n)
+          const offsetPrivKey = new PrivateKey(bn)
+          const unlock = p2pkh.unlock(offsetPrivKey, 'all', false)
+          tx.inputs[vin].unlockingScriptTemplate = unlock
+          vin++
+        }
+
+        // sign each input
+        await tx.sign()
+
+        vin = 0
+        // extract all the signed unlocking scripts
+        for (const comm of comms) {
+          const script = tx.inputs[vin].unlockingScript!
+          const unlockingScript = script.toHex()
+          spends[vin] = { unlockingScript }
+          vin++
+        }
+
+        const signArgs: SignActionArgs = {
+          reference: st.reference,
+          spends,
+          options: {
+            returnTXIDOnly: true,
+            noSend: true
+          }
+        }
+
+        // Forward all the unlocking scripts to storage and create the ProvenTxReq for the noSend txid.
+        const sr = await setup.wallet.signAction(signArgs)
+        expect(sr.txid).toBeTruthy()
+
+        // Update the commissions as redeemed in storage
+        for (const comm of comms) {
+          await storage.updateCommission(comm.commissionId, { isRedeemed: true })
+        }
+
+        {
+          // Get the transaction broadcast
+          const createArgs: CreateActionArgs = {
+            description: `broadcasting noSend`,
+            options: {
+              acceptDelayedBroadcast: false,
+              sendWith: [sr.txid!]
+            }
+          }
+
+          const cr = await setup.wallet.createAction(createArgs)
+
+          expect(cr.noSendChange).not.toBeTruthy()
+          expect(cr.sendWithResults?.length).toBe(1)
+          const [swr] = cr.sendWithResults!
+          expect(swr.status !== 'failed').toBe(true)
+        }
+      }
+    } catch (err) {
+      console.error('Error in 4_redeemServiceCharges test:', err)
+      throw err
+    }
+
+    await storage.destroy()
+    await setup.wallet.destroy()
+  })
+})

package/src/storage/methods/createAction.ts

@@ -1,17 +1,4 @@
-import {
-  Beef,
-  BigNumber,
-  Curve,
-  OriginatorDomainNameStringUnder250Bytes,
-  P2PKH,
-  PrivateKey,
-  PubKeyHex,
-  PublicKey,
-  Random,
-  ReviewActionResult,
-  Script,
-  Utils
-} from '@bsv/sdk'
+import { Beef, OriginatorDomainNameStringUnder250Bytes, Random, ReviewActionResult, Script, Utils } from '@bsv/sdk'
 import {
   generateChangeSdk,
   GenerateChangeSdkChangeInput,
@@ -37,7 +24,6 @@ import {
 import { WERR_INTERNAL, WERR_INVALID_PARAMETER, WERR_REVIEW_ACTIONS } from '../../sdk/WERR_errors'
 import {
   randomBytesBase64,
-  sha256Hash,
   verifyId,
   verifyInteger,
   verifyNumber,
@@ -52,6 +38,7 @@ import { TableOutputTag } from '../schema/tables/TableOutputTag'
 import { TableTransaction } from '../schema/tables/TableTransaction'
 import { EntityProvenTx } from '../schema/entities/EntityProvenTx'
 import { throwDummyReviewActions } from '../../Wallet'
+import { createStorageServiceChargeScript } from './offsetKey'
 
 let disableDoubleSpendCheckForTest = true
 export function setDisableDoubleSpendCheckForTest(v: boolean) {
@@ -244,7 +231,7 @@ async function createNewInputs(
         if (o2.spendable != true) {
           throw new WERR_INVALID_PARAMETER(
             `inputs[${i.vin}]`,
-            `spendable output. output ${o.txid}:${o.vout} appears to have been spent.`
+            `spendable output. output ${o.txid}:${o.vout} appears to have been spent (spendable=${o2.spendable}).`
           )
         }
         await storage.updateOutput(
@@ -942,55 +929,3 @@ async function mergeAllocatedChangeBeefs(
   }
   return trimInputBeef(beef, vargs)
 }
-
-function keyOffsetToHashedSecret(pub: PublicKey, keyOffset?: string): { hashedSecret: BigNumber; keyOffset: string } {
-  let offset: PrivateKey
-  if (keyOffset !== undefined && typeof keyOffset === 'string') {
-    if (keyOffset.length === 64) offset = PrivateKey.fromString(keyOffset, 'hex')
-    else offset = PrivateKey.fromWif(keyOffset)
-  } else {
-    offset = PrivateKey.fromRandom()
-    keyOffset = offset.toWif()
-  }
-
-  const sharedSecret = pub.mul(offset).encode(true, undefined) as number[]
-  const hashedSecret = sha256Hash(sharedSecret)
-
-  return { hashedSecret: new BigNumber(hashedSecret), keyOffset }
-}
-
-export function offsetPubKey(pubKey: string, keyOffset?: string): { offsetPubKey: string; keyOffset: string } {
-  const pub = PublicKey.fromString(pubKey)
-
-  const r = keyOffsetToHashedSecret(pub, keyOffset)
-
-  // The hashed secret is multiplied by the generator point.
-  const point = new Curve().g.mul(r.hashedSecret)
-
-  // The resulting point is added to the recipient public key.
-  const offsetPubKey = new PublicKey(pub.add(point))
-
-  return { offsetPubKey: offsetPubKey.toString(), keyOffset: r.keyOffset }
-}
-
-export function lockScriptWithKeyOffsetFromPubKey(
-  pubKey: string,
-  keyOffset?: string
-): { script: string; keyOffset: string } {
-  const r = offsetPubKey(pubKey, keyOffset)
-
-  const offsetPub = PublicKey.fromString(r.offsetPubKey)
-
-  const hash = offsetPub.toHash() as number[]
-
-  const script = new P2PKH().lock(hash).toHex()
-
-  return { script, keyOffset: r.keyOffset }
-}
-
-export function createStorageServiceChargeScript(pubKeyHex: PubKeyHex): {
-  script: string
-  keyOffset: string
-} {
-  return lockScriptWithKeyOffsetFromPubKey(pubKeyHex)
-}

package/src/storage/methods/getBeefForTransaction.ts

@@ -2,7 +2,7 @@ import { Beef } from '@bsv/sdk'
 import { StorageProvider } from '../StorageProvider'
 import { ProvenOrRawTx, StorageGetBeefOptions } from '../../sdk/WalletStorage.interfaces'
 import { EntityProvenTx } from '../schema/entities/EntityProvenTx'
-import { WERR_INVALID_OPERATION, WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
+import { WERR_INVALID_MERKLE_ROOT, WERR_INVALID_OPERATION, WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
 import { asBsvSdkTx, verifyTruthy } from '../../utility/utilityHelpers'
 
 /**
@@ -102,8 +102,16 @@ async function mergeBeefForTransactionRecurse(
   if (r.proven) {
     // storage has proven this txid,
     // merge both the raw transaction and its merkle path
+    const mp = new EntityProvenTx(r.proven).getMerklePath()
+    if (options.chainTracker) {
+      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)
+      }
+    }
     beef.mergeRawTx(r.proven.rawTx)
-    beef.mergeBump(new EntityProvenTx(r.proven).getMerklePath())
+    beef.mergeBump(mp)
     return beef
   }
 

package/src/storage/methods/offsetKey.ts

@@ -0,0 +1,89 @@
+import { PublicKey, BigNumber, PrivateKey, Curve, P2PKH, PubKeyHex, CreateActionInput } from '@bsv/sdk'
+import { TableCommission } from '../schema/tables/TableCommission'
+import { sha256Hash } from '../../utility/utilityHelpers'
+
+export function keyOffsetToHashedSecret(
+  pub: PublicKey,
+  keyOffset?: string
+): { hashedSecret: BigNumber; keyOffset: string } {
+  let offset: PrivateKey
+  if (keyOffset !== undefined && typeof keyOffset === 'string') {
+    if (keyOffset.length === 64) offset = PrivateKey.fromString(keyOffset, 'hex')
+    else offset = PrivateKey.fromWif(keyOffset)
+  } else {
+    offset = PrivateKey.fromRandom()
+    keyOffset = offset.toWif()
+  }
+
+  const sharedSecret = pub.mul(offset).encode(true, undefined) as number[]
+  const hashedSecret = sha256Hash(sharedSecret)
+
+  return { hashedSecret: new BigNumber(hashedSecret), keyOffset }
+}
+
+export function offsetPrivKey(privKey: string, keyOffset?: string): { offsetPrivKey: string; keyOffset: string } {
+  const priv = PrivateKey.fromWif(privKey)
+
+  const pub = priv.toPublicKey()
+
+  const r = keyOffsetToHashedSecret(pub, keyOffset)
+
+  const bn = priv.add(r.hashedSecret).mod(new Curve().n)
+
+  const offsetPrivKey = new PrivateKey(bn).toWif()
+
+  return { offsetPrivKey, keyOffset: r.keyOffset }
+}
+
+export function offsetPubKey(pubKey: string, keyOffset?: string): { offsetPubKey: string; keyOffset: string } {
+  const pub = PublicKey.fromString(pubKey)
+
+  const r = keyOffsetToHashedSecret(pub, keyOffset)
+
+  // The hashed secret is multiplied by the generator point.
+  const point = new Curve().g.mul(r.hashedSecret)
+
+  // The resulting point is added to the recipient public key.
+  const offsetPubKey = new PublicKey(pub.add(point))
+
+  return { offsetPubKey: offsetPubKey.toString(), keyOffset: r.keyOffset }
+}
+
+export function lockScriptWithKeyOffsetFromPubKey(
+  pubKey: string,
+  keyOffset?: string
+): { script: string; keyOffset: string } {
+  const r = offsetPubKey(pubKey, keyOffset)
+
+  const offsetPub = PublicKey.fromString(r.offsetPubKey)
+
+  const hash = offsetPub.toHash() as number[]
+
+  const script = new P2PKH().lock(hash).toHex()
+
+  return { script, keyOffset: r.keyOffset }
+}
+
+export function createStorageServiceChargeScript(pubKeyHex: PubKeyHex): {
+  script: string
+  keyOffset: string
+} {
+  return lockScriptWithKeyOffsetFromPubKey(pubKeyHex)
+}
+
+export function redeemServiceCharges(privateKeyWif: string, charges: TableCommission[]): {}[] {
+  const priv = PrivateKey.fromWif(privateKeyWif)
+  const pub = priv.toPublicKey()
+  const p2pkh = new P2PKH()
+
+  const inputs: CreateActionInput[] = []
+
+  for (const c of charges) {
+    const { hashedSecret } = keyOffsetToHashedSecret(pub, c.keyOffset)
+    const bn = priv.add(hashedSecret).mod(new Curve().n)
+    const offsetPrivKey = new PrivateKey(bn)
+    //const unlock = p2pkh.unlock(offsetPrivKey, signOutputs, anyoneCanPay)
+  }
+
+  return []
+}

package/test/Wallet/support/operations.man.test.ts

@@ -49,7 +49,7 @@ describe('operations.man tests', () => {
 
   test('1 review and unfail false doubleSpends', async () => {
     const { env, storage, services } = await _tu.createMainReviewSetup()
-    let offset = 0
+    let offset = 400
     const limit = 100
     let allUnfails: number[] = []
     let reviewed = 0
@@ -82,7 +82,7 @@ describe('operations.man tests', () => {
 
   test('2 review and unfail false invalids', async () => {
     const { env, storage, services } = await _tu.createMainReviewSetup()
-    let offset = 0
+    let offset = 500
     const limit = 100
     let allUnfails: number[] = []
     let reviewed = 0

package/test/WalletClient/WERR.man.test.ts

@@ -2,23 +2,34 @@ import { CreateActionArgs, WalletClient } from '@bsv/sdk'
 import { specOpThrowReviewActions } from '../../src/sdk/types'
 import { WalletError } from '../../src/sdk/WalletError'
 import { WERR_REVIEW_ACTIONS } from '../../src/sdk/WERR_errors'
-import { validateCreateActionArgs } from '../../src/sdk'
+import { validateCreateActionArgs, WalletErrorFromJson } from '../../src/sdk'
 
-test('0 WERR_REVIEW_ACTIONS via WalletClient', async () => {
-  const wallet = new WalletClient('auto', '0.WERR.man.test')
+describe('WERR.man tests', () => {
+  jest.setTimeout(99999999)
 
-  const args: CreateActionArgs = {
-    labels: [specOpThrowReviewActions],
-    description: 'must throw'
-  }
-  const vargs = validateCreateActionArgs(args)
+  test('0 WERR_REVIEW_ACTIONS via WalletClient', async () => {
+    const wallet = new WalletClient('auto', '0.WERR.man.test')
 
-  try {
-    const r = await wallet.createAction(args)
-    expect(true).toBe(false)
-  } catch (eu: unknown) {
-    const e = WalletError.fromUnknown(eu) as WERR_REVIEW_ACTIONS
-    expect(e.code).toBe('WERR_REVIEW_ACTIONS')
-    expect(e.reviewActionResults).toBeTruthy()
-  }
+    const args: CreateActionArgs = {
+      labels: [specOpThrowReviewActions],
+      description: 'must throw'
+    }
+    const vargs = validateCreateActionArgs(args)
+
+    try {
+      const r = await wallet.createAction(args)
+      expect(true).toBe(false)
+    } catch (eu: unknown) {
+      const e = WalletError.fromUnknown(eu) as WERR_REVIEW_ACTIONS
+      expect(e.code).toBe('WERR_REVIEW_ACTIONS')
+      expect(e.reviewActionResults).toBeTruthy()
+    }
+  })
+
+  test('1', async () => {
+    const s = `{\"isError\":true,\"name\":\"WERR_REVIEW_ACTIONS\",\"reviewActionResults\":[{\"txid\":\"344556f1c428367689e09e29aa4dc7cfe755db1fab5cf7c1cf8d1f99b507004b\",\"status\":\"doubleSpend\",\"competingTxs\":[\"344556f1c428367689e09e29aa4dc7cfe755db1fab5cf7c1cf8d1f99b507004b\"],\"competingBeef\":[1,0,190,239,1,254,12,52,25,0,3,2,2,2,13,153,15,202,45,179,254,102,34,161,222,144,207,214,224,219,57,76,176,248,213,137,238,7,63,67,204,253,45,62,70,190,3,0,206,69,142,120,152,200,85,221,140,68,16,34,144,39,29,181,67,66,245,76,24,46,209,253,246,204,133,193,175,188,98,241,2,0,0,119,165,81,236,153,173,143,252,69,138,209,229,97,189,36,123,84,160,234,127,63,185,82,5,26,106,157,73,26,107,32,100,1,0,143,243,215,201,227,2,63,39,103,57,216,42,131,190,76,56,216,43,104,59,7,4,174,137,191,49,49,128,249,252,45,42,2,0,0,25,6,223,99,50,23,119,231,67,155,160,205,224,45,74,194,190,202,18,106,135,17,234,165,66,245,89,135,90,255,10,227,1,0,35,96,209,29,146,83,58,174,231,36,40,57,137,94,136,75,149,86,89,160,195,121,92,180,37,191,31,187,23,71,219,209,2,1,0,0,0,2,1,247,147,92,34,59,244,55,220,70,138,231,75,160,174,137,68,202,34,151,142,102,170,47,246,106,0,25,152,90,245,197,0,0,0,0,106,71,48,68,2,32,23,143,242,5,200,252,85,12,167,137,194,54,96,107,40,141,240,219,145,62,182,133,119,224,94,146,94,249,214,213,212,121,2,32,15,130,24,137,152,12,86,54,141,67,39,178,80,29,110,48,77,114,212,69,237,139,89,152,246,124,138,91,19,32,71,43,65,33,3,16,229,154,223,195,210,19,58,106,26,124,66,99,139,137,43,164,213,109,60,35,235,32,30,122,36,252,12,131,190,69,63,255,255,255,255,1,247,147,92,34,59,244,55,220,70,138,231,75,160,174,137,68,202,34,151,142,102,170,47,246,106,0,25,152,90,245,197,2,0,0,0,107,72,48,69,2,33,0,154,55,50,224,237,75,147,58,95,164,173,104,149,13,24,125,198,35,126,194,134,91,150,238,179,25,192,213,136,196,51,66,2,32,98,84,153,139,248,106,241,122,65,180,241,124,30,233,140,74,172,74,217,165,129,143,127,156,49,230,34,46,188,15,28,52,65,33,2,146,89,63,53,57,196,48,37,118,17,182,193,201,75,44,105,67,181,136,23,25,104,127,48,146,231,88,99,197,53,56,239,255,255,255,255,2,225,3,0,0,0,0,0,0,25,118,169,20,255,161,196,19,38,201,6,21,136,26,207,151,137,162,75,232,58,201,53,88,136,172,1,0,0,0,0,0,0,0,25,118,169,20,39,140,42,205,54,197,3,247,165,173,16,224,138,193,127,34,191,29,126,7,136,172,0,0,0,0,1,0,1,0,0,0,1,13,153,15,202,45,179,254,102,34,161,222,144,207,214,224,219,57,76,176,248,213,137,238,7,63,67,204,253,45,62,70,190,0,0,0,0,106,71,48,68,2,32,113,14,233,125,141,249,154,234,138,195,178,164,149,171,255,63,165,28,128,191,230,247,66,128,150,223,65,199,233,39,23,251,2,32,80,77,229,88,242,236,59,27,87,164,79,120,131,240,100,247,182,28,231,200,43,86,4,88,118,214,123,86,89,234,15,220,65,33,2,126,31,155,113,109,251,248,50,61,159,13,216,133,12,125,72,157,20,95,38,54,244,202,14,140,141,176,184,127,210,62,36,255,255,255,255,3,42,0,0,0,0,0,0,0,25,118,169,20,56,12,202,72,139,24,243,136,130,254,20,130,110,109,96,207,112,30,168,123,136,172,1,0,0,0,0,0,0,0,25,118,169,20,70,66,47,177,97,74,57,246,237,66,211,206,113,253,228,175,14,128,182,53,136,172,181,3,0,0,0,0,0,0,25,118,169,20,168,166,193,185,78,43,31,133,215,58,172,227,98,32,56,171,116,85,185,171,136,172,0,0,0,0,0]}],\"sendWithResults\":[{\"txid\":\"344556f1c428367689e09e29aa4dc7cfe755db1fab5cf7c1cf8d1f99b507004b\",\"status\":\"failed\"}],\"txid\":\"344556f1c428367689e09e29aa4dc7cfe755db1fab5cf7c1cf8d1f99b507004b\",\"tx\":[1,1,1,1,75,0,7,181,153,31,141,207,193,247,92,171,31,219,85,231,207,199,77,170,41,158,224,137,118,54,40,196,241,86,69,52,1,0,190,239,1,254,12,52,25,0,3,2,2,2,13,153,15,202,45,179,254,102,34,161,222,144,207,214,224,219,57,76,176,248,213,137,238,7,63,67,204,253,45,62,70,190,3,0,206,69,142,120,152,200,85,221,140,68,16,34,144,39,29,181,67,66,245,76,24,46,209,253,246,204,133,193,175,188,98,241,2,0,0,119,165,81,236,153,173,143,252,69,138,209,229,97,189,36,123,84,160,234,127,63,185,82,5,26,106,157,73,26,107,32,100,1,0,143,243,215,201,227,2,63,39,103,57,216,42,131,190,76,56,216,43,104,59,7,4,174,137,191,49,49,128,249,252,45,42,2,0,0,25,6,223,99,50,23,119,231,67,155,160,205,224,45,74,194,190,202,18,106,135,17,234,165,66,245,89,135,90,255,10,227,1,0,35,96,209,29,146,83,58,174,231,36,40,57,137,94,136,75,149,86,89,160,195,121,92,180,37,191,31,187,23,71,219,209,2,1,0,0,0,2,1,247,147,92,34,59,244,55,220,70,138,231,75,160,174,137,68,202,34,151,142,102,170,47,246,106,0,25,152,90,245,197,0,0,0,0,106,71,48,68,2,32,23,143,242,5,200,252,85,12,167,137,194,54,96,107,40,141,240,219,145,62,182,133,119,224,94,146,94,249,214,213,212,121,2,32,15,130,24,137,152,12,86,54,141,67,39,178,80,29,110,48,77,114,212,69,237,139,89,152,246,124,138,91,19,32,71,43,65,33,3,16,229,154,223,195,210,19,58,106,26,124,66,99,139,137,43,164,213,109,60,35,235,32,30,122,36,252,12,131,190,69,63,255,255,255,255,1,247,147,92,34,59,244,55,220,70,138,231,75,160,174,137,68,202,34,151,142,102,170,47,246,106,0,25,152,90,245,197,2,0,0,0,107,72,48,69,2,33,0,154,55,50,224,237,75,147,58,95,164,173,104,149,13,24,125,198,35,126,194,134,91,150,238,179,25,192,213,136,196,51,66,2,32,98,84,153,139,248,106,241,122,65,180,241,124,30,233,140,74,172,74,217,165,129,143,127,156,49,230,34,46,188,15,28,52,65,33,2,146,89,63,53,57,196,48,37,118,17,182,193,201,75,44,105,67,181,136,23,25,104,127,48,146,231,88,99,197,53,56,239,255,255,255,255,2,225,3,0,0,0,0,0,0,25,118,169,20,255,161,196,19,38,201,6,21,136,26,207,151,137,162,75,232,58,201,53,88,136,172,1,0,0,0,0,0,0,0,25,118,169,20,39,140,42,205,54,197,3,247,165,173,16,224,138,193,127,34,191,29,126,7,136,172,0,0,0,0,1,0,1,0,0,0,1,13,153,15,202,45,179,254,102,34,161,222,144,207,214,224,219,57,76,176,248,213,137,238,7,63,67,204,253,45,62,70,190,0,0,0,0,106,71,48,68,2,32,113,14,233,125,141,249,154,234,138,195,178,164,149,171,255,63,165,28,128,191,230,247,66,128,150,223,65,199,233,39,23,251,2,32,80,77,229,88,242,236,59,27,87,164,79,120,131,240,100,247,182,28,231,200,43,86,4,88,118,214,123,86,89,234,15,220,65,33,2,126,31,155,113,109,251,248,50,61,159,13,216,133,12,125,72,157,20,95,38,54,244,202,14,140,141,176,184,127,210,62,36,255,255,255,255,3,42,0,0,0,0,0,0,0,25,118,169,20,56,12,202,72,139,24,243,136,130,254,20,130,110,109,96,207,112,30,168,123,136,172,1,0,0,0,0,0,0,0,25,118,169,20,70,66,47,177,97,74,57,246,237,66,211,206,113,253,228,175,14,128,182,53,136,172,181,3,0,0,0,0,0,0,25,118,169,20,168,166,193,185,78,43,31,133,215,58,172,227,98,32,56,171,116,85,185,171,136,172,0,0,0,0,0],\"noSendChange\":[\"344556f1c428367689e09e29aa4dc7cfe755db1fab5cf7c1cf8d1f99b507004b.0\"]}`
+    const o = JSON.parse(s)
+    const e = WalletErrorFromJson(o)
+    expect(e instanceof WERR_REVIEW_ACTIONS).toBe(true)
+  })
 })

package/test/utils/TestUtilsWalletStorage.ts

@@ -77,6 +77,7 @@ export interface TuEnv extends TuEnvFlags {
   taalApiKey: string
   bitailsApiKey: string
   whatsonchainApiKey: string
+  commissionsIdentity: string
   devKeys: Record<string, string>
   /**
    * file path to local sqlite file for identityKey
@@ -147,6 +148,8 @@ export abstract class TestUtilsWalletStorage {
     const bitailsApiKey = (chain === 'main' ? process.env.MAIN_BITAILS_API_KEY : process.env.TEST_BITAILS_API_KEY) || ''
     const whatsonchainApiKey =
       (chain === 'main' ? process.env.MAIN_WHATSONCHAIN_API_KEY : process.env.TEST_WHATSONCHAIN_API_KEY) || ''
+    const commissionsIdentity =
+      (chain === 'main' ? process.env.MAIN_COMMISSIONS_IDENTITY : process.env.TEST_COMMISSIONS_IDENTITY) || ''
     return {
       ...flagsEnv,
       identityKey,
@@ -154,6 +157,7 @@ export abstract class TestUtilsWalletStorage {
       taalApiKey,
       bitailsApiKey,
       whatsonchainApiKey,
+      commissionsIdentity,
       devKeys: JSON.parse(DEV_KEYS) as Record<string, string>,
       filePath,
       testIdentityKey,