more type fixes, fix version

packages/use-solana/package.json

@@ -30,8 +30,8 @@
   },
   "dependencies": {
     "@ledgerhq/devices": "6.27.1",
-    "@ledgerhq/hw-transport": "6.27.1",
-    "@ledgerhq/hw-transport-webusb": "6.27.1",
+    "@ledgerhq/hw-transport": "6.30.5",
+    "@ledgerhq/hw-transport-webusb": "6.28.5",
     "@saberhq/solana-contrib": "workspace:^",
     "@saberhq/wallet-adapter-icons": "workspace:^",
     "@solana/wallet-adapter-base": "^0.9.23",

packages/use-solana/src/adapters/solana.ts

@@ -10,7 +10,6 @@ import {
 import type {
   EventEmitter,
   SignerWalletAdapter,
-  SupportedTransactionVersions,
   WalletAdapterEvents,
 } from "@solana/wallet-adapter-base";
 import { BaseSignerWalletAdapter } from "@solana/wallet-adapter-base";
@@ -20,20 +19,22 @@ import type {
   Connection,
   PublicKey,
   Transaction,
+  TransactionVersion,
   VersionedTransaction,
 } from "@solana/web3.js";
 
 import type { ConnectedWallet, WalletAdapter } from "./types";
 
 type SolanaWalletAdapterInterface = Omit<
   SignerWalletAdapter,
+  | "supportedTransactionVersions"
   | "sendTransaction"
   | "signTransaction"
   | "signAllTransactions"
   | keyof EventEmitter
 > &
   EventEmitter<WalletAdapterEvents> & {
-    supportedTransactionVersions: Set<"legacy"> | null;
+    supportedTransactionVersions: ReadonlySet<"legacy"> | null;
     signTransaction: <T extends Transaction>(transaction: T) => Promise<T>;
     signAllTransactions: <T extends Transaction>(
       transactions: T[],
@@ -42,9 +43,12 @@ type SolanaWalletAdapterInterface = Omit<
 
 type SolanaWalletAdapterSupportingVersioned = Omit<
   SolanaWalletAdapterInterface,
-  "sendTransaction" | "signTransaction" | "signAllTransactions"
+  | "supportedTransactionVersions"
+  | "sendTransaction"
+  | "signTransaction"
+  | "signAllTransactions"
 > & {
-  supportedTransactionVersions: Set<SupportedTransactionVersions>;
+  supportedTransactionVersions: ReadonlySet<TransactionVersion>;
   signTransaction: <T extends Transaction | VersionedTransaction>(
     transaction: T,
   ) => Promise<T>;

yarn.lock

@@ -2362,7 +2362,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ledgerhq/devices@npm:6.27.1, @ledgerhq/devices@npm:^6.27.1":
+"@ledgerhq/devices@npm:6.27.1":
   version: 6.27.1
   resolution: "@ledgerhq/devices@npm:6.27.1"
   dependencies:
@@ -2374,56 +2374,53 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ledgerhq/devices@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "@ledgerhq/devices@npm:7.0.2"
+"@ledgerhq/devices@npm:^8.2.2":
+  version: 8.2.2
+  resolution: "@ledgerhq/devices@npm:8.2.2"
   dependencies:
-    "@ledgerhq/errors": "npm:^6.11.0"
-    "@ledgerhq/logs": "npm:^6.10.0"
-    rxjs: "npm:6"
+    "@ledgerhq/errors": "npm:^6.16.3"
+    "@ledgerhq/logs": "npm:^6.12.0"
+    rxjs: "npm:^7.8.1"
     semver: "npm:^7.3.5"
-  checksum: 10/2ed8e84898e4eaf7a4e8dedb3a9a9d90e1dac3af1a7d6ef6e79d1fed00897bad86d38131adfe8c32cbcb47fc3abef1a22dea548ae5c4af272e71bf023834d91c
+  checksum: 10/02102cbead70eafbe10859a1785085b8a18780860fa98ba2f2cad561634851f61b33659a98339ee388cee575aed3d299baaf737dc63a804ed53dbc609f497a03
   languageName: node
   linkType: hard
 
-"@ledgerhq/errors@npm:^6.10.0, @ledgerhq/errors@npm:^6.11.0":
+"@ledgerhq/errors@npm:^6.10.0":
   version: 6.11.0
   resolution: "@ledgerhq/errors@npm:6.11.0"
   checksum: 10/87d126ec6f19fff2a4903732b52a9c15596f3724020eeb31eddf1f2daba4dee0b3f2dfd872d28a7e72d86240ff4c72002d84a01fb758e9cf4a452e7eb18d9705
   languageName: node
   linkType: hard
 
-"@ledgerhq/hw-transport-webusb@npm:6.27.1":
-  version: 6.27.1
-  resolution: "@ledgerhq/hw-transport-webusb@npm:6.27.1"
-  dependencies:
-    "@ledgerhq/devices": "npm:^6.27.1"
-    "@ledgerhq/errors": "npm:^6.10.0"
-    "@ledgerhq/hw-transport": "npm:^6.27.1"
-    "@ledgerhq/logs": "npm:^6.10.0"
-  checksum: 10/6d1de5ec81168f771f37d01f04e495443ea630a66a80e38e58170f9748bf1708454f4abf9b1048c826fccef43ab7596081bed514560d252f851e0ca13a1631e8
+"@ledgerhq/errors@npm:^6.16.3":
+  version: 6.16.3
+  resolution: "@ledgerhq/errors@npm:6.16.3"
+  checksum: 10/db79349ec6f58092f393c7f3d63ebc5777e749cf5d7fb6454d7218847bbb8e2e58d2fb01494413f65e7df93ad51c975462df2521739bc808dd62665f141a059d
   languageName: node
   linkType: hard
 
-"@ledgerhq/hw-transport@npm:6.27.1":
-  version: 6.27.1
-  resolution: "@ledgerhq/hw-transport@npm:6.27.1"
+"@ledgerhq/hw-transport-webusb@npm:6.28.5":
+  version: 6.28.5
+  resolution: "@ledgerhq/hw-transport-webusb@npm:6.28.5"
   dependencies:
-    "@ledgerhq/devices": "npm:^6.27.1"
-    "@ledgerhq/errors": "npm:^6.10.0"
-    events: "npm:^3.3.0"
-  checksum: 10/57aeb7779a57ea5e2781e0d80f517db7a4dd68ea37c1f98c7c1262eeff16deb0babba6d29907c1cd733037a5b7aba2ff5876cbe5eefabcd7038a7932ace2836f
+    "@ledgerhq/devices": "npm:^8.2.2"
+    "@ledgerhq/errors": "npm:^6.16.3"
+    "@ledgerhq/hw-transport": "npm:^6.30.5"
+    "@ledgerhq/logs": "npm:^6.12.0"
+  checksum: 10/35d09c3a9cc7187bd4add7499ac38e2ea959af2ef8a806a70e475e6a00dcb70fe446c6c13e646410dac60f8209519793605dc35a1b23c6de0b98958b29af5344
   languageName: node
   linkType: hard
 
-"@ledgerhq/hw-transport@npm:^6.27.1":
-  version: 6.27.5
-  resolution: "@ledgerhq/hw-transport@npm:6.27.5"
+"@ledgerhq/hw-transport@npm:6.30.5, @ledgerhq/hw-transport@npm:^6.30.5":
+  version: 6.30.5
+  resolution: "@ledgerhq/hw-transport@npm:6.30.5"
   dependencies:
-    "@ledgerhq/devices": "npm:^7.0.2"
-    "@ledgerhq/errors": "npm:^6.11.0"
+    "@ledgerhq/devices": "npm:^8.2.2"
+    "@ledgerhq/errors": "npm:^6.16.3"
+    "@ledgerhq/logs": "npm:^6.12.0"
     events: "npm:^3.3.0"
-  checksum: 10/b2b7e5d95934da951eb2eeeed0360fa070ba6c646871b850cc8d67adb859caad25f412dbc3e3ad949f1bb26e07259b7764e31ab3a904f52ce2f1fb45fe23d270
+  checksum: 10/ca35e6224ea80a33eba3685119885856e5649e341eae2531a1dda499e75f0b19c400efc20647049c6d4dfddf9af532f56070e62890a42a6892fbf8558720e126
   languageName: node
   linkType: hard
 
@@ -2434,6 +2431,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ledgerhq/logs@npm:^6.12.0":
+  version: 6.12.0
+  resolution: "@ledgerhq/logs@npm:6.12.0"
+  checksum: 10/a0a01f5d6edb0c14e7a42d24ab67ce362219517f6a50d0572c917f4f7988a1e2e9363e3d0fb170fe267f054e1e30a111564de44276e01c538b258d902c546421
+  languageName: node
+  linkType: hard
+
 "@noble/curves@npm:^1.2.0":
   version: 1.2.0
   resolution: "@noble/curves@npm:1.2.0"
@@ -2941,8 +2945,8 @@ __metadata:
   resolution: "@saberhq/use-solana@workspace:packages/use-solana"
   dependencies:
     "@ledgerhq/devices": "npm:6.27.1"
-    "@ledgerhq/hw-transport": "npm:6.27.1"
-    "@ledgerhq/hw-transport-webusb": "npm:6.27.1"
+    "@ledgerhq/hw-transport": "npm:6.30.5"
+    "@ledgerhq/hw-transport-webusb": "npm:6.28.5"
     "@saberhq/solana-contrib": "workspace:^"
     "@saberhq/tsconfig": "npm:^3.2.1"
     "@saberhq/wallet-adapter-icons": "workspace:^"
@@ -12252,6 +12256,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^7.8.1":
+  version: 7.8.1
+  resolution: "rxjs@npm:7.8.1"
+  dependencies:
+    tslib: "npm:^2.1.0"
+  checksum: 10/b10cac1a5258f885e9dd1b70d23c34daeb21b61222ee735d2ec40a8685bdca40429000703a44f0e638c27a684ac139e1c37e835d2a0dc16f6fc061a138ae3abb
+  languageName: node
+  linkType: hard
+
 "safe-array-concat@npm:^1.0.1":
   version: 1.0.1
   resolution: "safe-array-concat@npm:1.0.1"
@@ -13242,7 +13255,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
+"tslib@npm:^2.1.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca