From 091b5f05b51270a59e19b1cafed0b984c78dc971 Mon Sep 17 00:00:00 2001 From: Ty J Everett Date: Mon, 22 Jun 2026 18:04:37 -0700 Subject: [PATCH 1/6] Harden paid wallet setup failures --- infra/chaintracks-server/package.json | 4 +- infra/message-box-server/package.json | 6 +-- infra/overlay-server/package.json | 6 +-- infra/uhrp-server-basic/package.json | 6 +-- infra/uhrp-server-cloud-bucket/package.json | 8 ++-- infra/wab/package.json | 6 +-- infra/wallet-infra/package.json | 6 +-- packages/helpers/amountinator/package.json | 4 +- .../helpers/bsv-wallet-helper/package.json | 4 +- packages/helpers/did-client/package.json | 4 +- packages/helpers/did/package.json | 2 +- packages/helpers/fund-wallet/package.json | 4 +- packages/helpers/simple/package.json | 6 +-- packages/helpers/ts-templates/package.json | 4 +- .../messaging/authsocket-client/package.json | 2 +- packages/messaging/authsocket/package.json | 2 +- .../messaging/message-box-client/package.json | 2 +- .../ts-paymail/docs/examples/package.json | 2 +- packages/messaging/ts-paymail/package.json | 2 +- packages/middleware/402-pay/package.json | 2 +- .../auth-express-middleware/package.json | 2 +- packages/middleware/auth/package.json | 2 +- .../payment-express-middleware/package.json | 2 +- packages/network/ts-p2p/package.json | 2 +- packages/overlays/btms-backend/package.json | 2 +- packages/overlays/gasp-core/package.json | 2 +- .../overlay-discovery-services/package.json | 6 +-- .../src/WalletAdvertiser.ts | 19 ++++++-- .../overlays/overlay-express/package.json | 6 +-- packages/overlays/overlay/package.json | 2 +- packages/overlays/topics/package.json | 2 +- packages/sdk/package.json | 2 +- packages/sdk/src/auth/clients/AuthFetch.ts | 45 +++++++++++-------- packages/verifast/package.json | 2 +- .../btms-permission-module/package.json | 6 +-- packages/wallet/btms/package.json | 2 +- packages/wallet/ts-wallet-relay/package.json | 2 +- .../wallet-toolbox-examples/package.json | 4 +- .../wallet/wallet-toolbox/client/package.json | 4 +- .../wallet/wallet-toolbox/mobile/package.json | 4 +- packages/wallet/wallet-toolbox/package.json | 4 +- 41 files changed, 112 insertions(+), 92 deletions(-) diff --git a/infra/chaintracks-server/package.json b/infra/chaintracks-server/package.json index 2f5d39d68..d797f968c 100644 --- a/infra/chaintracks-server/package.json +++ b/infra/chaintracks-server/package.json @@ -1,6 +1,6 @@ { "name": "chaintracks-server", - "version": "1.0.7", + "version": "1.0.8", "description": "TypeScript Express server wrapping ChaintracksService from @bsv/wallet-toolbox", "main": "dist/server.js", "type": "commonjs", @@ -26,7 +26,7 @@ "author": "", "license": "MIT", "dependencies": { - "@bsv/wallet-toolbox": "^2.2.0", + "@bsv/wallet-toolbox": "^2.2.1", "body-parser": "^2.2.2", "dotenv": "^17.4.2", "express": "^5.2.1" diff --git a/infra/message-box-server/package.json b/infra/message-box-server/package.json index 68d79a867..18f1c19a3 100644 --- a/infra/message-box-server/package.json +++ b/infra/message-box-server/package.json @@ -1,7 +1,7 @@ { "name": "@bsv/messagebox-server", "private": true, - "version": "1.1.11", + "version": "1.1.12", "main": "./out/src/index.js", "type": "module", "scripts": { @@ -61,8 +61,8 @@ "@bsv/auth-express-middleware": "^2.1.0", "@bsv/authsocket": "^2.1.0", "@bsv/payment-express-middleware": "^2.1.0", - "@bsv/sdk": "^2.1.6", - "@bsv/wallet-toolbox": "^2.2.0", + "@bsv/sdk": "^2.1.7", + "@bsv/wallet-toolbox": "^2.2.1", "body-parser": "^2.2.2", "dotenv": "^17.4.2", "express": "^5.2.1", diff --git a/infra/overlay-server/package.json b/infra/overlay-server/package.json index 35221bc84..140030ec7 100644 --- a/infra/overlay-server/package.json +++ b/infra/overlay-server/package.json @@ -1,7 +1,7 @@ { "name": "@bsv/overlay-express-examples", "private": true, - "version": "2.1.12", + "version": "2.1.13", "description": "Run the overlay infrastructure for distributed applications.", "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/infra/overlay-server#readme", "bugs": { @@ -27,10 +27,10 @@ }, "dependencies": { "@bsv/overlay": "^2.1.0", - "@bsv/overlay-discovery-services": "^2.1.0", + "@bsv/overlay-discovery-services": "^2.1.1", "@bsv/overlay-express": "^2.4.0", "@bsv/overlay-topics": "^1.2.0", - "@bsv/sdk": "^2.1.6", + "@bsv/sdk": "^2.1.7", "dotenv": "^17.4.2", "mongodb": "^7.2.0", "mysql2": "^3.22.5" diff --git a/infra/uhrp-server-basic/package.json b/infra/uhrp-server-basic/package.json index 3fa13ae25..1f0b238c8 100644 --- a/infra/uhrp-server-basic/package.json +++ b/infra/uhrp-server-basic/package.json @@ -1,6 +1,6 @@ { "name": "@bsv/uhrp-lite", - "version": "0.1.6", + "version": "0.1.7", "main": "./out/src/index.js", "types": "./out/src/index.d.ts", "files": [ @@ -21,8 +21,8 @@ "dependencies": { "@bsv/auth-express-middleware": "^2.1.0", "@bsv/payment-express-middleware": "^2.1.0", - "@bsv/sdk": "^2.1.6", - "@bsv/wallet-toolbox-client": "^2.2.0", + "@bsv/sdk": "^2.1.7", + "@bsv/wallet-toolbox-client": "^2.2.1", "axios": "^1.17.0", "body-parser": "^2.2.2", "dotenv": "^17.4.2", diff --git a/infra/uhrp-server-cloud-bucket/package.json b/infra/uhrp-server-cloud-bucket/package.json index 9d05d9797..50e2bee43 100644 --- a/infra/uhrp-server-cloud-bucket/package.json +++ b/infra/uhrp-server-cloud-bucket/package.json @@ -1,6 +1,6 @@ { "name": "@bsv/uhrp-storage-server", - "version": "0.2.7", + "version": "0.2.8", "main": "./out/src/index.js", "types": "./out/src/index.d.ts", "files": [ @@ -21,9 +21,9 @@ "dependencies": { "@bsv/auth-express-middleware": "^2.1.0", "@bsv/payment-express-middleware": "^2.1.0", - "@bsv/sdk": "^2.1.6", - "@bsv/wallet-toolbox": "^2.2.0", - "@bsv/wallet-toolbox-client": "^2.2.0", + "@bsv/sdk": "^2.1.7", + "@bsv/wallet-toolbox": "^2.2.1", + "@bsv/wallet-toolbox-client": "^2.2.1", "@bugsnag/js": "^8.9.0", "@bugsnag/plugin-express": "^8.9.0", "@google-cloud/storage": "^7.19.0", diff --git a/infra/wab/package.json b/infra/wab/package.json index 79654b004..8a49e8202 100644 --- a/infra/wab/package.json +++ b/infra/wab/package.json @@ -1,7 +1,7 @@ { "name": "@bsv/wab-server", "private": true, - "version": "1.4.7", + "version": "1.4.8", "description": "Wallet Authentication Backend (WAB) server", "main": "dist/server.js", "scripts": { @@ -13,8 +13,8 @@ "test:coverage": "jest --coverage" }, "dependencies": { - "@bsv/sdk": "^2.1.6", - "@bsv/wallet-toolbox": "^2.2.0", + "@bsv/sdk": "^2.1.7", + "@bsv/wallet-toolbox": "^2.2.1", "dotenv": "^17.4.2", "express": "^5.2.1", "express-rate-limit": "^8.5.2", diff --git a/infra/wallet-infra/package.json b/infra/wallet-infra/package.json index 55ad709db..ee4ec1ca6 100644 --- a/infra/wallet-infra/package.json +++ b/infra/wallet-infra/package.json @@ -1,7 +1,7 @@ { "name": "@bsv/wallet-infra", "private": true, - "version": "2.0.10", + "version": "2.0.11", "type": "module", "description": "UTXO Management Server", "author": "BSV Blockchain Association", @@ -45,8 +45,8 @@ }, "dependencies": { "@bsv/payment-express-middleware": "^2.1.0", - "@bsv/sdk": "^2.1.6", - "@bsv/wallet-toolbox": "^2.2.0", + "@bsv/sdk": "^2.1.7", + "@bsv/wallet-toolbox": "^2.2.1", "body-parser": "^2.2.2", "dotenv": "^17.4.2", "express": "^5.2.1", diff --git a/packages/helpers/amountinator/package.json b/packages/helpers/amountinator/package.json index fa22c005e..16fe53d56 100644 --- a/packages/helpers/amountinator/package.json +++ b/packages/helpers/amountinator/package.json @@ -36,7 +36,7 @@ "@bsv/sdk": "workspace:^" }, "dependencies": { - "@bsv/wallet-toolbox-client": "^2.2.0" + "@bsv/wallet-toolbox-client": "^2.2.1" }, "keywords": [ "bsv", @@ -46,7 +46,7 @@ "wallet" ], "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/bsv-wallet-helper/package.json b/packages/helpers/bsv-wallet-helper/package.json index f3ff129af..8e9531bae 100644 --- a/packages/helpers/bsv-wallet-helper/package.json +++ b/packages/helpers/bsv-wallet-helper/package.json @@ -33,7 +33,7 @@ "license": "ISC", "type": "commonjs", "dependencies": { - "@bsv/wallet-toolbox-client": "^2.2.0" + "@bsv/wallet-toolbox-client": "^2.2.1" }, "devDependencies": { "@jest/globals": "^30.4.1", @@ -58,7 +58,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/bsv-wallet-helper#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/did-client/package.json b/packages/helpers/did-client/package.json index e02f4d8ed..553e7953e 100644 --- a/packages/helpers/did-client/package.json +++ b/packages/helpers/did-client/package.json @@ -52,7 +52,7 @@ "@bsv/sdk": "workspace:^" }, "dependencies": { - "@bsv/wallet-toolbox-client": "^2.2.0" + "@bsv/wallet-toolbox-client": "^2.2.1" }, "overrides": { "typescript": "^6.0.3" @@ -74,7 +74,7 @@ "decentralized-identifier" ], "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/did/package.json b/packages/helpers/did/package.json index 95d268183..c9611b2d5 100644 --- a/packages/helpers/did/package.json +++ b/packages/helpers/did/package.json @@ -70,7 +70,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/did#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/fund-wallet/package.json b/packages/helpers/fund-wallet/package.json index 3a50a82ee..9ade9b4ab 100644 --- a/packages/helpers/fund-wallet/package.json +++ b/packages/helpers/fund-wallet/package.json @@ -21,7 +21,7 @@ "test": "exit 0" }, "dependencies": { - "@bsv/wallet-toolbox": "^2.2.0", + "@bsv/wallet-toolbox": "^2.2.1", "chalk": "^5.6.2", "crypto": "^1.0.1", "dotenv": "^17.4.2", @@ -45,7 +45,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/fund-wallet#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/simple/package.json b/packages/helpers/simple/package.json index 8b65cc020..acf152b2a 100644 --- a/packages/helpers/simple/package.json +++ b/packages/helpers/simple/package.json @@ -46,8 +46,8 @@ "license": "MIT", "dependencies": { "@bsv/message-box-client": "^2.2.0", - "@bsv/wallet-toolbox": "^2.2.0", - "@bsv/wallet-toolbox-client": "^2.2.0" + "@bsv/wallet-toolbox": "^2.2.1", + "@bsv/wallet-toolbox-client": "^2.2.1" }, "overrides": { "minimatch": "^10.2.1" @@ -76,7 +76,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/simple#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/ts-templates/package.json b/packages/helpers/ts-templates/package.json index 12cbeff0c..1eb578843 100644 --- a/packages/helpers/ts-templates/package.json +++ b/packages/helpers/ts-templates/package.json @@ -53,7 +53,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/ts-templates#readme", "devDependencies": { - "@bsv/wallet-toolbox": "^2.2.0", + "@bsv/wallet-toolbox": "^2.2.1", "@types/jest": "^30.0.0", "jest": "^30.4.2", "ts-jest": "^29.4.11", @@ -64,7 +64,7 @@ }, "dependencies": {}, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/authsocket-client/package.json b/packages/messaging/authsocket-client/package.json index 725b2a753..dd0340d28 100644 --- a/packages/messaging/authsocket-client/package.json +++ b/packages/messaging/authsocket-client/package.json @@ -70,7 +70,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/authsocket/package.json b/packages/messaging/authsocket/package.json index 7307dc2d8..7335b2c3c 100644 --- a/packages/messaging/authsocket/package.json +++ b/packages/messaging/authsocket/package.json @@ -74,7 +74,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/message-box-client/package.json b/packages/messaging/message-box-client/package.json index 321e197eb..b1a01e3aa 100644 --- a/packages/messaging/message-box-client/package.json +++ b/packages/messaging/message-box-client/package.json @@ -87,7 +87,7 @@ "@bsv/authsocket-client": "^2.1.0" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/ts-paymail/docs/examples/package.json b/packages/messaging/ts-paymail/docs/examples/package.json index 74d842386..31c66f224 100644 --- a/packages/messaging/ts-paymail/docs/examples/package.json +++ b/packages/messaging/ts-paymail/docs/examples/package.json @@ -19,7 +19,7 @@ "license": "ISC", "dependencies": { "@bsv/paymail": "workspace:^", - "@bsv/sdk": "^2.1.6", + "@bsv/sdk": "^2.1.7", "express": "^5.2.1", "jwt-simple": "^0.5.6", "ts-standard": "^12.0.2" diff --git a/packages/messaging/ts-paymail/package.json b/packages/messaging/ts-paymail/package.json index 800a496db..43d3fa60f 100644 --- a/packages/messaging/ts-paymail/package.json +++ b/packages/messaging/ts-paymail/package.json @@ -123,7 +123,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/middleware/402-pay/package.json b/packages/middleware/402-pay/package.json index 46c8aa115..ed5e9578b 100644 --- a/packages/middleware/402-pay/package.json +++ b/packages/middleware/402-pay/package.json @@ -45,7 +45,7 @@ "author": "Deggen ", "license": "SEE LICENSE IN LICENSE", "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "devDependencies": { "@bsv/sdk": "workspace:^", diff --git a/packages/middleware/auth-express-middleware/package.json b/packages/middleware/auth-express-middleware/package.json index 4680ccd93..943bba5b9 100644 --- a/packages/middleware/auth-express-middleware/package.json +++ b/packages/middleware/auth-express-middleware/package.json @@ -70,7 +70,7 @@ "express": "^5.2.1" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/middleware/auth/package.json b/packages/middleware/auth/package.json index f85fa5e6c..c0a9a11f9 100644 --- a/packages/middleware/auth/package.json +++ b/packages/middleware/auth/package.json @@ -63,7 +63,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/middleware/auth#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/middleware/payment-express-middleware/package.json b/packages/middleware/payment-express-middleware/package.json index 42c51ddcc..d241046a6 100644 --- a/packages/middleware/payment-express-middleware/package.json +++ b/packages/middleware/payment-express-middleware/package.json @@ -68,7 +68,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/middleware/payment-express-middleware#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/network/ts-p2p/package.json b/packages/network/ts-p2p/package.json index 2360a728e..89b11bb99 100644 --- a/packages/network/ts-p2p/package.json +++ b/packages/network/ts-p2p/package.json @@ -60,7 +60,7 @@ "url": "https://github.com/bsv-blockchain/ts-stack/issues" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/btms-backend/package.json b/packages/overlays/btms-backend/package.json index 632085aea..2420edd66 100644 --- a/packages/overlays/btms-backend/package.json +++ b/packages/overlays/btms-backend/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@bsv/overlay": "^2.1.0", - "@bsv/sdk": "^2.1.6", + "@bsv/sdk": "^2.1.7", "mongodb": "^7.3.0" }, "repository": { diff --git a/packages/overlays/gasp-core/package.json b/packages/overlays/gasp-core/package.json index adf1f57b0..787d75694 100644 --- a/packages/overlays/gasp-core/package.json +++ b/packages/overlays/gasp-core/package.json @@ -64,7 +64,7 @@ }, "dependencies": {}, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/overlay-discovery-services/package.json b/packages/overlays/overlay-discovery-services/package.json index f46ef23df..e0c0705f1 100644 --- a/packages/overlays/overlay-discovery-services/package.json +++ b/packages/overlays/overlay-discovery-services/package.json @@ -1,6 +1,6 @@ { "name": "@bsv/overlay-discovery-services", - "version": "2.1.0", + "version": "2.1.1", "type": "module", "description": "BSV Blockchain Overlay Services Engine", "main": "dist/cjs/mod.js", @@ -67,11 +67,11 @@ }, "dependencies": { "@bsv/overlay": "^2.1.0", - "@bsv/wallet-toolbox-client": "^2.2.0", + "@bsv/wallet-toolbox-client": "^2.2.1", "mongodb": "^7.3.0" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/overlay-discovery-services/src/WalletAdvertiser.ts b/packages/overlays/overlay-discovery-services/src/WalletAdvertiser.ts index 2cb960659..0f4009c48 100644 --- a/packages/overlays/overlay-discovery-services/src/WalletAdvertiser.ts +++ b/packages/overlays/overlay-discovery-services/src/WalletAdvertiser.ts @@ -91,10 +91,21 @@ export class WalletAdvertiser implements Advertiser { } })) - const tx = await this.wallet.createAction({ - outputs, - description: 'SHIP/SLAP Advertisement Issuance' - }) + let tx + try { + tx = await this.wallet.createAction({ + outputs, + description: 'SHIP/SLAP Advertisement Issuance' + }) + } catch (error) { + const protocols = [...new Set(adsData.map(ad => ad.protocol))].join('/') + const names = adsData.map(ad => ad.topicOrServiceName).join(', ') + const wrapped = new Error( + `Unable to create ${protocols} advertisement transaction for ${names}. The advertiser wallet must have spendable funds before advertisements can be issued.` + ) + ;(wrapped as any).cause = error + throw wrapped + } if (tx.tx === undefined) { throw new Error('createAction did not return a transaction') diff --git a/packages/overlays/overlay-express/package.json b/packages/overlays/overlay-express/package.json index 77aeff43a..d184ed35a 100644 --- a/packages/overlays/overlay-express/package.json +++ b/packages/overlays/overlay-express/package.json @@ -72,8 +72,8 @@ "dependencies": { "@bsv/auth-express-middleware": "^2.1.0", "@bsv/overlay": "^2.1.0", - "@bsv/overlay-discovery-services": "^2.1.0", - "@bsv/wallet-toolbox-client": "^2.2.0", + "@bsv/overlay-discovery-services": "^2.1.1", + "@bsv/wallet-toolbox-client": "^2.2.1", "body-parser": "^2.2.2", "chalk": "^5.6.2", "express": "^5.2.1", @@ -82,7 +82,7 @@ "uuid": "^14.0.0" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/overlay/package.json b/packages/overlays/overlay/package.json index 12dd4ec5b..7929261b8 100644 --- a/packages/overlays/overlay/package.json +++ b/packages/overlays/overlay/package.json @@ -80,7 +80,7 @@ "knex": "^3.2.10" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/topics/package.json b/packages/overlays/topics/package.json index 3c83e4399..1f7f8cb41 100644 --- a/packages/overlays/topics/package.json +++ b/packages/overlays/topics/package.json @@ -53,7 +53,7 @@ "blockchain" ], "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 99082dea8..c3f137f86 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@bsv/sdk", - "version": "2.1.6", + "version": "2.1.7", "type": "module", "description": "BSV Blockchain Software Development Kit", "main": "dist/cjs/mod.js", diff --git a/packages/sdk/src/auth/clients/AuthFetch.ts b/packages/sdk/src/auth/clients/AuthFetch.ts index 93612fc28..b8005c951 100644 --- a/packages/sdk/src/auth/clients/AuthFetch.ts +++ b/packages/sdk/src/auth/clients/AuthFetch.ts @@ -656,18 +656,29 @@ export class AuthFetch { }, this.originator) const lockingScript = new P2PKH().lock(PublicKey.fromString(derivedPublicKey).toAddress()).toHex() - const { tx } = await this.wallet.createAction({ - description: `Payment for request to ${new URL(url).origin}`, - outputs: [{ - satoshis: satoshisRequired, - lockingScript, - customInstructions: JSON.stringify({ derivationPrefix, derivationSuffix, payee: serverIdentityKey }), - outputDescription: 'HTTP request payment' - }], - options: { - randomizeOutputs: false - } - }, this.originator) + const requestOrigin = new URL(url).origin + let paymentAction + try { + paymentAction = await this.wallet.createAction({ + description: `Payment for request to ${requestOrigin}`, + outputs: [{ + satoshis: satoshisRequired, + lockingScript, + customInstructions: JSON.stringify({ derivationPrefix, derivationSuffix, payee: serverIdentityKey }), + outputDescription: 'HTTP request payment' + }], + options: { + randomizeOutputs: false + } + }, this.originator) + } catch (error) { + const wrapped = new Error( + `Unable to create ${satoshisRequired} satoshi payment for ${requestOrigin}. The wallet must have spendable funds before paid requests can be completed.` + ) + ;(wrapped as any).cause = error + throw wrapped + } + const { tx } = paymentAction const { publicKey: clientIdentityKey } = await this.wallet.getPublicKey({ identityKey: true }, this.originator) @@ -772,11 +783,10 @@ export class AuthFetch { request: context.requestSummary, payment: { satoshis: context.satoshisRequired, - transactionBase64: context.transactionBase64, derivationPrefix: context.derivationPrefix, - derivationSuffix: context.derivationSuffix, serverIdentityKey: context.serverIdentityKey, - clientIdentityKey: context.clientIdentityKey + clientIdentityKey: context.clientIdentityKey, + transactionBytes: Utils.toArray(context.transactionBase64, 'utf8').length }, attempts: { used: context.attempts, @@ -846,11 +856,10 @@ export class AuthFetch { request: context.requestSummary, payment: { satoshis: context.satoshisRequired, - transactionBase64: context.transactionBase64, derivationPrefix: context.derivationPrefix, - derivationSuffix: context.derivationSuffix, serverIdentityKey: context.serverIdentityKey, - clientIdentityKey: context.clientIdentityKey + clientIdentityKey: context.clientIdentityKey, + transactionBytes: Utils.toArray(context.transactionBase64, 'utf8').length }, attempts: { used: context.attempts, diff --git a/packages/verifast/package.json b/packages/verifast/package.json index 474d2c81d..4e4e5c0e2 100644 --- a/packages/verifast/package.json +++ b/packages/verifast/package.json @@ -41,7 +41,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/wallet/btms-permission-module/package.json b/packages/wallet/btms-permission-module/package.json index 9b8da6abe..be9877f5f 100644 --- a/packages/wallet/btms-permission-module/package.json +++ b/packages/wallet/btms-permission-module/package.json @@ -25,13 +25,13 @@ "license": "Open BSV", "peerDependencies": { "@bsv/btms": "^1.1.0", - "@bsv/sdk": "^2.1.6", - "@bsv/wallet-toolbox-client": "^2.2.0" + "@bsv/sdk": "^2.1.7", + "@bsv/wallet-toolbox-client": "^2.2.1" }, "devDependencies": { "@bsv/btms": "^1.1.0", "@bsv/sdk": "workspace:^", - "@bsv/wallet-toolbox-client": "^2.2.0", + "@bsv/wallet-toolbox-client": "^2.2.1", "@types/node": "^25.9.3", "typescript": "^6.0.3" }, diff --git a/packages/wallet/btms/package.json b/packages/wallet/btms/package.json index f3e37b006..8c5431f0f 100644 --- a/packages/wallet/btms/package.json +++ b/packages/wallet/btms/package.json @@ -51,7 +51,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "bugs": { "url": "https://github.com/bsv-blockchain/ts-stack/issues" diff --git a/packages/wallet/ts-wallet-relay/package.json b/packages/wallet/ts-wallet-relay/package.json index 59fb667cc..ebffde17b 100644 --- a/packages/wallet/ts-wallet-relay/package.json +++ b/packages/wallet/ts-wallet-relay/package.json @@ -38,7 +38,7 @@ "test": "jest --config jest.config.cjs" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6", + "@bsv/sdk": "^2.1.7", "express": ">=4.0.0", "qrcode": ">=1.5.0", "react": ">=17.0.0", diff --git a/packages/wallet/wallet-toolbox-examples/package.json b/packages/wallet/wallet-toolbox-examples/package.json index e6b7461a3..9849b3456 100644 --- a/packages/wallet/wallet-toolbox-examples/package.json +++ b/packages/wallet/wallet-toolbox-examples/package.json @@ -54,7 +54,7 @@ "typescript": "^6.0.3" }, "dependencies": { - "@bsv/sdk": "^2.1.6", - "@bsv/wallet-toolbox": "^2.2.0" + "@bsv/sdk": "^2.1.7", + "@bsv/wallet-toolbox": "^2.2.1" } } diff --git a/packages/wallet/wallet-toolbox/client/package.json b/packages/wallet/wallet-toolbox/client/package.json index 73a7cec54..066d94521 100644 --- a/packages/wallet/wallet-toolbox/client/package.json +++ b/packages/wallet/wallet-toolbox/client/package.json @@ -1,6 +1,6 @@ { "name": "@bsv/wallet-toolbox-client", - "version": "2.2.0", + "version": "2.2.1", "description": "Client only Wallet Storage", "main": "./out/src/index.client.js", "types": "./out/src/index.client.d.ts", @@ -25,7 +25,7 @@ "idb": "^8.0.2" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/wallet/wallet-toolbox/mobile/package.json b/packages/wallet/wallet-toolbox/mobile/package.json index 063b79309..2919ade16 100644 --- a/packages/wallet/wallet-toolbox/mobile/package.json +++ b/packages/wallet/wallet-toolbox/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@bsv/wallet-toolbox-mobile", - "version": "2.2.0", + "version": "2.2.1", "description": "Client only Wallet Storage", "main": "./out/src/index.mobile.js", "types": "./out/src/index.mobile.d.ts", @@ -25,7 +25,7 @@ "idb": "^8.0.2" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/wallet/wallet-toolbox/package.json b/packages/wallet/wallet-toolbox/package.json index a359d8f48..5811c8f30 100644 --- a/packages/wallet/wallet-toolbox/package.json +++ b/packages/wallet/wallet-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@bsv/wallet-toolbox", - "version": "2.2.0", + "version": "2.2.1", "description": "BRC100 conforming wallet, wallet storage and wallet signer components", "main": "./out/src/index.js", "types": "./out/src/index.d.ts", @@ -73,7 +73,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.6" + "@bsv/sdk": "^2.1.7" }, "peerDependenciesMeta": { "@bsv/sdk": { From ac9a88b92fdac31fe4fa3873b110b50d3a4054c4 Mon Sep 17 00:00:00 2001 From: Ty J Everett Date: Mon, 22 Jun 2026 18:09:13 -0700 Subject: [PATCH 2/6] Fix workspace package version syncing --- .github/workflows/release.yaml | 8 +- packages/helpers/amountinator/package.json | 4 +- .../helpers/bsv-wallet-helper/package.json | 4 +- packages/helpers/did-client/package.json | 4 +- packages/helpers/did/package.json | 2 +- packages/helpers/fund-wallet/package.json | 4 +- packages/helpers/simple/package.json | 8 +- packages/helpers/ts-templates/package.json | 4 +- .../messaging/authsocket-client/package.json | 2 +- packages/messaging/authsocket/package.json | 6 +- .../messaging/message-box-client/package.json | 8 +- .../ts-paymail/docs/examples/package.json | 2 +- packages/messaging/ts-paymail/package.json | 2 +- packages/middleware/402-pay/package.json | 2 +- .../auth-express-middleware/package.json | 2 +- packages/middleware/auth/package.json | 2 +- .../payment-express-middleware/package.json | 2 +- packages/network/ts-p2p/package.json | 2 +- packages/overlays/btms-backend/package.json | 4 +- packages/overlays/gasp-core/package.json | 2 +- .../overlay-discovery-services/package.json | 6 +- .../overlays/overlay-express/package.json | 10 +- packages/overlays/overlay/package.json | 4 +- packages/overlays/topics/package.json | 4 +- packages/verifast/package.json | 2 +- .../btms-permission-module/package.json | 10 +- packages/wallet/btms/package.json | 2 +- packages/wallet/ts-wallet-relay/package.json | 2 +- .../wallet-toolbox-examples/package.json | 4 +- .../wallet/wallet-toolbox/client/package.json | 2 +- .../wallet/wallet-toolbox/mobile/package.json | 2 +- packages/wallet/wallet-toolbox/package.json | 2 +- pnpm-lock.yaml | 284 ++++-------------- scripts/sync-versions.mjs | 20 +- 34 files changed, 125 insertions(+), 303 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e2ff69ff4..f390e9dd3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -150,9 +150,9 @@ jobs: - name: Wait for npm registry propagation run: sleep 300 - # After publish, the workspace's `^X.Y.Z` cross-references for *downstream* packages - # that we didn't bump still point at old versions. sync-versions rewrites them to the - # newly-published versions and opens a PR with the diff + lockfile update. The PR is + # After publish, sync-versions keeps source-tree package references on + # `workspace:^` so future PR installs use unpublished workspace packages, + # then refreshes the lockfiles and infra semver consumers. The PR is # idempotent — re-running the workflow updates the existing branch in place. - name: Sync published workspace versions id: sync-versions @@ -167,7 +167,7 @@ jobs: # Infra components are NOT in the pnpm workspace — each has its own # npm package-lock.json that goes stale when sync-versions rewrites - # their @bsv/* ranges. Refresh each infra lockfile so the Dockerfile + # their registry-installed @bsv/* ranges. Refresh each infra lockfile so the Dockerfile # `npm ci` step won't fail with "lockfile doesn't match" on the next # infra-release build. --package-lock-only skips node_modules I/O. # Peer-aware (no --legacy-peer-deps): @bsv/* libraries declare @bsv/sdk diff --git a/packages/helpers/amountinator/package.json b/packages/helpers/amountinator/package.json index 16fe53d56..56375f46d 100644 --- a/packages/helpers/amountinator/package.json +++ b/packages/helpers/amountinator/package.json @@ -36,7 +36,7 @@ "@bsv/sdk": "workspace:^" }, "dependencies": { - "@bsv/wallet-toolbox-client": "^2.2.1" + "@bsv/wallet-toolbox-client": "workspace:^" }, "keywords": [ "bsv", @@ -46,7 +46,7 @@ "wallet" ], "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/bsv-wallet-helper/package.json b/packages/helpers/bsv-wallet-helper/package.json index 8e9531bae..afca321b0 100644 --- a/packages/helpers/bsv-wallet-helper/package.json +++ b/packages/helpers/bsv-wallet-helper/package.json @@ -33,7 +33,7 @@ "license": "ISC", "type": "commonjs", "dependencies": { - "@bsv/wallet-toolbox-client": "^2.2.1" + "@bsv/wallet-toolbox-client": "workspace:^" }, "devDependencies": { "@jest/globals": "^30.4.1", @@ -58,7 +58,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/bsv-wallet-helper#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/did-client/package.json b/packages/helpers/did-client/package.json index 553e7953e..246b53982 100644 --- a/packages/helpers/did-client/package.json +++ b/packages/helpers/did-client/package.json @@ -52,7 +52,7 @@ "@bsv/sdk": "workspace:^" }, "dependencies": { - "@bsv/wallet-toolbox-client": "^2.2.1" + "@bsv/wallet-toolbox-client": "workspace:^" }, "overrides": { "typescript": "^6.0.3" @@ -74,7 +74,7 @@ "decentralized-identifier" ], "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/did/package.json b/packages/helpers/did/package.json index c9611b2d5..958056019 100644 --- a/packages/helpers/did/package.json +++ b/packages/helpers/did/package.json @@ -70,7 +70,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/did#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/fund-wallet/package.json b/packages/helpers/fund-wallet/package.json index 9ade9b4ab..b1545b9ea 100644 --- a/packages/helpers/fund-wallet/package.json +++ b/packages/helpers/fund-wallet/package.json @@ -21,7 +21,7 @@ "test": "exit 0" }, "dependencies": { - "@bsv/wallet-toolbox": "^2.2.1", + "@bsv/wallet-toolbox": "workspace:^", "chalk": "^5.6.2", "crypto": "^1.0.1", "dotenv": "^17.4.2", @@ -45,7 +45,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/fund-wallet#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/simple/package.json b/packages/helpers/simple/package.json index acf152b2a..6a0cd65c7 100644 --- a/packages/helpers/simple/package.json +++ b/packages/helpers/simple/package.json @@ -45,9 +45,9 @@ "author": "", "license": "MIT", "dependencies": { - "@bsv/message-box-client": "^2.2.0", - "@bsv/wallet-toolbox": "^2.2.1", - "@bsv/wallet-toolbox-client": "^2.2.1" + "@bsv/message-box-client": "workspace:^", + "@bsv/wallet-toolbox": "workspace:^", + "@bsv/wallet-toolbox-client": "workspace:^" }, "overrides": { "minimatch": "^10.2.1" @@ -76,7 +76,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/simple#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/ts-templates/package.json b/packages/helpers/ts-templates/package.json index 1eb578843..0fe61eb65 100644 --- a/packages/helpers/ts-templates/package.json +++ b/packages/helpers/ts-templates/package.json @@ -53,7 +53,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/ts-templates#readme", "devDependencies": { - "@bsv/wallet-toolbox": "^2.2.1", + "@bsv/wallet-toolbox": "workspace:^", "@types/jest": "^30.0.0", "jest": "^30.4.2", "ts-jest": "^29.4.11", @@ -64,7 +64,7 @@ }, "dependencies": {}, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/authsocket-client/package.json b/packages/messaging/authsocket-client/package.json index dd0340d28..52a66a643 100644 --- a/packages/messaging/authsocket-client/package.json +++ b/packages/messaging/authsocket-client/package.json @@ -70,7 +70,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/authsocket/package.json b/packages/messaging/authsocket/package.json index 7335b2c3c..a699f50c9 100644 --- a/packages/messaging/authsocket/package.json +++ b/packages/messaging/authsocket/package.json @@ -58,8 +58,8 @@ "socket.io": "^4.8.1" }, "devDependencies": { - "@bsv/authsocket-client": "^2.1.0", - "@bsv/message-box-client": "^2.2.0", + "@bsv/authsocket-client": "workspace:^", + "@bsv/message-box-client": "workspace:^", "@types/jest": "^30.0.0", "jest": "^30.4.2", "jest-environment-jsdom": "^30.4.1", @@ -74,7 +74,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/message-box-client/package.json b/packages/messaging/message-box-client/package.json index b1a01e3aa..50823959e 100644 --- a/packages/messaging/message-box-client/package.json +++ b/packages/messaging/message-box-client/package.json @@ -55,8 +55,8 @@ "author": "BSV Blockchain Association", "license": "SEE LICENSE IN LICENSE.txt", "devDependencies": { - "@bsv/auth-express-middleware": "^2.1.0", - "@bsv/payment-express-middleware": "^2.1.0", + "@bsv/auth-express-middleware": "workspace:^", + "@bsv/payment-express-middleware": "workspace:^", "@eslint/js": "^10.0.1", "@types/jest": "^30.0.0", "@types/node": "^25.9.3", @@ -84,10 +84,10 @@ "@bsv/sdk": "workspace:^" }, "dependencies": { - "@bsv/authsocket-client": "^2.1.0" + "@bsv/authsocket-client": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/ts-paymail/docs/examples/package.json b/packages/messaging/ts-paymail/docs/examples/package.json index 31c66f224..ebf2621f8 100644 --- a/packages/messaging/ts-paymail/docs/examples/package.json +++ b/packages/messaging/ts-paymail/docs/examples/package.json @@ -19,7 +19,7 @@ "license": "ISC", "dependencies": { "@bsv/paymail": "workspace:^", - "@bsv/sdk": "^2.1.7", + "@bsv/sdk": "workspace:^", "express": "^5.2.1", "jwt-simple": "^0.5.6", "ts-standard": "^12.0.2" diff --git a/packages/messaging/ts-paymail/package.json b/packages/messaging/ts-paymail/package.json index 43d3fa60f..4e86d5000 100644 --- a/packages/messaging/ts-paymail/package.json +++ b/packages/messaging/ts-paymail/package.json @@ -123,7 +123,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/middleware/402-pay/package.json b/packages/middleware/402-pay/package.json index ed5e9578b..ad970e30c 100644 --- a/packages/middleware/402-pay/package.json +++ b/packages/middleware/402-pay/package.json @@ -45,7 +45,7 @@ "author": "Deggen ", "license": "SEE LICENSE IN LICENSE", "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "devDependencies": { "@bsv/sdk": "workspace:^", diff --git a/packages/middleware/auth-express-middleware/package.json b/packages/middleware/auth-express-middleware/package.json index 943bba5b9..5fc277bd8 100644 --- a/packages/middleware/auth-express-middleware/package.json +++ b/packages/middleware/auth-express-middleware/package.json @@ -70,7 +70,7 @@ "express": "^5.2.1" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/middleware/auth/package.json b/packages/middleware/auth/package.json index c0a9a11f9..77957fe1f 100644 --- a/packages/middleware/auth/package.json +++ b/packages/middleware/auth/package.json @@ -63,7 +63,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/middleware/auth#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/middleware/payment-express-middleware/package.json b/packages/middleware/payment-express-middleware/package.json index d241046a6..520a001a9 100644 --- a/packages/middleware/payment-express-middleware/package.json +++ b/packages/middleware/payment-express-middleware/package.json @@ -68,7 +68,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/middleware/payment-express-middleware#readme", "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/network/ts-p2p/package.json b/packages/network/ts-p2p/package.json index 89b11bb99..02103c449 100644 --- a/packages/network/ts-p2p/package.json +++ b/packages/network/ts-p2p/package.json @@ -60,7 +60,7 @@ "url": "https://github.com/bsv-blockchain/ts-stack/issues" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/btms-backend/package.json b/packages/overlays/btms-backend/package.json index 2420edd66..654aa16eb 100644 --- a/packages/overlays/btms-backend/package.json +++ b/packages/overlays/btms-backend/package.json @@ -47,8 +47,8 @@ "typescript": "^6.0.3" }, "dependencies": { - "@bsv/overlay": "^2.1.0", - "@bsv/sdk": "^2.1.7", + "@bsv/overlay": "workspace:^", + "@bsv/sdk": "workspace:^", "mongodb": "^7.3.0" }, "repository": { diff --git a/packages/overlays/gasp-core/package.json b/packages/overlays/gasp-core/package.json index 787d75694..52d175783 100644 --- a/packages/overlays/gasp-core/package.json +++ b/packages/overlays/gasp-core/package.json @@ -64,7 +64,7 @@ }, "dependencies": {}, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/overlay-discovery-services/package.json b/packages/overlays/overlay-discovery-services/package.json index e0c0705f1..7fc46a74f 100644 --- a/packages/overlays/overlay-discovery-services/package.json +++ b/packages/overlays/overlay-discovery-services/package.json @@ -66,12 +66,12 @@ "@bsv/sdk": "workspace:^" }, "dependencies": { - "@bsv/overlay": "^2.1.0", - "@bsv/wallet-toolbox-client": "^2.2.1", + "@bsv/overlay": "workspace:^", + "@bsv/wallet-toolbox-client": "workspace:^", "mongodb": "^7.3.0" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/overlay-express/package.json b/packages/overlays/overlay-express/package.json index d184ed35a..15e3dab9e 100644 --- a/packages/overlays/overlay-express/package.json +++ b/packages/overlays/overlay-express/package.json @@ -70,10 +70,10 @@ "@bsv/sdk": "workspace:^" }, "dependencies": { - "@bsv/auth-express-middleware": "^2.1.0", - "@bsv/overlay": "^2.1.0", - "@bsv/overlay-discovery-services": "^2.1.1", - "@bsv/wallet-toolbox-client": "^2.2.1", + "@bsv/auth-express-middleware": "workspace:^", + "@bsv/overlay": "workspace:^", + "@bsv/overlay-discovery-services": "workspace:^", + "@bsv/wallet-toolbox-client": "workspace:^", "body-parser": "^2.2.2", "chalk": "^5.6.2", "express": "^5.2.1", @@ -82,7 +82,7 @@ "uuid": "^14.0.0" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/overlay/package.json b/packages/overlays/overlay/package.json index 7929261b8..628da77a8 100644 --- a/packages/overlays/overlay/package.json +++ b/packages/overlays/overlay/package.json @@ -76,11 +76,11 @@ "@bsv/sdk": "workspace:^" }, "dependencies": { - "@bsv/gasp": "^1.3.0", + "@bsv/gasp": "workspace:^", "knex": "^3.2.10" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/topics/package.json b/packages/overlays/topics/package.json index 1f7f8cb41..6b807dcfa 100644 --- a/packages/overlays/topics/package.json +++ b/packages/overlays/topics/package.json @@ -18,7 +18,7 @@ "test:coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage" }, "dependencies": { - "@bsv/overlay": "^2.1.0", + "@bsv/overlay": "workspace:^", "@bsv/templates": "workspace:^", "mongodb": "^7.3.0" }, @@ -53,7 +53,7 @@ "blockchain" ], "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/verifast/package.json b/packages/verifast/package.json index 4e4e5c0e2..18fadf60b 100644 --- a/packages/verifast/package.json +++ b/packages/verifast/package.json @@ -41,7 +41,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/wallet/btms-permission-module/package.json b/packages/wallet/btms-permission-module/package.json index be9877f5f..78a362542 100644 --- a/packages/wallet/btms-permission-module/package.json +++ b/packages/wallet/btms-permission-module/package.json @@ -24,14 +24,14 @@ "author": "BSV Blockchain Association", "license": "Open BSV", "peerDependencies": { - "@bsv/btms": "^1.1.0", - "@bsv/sdk": "^2.1.7", - "@bsv/wallet-toolbox-client": "^2.2.1" + "@bsv/btms": "workspace:^", + "@bsv/sdk": "workspace:^", + "@bsv/wallet-toolbox-client": "workspace:^" }, "devDependencies": { - "@bsv/btms": "^1.1.0", + "@bsv/btms": "workspace:^", "@bsv/sdk": "workspace:^", - "@bsv/wallet-toolbox-client": "^2.2.1", + "@bsv/wallet-toolbox-client": "workspace:^", "@types/node": "^25.9.3", "typescript": "^6.0.3" }, diff --git a/packages/wallet/btms/package.json b/packages/wallet/btms/package.json index 8c5431f0f..4a6090a1e 100644 --- a/packages/wallet/btms/package.json +++ b/packages/wallet/btms/package.json @@ -51,7 +51,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "bugs": { "url": "https://github.com/bsv-blockchain/ts-stack/issues" diff --git a/packages/wallet/ts-wallet-relay/package.json b/packages/wallet/ts-wallet-relay/package.json index ebffde17b..fdf4819f3 100644 --- a/packages/wallet/ts-wallet-relay/package.json +++ b/packages/wallet/ts-wallet-relay/package.json @@ -38,7 +38,7 @@ "test": "jest --config jest.config.cjs" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7", + "@bsv/sdk": "workspace:^", "express": ">=4.0.0", "qrcode": ">=1.5.0", "react": ">=17.0.0", diff --git a/packages/wallet/wallet-toolbox-examples/package.json b/packages/wallet/wallet-toolbox-examples/package.json index 9849b3456..7cc7a5291 100644 --- a/packages/wallet/wallet-toolbox-examples/package.json +++ b/packages/wallet/wallet-toolbox-examples/package.json @@ -54,7 +54,7 @@ "typescript": "^6.0.3" }, "dependencies": { - "@bsv/sdk": "^2.1.7", - "@bsv/wallet-toolbox": "^2.2.1" + "@bsv/sdk": "workspace:^", + "@bsv/wallet-toolbox": "workspace:^" } } diff --git a/packages/wallet/wallet-toolbox/client/package.json b/packages/wallet/wallet-toolbox/client/package.json index 066d94521..7ca7b8502 100644 --- a/packages/wallet/wallet-toolbox/client/package.json +++ b/packages/wallet/wallet-toolbox/client/package.json @@ -25,7 +25,7 @@ "idb": "^8.0.2" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/wallet/wallet-toolbox/mobile/package.json b/packages/wallet/wallet-toolbox/mobile/package.json index 2919ade16..f8cc6409e 100644 --- a/packages/wallet/wallet-toolbox/mobile/package.json +++ b/packages/wallet/wallet-toolbox/mobile/package.json @@ -25,7 +25,7 @@ "idb": "^8.0.2" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/wallet/wallet-toolbox/package.json b/packages/wallet/wallet-toolbox/package.json index 5811c8f30..fb2659919 100644 --- a/packages/wallet/wallet-toolbox/package.json +++ b/packages/wallet/wallet-toolbox/package.json @@ -73,7 +73,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "^2.1.7" + "@bsv/sdk": "workspace:^" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 991916912..91f16d036 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -136,8 +136,8 @@ importers: packages/helpers/amountinator: dependencies: '@bsv/wallet-toolbox-client': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../wallet/wallet-toolbox/client devDependencies: '@bsv/sdk': specifier: 2.1.3 @@ -161,8 +161,8 @@ importers: packages/helpers/bsv-wallet-helper: dependencies: '@bsv/wallet-toolbox-client': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../wallet/wallet-toolbox/client devDependencies: '@bsv/sdk': specifier: 2.1.3 @@ -232,8 +232,8 @@ importers: packages/helpers/did-client: dependencies: '@bsv/wallet-toolbox-client': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../wallet/wallet-toolbox/client devDependencies: '@bsv/sdk': specifier: 2.1.3 @@ -293,8 +293,8 @@ importers: packages/helpers/fund-wallet: dependencies: '@bsv/wallet-toolbox': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3)(@types/node@25.9.3)(sqlite3@6.0.1) + specifier: workspace:^ + version: link:../../wallet/wallet-toolbox chalk: specifier: ^5.6.2 version: 5.6.2 @@ -321,14 +321,14 @@ importers: packages/helpers/simple: dependencies: '@bsv/message-box-client': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../messaging/message-box-client '@bsv/wallet-toolbox': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3)(@types/node@25.9.3)(sqlite3@6.0.1) + specifier: workspace:^ + version: link:../../wallet/wallet-toolbox '@bsv/wallet-toolbox-client': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../wallet/wallet-toolbox/client devDependencies: '@bsv/sdk': specifier: 2.1.3 @@ -358,8 +358,8 @@ importers: specifier: 2.1.3 version: 2.1.3 '@bsv/wallet-toolbox': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3)(@types/node@25.9.3)(sqlite3@6.0.1) + specifier: workspace:^ + version: link:../../wallet/wallet-toolbox '@types/jest': specifier: ^30.0.0 version: 30.0.0 @@ -386,11 +386,11 @@ importers: version: 4.8.3 devDependencies: '@bsv/authsocket-client': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../authsocket-client '@bsv/message-box-client': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../message-box-client '@bsv/sdk': specifier: 2.1.3 version: 2.1.3 @@ -474,15 +474,15 @@ importers: packages/messaging/message-box-client: dependencies: '@bsv/authsocket-client': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../authsocket-client devDependencies: '@bsv/auth-express-middleware': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../middleware/auth-express-middleware '@bsv/payment-express-middleware': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../middleware/payment-express-middleware '@bsv/sdk': specifier: 2.1.3 version: 2.1.3 @@ -825,8 +825,8 @@ importers: packages/overlays/btms-backend: dependencies: '@bsv/overlay': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../overlay '@bsv/sdk': specifier: 2.1.3 version: 2.1.3 @@ -895,11 +895,11 @@ importers: packages/overlays/overlay: dependencies: '@bsv/gasp': - specifier: ^1.3.0 - version: 1.3.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../gasp-core knex: specifier: 3.2.10 - version: 3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3))(sqlite3@6.0.1) + version: 3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3)) devDependencies: '@bsv/sdk': specifier: 2.1.3 @@ -932,11 +932,11 @@ importers: packages/overlays/overlay-discovery-services: dependencies: '@bsv/overlay': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../overlay '@bsv/wallet-toolbox-client': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../wallet/wallet-toolbox/client mongodb: specifier: ^7.3.0 version: 7.3.0(socks@2.8.7) @@ -972,17 +972,17 @@ importers: packages/overlays/overlay-express: dependencies: '@bsv/auth-express-middleware': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../middleware/auth-express-middleware '@bsv/overlay': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../overlay '@bsv/overlay-discovery-services': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3)(socks@2.8.7) + specifier: workspace:^ + version: link:../overlay-discovery-services '@bsv/wallet-toolbox-client': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../../wallet/wallet-toolbox/client body-parser: specifier: ^2.2.2 version: 2.2.2 @@ -994,7 +994,7 @@ importers: version: 5.2.1 knex: specifier: 3.2.10 - version: 3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3))(sqlite3@6.0.1) + version: 3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3)) mongodb: specifier: ^7.3.0 version: 7.3.0(socks@2.8.7) @@ -1042,8 +1042,8 @@ importers: packages/overlays/topics: dependencies: '@bsv/overlay': - specifier: ^2.1.0 - version: 2.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../overlay '@bsv/templates': specifier: workspace:^ version: link:../../helpers/ts-templates @@ -1190,14 +1190,14 @@ importers: packages/wallet/btms-permission-module: devDependencies: '@bsv/btms': - specifier: ^1.1.0 - version: 1.1.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../btms '@bsv/sdk': specifier: 2.1.3 version: 2.1.3 '@bsv/wallet-toolbox-client': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3) + specifier: workspace:^ + version: link:../wallet-toolbox/client '@types/node': specifier: ^25.9.3 version: 25.9.3 @@ -1287,7 +1287,7 @@ importers: version: 8.0.3 knex: specifier: 3.2.10 - version: 3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3))(sqlite3@6.0.1) + version: 3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3)) mysql2: specifier: 3.22.3 version: 3.22.3(@types/node@25.9.3) @@ -1362,8 +1362,8 @@ importers: specifier: 2.1.3 version: 2.1.3 '@bsv/wallet-toolbox': - specifier: ^2.2.0 - version: 2.2.0(@bsv/sdk@2.1.3)(@types/node@25.9.3)(sqlite3@6.0.1) + specifier: workspace:^ + version: link:../wallet-toolbox devDependencies: '@types/diff': specifier: ^8.0.0 @@ -2204,59 +2204,9 @@ packages: resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==} hasBin: true - '@bsv/auth-express-middleware@2.1.0': - resolution: {integrity: sha512-pdVCr8GBx+xs39KHcoiyIcyuBXTpIB+VKZNykIaVfZzhUyTIMEv1zQ+y8WhonCsvc9B9jcFAeYVI7kZ8IF4Gxw==} - peerDependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/authsocket-client@2.1.0': - resolution: {integrity: sha512-dm2HkXhIgGUDlBKCd7gfSnCJqM4PC3a5QbchT0d3IBizD7GJT8jBcFsnhPQ31EoV0NBFRUgBdptJucS8w8weCQ==} - peerDependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/btms@1.1.0': - resolution: {integrity: sha512-eQBfAwg+0lLSmEirbrAMS6qAKxpkQAq0F5WjLnPPzKREe65Zn3VkXmjP165CqAlvtXPL0aE9GeGL2uHuSRyc6Q==} - peerDependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/gasp@1.3.0': - resolution: {integrity: sha512-5hZxb71aY/TEGHsBkoWz9+bo6qj6YIbxLObBzagfV02Ny6eGUtPhov1MJ9SfmR6POUNM+r4pkACOZmDNSWLPZg==} - peerDependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/message-box-client@2.2.0': - resolution: {integrity: sha512-l/bJOI9p2wetnsYaGcRbtn53soUuQxyqtH0AliyXWuKUY+aXUArAVjCmxy1Fkv+FGsa/uws8N0w/LyI3B7uDsA==} - peerDependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/overlay-discovery-services@2.1.0': - resolution: {integrity: sha512-f1FjYZUpHkCIkaT/ISEyvHzMVHbCh84I9SEpqjh3JCy7bO9BWdFSnYdw+Eb77RuIKuCj+juaVUm4vbZ2KTxyKw==} - peerDependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/overlay@2.1.0': - resolution: {integrity: sha512-XKccMFFgzPEeT8C613uD/TVKaG4uAlSMKS56O2rdo1IevlK8E9rv4jzz5KvfzpEQ2CCbI04GvZaDsf62wj/dfA==} - peerDependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/payment-express-middleware@2.1.0': - resolution: {integrity: sha512-tiYwQeT6nnVi0pas+SaxPwaOQH1230BbI1T61TQ0btj+/QykE5Jwc+Ae0X1VMh5uj0jiHyJrMkxQ6rbX0fQ3dg==} - peerDependencies: - '@bsv/sdk': 2.1.3 - '@bsv/sdk@2.1.3': resolution: {integrity: sha512-nmni2Q762/TeWz6MfbHdWRSTwzPV8o5t34789/u8MA+kPNnoZfs/BQOw4c5FtlXYcu3Soxbhup3+02zdrP+drg==} - '@bsv/wallet-toolbox-client@2.2.0': - resolution: {integrity: sha512-j8LoN8VGvO9Rh//+x/nXnjL6mKTaFdcBFLK+UDt+sAkmkkcVAhXbS/2wNqmGzD/dqxamv+gVtVFd6fm7uqjcWQ==} - peerDependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/wallet-toolbox@2.2.0': - resolution: {integrity: sha512-HGCXQALHe9oXnxxvoD5AoKg4LB87UJ2c/k6zpmITswDIr3/b8DT5/FfjuHRgg/qY7c30c9x5d5ZfAZSBB4JPnA==} - peerDependencies: - '@bsv/sdk': 2.1.3 - '@chainsafe/as-chacha20poly1305@0.1.0': resolution: {integrity: sha512-BpNcL8/lji/GM3+vZ/bgRWqJ1q5kwvTFmGPk7pxm/QQZDbaMI98waOHjEymTjq2JmdD/INdNBFOVSyJofXg7ew==} @@ -12140,118 +12090,8 @@ snapshots: dependencies: css-tree: 3.2.1 - '@bsv/auth-express-middleware@2.1.0(@bsv/sdk@2.1.3)': - dependencies: - '@bsv/sdk': 2.1.3 - express: 5.2.1 - transitivePeerDependencies: - - supports-color - - '@bsv/authsocket-client@2.1.0(@bsv/sdk@2.1.3)': - dependencies: - '@bsv/sdk': 2.1.3 - socket.io-client: 4.8.3 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - - '@bsv/btms@1.1.0(@bsv/sdk@2.1.3)': - dependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/gasp@1.3.0(@bsv/sdk@2.1.3)': - dependencies: - '@bsv/sdk': 2.1.3 - - '@bsv/message-box-client@2.2.0(@bsv/sdk@2.1.3)': - dependencies: - '@bsv/authsocket-client': 2.1.0(@bsv/sdk@2.1.3) - '@bsv/sdk': 2.1.3 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - - '@bsv/overlay-discovery-services@2.1.0(@bsv/sdk@2.1.3)(socks@2.8.7)': - dependencies: - '@bsv/overlay': 2.1.0(@bsv/sdk@2.1.3) - '@bsv/sdk': 2.1.3 - '@bsv/wallet-toolbox-client': 2.2.0(@bsv/sdk@2.1.3) - mongodb: 7.3.0(socks@2.8.7) - transitivePeerDependencies: - - '@aws-sdk/credential-providers' - - '@mongodb-js/zstd' - - better-sqlite3 - - gcp-metadata - - kerberos - - mongodb-client-encryption - - mysql - - mysql2 - - pg - - pg-native - - pg-query-stream - - snappy - - socks - - sqlite3 - - supports-color - - tedious - - '@bsv/overlay@2.1.0(@bsv/sdk@2.1.3)': - dependencies: - '@bsv/gasp': 1.3.0(@bsv/sdk@2.1.3) - '@bsv/sdk': 2.1.3 - knex: 3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3))(sqlite3@6.0.1) - transitivePeerDependencies: - - better-sqlite3 - - mysql - - mysql2 - - pg - - pg-native - - pg-query-stream - - sqlite3 - - supports-color - - tedious - - '@bsv/payment-express-middleware@2.1.0(@bsv/sdk@2.1.3)': - dependencies: - '@bsv/sdk': 2.1.3 - express: 5.2.1 - transitivePeerDependencies: - - supports-color - '@bsv/sdk@2.1.3': {} - '@bsv/wallet-toolbox-client@2.2.0(@bsv/sdk@2.1.3)': - dependencies: - '@bsv/sdk': 2.1.3 - hash-wasm: 4.12.0 - idb: 8.0.3 - - '@bsv/wallet-toolbox@2.2.0(@bsv/sdk@2.1.3)(@types/node@25.9.3)(sqlite3@6.0.1)': - dependencies: - '@bsv/auth-express-middleware': 2.1.0(@bsv/sdk@2.1.3) - '@bsv/payment-express-middleware': 2.1.0(@bsv/sdk@2.1.3) - '@bsv/sdk': 2.1.3 - better-sqlite3: 12.10.0 - express: 5.2.1 - hash-wasm: 4.12.0 - idb: 8.0.3 - knex: 3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3))(sqlite3@6.0.1) - mysql2: 3.22.3(@types/node@25.9.3) - ws: 8.21.0 - transitivePeerDependencies: - - '@types/node' - - bufferutil - - mysql - - pg - - pg-native - - pg-query-stream - - sqlite3 - - supports-color - - tedious - - utf-8-validate - '@chainsafe/as-chacha20poly1305@0.1.0': {} '@chainsafe/as-sha256@1.2.4': {} @@ -16863,12 +16703,6 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-es@4.1.0(eslint@10.5.0): - dependencies: - eslint: 10.5.0 - eslint-utils: 2.1.0 - regexpp: 3.2.0 - eslint-plugin-es@4.1.0(eslint@8.57.1): dependencies: eslint: 8.57.1 @@ -16935,8 +16769,8 @@ snapshots: dependencies: builtins: 5.1.0 eslint: 10.5.0 - eslint-plugin-es: 4.1.0(eslint@10.5.0) - eslint-utils: 3.0.0(eslint@10.5.0) + eslint-plugin-es: 4.1.0(eslint@8.57.1) + eslint-utils: 3.0.0(eslint@8.57.1) ignore: 5.3.2 is-core-module: 2.16.2 minimatch: 3.1.5 @@ -17028,11 +16862,6 @@ snapshots: dependencies: eslint-visitor-keys: 1.3.0 - eslint-utils@3.0.0(eslint@10.5.0): - dependencies: - eslint: 10.5.0 - eslint-visitor-keys: 2.1.0 - eslint-utils@3.0.0(eslint@8.57.1): dependencies: eslint: 8.57.1 @@ -18917,7 +18746,7 @@ snapshots: kind-of@6.0.3: {} - knex@3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3))(sqlite3@6.0.1): + knex@3.2.10(better-sqlite3@12.10.0)(mysql2@3.22.3(@types/node@25.9.3)): dependencies: colorette: 2.0.19 commander: 10.0.1 @@ -18936,7 +18765,6 @@ snapshots: optionalDependencies: better-sqlite3: 12.10.0 mysql2: 3.22.3(@types/node@25.9.3) - sqlite3: 6.0.1 transitivePeerDependencies: - supports-color diff --git a/scripts/sync-versions.mjs b/scripts/sync-versions.mjs index 06417d8bc..6e455d468 100644 --- a/scripts/sync-versions.mjs +++ b/scripts/sync-versions.mjs @@ -5,7 +5,8 @@ * Reads all workspace package.json files, builds a map of * { packageName → currentVersion }, then rewrites every cross-package * dependency reference (dependencies, devDependencies, peerDependencies) - * so that they point at the current workspace version. + * to `workspace:^` so local and CI installs link unpublished workspace + * packages. pnpm rewrites those ranges to `^X.Y.Z` at publish time. * * Also walks ./infra/* package.json files (which are NOT in the pnpm * workspace) and rewrites their @bsv/* dependency ranges to track the @@ -62,18 +63,11 @@ for (const [, { path: pkgPath }] of Object.entries(workspaceMap)) { for (const [dep, range] of Object.entries(pkg[field])) { const ws = workspaceMap[dep] if (!ws) continue - const target = `^${ws.version}` - // `workspace:^` is the canonical form for cross-workspace deps in this repo — - // publishes as `^X.Y.Z` so downstream installs dedupe. `workspace:*` publishes - // as an exact pin and causes duplicate-install bugs; rewrite it to `workspace:^`. - if (range === 'workspace:*') { - console.log(` ${pkg.name}: ${dep} workspace:* → workspace:^`) - pkg[field][dep] = 'workspace:^' - changed = true - totalChanges++ - continue - } - if (range !== target && range !== 'workspace:^') { + // `workspace:^` is the canonical source-tree form for cross-workspace deps + // in this repo. pnpm rewrites it to `^X.Y.Z` during publish, while local + // and CI installs keep linking the unpublished workspace package. + const target = 'workspace:^' + if (range !== target) { console.log(` ${pkg.name}: ${dep} ${range} → ${target}`) pkg[field][dep] = target changed = true From 2192a90762b001c0c3965f5cb2da2e646f7881b9 Mon Sep 17 00:00:00 2001 From: Ty J Everett Date: Mon, 22 Jun 2026 18:11:27 -0700 Subject: [PATCH 3/6] Preserve broad SDK peer ranges --- packages/helpers/amountinator/package.json | 2 +- .../helpers/bsv-wallet-helper/package.json | 2 +- packages/helpers/did-client/package.json | 2 +- packages/helpers/did/package.json | 2 +- packages/helpers/fund-wallet/package.json | 2 +- packages/helpers/simple/package.json | 2 +- packages/helpers/ts-templates/package.json | 2 +- .../messaging/authsocket-client/package.json | 2 +- packages/messaging/authsocket/package.json | 2 +- .../messaging/message-box-client/package.json | 2 +- packages/messaging/ts-paymail/package.json | 2 +- packages/middleware/402-pay/package.json | 2 +- .../auth-express-middleware/package.json | 2 +- packages/middleware/auth/package.json | 2 +- .../payment-express-middleware/package.json | 2 +- packages/network/ts-p2p/package.json | 2 +- packages/overlays/gasp-core/package.json | 2 +- .../overlay-discovery-services/package.json | 2 +- .../overlays/overlay-express/package.json | 2 +- packages/overlays/overlay/package.json | 2 +- packages/overlays/topics/package.json | 2 +- packages/verifast/package.json | 2 +- .../btms-permission-module/package.json | 6 ++--- packages/wallet/btms/package.json | 2 +- packages/wallet/ts-wallet-relay/package.json | 2 +- .../wallet/wallet-toolbox/client/package.json | 2 +- .../wallet/wallet-toolbox/mobile/package.json | 2 +- packages/wallet/wallet-toolbox/package.json | 2 +- scripts/check-versions.mjs | 6 ++--- scripts/sync-versions.mjs | 27 ++++++++++++++++--- 30 files changed, 56 insertions(+), 37 deletions(-) diff --git a/packages/helpers/amountinator/package.json b/packages/helpers/amountinator/package.json index 56375f46d..530615d43 100644 --- a/packages/helpers/amountinator/package.json +++ b/packages/helpers/amountinator/package.json @@ -46,7 +46,7 @@ "wallet" ], "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/bsv-wallet-helper/package.json b/packages/helpers/bsv-wallet-helper/package.json index afca321b0..17d42a97b 100644 --- a/packages/helpers/bsv-wallet-helper/package.json +++ b/packages/helpers/bsv-wallet-helper/package.json @@ -58,7 +58,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/bsv-wallet-helper#readme", "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/did-client/package.json b/packages/helpers/did-client/package.json index 246b53982..133794e2f 100644 --- a/packages/helpers/did-client/package.json +++ b/packages/helpers/did-client/package.json @@ -74,7 +74,7 @@ "decentralized-identifier" ], "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/did/package.json b/packages/helpers/did/package.json index 958056019..68d0b384b 100644 --- a/packages/helpers/did/package.json +++ b/packages/helpers/did/package.json @@ -70,7 +70,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/did#readme", "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/fund-wallet/package.json b/packages/helpers/fund-wallet/package.json index b1545b9ea..8842af6c9 100644 --- a/packages/helpers/fund-wallet/package.json +++ b/packages/helpers/fund-wallet/package.json @@ -45,7 +45,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/fund-wallet#readme", "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/simple/package.json b/packages/helpers/simple/package.json index 6a0cd65c7..fd5d652b9 100644 --- a/packages/helpers/simple/package.json +++ b/packages/helpers/simple/package.json @@ -76,7 +76,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/simple#readme", "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/helpers/ts-templates/package.json b/packages/helpers/ts-templates/package.json index 0fe61eb65..be2d6572b 100644 --- a/packages/helpers/ts-templates/package.json +++ b/packages/helpers/ts-templates/package.json @@ -64,7 +64,7 @@ }, "dependencies": {}, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/authsocket-client/package.json b/packages/messaging/authsocket-client/package.json index 52a66a643..7166f5b64 100644 --- a/packages/messaging/authsocket-client/package.json +++ b/packages/messaging/authsocket-client/package.json @@ -70,7 +70,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/authsocket/package.json b/packages/messaging/authsocket/package.json index a699f50c9..d3c91e31f 100644 --- a/packages/messaging/authsocket/package.json +++ b/packages/messaging/authsocket/package.json @@ -74,7 +74,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/message-box-client/package.json b/packages/messaging/message-box-client/package.json index 50823959e..819306f8d 100644 --- a/packages/messaging/message-box-client/package.json +++ b/packages/messaging/message-box-client/package.json @@ -87,7 +87,7 @@ "@bsv/authsocket-client": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/messaging/ts-paymail/package.json b/packages/messaging/ts-paymail/package.json index 4e86d5000..4eafe0b81 100644 --- a/packages/messaging/ts-paymail/package.json +++ b/packages/messaging/ts-paymail/package.json @@ -123,7 +123,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/middleware/402-pay/package.json b/packages/middleware/402-pay/package.json index ad970e30c..2d1820d02 100644 --- a/packages/middleware/402-pay/package.json +++ b/packages/middleware/402-pay/package.json @@ -45,7 +45,7 @@ "author": "Deggen ", "license": "SEE LICENSE IN LICENSE", "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "devDependencies": { "@bsv/sdk": "workspace:^", diff --git a/packages/middleware/auth-express-middleware/package.json b/packages/middleware/auth-express-middleware/package.json index 5fc277bd8..5a061d3b7 100644 --- a/packages/middleware/auth-express-middleware/package.json +++ b/packages/middleware/auth-express-middleware/package.json @@ -70,7 +70,7 @@ "express": "^5.2.1" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/middleware/auth/package.json b/packages/middleware/auth/package.json index 77957fe1f..ca678d10e 100644 --- a/packages/middleware/auth/package.json +++ b/packages/middleware/auth/package.json @@ -63,7 +63,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/middleware/auth#readme", "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/middleware/payment-express-middleware/package.json b/packages/middleware/payment-express-middleware/package.json index 520a001a9..d3c3498ee 100644 --- a/packages/middleware/payment-express-middleware/package.json +++ b/packages/middleware/payment-express-middleware/package.json @@ -68,7 +68,7 @@ }, "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/middleware/payment-express-middleware#readme", "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/network/ts-p2p/package.json b/packages/network/ts-p2p/package.json index 02103c449..9150084a7 100644 --- a/packages/network/ts-p2p/package.json +++ b/packages/network/ts-p2p/package.json @@ -60,7 +60,7 @@ "url": "https://github.com/bsv-blockchain/ts-stack/issues" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/gasp-core/package.json b/packages/overlays/gasp-core/package.json index 52d175783..3e0f45bee 100644 --- a/packages/overlays/gasp-core/package.json +++ b/packages/overlays/gasp-core/package.json @@ -64,7 +64,7 @@ }, "dependencies": {}, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/overlay-discovery-services/package.json b/packages/overlays/overlay-discovery-services/package.json index 7fc46a74f..ec2dd9eb0 100644 --- a/packages/overlays/overlay-discovery-services/package.json +++ b/packages/overlays/overlay-discovery-services/package.json @@ -71,7 +71,7 @@ "mongodb": "^7.3.0" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/overlay-express/package.json b/packages/overlays/overlay-express/package.json index 15e3dab9e..5c0ddc283 100644 --- a/packages/overlays/overlay-express/package.json +++ b/packages/overlays/overlay-express/package.json @@ -82,7 +82,7 @@ "uuid": "^14.0.0" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/overlay/package.json b/packages/overlays/overlay/package.json index 628da77a8..72ca17173 100644 --- a/packages/overlays/overlay/package.json +++ b/packages/overlays/overlay/package.json @@ -80,7 +80,7 @@ "knex": "^3.2.10" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/overlays/topics/package.json b/packages/overlays/topics/package.json index 6b807dcfa..5923629dd 100644 --- a/packages/overlays/topics/package.json +++ b/packages/overlays/topics/package.json @@ -53,7 +53,7 @@ "blockchain" ], "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/verifast/package.json b/packages/verifast/package.json index 18fadf60b..b1ab94010 100644 --- a/packages/verifast/package.json +++ b/packages/verifast/package.json @@ -41,7 +41,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/wallet/btms-permission-module/package.json b/packages/wallet/btms-permission-module/package.json index 78a362542..9fab844a9 100644 --- a/packages/wallet/btms-permission-module/package.json +++ b/packages/wallet/btms-permission-module/package.json @@ -24,9 +24,9 @@ "author": "BSV Blockchain Association", "license": "Open BSV", "peerDependencies": { - "@bsv/btms": "workspace:^", - "@bsv/sdk": "workspace:^", - "@bsv/wallet-toolbox-client": "workspace:^" + "@bsv/btms": "^1", + "@bsv/sdk": "^2", + "@bsv/wallet-toolbox-client": "^2" }, "devDependencies": { "@bsv/btms": "workspace:^", diff --git a/packages/wallet/btms/package.json b/packages/wallet/btms/package.json index 4a6090a1e..69e9f7afc 100644 --- a/packages/wallet/btms/package.json +++ b/packages/wallet/btms/package.json @@ -51,7 +51,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "bugs": { "url": "https://github.com/bsv-blockchain/ts-stack/issues" diff --git a/packages/wallet/ts-wallet-relay/package.json b/packages/wallet/ts-wallet-relay/package.json index fdf4819f3..64646d0fd 100644 --- a/packages/wallet/ts-wallet-relay/package.json +++ b/packages/wallet/ts-wallet-relay/package.json @@ -38,7 +38,7 @@ "test": "jest --config jest.config.cjs" }, "peerDependencies": { - "@bsv/sdk": "workspace:^", + "@bsv/sdk": "^2", "express": ">=4.0.0", "qrcode": ">=1.5.0", "react": ">=17.0.0", diff --git a/packages/wallet/wallet-toolbox/client/package.json b/packages/wallet/wallet-toolbox/client/package.json index 7ca7b8502..c4516566d 100644 --- a/packages/wallet/wallet-toolbox/client/package.json +++ b/packages/wallet/wallet-toolbox/client/package.json @@ -25,7 +25,7 @@ "idb": "^8.0.2" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/wallet/wallet-toolbox/mobile/package.json b/packages/wallet/wallet-toolbox/mobile/package.json index f8cc6409e..6f881b4d1 100644 --- a/packages/wallet/wallet-toolbox/mobile/package.json +++ b/packages/wallet/wallet-toolbox/mobile/package.json @@ -25,7 +25,7 @@ "idb": "^8.0.2" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/packages/wallet/wallet-toolbox/package.json b/packages/wallet/wallet-toolbox/package.json index fb2659919..e4c597e1e 100644 --- a/packages/wallet/wallet-toolbox/package.json +++ b/packages/wallet/wallet-toolbox/package.json @@ -73,7 +73,7 @@ "@bsv/sdk": "workspace:^" }, "peerDependencies": { - "@bsv/sdk": "workspace:^" + "@bsv/sdk": "^2" }, "peerDependenciesMeta": { "@bsv/sdk": { diff --git a/scripts/check-versions.mjs b/scripts/check-versions.mjs index 6a56c9fb8..0de0f1453 100644 --- a/scripts/check-versions.mjs +++ b/scripts/check-versions.mjs @@ -28,12 +28,12 @@ for (const pkg of pkgList) { } function parseVersion (version) { - const match = version.match(/^(\d+)\.(\d+)\.(\d+)/) + const match = version.match(/^(\d+)(?:\.(\d+))?(?:\.(\d+))?/) if (!match) return null return { major: Number(match[1]), - minor: Number(match[2]), - patch: Number(match[3]) + minor: Number(match[2] ?? 0), + patch: Number(match[3] ?? 0) } } diff --git a/scripts/sync-versions.mjs b/scripts/sync-versions.mjs index 6e455d468..8acc93538 100644 --- a/scripts/sync-versions.mjs +++ b/scripts/sync-versions.mjs @@ -4,9 +4,13 @@ * * Reads all workspace package.json files, builds a map of * { packageName → currentVersion }, then rewrites every cross-package - * dependency reference (dependencies, devDependencies, peerDependencies) - * to `workspace:^` so local and CI installs link unpublished workspace - * packages. pnpm rewrites those ranges to `^X.Y.Z` at publish time. + * install-time dependency reference (dependencies, devDependencies, and + * optionalDependencies) to `workspace:^` so local and CI installs link + * unpublished workspace packages. pnpm rewrites those ranges to `^X.Y.Z` at + * publish time. + * + * Peer dependencies are consumer-facing compatibility contracts, so they stay + * as broad semver ranges instead of workspace links. * * Also walks ./infra/* package.json files (which are NOT in the pnpm * workspace) and rewrites their @bsv/* dependency ranges to track the @@ -58,7 +62,7 @@ for (const [, { path: pkgPath }] of Object.entries(workspaceMap)) { const pkg = JSON.parse(raw) let changed = false - for (const field of ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies']) { + for (const field of ['dependencies', 'devDependencies', 'optionalDependencies']) { if (!pkg[field]) continue for (const [dep, range] of Object.entries(pkg[field])) { const ws = workspaceMap[dep] @@ -76,6 +80,21 @@ for (const [, { path: pkgPath }] of Object.entries(workspaceMap)) { } } + if (pkg.peerDependencies) { + for (const [dep, range] of Object.entries(pkg.peerDependencies)) { + const ws = workspaceMap[dep] + if (!ws) continue + const major = String(ws.version).split('.')[0] + const target = major ? `^${major}` : `^${ws.version}` + if (range !== target && (range.startsWith('workspace:') || !range.startsWith('^'))) { + console.log(` ${pkg.name}: ${dep} peer ${range} → ${target}`) + pkg.peerDependencies[dep] = target + changed = true + totalChanges++ + } + } + } + if (changed && !DRY_RUN) { writeFileSync(jsonPath, JSON.stringify(pkg, null, 2) + '\n') } From 34c83aaafd13ff9cf0609f10d8873d9238bb14db Mon Sep 17 00:00:00 2001 From: Ty J Everett Date: Mon, 22 Jun 2026 18:14:55 -0700 Subject: [PATCH 4/6] Build split wallet toolbox packages --- packages/wallet/wallet-toolbox/client/package.json | 3 +++ packages/wallet/wallet-toolbox/mobile/package.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/wallet/wallet-toolbox/client/package.json b/packages/wallet/wallet-toolbox/client/package.json index c4516566d..857306214 100644 --- a/packages/wallet/wallet-toolbox/client/package.json +++ b/packages/wallet/wallet-toolbox/client/package.json @@ -4,6 +4,9 @@ "description": "Client only Wallet Storage", "main": "./out/src/index.client.js", "types": "./out/src/index.client.d.ts", + "scripts": { + "build": "cd .. && pnpm exec tsc -b tsconfig.client.json" + }, "repository": { "type": "git", "url": "git+https://github.com/bsv-blockchain/ts-stack.git", diff --git a/packages/wallet/wallet-toolbox/mobile/package.json b/packages/wallet/wallet-toolbox/mobile/package.json index 6f881b4d1..de73f3e52 100644 --- a/packages/wallet/wallet-toolbox/mobile/package.json +++ b/packages/wallet/wallet-toolbox/mobile/package.json @@ -4,6 +4,9 @@ "description": "Client only Wallet Storage", "main": "./out/src/index.mobile.js", "types": "./out/src/index.mobile.d.ts", + "scripts": { + "build": "cd .. && pnpm exec tsc -b tsconfig.mobile.json" + }, "repository": { "type": "git", "url": "git+https://github.com/bsv-blockchain/ts-stack.git", From 0abf20204d66d7f46a3098e16ab3a41d84736927 Mon Sep 17 00:00:00 2001 From: Ty J Everett Date: Mon, 22 Jun 2026 18:29:22 -0700 Subject: [PATCH 5/6] Run wallet toolbox tests serially --- packages/wallet/wallet-toolbox/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wallet/wallet-toolbox/package.json b/packages/wallet/wallet-toolbox/package.json index e4c597e1e..2c466c44c 100644 --- a/packages/wallet/wallet-toolbox/package.json +++ b/packages/wallet/wallet-toolbox/package.json @@ -25,7 +25,7 @@ "BRC100" ], "scripts": { - "test": "npm run build && jest --testPathIgnorePatterns=man.test.ts", + "test": "npm run build && jest --runInBand --testPathIgnorePatterns=man.test.ts", "test:watch": "npm run build && jest --testPathIgnorePatterns=man.test.ts --watch", "test:coverage": "npm run build && jest --testPathIgnorePatterns=man.test.ts --coverage", "lint": "ts-standard --fix src/**/*.ts", From 6dd9ad0f3a1bed1ab74a76c1ddb72eabed6631ec Mon Sep 17 00:00:00 2001 From: Ty J Everett Date: Mon, 22 Jun 2026 19:56:30 -0700 Subject: [PATCH 6/6] Fix auth handshake response race --- packages/sdk/src/auth/Peer.ts | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/packages/sdk/src/auth/Peer.ts b/packages/sdk/src/auth/Peer.ts index c2499ab21..d50ef351b 100644 --- a/packages/sdk/src/auth/Peer.ts +++ b/packages/sdk/src/auth/Peer.ts @@ -17,6 +17,7 @@ import * as Utils from '../primitives/utils.js' import { OriginatorDomainNameStringUnder250Bytes, WalletInterface } from '../wallet/Wallet.interfaces.js' const AUTH_VERSION = '0.1' +const INITIAL_RESPONSE_TIMEOUT_MS = 30000 const BufferCtor = typeof globalThis === 'undefined' ? undefined : (globalThis as any).Buffer @@ -394,8 +395,14 @@ export class Peer { requestedCertificates: this.certificatesToRequest } - await this.transport.send(initialRequest) - return await this.waitForInitialResponse(sessionNonce) + const initialResponse = this.waitForInitialResponse(sessionNonce) + try { + await this.transport.send(initialRequest) + } catch (error) { + initialResponse.catch(() => {}) + throw error + } + return await initialResponse } /** @@ -407,8 +414,16 @@ export class Peer { private async waitForInitialResponse ( sessionNonce: string ): Promise { - return await new Promise(resolve => { - const callbackID = this.listenForInitialResponse(sessionNonce, nonce => { + return await new Promise((resolve, reject) => { + let callbackID: number + const timer = setTimeout(() => { + this.stopListeningForInitialResponses(callbackID) + reject(new Error(`Timed out waiting for initial auth response for session ${sessionNonce}`)) + }, INITIAL_RESPONSE_TIMEOUT_MS) + ;(timer as any).unref?.() + + callbackID = this.listenForInitialResponse(sessionNonce, nonce => { + clearTimeout(timer) this.stopListeningForInitialResponses(callbackID) resolve(nonce) })