Upgrade to Yarn 4 (#705)

* Upgrade to Yarn 4

* update devdeps

* upgrade other things

* resolution

* resolve again

* force cache eviction

* remove setup node

* flake cleanup

* fix types

* fix resolution

* resolution

.github/actions/yarn/action.yml

@@ -18,7 +18,6 @@ runs:
         authToken: ${{ inputs.cachix-auth-token }}
 
     # Install Node
-    - uses: actions/setup-node@v3
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
       run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -27,8 +26,8 @@ runs:
       uses: actions/cache@v3
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+        key: ${{ runner.os }}-mod-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
-          ${{ runner.os }}-modules-
+          ${{ runner.os }}-mod-
     - run: yarn install
       shell: nix shell .#ci --command bash {0}

.vscode/settings.json

@@ -13,5 +13,7 @@
   "eslint.nodePath": ".yarn/sdks",
   "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
   "typescript.enablePromptUseWorkspaceTsdk": true,
-  "cSpell.words": ["saberhq"]
+  "cSpell.words": [
+    "saberhq"
+  ]
 }

.yarn/sdks/eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "8.23.1-sdk",
+  "version": "8.24.0-sdk",
   "main": "./lib/api.js",
   "type": "commonjs"
 }

.yarn/sdks/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.8.3-sdk",
+  "version": "4.8.4-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }

.yarnrc.yml

@@ -1,15 +1,3 @@
-enableGlobalCache: true
-
 nodeLinker: pnp
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
-  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
-    spec: "@yarnpkg/plugin-version"
-
-yarnPath: .yarn/releases/yarn-3.2.3.cjs
+yarnPath: .yarn/releases/yarn-4.0.0-rc.22.cjs

flake.nix

@@ -9,13 +9,15 @@
   outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem
       (system:
-        let pkgs = import nixpkgs { inherit system; };
+        let
+          pkgs = import nixpkgs { inherit system; };
         in
+        with pkgs;
         rec {
-          packages.ci = pkgs.buildEnv {
+          packages.ci = buildEnv {
             name = "ci";
-            paths = with pkgs; [ nodejs yarn nixpkgs-fmt bash ];
+            paths = [ nodejs yarn nixpkgs-fmt bash ];
           };
-          devShell = pkgs.mkShell { buildInputs = [ packages.ci ]; };
+          devShell = mkShell { buildInputs = [ packages.ci ]; };
         });
 }

package.json

@@ -12,47 +12,47 @@
     "*.{md,js,jsx,json,yml,yaml,css,md}": "prettier --write"
   },
   "devDependencies": {
-    "@babel/core": "^7.19.0",
-    "@babel/preset-env": "^7.19.0",
+    "@babel/core": "^7.19.3",
+    "@babel/preset-env": "^7.19.3",
     "@babel/preset-typescript": "^7.18.6",
-    "@jest/types": "^29.0.3",
+    "@jest/types": "^29.1.0",
     "@project-serum/anchor": "^0.25.0",
-    "@rushstack/eslint-patch": "^1.1.4",
-    "@saberhq/eslint-config": "^2.0.5",
-    "@saberhq/eslint-config-react": "^2.0.5",
-    "@saberhq/tsconfig": "^2.0.5",
+    "@rushstack/eslint-patch": "^1.2.0",
+    "@saberhq/eslint-config": "^2.1.0",
+    "@saberhq/eslint-config-react": "^2.1.0",
+    "@saberhq/tsconfig": "^2.1.0",
     "@saberhq/use-solana": "workspace:*",
     "@size-limit/file": "^8.1.0",
     "@size-limit/webpack": "^8.1.0",
     "@size-limit/webpack-why": "^8.1.0",
-    "@solana/web3.js": "^1.61.0",
+    "@solana/web3.js": "^1.63.1",
     "@types/babel__core": "^7.1.19",
     "@types/babel__preset-env": "^7.9.2",
     "@types/bn.js": "^5.1.1",
     "@types/eslint": "^8.4.6",
-    "@types/jest": "^29.0.1",
-    "@types/node": "^18.7.17",
-    "@types/react": "^18.0.19",
+    "@types/jest": "^29.0.3",
+    "@types/node": "^18.7.23",
+    "@types/react": "^18.0.21",
     "@types/source-map-support": "^0.5.6",
     "@types/w3c-web-usb": "^1.0.6",
-    "@typescript-eslint/utils": "^5.37.0",
-    "@yarnpkg/doctor": "^3.1.4",
+    "@typescript-eslint/utils": "^5.38.1",
+    "@yarnpkg/doctor": "^4.0.0-rc.22",
     "bn.js": "^5.2.1",
     "buffer": "^6.0.3",
-    "eslint": "^8.23.1",
+    "eslint": "^8.24.0",
     "husky": "^8.0.1",
-    "jest": "^29.0.3",
-    "jest-runtime": "^29.0.3",
+    "jest": "^29.1.1",
+    "jest-runtime": "^29.1.1",
     "jsbi": "^4.3.0",
     "lint-staged": "^13.0.3",
     "prettier": "^2.7.1",
     "react": "^18.2.0",
     "size-limit": "^8.1.0",
     "source-map-support": "^0.5.21",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.0.2",
     "ts-node": "^10.9.1",
-    "typedoc": "^0.23.14",
-    "typescript": "^4.8.3"
+    "typedoc": "^0.23.15",
+    "typescript": "^4.8.4"
   },
   "scripts": {
     "build": "yarn workspaces foreach --exclude @saberhq/saber-common -ptv run build",
@@ -70,5 +70,5 @@
     "doctor:packages": "yarn doctor packages/"
   },
   "version": "1.14.7",
-  "packageManager": "yarn@3.2.3"
+  "packageManager": "yarn@4.0.0-rc.22"
 }

packages/anchor-contrib/package.json

@@ -28,12 +28,12 @@
   },
   "devDependencies": {
     "@project-serum/anchor": "^0.25.0",
-    "@saberhq/tsconfig": "^2.0.5",
-    "@solana/web3.js": "^1.61.0",
+    "@saberhq/tsconfig": "^2.1.0",
+    "@solana/web3.js": "^1.63.1",
     "@types/lodash.camelcase": "^4.3.7",
     "@types/lodash.mapvalues": "^4.6.7",
     "bn.js": "^5.2.1",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.4"
   },
   "dependencies": {
     "@saberhq/solana-contrib": "workspace:^",

packages/chai-solana/package.json

@@ -49,10 +49,10 @@
   },
   "devDependencies": {
     "@project-serum/anchor": "^0.25.0",
-    "@saberhq/tsconfig": "^2.0.5",
-    "@solana/web3.js": "^1.61.0",
+    "@saberhq/tsconfig": "^2.1.0",
+    "@solana/web3.js": "^1.63.1",
     "bn.js": "^5.2.1",
     "jsbi": "^4.3.0",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.4"
   }
 }

packages/option-utils/package.json

@@ -36,7 +36,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@saberhq/tsconfig": "^2.0.5",
-    "typescript": "^4.8.3"
+    "@saberhq/tsconfig": "^2.1.0",
+    "typescript": "^4.8.4"
   }
 }

packages/solana-contrib/package.json

@@ -32,17 +32,17 @@
     "@types/retry": "^0.12.2",
     "promise-retry": "^2.0.1",
     "retry": "^0.13.1",
-    "tiny-invariant": "^1.2.0",
+    "tiny-invariant": "^1.3.1",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@saberhq/tsconfig": "^2.0.5",
-    "@solana/web3.js": "^1.61.0",
+    "@saberhq/tsconfig": "^2.1.0",
+    "@solana/web3.js": "^1.63.1",
     "@types/bn.js": "^5.1.1",
-    "@types/jest": "^29.0.1",
-    "@types/node": "^18.7.17",
+    "@types/jest": "^29.0.3",
+    "@types/node": "^18.7.23",
     "bn.js": "^5.2.1",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.4"
   },
   "peerDependencies": {
     "@solana/web3.js": "^1.42",

packages/stableswap-sdk/package.json

@@ -27,15 +27,15 @@
     "node": ">=12.x"
   },
   "devDependencies": {
-    "@saberhq/tsconfig": "^2.0.5",
-    "@solana/web3.js": "^1.61.0",
+    "@saberhq/tsconfig": "^2.1.0",
+    "@solana/web3.js": "^1.63.1",
     "@types/bn.js": "^5.1.1",
-    "@types/lodash": "^4.14.185",
-    "@types/node": "^18.7.17",
+    "@types/lodash": "^4.14.186",
+    "@types/node": "^18.7.23",
     "bn.js": "^5.2.1",
     "jsbi": "^4.3.0",
     "lodash": "^4.17.21",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.4"
   },
   "peerDependencies": {
     "@solana/web3.js": "^1.42",
@@ -46,7 +46,7 @@
     "@saberhq/solana-contrib": "workspace:^",
     "@saberhq/token-utils": "workspace:^",
     "@solana/buffer-layout": "^4.0.0",
-    "tiny-invariant": "^1.2.0",
+    "tiny-invariant": "^1.3.1",
     "tslib": "^2.4.0"
   },
   "files": [

packages/token-utils/package.json

@@ -29,20 +29,20 @@
     "@saberhq/solana-contrib": "workspace:^",
     "@solana/buffer-layout": "^4.0.0",
     "@solana/spl-token": "^0.1.8",
-    "@ubeswap/token-math": "^5.2.0",
-    "tiny-invariant": "^1.2.0",
+    "@ubeswap/token-math": "^5.2.1",
+    "tiny-invariant": "^1.3.1",
     "tslib": "^2.4.0"
   },
   "files": [
     "dist/",
     "src/"
   ],
   "devDependencies": {
-    "@saberhq/tsconfig": "^2.0.5",
-    "@solana/web3.js": "^1.61.0",
+    "@saberhq/tsconfig": "^2.1.0",
+    "@solana/web3.js": "^1.63.1",
     "@types/bn.js": "^5.1.1",
     "jsbi": "^4.3.0",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.4"
   },
   "peerDependencies": {
     "@solana/web3.js": "^1.42",

packages/tuple-utils/package.json

@@ -37,7 +37,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@saberhq/tsconfig": "^2.0.5",
-    "typescript": "^4.8.3"
+    "@saberhq/tsconfig": "^2.1.0",
+    "typescript": "^4.8.4"
   }
 }

packages/use-solana/package.json

@@ -19,39 +19,39 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@saberhq/tsconfig": "^2.0.5",
-    "@solana/web3.js": "^1.61.0",
+    "@saberhq/tsconfig": "^2.1.0",
+    "@solana/web3.js": "^1.63.1",
     "@types/bn.js": "^5.1.1",
-    "@types/node": "^18.7.17",
-    "@types/react": "^18.0.19",
+    "@types/node": "^18.7.23",
+    "@types/react": "^18.0.21",
     "bn.js": "^5.2.1",
     "react": "^18.2.0",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.4"
   },
   "dependencies": {
-    "@ledgerhq/hw-transport": "^6.27.3",
-    "@ledgerhq/hw-transport-webusb": "^6.27.3",
-    "@nightlylabs/wallet-solana-adapter": "^0.0.5",
+    "@ledgerhq/hw-transport": "^6.27.5",
+    "@ledgerhq/hw-transport-webusb": "^6.27.5",
+    "@nightlylabs/wallet-solana-adapter": "^0.0.6",
     "@saberhq/solana-contrib": "workspace:^",
     "@saberhq/wallet-adapter-icons": "workspace:^",
-    "@solana/wallet-adapter-base": "^0.9.16",
-    "@solana/wallet-adapter-brave": "0.1.10",
-    "@solana/wallet-adapter-clover": "^0.4.12",
-    "@solana/wallet-adapter-coin98": "^0.5.13",
-    "@solana/wallet-adapter-coinbase": "^0.1.11",
-    "@solana/wallet-adapter-exodus": "^0.1.11",
-    "@solana/wallet-adapter-glow": "^0.1.11",
-    "@solana/wallet-adapter-huobi": "^0.1.8",
-    "@solana/wallet-adapter-mathwallet": "^0.9.11",
-    "@solana/wallet-adapter-phantom": "^0.9.15",
-    "@solana/wallet-adapter-slope": "^0.5.14",
-    "@solana/wallet-adapter-solflare": "^0.6.15",
-    "@solana/wallet-adapter-sollet": "^0.11.10",
-    "@solana/wallet-adapter-solong": "^0.9.11",
-    "@solana/wallet-adapter-walletconnect": "^0.1.5",
+    "@solana/wallet-adapter-base": "^0.9.17",
+    "@solana/wallet-adapter-brave": "0.1.11",
+    "@solana/wallet-adapter-clover": "^0.4.13",
+    "@solana/wallet-adapter-coin98": "^0.5.14",
+    "@solana/wallet-adapter-coinbase": "^0.1.12",
+    "@solana/wallet-adapter-exodus": "^0.1.12",
+    "@solana/wallet-adapter-glow": "^0.1.12",
+    "@solana/wallet-adapter-huobi": "^0.1.9",
+    "@solana/wallet-adapter-mathwallet": "^0.9.12",
+    "@solana/wallet-adapter-phantom": "^0.9.16",
+    "@solana/wallet-adapter-slope": "^0.5.15",
+    "@solana/wallet-adapter-solflare": "^0.6.16",
+    "@solana/wallet-adapter-sollet": "^0.11.11",
+    "@solana/wallet-adapter-solong": "^0.9.12",
+    "@solana/wallet-adapter-walletconnect": "^0.1.6",
     "eventemitter3": "^4.0.7",
     "fast-json-stable-stringify": "^2.1.0",
-    "tiny-invariant": "^1.2.0",
+    "tiny-invariant": "^1.3.1",
     "tslib": "^2.4.0",
     "unstated-next": "^1.1.0"
   },

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

@@ -22,9 +22,17 @@ export class SolanaWalletAdapter implements WalletAdapter {
   constructor(
     readonly adapter: Omit<
       SignerWalletAdapter,
-      "sendTransaction" | keyof EventEmitter
+      | "sendTransaction"
+      | keyof EventEmitter
+      | "signTransaction"
+      | "signAllTransactions"
     > &
-      EventEmitter<WalletAdapterEvents>
+      EventEmitter<WalletAdapterEvents> & {
+        signTransaction: (transaction: Transaction) => Promise<Transaction>;
+        signAllTransactions: (
+          transactions: Transaction[]
+        ) => Promise<Transaction[]>;
+      }
   ) {}
 
   async signAndBroadcastTransaction(

packages/wallet-adapter-icons/package.json

@@ -41,9 +41,9 @@
     "react": "^17.0.2 || ^18"
   },
   "devDependencies": {
-    "@saberhq/tsconfig": "^2.0.5",
-    "@types/react": "^18.0.19",
+    "@saberhq/tsconfig": "^2.1.0",
+    "@types/react": "^18.0.21",
     "react": "^18.2.0",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.4"
   }
 }