Merge branch 'master' into feature/init_with_root

StanChe · Sep 13, 2024 · 7fab6b9 · 7fab6b9
2 parents 6a3c9cb + 992c299
commit 7fab6b9
Show file tree

Hide file tree

Showing 39 changed files with 2,055 additions and 486 deletions.
diff --git a/.github/workflows/pull-request-js.yml b/.github/workflows/pull-request-js.yml
@@ -40,29 +40,32 @@ jobs:
  js-test:
  strategy:
  matrix:
+ node-version: [16.x, 18.x, 20.x]
  package:
  [
  account-compression,
  libraries,
  memo,
  name-service,
- single-pool,
  stake-pool,
  token,
  token-group,
- token-lending,
  token-metadata,
  token-swap,
  ]
+ include:
+ # Restrict single-pool and token-lending to supported Node.js versions.
+ - package: single-pool
+ node-version: 20.5
+ - package: token-lending
+ node-version: 18.5
  runs-on: ubuntu-latest
- env:
- NODE_VERSION: 20.5
  steps:
  - uses: actions/checkout@v4
- - name: Use Node.js ${{ env.NODE_VERSION }}
+ - name: Use Node.js ${{ matrix.node-version }}
  uses: actions/setup-node@v4
  with:
- node-version: ${{ env.NODE_VERSION }}
+ node-version: ${{ matrix.node-version }}
  - uses: pnpm/action-setup@v4
  - uses: actions/cache@v4
  with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/account-compression/sdk/package.json b/account-compression/sdk/package.json
@@ -66,13 +66,13 @@
  "@coral-xyz/anchor": "^0.29.0",
  "@solana/eslint-config-solana": "^3.0.3",
  "@types/bn.js": "^5.1.0",
- "@types/jest": "^29.5.12",
+ "@types/jest": "^29.5.13",
  "@types/node": "^22.5.4",
  "@types/node-fetch": "^2.6.11",
- "@typescript-eslint/eslint-plugin": "^8.5.0",
- "@typescript-eslint/parser": "^8.5.0",
+ "@typescript-eslint/eslint-plugin": "^8.4.0",
+ "@typescript-eslint/parser": "^8.4.0",
  "eslint": "^8.57.0",
- "eslint-config-turbo": "^2.1.1",
+ "eslint-config-turbo": "^2.1.2",
  "eslint-plugin-import": "^2.30.0",
  "eslint-plugin-jest": "^28.8.3",
  "eslint-plugin-mocha": "^10.5.0",

diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml
@@ -16,7 +16,7 @@ spl-token = { version = "6.0", path = "../../token/program", features = [
 ] }
 arrayref = "0.3.8"
 borsh = "1.5.1"
-uint = "0.9"
+uint = "0.10"
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml
@@ -18,7 +18,7 @@ spl-token = { version = "6.0", path = "../../token/program", features = [
  "no-entrypoint",
 ] }
 thiserror = "1.0"
-uint = "0.9"
+uint = "0.10"
 borsh = "1.5.1"
 
 [dev-dependencies]