@bsv/wallet-toolbox 1.6.34 → 1.6.36

package/package.json

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

package/src/Wallet.ts

@@ -770,8 +770,6 @@ export class Wallet implements WalletInterface, ProtoWallet {
 
     const { auth, vargs } = this.validateAuthAndArgs(args, validateCreateActionArgs)
 
-    if (vargs.labels.indexOf(specOpThrowReviewActions) >= 0) throwDummyReviewActions()
-
     vargs.includeAllSourceTransactions = this.includeAllSourceTransactions
     if (this.randomVals && this.randomVals.length > 1) {
       vargs.randomVals = [...this.randomVals]
@@ -1105,13 +1103,15 @@ function throwIfUnsuccessfulInternalizeAction(r: StorageInternalizeActionResult)
 /**
  * Throws a WERR_REVIEW_ACTIONS with a full set of properties to test data formats and propagation.
  */
-function throwDummyReviewActions() {
+export function throwDummyReviewActions() {
   const b58Beef =
     'gno9MC7VXii1KoCkc2nsVyYJpqzN3dhBzYATETJcys62emMKfpBof4R7GozwYEaSapUtnNvqQ57aaYYjm3U2dv9eUJ1sV46boHkQgppYmAz9YH8FdZduV8aJayPViaKcyPmbDhEw6UW8TM5iFZLXNs7HBnJHUKCeTdNK4FUEL7vAugxAV9WUUZ43BZjJk2SmSeps9TCXjt1Ci9fKWp3d9QSoYvTpxwzyUFHjRKtbUgwq55ZfkBp5bV2Bpz9qSuKywKewW7Hh4S1nCUScwwzpKDozb3zic1V9p2k8rQxoPsRxjUJ8bjhNDdsN8d7KukFuc3n47fXzdWttvnxwsujLJRGnQbgJuknQqx3KLf5kJXHzwjG6TzigZk2t24qeB6d3hbYiaDr2fFkUJBL3tukTHhfNkQYRXuz3kucVDzvejHyqJaF51mXG8BjMN5aQj91ZJXCaPVqkMWCzmvyaqmXMdRiJdSAynhXbQK91xf6RwdNhz1tg5f9B6oJJMhsi9UYSVymmax8VLKD9AKzBCBDcfyD83m3jyS1VgKGZn3SkQmr6bsoWq88L3GsMnnmYUGogvdAYarTqg3pzkjCMxHzmJBMN6ofnUk8c1sRTXQue7BbyUaN5uZu3KW6CmFsEfpuqVvnqFW93TU1jrPP2S8yz8AexAnARPCKE8Yz7RfVaT6RCavwQKL3u5iookwRWEZXW1QWmM37yJWHD87SjVynyg327a1CLwcBxmE2CB48QeNVGyQki4CTQMqw2o8TMhDPJej1g68oniAjBcxBLSCs7KGvK3k7AfrHbCMULX9CTibYhCjdFjbsbBoocqJpxxcvkMo1fEEiAzZuiBVZQDYktDdTVbhKHvYkW25HcYX75NJrpNAhm7AjFeKLzEVxqAQkMfvTufpESNRZF4kQqg2Rg8h2ajcKTd5cpEPwXCrZLHm4EaZEmZVbg3QNfGhn7BJu1bHMtLqPD4y8eJxm2uGrW6saf6qKYmmu64F8A667NbD4yskPRQ1S863VzwGpxxmgLc1Ta3R46jEqsAoRDoZVUaCgBBZG3Yg1CTgi1EVBMXU7qvY4n3h8o2FLCEMWY4KadnV3iD4FbcdCmg4yxBosNAZgbPjhgGjCimjh4YsLd9zymGLmivmz2ZBg5m3xaiXT9NN81X9C1JUujd'
   const beef = Beef.fromBinary(Utils.fromBase58(b58Beef))
   const btx = beef.txs.slice(-1)[0]
   const txid = btx.txid
-  debugger
+
+  console.log('Throwing dummy WERR_REVIEW_ACTIONS')
+
   throw new WERR_REVIEW_ACTIONS(
     [
       {

package/src/sdk/validationHelpers.ts

@@ -44,7 +44,7 @@ import {
   Utils,
   WalletPayment
 } from '@bsv/sdk'
-import { OutPoint } from './types'
+import { OutPoint, specOpThrowReviewActions } from './types'
 import { WERR_INTERNAL, WERR_INVALID_PARAMETER } from './WERR_errors'
 
 export function parseWalletOutpoint(outpoint: string): {
@@ -327,6 +327,8 @@ export interface ValidProcessActionArgs extends ValidWalletSignerArgs {
   isNoSend: boolean
   // true if options.acceptDelayedBroadcast is true
   isDelayed: boolean
+  // true if WERR_REVIEW_ACTIONS should be thrown to test review actions handling
+  isTestWerrReviewActions: boolean
 }
 
 export interface ValidCreateActionArgs extends ValidProcessActionArgs {
@@ -357,6 +359,13 @@ export interface ValidSignActionArgs extends ValidProcessActionArgs {
   options: ValidSignActionOptions
 }
 
+/**
+ * Validate the arguments for creating a new action.
+ *
+ * @param args
+ * @returns validated arguments
+ * @throws primarily WERR_INVALID_PARAMETER if args are invalid.
+ */
 export function validateCreateActionArgs(args: CreateActionArgs): ValidCreateActionArgs {
   const vargs: ValidCreateActionArgs = {
     description: validateStringLength(args.description, 'description', 5, 2000),
@@ -374,8 +383,10 @@ export function validateCreateActionArgs(args: CreateActionArgs): ValidCreateAct
     isRemixChange: false,
     isSignAction: false,
     randomVals: undefined,
-    includeAllSourceTransactions: false
+    includeAllSourceTransactions: false,
+    isTestWerrReviewActions: false
   }
+  vargs.isTestWerrReviewActions = vargs.labels.indexOf(specOpThrowReviewActions) >= 0
   vargs.isSendWith = vargs.options.sendWith.length > 0
   vargs.isRemixChange = !vargs.isSendWith && vargs.inputs.length === 0 && vargs.outputs.length === 0
   vargs.isNewTx = vargs.isRemixChange || vargs.inputs.length > 0 || vargs.outputs.length > 0
@@ -413,7 +424,8 @@ export function validateSignActionArgs(args: SignActionArgs): ValidSignActionArg
     isDelayed: false,
     isNoSend: false,
     isNewTx: true,
-    isRemixChange: false
+    isRemixChange: false,
+    isTestWerrReviewActions: false
   }
   vargs.isSendWith = vargs.options.sendWith.length > 0
   vargs.isDelayed = vargs.options.acceptDelayedBroadcast

package/src/services/chaintracker/ChaintracksChainTracker.ts

@@ -19,8 +19,7 @@ export class ChaintracksChainTracker implements ChainTracker {
   constructor(chain?: Chain, chaintracks?: ChaintracksClientApi, options?: ChaintracksChainTrackerOptions) {
     chain ||= 'main'
     this.chaintracks =
-      chaintracks ??
-      new ChaintracksServiceClient(chain, `https://${chain}net-chaintracks.babbage.systems`)
+      chaintracks ?? new ChaintracksServiceClient(chain, `https://${chain}net-chaintracks.babbage.systems`)
     this.cache = {}
     this.options = options || {}
   }

package/src/signer/methods/createAction.ts

@@ -44,7 +44,7 @@ export async function createAction(
 
   let prior: PendingSignAction | undefined = undefined
 
-  if (vargs.isNewTx) {
+  if (vargs.isNewTx || vargs.isTestWerrReviewActions) {
     prior = await createNewTx(wallet, vargs)
 
     if (vargs.isSignAction) {

package/src/storage/methods/createAction.ts

@@ -52,6 +52,7 @@ import { asArray, asString } from '../../utility/utilityHelpers.noBuffer'
 import { TableOutputTag } from '../schema/tables/TableOutputTag'
 import { TableTransaction } from '../schema/tables/TableTransaction'
 import { EntityProvenTx } from '../schema/entities/EntityProvenTx'
+import { throwDummyReviewActions } from '../../Wallet'
 
 let disableDoubleSpendCheckForTest = true
 export function setDisableDoubleSpendCheckForTest(v: boolean) {
@@ -66,6 +67,8 @@ export async function createAction(
 ): Promise<StorageCreateActionResult> {
   //stampLog(vargs, `start storage createTransactionSdk`)
 
+  if (vargs.isTestWerrReviewActions) throwDummyReviewActions()
+
   if (!vargs.isNewTx)
     // The purpose of this function is to create the initial storage records associated
     // with a new transaction. It's an error if we have no new inputs or outputs...

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

@@ -1,16 +1,20 @@
-import { WalletClient } from '@bsv/sdk'
+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'
 
-test('0 WERR_REVIEW_ACTIONS', async () => {
-  const wallet = new WalletClient(undefined, '0.WERR.man.test')
+test('0 WERR_REVIEW_ACTIONS via WalletClient', async () => {
+  const wallet = new WalletClient('auto', '0.WERR.man.test')
+
+  const args: CreateActionArgs = {
+    labels: [specOpThrowReviewActions],
+    description: 'must throw'
+  }
+  const vargs = validateCreateActionArgs(args)
 
   try {
-    const r = await wallet.createAction({
-      labels: [specOpThrowReviewActions],
-      description: 'must throw'
-    })
+    const r = await wallet.createAction(args)
     expect(true).toBe(false)
   } catch (eu: unknown) {
     const e = WalletError.fromUnknown(eu) as WERR_REVIEW_ACTIONS