Merge branch 'listOutNegOffset'

tonesnotes · tonesnotes · commit 1785c6dfd210 · 2025-08-14T16:41:45.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,6 @@ backup-*.sqlite
 test/wallet/support/reqhistory.sqlite
 
 node_modules
+src/services/chaintracker/chaintracks/__tests/*.sqlite
+src/services/chaintracker/chaintracks/__tests/data/*.sqlite
+src/services/chaintracker/chaintracks/__tests/data/export*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 This document captures the history of significant changes to the wallet-toolbox repository. The git commit history contains the details but is unable to draw
 attention to changes that materially alter behavior or extend functionality.
 
+## wallet-toolbox 1.5.21
+
+- Add support for listOutputs with negative offsets. (Sorts newest first, offset -1 is newest output).
+
 ## wallet-toolbox 1.5.10
 
 - Add automatic request timeouts and deprioritization of postBeef services.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox-client",
-  "version": "1.5.20",
+  "version": "1.5.21",
   "description": "Client only Wallet Storage",
   "main": "./out/src/index.client.js",
   "types": "./out/src/index.client.d.ts",
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/bsv-blockchain/wallet-toolbox#readme",
   "dependencies": {
-    "@bsv/sdk": "^1.6.20",
+    "@bsv/sdk": "^1.6.23",
     "idb": "^8.0.2"
   }
 }
diff --git a/docs/client.md b/docs/client.md
@@ -5142,7 +5142,7 @@ export interface ValidListOutputsArgs extends ValidWalletSignerArgs {
     includeTags: BooleanDefaultFalse;
     includeLabels: BooleanDefaultFalse;
     limit: PositiveIntegerDefault10Max10000;
-    offset: PositiveIntegerOrZero;
+    offset: number;
     seekPermission: BooleanDefaultTrue;
     knownTxids: string[];
 }
@@ -13210,7 +13210,10 @@ Argument Details
 + **args.limit**
   + Optional limit on the number of outputs to return.
 + **args.offset**
-  + Optional. Number of outputs to skip before starting to return results.
+  + If positive or zero: Number of outputs to skip before starting to return results, oldest first.
+If negative: Outputs are returned newest first and offset of -1 is the newest output.
+When using negative offsets, caution is required as new outputs may be added between calls,
+potentially causing outputs to be duplicated across calls.
 + **args.seekPermission**
   + — Optional. Whether to seek permission from the user for this operation if required. Default true, will return an error rather than proceed if set to false.
 
diff --git a/docs/wallet.md b/docs/wallet.md
@@ -5141,7 +5141,7 @@ export interface ValidListOutputsArgs extends ValidWalletSignerArgs {
     includeTags: BooleanDefaultFalse;
     includeLabels: BooleanDefaultFalse;
     limit: PositiveIntegerDefault10Max10000;
-    offset: PositiveIntegerOrZero;
+    offset: number;
     seekPermission: BooleanDefaultTrue;
     knownTxids: string[];
 }
@@ -13209,7 +13209,10 @@ Argument Details
 + **args.limit**
   + Optional limit on the number of outputs to return.
 + **args.offset**
-  + Optional. Number of outputs to skip before starting to return results.
+  + If positive or zero: Number of outputs to skip before starting to return results, oldest first.
+If negative: Outputs are returned newest first and offset of -1 is the newest output.
+When using negative offsets, caution is required as new outputs may be added between calls,
+potentially causing outputs to be duplicated across calls.
 + **args.seekPermission**
   + — Optional. Whether to seek permission from the user for this operation if required. Default true, will return an error rather than proceed if set to false.
 
diff --git a/mobile/package-lock.json b/mobile/package-lock.json
diff --git a/mobile/package.json b/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox-mobile",
-  "version": "1.5.20",
+  "version": "1.5.21",
   "description": "Client only Wallet Storage",
   "main": "./out/src/index.mobile.js",
   "types": "./out/src/index.mobile.d.ts",
@@ -20,6 +20,6 @@
   },
   "homepage": "https://github.com/bsv-blockchain/wallet-toolbox#readme",
   "dependencies": {
-    "@bsv/sdk": "^1.6.20"
+    "@bsv/sdk": "^1.6.23"
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.5.20",
+  "version": "1.5.21",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",
@@ -30,9 +30,9 @@
   },
   "homepage": "https://github.com/bsv-blockchain/wallet-toolbox#readme",
   "dependencies": {
-    "@bsv/auth-express-middleware": "^1.2.2",
+    "@bsv/auth-express-middleware": "^1.2.3",
     "@bsv/payment-express-middleware": "^1.2.3",
-    "@bsv/sdk": "^1.6.20",
+    "@bsv/sdk": "^1.6.23",
     "express": "^4.21.2",
     "idb": "^8.0.2",
     "knex": "^3.1.0",
diff --git a/src/WalletPermissionsManager.ts b/src/WalletPermissionsManager.ts
@@ -1044,7 +1044,6 @@ export class WalletPermissionsManager implements WalletInterface {
     }
   }
 
-
   /**
    * Ensures the originator has label usage permission.
    * If no valid (unexpired) permission token is found, triggers a permission request flow.
@@ -2909,15 +2908,15 @@ export class WalletPermissionsManager implements WalletInterface {
    * do not produce multiple user prompts.
    */
   private buildRequestKey(r: PermissionRequest): string {
-  switch (r.type) {
-    case 'protocol':
-      return `proto:${r.originator}:${!!r.privileged}:${r.protocolID?.join(',')}:${r.counterparty}`
-    case 'basket':
-      return `basket:${r.originator}:${r.basket}`
-    case 'certificate':
-      return `cert:${r.originator}:${!!r.privileged}:${r.certificate?.verifier}:${r.certificate?.certType}:${r.certificate?.fields.join('|')}`
-    case 'spending':
-      return `spend:${r.originator}:${r.spending?.satoshis}`
-  }
+    switch (r.type) {
+      case 'protocol':
+        return `proto:${r.originator}:${!!r.privileged}:${r.protocolID?.join(',')}:${r.counterparty}`
+      case 'basket':
+        return `basket:${r.originator}:${r.basket}`
+      case 'certificate':
+        return `cert:${r.originator}:${!!r.privileged}:${r.certificate?.verifier}:${r.certificate?.certType}:${r.certificate?.fields.join('|')}`
+      case 'spending':
+        return `spend:${r.originator}:${r.spending?.satoshis}`
+    }
   }
 }
diff --git a/src/sdk/validationHelpers.ts b/src/sdk/validationHelpers.ts
@@ -881,7 +881,7 @@ export interface ValidListOutputsArgs extends ValidWalletSignerArgs {
   includeTags: BooleanDefaultFalse
   includeLabels: BooleanDefaultFalse
   limit: PositiveIntegerDefault10Max10000
-  offset: PositiveIntegerOrZero
+  offset: number
   seekPermission: BooleanDefaultTrue
   knownTxids: string[]
 }
@@ -896,7 +896,10 @@ export interface ValidListOutputsArgs extends ValidWalletSignerArgs {
  * @param {BooleanDefaultFalse} [args.includeTags] - Optional. Whether the tags associated with the output should be returned.
  * @param {BooleanDefaultFalse} [args.includeLabels] - Optional. Whether the labels associated with the transaction containing the output should be returned.
  * @param {PositiveIntegerDefault10Max10000} [args.limit] - Optional limit on the number of outputs to return.
- * @param {PositiveIntegerOrZero} [args.offset] - Optional. Number of outputs to skip before starting to return results.
+ * @param {number} [args.offset] - If positive or zero: Number of outputs to skip before starting to return results, oldest first.
+ * If negative: Outputs are returned newest first and offset of -1 is the newest output.
+ * When using negative offsets, caution is required as new outputs may be added between calls,
+ * potentially causing outputs to be duplicated across calls.
  * @param {BooleanDefaultTrue} [args.seekPermission] — Optional. Whether to seek permission from the user for this operation if required. Default true, will return an error rather than proceed if set to false.
  */
 export function validateListOutputsArgs(args: ListOutputsArgs): ValidListOutputsArgs {
@@ -915,7 +918,7 @@ export function validateListOutputsArgs(args: ListOutputsArgs): ValidListOutputs
     includeTags: defaultFalse(args.includeTags),
     includeLabels: defaultFalse(args.includeLabels),
     limit: validateInteger(args.limit, 'limit', 10, 1, 10000),
-    offset: validateInteger(args.offset, 'offset', 0, 0),
+    offset: validateInteger(args.offset, 'offset', 0, undefined, undefined),
     seekPermission: defaultTrue(args.seekPermission),
     knownTxids: []
   }
diff --git a/src/storage/methods/listOutputsIdb.ts b/src/storage/methods/listOutputsIdb.ts
@@ -3,7 +3,7 @@ import { TableOutput, TableOutputBasket, TableOutputTag } from '../index.client'
 import { asString, sdk, verifyId, verifyOne } from '../../index.client'
 import { getBasketToSpecOp, ListOutputsSpecOp } from './ListOutputsSpecOp'
 import { StorageIdb } from '../StorageIdb'
-import { TransactionStatus } from '../../sdk'
+import { TransactionStatus, WERR_NOT_IMPLEMENTED } from '../../sdk'
 
 export async function listOutputsIdb(
   storage: StorageIdb,
@@ -14,6 +14,7 @@ export async function listOutputsIdb(
   const userId = verifyId(auth.userId)
   const limit = vargs.limit
   const offset = vargs.offset
+  if (offset < 0) throw new WERR_NOT_IMPLEMENTED('Negative offset not supported in IndexedDB')
 
   const r: ListOutputsResult = {
     totalOutputs: 0,
diff --git a/src/storage/methods/listOutputsKnex.ts b/src/storage/methods/listOutputsKnex.ts
@@ -13,7 +13,12 @@ export async function listOutputs(
   const trx: sdk.TrxToken | undefined = undefined
   const userId = verifyId(auth.userId)
   const limit = vargs.limit
-  const offset = vargs.offset
+  let offset = vargs.offset
+  let orderBy: 'asc' | 'desc' = 'asc'
+  if (offset < 0) {
+    offset = -offset - 1
+    orderBy = 'desc'
+  }
 
   const k = dsk.toDb(trx)
 
@@ -23,14 +28,14 @@ export async function listOutputs(
   }
 
   /*
-        ListOutputsArgs {
+        ValidListOutputsArgs {
             basket: BasketStringUnder300Bytes
 
-            tags?: OutputTagStringUnder300Bytes[]
-            tagQueryMode?: 'all' | 'any' // default any
+            tags: OutputTagStringUnder300Bytes[]
+            tagQueryMode: 'all' | 'any' // default any
 
-            limit?: PositiveIntegerDefault10Max10000
-            offset?: PositiveIntegerOrZero
+            limit: PositiveIntegerDefault10Max10000 // default 10
+            offset: number // default 0
         }
     */
 
@@ -166,7 +171,7 @@ export async function listOutputs(
   // Sort order when limit and offset are possible must be ascending for determinism.
   if (!specOp || !specOp.ignoreLimit) q.limit(limit).offset(offset)
 
-  q.orderBy('outputId', 'asc')
+  q.orderBy('outputId', orderBy)
 
   let outputs: TableOutput[] = await q
 
diff --git a/test/wallet/list/listOutputs.test.ts b/test/wallet/list/listOutputs.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@bsv/wallet-toolbox-client",`
`3`		`- "version": "1.5.20",`
	`3`	`+ "version": "1.5.21",`
`4`	`4`	`"description": "Client only Wallet Storage",`
`5`	`5`	`"main": "./out/src/index.client.js",`
`6`	`6`	`"types": "./out/src/index.client.d.ts",`
`@@ -20,7 +20,7 @@`
`20`	`20`	`},`
`21`	`21`	`"homepage": "https://github.com/bsv-blockchain/wallet-toolbox#readme",`
`22`	`22`	`"dependencies": {`
`23`		`- "@bsv/sdk": "^1.6.20",`
	`23`	`+ "@bsv/sdk": "^1.6.23",`
`24`	`24`	`"idb": "^8.0.2"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@bsv/wallet-toolbox-mobile",`
`3`		`- "version": "1.5.20",`
	`3`	`+ "version": "1.5.21",`
`4`	`4`	`"description": "Client only Wallet Storage",`
`5`	`5`	`"main": "./out/src/index.mobile.js",`
`6`	`6`	`"types": "./out/src/index.mobile.d.ts",`
`@@ -20,6 +20,6 @@`
`20`	`20`	`},`
`21`	`21`	`"homepage": "https://github.com/bsv-blockchain/wallet-toolbox#readme",`
`22`	`22`	`"dependencies": {`
`23`		`- "@bsv/sdk": "^1.6.20"`
	`23`	`+ "@bsv/sdk": "^1.6.23"`
`24`	`24`	`}`
`25`	`25`	`}`