From 821c55b3b2383d05ffa12d80deeb874c872f4871 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:26:15 +0200 Subject: [PATCH 1/7] build(deps-dev): bump @typescript-eslint/eslint-plugin from 7.16.1 to 7.17.0 (#7044) build(deps-dev): bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 7.16.1 to 7.17.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.17.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- account-compression/sdk/package.json | 2 +- libraries/type-length-value/js/package.json | 2 +- memo/js/package.json | 2 +- name-service/js/package.json | 2 +- pnpm-lock.yaml | 137 ++++++++++++------- single-pool/js/packages/classic/package.json | 2 +- single-pool/js/packages/modern/package.json | 2 +- stake-pool/js/package.json | 2 +- token-group/js/package.json | 2 +- token-lending/js/package.json | 2 +- token-metadata/js/package.json | 2 +- token-swap/js/package.json | 2 +- token/js/package.json | 2 +- 13 files changed, 102 insertions(+), 59 deletions(-) diff --git a/account-compression/sdk/package.json b/account-compression/sdk/package.json index 51cbcf30c75..3cadfa0f7c2 100644 --- a/account-compression/sdk/package.json +++ b/account-compression/sdk/package.json @@ -73,7 +73,7 @@ "@types/jest": "^29.5.12", "@types/node": "^20.14.11", "@types/node-fetch": "^2.6.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/libraries/type-length-value/js/package.json b/libraries/type-length-value/js/package.json index 52aae952199..451038eed28 100644 --- a/libraries/type-length-value/js/package.json +++ b/libraries/type-length-value/js/package.json @@ -50,7 +50,7 @@ "@types/chai": "^4.3.16", "@types/mocha": "^10.0.7", "@types/node": "^20.14.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "chai": "^5.1.1", "eslint": "^8.57.0", diff --git a/memo/js/package.json b/memo/js/package.json index 0b98504b99a..b714351b666 100644 --- a/memo/js/package.json +++ b/memo/js/package.json @@ -57,7 +57,7 @@ "@types/jest": "^29.5.12", "@types/node": "^20.14.11", "@types/node-fetch": "^2.6.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "chai": "^5.1.1", "eslint": "^8.57.0", diff --git a/name-service/js/package.json b/name-service/js/package.json index fda6ac57a37..a0fc8b4d0b3 100644 --- a/name-service/js/package.json +++ b/name-service/js/package.json @@ -51,7 +51,7 @@ "@types/bn.js": "^5.1.1", "@types/jest": "^29.5.12", "@types/node": "^20.14.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7e3fc9cb016..91f6bc9a7b3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,7 +53,7 @@ importers: version: 0.26.0 '@solana/eslint-config-solana': specifier: ^3.0.3 - version: 3.0.3(@typescript-eslint/eslint-plugin@7.16.1)(@typescript-eslint/parser@7.16.1)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3) + version: 3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.16.1)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3) '@solana/prettier-config-solana': specifier: ^0.0.5 version: 0.0.5(prettier@3.3.3) @@ -70,8 +70,8 @@ importers: specifier: ^2.6.11 version: 2.6.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -89,7 +89,7 @@ importers: version: 2.29.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0) eslint-plugin-jest: specifier: ^28.6.0 - version: 28.6.0(@typescript-eslint/eslint-plugin@7.16.1)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3) + version: 28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3) eslint-plugin-mocha: specifier: ^10.4.3 version: 10.4.3(eslint@8.57.0) @@ -149,8 +149,8 @@ importers: specifier: ^20.14.11 version: 20.14.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -213,8 +213,8 @@ importers: specifier: ^2.6.11 version: 2.6.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -289,8 +289,8 @@ importers: specifier: ^20.14.11 version: 20.14.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -350,8 +350,8 @@ importers: specifier: ^20.14.11 version: 20.14.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) ava: specifier: ^6.1.3 version: 6.1.3(@ava/typescript@5.0.0) @@ -384,8 +384,8 @@ importers: specifier: ^20.14.11 version: 20.14.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -457,8 +457,8 @@ importers: specifier: ^2.6.11 version: 2.6.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -518,8 +518,8 @@ importers: specifier: ^20.14.11 version: 20.14.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -603,8 +603,8 @@ importers: specifier: ^20.14.11 version: 20.14.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -661,8 +661,8 @@ importers: specifier: ^20.14.11 version: 20.14.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -734,8 +734,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -813,8 +813,8 @@ importers: specifier: ^2.6.11 version: 2.6.11 '@typescript-eslint/eslint-plugin': - specifier: ^7.16.1 - version: 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': specifier: ^7.16.1 version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) @@ -2486,7 +2486,7 @@ packages: typescript: 5.5.3 dev: true - /@solana/eslint-config-solana@3.0.3(@typescript-eslint/eslint-plugin@7.16.1)(@typescript-eslint/parser@7.16.1)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3): + /@solana/eslint-config-solana@3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.16.1)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3): resolution: {integrity: sha512-yTaeCbOBwjmK4oUkknixOpwOzzAK8+4YWvJEJFNHuueESetieDnAeEHV7rzJllFgHEWa9nXps9Q3aD4/XJp71A==} peerDependencies: '@typescript-eslint/eslint-plugin': ^6.0.0 @@ -2499,10 +2499,10 @@ packages: eslint-plugin-typescript-sort-keys: ^3.2.0 typescript: ^5.1.6 dependencies: - '@typescript-eslint/eslint-plugin': 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.5.3) eslint: 8.57.0 - eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.16.1)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3) + eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3) eslint-plugin-react-hooks: 4.6.0(eslint@8.57.0) eslint-plugin-simple-import-sort: 12.1.1(eslint@8.57.0) eslint-plugin-sort-keys-fix: 1.1.2 @@ -2873,8 +2873,8 @@ packages: - supports-color dev: true - /@typescript-eslint/eslint-plugin@7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3): - resolution: {integrity: sha512-SxdPak/5bO0EnGktV05+Hq8oatjAYVY3Zh2bye9pGZy6+jwyR3LG3YKkV4YatlsgqXP28BTeVm9pqwJM96vf2A==} + /@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3): + resolution: {integrity: sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: '@typescript-eslint/parser': ^7.0.0 @@ -2886,10 +2886,10 @@ packages: dependencies: '@eslint-community/regexpp': 4.10.0 '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/scope-manager': 7.16.1 - '@typescript-eslint/type-utils': 7.16.1(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/utils': 7.16.1(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/visitor-keys': 7.16.1 + '@typescript-eslint/scope-manager': 7.17.0 + '@typescript-eslint/type-utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/visitor-keys': 7.17.0 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 @@ -2995,6 +2995,14 @@ packages: '@typescript-eslint/visitor-keys': 7.16.1 dev: true + /@typescript-eslint/scope-manager@7.17.0: + resolution: {integrity: sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==} + engines: {node: ^18.18.0 || >=20.0.0} + dependencies: + '@typescript-eslint/types': 7.17.0 + '@typescript-eslint/visitor-keys': 7.17.0 + dev: true + /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.5.3): resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} engines: {node: ^16.0.0 || >=18.0.0} @@ -3015,8 +3023,8 @@ packages: - supports-color dev: true - /@typescript-eslint/type-utils@7.16.1(eslint@8.57.0)(typescript@5.5.3): - resolution: {integrity: sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==} + /@typescript-eslint/type-utils@7.17.0(eslint@8.57.0)(typescript@5.5.3): + resolution: {integrity: sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -3025,8 +3033,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 7.16.1(typescript@5.5.3) - '@typescript-eslint/utils': 7.16.1(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.3) + '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) debug: 4.3.5(supports-color@8.1.1) eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.5.3) @@ -3060,6 +3068,11 @@ packages: engines: {node: ^18.18.0 || >=20.0.0} dev: true + /@typescript-eslint/types@7.17.0: + resolution: {integrity: sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==} + engines: {node: ^18.18.0 || >=20.0.0} + dev: true + /@typescript-eslint/typescript-estree@5.62.0(typescript@5.5.3): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -3169,6 +3182,28 @@ packages: - supports-color dev: true + /@typescript-eslint/typescript-estree@7.17.0(typescript@5.5.3): + resolution: {integrity: sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 7.17.0 + '@typescript-eslint/visitor-keys': 7.17.0 + debug: 4.3.5(supports-color@8.1.1) + globby: 11.1.0 + is-glob: 4.0.3 + minimatch: 9.0.5 + semver: 7.6.0 + ts-api-utils: 1.3.0(typescript@5.5.3) + typescript: 5.5.3 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.5.3): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -3240,16 +3275,16 @@ packages: - typescript dev: true - /@typescript-eslint/utils@7.16.1(eslint@8.57.0)(typescript@5.5.3): - resolution: {integrity: sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==} + /@typescript-eslint/utils@7.17.0(eslint@8.57.0)(typescript@5.5.3): + resolution: {integrity: sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@typescript-eslint/scope-manager': 7.16.1 - '@typescript-eslint/types': 7.16.1 - '@typescript-eslint/typescript-estree': 7.16.1(typescript@5.5.3) + '@typescript-eslint/scope-manager': 7.17.0 + '@typescript-eslint/types': 7.17.0 + '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.3) eslint: 8.57.0 transitivePeerDependencies: - supports-color @@ -3296,6 +3331,14 @@ packages: eslint-visitor-keys: 3.4.3 dev: true + /@typescript-eslint/visitor-keys@7.17.0: + resolution: {integrity: sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==} + engines: {node: ^18.18.0 || >=20.0.0} + dependencies: + '@typescript-eslint/types': 7.17.0 + eslint-visitor-keys: 3.4.3 + dev: true + /@ungap/structured-clone@1.2.0: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true @@ -4724,7 +4767,7 @@ packages: - typescript dev: true - /eslint-plugin-jest@28.6.0(@typescript-eslint/eslint-plugin@7.16.1)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3): + /eslint-plugin-jest@28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3): resolution: {integrity: sha512-YG28E1/MIKwnz+e2H7VwYPzHUYU4aMa19w0yGcwXnnmJH6EfgHahTJ2un3IyraUxNfnz/KUhJAFXNNwWPo12tg==} engines: {node: ^16.10.0 || ^18.12.0 || >=20.0.0} peerDependencies: @@ -4737,7 +4780,7 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 7.16.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/utils': 7.12.0(eslint@8.57.0)(typescript@5.5.3) eslint: 8.57.0 jest: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) @@ -5791,7 +5834,7 @@ packages: eslint: '*' typescript: '>=4.7.4' dependencies: - '@typescript-eslint/type-utils': 7.16.1(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/type-utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.5.3) ts-declaration-location: 1.0.0(typescript@5.5.3) diff --git a/single-pool/js/packages/classic/package.json b/single-pool/js/packages/classic/package.json index c0d98a7aabe..04b7d12e356 100644 --- a/single-pool/js/packages/classic/package.json +++ b/single-pool/js/packages/classic/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@types/node": "^20.14.11", "@ava/typescript": "^5.0.0", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "ava": "^6.1.3", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/single-pool/js/packages/modern/package.json b/single-pool/js/packages/modern/package.json index 6342183df8b..9e1dd1a9f78 100644 --- a/single-pool/js/packages/modern/package.json +++ b/single-pool/js/packages/modern/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@types/node": "^20.14.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", diff --git a/stake-pool/js/package.json b/stake-pool/js/package.json index aafc6b8c614..51c48aee6ce 100644 --- a/stake-pool/js/package.json +++ b/stake-pool/js/package.json @@ -63,7 +63,7 @@ "@types/jest": "^29.5.12", "@types/node": "^20.14.11", "@types/node-fetch": "^2.6.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "cross-env": "^7.0.3", "eslint": "^8.57.0", diff --git a/token-group/js/package.json b/token-group/js/package.json index e84e7219ca1..1feb32ec789 100644 --- a/token-group/js/package.json +++ b/token-group/js/package.json @@ -55,7 +55,7 @@ "@types/chai": "^4.3.16", "@types/mocha": "^10.0.7", "@types/node": "^20.14.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "chai": "^5.1.1", "eslint": "^8.57.0", diff --git a/token-lending/js/package.json b/token-lending/js/package.json index 473e3b4ac73..34a5b890524 100644 --- a/token-lending/js/package.json +++ b/token-lending/js/package.json @@ -49,7 +49,7 @@ "@types/eslint": "^8.56.7", "@types/eslint-plugin-prettier": "^3.1.0", "@types/node": "^20.14.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/token-metadata/js/package.json b/token-metadata/js/package.json index a3f130e130c..9e7dc917910 100644 --- a/token-metadata/js/package.json +++ b/token-metadata/js/package.json @@ -55,7 +55,7 @@ "@types/chai": "^4.3.16", "@types/mocha": "^10.0.7", "@types/node": "^20.14.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "chai": "^5.1.1", "eslint": "^8.57.0", diff --git a/token-swap/js/package.json b/token-swap/js/package.json index bc148523dc5..aacd6f5c760 100644 --- a/token-swap/js/package.json +++ b/token-swap/js/package.json @@ -57,7 +57,7 @@ "@types/chai-as-promised": "^7.1.4", "@types/chai": "^4.3.16", "@types/mocha": "^10.0.7", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "eslint": "^8.57.0", "eslint-plugin-import": "^2.29.1", diff --git a/token/js/package.json b/token/js/package.json index c8d5380018c..ed256ba7860 100644 --- a/token/js/package.json +++ b/token/js/package.json @@ -69,7 +69,7 @@ "@types/mocha": "^10.0.7", "@types/node": "^20.14.11", "@types/node-fetch": "^2.6.11", - "@typescript-eslint/eslint-plugin": "^7.16.1", + "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.16.1", "chai": "^5.1.1", "chai-as-promised": "^8.0.0", From 9ade1bb287c2e24e21dad2c42d5c0a2bce6903f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:39:04 +0200 Subject: [PATCH 2/7] build(deps-dev): bump @typescript-eslint/parser from 7.16.1 to 7.17.0 (#7046) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 7.16.1 to 7.17.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.17.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- account-compression/sdk/package.json | 2 +- libraries/type-length-value/js/package.json | 2 +- memo/js/package.json | 2 +- name-service/js/package.json | 2 +- pnpm-lock.yaml | 155 +++++++------------- stake-pool/js/package.json | 2 +- token-group/js/package.json | 2 +- token-lending/js/package.json | 2 +- token-metadata/js/package.json | 2 +- token-swap/js/package.json | 2 +- token/js/package.json | 2 +- 11 files changed, 66 insertions(+), 109 deletions(-) diff --git a/account-compression/sdk/package.json b/account-compression/sdk/package.json index 3cadfa0f7c2..41e3347e238 100644 --- a/account-compression/sdk/package.json +++ b/account-compression/sdk/package.json @@ -74,7 +74,7 @@ "@types/node": "^20.14.11", "@types/node-fetch": "^2.6.11", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-config-turbo": "^2.0.9", diff --git a/libraries/type-length-value/js/package.json b/libraries/type-length-value/js/package.json index 451038eed28..8d6d2496e5d 100644 --- a/libraries/type-length-value/js/package.json +++ b/libraries/type-length-value/js/package.json @@ -51,7 +51,7 @@ "@types/mocha": "^10.0.7", "@types/node": "^20.14.11", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "chai": "^5.1.1", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/memo/js/package.json b/memo/js/package.json index b714351b666..0174b6294f5 100644 --- a/memo/js/package.json +++ b/memo/js/package.json @@ -58,7 +58,7 @@ "@types/node": "^20.14.11", "@types/node-fetch": "^2.6.11", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "chai": "^5.1.1", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/name-service/js/package.json b/name-service/js/package.json index a0fc8b4d0b3..0dfe4bea956 100644 --- a/name-service/js/package.json +++ b/name-service/js/package.json @@ -52,7 +52,7 @@ "@types/jest": "^29.5.12", "@types/node": "^20.14.11", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-eslint-comments": "^3.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 91f6bc9a7b3..e50336d6192 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,7 +53,7 @@ importers: version: 0.26.0 '@solana/eslint-config-solana': specifier: ^3.0.3 - version: 3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.16.1)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3) + version: 3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.17.0)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3) '@solana/prettier-config-solana': specifier: ^0.0.5 version: 0.0.5(prettier@3.3.3) @@ -71,10 +71,10 @@ importers: version: 2.6.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -86,7 +86,7 @@ importers: version: 2.0.9(eslint@8.57.0) eslint-plugin-import: specifier: ^2.29.1 - version: 2.29.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0) + version: 2.29.1(@typescript-eslint/parser@7.17.0)(eslint@8.57.0) eslint-plugin-jest: specifier: ^28.6.0 version: 28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3) @@ -150,10 +150,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) chai: specifier: ^5.1.1 version: 5.1.1 @@ -214,10 +214,10 @@ importers: version: 2.6.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) chai: specifier: ^5.1.1 version: 5.1.1 @@ -290,10 +290,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -308,7 +308,7 @@ importers: version: 6.6.3(eslint@8.57.0)(typescript@5.5.3) eslint-plugin-import: specifier: ^2.29.1 - version: 2.29.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0) + version: 2.29.1(@typescript-eslint/parser@7.17.0)(eslint@8.57.0) jest: specifier: ^29.7.0 version: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) @@ -351,7 +351,7 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) ava: specifier: ^6.1.3 version: 6.1.3(@ava/typescript@5.0.0) @@ -385,7 +385,7 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -458,10 +458,10 @@ importers: version: 2.6.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) cross-env: specifier: ^7.0.3 version: 7.0.3 @@ -519,10 +519,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) chai: specifier: ^5.1.1 version: 5.1.1 @@ -604,10 +604,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -662,10 +662,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) chai: specifier: ^5.1.1 version: 5.1.1 @@ -735,10 +735,10 @@ importers: version: 10.0.7 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -747,7 +747,7 @@ importers: version: 9.1.0(eslint@8.57.0) eslint-plugin-import: specifier: ^2.29.1 - version: 2.29.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0) + version: 2.29.1(@typescript-eslint/parser@7.17.0)(eslint@8.57.0) eslint-plugin-prettier: specifier: ^5.2.1 version: 5.2.1(@types/eslint@8.56.7)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.3.3) @@ -814,10 +814,10 @@ importers: version: 2.6.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/parser': - specifier: ^7.16.1 - version: 7.16.1(eslint@8.57.0)(typescript@5.5.3) + specifier: ^7.17.0 + version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) chai: specifier: ^5.1.1 version: 5.1.1 @@ -2486,7 +2486,7 @@ packages: typescript: 5.5.3 dev: true - /@solana/eslint-config-solana@3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.16.1)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3): + /@solana/eslint-config-solana@3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.17.0)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3): resolution: {integrity: sha512-yTaeCbOBwjmK4oUkknixOpwOzzAK8+4YWvJEJFNHuueESetieDnAeEHV7rzJllFgHEWa9nXps9Q3aD4/XJp71A==} peerDependencies: '@typescript-eslint/eslint-plugin': ^6.0.0 @@ -2499,14 +2499,14 @@ packages: eslint-plugin-typescript-sort-keys: ^3.2.0 typescript: ^5.1.6 dependencies: - '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) eslint: 8.57.0 eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3) eslint-plugin-react-hooks: 4.6.0(eslint@8.57.0) eslint-plugin-simple-import-sort: 12.1.1(eslint@8.57.0) eslint-plugin-sort-keys-fix: 1.1.2 - eslint-plugin-typescript-sort-keys: 3.2.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + eslint-plugin-typescript-sort-keys: 3.2.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) typescript: 5.5.3 dev: true @@ -2873,7 +2873,7 @@ packages: - supports-color dev: true - /@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3): resolution: {integrity: sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -2885,7 +2885,7 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/scope-manager': 7.17.0 '@typescript-eslint/type-utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) @@ -2934,8 +2934,8 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@7.16.1(eslint@8.57.0)(typescript@5.5.3): - resolution: {integrity: sha512-u+1Qx86jfGQ5i4JjK33/FnawZRpsLxRnKzGE6EABZ40KxVT/vWsiZFEBBHjFOljmmV3MBYOHEKi0Jm9hbAOClA==} + /@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.3): + resolution: {integrity: sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -2944,10 +2944,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 7.16.1 - '@typescript-eslint/types': 7.16.1 - '@typescript-eslint/typescript-estree': 7.16.1(typescript@5.5.3) - '@typescript-eslint/visitor-keys': 7.16.1 + '@typescript-eslint/scope-manager': 7.17.0 + '@typescript-eslint/types': 7.17.0 + '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.3) + '@typescript-eslint/visitor-keys': 7.17.0 debug: 4.3.5(supports-color@8.1.1) eslint: 8.57.0 typescript: 5.5.3 @@ -2987,14 +2987,6 @@ packages: '@typescript-eslint/visitor-keys': 7.16.0 dev: true - /@typescript-eslint/scope-manager@7.16.1: - resolution: {integrity: sha512-nYpyv6ALte18gbMz323RM+vpFpTjfNdyakbf3nsLvF43uF9KeNC289SUEW3QLZ1xPtyINJ1dIsZOuWuSRIWygw==} - engines: {node: ^18.18.0 || >=20.0.0} - dependencies: - '@typescript-eslint/types': 7.16.1 - '@typescript-eslint/visitor-keys': 7.16.1 - dev: true - /@typescript-eslint/scope-manager@7.17.0: resolution: {integrity: sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==} engines: {node: ^18.18.0 || >=20.0.0} @@ -3063,11 +3055,6 @@ packages: engines: {node: ^18.18.0 || >=20.0.0} dev: true - /@typescript-eslint/types@7.16.1: - resolution: {integrity: sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==} - engines: {node: ^18.18.0 || >=20.0.0} - dev: true - /@typescript-eslint/types@7.17.0: resolution: {integrity: sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==} engines: {node: ^18.18.0 || >=20.0.0} @@ -3160,28 +3147,6 @@ packages: - supports-color dev: true - /@typescript-eslint/typescript-estree@7.16.1(typescript@5.5.3): - resolution: {integrity: sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==} - engines: {node: ^18.18.0 || >=20.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/types': 7.16.1 - '@typescript-eslint/visitor-keys': 7.16.1 - debug: 4.3.5(supports-color@8.1.1) - globby: 11.1.0 - is-glob: 4.0.3 - minimatch: 9.0.5 - semver: 7.6.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 - transitivePeerDependencies: - - supports-color - dev: true - /@typescript-eslint/typescript-estree@7.17.0(typescript@5.5.3): resolution: {integrity: sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==} engines: {node: ^18.18.0 || >=20.0.0} @@ -3323,14 +3288,6 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@typescript-eslint/visitor-keys@7.16.1: - resolution: {integrity: sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==} - engines: {node: ^18.18.0 || >=20.0.0} - dependencies: - '@typescript-eslint/types': 7.16.1 - eslint-visitor-keys: 3.4.3 - dev: true - /@typescript-eslint/visitor-keys@7.17.0: resolution: {integrity: sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==} engines: {node: ^18.18.0 || >=20.0.0} @@ -4649,7 +4606,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@7.16.1)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@7.17.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -4670,7 +4627,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) debug: 3.2.7 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 @@ -4711,7 +4668,7 @@ packages: - supports-color dev: true - /eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1)(eslint@8.57.0): + /eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0)(eslint@8.57.0): resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} engines: {node: '>=4'} peerDependencies: @@ -4721,7 +4678,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -4730,7 +4687,7 @@ packages: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.16.1)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.17.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) hasown: 2.0.0 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -4780,7 +4737,7 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) '@typescript-eslint/utils': 7.12.0(eslint@8.57.0)(typescript@5.5.3) eslint: 8.57.0 jest: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) @@ -4894,7 +4851,7 @@ packages: - supports-color dev: true - /eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@7.16.1)(eslint@8.57.0)(typescript@5.5.3): + /eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3): resolution: {integrity: sha512-GutszvriaVtwmn7pQjuj9/9o0iXhD7XZs0/424+zsozdRr/fdg5e8206t478Vnqnqi1GjuxcAolj1kf74KnhPA==} engines: {node: '>= 16'} peerDependencies: @@ -4903,7 +4860,7 @@ packages: typescript: ^3 || ^4 || ^5 dependencies: '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/parser': 7.16.1(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) eslint: 8.57.0 json-schema: 0.4.0 natural-compare-lite: 1.4.0 diff --git a/stake-pool/js/package.json b/stake-pool/js/package.json index 51c48aee6ce..c58bf31f6ac 100644 --- a/stake-pool/js/package.json +++ b/stake-pool/js/package.json @@ -64,7 +64,7 @@ "@types/node": "^20.14.11", "@types/node-fetch": "^2.6.11", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "cross-env": "^7.0.3", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/token-group/js/package.json b/token-group/js/package.json index 1feb32ec789..542e59a9aca 100644 --- a/token-group/js/package.json +++ b/token-group/js/package.json @@ -56,7 +56,7 @@ "@types/mocha": "^10.0.7", "@types/node": "^20.14.11", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "chai": "^5.1.1", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/token-lending/js/package.json b/token-lending/js/package.json index 34a5b890524..e0677a354b2 100644 --- a/token-lending/js/package.json +++ b/token-lending/js/package.json @@ -50,7 +50,7 @@ "@types/eslint-plugin-prettier": "^3.1.0", "@types/node": "^20.14.11", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", diff --git a/token-metadata/js/package.json b/token-metadata/js/package.json index 9e7dc917910..4cf7783ed15 100644 --- a/token-metadata/js/package.json +++ b/token-metadata/js/package.json @@ -56,7 +56,7 @@ "@types/mocha": "^10.0.7", "@types/node": "^20.14.11", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "chai": "^5.1.1", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/token-swap/js/package.json b/token-swap/js/package.json index aacd6f5c760..69fea82feb5 100644 --- a/token-swap/js/package.json +++ b/token-swap/js/package.json @@ -58,7 +58,7 @@ "@types/chai": "^4.3.16", "@types/mocha": "^10.0.7", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "eslint": "^8.57.0", "eslint-plugin-import": "^2.29.1", "eslint-config-prettier": "^9.1.0", diff --git a/token/js/package.json b/token/js/package.json index ed256ba7860..fd487eb30ff 100644 --- a/token/js/package.json +++ b/token/js/package.json @@ -70,7 +70,7 @@ "@types/node": "^20.14.11", "@types/node-fetch": "^2.6.11", "@typescript-eslint/eslint-plugin": "^7.17.0", - "@typescript-eslint/parser": "^7.16.1", + "@typescript-eslint/parser": "^7.17.0", "chai": "^5.1.1", "chai-as-promised": "^8.0.0", "eslint": "^8.57.0", From e2d570e50340e2ab353522975f31e0a1b9964a5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:00:57 +0200 Subject: [PATCH 3/7] build(deps-dev): bump typescript from 5.5.3 to 5.5.4 (#7045) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.5.3 to 5.5.4. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.3...v5.5.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- account-compression/sdk/package.json | 2 +- libraries/type-length-value/js/package.json | 2 +- memo/js/package.json | 2 +- name-service/js/package.json | 2 +- pnpm-lock.yaml | 444 +++++++++---------- single-pool/js/packages/classic/package.json | 2 +- single-pool/js/packages/modern/package.json | 2 +- stake-pool/js/package.json | 2 +- token-group/js/package.json | 2 +- token-lending/js/package.json | 2 +- token-metadata/js/package.json | 2 +- token-swap/js/package.json | 2 +- token/js/package.json | 2 +- 13 files changed, 234 insertions(+), 234 deletions(-) diff --git a/account-compression/sdk/package.json b/account-compression/sdk/package.json index 41e3347e238..e543d68e790 100644 --- a/account-compression/sdk/package.json +++ b/account-compression/sdk/package.json @@ -93,7 +93,7 @@ "ts-jest-resolver": "^2.0.1", "ts-node": "^10.9.2", "typedoc": "^0.26.5", - "typescript": "5.5.3" + "typescript": "5.5.4" }, "prettier": "@solana/prettier-config-solana" } diff --git a/libraries/type-length-value/js/package.json b/libraries/type-length-value/js/package.json index 8d6d2496e5d..13e2de3390e 100644 --- a/libraries/type-length-value/js/package.json +++ b/libraries/type-length-value/js/package.json @@ -63,6 +63,6 @@ "shx": "^0.3.4", "ts-node": "^10.9.2", "typedoc": "^0.26.5", - "typescript": "^5.5.3" + "typescript": "^5.5.4" } } diff --git a/memo/js/package.json b/memo/js/package.json index 0174b6294f5..d938db01b9b 100644 --- a/memo/js/package.json +++ b/memo/js/package.json @@ -73,6 +73,6 @@ "ts-jest": "^29.2.3", "ts-node": "^10.9.2", "typedoc": "^0.26.5", - "typescript": "^5.5.3" + "typescript": "^5.5.4" } } diff --git a/name-service/js/package.json b/name-service/js/package.json index 0dfe4bea956..d22acd828d0 100644 --- a/name-service/js/package.json +++ b/name-service/js/package.json @@ -64,7 +64,7 @@ "ts-jest": "^29.2.3", "ts-node": "^10.9.2", "typedoc": "^0.26.5", - "typescript": "^5.5.3" + "typescript": "^5.5.4" }, "dependencies": { "@solana/web3.js": "^1.95.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e50336d6192..b930de18c10 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: devDependencies: '@solana/eslint-config-solana': specifier: ^3.0.3 - version: 3.0.3(@typescript-eslint/eslint-plugin@6.21.0)(@typescript-eslint/parser@6.21.0)(eslint-plugin-jest@27.9.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@10.0.0)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3) + version: 3.0.3(@typescript-eslint/eslint-plugin@6.21.0)(@typescript-eslint/parser@6.21.0)(eslint-plugin-jest@27.9.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@10.0.0)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.4) '@solana/prettier-config-solana': specifier: ^0.0.5 version: 0.0.5(prettier@3.3.3) @@ -53,7 +53,7 @@ importers: version: 0.26.0 '@solana/eslint-config-solana': specifier: ^3.0.3 - version: 3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.17.0)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3) + version: 3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.17.0)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.4) '@solana/prettier-config-solana': specifier: ^0.0.5 version: 0.0.5(prettier@3.3.3) @@ -71,10 +71,10 @@ importers: version: 2.6.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -89,7 +89,7 @@ importers: version: 2.29.1(@typescript-eslint/parser@7.17.0)(eslint@8.57.0) eslint-plugin-jest: specifier: ^28.6.0 - version: 28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3) + version: 28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.4) eslint-plugin-mocha: specifier: ^10.4.3 version: 10.4.3(eslint@8.57.0) @@ -119,19 +119,19 @@ importers: version: 2.0.4 ts-jest: specifier: ^29.2.3 - version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.3) + version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.4) ts-jest-resolver: specifier: ^2.0.1 version: 2.0.1 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) typedoc: specifier: ^0.26.5 - version: 0.26.5(typescript@5.5.3) + version: 0.26.5(typescript@5.5.4) typescript: - specifier: 5.5.3 - version: 5.5.3 + specifier: 5.5.4 + version: 5.5.4 libraries/type-length-value/js: dependencies: @@ -150,10 +150,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) chai: specifier: ^5.1.1 version: 5.1.1 @@ -183,13 +183,13 @@ importers: version: 0.3.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) typedoc: specifier: ^0.26.5 - version: 0.26.5(typescript@5.5.3) + version: 0.26.5(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 memo/js: dependencies: @@ -214,10 +214,10 @@ importers: version: 2.6.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) chai: specifier: ^5.1.1 version: 5.1.1 @@ -253,16 +253,16 @@ importers: version: 2.0.4 ts-jest: specifier: ^29.2.3 - version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.3) + version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.4) ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) typedoc: specifier: ^0.26.5 - version: 0.26.5(typescript@5.5.3) + version: 0.26.5(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 name-service/js: dependencies: @@ -290,10 +290,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -305,7 +305,7 @@ importers: version: 3.2.0(eslint@8.57.0) eslint-plugin-functional: specifier: ^6.6.3 - version: 6.6.3(eslint@8.57.0)(typescript@5.5.3) + version: 6.6.3(eslint@8.57.0)(typescript@5.5.4) eslint-plugin-import: specifier: ^2.29.1 version: 2.29.1(@typescript-eslint/parser@7.17.0)(eslint@8.57.0) @@ -320,16 +320,16 @@ importers: version: 2.0.4 ts-jest: specifier: ^29.2.3 - version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.3) + version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.4) ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) typedoc: specifier: ^0.26.5 - version: 0.26.5(typescript@5.5.3) + version: 0.26.5(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 single-pool/js/packages/classic: dependencies: @@ -351,7 +351,7 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) ava: specifier: ^6.1.3 version: 6.1.3(@ava/typescript@5.0.0) @@ -371,8 +371,8 @@ importers: specifier: ^4.16.2 version: 4.16.2 typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 single-pool/js/packages/modern: dependencies: @@ -385,7 +385,7 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -396,8 +396,8 @@ importers: specifier: ^5.2.1 version: 5.2.1(@types/eslint@8.56.7)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.3.3) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 stake-pool/js: dependencies: @@ -443,7 +443,7 @@ importers: version: 0.4.4(rollup@4.19.0) '@rollup/plugin-typescript': specifier: ^11.1.6 - version: 11.1.6(rollup@4.19.0)(tslib@2.6.3)(typescript@5.5.3) + version: 11.1.6(rollup@4.19.0)(tslib@2.6.3)(typescript@5.5.4) '@types/bn.js': specifier: ^5.1.0 version: 5.1.5 @@ -458,10 +458,10 @@ importers: version: 2.6.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) cross-env: specifier: ^7.0.3 version: 7.0.3 @@ -488,19 +488,19 @@ importers: version: 4.19.0 rollup-plugin-dts: specifier: ^6.1.1 - version: 6.1.1(rollup@4.19.0)(typescript@5.5.3) + version: 6.1.1(rollup@4.19.0)(typescript@5.5.4) ts-jest: specifier: ^29.2.3 - version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.3) + version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 token-group/js: dependencies: '@solana/codecs': specifier: 2.0.0-preview.4 - version: 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3) + version: 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) '@solana/spl-type-length-value': specifier: 0.1.0 version: link:../../libraries/type-length-value/js @@ -519,10 +519,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) chai: specifier: ^5.1.1 version: 5.1.1 @@ -552,16 +552,16 @@ importers: version: 0.3.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) tslib: specifier: ^2.6.3 version: 2.6.3 typedoc: specifier: ^0.26.5 - version: 0.26.5(typescript@5.5.3) + version: 0.26.5(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 token-lending/js: dependencies: @@ -586,7 +586,7 @@ importers: version: 15.2.3(rollup@4.19.0) '@rollup/plugin-typescript': specifier: ^11.1.6 - version: 11.1.6(rollup@4.19.0)(tslib@2.6.3)(typescript@5.5.3) + version: 11.1.6(rollup@4.19.0)(tslib@2.6.3)(typescript@5.5.4) '@solana/spl-token': specifier: 0.4.6 version: 0.4.6(@solana/web3.js@1.95.1)(fastestsmallesttextencoderdecoder@1.0.22) @@ -604,10 +604,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -628,22 +628,22 @@ importers: version: 4.19.0 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) tslib: specifier: ^2.6.3 version: 2.6.3 typedoc: specifier: ^0.26.5 - version: 0.26.5(typescript@5.5.3) + version: 0.26.5(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 token-metadata/js: dependencies: '@solana/codecs': specifier: 2.0.0-preview.4 - version: 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3) + version: 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) '@solana/spl-type-length-value': specifier: 0.1.0 version: link:../../libraries/type-length-value/js @@ -662,10 +662,10 @@ importers: version: 20.14.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) chai: specifier: ^5.1.1 version: 5.1.1 @@ -695,16 +695,16 @@ importers: version: 0.3.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) tslib: specifier: ^2.6.3 version: 2.6.3 typedoc: specifier: ^0.26.5 - version: 0.26.5(typescript@5.5.3) + version: 0.26.5(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 token-swap/js: dependencies: @@ -735,10 +735,10 @@ importers: version: 10.0.7 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -765,10 +765,10 @@ importers: version: 2.0.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 token/js: dependencies: @@ -790,7 +790,7 @@ importers: devDependencies: '@solana/codecs-strings': specifier: 2.0.0-preview.4 - version: 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3) + version: 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) '@solana/spl-memo': specifier: 0.2.4 version: link:../../memo/js @@ -814,10 +814,10 @@ importers: version: 2.6.11 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 - version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': specifier: ^7.17.0 - version: 7.17.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.17.0(eslint@8.57.0)(typescript@5.5.4) chai: specifier: ^5.1.1 version: 5.1.1 @@ -856,13 +856,13 @@ importers: version: 2.0.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) typedoc: specifier: ^0.26.5 - version: 0.26.5(typescript@5.5.3) + version: 0.26.5(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 packages: @@ -2084,7 +2084,7 @@ packages: terser: 5.24.0 dev: true - /@rollup/plugin-typescript@11.1.6(rollup@4.19.0)(tslib@2.6.3)(typescript@5.5.3): + /@rollup/plugin-typescript@11.1.6(rollup@4.19.0)(tslib@2.6.3)(typescript@5.5.4): resolution: {integrity: sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2101,7 +2101,7 @@ packages: resolve: 1.22.8 rollup: 4.19.0 tslib: 2.6.3 - typescript: 5.5.3 + typescript: 5.5.4 dev: true /@rollup/plugin-virtual@3.0.2(rollup@4.19.0): @@ -2356,13 +2356,13 @@ packages: dependencies: '@solana/errors': 2.0.0-preview.2 - /@solana/codecs-core@2.0.0-preview.4(typescript@5.5.3): + /@solana/codecs-core@2.0.0-preview.4(typescript@5.5.4): resolution: {integrity: sha512-A0VVuDDA5kNKZUinOqHxJQK32aKTucaVbvn31YenGzHX1gPqq+SOnFwgaEY6pq4XEopSmaK16w938ZQS8IvCnw==} peerDependencies: typescript: '>=5' dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.3) - typescript: 5.5.3 + '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + typescript: 5.5.4 /@solana/codecs-data-structures@2.0.0-preview.2: resolution: {integrity: sha512-Xf5vIfromOZo94Q8HbR04TbgTwzigqrKII0GjYr21K7rb3nba4hUW2ir8kguY7HWFBcjHGlU5x3MevKBOLp3Zg==} @@ -2371,15 +2371,15 @@ packages: '@solana/codecs-numbers': 2.0.0-preview.2 '@solana/errors': 2.0.0-preview.2 - /@solana/codecs-data-structures@2.0.0-preview.4(typescript@5.5.3): + /@solana/codecs-data-structures@2.0.0-preview.4(typescript@5.5.4): resolution: {integrity: sha512-nt2k2eTeyzlI/ccutPcG36M/J8NAYfxBPI9h/nQjgJ+M+IgOKi31JV8StDDlG/1XvY0zyqugV3I0r3KAbZRJpA==} peerDependencies: typescript: '>=5' dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.3) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.3) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.3) - typescript: 5.5.3 + '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) + '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + typescript: 5.5.4 dev: false /@solana/codecs-numbers@2.0.0-preview.2: @@ -2388,14 +2388,14 @@ packages: '@solana/codecs-core': 2.0.0-preview.2 '@solana/errors': 2.0.0-preview.2 - /@solana/codecs-numbers@2.0.0-preview.4(typescript@5.5.3): + /@solana/codecs-numbers@2.0.0-preview.4(typescript@5.5.4): resolution: {integrity: sha512-Q061rLtMadsO7uxpguT+Z7G4UHnjQ6moVIxAQxR58nLxDPCC7MB1Pk106/Z7NDhDLHTcd18uO6DZ7ajHZEn2XQ==} peerDependencies: typescript: '>=5' dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.3) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.3) - typescript: 5.5.3 + '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) + '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + typescript: 5.5.4 /@solana/codecs-strings@2.0.0-preview.2(fastestsmallesttextencoderdecoder@1.0.22): resolution: {integrity: sha512-EgBwY+lIaHHgMJIqVOGHfIfpdmmUDNoNO/GAUGeFPf+q0dF+DtwhJPEMShhzh64X2MeCZcmSO6Kinx0Bvmmz2g==} @@ -2407,17 +2407,17 @@ packages: '@solana/errors': 2.0.0-preview.2 fastestsmallesttextencoderdecoder: 1.0.22 - /@solana/codecs-strings@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3): + /@solana/codecs-strings@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4): resolution: {integrity: sha512-YDbsQePRWm+xnrfS64losSGRg8Wb76cjK1K6qfR8LPmdwIC3787x9uW5/E4icl/k+9nwgbIRXZ65lpF+ucZUnw==} peerDependencies: fastestsmallesttextencoderdecoder: ^1.0.22 typescript: '>=5' dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.3) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.3) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.3) + '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) + '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) fastestsmallesttextencoderdecoder: 1.0.22 - typescript: 5.5.3 + typescript: 5.5.4 /@solana/codecs@2.0.0-preview.2(fastestsmallesttextencoderdecoder@1.0.22): resolution: {integrity: sha512-4HHzCD5+pOSmSB71X6w9ptweV48Zj1Vqhe732+pcAQ2cMNnN0gMPMdDq7j3YwaZDZ7yrILVV/3+HTnfT77t2yA==} @@ -2430,17 +2430,17 @@ packages: transitivePeerDependencies: - fastestsmallesttextencoderdecoder - /@solana/codecs@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3): + /@solana/codecs@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4): resolution: {integrity: sha512-gLMupqI4i+G4uPi2SGF/Tc1aXcviZF2ybC81x7Q/fARamNSgNOCUUoSCg9nWu1Gid6+UhA7LH80sWI8XjKaRog==} peerDependencies: typescript: '>=5' dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.3) - '@solana/codecs-data-structures': 2.0.0-preview.4(typescript@5.5.3) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.3) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3) - '@solana/options': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3) - typescript: 5.5.3 + '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-data-structures': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/options': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder dev: false @@ -2452,7 +2452,7 @@ packages: chalk: 5.3.0 commander: 12.1.0 - /@solana/errors@2.0.0-preview.4(typescript@5.5.3): + /@solana/errors@2.0.0-preview.4(typescript@5.5.4): resolution: {integrity: sha512-kadtlbRv2LCWr8A9V22On15Us7Nn8BvqNaOB4hXsTB3O0fU40D1ru2l+cReqLcRPij4znqlRzW9Xi0m6J5DIhA==} hasBin: true peerDependencies: @@ -2460,9 +2460,9 @@ packages: dependencies: chalk: 5.3.0 commander: 12.1.0 - typescript: 5.5.3 + typescript: 5.5.4 - /@solana/eslint-config-solana@3.0.3(@typescript-eslint/eslint-plugin@6.21.0)(@typescript-eslint/parser@6.21.0)(eslint-plugin-jest@27.9.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@10.0.0)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3): + /@solana/eslint-config-solana@3.0.3(@typescript-eslint/eslint-plugin@6.21.0)(@typescript-eslint/parser@6.21.0)(eslint-plugin-jest@27.9.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@10.0.0)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-yTaeCbOBwjmK4oUkknixOpwOzzAK8+4YWvJEJFNHuueESetieDnAeEHV7rzJllFgHEWa9nXps9Q3aD4/XJp71A==} peerDependencies: '@typescript-eslint/eslint-plugin': ^6.0.0 @@ -2475,18 +2475,18 @@ packages: eslint-plugin-typescript-sort-keys: ^3.2.0 typescript: ^5.1.6 dependencies: - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 - eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint@8.57.0)(typescript@5.5.3) + eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint@8.57.0)(typescript@5.5.4) eslint-plugin-react-hooks: 4.6.0(eslint@8.57.0) eslint-plugin-simple-import-sort: 10.0.0(eslint@8.57.0) eslint-plugin-sort-keys-fix: 1.1.2 - eslint-plugin-typescript-sort-keys: 3.2.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.3) - typescript: 5.5.3 + eslint-plugin-typescript-sort-keys: 3.2.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.4) + typescript: 5.5.4 dev: true - /@solana/eslint-config-solana@3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.17.0)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.3): + /@solana/eslint-config-solana@3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.17.0)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-yTaeCbOBwjmK4oUkknixOpwOzzAK8+4YWvJEJFNHuueESetieDnAeEHV7rzJllFgHEWa9nXps9Q3aD4/XJp71A==} peerDependencies: '@typescript-eslint/eslint-plugin': ^6.0.0 @@ -2499,15 +2499,15 @@ packages: eslint-plugin-typescript-sort-keys: ^3.2.0 typescript: ^5.1.6 dependencies: - '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 - eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3) + eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.4) eslint-plugin-react-hooks: 4.6.0(eslint@8.57.0) eslint-plugin-simple-import-sort: 12.1.1(eslint@8.57.0) eslint-plugin-sort-keys-fix: 1.1.2 - eslint-plugin-typescript-sort-keys: 3.2.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) - typescript: 5.5.3 + eslint-plugin-typescript-sort-keys: 3.2.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) + typescript: 5.5.4 dev: true /@solana/functional@2.0.0-experimental.21e994f: @@ -2530,17 +2530,17 @@ packages: '@solana/codecs-core': 2.0.0-preview.2 '@solana/codecs-numbers': 2.0.0-preview.2 - /@solana/options@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3): + /@solana/options@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4): resolution: {integrity: sha512-tv2O/Frxql/wSe3jbzi5nVicIWIus/BftH+5ZR+r9r3FO0/htEllZS5Q9XdbmSboHu+St87584JXeDx3xm4jaA==} peerDependencies: typescript: '>=5' dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.3) - '@solana/codecs-data-structures': 2.0.0-preview.4(typescript@5.5.3) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.3) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.3) - typescript: 5.5.3 + '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-data-structures': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder dev: false @@ -2844,7 +2844,7 @@ packages: '@types/yargs-parser': 21.0.3 dev: true - /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2856,10 +2856,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.5(supports-color@8.1.1) eslint: 8.57.0 @@ -2867,13 +2867,13 @@ packages: ignore: 5.3.1 natural-compare: 1.4.0 semver: 7.6.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -2885,35 +2885,35 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/scope-manager': 7.17.0 - '@typescript-eslint/type-utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/type-utils': 7.17.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/visitor-keys': 7.17.0 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils@5.62.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/experimental-utils@5.62.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2925,16 +2925,16 @@ packages: dependencies: '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.4) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.5(supports-color@8.1.1) eslint: 8.57.0 - typescript: 5.5.3 + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -2946,11 +2946,11 @@ packages: dependencies: '@typescript-eslint/scope-manager': 7.17.0 '@typescript-eslint/types': 7.17.0 - '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.4) '@typescript-eslint/visitor-keys': 7.17.0 debug: 4.3.5(supports-color@8.1.1) eslint: 8.57.0 - typescript: 5.5.3 + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true @@ -2995,7 +2995,7 @@ packages: '@typescript-eslint/visitor-keys': 7.17.0 dev: true - /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -3005,17 +3005,17 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.3) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.4) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.4) debug: 4.3.5(supports-color@8.1.1) eslint: 8.57.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/type-utils@7.17.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/type-utils@7.17.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -3025,12 +3025,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.3) - '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.4) + '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.5.4) debug: 4.3.5(supports-color@8.1.1) eslint: 8.57.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true @@ -3060,7 +3060,7 @@ packages: engines: {node: ^18.18.0 || >=20.0.0} dev: true - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.5.3): + /@typescript-eslint/typescript-estree@5.62.0(typescript@5.5.4): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3075,13 +3075,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 - tsutils: 3.21.0(typescript@5.5.3) - typescript: 5.5.3 + tsutils: 3.21.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@6.21.0(typescript@5.5.3): + /@typescript-eslint/typescript-estree@6.21.0(typescript@5.5.4): resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -3097,13 +3097,13 @@ packages: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@7.12.0(typescript@5.5.3): + /@typescript-eslint/typescript-estree@7.12.0(typescript@5.5.4): resolution: {integrity: sha512-5bwqLsWBULv1h6pn7cMW5dXX/Y2amRqLaKqsASVwbBHMZSnHqE/HN4vT4fE0aFsiwxYvr98kqOWh1a8ZKXalCQ==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -3119,13 +3119,13 @@ packages: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@7.16.0(typescript@5.5.3): + /@typescript-eslint/typescript-estree@7.16.0(typescript@5.5.4): resolution: {integrity: sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -3141,13 +3141,13 @@ packages: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@7.17.0(typescript@5.5.3): + /@typescript-eslint/typescript-estree@7.17.0(typescript@5.5.4): resolution: {integrity: sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -3163,13 +3163,13 @@ packages: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3180,7 +3180,7 @@ packages: '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.5.4) eslint: 8.57.0 eslint-scope: 5.1.1 semver: 7.6.0 @@ -3189,7 +3189,7 @@ packages: - typescript dev: true - /@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -3200,7 +3200,7 @@ packages: '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.4) eslint: 8.57.0 semver: 7.6.0 transitivePeerDependencies: @@ -3208,7 +3208,7 @@ packages: - typescript dev: true - /@typescript-eslint/utils@7.12.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/utils@7.12.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -3217,14 +3217,14 @@ packages: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@typescript-eslint/scope-manager': 7.12.0 '@typescript-eslint/types': 7.12.0 - '@typescript-eslint/typescript-estree': 7.12.0(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 7.12.0(typescript@5.5.4) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/utils@7.16.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/utils@7.16.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-PqP4kP3hb4r7Jav+NiRCntlVzhxBNWq6ZQ+zQwII1y/G/1gdIPeYDCKr2+dH6049yJQsWZiHU6RlwvIFBXXGNA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -3233,14 +3233,14 @@ packages: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@typescript-eslint/scope-manager': 7.16.0 '@typescript-eslint/types': 7.16.0 - '@typescript-eslint/typescript-estree': 7.16.0(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 7.16.0(typescript@5.5.4) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/utils@7.17.0(eslint@8.57.0)(typescript@5.5.3): + /@typescript-eslint/utils@7.17.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: @@ -3249,7 +3249,7 @@ packages: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@typescript-eslint/scope-manager': 7.17.0 '@typescript-eslint/types': 7.17.0 - '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.4) eslint: 8.57.0 transitivePeerDependencies: - supports-color @@ -4627,7 +4627,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.4) debug: 3.2.7 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 @@ -4646,7 +4646,7 @@ packages: ignore: 5.2.4 dev: true - /eslint-plugin-functional@6.6.3(eslint@8.57.0)(typescript@5.5.3): + /eslint-plugin-functional@6.6.3(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-sVbbvNvwX3HVkXAykKyoNLv57r4DPF7f1sy+/8j4YtzLYVQPGljMUWv3T6Kd4lwnnjmcKuj0EkIbS+knL6P5jw==} engines: {node: '>=16.10.0'} peerDependencies: @@ -4656,14 +4656,14 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 7.16.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/utils': 7.16.0(eslint@8.57.0)(typescript@5.5.4) deepmerge-ts: 5.1.0 escape-string-regexp: 4.0.0 eslint: 8.57.0 - is-immutable-type: 4.0.0(eslint@8.57.0)(typescript@5.5.3) + is-immutable-type: 4.0.0(eslint@8.57.0)(typescript@5.5.4) semver: 7.6.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true @@ -4678,7 +4678,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.4) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -4703,7 +4703,7 @@ packages: - supports-color dev: true - /eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint@8.57.0)(typescript@5.5.3): + /eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -4716,15 +4716,15 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript dev: true - /eslint-plugin-jest@28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.3): + /eslint-plugin-jest@28.6.0(@typescript-eslint/eslint-plugin@7.17.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.4): resolution: {integrity: sha512-YG28E1/MIKwnz+e2H7VwYPzHUYU4aMa19w0yGcwXnnmJH6EfgHahTJ2un3IyraUxNfnz/KUhJAFXNNwWPo12tg==} engines: {node: ^16.10.0 || ^18.12.0 || >=20.0.0} peerDependencies: @@ -4737,8 +4737,8 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/utils': 7.12.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/utils': 7.12.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 jest: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) transitivePeerDependencies: @@ -4833,7 +4833,7 @@ packages: eslint: 8.57.0 dev: true - /eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.3): + /eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@6.21.0)(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-GutszvriaVtwmn7pQjuj9/9o0iXhD7XZs0/424+zsozdRr/fdg5e8206t478Vnqnqi1GjuxcAolj1kf74KnhPA==} engines: {node: '>= 16'} peerDependencies: @@ -4841,17 +4841,17 @@ packages: eslint: ^7 || ^8 typescript: ^3 || ^4 || ^5 dependencies: - '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 json-schema: 0.4.0 natural-compare-lite: 1.4.0 - typescript: 5.5.3 + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true - /eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.3): + /eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-GutszvriaVtwmn7pQjuj9/9o0iXhD7XZs0/424+zsozdRr/fdg5e8206t478Vnqnqi1GjuxcAolj1kf74KnhPA==} engines: {node: '>= 16'} peerDependencies: @@ -4859,12 +4859,12 @@ packages: eslint: ^7 || ^8 typescript: ^3 || ^4 || ^5 dependencies: - '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 json-schema: 0.4.0 natural-compare-lite: 1.4.0 - typescript: 5.5.3 + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true @@ -5785,17 +5785,17 @@ packages: is-extglob: 2.1.1 dev: true - /is-immutable-type@4.0.0(eslint@8.57.0)(typescript@5.5.3): + /is-immutable-type@4.0.0(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-gyFBCXv+NikTs8/PGZhgjbMmFZQ5jvHGZIsVu6+/9Bk4K7imlWBIDN7hTr9fNioGzFg71I4YM3z8f0aKXarTAw==} peerDependencies: eslint: '*' typescript: '>=4.7.4' dependencies: - '@typescript-eslint/type-utils': 7.17.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/type-utils': 7.17.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 - ts-api-utils: 1.3.0(typescript@5.5.3) - ts-declaration-location: 1.0.0(typescript@5.5.3) - typescript: 5.5.3 + ts-api-utils: 1.3.0(typescript@5.5.4) + ts-declaration-location: 1.0.0(typescript@5.5.4) + typescript: 5.5.4 transitivePeerDependencies: - supports-color dev: true @@ -6138,7 +6138,7 @@ packages: pretty-format: 29.7.0 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.2(@types/node@20.14.11)(typescript@5.5.3) + ts-node: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -7440,7 +7440,7 @@ packages: package-json-from-dist: 1.0.0 dev: true - /rollup-plugin-dts@6.1.1(rollup@4.19.0)(typescript@5.5.3): + /rollup-plugin-dts@6.1.1(rollup@4.19.0)(typescript@5.5.4): resolution: {integrity: sha512-aSHRcJ6KG2IHIioYlvAOcEq6U99sVtqDDKVhnwt70rW6tsz3tv5OSjEiWcgzfsHdLyGXZ/3b/7b/+Za3Y6r1XA==} engines: {node: '>=16'} peerDependencies: @@ -7449,7 +7449,7 @@ packages: dependencies: magic-string: 0.30.10 rollup: 4.19.0 - typescript: 5.5.3 + typescript: 5.5.4 optionalDependencies: '@babel/code-frame': 7.24.2 dev: true @@ -8057,22 +8057,22 @@ packages: escape-string-regexp: 1.0.5 dev: true - /ts-api-utils@1.3.0(typescript@5.5.3): + /ts-api-utils@1.3.0(typescript@5.5.4): resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} engines: {node: '>=16'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.5.3 + typescript: 5.5.4 dev: true - /ts-declaration-location@1.0.0(typescript@5.5.3): + /ts-declaration-location@1.0.0(typescript@5.5.4): resolution: {integrity: sha512-/C+R0e1CLF1KtwbE59IFhCg4jLwfU7Puob+uVIl4iUVQhepN/bHmWXy3Gt3mAgvdLQybEZ4yb4qhnJQbphnEgA==} peerDependencies: typescript: '>=4.0.0' dependencies: fast-glob: 3.3.2 - typescript: 5.5.3 + typescript: 5.5.4 dev: true /ts-jest-resolver@2.0.1: @@ -8081,7 +8081,7 @@ packages: jest-resolve: 29.7.0 dev: true - /ts-jest@29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.3): + /ts-jest@29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.4): resolution: {integrity: sha512-yCcfVdiBFngVz9/keHin9EnsrQtQtEu3nRykNy9RVp+FiPFFbPJ3Sg6Qg4+TkmH0vMP5qsTKgXSsk80HRwvdgQ==} engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -8115,11 +8115,11 @@ packages: lodash.memoize: 4.1.2 make-error: 1.3.6 semver: 7.6.0 - typescript: 5.5.3 + typescript: 5.5.4 yargs-parser: 21.1.1 dev: true - /ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.3): + /ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -8145,7 +8145,7 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.5.3 + typescript: 5.5.4 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -8166,14 +8166,14 @@ packages: /tslib@2.6.3: resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} - /tsutils@3.21.0(typescript@5.5.3): + /tsutils@3.21.0(typescript@5.5.4): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 5.5.3 + typescript: 5.5.4 dev: true /tsx@4.16.2: @@ -8312,7 +8312,7 @@ packages: is-typed-array: 1.1.12 dev: true - /typedoc@0.26.5(typescript@5.5.3): + /typedoc@0.26.5(typescript@5.5.4): resolution: {integrity: sha512-Vn9YKdjKtDZqSk+by7beZ+xzkkr8T8CYoiasqyt4TTRFy5+UHzL/mF/o4wGBjRF+rlWQHDb0t6xCpA3JNL5phg==} engines: {node: '>= 18'} hasBin: true @@ -8323,7 +8323,7 @@ packages: markdown-it: 14.1.0 minimatch: 9.0.5 shiki: 1.10.0 - typescript: 5.5.3 + typescript: 5.5.4 yaml: 2.4.5 dev: true @@ -8331,8 +8331,8 @@ packages: resolution: {integrity: sha512-7sI4e/bZijOzyURng88oOFZCISQPTHozfE2sUu5AviFYk5QV7fYGb6YiDl+vKjF/pICA354JImBImL9XJWUvdQ==} dev: false - /typescript@5.5.3: - resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==} + /typescript@5.5.4: + resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==} engines: {node: '>=14.17'} hasBin: true diff --git a/single-pool/js/packages/classic/package.json b/single-pool/js/packages/classic/package.json index 04b7d12e356..4fe90db5c7e 100644 --- a/single-pool/js/packages/classic/package.json +++ b/single-pool/js/packages/classic/package.json @@ -27,7 +27,7 @@ "eslint-plugin-prettier": "^5.2.1", "solana-bankrun": "^0.2.0", "tsx": "^4.16.2", - "typescript": "^5.5.3" + "typescript": "^5.5.4" }, "dependencies": { "@solana/web3.js": "^1.95.1", diff --git a/single-pool/js/packages/modern/package.json b/single-pool/js/packages/modern/package.json index 9e1dd1a9f78..b3e13522b70 100644 --- a/single-pool/js/packages/modern/package.json +++ b/single-pool/js/packages/modern/package.json @@ -21,7 +21,7 @@ "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", - "typescript": "^5.5.3" + "typescript": "^5.5.4" }, "dependencies": { "@solana/web3.js": "=2.0.0-experimental.21e994f" diff --git a/stake-pool/js/package.json b/stake-pool/js/package.json index c58bf31f6ac..b19b90564d0 100644 --- a/stake-pool/js/package.json +++ b/stake-pool/js/package.json @@ -75,7 +75,7 @@ "rollup": "^4.19.0", "rollup-plugin-dts": "^6.1.1", "ts-jest": "^29.2.3", - "typescript": "^5.5.3" + "typescript": "^5.5.4" }, "jest": { "moduleFileExtensions": [ diff --git a/token-group/js/package.json b/token-group/js/package.json index 542e59a9aca..86a337de536 100644 --- a/token-group/js/package.json +++ b/token-group/js/package.json @@ -69,6 +69,6 @@ "ts-node": "^10.9.2", "tslib": "^2.6.3", "typedoc": "^0.26.5", - "typescript": "^5.5.3" + "typescript": "^5.5.4" } } diff --git a/token-lending/js/package.json b/token-lending/js/package.json index e0677a354b2..dc33f0c6601 100644 --- a/token-lending/js/package.json +++ b/token-lending/js/package.json @@ -60,6 +60,6 @@ "ts-node": "^10.9.2", "tslib": "^2.6.3", "typedoc": "^0.26.5", - "typescript": "^5.5.3" + "typescript": "^5.5.4" } } diff --git a/token-metadata/js/package.json b/token-metadata/js/package.json index 4cf7783ed15..b560102d86c 100644 --- a/token-metadata/js/package.json +++ b/token-metadata/js/package.json @@ -69,6 +69,6 @@ "ts-node": "^10.9.2", "tslib": "^2.6.3", "typedoc": "^0.26.5", - "typescript": "^5.5.3" + "typescript": "^5.5.4" } } diff --git a/token-swap/js/package.json b/token-swap/js/package.json index 69fea82feb5..6a0ce442118 100644 --- a/token-swap/js/package.json +++ b/token-swap/js/package.json @@ -68,6 +68,6 @@ "prettier": "^3.3.3", "start-server-and-test": "^2.0.4", "ts-node": "^10.9.2", - "typescript": "^5.5.3" + "typescript": "^5.5.4" } } diff --git a/token/js/package.json b/token/js/package.json index fd487eb30ff..9cff5c37a20 100644 --- a/token/js/package.json +++ b/token/js/package.json @@ -85,6 +85,6 @@ "start-server-and-test": "^2.0.4", "ts-node": "^10.9.2", "typedoc": "^0.26.5", - "typescript": "^5.5.3" + "typescript": "^5.5.4" } } From a14d56b8abdef30d91de5af9af3ae0c8bd42524e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:54:53 +0200 Subject: [PATCH 4/7] build(deps): bump tokio from 1.38.1 to 1.39.1 (#7048) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.38.1 to 1.39.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.1...tokio-1.39.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 24 ++++++++++----------- libraries/concurrent-merkle-tree/Cargo.toml | 2 +- single-pool/cli/Cargo.toml | 2 +- token/cli/Cargo.toml | 2 +- token/transfer-hook/interface/Cargo.toml | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a7c98f6245..9aa2baa2254 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2311,9 +2311,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -3147,13 +3147,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3378,7 +3379,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.9", "libc", ] @@ -8476,21 +8477,20 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.38.1" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -8505,9 +8505,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", diff --git a/libraries/concurrent-merkle-tree/Cargo.toml b/libraries/concurrent-merkle-tree/Cargo.toml index ff12590e294..62b05ba7d34 100644 --- a/libraries/concurrent-merkle-tree/Cargo.toml +++ b/libraries/concurrent-merkle-tree/Cargo.toml @@ -20,7 +20,7 @@ thiserror = "1.0.63" rand_distr = "0.4.3" rand = "0.8" spl-merkle-tree-reference = { version = "0.1.0", path = "../merkle-tree-reference" } -tokio = { version = "1.38", features = ["full"] } +tokio = { version = "1.39", features = ["full"] } [lib] crate-type = ["cdylib", "lib"] diff --git a/single-pool/cli/Cargo.toml b/single-pool/cli/Cargo.toml index 62db27ea1e7..b212045e0c0 100644 --- a/single-pool/cli/Cargo.toml +++ b/single-pool/cli/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" edition = "2021" [dependencies] -tokio = "1.38" +tokio = "1.39" clap = { version = "3.2.23", features = ["derive"] } console = "0.15.8" borsh = "1.5.1" diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml index 43d120c9664..8ebd81c7d1a 100644 --- a/token/cli/Cargo.toml +++ b/token/cli/Cargo.toml @@ -45,7 +45,7 @@ spl-memo = { version = "5.0", path = "../../memo/program", features = [ ] } strum = "0.26" strum_macros = "0.26" -tokio = "1.38" +tokio = "1.39" [dev-dependencies] solana-test-validator = "2.0.0" diff --git a/token/transfer-hook/interface/Cargo.toml b/token/transfer-hook/interface/Cargo.toml index b60095bf14b..2e3fb0c5edc 100644 --- a/token/transfer-hook/interface/Cargo.toml +++ b/token/transfer-hook/interface/Cargo.toml @@ -21,7 +21,7 @@ spl-pod = { version = "0.3.0", path = "../../../libraries/pod" } crate-type = ["cdylib", "lib"] [dev-dependencies] -tokio = { version = "1.38.1", features = ["full"] } +tokio = { version = "1.39.1", features = ["full"] } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] From 2d2c4bba858ecd4004de09bfed1c043896a6d12f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 13:29:50 +0200 Subject: [PATCH 5/7] build(deps-dev): bump @types/node from 20.14.11 to 20.14.12 (#7049) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.14.11 to 20.14.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- account-compression/sdk/package.json | 2 +- libraries/type-length-value/js/package.json | 2 +- memo/js/package.json | 2 +- name-service/js/package.json | 2 +- pnpm-lock.yaml | 148 +++++++++---------- single-pool/js/packages/classic/package.json | 2 +- single-pool/js/packages/modern/package.json | 2 +- stake-pool/js/package.json | 2 +- token-group/js/package.json | 2 +- token-lending/js/package.json | 2 +- token-metadata/js/package.json | 2 +- token/js/package.json | 2 +- 12 files changed, 85 insertions(+), 85 deletions(-) diff --git a/account-compression/sdk/package.json b/account-compression/sdk/package.json index e543d68e790..34412c8442a 100644 --- a/account-compression/sdk/package.json +++ b/account-compression/sdk/package.json @@ -71,7 +71,7 @@ "@solana/prettier-config-solana": "^0.0.5", "@types/bn.js": "^5.1.0", "@types/jest": "^29.5.12", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@types/node-fetch": "^2.6.11", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", diff --git a/libraries/type-length-value/js/package.json b/libraries/type-length-value/js/package.json index 13e2de3390e..ef823f67a36 100644 --- a/libraries/type-length-value/js/package.json +++ b/libraries/type-length-value/js/package.json @@ -49,7 +49,7 @@ "devDependencies": { "@types/chai": "^4.3.16", "@types/mocha": "^10.0.7", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", "chai": "^5.1.1", diff --git a/memo/js/package.json b/memo/js/package.json index d938db01b9b..7b8160bfb30 100644 --- a/memo/js/package.json +++ b/memo/js/package.json @@ -55,7 +55,7 @@ "@solana/web3.js": "^1.95.1", "@types/chai": "^4.3.16", "@types/jest": "^29.5.12", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@types/node-fetch": "^2.6.11", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", diff --git a/name-service/js/package.json b/name-service/js/package.json index d22acd828d0..f6629e7a6b0 100644 --- a/name-service/js/package.json +++ b/name-service/js/package.json @@ -50,7 +50,7 @@ "@jest/globals": "^29.7.0", "@types/bn.js": "^5.1.1", "@types/jest": "^29.5.12", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", "eslint": "^8.57.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b930de18c10..f7e888559fb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -64,8 +64,8 @@ importers: specifier: ^29.5.12 version: 29.5.12 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@types/node-fetch': specifier: ^2.6.11 version: 2.6.11 @@ -107,10 +107,10 @@ importers: version: 6.1.1 jest: specifier: ^29.0.1 - version: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + version: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) jest-config: specifier: ^29.0.1 - version: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + version: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) prettier: specifier: ^3.3.3 version: 3.3.3 @@ -125,7 +125,7 @@ importers: version: 2.0.1 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + version: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) typedoc: specifier: ^0.26.5 version: 0.26.5(typescript@5.5.4) @@ -146,8 +146,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) @@ -183,7 +183,7 @@ importers: version: 0.3.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + version: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) typedoc: specifier: ^0.26.5 version: 0.26.5(typescript@5.5.4) @@ -207,8 +207,8 @@ importers: specifier: ^29.5.12 version: 29.5.12 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@types/node-fetch': specifier: ^2.6.11 version: 2.6.11 @@ -238,7 +238,7 @@ importers: version: 6.1.1 jest: specifier: ^29.0.0 - version: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + version: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) prettier: specifier: ^3.3.3 version: 3.3.3 @@ -256,7 +256,7 @@ importers: version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.4) ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + version: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) typedoc: specifier: ^0.26.5 version: 0.26.5(typescript@5.5.4) @@ -286,8 +286,8 @@ importers: specifier: ^29.5.12 version: 29.5.12 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) @@ -311,7 +311,7 @@ importers: version: 2.29.1(@typescript-eslint/parser@7.17.0)(eslint@8.57.0) jest: specifier: ^29.7.0 - version: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + version: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) prettier: specifier: ^3.3.3 version: 3.3.3 @@ -323,7 +323,7 @@ importers: version: 29.2.3(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.5.4) ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + version: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) typedoc: specifier: ^0.26.5 version: 0.26.5(typescript@5.5.4) @@ -347,8 +347,8 @@ importers: specifier: ^5.0.0 version: 5.0.0 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) @@ -381,8 +381,8 @@ importers: version: 2.0.0-experimental.21e994f(node-fetch@2.7.0)(ws@8.14.2) devDependencies: '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) @@ -451,8 +451,8 @@ importers: specifier: ^29.5.12 version: 29.5.12 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@types/node-fetch': specifier: ^2.6.11 version: 2.6.11 @@ -476,7 +476,7 @@ importers: version: 5.2.1(@types/eslint@8.56.7)(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.3.3) jest: specifier: ^29.0.0 - version: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + version: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) prettier: specifier: ^3.3.3 version: 3.3.3 @@ -515,8 +515,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) @@ -552,7 +552,7 @@ importers: version: 0.3.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + version: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) tslib: specifier: ^2.6.3 version: 2.6.3 @@ -600,8 +600,8 @@ importers: specifier: ^3.1.0 version: 3.1.3 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) @@ -628,7 +628,7 @@ importers: version: 4.19.0 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + version: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) tslib: specifier: ^2.6.3 version: 2.6.3 @@ -658,8 +658,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@typescript-eslint/eslint-plugin': specifier: ^7.17.0 version: 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) @@ -695,7 +695,7 @@ importers: version: 0.3.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + version: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) tslib: specifier: ^2.6.3 version: 2.6.3 @@ -765,7 +765,7 @@ importers: version: 2.0.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + version: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) typescript: specifier: ^5.5.4 version: 5.5.4 @@ -807,8 +807,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 '@types/node-fetch': specifier: ^2.6.11 version: 2.6.11 @@ -856,7 +856,7 @@ importers: version: 2.0.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + version: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) typedoc: specifier: ^0.26.5 version: 0.26.5(typescript@5.5.4) @@ -1548,7 +1548,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 @@ -1569,14 +1569,14 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.9.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -1604,7 +1604,7 @@ packages: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 jest-mock: 29.7.0 dev: true @@ -1631,7 +1631,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.3.0 - '@types/node': 20.14.11 + '@types/node': 20.14.12 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -1664,7 +1664,7 @@ packages: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.20 - '@types/node': 20.14.11 + '@types/node': 20.14.12 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -1752,7 +1752,7 @@ packages: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 20.14.11 + '@types/node': 20.14.12 '@types/yargs': 17.0.31 chalk: 4.1.2 dev: true @@ -2718,7 +2718,7 @@ packages: /@types/bn.js@5.1.5: resolution: {integrity: sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==} dependencies: - '@types/node': 20.14.11 + '@types/node': 20.14.12 dev: true /@types/chai-as-promised@7.1.8: @@ -2734,7 +2734,7 @@ packages: /@types/connect@3.4.38: resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} dependencies: - '@types/node': 20.14.11 + '@types/node': 20.14.12 /@types/eslint-plugin-prettier@3.1.3: resolution: {integrity: sha512-Jk+lgBZM0u9ETUyqe2HvykL1j6uE7L1oEqbInWtsVHT6sP+AdwLb4ncmQBqASTS+YzYOPF6hKX0zgEhblRMjqA==} @@ -2756,7 +2756,7 @@ packages: /@types/graceful-fs@4.1.9: resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==} dependencies: - '@types/node': 20.14.11 + '@types/node': 20.14.12 dev: true /@types/istanbul-lib-coverage@2.0.6: @@ -2797,15 +2797,15 @@ packages: /@types/node-fetch@2.6.11: resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==} dependencies: - '@types/node': 20.14.11 + '@types/node': 20.14.12 form-data: 4.0.0 dev: true /@types/node@12.20.55: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - /@types/node@20.14.11: - resolution: {integrity: sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==} + /@types/node@20.14.12: + resolution: {integrity: sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==} dependencies: undici-types: 5.26.5 @@ -2827,12 +2827,12 @@ packages: /@types/ws@7.4.7: resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==} dependencies: - '@types/node': 20.14.11 + '@types/node': 20.14.12 /@types/ws@8.5.10: resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==} dependencies: - '@types/node': 20.14.11 + '@types/node': 20.14.12 /@types/yargs-parser@21.0.3: resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==} @@ -4166,7 +4166,7 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: true - /create-jest@29.7.0(@types/node@20.14.11)(ts-node@10.9.2): + /create-jest@29.7.0(@types/node@20.14.12)(ts-node@10.9.2): resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -4175,7 +4175,7 @@ packages: chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -4740,7 +4740,7 @@ packages: '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/utils': 7.12.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 - jest: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + jest: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) transitivePeerDependencies: - supports-color - typescript @@ -6054,7 +6054,7 @@ packages: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.1 @@ -6075,7 +6075,7 @@ packages: - supports-color dev: true - /jest-cli@29.7.0(@types/node@20.14.11)(ts-node@10.9.2): + /jest-cli@29.7.0(@types/node@20.14.12)(ts-node@10.9.2): resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -6089,10 +6089,10 @@ packages: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + create-jest: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) exit: 0.1.2 import-local: 3.1.0 - jest-config: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -6103,7 +6103,7 @@ packages: - ts-node dev: true - /jest-config@29.7.0(@types/node@20.14.11)(ts-node@10.9.2): + /jest-config@29.7.0(@types/node@20.14.12)(ts-node@10.9.2): resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -6118,7 +6118,7 @@ packages: '@babel/core': 7.23.2 '@jest/test-sequencer': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 babel-jest: 29.7.0(@babel/core@7.23.2) chalk: 4.1.2 ci-info: 3.9.0 @@ -6138,7 +6138,7 @@ packages: pretty-format: 29.7.0 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.2(@types/node@20.14.11)(typescript@5.5.4) + ts-node: 10.9.2(@types/node@20.14.12)(typescript@5.5.4) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -6179,7 +6179,7 @@ packages: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 jest-mock: 29.7.0 jest-util: 29.7.0 dev: true @@ -6195,7 +6195,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.9 - '@types/node': 20.14.11 + '@types/node': 20.14.12 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -6246,7 +6246,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 jest-util: 29.7.0 dev: true @@ -6301,7 +6301,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -6332,7 +6332,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 chalk: 4.1.2 cjs-module-lexer: 1.2.3 collect-v8-coverage: 1.0.2 @@ -6384,7 +6384,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 chalk: 4.1.2 ci-info: 3.9.0 graceful-fs: 4.2.11 @@ -6409,7 +6409,7 @@ packages: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.14.11 + '@types/node': 20.14.12 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -6421,13 +6421,13 @@ packages: resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 20.14.11 + '@types/node': 20.14.12 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true - /jest@29.7.0(@types/node@20.14.11)(ts-node@10.9.2): + /jest@29.7.0(@types/node@20.14.12)(ts-node@10.9.2): resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -6440,7 +6440,7 @@ packages: '@jest/core': 29.7.0(ts-node@10.9.2) '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + jest-cli: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -8109,7 +8109,7 @@ packages: bs-logger: 0.2.6 ejs: 3.1.10 fast-json-stable-stringify: 2.1.0 - jest: 29.7.0(@types/node@20.14.11)(ts-node@10.9.2) + jest: 29.7.0(@types/node@20.14.12)(ts-node@10.9.2) jest-util: 29.7.0 json5: 2.2.3 lodash.memoize: 4.1.2 @@ -8119,7 +8119,7 @@ packages: yargs-parser: 21.1.1 dev: true - /ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4): + /ts-node@10.9.2(@types/node@20.14.12)(typescript@5.5.4): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -8138,7 +8138,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.14.11 + '@types/node': 20.14.12 acorn: 8.11.2 acorn-walk: 8.3.0 arg: 4.1.3 diff --git a/single-pool/js/packages/classic/package.json b/single-pool/js/packages/classic/package.json index 4fe90db5c7e..d8643d7a4cc 100644 --- a/single-pool/js/packages/classic/package.json +++ b/single-pool/js/packages/classic/package.json @@ -18,7 +18,7 @@ "test": "sed -i '1s/.*/{ \"type\": \"module\",/' package.json && NODE_OPTIONS='--loader=tsx' ava ; ret=$?; sed -i '1s/.*/{/' package.json && exit $ret" }, "devDependencies": { - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@ava/typescript": "^5.0.0", "@typescript-eslint/eslint-plugin": "^7.17.0", "ava": "^6.1.3", diff --git a/single-pool/js/packages/modern/package.json b/single-pool/js/packages/modern/package.json index b3e13522b70..78031d7e714 100644 --- a/single-pool/js/packages/modern/package.json +++ b/single-pool/js/packages/modern/package.json @@ -16,7 +16,7 @@ "lint:fix": "eslint . --fix" }, "devDependencies": { - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@typescript-eslint/eslint-plugin": "^7.17.0", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/stake-pool/js/package.json b/stake-pool/js/package.json index b19b90564d0..c1a75dad15c 100644 --- a/stake-pool/js/package.json +++ b/stake-pool/js/package.json @@ -61,7 +61,7 @@ "@rollup/plugin-typescript": "^11.1.6", "@types/bn.js": "^5.1.0", "@types/jest": "^29.5.12", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@types/node-fetch": "^2.6.11", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", diff --git a/token-group/js/package.json b/token-group/js/package.json index 86a337de536..80bbf69eb13 100644 --- a/token-group/js/package.json +++ b/token-group/js/package.json @@ -54,7 +54,7 @@ "@solana/web3.js": "^1.95.1", "@types/chai": "^4.3.16", "@types/mocha": "^10.0.7", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", "chai": "^5.1.1", diff --git a/token-lending/js/package.json b/token-lending/js/package.json index dc33f0c6601..010d3685f8b 100644 --- a/token-lending/js/package.json +++ b/token-lending/js/package.json @@ -48,7 +48,7 @@ "@solana/web3.js": "^1.95.1", "@types/eslint": "^8.56.7", "@types/eslint-plugin-prettier": "^3.1.0", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", "eslint": "^8.57.0", diff --git a/token-metadata/js/package.json b/token-metadata/js/package.json index b560102d86c..98943623cc2 100644 --- a/token-metadata/js/package.json +++ b/token-metadata/js/package.json @@ -54,7 +54,7 @@ "@solana/web3.js": "^1.95.1", "@types/chai": "^4.3.16", "@types/mocha": "^10.0.7", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", "chai": "^5.1.1", diff --git a/token/js/package.json b/token/js/package.json index 9cff5c37a20..6dd6e0cfc41 100644 --- a/token/js/package.json +++ b/token/js/package.json @@ -67,7 +67,7 @@ "@types/chai-as-promised": "^7.1.4", "@types/chai": "^4.3.16", "@types/mocha": "^10.0.7", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "@types/node-fetch": "^2.6.11", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", From 5f0190cc6f733b9ce794b7b5551f7d6def570b8c Mon Sep 17 00:00:00 2001 From: Jon C Date: Thu, 25 Jul 2024 15:01:50 +0200 Subject: [PATCH 6/7] stake-pool-py: Update to newer solana-py / solders (#7050) * stake-pool-py: Update to newer solana-py / solders * Harden tests further --- stake-pool/py/bot/rebalance.py | 34 +- stake-pool/py/optional-requirements.txt | 24 +- stake-pool/py/requirements.txt | 27 +- stake-pool/py/spl_token/actions.py | 41 +- stake-pool/py/stake/actions.py | 66 ++- stake-pool/py/stake/constants.py | 6 +- stake-pool/py/stake/instructions.py | 48 +- stake-pool/py/stake/state.py | 16 +- stake-pool/py/stake_pool/actions.py | 340 +++++------ stake-pool/py/stake_pool/constants.py | 56 +- stake-pool/py/stake_pool/instructions.py | 554 +++++++++--------- stake-pool/py/stake_pool/state.py | 61 +- stake-pool/py/system/actions.py | 9 +- stake-pool/py/tests/conftest.py | 26 +- stake-pool/py/tests/test_a_time_sensitive.py | 28 +- stake-pool/py/tests/test_add_remove.py | 10 +- stake-pool/py/tests/test_bot_rebalance.py | 26 +- stake-pool/py/tests/test_create.py | 30 +- .../test_create_update_token_metadata.py | 26 +- .../py/tests/test_deposit_withdraw_sol.py | 17 +- .../py/tests/test_deposit_withdraw_stake.py | 26 +- stake-pool/py/tests/test_stake.py | 16 +- stake-pool/py/tests/test_system.py | 8 +- stake-pool/py/tests/test_token.py | 8 +- stake-pool/py/tests/test_vote.py | 9 +- stake-pool/py/vote/actions.py | 34 +- stake-pool/py/vote/constants.py | 4 +- stake-pool/py/vote/instructions.py | 30 +- 28 files changed, 788 insertions(+), 792 deletions(-) diff --git a/stake-pool/py/bot/rebalance.py b/stake-pool/py/bot/rebalance.py index bc656a87591..e12a6a9a678 100644 --- a/stake-pool/py/bot/rebalance.py +++ b/stake-pool/py/bot/rebalance.py @@ -2,8 +2,8 @@ import asyncio import json -from solana.keypair import Keypair -from solana.publickey import PublicKey +from solders.keypair import Keypair +from solders.pubkey import Pubkey from solana.rpc.async_api import AsyncClient from solana.rpc.commitment import Confirmed @@ -27,30 +27,30 @@ async def get_client(endpoint: str) -> AsyncClient: return async_client -async def rebalance(endpoint: str, stake_pool_address: PublicKey, staker: Keypair, retained_reserve_amount: float): +async def rebalance(endpoint: str, stake_pool_address: Pubkey, staker: Keypair, retained_reserve_amount: float): async_client = await get_client(endpoint) - resp = await async_client.get_epoch_info(commitment=Confirmed) - epoch = resp['result']['epoch'] + epoch_resp = await async_client.get_epoch_info(commitment=Confirmed) + epoch = epoch_resp.value.epoch resp = await async_client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) print(f'Stake pool last update epoch {stake_pool.last_update_epoch}, current epoch {epoch}') if stake_pool.last_update_epoch != epoch: print('Updating stake pool') await update_stake_pool(async_client, staker, stake_pool_address) resp = await async_client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) - resp = await async_client.get_minimum_balance_for_rent_exemption(STAKE_LEN) - stake_rent_exemption = resp['result'] + rent_resp = await async_client.get_minimum_balance_for_rent_exemption(STAKE_LEN) + stake_rent_exemption = rent_resp.value retained_reserve_lamports = int(retained_reserve_amount * LAMPORTS_PER_SOL) - resp = await async_client.get_account_info(stake_pool.validator_list, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + val_resp = await async_client.get_account_info(stake_pool.validator_list, commitment=Confirmed) + data = val_resp.value.data if val_resp.value else bytes() + validator_list = ValidatorList.decode(data) print('Stake pool stats:') print(f'* {stake_pool.total_lamports} total lamports') @@ -107,7 +107,7 @@ def keypair_from_file(keyfile_name: str) -> Keypair: data = keyfile.read() int_list = json.loads(data) bytes_list = [value.to_bytes(1, 'little') for value in int_list] - return Keypair.from_secret_key(b''.join(bytes_list)) + return Keypair.from_seed(b''.join(bytes_list)) if __name__ == "__main__": @@ -124,9 +124,9 @@ def keypair_from_file(keyfile_name: str) -> Keypair: help='RPC endpoint to use, e.g. https://api.mainnet-beta.solana.com') args = parser.parse_args() - stake_pool = PublicKey(args.stake_pool) + stake_pool = Pubkey(args.stake_pool) staker = keypair_from_file(args.staker) print(f'Rebalancing stake pool {stake_pool}') - print(f'Staker public key: {staker.public_key}') + print(f'Staker public key: {staker.pubkey()}') print(f'Amount to leave in the reserve: {args.reserve_amount} SOL') asyncio.run(rebalance(args.endpoint, stake_pool, staker, args.reserve_amount)) diff --git a/stake-pool/py/optional-requirements.txt b/stake-pool/py/optional-requirements.txt index 5aa593192f4..5f08be95a62 100644 --- a/stake-pool/py/optional-requirements.txt +++ b/stake-pool/py/optional-requirements.txt @@ -1,15 +1,11 @@ -attrs==22.1.0 -flake8==5.0.3 -iniconfig==1.1.1 +flake8==7.1.0 +iniconfig==2.0.0 mccabe==0.7.0 -mypy==0.971 -mypy-extensions==0.4.3 -packaging==21.3 -pluggy==1.0.0 -py==1.11.0 -pycodestyle==2.9.0 -pyflakes==2.5.0 -pyparsing==3.0.9 -pytest==7.1.2 -pytest-asyncio==0.19.0 -tomli==2.0.1 +mypy==1.11.0 +mypy-extensions==1.0.0 +packaging==24.1 +pluggy==1.5.0 +pycodestyle==2.12.0 +pyflakes==3.2.0 +pytest==8.3.1 +pytest-asyncio==0.23.8 diff --git a/stake-pool/py/requirements.txt b/stake-pool/py/requirements.txt index 668602a5d36..9b0f39a3f60 100644 --- a/stake-pool/py/requirements.txt +++ b/stake-pool/py/requirements.txt @@ -1,19 +1,14 @@ -anyio==3.6.1 -base58==2.1.1 -cachetools==4.2.4 +anyio==4.4.0 certifi==2024.7.4 -cffi==1.15.1 -charset-normalizer==2.1.0 construct==2.10.68 -h11==0.12.0 -httpcore==0.15.0 -httpx==0.23.0 +construct-typing==0.5.6 +h11==0.14.0 +httpcore==1.0.5 +httpx==0.27.0 idna==3.7 -pycparser==2.21 -PyNaCl==1.5.0 -requests==2.32.0 -rfc3986==1.5.0 -sniffio==1.2.0 -solana==0.18.1 -typing_extensions==4.3.0 -urllib3==1.26.19 +jsonalias==0.1.1 +sniffio==1.3.1 +solana==0.34.2 +solders==0.21.0 +typing_extensions==4.12.2 +websockets==11.0.3 diff --git a/stake-pool/py/spl_token/actions.py b/stake-pool/py/spl_token/actions.py index 6c00a9285cf..99a03fd0d9e 100644 --- a/stake-pool/py/spl_token/actions.py +++ b/stake-pool/py/spl_token/actions.py @@ -1,10 +1,10 @@ -from solana.publickey import PublicKey -from solana.keypair import Keypair +from solders.pubkey import Pubkey +from solders.keypair import Keypair from solana.rpc.async_api import AsyncClient from solana.rpc.commitment import Confirmed from solana.rpc.types import TxOpts from solana.transaction import Transaction -import solana.system_program as sys +import solders.system_program as sys from spl.token.constants import TOKEN_PROGRAM_ID from spl.token.async_client import AsyncToken @@ -12,33 +12,37 @@ import spl.token.instructions as spl_token +OPTS = TxOpts(skip_confirmation=False, preflight_commitment=Confirmed) + + async def create_associated_token_account( client: AsyncClient, payer: Keypair, - owner: PublicKey, - mint: PublicKey -) -> PublicKey: - txn = Transaction() + owner: Pubkey, + mint: Pubkey +) -> Pubkey: + txn = Transaction(fee_payer=payer.pubkey()) create_txn = spl_token.create_associated_token_account( - payer=payer.public_key, owner=owner, mint=mint + payer=payer.pubkey(), owner=owner, mint=mint ) txn.add(create_txn) - await client.send_transaction(txn, payer, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) - return create_txn.keys[1].pubkey + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, payer, recent_blockhash=recent_blockhash, opts=OPTS) + return create_txn.accounts[1].pubkey -async def create_mint(client: AsyncClient, payer: Keypair, mint: Keypair, mint_authority: PublicKey): +async def create_mint(client: AsyncClient, payer: Keypair, mint: Keypair, mint_authority: Pubkey): mint_balance = await AsyncToken.get_min_balance_rent_for_exempt_for_mint(client) - print(f"Creating pool token mint {mint.public_key}") - txn = Transaction() + print(f"Creating pool token mint {mint.pubkey()}") + txn = Transaction(fee_payer=payer.pubkey()) txn.add( sys.create_account( sys.CreateAccountParams( - from_pubkey=payer.public_key, - new_account_pubkey=mint.public_key, + from_pubkey=payer.pubkey(), + to_pubkey=mint.pubkey(), lamports=mint_balance, space=MINT_LAYOUT.sizeof(), - program_id=TOKEN_PROGRAM_ID, + owner=TOKEN_PROGRAM_ID, ) ) ) @@ -46,12 +50,13 @@ async def create_mint(client: AsyncClient, payer: Keypair, mint: Keypair, mint_a spl_token.initialize_mint( spl_token.InitializeMintParams( program_id=TOKEN_PROGRAM_ID, - mint=mint.public_key, + mint=mint.pubkey(), decimals=9, mint_authority=mint_authority, freeze_authority=None, ) ) ) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash await client.send_transaction( - txn, payer, mint, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + txn, payer, mint, recent_blockhash=recent_blockhash, opts=OPTS) diff --git a/stake-pool/py/stake/actions.py b/stake-pool/py/stake/actions.py index 2963a43da62..1147a56db03 100644 --- a/stake-pool/py/stake/actions.py +++ b/stake-pool/py/stake/actions.py @@ -1,36 +1,40 @@ -from solana.publickey import PublicKey -from solana.keypair import Keypair +from solders.pubkey import Pubkey +from solders.keypair import Keypair +import solders.system_program as sys +from solana.constants import SYSTEM_PROGRAM_ID from solana.rpc.async_api import AsyncClient from solana.rpc.commitment import Confirmed from solana.rpc.types import TxOpts -from solana.sysvar import SYSVAR_CLOCK_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY +from solders.sysvar import CLOCK, STAKE_HISTORY from solana.transaction import Transaction -import solana.system_program as sys from stake.constants import STAKE_LEN, STAKE_PROGRAM_ID, SYSVAR_STAKE_CONFIG_ID from stake.state import Authorized, Lockup, StakeAuthorize import stake.instructions as st -async def create_stake(client: AsyncClient, payer: Keypair, stake: Keypair, authority: PublicKey, lamports: int): - print(f"Creating stake {stake.public_key}") +OPTS = TxOpts(skip_confirmation=False, preflight_commitment=Confirmed) + + +async def create_stake(client: AsyncClient, payer: Keypair, stake: Keypair, authority: Pubkey, lamports: int): + print(f"Creating stake {stake.pubkey()}") resp = await client.get_minimum_balance_for_rent_exemption(STAKE_LEN) - txn = Transaction() + txn = Transaction(fee_payer=payer.pubkey()) txn.add( sys.create_account( sys.CreateAccountParams( - from_pubkey=payer.public_key, - new_account_pubkey=stake.public_key, - lamports=resp['result'] + lamports, + from_pubkey=payer.pubkey(), + to_pubkey=stake.pubkey(), + lamports=resp.value + lamports, space=STAKE_LEN, - program_id=STAKE_PROGRAM_ID, + owner=STAKE_PROGRAM_ID, ) ) ) txn.add( st.initialize( st.InitializeParams( - stake=stake.public_key, + stake=stake.pubkey(), authorized=Authorized( staker=authority, withdrawer=authority, @@ -38,50 +42,50 @@ async def create_stake(client: AsyncClient, payer: Keypair, stake: Keypair, auth lockup=Lockup( unix_timestamp=0, epoch=0, - custodian=sys.SYS_PROGRAM_ID, + custodian=SYSTEM_PROGRAM_ID, ) ) ) ) - await client.send_transaction( - txn, payer, stake, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, payer, stake, recent_blockhash=recent_blockhash, opts=OPTS) -async def delegate_stake(client: AsyncClient, payer: Keypair, staker: Keypair, stake: PublicKey, vote: PublicKey): - txn = Transaction() +async def delegate_stake(client: AsyncClient, payer: Keypair, staker: Keypair, stake: Pubkey, vote: Pubkey): + txn = Transaction(fee_payer=payer.pubkey()) txn.add( st.delegate_stake( st.DelegateStakeParams( stake=stake, vote=vote, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - stake_history_sysvar=SYSVAR_STAKE_HISTORY_PUBKEY, + clock_sysvar=CLOCK, + stake_history_sysvar=STAKE_HISTORY, stake_config_id=SYSVAR_STAKE_CONFIG_ID, - staker=staker.public_key, + staker=staker.pubkey(), ) ) ) - signers = [payer, staker] if payer != staker else [payer] - await client.send_transaction( - txn, *signers, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + signers = [payer, staker] if payer.pubkey() != staker.pubkey() else [payer] + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, *signers, recent_blockhash=recent_blockhash, opts=OPTS) async def authorize( - client: AsyncClient, payer: Keypair, authority: Keypair, stake: PublicKey, - new_authority: PublicKey, stake_authorize: StakeAuthorize + client: AsyncClient, payer: Keypair, authority: Keypair, stake: Pubkey, + new_authority: Pubkey, stake_authorize: StakeAuthorize ): - txn = Transaction() + txn = Transaction(fee_payer=payer.pubkey()) txn.add( st.authorize( st.AuthorizeParams( stake=stake, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - authority=authority.public_key, + clock_sysvar=CLOCK, + authority=authority.pubkey(), new_authority=new_authority, stake_authorize=stake_authorize, ) ) ) - signers = [payer, authority] if payer != authority else [payer] - await client.send_transaction( - txn, *signers, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + signers = [payer, authority] if payer.pubkey() != authority.pubkey() else [payer] + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, *signers, recent_blockhash=recent_blockhash, opts=OPTS) diff --git a/stake-pool/py/stake/constants.py b/stake-pool/py/stake/constants.py index 344a8a5e768..da1c644c75d 100644 --- a/stake-pool/py/stake/constants.py +++ b/stake-pool/py/stake/constants.py @@ -1,11 +1,11 @@ """Stake Program Constants.""" -from solana.publickey import PublicKey +from solders.pubkey import Pubkey -STAKE_PROGRAM_ID: PublicKey = PublicKey("Stake11111111111111111111111111111111111111") +STAKE_PROGRAM_ID = Pubkey.from_string("Stake11111111111111111111111111111111111111") """Public key that identifies the Stake program.""" -SYSVAR_STAKE_CONFIG_ID: PublicKey = PublicKey("StakeConfig11111111111111111111111111111111") +SYSVAR_STAKE_CONFIG_ID = Pubkey.from_string("StakeConfig11111111111111111111111111111111") """Public key that identifies the Stake config sysvar.""" STAKE_LEN: int = 200 diff --git a/stake-pool/py/stake/instructions.py b/stake-pool/py/stake/instructions.py index f4b116bac5b..91e7e7dc651 100644 --- a/stake-pool/py/stake/instructions.py +++ b/stake-pool/py/stake/instructions.py @@ -7,9 +7,9 @@ from construct import Int32ul, Pass # type: ignore from construct import Bytes, Struct -from solana.publickey import PublicKey -from solana.sysvar import SYSVAR_RENT_PUBKEY -from solana.transaction import AccountMeta, TransactionInstruction +from solders.pubkey import Pubkey +from solders.sysvar import RENT +from solders.instruction import AccountMeta, Instruction from stake.constants import STAKE_PROGRAM_ID from stake.state import AUTHORIZED_LAYOUT, LOCKUP_LAYOUT, Authorized, Lockup, StakeAuthorize @@ -20,7 +20,7 @@ class InitializeParams(NamedTuple): """Initialize stake transaction params.""" - stake: PublicKey + stake: Pubkey """`[w]` Uninitialized stake account.""" authorized: Authorized """Information about the staker and withdrawer keys.""" @@ -31,32 +31,32 @@ class InitializeParams(NamedTuple): class DelegateStakeParams(NamedTuple): """Initialize stake transaction params.""" - stake: PublicKey + stake: Pubkey """`[w]` Uninitialized stake account.""" - vote: PublicKey + vote: Pubkey """`[]` Vote account to which this stake will be delegated.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - stake_history_sysvar: PublicKey + stake_history_sysvar: Pubkey """`[]` Stake history sysvar that carries stake warmup/cooldown history.""" - stake_config_id: PublicKey + stake_config_id: Pubkey """`[]` Address of config account that carries stake config.""" - staker: PublicKey + staker: Pubkey """`[s]` Stake authority.""" class AuthorizeParams(NamedTuple): """Authorize stake transaction params.""" - stake: PublicKey + stake: Pubkey """`[w]` Initialized stake account to modify.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - authority: PublicKey + authority: Pubkey """`[s]` Current stake authority.""" # Params - new_authority: PublicKey + new_authority: Pubkey """New authority's public key.""" stake_authorize: StakeAuthorize """Type of authority to modify, staker or withdrawer.""" @@ -116,12 +116,12 @@ class InstructionType(IntEnum): ) -def initialize(params: InitializeParams) -> TransactionInstruction: +def initialize(params: InitializeParams) -> Instruction: """Creates a transaction instruction to initialize a new stake.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake, is_signer=False, is_writable=True), - AccountMeta(pubkey=SYSVAR_RENT_PUBKEY, is_signer=False, is_writable=False), + AccountMeta(pubkey=RENT, is_signer=False, is_writable=False), ], program_id=STAKE_PROGRAM_ID, data=INSTRUCTIONS_LAYOUT.build( @@ -136,10 +136,10 @@ def initialize(params: InitializeParams) -> TransactionInstruction: ) -def delegate_stake(params: DelegateStakeParams) -> TransactionInstruction: +def delegate_stake(params: DelegateStakeParams) -> Instruction: """Creates an instruction to delegate a stake account.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake, is_signer=False, is_writable=True), AccountMeta(pubkey=params.vote, is_signer=False, is_writable=False), AccountMeta(pubkey=params.clock_sysvar, is_signer=False, is_writable=False), @@ -157,10 +157,10 @@ def delegate_stake(params: DelegateStakeParams) -> TransactionInstruction: ) -def authorize(params: AuthorizeParams) -> TransactionInstruction: +def authorize(params: AuthorizeParams) -> Instruction: """Creates an instruction to change the authority on a stake account.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake, is_signer=False, is_writable=True), AccountMeta(pubkey=params.clock_sysvar, is_signer=False, is_writable=False), AccountMeta(pubkey=params.authority, is_signer=True, is_writable=False), diff --git a/stake-pool/py/stake/state.py b/stake-pool/py/stake/state.py index 8d8ac81f128..45d1942ab40 100644 --- a/stake-pool/py/stake/state.py +++ b/stake-pool/py/stake/state.py @@ -4,8 +4,7 @@ from typing import NamedTuple, Dict from construct import Bytes, Container, Struct, Float64l, Int32ul, Int64ul # type: ignore -from solana.publickey import PublicKey -from solana.utils.helpers import decode_byte_string +from solders.pubkey import Pubkey PUBLIC_KEY_LAYOUT = Bytes(32) @@ -14,14 +13,14 @@ class Lockup(NamedTuple): """Lockup for a stake account.""" unix_timestamp: int epoch: int - custodian: PublicKey + custodian: Pubkey @classmethod def decode_container(cls, container: Container): return Lockup( unix_timestamp=container['unix_timestamp'], epoch=container['epoch'], - custodian=PublicKey(container['custodian']), + custodian=Pubkey(container['custodian']), ) def as_bytes_dict(self) -> Dict: @@ -32,8 +31,8 @@ def as_bytes_dict(self) -> Dict: class Authorized(NamedTuple): """Define who is authorized to change a stake.""" - staker: PublicKey - withdrawer: PublicKey + staker: Pubkey + withdrawer: Pubkey def as_bytes_dict(self) -> Dict: return { @@ -62,9 +61,8 @@ class StakeStake(NamedTuple): """Stake state.""" @classmethod - def decode(cls, data: str, encoding: str): - data_bytes = decode_byte_string(data, encoding) - parsed = STAKE_STATE_LAYOUT.parse(data_bytes) + def decode(cls, data: bytes): + parsed = STAKE_STATE_LAYOUT.parse(data) return StakeStake( state_type=parsed['state_type'], state=parsed['state'], diff --git a/stake-pool/py/stake_pool/actions.py b/stake-pool/py/stake_pool/actions.py index e44afba4d80..400f9252447 100644 --- a/stake-pool/py/stake_pool/actions.py +++ b/stake-pool/py/stake_pool/actions.py @@ -1,13 +1,13 @@ from typing import Optional, Tuple -from solana.keypair import Keypair -from solana.publickey import PublicKey +from solders.keypair import Keypair +from solders.pubkey import Pubkey from solana.rpc.async_api import AsyncClient from solana.rpc.commitment import Confirmed from solana.rpc.types import TxOpts -from solana.sysvar import SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY +from solders.sysvar import CLOCK, RENT, STAKE_HISTORY from solana.transaction import Transaction -import solana.system_program as sys +import solders.system_program as sys from spl.token.constants import TOKEN_PROGRAM_ID @@ -31,54 +31,58 @@ from spl_token.actions import create_mint, create_associated_token_account +OPTS = TxOpts(skip_confirmation=False, preflight_commitment=Confirmed) + + async def create(client: AsyncClient, manager: Keypair, stake_pool: Keypair, validator_list: Keypair, - pool_mint: PublicKey, reserve_stake: PublicKey, - manager_fee_account: PublicKey, fee: Fee, referral_fee: int): + pool_mint: Pubkey, reserve_stake: Pubkey, + manager_fee_account: Pubkey, fee: Fee, referral_fee: int): resp = await client.get_minimum_balance_for_rent_exemption(STAKE_POOL_LAYOUT.sizeof()) - pool_balance = resp['result'] - txn = Transaction() + pool_balance = resp.value + txn = Transaction(fee_payer=manager.pubkey()) txn.add( sys.create_account( sys.CreateAccountParams( - from_pubkey=manager.public_key, - new_account_pubkey=stake_pool.public_key, + from_pubkey=manager.pubkey(), + to_pubkey=stake_pool.pubkey(), lamports=pool_balance, space=STAKE_POOL_LAYOUT.sizeof(), - program_id=STAKE_POOL_PROGRAM_ID, + owner=STAKE_POOL_PROGRAM_ID, ) ) ) max_validators = 2950 # current supported max by the program, go big! validator_list_size = ValidatorList.calculate_validator_list_size(max_validators) resp = await client.get_minimum_balance_for_rent_exemption(validator_list_size) - validator_list_balance = resp['result'] + validator_list_balance = resp.value txn.add( sys.create_account( sys.CreateAccountParams( - from_pubkey=manager.public_key, - new_account_pubkey=validator_list.public_key, + from_pubkey=manager.pubkey(), + to_pubkey=validator_list.pubkey(), lamports=validator_list_balance, space=validator_list_size, - program_id=STAKE_POOL_PROGRAM_ID, + owner=STAKE_POOL_PROGRAM_ID, ) ) ) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash await client.send_transaction( - txn, manager, stake_pool, validator_list, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + txn, manager, stake_pool, validator_list, recent_blockhash=recent_blockhash, opts=OPTS) (withdraw_authority, seed) = find_withdraw_authority_program_address( - STAKE_POOL_PROGRAM_ID, stake_pool.public_key) - txn = Transaction() + STAKE_POOL_PROGRAM_ID, stake_pool.pubkey()) + txn = Transaction(fee_payer=manager.pubkey()) txn.add( sp.initialize( sp.InitializeParams( program_id=STAKE_POOL_PROGRAM_ID, - stake_pool=stake_pool.public_key, - manager=manager.public_key, - staker=manager.public_key, + stake_pool=stake_pool.pubkey(), + manager=manager.pubkey(), + staker=manager.pubkey(), withdraw_authority=withdraw_authority, - validator_list=validator_list.public_key, + validator_list=validator_list.pubkey(), reserve_stake=reserve_stake, pool_mint=pool_mint, manager_fee_account=manager_fee_account, @@ -91,17 +95,17 @@ async def create(client: AsyncClient, manager: Keypair, ) ) ) - await client.send_transaction( - txn, manager, validator_list, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, manager, recent_blockhash=recent_blockhash, opts=OPTS) async def create_all( client: AsyncClient, manager: Keypair, fee: Fee, referral_fee: int -) -> Tuple[PublicKey, PublicKey, PublicKey]: +) -> Tuple[Pubkey, Pubkey, Pubkey]: stake_pool = Keypair() validator_list = Keypair() (pool_withdraw_authority, seed) = find_withdraw_authority_program_address( - STAKE_POOL_PROGRAM_ID, stake_pool.public_key) + STAKE_POOL_PROGRAM_ID, stake_pool.pubkey()) reserve_stake = Keypair() await create_stake(client, manager, reserve_stake, pool_withdraw_authority, MINIMUM_RESERVE_LAMPORTS) @@ -112,26 +116,26 @@ async def create_all( manager_fee_account = await create_associated_token_account( client, manager, - manager.public_key, - pool_mint.public_key, + manager.pubkey(), + pool_mint.pubkey(), ) fee = Fee(numerator=1, denominator=1000) referral_fee = 20 await create( - client, manager, stake_pool, validator_list, pool_mint.public_key, - reserve_stake.public_key, manager_fee_account, fee, referral_fee) - return (stake_pool.public_key, validator_list.public_key, pool_mint.public_key) + client, manager, stake_pool, validator_list, pool_mint.pubkey(), + reserve_stake.pubkey(), manager_fee_account, fee, referral_fee) + return (stake_pool.pubkey(), validator_list.pubkey(), pool_mint.pubkey()) async def add_validator_to_pool( client: AsyncClient, staker: Keypair, - stake_pool_address: PublicKey, validator: PublicKey + stake_pool_address: Pubkey, validator: Pubkey ): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) - txn = Transaction() + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) + txn = Transaction(fee_payer=staker.pubkey()) txn.add( sp.add_validator_to_pool_with_vote( STAKE_POOL_PROGRAM_ID, @@ -143,22 +147,22 @@ async def add_validator_to_pool( None, ) ) - await client.send_transaction( - txn, staker, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, staker, recent_blockhash=recent_blockhash, opts=OPTS) async def remove_validator_from_pool( client: AsyncClient, staker: Keypair, - stake_pool_address: PublicKey, validator: PublicKey + stake_pool_address: Pubkey, validator: Pubkey ): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) resp = await client.get_account_info(stake_pool.validator_list, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) validator_info = next(x for x in validator_list.validators if x.vote_account_address == validator) - txn = Transaction() + txn = Transaction(fee_payer=staker.pubkey()) txn.add( sp.remove_validator_from_pool_with_vote( STAKE_POOL_PROGRAM_ID, @@ -170,22 +174,21 @@ async def remove_validator_from_pool( validator_info.transient_seed_suffix, ) ) - await client.send_transaction( - txn, staker, - opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, staker, recent_blockhash=recent_blockhash, opts=OPTS) async def deposit_sol( - client: AsyncClient, funder: Keypair, stake_pool_address: PublicKey, - destination_token_account: PublicKey, amount: int, + client: AsyncClient, funder: Keypair, stake_pool_address: Pubkey, + destination_token_account: Pubkey, amount: int, ): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) (withdraw_authority, seed) = find_withdraw_authority_program_address(STAKE_POOL_PROGRAM_ID, stake_pool_address) - txn = Transaction() + txn = Transaction(fee_payer=funder.pubkey()) txn.add( sp.deposit_sol( sp.DepositSolParams( @@ -193,47 +196,47 @@ async def deposit_sol( stake_pool=stake_pool_address, withdraw_authority=withdraw_authority, reserve_stake=stake_pool.reserve_stake, - funding_account=funder.public_key, + funding_account=funder.pubkey(), destination_pool_account=destination_token_account, manager_fee_account=stake_pool.manager_fee_account, referral_pool_account=destination_token_account, pool_mint=stake_pool.pool_mint, - system_program_id=sys.SYS_PROGRAM_ID, + system_program_id=sys.ID, token_program_id=stake_pool.token_program_id, amount=amount, deposit_authority=None, ) ) ) - await client.send_transaction( - txn, funder, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, funder, recent_blockhash=recent_blockhash, opts=OPTS) async def withdraw_sol( - client: AsyncClient, owner: Keypair, source_token_account: PublicKey, - stake_pool_address: PublicKey, destination_system_account: PublicKey, amount: int, + client: AsyncClient, owner: Keypair, source_token_account: Pubkey, + stake_pool_address: Pubkey, destination_system_account: Pubkey, amount: int, ): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) (withdraw_authority, seed) = find_withdraw_authority_program_address(STAKE_POOL_PROGRAM_ID, stake_pool_address) - txn = Transaction() + txn = Transaction(fee_payer=owner.pubkey()) txn.add( sp.withdraw_sol( sp.WithdrawSolParams( program_id=STAKE_POOL_PROGRAM_ID, stake_pool=stake_pool_address, withdraw_authority=withdraw_authority, - source_transfer_authority=owner.public_key, + source_transfer_authority=owner.pubkey(), source_pool_account=source_token_account, reserve_stake=stake_pool.reserve_stake, destination_system_account=destination_system_account, manager_fee_account=stake_pool.manager_fee_account, pool_mint=stake_pool.pool_mint, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - stake_history_sysvar=SYSVAR_STAKE_HISTORY_PUBKEY, + clock_sysvar=CLOCK, + stake_history_sysvar=STAKE_HISTORY, stake_program_id=STAKE_PROGRAM_ID, token_program_id=stake_pool.token_program_id, amount=amount, @@ -241,25 +244,25 @@ async def withdraw_sol( ) ) ) - await client.send_transaction( - txn, owner, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, owner, recent_blockhash=recent_blockhash, opts=OPTS) async def deposit_stake( client: AsyncClient, deposit_stake_authority: Keypair, - stake_pool_address: PublicKey, - validator_vote: PublicKey, - deposit_stake: PublicKey, - destination_pool_account: PublicKey, + stake_pool_address: Pubkey, + validator_vote: Pubkey, + deposit_stake: Pubkey, + destination_pool_account: Pubkey, ): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) resp = await client.get_account_info(stake_pool.validator_list, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) validator_info = next(x for x in validator_list.validators if x.vote_account_address == validator_vote) @@ -271,13 +274,13 @@ async def deposit_stake( validator_info.validator_seed_suffix or None, ) - txn = Transaction() + txn = Transaction(fee_payer=deposit_stake_authority.pubkey()) txn.add( st.authorize( st.AuthorizeParams( stake=deposit_stake, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - authority=deposit_stake_authority.public_key, + clock_sysvar=CLOCK, + authority=deposit_stake_authority.pubkey(), new_authority=stake_pool.stake_deposit_authority, stake_authorize=StakeAuthorize.STAKER, ) @@ -287,8 +290,8 @@ async def deposit_stake( st.authorize( st.AuthorizeParams( stake=deposit_stake, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - authority=deposit_stake_authority.public_key, + clock_sysvar=CLOCK, + authority=deposit_stake_authority.pubkey(), new_authority=stake_pool.stake_deposit_authority, stake_authorize=StakeAuthorize.WITHDRAWER, ) @@ -309,15 +312,15 @@ async def deposit_stake( manager_fee_account=stake_pool.manager_fee_account, referral_pool_account=destination_pool_account, pool_mint=stake_pool.pool_mint, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - stake_history_sysvar=SYSVAR_STAKE_HISTORY_PUBKEY, + clock_sysvar=CLOCK, + stake_history_sysvar=STAKE_HISTORY, token_program_id=stake_pool.token_program_id, stake_program_id=STAKE_PROGRAM_ID, ) ) ) - await client.send_transaction( - txn, deposit_stake_authority, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, deposit_stake_authority, recent_blockhash=recent_blockhash, opts=OPTS) async def withdraw_stake( @@ -325,19 +328,19 @@ async def withdraw_stake( payer: Keypair, source_transfer_authority: Keypair, destination_stake: Keypair, - stake_pool_address: PublicKey, - validator_vote: PublicKey, - destination_stake_authority: PublicKey, - source_pool_account: PublicKey, + stake_pool_address: Pubkey, + validator_vote: Pubkey, + destination_stake_authority: Pubkey, + source_pool_account: Pubkey, amount: int, ): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) resp = await client.get_account_info(stake_pool.validator_list, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) validator_info = next(x for x in validator_list.validators if x.vote_account_address == validator_vote) @@ -349,18 +352,18 @@ async def withdraw_stake( validator_info.validator_seed_suffix or None, ) - resp = await client.get_minimum_balance_for_rent_exemption(STAKE_LEN) - stake_rent_exemption = resp['result'] + rent_resp = await client.get_minimum_balance_for_rent_exemption(STAKE_LEN) + stake_rent_exemption = rent_resp.value - txn = Transaction() + txn = Transaction(fee_payer=payer.pubkey()) txn.add( sys.create_account( sys.CreateAccountParams( - from_pubkey=payer.public_key, - new_account_pubkey=destination_stake.public_key, + from_pubkey=payer.pubkey(), + to_pubkey=destination_stake.pubkey(), lamports=stake_rent_exemption, space=STAKE_LEN, - program_id=STAKE_PROGRAM_ID, + owner=STAKE_PROGRAM_ID, ) ) ) @@ -372,13 +375,13 @@ async def withdraw_stake( validator_list=stake_pool.validator_list, withdraw_authority=withdraw_authority, validator_stake=validator_stake, - destination_stake=destination_stake.public_key, + destination_stake=destination_stake.pubkey(), destination_stake_authority=destination_stake_authority, - source_transfer_authority=source_transfer_authority.public_key, + source_transfer_authority=source_transfer_authority.pubkey(), source_pool_account=source_pool_account, manager_fee_account=stake_pool.manager_fee_account, pool_mint=stake_pool.pool_mint, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, + clock_sysvar=CLOCK, token_program_id=stake_pool.token_program_id, stake_program_id=STAKE_PROGRAM_ID, amount=amount, @@ -387,18 +390,18 @@ async def withdraw_stake( ) signers = [payer, source_transfer_authority, destination_stake] \ if payer != source_transfer_authority else [payer, destination_stake] - await client.send_transaction( - txn, *signers, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, *signers, recent_blockhash=recent_blockhash, opts=OPTS) -async def update_stake_pool(client: AsyncClient, payer: Keypair, stake_pool_address: PublicKey): +async def update_stake_pool(client: AsyncClient, payer: Keypair, stake_pool_address: Pubkey): """Create and send all instructions to completely update a stake pool after epoch change.""" resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) resp = await client.get_account_info(stake_pool.validator_list, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) (withdraw_authority, seed) = find_withdraw_authority_program_address(STAKE_POOL_PROGRAM_ID, stake_pool_address) update_list_instructions = [] validator_chunks = [ @@ -431,8 +434,8 @@ async def update_stake_pool(client: AsyncClient, payer: Keypair, stake_pool_addr withdraw_authority=withdraw_authority, validator_list=stake_pool.validator_list, reserve_stake=stake_pool.reserve_stake, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - stake_history_sysvar=SYSVAR_STAKE_HISTORY_PUBKEY, + clock_sysvar=CLOCK, + stake_history_sysvar=STAKE_HISTORY, stake_program_id=STAKE_PROGRAM_ID, validator_and_transient_stake_pairs=validator_and_transient_stake_pairs, start_index=start_index, @@ -444,15 +447,16 @@ async def update_stake_pool(client: AsyncClient, payer: Keypair, stake_pool_addr if update_list_instructions: last_instruction = update_list_instructions.pop() for update_list_instruction in update_list_instructions: - txn = Transaction() + txn = Transaction(fee_payer=payer.pubkey()) txn.add(update_list_instruction) - await client.send_transaction( - txn, payer, opts=TxOpts(skip_confirmation=True, preflight_commitment=Confirmed)) - txn = Transaction() + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, payer, recent_blockhash=recent_blockhash, + opts=TxOpts(skip_confirmation=True, preflight_commitment=Confirmed)) + txn = Transaction(fee_payer=payer.pubkey()) txn.add(last_instruction) - await client.send_transaction( - txn, payer, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) - txn = Transaction() + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, payer, recent_blockhash=recent_blockhash, opts=OPTS) + txn = Transaction(fee_payer=payer.pubkey()) txn.add( sp.update_stake_pool_balance( sp.UpdateStakePoolBalanceParams( @@ -476,26 +480,26 @@ async def update_stake_pool(client: AsyncClient, payer: Keypair, stake_pool_addr ) ) ) - await client.send_transaction( - txn, payer, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, payer, recent_blockhash=recent_blockhash, opts=OPTS) async def increase_validator_stake( client: AsyncClient, payer: Keypair, staker: Keypair, - stake_pool_address: PublicKey, - validator_vote: PublicKey, + stake_pool_address: Pubkey, + validator_vote: Pubkey, lamports: int, ephemeral_stake_seed: Optional[int] = None ): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) resp = await client.get_account_info(stake_pool.validator_list, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) (withdraw_authority, seed) = find_withdraw_authority_program_address(STAKE_POOL_PROGRAM_ID, stake_pool_address) validator_info = next(x for x in validator_list.validators if x.vote_account_address == validator_vote) @@ -520,7 +524,7 @@ async def increase_validator_stake( validator_stake_seed ) - txn = Transaction() + txn = Transaction(fee_payer=payer.pubkey()) if ephemeral_stake_seed is not None: # We assume there is an existing transient account that we will update @@ -534,18 +538,18 @@ async def increase_validator_stake( sp.IncreaseAdditionalValidatorStakeParams( program_id=STAKE_POOL_PROGRAM_ID, stake_pool=stake_pool_address, - staker=staker.public_key, + staker=staker.pubkey(), withdraw_authority=withdraw_authority, validator_list=stake_pool.validator_list, reserve_stake=stake_pool.reserve_stake, transient_stake=transient_stake, validator_stake=validator_stake, validator_vote=validator_vote, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - rent_sysvar=SYSVAR_RENT_PUBKEY, - stake_history_sysvar=SYSVAR_STAKE_HISTORY_PUBKEY, + clock_sysvar=CLOCK, + rent_sysvar=RENT, + stake_history_sysvar=STAKE_HISTORY, stake_config_sysvar=SYSVAR_STAKE_CONFIG_ID, - system_program_id=sys.SYS_PROGRAM_ID, + system_program_id=sys.ID, stake_program_id=STAKE_PROGRAM_ID, lamports=lamports, transient_stake_seed=transient_stake_seed, @@ -561,18 +565,18 @@ async def increase_validator_stake( sp.IncreaseValidatorStakeParams( program_id=STAKE_POOL_PROGRAM_ID, stake_pool=stake_pool_address, - staker=staker.public_key, + staker=staker.pubkey(), withdraw_authority=withdraw_authority, validator_list=stake_pool.validator_list, reserve_stake=stake_pool.reserve_stake, transient_stake=transient_stake, validator_stake=validator_stake, validator_vote=validator_vote, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - rent_sysvar=SYSVAR_RENT_PUBKEY, - stake_history_sysvar=SYSVAR_STAKE_HISTORY_PUBKEY, + clock_sysvar=CLOCK, + rent_sysvar=RENT, + stake_history_sysvar=STAKE_HISTORY, stake_config_sysvar=SYSVAR_STAKE_CONFIG_ID, - system_program_id=sys.SYS_PROGRAM_ID, + system_program_id=sys.ID, stake_program_id=STAKE_PROGRAM_ID, lamports=lamports, transient_stake_seed=transient_stake_seed, @@ -581,26 +585,26 @@ async def increase_validator_stake( ) signers = [payer, staker] if payer != staker else [payer] - await client.send_transaction( - txn, *signers, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, *signers, recent_blockhash=recent_blockhash, opts=OPTS) async def decrease_validator_stake( client: AsyncClient, payer: Keypair, staker: Keypair, - stake_pool_address: PublicKey, - validator_vote: PublicKey, + stake_pool_address: Pubkey, + validator_vote: Pubkey, lamports: int, ephemeral_stake_seed: Optional[int] = None ): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) resp = await client.get_account_info(stake_pool.validator_list, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) (withdraw_authority, seed) = find_withdraw_authority_program_address(STAKE_POOL_PROGRAM_ID, stake_pool_address) validator_info = next(x for x in validator_list.validators if x.vote_account_address == validator_vote) @@ -625,7 +629,7 @@ async def decrease_validator_stake( transient_stake_seed, ) - txn = Transaction() + txn = Transaction(fee_payer=payer.pubkey()) if ephemeral_stake_seed is not None: @@ -640,16 +644,16 @@ async def decrease_validator_stake( sp.DecreaseAdditionalValidatorStakeParams( program_id=STAKE_POOL_PROGRAM_ID, stake_pool=stake_pool_address, - staker=staker.public_key, + staker=staker.pubkey(), withdraw_authority=withdraw_authority, validator_list=stake_pool.validator_list, reserve_stake=stake_pool.reserve_stake, validator_stake=validator_stake, transient_stake=transient_stake, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - rent_sysvar=SYSVAR_RENT_PUBKEY, - stake_history_sysvar=SYSVAR_STAKE_HISTORY_PUBKEY, - system_program_id=sys.SYS_PROGRAM_ID, + clock_sysvar=CLOCK, + rent_sysvar=RENT, + stake_history_sysvar=STAKE_HISTORY, + system_program_id=sys.ID, stake_program_id=STAKE_PROGRAM_ID, lamports=lamports, transient_stake_seed=transient_stake_seed, @@ -666,15 +670,15 @@ async def decrease_validator_stake( sp.DecreaseValidatorStakeWithReserveParams( program_id=STAKE_POOL_PROGRAM_ID, stake_pool=stake_pool_address, - staker=staker.public_key, + staker=staker.pubkey(), withdraw_authority=withdraw_authority, validator_list=stake_pool.validator_list, reserve_stake=stake_pool.reserve_stake, validator_stake=validator_stake, transient_stake=transient_stake, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - stake_history_sysvar=SYSVAR_STAKE_HISTORY_PUBKEY, - system_program_id=sys.SYS_PROGRAM_ID, + clock_sysvar=CLOCK, + stake_history_sysvar=STAKE_HISTORY, + system_program_id=sys.ID, stake_program_id=STAKE_PROGRAM_ID, lamports=lamports, transient_stake_seed=transient_stake_seed, @@ -683,20 +687,20 @@ async def decrease_validator_stake( ) signers = [payer, staker] if payer != staker else [payer] - await client.send_transaction( - txn, *signers, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, *signers, recent_blockhash=recent_blockhash, opts=OPTS) -async def create_token_metadata(client: AsyncClient, payer: Keypair, stake_pool_address: PublicKey, +async def create_token_metadata(client: AsyncClient, payer: Keypair, stake_pool_address: Pubkey, name: str, symbol: str, uri: str): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) (withdraw_authority, _seed) = find_withdraw_authority_program_address(STAKE_POOL_PROGRAM_ID, stake_pool_address) (token_metadata, _seed) = find_metadata_account(stake_pool.pool_mint) - txn = Transaction() + txn = Transaction(fee_payer=payer.pubkey()) txn.add( sp.create_token_metadata( sp.CreateTokenMetadataParams( @@ -704,31 +708,31 @@ async def create_token_metadata(client: AsyncClient, payer: Keypair, stake_pool_ stake_pool=stake_pool_address, manager=stake_pool.manager, pool_mint=stake_pool.pool_mint, - payer=payer.public_key, + payer=payer.pubkey(), name=name, symbol=symbol, uri=uri, withdraw_authority=withdraw_authority, token_metadata=token_metadata, metadata_program_id=METADATA_PROGRAM_ID, - system_program_id=sys.SYS_PROGRAM_ID, + system_program_id=sys.ID, ) ) ) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, payer, recent_blockhash=recent_blockhash, opts=OPTS) - await client.send_transaction(txn, payer, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) - -async def update_token_metadata(client: AsyncClient, payer: Keypair, stake_pool_address: PublicKey, +async def update_token_metadata(client: AsyncClient, payer: Keypair, stake_pool_address: Pubkey, name: str, symbol: str, uri: str): resp = await client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) (withdraw_authority, _seed) = find_withdraw_authority_program_address(STAKE_POOL_PROGRAM_ID, stake_pool_address) (token_metadata, _seed) = find_metadata_account(stake_pool.pool_mint) - txn = Transaction() + txn = Transaction(fee_payer=payer.pubkey()) txn.add( sp.update_token_metadata( sp.UpdateTokenMetadataParams( @@ -745,5 +749,5 @@ async def update_token_metadata(client: AsyncClient, payer: Keypair, stake_pool_ ) ) ) - - await client.send_transaction(txn, payer, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash + await client.send_transaction(txn, payer, recent_blockhash=recent_blockhash, opts=OPTS) diff --git a/stake-pool/py/stake_pool/constants.py b/stake-pool/py/stake_pool/constants.py index ff1f1dbe2f3..8a09dfbb20d 100644 --- a/stake-pool/py/stake_pool/constants.py +++ b/stake-pool/py/stake_pool/constants.py @@ -2,10 +2,10 @@ from typing import Optional, Tuple -from solana.publickey import PublicKey +from solders.pubkey import Pubkey from stake.constants import MINIMUM_DELEGATION -STAKE_POOL_PROGRAM_ID: PublicKey = PublicKey("SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy") +STAKE_POOL_PROGRAM_ID = Pubkey.from_string("SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy") """Public key that identifies the SPL Stake Pool program.""" MAX_VALIDATORS_TO_UPDATE: int = 5 @@ -17,40 +17,40 @@ MINIMUM_ACTIVE_STAKE: int = MINIMUM_DELEGATION """Minimum active delegated staked required in a stake account""" -METADATA_PROGRAM_ID: PublicKey = PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s") +METADATA_PROGRAM_ID = Pubkey.from_string("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s") """Public key that identifies the Metaplex Token Metadata program.""" def find_deposit_authority_program_address( - program_id: PublicKey, - stake_pool_address: PublicKey, -) -> Tuple[PublicKey, int]: + program_id: Pubkey, + stake_pool_address: Pubkey, +) -> Tuple[Pubkey, int]: """Generates the deposit authority program address for the stake pool""" - return PublicKey.find_program_address( + return Pubkey.find_program_address( [bytes(stake_pool_address), AUTHORITY_DEPOSIT], program_id, ) def find_withdraw_authority_program_address( - program_id: PublicKey, - stake_pool_address: PublicKey, -) -> Tuple[PublicKey, int]: + program_id: Pubkey, + stake_pool_address: Pubkey, +) -> Tuple[Pubkey, int]: """Generates the withdraw authority program address for the stake pool""" - return PublicKey.find_program_address( + return Pubkey.find_program_address( [bytes(stake_pool_address), AUTHORITY_WITHDRAW], program_id, ) def find_stake_program_address( - program_id: PublicKey, - vote_account_address: PublicKey, - stake_pool_address: PublicKey, + program_id: Pubkey, + vote_account_address: Pubkey, + stake_pool_address: Pubkey, seed: Optional[int] -) -> Tuple[PublicKey, int]: +) -> Tuple[Pubkey, int]: """Generates the stake program address for a validator's vote account""" - return PublicKey.find_program_address( + return Pubkey.find_program_address( [ bytes(vote_account_address), bytes(stake_pool_address), @@ -61,13 +61,13 @@ def find_stake_program_address( def find_transient_stake_program_address( - program_id: PublicKey, - vote_account_address: PublicKey, - stake_pool_address: PublicKey, + program_id: Pubkey, + vote_account_address: Pubkey, + stake_pool_address: Pubkey, seed: int, -) -> Tuple[PublicKey, int]: +) -> Tuple[Pubkey, int]: """Generates the stake program address for a validator's vote account""" - return PublicKey.find_program_address( + return Pubkey.find_program_address( [ TRANSIENT_STAKE_SEED_PREFIX, bytes(vote_account_address), @@ -79,13 +79,13 @@ def find_transient_stake_program_address( def find_ephemeral_stake_program_address( - program_id: PublicKey, - stake_pool_address: PublicKey, + program_id: Pubkey, + stake_pool_address: Pubkey, seed: int -) -> Tuple[PublicKey, int]: +) -> Tuple[Pubkey, int]: """Generates the ephemeral program address for stake pool redelegation""" - return PublicKey.find_program_address( + return Pubkey.find_program_address( [ EPHEMERAL_STAKE_SEED_PREFIX, bytes(stake_pool_address), @@ -96,10 +96,10 @@ def find_ephemeral_stake_program_address( def find_metadata_account( - mint_key: PublicKey -) -> Tuple[PublicKey, int]: + mint_key: Pubkey +) -> Tuple[Pubkey, int]: """Generates the metadata account program address""" - return PublicKey.find_program_address( + return Pubkey.find_program_address( [ METADATA_SEED_PREFIX, bytes(METADATA_PROGRAM_ID), diff --git a/stake-pool/py/stake_pool/instructions.py b/stake-pool/py/stake_pool/instructions.py index 8a3ae4cf5f3..e5d9199cd6f 100644 --- a/stake-pool/py/stake_pool/instructions.py +++ b/stake-pool/py/stake_pool/instructions.py @@ -4,10 +4,10 @@ from typing import List, NamedTuple, Optional from construct import Prefixed, GreedyString, Struct, Switch, Int8ul, Int32ul, Int64ul, Pass # type: ignore -from solana.publickey import PublicKey -from solana.transaction import AccountMeta, TransactionInstruction -from solana.system_program import SYS_PROGRAM_ID -from solana.sysvar import SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY +from solana.constants import SYSTEM_PROGRAM_ID +from solders.pubkey import Pubkey +from solders.instruction import AccountMeta, Instruction +from solders.sysvar import CLOCK, RENT, STAKE_HISTORY from spl.token.constants import TOKEN_PROGRAM_ID from stake.constants import STAKE_PROGRAM_ID, SYSVAR_STAKE_CONFIG_ID @@ -41,25 +41,25 @@ class InitializeParams(NamedTuple): """Initialize token mint transaction params.""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """[w] Stake Pool account to initialize.""" - manager: PublicKey + manager: Pubkey """[s] Manager for new stake pool.""" - staker: PublicKey + staker: Pubkey """[] Staker for the new stake pool.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """[] Withdraw authority for the new stake pool.""" - validator_list: PublicKey + validator_list: Pubkey """[w] Uninitialized validator list account for the new stake pool.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """[] Reserve stake account.""" - pool_mint: PublicKey + pool_mint: Pubkey """[w] Pool token mint account.""" - manager_fee_account: PublicKey + manager_fee_account: Pubkey """[w] Manager's fee account""" - token_program_id: PublicKey + token_program_id: Pubkey """[] SPL Token program id.""" # Params @@ -75,40 +75,40 @@ class InitializeParams(NamedTuple): """Maximum number of possible validators in the pool.""" # Optional - deposit_authority: Optional[PublicKey] = None + deposit_authority: Optional[Pubkey] = None """[] Optional deposit authority that must sign all deposits.""" class AddValidatorToPoolParams(NamedTuple): """(Staker only) Adds stake account delegated to validator to the pool's list of managed validators.""" - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[w]` Stake pool.""" - staker: PublicKey + staker: Pubkey """`[s]` Staker.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """`[w]` Reserve stake account.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" - validator_stake: PublicKey + validator_stake: Pubkey """`[w]` Stake account to add to the pool.""" - validator_vote: PublicKey + validator_vote: Pubkey """`[]` Validator this stake account will be delegated to.""" - rent_sysvar: PublicKey + rent_sysvar: Pubkey """`[]` Rent sysvar.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - stake_history_sysvar: PublicKey + stake_history_sysvar: Pubkey """'[]' Stake history sysvar.""" - stake_config_sysvar: PublicKey + stake_config_sysvar: Pubkey """'[]' Stake config sysvar.""" - system_program_id: PublicKey + system_program_id: Pubkey """`[]` System program.""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program.""" # Params @@ -119,23 +119,23 @@ class AddValidatorToPoolParams(NamedTuple): class RemoveValidatorFromPoolParams(NamedTuple): """(Staker only) Removes validator from the pool.""" - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[w]` Stake pool.""" - staker: PublicKey + staker: Pubkey """`[s]` Staker.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" - validator_stake: PublicKey + validator_stake: Pubkey """`[w]` Stake account to remove from the pool.""" - transient_stake: PublicKey + transient_stake: Pubkey """`[]` Transient stake account, to check that there's no activation ongoing.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """'[]' Stake config sysvar.""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program.""" @@ -143,27 +143,27 @@ class DecreaseValidatorStakeParams(NamedTuple): """(Staker only) Decrease active stake on a validator, eventually moving it to the reserve""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[]` Stake pool.""" - staker: PublicKey + staker: Pubkey """`[s]` Staker.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" - validator_stake: PublicKey + validator_stake: Pubkey """`[w]` Canonical stake to split from.""" - transient_stake: PublicKey + transient_stake: Pubkey """`[w]` Transient stake account to receive split.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - rent_sysvar: PublicKey + rent_sysvar: Pubkey """`[]` Rent sysvar.""" - system_program_id: PublicKey + system_program_id: Pubkey """`[]` System program.""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program.""" # Params @@ -177,29 +177,29 @@ class DecreaseValidatorStakeWithReserveParams(NamedTuple): """(Staker only) Decrease active stake on a validator, eventually moving it to the reserve""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[]` Stake pool.""" - staker: PublicKey + staker: Pubkey """`[s]` Staker.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """`[w]` Stake pool's reserve.""" - validator_stake: PublicKey + validator_stake: Pubkey """`[w]` Canonical stake to split from.""" - transient_stake: PublicKey + transient_stake: Pubkey """`[w]` Transient stake account to receive split.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - stake_history_sysvar: PublicKey + stake_history_sysvar: Pubkey """'[]' Stake history sysvar.""" - system_program_id: PublicKey + system_program_id: Pubkey """`[]` System program.""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program.""" # Params @@ -213,35 +213,35 @@ class IncreaseValidatorStakeParams(NamedTuple): """(Staker only) Increase stake on a validator from the reserve account.""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[]` Stake pool.""" - staker: PublicKey + staker: Pubkey """`[s]` Staker.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """`[w]` Stake pool's reserve.""" - transient_stake: PublicKey + transient_stake: Pubkey """`[w]` Transient stake account to receive split.""" - validator_stake: PublicKey + validator_stake: Pubkey """`[]` Canonical stake account to check.""" - validator_vote: PublicKey + validator_vote: Pubkey """`[]` Validator vote account to delegate to.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - rent_sysvar: PublicKey + rent_sysvar: Pubkey """`[]` Rent sysvar.""" - stake_history_sysvar: PublicKey + stake_history_sysvar: Pubkey """'[]' Stake history sysvar.""" - stake_config_sysvar: PublicKey + stake_config_sysvar: Pubkey """'[]' Stake config sysvar.""" - system_program_id: PublicKey + system_program_id: Pubkey """`[]` System program.""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program.""" # Params @@ -259,23 +259,23 @@ class UpdateValidatorListBalanceParams(NamedTuple): """Updates balances of validator and transient stake accounts in the pool.""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[]` Stake pool.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """`[w]` Stake pool's reserve.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - stake_history_sysvar: PublicKey + stake_history_sysvar: Pubkey """'[]' Stake history sysvar.""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program.""" - validator_and_transient_stake_pairs: List[PublicKey] + validator_and_transient_stake_pairs: List[Pubkey] """[] N pairs of validator and transient stake accounts""" # Params @@ -288,102 +288,102 @@ class UpdateValidatorListBalanceParams(NamedTuple): class UpdateStakePoolBalanceParams(NamedTuple): """Updates total pool balance based on balances in the reserve and validator list.""" - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[w]` Stake pool.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """`[w]` Stake pool's reserve.""" - manager_fee_account: PublicKey + manager_fee_account: Pubkey """`[w]` Account to receive pool fee tokens.""" - pool_mint: PublicKey + pool_mint: Pubkey """`[w]` Pool mint account.""" - token_program_id: PublicKey + token_program_id: Pubkey """`[]` Pool token program.""" class CleanupRemovedValidatorEntriesParams(NamedTuple): """Cleans up validator stake account entries marked as `ReadyForRemoval`""" - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[w]` Stake pool.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" class DepositStakeParams(NamedTuple): """Deposits a stake account into the pool in exchange for pool tokens""" - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[w]` Stake pool""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account""" - deposit_authority: PublicKey + deposit_authority: Pubkey """`[s]/[]` Stake pool deposit authority""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority""" - deposit_stake: PublicKey + deposit_stake: Pubkey """`[w]` Stake account to join the pool (stake's withdraw authority set to the stake pool deposit authority)""" - validator_stake: PublicKey + validator_stake: Pubkey """`[w]` Validator stake account for the stake account to be merged with""" - reserve_stake: PublicKey + reserve_stake: Pubkey """`[w]` Reserve stake account, to withdraw rent exempt reserve""" - destination_pool_account: PublicKey + destination_pool_account: Pubkey """`[w]` User account to receive pool tokens""" - manager_fee_account: PublicKey + manager_fee_account: Pubkey """`[w]` Account to receive pool fee tokens""" - referral_pool_account: PublicKey + referral_pool_account: Pubkey """`[w]` Account to receive a portion of pool fee tokens as referral fees""" - pool_mint: PublicKey + pool_mint: Pubkey """`[w]` Pool token mint account""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Sysvar clock account""" - stake_history_sysvar: PublicKey + stake_history_sysvar: Pubkey """`[]` Sysvar stake history account""" - token_program_id: PublicKey + token_program_id: Pubkey """`[]` Pool token program id""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program id""" class WithdrawStakeParams(NamedTuple): """Withdraws a stake account from the pool in exchange for pool tokens""" - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[w]` Stake pool""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority""" - validator_stake: PublicKey + validator_stake: Pubkey """`[w]` Validator or reserve stake account to split""" - destination_stake: PublicKey + destination_stake: Pubkey """`[w]` Unitialized stake account to receive withdrawal""" - destination_stake_authority: PublicKey + destination_stake_authority: Pubkey """`[]` User account to set as a new withdraw authority""" - source_transfer_authority: PublicKey + source_transfer_authority: Pubkey """`[s]` User transfer authority, for pool token account""" - source_pool_account: PublicKey + source_pool_account: Pubkey """`[w]` User account with pool tokens to burn from""" - manager_fee_account: PublicKey + manager_fee_account: Pubkey """`[w]` Account to receive pool fee tokens""" - pool_mint: PublicKey + pool_mint: Pubkey """`[w]` Pool token mint account""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Sysvar clock account""" - token_program_id: PublicKey + token_program_id: Pubkey """`[]` Pool token program id""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program id""" # Params @@ -408,27 +408,27 @@ class DepositSolParams(NamedTuple): representing ownership into the pool. Inputs are converted to the current ratio.""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[w]` Stake pool.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """`[w]` Stake pool's reserve.""" - funding_account: PublicKey + funding_account: Pubkey """`[ws]` Funding account (must be a system account).""" - destination_pool_account: PublicKey + destination_pool_account: Pubkey """`[w]` User account to receive pool tokens.""" - manager_fee_account: PublicKey + manager_fee_account: Pubkey """`[w]` Manager's pool token account to receive deposit fee.""" - referral_pool_account: PublicKey + referral_pool_account: Pubkey """`[w]` Referrer pool token account to receive referral fee.""" - pool_mint: PublicKey + pool_mint: Pubkey """`[w]` Pool token mint.""" - system_program_id: PublicKey + system_program_id: Pubkey """`[]` System program.""" - token_program_id: PublicKey + token_program_id: Pubkey """`[]` Token program.""" # Params @@ -436,7 +436,7 @@ class DepositSolParams(NamedTuple): """Amount of SOL to deposit""" # Optional - deposit_authority: Optional[PublicKey] = None + deposit_authority: Optional[Pubkey] = None """`[s]` (Optional) Stake pool sol deposit authority.""" @@ -448,31 +448,31 @@ class WithdrawSolParams(NamedTuple): """Withdraw SOL directly from the pool's reserve account.""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[w]` Stake pool.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - source_transfer_authority: PublicKey + source_transfer_authority: Pubkey """`[s]` Transfer authority for user pool token account.""" - source_pool_account: PublicKey + source_pool_account: Pubkey """`[w]` User's pool token account to burn pool tokens.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """`[w]` Stake pool's reserve.""" - destination_system_account: PublicKey + destination_system_account: Pubkey """`[w]` Destination system account to receive lamports from the reserve.""" - manager_fee_account: PublicKey + manager_fee_account: Pubkey """`[w]` Manager's pool token account to receive fee.""" - pool_mint: PublicKey + pool_mint: Pubkey """`[w]` Pool token mint.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - stake_history_sysvar: PublicKey + stake_history_sysvar: Pubkey """'[]' Stake history sysvar.""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program.""" - token_program_id: PublicKey + token_program_id: Pubkey """`[]` Token program.""" # Params @@ -480,7 +480,7 @@ class WithdrawSolParams(NamedTuple): """Amount of pool tokens to burn""" # Optional - sol_withdraw_authority: Optional[PublicKey] = None + sol_withdraw_authority: Optional[Pubkey] = None """`[s]` (Optional) Stake pool sol withdraw authority.""" @@ -488,23 +488,23 @@ class CreateTokenMetadataParams(NamedTuple): """Create token metadata for the stake-pool token in the metaplex-token program.""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[]` Stake pool.""" - manager: PublicKey + manager: Pubkey """`[s]` Manager.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - pool_mint: PublicKey + pool_mint: Pubkey """`[]` Pool token mint account.""" - payer: PublicKey + payer: Pubkey """`[s, w]` Payer for creation of token metadata account.""" - token_metadata: PublicKey + token_metadata: Pubkey """`[w]` Token metadata program account.""" - metadata_program_id: PublicKey + metadata_program_id: Pubkey """`[]` Metadata program id""" - system_program_id: PublicKey + system_program_id: Pubkey """`[]` System program id""" # Params @@ -519,19 +519,19 @@ class CreateTokenMetadataParams(NamedTuple): class UpdateTokenMetadataParams(NamedTuple): """Update token metadata for the stake-pool token in the metaplex-token program.""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[]` Stake pool.""" - manager: PublicKey + manager: Pubkey """`[s]` Manager.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - pool_mint: PublicKey + pool_mint: Pubkey """`[]` Pool token mint account.""" - token_metadata: PublicKey + token_metadata: Pubkey """`[w]` Token metadata program account.""" - metadata_program_id: PublicKey + metadata_program_id: Pubkey """`[]` Metadata program id""" # Params @@ -547,37 +547,37 @@ class IncreaseAdditionalValidatorStakeParams(NamedTuple): """(Staker only) Increase stake on a validator from the reserve account.""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[]` Stake pool.""" - staker: PublicKey + staker: Pubkey """`[s]` Staker.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """`[w]` Stake pool's reserve.""" - ephemeral_stake: PublicKey + ephemeral_stake: Pubkey """The ephemeral stake account used during the operation.""" - transient_stake: PublicKey + transient_stake: Pubkey """`[w]` Transient stake account to receive split.""" - validator_stake: PublicKey + validator_stake: Pubkey """`[]` Canonical stake account to check.""" - validator_vote: PublicKey + validator_vote: Pubkey """`[]` Validator vote account to delegate to.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - rent_sysvar: PublicKey + rent_sysvar: Pubkey """`[]` Rent sysvar.""" - stake_history_sysvar: PublicKey + stake_history_sysvar: Pubkey """'[]' Stake history sysvar.""" - stake_config_sysvar: PublicKey + stake_config_sysvar: Pubkey """'[]' Stake config sysvar.""" - system_program_id: PublicKey + system_program_id: Pubkey """`[]` System program.""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program.""" # Params @@ -593,33 +593,33 @@ class DecreaseAdditionalValidatorStakeParams(NamedTuple): """(Staker only) Decrease active stake on a validator, eventually moving it to the reserve""" # Accounts - program_id: PublicKey + program_id: Pubkey """SPL Stake Pool program account.""" - stake_pool: PublicKey + stake_pool: Pubkey """`[]` Stake pool.""" - staker: PublicKey + staker: Pubkey """`[s]` Staker.""" - withdraw_authority: PublicKey + withdraw_authority: Pubkey """`[]` Stake pool withdraw authority.""" - validator_list: PublicKey + validator_list: Pubkey """`[w]` Validator stake list storage account.""" - reserve_stake: PublicKey + reserve_stake: Pubkey """The reserve stake account to move the stake to.""" - validator_stake: PublicKey + validator_stake: Pubkey """`[w]` Canonical stake to split from.""" - ephemeral_stake: PublicKey + ephemeral_stake: Pubkey """The ephemeral stake account used during the operation.""" - transient_stake: PublicKey + transient_stake: Pubkey """`[w]` Transient stake account to receive split.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - rent_sysvar: PublicKey + rent_sysvar: Pubkey """`[]` Rent sysvar.""" - stake_history_sysvar: PublicKey + stake_history_sysvar: Pubkey """'[]' Stake history sysvar.""" - system_program_id: PublicKey + system_program_id: Pubkey """`[]` System program.""" - stake_program_id: PublicKey + stake_program_id: Pubkey """`[]` Stake program.""" # Params @@ -730,7 +730,7 @@ class InstructionType(IntEnum): ) -def initialize(params: InitializeParams) -> TransactionInstruction: +def initialize(params: InitializeParams) -> Instruction: """Creates a transaction instruction to initialize a new stake pool.""" data = INSTRUCTIONS_LAYOUT.build( @@ -745,7 +745,7 @@ def initialize(params: InitializeParams) -> TransactionInstruction: ), ) ) - keys = [ + accounts = [ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=True), AccountMeta(pubkey=params.manager, is_signer=True, is_writable=False), AccountMeta(pubkey=params.staker, is_signer=False, is_writable=False), @@ -757,20 +757,20 @@ def initialize(params: InitializeParams) -> TransactionInstruction: AccountMeta(pubkey=TOKEN_PROGRAM_ID, is_signer=False, is_writable=False), ] if params.deposit_authority: - keys.append( + accounts.append( AccountMeta(pubkey=params.deposit_authority, is_signer=True, is_writable=False), ) - return TransactionInstruction( - keys=keys, + return Instruction( + accounts=accounts, program_id=params.program_id, data=data, ) -def add_validator_to_pool(params: AddValidatorToPoolParams) -> TransactionInstruction: +def add_validator_to_pool(params: AddValidatorToPoolParams) -> Instruction: """Creates instruction to add a validator to the pool.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=True), AccountMeta(pubkey=params.staker, is_signer=True, is_writable=False), AccountMeta(pubkey=params.reserve_stake, is_signer=False, is_writable=True), @@ -796,14 +796,14 @@ def add_validator_to_pool(params: AddValidatorToPoolParams) -> TransactionInstru def add_validator_to_pool_with_vote( - program_id: PublicKey, - stake_pool: PublicKey, - staker: PublicKey, - validator_list: PublicKey, - reserve_stake: PublicKey, - validator: PublicKey, + program_id: Pubkey, + stake_pool: Pubkey, + staker: Pubkey, + validator_list: Pubkey, + reserve_stake: Pubkey, + validator: Pubkey, validator_stake_seed: Optional[int], -) -> TransactionInstruction: +) -> Instruction: """Creates instruction to add a validator based on their vote account address.""" (withdraw_authority, _seed) = find_withdraw_authority_program_address(program_id, stake_pool) (validator_stake, _seed) = find_stake_program_address(program_id, validator, stake_pool, validator_stake_seed) @@ -817,21 +817,21 @@ def add_validator_to_pool_with_vote( validator_list=validator_list, validator_stake=validator_stake, validator_vote=validator, - rent_sysvar=SYSVAR_RENT_PUBKEY, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - stake_history_sysvar=SYSVAR_STAKE_HISTORY_PUBKEY, + rent_sysvar=RENT, + clock_sysvar=CLOCK, + stake_history_sysvar=STAKE_HISTORY, stake_config_sysvar=SYSVAR_STAKE_CONFIG_ID, - system_program_id=SYS_PROGRAM_ID, + system_program_id=SYSTEM_PROGRAM_ID, stake_program_id=STAKE_PROGRAM_ID, seed=validator_stake_seed, ) ) -def remove_validator_from_pool(params: RemoveValidatorFromPoolParams) -> TransactionInstruction: +def remove_validator_from_pool(params: RemoveValidatorFromPoolParams) -> Instruction: """Creates instruction to remove a validator from the pool.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=True), AccountMeta(pubkey=params.staker, is_signer=True, is_writable=False), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), @@ -852,14 +852,14 @@ def remove_validator_from_pool(params: RemoveValidatorFromPoolParams) -> Transac def remove_validator_from_pool_with_vote( - program_id: PublicKey, - stake_pool: PublicKey, - staker: PublicKey, - validator_list: PublicKey, - validator: PublicKey, + program_id: Pubkey, + stake_pool: Pubkey, + staker: Pubkey, + validator_list: Pubkey, + validator: Pubkey, validator_stake_seed: Optional[int], transient_stake_seed: int, -) -> TransactionInstruction: +) -> Instruction: """Creates instruction to remove a validator based on their vote account address.""" (withdraw_authority, seed) = find_withdraw_authority_program_address(program_id, stake_pool) (validator_stake, seed) = find_stake_program_address(program_id, validator, stake_pool, validator_stake_seed) @@ -874,15 +874,15 @@ def remove_validator_from_pool_with_vote( validator_list=validator_list, validator_stake=validator_stake, transient_stake=transient_stake, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, + clock_sysvar=CLOCK, stake_program_id=STAKE_PROGRAM_ID, ) ) -def deposit_stake(params: DepositStakeParams) -> TransactionInstruction: +def deposit_stake(params: DepositStakeParams) -> Instruction: """Creates a transaction instruction to deposit a stake account into a stake pool.""" - keys = [ + accounts = [ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=True), AccountMeta(pubkey=params.validator_list, is_signer=False, is_writable=True), AccountMeta(pubkey=params.deposit_authority, is_signer=False, is_writable=False), @@ -899,8 +899,8 @@ def deposit_stake(params: DepositStakeParams) -> TransactionInstruction: AccountMeta(pubkey=params.token_program_id, is_signer=False, is_writable=False), AccountMeta(pubkey=params.stake_program_id, is_signer=False, is_writable=False), ] - return TransactionInstruction( - keys=keys, + return Instruction( + accounts=accounts, program_id=params.program_id, data=INSTRUCTIONS_LAYOUT.build( dict( @@ -911,10 +911,10 @@ def deposit_stake(params: DepositStakeParams) -> TransactionInstruction: ) -def withdraw_stake(params: WithdrawStakeParams) -> TransactionInstruction: +def withdraw_stake(params: WithdrawStakeParams) -> Instruction: """Creates a transaction instruction to withdraw active stake from a stake pool.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=True), AccountMeta(pubkey=params.validator_list, is_signer=False, is_writable=True), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), @@ -939,9 +939,9 @@ def withdraw_stake(params: WithdrawStakeParams) -> TransactionInstruction: ) -def deposit_sol(params: DepositSolParams) -> TransactionInstruction: +def deposit_sol(params: DepositSolParams) -> Instruction: """Creates a transaction instruction to deposit SOL into a stake pool.""" - keys = [ + accounts = [ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=True), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), AccountMeta(pubkey=params.reserve_stake, is_signer=False, is_writable=True), @@ -954,9 +954,9 @@ def deposit_sol(params: DepositSolParams) -> TransactionInstruction: AccountMeta(pubkey=params.token_program_id, is_signer=False, is_writable=False), ] if params.deposit_authority: - keys.append(AccountMeta(pubkey=params.deposit_authority, is_signer=True, is_writable=False)) - return TransactionInstruction( - keys=keys, + accounts.append(AccountMeta(pubkey=params.deposit_authority, is_signer=True, is_writable=False)) + return Instruction( + accounts=accounts, program_id=params.program_id, data=INSTRUCTIONS_LAYOUT.build( dict( @@ -967,9 +967,9 @@ def deposit_sol(params: DepositSolParams) -> TransactionInstruction: ) -def withdraw_sol(params: WithdrawSolParams) -> TransactionInstruction: +def withdraw_sol(params: WithdrawSolParams) -> Instruction: """Creates a transaction instruction to withdraw SOL from a stake pool.""" - keys = [ + accounts = [ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=True), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), AccountMeta(pubkey=params.source_transfer_authority, is_signer=True, is_writable=False), @@ -987,8 +987,8 @@ def withdraw_sol(params: WithdrawSolParams) -> TransactionInstruction: if params.sol_withdraw_authority: AccountMeta(pubkey=params.sol_withdraw_authority, is_signer=True, is_writable=False) - return TransactionInstruction( - keys=keys, + return Instruction( + accounts=accounts, program_id=params.program_id, data=INSTRUCTIONS_LAYOUT.build( dict( @@ -999,9 +999,9 @@ def withdraw_sol(params: WithdrawSolParams) -> TransactionInstruction: ) -def update_validator_list_balance(params: UpdateValidatorListBalanceParams) -> TransactionInstruction: +def update_validator_list_balance(params: UpdateValidatorListBalanceParams) -> Instruction: """Creates instruction to update a set of validators in the stake pool.""" - keys = [ + accounts = [ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=False), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), AccountMeta(pubkey=params.validator_list, is_signer=False, is_writable=True), @@ -1010,12 +1010,12 @@ def update_validator_list_balance(params: UpdateValidatorListBalanceParams) -> T AccountMeta(pubkey=params.stake_history_sysvar, is_signer=False, is_writable=False), AccountMeta(pubkey=params.stake_program_id, is_signer=False, is_writable=False), ] - keys.extend([ + accounts.extend([ AccountMeta(pubkey=pubkey, is_signer=False, is_writable=True) for pubkey in params.validator_and_transient_stake_pairs ]) - return TransactionInstruction( - keys=keys, + return Instruction( + accounts=accounts, program_id=params.program_id, data=INSTRUCTIONS_LAYOUT.build( dict( @@ -1026,10 +1026,10 @@ def update_validator_list_balance(params: UpdateValidatorListBalanceParams) -> T ) -def update_stake_pool_balance(params: UpdateStakePoolBalanceParams) -> TransactionInstruction: +def update_stake_pool_balance(params: UpdateStakePoolBalanceParams) -> Instruction: """Creates instruction to update the overall stake pool balance.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=True), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), AccountMeta(pubkey=params.validator_list, is_signer=False, is_writable=True), @@ -1048,10 +1048,10 @@ def update_stake_pool_balance(params: UpdateStakePoolBalanceParams) -> Transacti ) -def cleanup_removed_validator_entries(params: CleanupRemovedValidatorEntriesParams) -> TransactionInstruction: +def cleanup_removed_validator_entries(params: CleanupRemovedValidatorEntriesParams) -> Instruction: """Creates instruction to cleanup removed validator entries.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=False), AccountMeta(pubkey=params.validator_list, is_signer=False, is_writable=True), ], @@ -1065,10 +1065,10 @@ def cleanup_removed_validator_entries(params: CleanupRemovedValidatorEntriesPara ) -def increase_validator_stake(params: IncreaseValidatorStakeParams) -> TransactionInstruction: +def increase_validator_stake(params: IncreaseValidatorStakeParams) -> Instruction: """Creates instruction to increase the stake on a validator.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=False), AccountMeta(pubkey=params.staker, is_signer=True, is_writable=False), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), @@ -1099,11 +1099,11 @@ def increase_validator_stake(params: IncreaseValidatorStakeParams) -> Transactio def increase_additional_validator_stake( params: IncreaseAdditionalValidatorStakeParams, - ) -> TransactionInstruction: + ) -> Instruction: """Creates `IncreaseAdditionalValidatorStake` instruction (rebalance from reserve account to transient account)""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=False), AccountMeta(pubkey=params.staker, is_signer=True, is_writable=False), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), @@ -1133,10 +1133,10 @@ def increase_additional_validator_stake( ) -def decrease_validator_stake(params: DecreaseValidatorStakeParams) -> TransactionInstruction: +def decrease_validator_stake(params: DecreaseValidatorStakeParams) -> Instruction: """Creates instruction to decrease the stake on a validator.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=False), AccountMeta(pubkey=params.staker, is_signer=True, is_writable=False), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), @@ -1161,11 +1161,11 @@ def decrease_validator_stake(params: DecreaseValidatorStakeParams) -> Transactio ) -def decrease_additional_validator_stake(params: DecreaseAdditionalValidatorStakeParams) -> TransactionInstruction: +def decrease_additional_validator_stake(params: DecreaseAdditionalValidatorStakeParams) -> Instruction: """ Creates `DecreaseAdditionalValidatorStake` instruction (rebalance from validator account to transient account).""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=False), AccountMeta(pubkey=params.staker, is_signer=True, is_writable=False), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), @@ -1193,10 +1193,10 @@ def decrease_additional_validator_stake(params: DecreaseAdditionalValidatorStake ) -def decrease_validator_stake_with_reserve(params: DecreaseValidatorStakeWithReserveParams) -> TransactionInstruction: +def decrease_validator_stake_with_reserve(params: DecreaseValidatorStakeWithReserveParams) -> Instruction: """Creates instruction to decrease the stake on a validator.""" - return TransactionInstruction( - keys=[ + return Instruction( + accounts=[ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=False), AccountMeta(pubkey=params.staker, is_signer=True, is_writable=False), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), @@ -1222,10 +1222,10 @@ def decrease_validator_stake_with_reserve(params: DecreaseValidatorStakeWithRese ) -def create_token_metadata(params: CreateTokenMetadataParams) -> TransactionInstruction: +def create_token_metadata(params: CreateTokenMetadataParams) -> Instruction: """Creates an instruction to create metadata using the mpl token metadata program for the pool token.""" - keys = [ + accounts = [ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=False), AccountMeta(pubkey=params.manager, is_signer=True, is_writable=False), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), @@ -1235,8 +1235,8 @@ def create_token_metadata(params: CreateTokenMetadataParams) -> TransactionInstr AccountMeta(pubkey=params.metadata_program_id, is_signer=False, is_writable=False), AccountMeta(pubkey=params.system_program_id, is_signer=False, is_writable=False), ] - return TransactionInstruction( - keys=keys, + return Instruction( + accounts=accounts, program_id=params.program_id, data=INSTRUCTIONS_LAYOUT.build( dict( @@ -1251,18 +1251,18 @@ def create_token_metadata(params: CreateTokenMetadataParams) -> TransactionInstr ) -def update_token_metadata(params: UpdateTokenMetadataParams) -> TransactionInstruction: +def update_token_metadata(params: UpdateTokenMetadataParams) -> Instruction: """Creates an instruction to update metadata in the mpl token metadata program account for the pool token.""" - keys = [ + accounts = [ AccountMeta(pubkey=params.stake_pool, is_signer=False, is_writable=False), AccountMeta(pubkey=params.manager, is_signer=True, is_writable=False), AccountMeta(pubkey=params.withdraw_authority, is_signer=False, is_writable=False), AccountMeta(pubkey=params.token_metadata, is_signer=False, is_writable=True), AccountMeta(pubkey=params.metadata_program_id, is_signer=False, is_writable=False) ] - return TransactionInstruction( - keys=keys, + return Instruction( + accounts=accounts, program_id=params.program_id, data=INSTRUCTIONS_LAYOUT.build( dict( diff --git a/stake-pool/py/stake_pool/state.py b/stake-pool/py/stake_pool/state.py index 36be8a11de8..b0bc5cbcb5c 100644 --- a/stake-pool/py/stake_pool/state.py +++ b/stake-pool/py/stake_pool/state.py @@ -4,16 +4,15 @@ from typing import List, NamedTuple, Optional from construct import Bytes, Container, Struct, Switch, Int8ul, Int32ul, Int64ul, Pass # type: ignore -from solana.publickey import PublicKey -from solana.utils.helpers import decode_byte_string +from solders.pubkey import Pubkey from stake.state import Lockup, LOCKUP_LAYOUT PUBLIC_KEY_LAYOUT = Bytes(32) -def decode_optional_publickey(container: Container) -> Optional[PublicKey]: +def decode_optional_publickey(container: Container) -> Optional[Pubkey]: if container: - return PublicKey(container.popitem()[1]) + return Pubkey(container.popitem()[1]) else: return None @@ -40,50 +39,49 @@ def decode_optional_container(cls, container: Container): class StakePool(NamedTuple): """Stake pool and all its data.""" - manager: PublicKey - staker: PublicKey - stake_deposit_authority: PublicKey + manager: Pubkey + staker: Pubkey + stake_deposit_authority: Pubkey stake_withdraw_bump_seed: int - validator_list: PublicKey - reserve_stake: PublicKey - pool_mint: PublicKey - manager_fee_account: PublicKey - token_program_id: PublicKey + validator_list: Pubkey + reserve_stake: Pubkey + pool_mint: Pubkey + manager_fee_account: Pubkey + token_program_id: Pubkey total_lamports: int pool_token_supply: int last_update_epoch: int lockup: Lockup epoch_fee: Fee next_epoch_fee: Optional[Fee] - preferred_deposit_validator: Optional[PublicKey] - preferred_withdraw_validator: Optional[PublicKey] + preferred_deposit_validator: Optional[Pubkey] + preferred_withdraw_validator: Optional[Pubkey] stake_deposit_fee: Fee stake_withdrawal_fee: Fee next_stake_withdrawal_fee: Optional[Fee] stake_referral_fee: int - sol_deposit_authority: Optional[PublicKey] + sol_deposit_authority: Optional[Pubkey] sol_deposit_fee: Fee sol_referral_fee: int - sol_withdraw_authority: Optional[PublicKey] + sol_withdraw_authority: Optional[Pubkey] sol_withdrawal_fee: Fee next_sol_withdrawal_fee: Optional[Fee] last_epoch_pool_token_supply: int last_epoch_total_lamports: int @classmethod - def decode(cls, data: str, encoding: str): - data_bytes = decode_byte_string(data, encoding) - parsed = DECODE_STAKE_POOL_LAYOUT.parse(data_bytes) + def decode(cls, data: bytes): + parsed = DECODE_STAKE_POOL_LAYOUT.parse(data) return StakePool( - manager=PublicKey(parsed['manager']), - staker=PublicKey(parsed['staker']), - stake_deposit_authority=PublicKey(parsed['stake_deposit_authority']), + manager=Pubkey(parsed['manager']), + staker=Pubkey(parsed['staker']), + stake_deposit_authority=Pubkey(parsed['stake_deposit_authority']), stake_withdraw_bump_seed=parsed['stake_withdraw_bump_seed'], - validator_list=PublicKey(parsed['validator_list']), - reserve_stake=PublicKey(parsed['reserve_stake']), - pool_mint=PublicKey(parsed['pool_mint']), - manager_fee_account=PublicKey(parsed['manager_fee_account']), - token_program_id=PublicKey(parsed['token_program_id']), + validator_list=Pubkey(parsed['validator_list']), + reserve_stake=Pubkey(parsed['reserve_stake']), + pool_mint=Pubkey(parsed['pool_mint']), + manager_fee_account=Pubkey(parsed['manager_fee_account']), + token_program_id=Pubkey(parsed['token_program_id']), total_lamports=parsed['total_lamports'], pool_token_supply=parsed['pool_token_supply'], last_update_epoch=parsed['last_update_epoch'], @@ -144,7 +142,7 @@ class ValidatorStakeInfo(NamedTuple): status: StakeStatus """Status of the validator stake account.""" - vote_account_address: PublicKey + vote_account_address: Pubkey """Validator vote account address.""" @classmethod @@ -157,7 +155,7 @@ def decode_container(cls, container: Container): unused=container['unused'], validator_seed_suffix=container['validator_seed_suffix'], status=container['status'], - vote_account_address=PublicKey(container['vote_account_address']), + vote_account_address=Pubkey(container['vote_account_address']), ) @@ -176,9 +174,8 @@ def calculate_validator_list_size(max_validators: int) -> int: return layout.sizeof() @classmethod - def decode(cls, data: str, encoding: str): - data_bytes = decode_byte_string(data, encoding) - parsed = DECODE_VALIDATOR_LIST_LAYOUT.parse(data_bytes) + def decode(cls, data: bytes): + parsed = DECODE_VALIDATOR_LIST_LAYOUT.parse(data) return ValidatorList( max_validators=parsed['max_validators'], validators=[ValidatorStakeInfo.decode_container(container) for container in parsed['validators']], diff --git a/stake-pool/py/system/actions.py b/stake-pool/py/system/actions.py index 0b16a04587f..c4c025494b7 100644 --- a/stake-pool/py/system/actions.py +++ b/stake-pool/py/system/actions.py @@ -1,9 +1,8 @@ -from solana.publickey import PublicKey +from solders.pubkey import Pubkey from solana.rpc.async_api import AsyncClient -from solana.rpc.commitment import Confirmed -async def airdrop(client: AsyncClient, receiver: PublicKey, lamports: int): +async def airdrop(client: AsyncClient, receiver: Pubkey, lamports: int): print(f"Airdropping {lamports} lamports to {receiver}...") - resp = await client.request_airdrop(receiver, lamports, Confirmed) - await client.confirm_transaction(resp['result'], Confirmed) + resp = await client.request_airdrop(receiver, lamports) + await client.confirm_transaction(resp.value) diff --git a/stake-pool/py/tests/conftest.py b/stake-pool/py/tests/conftest.py index 24212678822..647e9594f2a 100644 --- a/stake-pool/py/tests/conftest.py +++ b/stake-pool/py/tests/conftest.py @@ -7,8 +7,8 @@ from typing import AsyncIterator, List, Tuple from subprocess import Popen -from solana.keypair import Keypair -from solana.publickey import PublicKey +from solders.keypair import Keypair +from solders.pubkey import Pubkey from solana.rpc.async_api import AsyncClient from solana.rpc.commitment import Confirmed @@ -44,29 +44,28 @@ def solana_test_validator(): @pytest_asyncio.fixture -async def validators(async_client, payer) -> List[PublicKey]: +async def validators(async_client, payer) -> List[Pubkey]: num_validators = 3 validators = [] for i in range(num_validators): vote = Keypair() node = Keypair() - await create_vote(async_client, payer, vote, node, payer.public_key, payer.public_key, 10) - validators.append(vote.public_key) + await create_vote(async_client, payer, vote, node, payer.pubkey(), payer.pubkey(), 10) + validators.append(vote.pubkey()) return validators @pytest_asyncio.fixture async def stake_pool_addresses( async_client, payer, validators, waiter -) -> Tuple[PublicKey, PublicKey, PublicKey]: +) -> Tuple[Pubkey, Pubkey, Pubkey]: fee = Fee(numerator=1, denominator=1000) referral_fee = 20 - # Change back to `wait_for_next_epoch_if_soon` once https://github.com/solana-labs/solana/pull/26851 is available - await waiter.wait_for_next_epoch(async_client) + await waiter.wait_for_next_epoch_if_soon(async_client) stake_pool_addresses = await create_all(async_client, payer, fee, referral_fee) stake_pool = stake_pool_addresses[0] pool_mint = stake_pool_addresses[2] - token_account = get_associated_token_address(payer.public_key, pool_mint) + token_account = get_associated_token_address(payer.pubkey(), pool_mint) await deposit_sol(async_client, payer, stake_pool, token_account, AIRDROP_LAMPORTS // 2) for validator in validators: await add_validator_to_pool(async_client, payer, stake_pool, validator) @@ -91,7 +90,7 @@ async def async_client(solana_test_validator) -> AsyncIterator[AsyncClient]: @pytest_asyncio.fixture async def payer(async_client) -> Keypair: payer = Keypair() - await airdrop(async_client, payer.public_key, AIRDROP_LAMPORTS) + await airdrop(async_client, payer.pubkey(), AIRDROP_LAMPORTS) return payer @@ -99,17 +98,18 @@ class Waiter: @staticmethod async def wait_for_next_epoch(async_client: AsyncClient): resp = await async_client.get_epoch_info(commitment=Confirmed) - current_epoch = resp['result']['epoch'] + current_epoch = resp.value.epoch next_epoch = current_epoch while current_epoch == next_epoch: await asyncio.sleep(1.0) resp = await async_client.get_epoch_info(commitment=Confirmed) - next_epoch = resp['result']['epoch'] + next_epoch = resp.value.epoch + await asyncio.sleep(0.4) # wait one more block to avoid reward payout time @staticmethod async def wait_for_next_epoch_if_soon(async_client: AsyncClient): resp = await async_client.get_epoch_info(commitment=Confirmed) - if resp['result']['slotsInEpoch'] - resp['result']['slotIndex'] < NUM_SLOTS_PER_EPOCH // 2: + if resp.value.slots_in_epoch - resp.value.slot_index < NUM_SLOTS_PER_EPOCH // 2: await Waiter.wait_for_next_epoch(async_client) return True else: diff --git a/stake-pool/py/tests/test_a_time_sensitive.py b/stake-pool/py/tests/test_a_time_sensitive.py index 682d1202bea..59e59e9e89f 100644 --- a/stake-pool/py/tests/test_a_time_sensitive.py +++ b/stake-pool/py/tests/test_a_time_sensitive.py @@ -15,16 +15,16 @@ async def test_increase_decrease_this_is_very_slow(async_client, validators, pay (stake_pool_address, validator_list_address, _) = stake_pool_addresses resp = await async_client.get_minimum_balance_for_rent_exemption(STAKE_LEN) - stake_rent_exemption = resp['result'] + stake_rent_exemption = resp.value minimum_amount = MINIMUM_ACTIVE_STAKE + stake_rent_exemption increase_amount = MINIMUM_ACTIVE_STAKE * 4 decrease_amount = increase_amount // 2 deposit_amount = (increase_amount + stake_rent_exemption) * len(validators) resp = await async_client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) - token_account = get_associated_token_address(payer.public_key, stake_pool.pool_mint) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) + token_account = get_associated_token_address(payer.pubkey(), stake_pool.pool_mint) await deposit_sol(async_client, payer, stake_pool_address, token_account, deposit_amount) # increase to all @@ -36,8 +36,8 @@ async def test_increase_decrease_this_is_very_slow(async_client, validators, pay # validate the increase is now on the transient account resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) for validator in validator_list.validators: assert validator.transient_stake_lamports == increase_amount // 2 + stake_rent_exemption assert validator.active_stake_lamports == minimum_amount @@ -52,8 +52,8 @@ async def test_increase_decrease_this_is_very_slow(async_client, validators, pay # validate the additional increase is now on the transient account resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) for validator in validator_list.validators: assert validator.transient_stake_lamports == increase_amount + stake_rent_exemption * 2 assert validator.active_stake_lamports == minimum_amount @@ -63,8 +63,8 @@ async def test_increase_decrease_this_is_very_slow(async_client, validators, pay await update_stake_pool(async_client, payer, stake_pool_address) resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) for validator in validator_list.validators: assert validator.last_update_epoch != 0 assert validator.transient_stake_lamports == 0 @@ -79,8 +79,8 @@ async def test_increase_decrease_this_is_very_slow(async_client, validators, pay # validate the decrease is now on the transient account resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) for validator in validator_list.validators: assert validator.transient_stake_lamports == decrease_amount + stake_rent_exemption assert validator.active_stake_lamports == increase_amount - decrease_amount + minimum_amount + \ @@ -96,8 +96,8 @@ async def test_increase_decrease_this_is_very_slow(async_client, validators, pay await update_stake_pool(async_client, payer, stake_pool_address) resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) for validator in validator_list.validators: assert validator.transient_stake_lamports == 0 assert validator.active_stake_lamports == expected_active_stake_lamports diff --git a/stake-pool/py/tests/test_add_remove.py b/stake-pool/py/tests/test_add_remove.py index b2d96af3954..abf47871ef8 100644 --- a/stake-pool/py/tests/test_add_remove.py +++ b/stake-pool/py/tests/test_add_remove.py @@ -12,11 +12,11 @@ async def test_add_remove_validators(async_client, validators, payer, stake_pool_addresses): (stake_pool_address, validator_list_address, _) = stake_pool_addresses resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) assert len(validator_list.validators) == len(validators) resp = await async_client.get_minimum_balance_for_rent_exemption(STAKE_LEN) - stake_rent_exemption = resp['result'] + stake_rent_exemption = resp.value futures = [] for validator_info in validator_list.validators: assert validator_info.vote_account_address in validators @@ -29,7 +29,7 @@ async def test_add_remove_validators(async_client, validators, payer, stake_pool await asyncio.gather(*futures) resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) for validator_info in validator_list.validators: assert validator_info.status == StakeStatus.DEACTIVATING_VALIDATOR diff --git a/stake-pool/py/tests/test_bot_rebalance.py b/stake-pool/py/tests/test_bot_rebalance.py index c0283ef5f77..c7da3f82586 100644 --- a/stake-pool/py/tests/test_bot_rebalance.py +++ b/stake-pool/py/tests/test_bot_rebalance.py @@ -18,7 +18,7 @@ async def test_rebalance_this_is_very_slow(async_client, validators, payer, stake_pool_addresses, waiter): (stake_pool_address, validator_list_address, _) = stake_pool_addresses resp = await async_client.get_minimum_balance_for_rent_exemption(STAKE_LEN) - stake_rent_exemption = resp['result'] + stake_rent_exemption = resp.value # With minimum delegation at MINIMUM_DELEGATION + rent-exemption, when # decreasing, we'll need rent exemption + minimum delegation delegated to # cover all movements @@ -27,10 +27,10 @@ async def test_rebalance_this_is_very_slow(async_client, validators, payer, stak deposit_amount = (increase_amount + stake_rent_exemption) * len(validators) resp = await async_client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) total_lamports = stake_pool.total_lamports + deposit_amount - token_account = get_associated_token_address(payer.public_key, stake_pool.pool_mint) + token_account = get_associated_token_address(payer.pubkey(), stake_pool.pool_mint) await deposit_sol(async_client, payer, stake_pool_address, token_account, deposit_amount) # Test case 1: Increase everywhere @@ -38,12 +38,12 @@ async def test_rebalance_this_is_very_slow(async_client, validators, payer, stak # should only have minimum left resp = await async_client.get_account_info(stake_pool.reserve_stake, commitment=Confirmed) - assert resp['result']['value']['lamports'] == stake_rent_exemption + MINIMUM_RESERVE_LAMPORTS + assert resp.value.lamports == stake_rent_exemption + MINIMUM_RESERVE_LAMPORTS # should all be the same resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) for validator in validator_list.validators: assert validator.active_stake_lamports == minimum_amount assert validator.transient_stake_lamports == total_lamports / len(validators) - minimum_amount @@ -56,13 +56,13 @@ async def test_rebalance_this_is_very_slow(async_client, validators, payer, stak # should still only have minimum left resp = await async_client.get_account_info(stake_pool.reserve_stake, commitment=Confirmed) - reserve_lamports = resp['result']['value']['lamports'] + reserve_lamports = resp.value.lamports assert reserve_lamports == stake_rent_exemption + MINIMUM_RESERVE_LAMPORTS # should all be decreasing now resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) for validator in validator_list.validators: assert validator.active_stake_lamports == minimum_amount assert validator.transient_stake_lamports == max_in_reserve / len(validators) @@ -74,13 +74,13 @@ async def test_rebalance_this_is_very_slow(async_client, validators, payer, stak # should still only have minimum left + rent exemptions from increase resp = await async_client.get_account_info(stake_pool.reserve_stake, commitment=Confirmed) - reserve_lamports = resp['result']['value']['lamports'] + reserve_lamports = resp.value.lamports assert reserve_lamports == stake_rent_exemption + max_in_reserve + MINIMUM_RESERVE_LAMPORTS # should all be decreased now resp = await async_client.get_account_info(validator_list_address, commitment=Confirmed) - data = resp['result']['value']['data'] - validator_list = ValidatorList.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + validator_list = ValidatorList.decode(data) for validator in validator_list.validators: assert validator.active_stake_lamports == minimum_amount assert validator.transient_stake_lamports == 0 diff --git a/stake-pool/py/tests/test_create.py b/stake-pool/py/tests/test_create.py index 97600ae3926..3b5a42a18c0 100644 --- a/stake-pool/py/tests/test_create.py +++ b/stake-pool/py/tests/test_create.py @@ -1,5 +1,5 @@ import pytest -from solana.keypair import Keypair +from solders.keypair import Keypair from solana.rpc.commitment import Confirmed from spl.token.constants import TOKEN_PROGRAM_ID @@ -19,7 +19,7 @@ async def test_create_stake_pool(async_client, payer): stake_pool = Keypair() validator_list = Keypair() (pool_withdraw_authority, seed) = find_withdraw_authority_program_address( - STAKE_POOL_PROGRAM_ID, stake_pool.public_key) + STAKE_POOL_PROGRAM_ID, stake_pool.pubkey()) reserve_stake = Keypair() await create_stake(async_client, payer, reserve_stake, pool_withdraw_authority, MINIMUM_RESERVE_LAMPORTS) @@ -30,25 +30,25 @@ async def test_create_stake_pool(async_client, payer): manager_fee_account = await create_associated_token_account( async_client, payer, - payer.public_key, - pool_mint.public_key, + payer.pubkey(), + pool_mint.pubkey(), ) fee = Fee(numerator=1, denominator=1000) referral_fee = 20 await create( - async_client, payer, stake_pool, validator_list, pool_mint.public_key, - reserve_stake.public_key, manager_fee_account, fee, referral_fee) - resp = await async_client.get_account_info(stake_pool.public_key, commitment=Confirmed) - assert resp['result']['value']['owner'] == str(STAKE_POOL_PROGRAM_ID) - data = resp['result']['value']['data'] - pool_data = StakePool.decode(data[0], data[1]) - assert pool_data.manager == payer.public_key - assert pool_data.staker == payer.public_key + async_client, payer, stake_pool, validator_list, pool_mint.pubkey(), + reserve_stake.pubkey(), manager_fee_account, fee, referral_fee) + resp = await async_client.get_account_info(stake_pool.pubkey(), commitment=Confirmed) + assert resp.value.owner == STAKE_POOL_PROGRAM_ID + data = resp.value.data if resp.value else bytes() + pool_data = StakePool.decode(data) + assert pool_data.manager == payer.pubkey() + assert pool_data.staker == payer.pubkey() assert pool_data.stake_withdraw_bump_seed == seed - assert pool_data.validator_list == validator_list.public_key - assert pool_data.reserve_stake == reserve_stake.public_key - assert pool_data.pool_mint == pool_mint.public_key + assert pool_data.validator_list == validator_list.pubkey() + assert pool_data.reserve_stake == reserve_stake.pubkey() + assert pool_data.pool_mint == pool_mint.pubkey() assert pool_data.manager_fee_account == manager_fee_account assert pool_data.token_program_id == TOKEN_PROGRAM_ID assert pool_data.total_lamports == 0 diff --git a/stake-pool/py/tests/test_create_update_token_metadata.py b/stake-pool/py/tests/test_create_update_token_metadata.py index 10ae24f6963..2ee0a7db226 100644 --- a/stake-pool/py/tests/test_create_update_token_metadata.py +++ b/stake-pool/py/tests/test_create_update_token_metadata.py @@ -2,20 +2,18 @@ from stake_pool.actions import create_all, create_token_metadata, update_token_metadata from stake_pool.state import Fee, StakePool from solana.rpc.commitment import Confirmed -from solana.rpc.async_api import AsyncClient -from solana.keypair import Keypair from stake_pool.constants import find_metadata_account -from solana.utils.helpers import decode_byte_string @pytest.mark.asyncio -async def test_create_metadata_success(async_client: AsyncClient, payer: Keypair): +async def test_create_metadata_success(async_client, waiter, payer): fee = Fee(numerator=1, denominator=1000) referral_fee = 20 + await waiter.wait_for_next_epoch_if_soon(async_client) (stake_pool_address, _validator_list_address, _) = await create_all(async_client, payer, fee, referral_fee) resp = await async_client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) name = "test_name" symbol = "SYM" @@ -24,21 +22,21 @@ async def test_create_metadata_success(async_client: AsyncClient, payer: Keypair (metadata_program_address, _seed) = find_metadata_account(stake_pool.pool_mint) resp = await async_client.get_account_info(metadata_program_address, commitment=Confirmed) - data = resp['result']['value']['data'] - raw_data = decode_byte_string(data[0], data[1]) + raw_data = resp.value.data if resp.value else bytes() assert name == str(raw_data[69:101], "utf-8")[:len(name)] assert symbol == str(raw_data[105:115], "utf-8")[:len(symbol)] assert uri == str(raw_data[119:319], "utf-8")[:len(uri)] @pytest.mark.asyncio -async def test_update_metadata_success(async_client: AsyncClient, payer: Keypair): +async def test_update_metadata_success(async_client, waiter, payer): fee = Fee(numerator=1, denominator=1000) referral_fee = 20 + await waiter.wait_for_next_epoch_if_soon(async_client) (stake_pool_address, _validator_list_address, _) = await create_all(async_client, payer, fee, referral_fee) resp = await async_client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) name = "test_name" symbol = "SYM" @@ -47,8 +45,7 @@ async def test_update_metadata_success(async_client: AsyncClient, payer: Keypair (metadata_program_address, _seed) = find_metadata_account(stake_pool.pool_mint) resp = await async_client.get_account_info(metadata_program_address, commitment=Confirmed) - data = resp['result']['value']['data'] - raw_data = decode_byte_string(data[0], data[1]) + raw_data = resp.value.data if resp.value else bytes() assert name == str(raw_data[69:101], "utf-8")[:len(name)] assert symbol == str(raw_data[105:115], "utf-8")[:len(symbol)] assert uri == str(raw_data[119:319], "utf-8")[:len(uri)] @@ -60,8 +57,7 @@ async def test_update_metadata_success(async_client: AsyncClient, payer: Keypair (metadata_program_address, _seed) = find_metadata_account(stake_pool.pool_mint) resp = await async_client.get_account_info(metadata_program_address, commitment=Confirmed) - data = resp['result']['value']['data'] - raw_data = decode_byte_string(data[0], data[1]) + raw_data = resp.value.data if resp.value else bytes() assert updated_name == str(raw_data[69:101], "utf-8")[:len(updated_name)] assert updated_symbol == str(raw_data[105:115], "utf-8")[:len(updated_symbol)] assert updated_uri == str(raw_data[119:319], "utf-8")[:len(updated_uri)] diff --git a/stake-pool/py/tests/test_deposit_withdraw_sol.py b/stake-pool/py/tests/test_deposit_withdraw_sol.py index 8057101e37b..438c4afd293 100644 --- a/stake-pool/py/tests/test_deposit_withdraw_sol.py +++ b/stake-pool/py/tests/test_deposit_withdraw_sol.py @@ -1,6 +1,6 @@ import pytest from solana.rpc.commitment import Confirmed, Processed -from solana.keypair import Keypair +from solders.keypair import Keypair from spl.token.instructions import get_associated_token_address from stake_pool.state import Fee, StakePool @@ -8,20 +8,21 @@ @pytest.mark.asyncio -async def test_deposit_withdraw_sol(async_client, payer): +async def test_deposit_withdraw_sol(async_client, waiter, payer): fee = Fee(numerator=1, denominator=1000) referral_fee = 20 + await waiter.wait_for_next_epoch(async_client) (stake_pool_address, validator_list_address, _) = await create_all(async_client, payer, fee, referral_fee) resp = await async_client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) - token_account = get_associated_token_address(payer.public_key, stake_pool.pool_mint) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) + token_account = get_associated_token_address(payer.pubkey(), stake_pool.pool_mint) deposit_amount = 100_000_000 await deposit_sol(async_client, payer, stake_pool_address, token_account, deposit_amount) pool_token_balance = await async_client.get_token_account_balance(token_account, Confirmed) - assert pool_token_balance['result']['value']['amount'] == str(deposit_amount) + assert pool_token_balance.value.amount == str(deposit_amount) recipient = Keypair() - await withdraw_sol(async_client, payer, token_account, stake_pool_address, recipient.public_key, deposit_amount) + await withdraw_sol(async_client, payer, token_account, stake_pool_address, recipient.pubkey(), deposit_amount) # for some reason, this is not always in sync when running all tests pool_token_balance = await async_client.get_token_account_balance(token_account, Processed) - assert pool_token_balance['result']['value']['amount'] == str('0') + assert pool_token_balance.value.amount == str('0') diff --git a/stake-pool/py/tests/test_deposit_withdraw_stake.py b/stake-pool/py/tests/test_deposit_withdraw_stake.py index 890fb9d1f4d..63b9e07dbc1 100644 --- a/stake-pool/py/tests/test_deposit_withdraw_stake.py +++ b/stake-pool/py/tests/test_deposit_withdraw_stake.py @@ -1,6 +1,6 @@ import pytest from solana.rpc.commitment import Confirmed -from solana.keypair import Keypair +from solders.keypair import Keypair from spl.token.instructions import get_associated_token_address from stake.actions import create_stake, delegate_stake @@ -15,20 +15,20 @@ async def test_deposit_withdraw_stake(async_client, validators, payer, stake_pool_addresses, waiter): (stake_pool_address, validator_list_address, _) = stake_pool_addresses resp = await async_client.get_account_info(stake_pool_address, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_pool = StakePool.decode(data[0], data[1]) + data = resp.value.data if resp.value else bytes() + stake_pool = StakePool.decode(data) validator = next(iter(validators)) stake_amount = MINIMUM_ACTIVE_STAKE stake = Keypair() - await create_stake(async_client, payer, stake, payer.public_key, stake_amount) - stake = stake.public_key + await create_stake(async_client, payer, stake, payer.pubkey(), stake_amount) + stake = stake.pubkey() await delegate_stake(async_client, payer, payer, stake, validator) resp = await async_client.get_account_info(stake, commitment=Confirmed) - data = resp['result']['value']['data'] - stake_state = StakeStake.decode(data[0], data[1]) - token_account = get_associated_token_address(payer.public_key, stake_pool.pool_mint) + data = resp.value.data if resp.value else bytes() + stake_state = StakeStake.decode(data) + token_account = get_associated_token_address(payer.pubkey(), stake_pool.pool_mint) pre_pool_token_balance = await async_client.get_token_account_balance(token_account, Confirmed) - pre_pool_token_balance = int(pre_pool_token_balance['result']['value']['amount']) + pre_pool_token_balance = int(pre_pool_token_balance.value.amount) print(stake_state) await waiter.wait_for_next_epoch(async_client) @@ -36,17 +36,17 @@ async def test_deposit_withdraw_stake(async_client, validators, payer, stake_poo await update_stake_pool(async_client, payer, stake_pool_address) await deposit_stake(async_client, payer, stake_pool_address, validator, stake, token_account) pool_token_balance = await async_client.get_token_account_balance(token_account, Confirmed) - pool_token_balance = pool_token_balance['result']['value']['amount'] + pool_token_balance = pool_token_balance.value.amount resp = await async_client.get_minimum_balance_for_rent_exemption(STAKE_LEN) - stake_rent_exemption = resp['result'] + stake_rent_exemption = resp.value assert pool_token_balance == str(stake_amount + stake_rent_exemption + pre_pool_token_balance) destination_stake = Keypair() await withdraw_stake( async_client, payer, payer, destination_stake, stake_pool_address, validator, - payer.public_key, token_account, stake_amount + payer.pubkey(), token_account, stake_amount ) pool_token_balance = await async_client.get_token_account_balance(token_account, Confirmed) - pool_token_balance = pool_token_balance['result']['value']['amount'] + pool_token_balance = pool_token_balance.value.amount assert pool_token_balance == str(stake_rent_exemption + pre_pool_token_balance) diff --git a/stake-pool/py/tests/test_stake.py b/stake-pool/py/tests/test_stake.py index ab7cc3a4494..7f89b8a75cf 100644 --- a/stake-pool/py/tests/test_stake.py +++ b/stake-pool/py/tests/test_stake.py @@ -1,6 +1,6 @@ import asyncio import pytest -from solana.keypair import Keypair +from solders.keypair import Keypair from stake.actions import authorize, create_stake, delegate_stake from stake.constants import MINIMUM_DELEGATION @@ -10,24 +10,24 @@ @pytest.mark.asyncio async def test_create_stake(async_client, payer): stake = Keypair() - await create_stake(async_client, payer, stake, payer.public_key, 1) + await create_stake(async_client, payer, stake, payer.pubkey(), 1) @pytest.mark.asyncio async def test_delegate_stake(async_client, validators, payer): validator = validators[0] stake = Keypair() - await create_stake(async_client, payer, stake, payer.public_key, MINIMUM_DELEGATION) - await delegate_stake(async_client, payer, payer, stake.public_key, validator) + await create_stake(async_client, payer, stake, payer.pubkey(), MINIMUM_DELEGATION) + await delegate_stake(async_client, payer, payer, stake.pubkey(), validator) @pytest.mark.asyncio async def test_authorize_stake(async_client, payer): stake = Keypair() new_authority = Keypair() - await create_stake(async_client, payer, stake, payer.public_key, MINIMUM_DELEGATION) + await create_stake(async_client, payer, stake, payer.pubkey(), MINIMUM_DELEGATION) await asyncio.gather( - authorize(async_client, payer, payer, stake.public_key, new_authority.public_key, StakeAuthorize.STAKER), - authorize(async_client, payer, payer, stake.public_key, new_authority.public_key, StakeAuthorize.WITHDRAWER) + authorize(async_client, payer, payer, stake.pubkey(), new_authority.pubkey(), StakeAuthorize.STAKER), + authorize(async_client, payer, payer, stake.pubkey(), new_authority.pubkey(), StakeAuthorize.WITHDRAWER) ) - await authorize(async_client, payer, new_authority, stake.public_key, payer.public_key, StakeAuthorize.WITHDRAWER) + await authorize(async_client, payer, new_authority, stake.pubkey(), payer.pubkey(), StakeAuthorize.WITHDRAWER) diff --git a/stake-pool/py/tests/test_system.py b/stake-pool/py/tests/test_system.py index 31d2af3437a..f3b578ae2f1 100644 --- a/stake-pool/py/tests/test_system.py +++ b/stake-pool/py/tests/test_system.py @@ -1,5 +1,5 @@ import pytest -from solana.keypair import Keypair +from solders.keypair import Keypair from solana.rpc.commitment import Confirmed import system.actions @@ -9,6 +9,6 @@ async def test_airdrop(async_client): manager = Keypair() airdrop_lamports = 1_000_000 - await system.actions.airdrop(async_client, manager.public_key, airdrop_lamports) - resp = await async_client.get_balance(manager.public_key, commitment=Confirmed) - assert resp['result']['value'] == airdrop_lamports + await system.actions.airdrop(async_client, manager.pubkey(), airdrop_lamports) + resp = await async_client.get_balance(manager.pubkey(), commitment=Confirmed) + assert resp.value == airdrop_lamports diff --git a/stake-pool/py/tests/test_token.py b/stake-pool/py/tests/test_token.py index 1d92c179db7..835feb15f73 100644 --- a/stake-pool/py/tests/test_token.py +++ b/stake-pool/py/tests/test_token.py @@ -1,5 +1,5 @@ import pytest -from solana.keypair import Keypair +from solders.keypair import Keypair from spl_token.actions import create_mint, create_associated_token_account @@ -7,10 +7,10 @@ @pytest.mark.asyncio async def test_create_mint(async_client, payer): pool_mint = Keypair() - await create_mint(async_client, payer, pool_mint, payer.public_key) + await create_mint(async_client, payer, pool_mint, payer.pubkey()) await create_associated_token_account( async_client, payer, - payer.public_key, - pool_mint.public_key, + payer.pubkey(), + pool_mint.pubkey(), ) diff --git a/stake-pool/py/tests/test_vote.py b/stake-pool/py/tests/test_vote.py index b0861d465fd..3b3ff460fbb 100644 --- a/stake-pool/py/tests/test_vote.py +++ b/stake-pool/py/tests/test_vote.py @@ -1,6 +1,5 @@ import pytest -from solana.keypair import Keypair -from solana.publickey import PublicKey +from solders.keypair import Keypair from solana.rpc.commitment import Confirmed from vote.actions import create_vote @@ -11,6 +10,6 @@ async def test_create_vote(async_client, payer): vote = Keypair() node = Keypair() - await create_vote(async_client, payer, vote, node, payer.public_key, payer.public_key, 10) - resp = await async_client.get_account_info(vote.public_key, commitment=Confirmed) - assert PublicKey(resp['result']['value']['owner']) == VOTE_PROGRAM_ID + await create_vote(async_client, payer, vote, node, payer.pubkey(), payer.pubkey(), 10) + resp = await async_client.get_account_info(vote.pubkey(), commitment=Confirmed) + assert resp.value.owner == VOTE_PROGRAM_ID diff --git a/stake-pool/py/vote/actions.py b/stake-pool/py/vote/actions.py index 9f3fc49f197..305d79a4c26 100644 --- a/stake-pool/py/vote/actions.py +++ b/stake-pool/py/vote/actions.py @@ -1,11 +1,11 @@ -from solana.publickey import PublicKey -from solana.keypair import Keypair +from solders.pubkey import Pubkey +from solders.keypair import Keypair from solana.rpc.async_api import AsyncClient from solana.rpc.commitment import Confirmed from solana.rpc.types import TxOpts -from solana.sysvar import SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY +from solders.sysvar import CLOCK, RENT from solana.transaction import Transaction -import solana.system_program as sys +import solders.system_program as sys from vote.constants import VOTE_PROGRAM_ID, VOTE_STATE_LEN from vote.instructions import initialize, InitializeParams @@ -13,33 +13,35 @@ async def create_vote( client: AsyncClient, payer: Keypair, vote: Keypair, node: Keypair, - voter: PublicKey, withdrawer: PublicKey, commission: int): - print(f"Creating vote account {vote.public_key}") + voter: Pubkey, withdrawer: Pubkey, commission: int): + print(f"Creating vote account {vote.pubkey()}") resp = await client.get_minimum_balance_for_rent_exemption(VOTE_STATE_LEN) - txn = Transaction() + txn = Transaction(fee_payer=payer.pubkey()) txn.add( sys.create_account( sys.CreateAccountParams( - from_pubkey=payer.public_key, - new_account_pubkey=vote.public_key, - lamports=resp['result'], + from_pubkey=payer.pubkey(), + to_pubkey=vote.pubkey(), + lamports=resp.value, space=VOTE_STATE_LEN, - program_id=VOTE_PROGRAM_ID, + owner=VOTE_PROGRAM_ID, ) ) ) txn.add( initialize( InitializeParams( - vote=vote.public_key, - rent_sysvar=SYSVAR_RENT_PUBKEY, - clock_sysvar=SYSVAR_CLOCK_PUBKEY, - node=node.public_key, + vote=vote.pubkey(), + rent_sysvar=RENT, + clock_sysvar=CLOCK, + node=node.pubkey(), authorized_voter=voter, authorized_withdrawer=withdrawer, commission=commission, ) ) ) + recent_blockhash = (await client.get_latest_blockhash()).value.blockhash await client.send_transaction( - txn, payer, vote, node, opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) + txn, payer, vote, node, recent_blockhash=recent_blockhash, + opts=TxOpts(skip_confirmation=False, preflight_commitment=Confirmed)) diff --git a/stake-pool/py/vote/constants.py b/stake-pool/py/vote/constants.py index 701c90a022f..0da3846bea3 100644 --- a/stake-pool/py/vote/constants.py +++ b/stake-pool/py/vote/constants.py @@ -1,7 +1,7 @@ -from solana.publickey import PublicKey +from solders.pubkey import Pubkey -VOTE_PROGRAM_ID = PublicKey("Vote111111111111111111111111111111111111111") +VOTE_PROGRAM_ID = Pubkey.from_string("Vote111111111111111111111111111111111111111") """Program id for the native vote program.""" VOTE_STATE_LEN: int = 3762 diff --git a/stake-pool/py/vote/instructions.py b/stake-pool/py/vote/instructions.py index 267aeb4aa46..c8a0a69d803 100644 --- a/stake-pool/py/vote/instructions.py +++ b/stake-pool/py/vote/instructions.py @@ -5,9 +5,9 @@ from construct import Bytes, Struct, Switch, Int8ul, Int32ul, Pass # type: ignore -from solana.publickey import PublicKey -from solana.sysvar import SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY -from solana.transaction import AccountMeta, TransactionInstruction +from solders.pubkey import Pubkey +from solders.sysvar import CLOCK, RENT +from solders.instruction import AccountMeta, Instruction from vote.constants import VOTE_PROGRAM_ID @@ -17,18 +17,18 @@ class InitializeParams(NamedTuple): """Initialize vote account params.""" - vote: PublicKey + vote: Pubkey """`[w]` Uninitialized vote account""" - rent_sysvar: PublicKey + rent_sysvar: Pubkey """`[]` Rent sysvar.""" - clock_sysvar: PublicKey + clock_sysvar: Pubkey """`[]` Clock sysvar.""" - node: PublicKey + node: Pubkey """`[s]` New validator identity.""" - authorized_voter: PublicKey + authorized_voter: Pubkey """The authorized voter for this vote account.""" - authorized_withdrawer: PublicKey + authorized_withdrawer: Pubkey """The authorized withdrawer for this vote account.""" commission: int """Commission, represented as a percentage""" @@ -73,7 +73,7 @@ class InstructionType(IntEnum): ) -def initialize(params: InitializeParams) -> TransactionInstruction: +def initialize(params: InitializeParams) -> Instruction: """Creates a transaction instruction to initialize a new stake.""" data = INSTRUCTIONS_LAYOUT.build( dict( @@ -86,13 +86,13 @@ def initialize(params: InitializeParams) -> TransactionInstruction: ), ) ) - return TransactionInstruction( - keys=[ + return Instruction( + program_id=VOTE_PROGRAM_ID, + accounts=[ AccountMeta(pubkey=params.vote, is_signer=False, is_writable=True), - AccountMeta(pubkey=params.rent_sysvar or SYSVAR_RENT_PUBKEY, is_signer=False, is_writable=False), - AccountMeta(pubkey=params.clock_sysvar or SYSVAR_CLOCK_PUBKEY, is_signer=False, is_writable=False), + AccountMeta(pubkey=params.rent_sysvar or RENT, is_signer=False, is_writable=False), + AccountMeta(pubkey=params.clock_sysvar or CLOCK, is_signer=False, is_writable=False), AccountMeta(pubkey=params.node, is_signer=True, is_writable=False), ], - program_id=VOTE_PROGRAM_ID, data=data, ) From d1fa4d506235c4b1f6f993bd1064fe3165040290 Mon Sep 17 00:00:00 2001 From: Jon C Date: Thu, 25 Jul 2024 16:53:13 +0200 Subject: [PATCH 7/7] ci: Bump crates to Solana 2.0.3 (#7047) * Run script * Update lockfile * Use "processed" instead of deprecated "recent" * Fixup account compression tests * account-compression: Remove `only` in test --- Anchor.toml | 2 +- Cargo.lock | 560 +++++++++--------- account-compression/Cargo.lock | 8 +- account-compression/sdk/package.json | 2 +- .../sdk/tests/accountCompression.test.ts | 4 +- .../concurrentMerkleTreeAccount.test.ts | 4 +- .../sdk/tests/events/changelog.test.ts | 6 +- account-compression/sdk/tests/utils.ts | 6 +- .../program-test/Cargo.toml | 6 +- associated-token-account/program/Cargo.toml | 2 +- binary-option/program/Cargo.toml | 2 +- binary-oracle-pair/program/Cargo.toml | 6 +- ci/solana-version.sh | 2 +- .../rust/cross-program-invocation/Cargo.toml | 6 +- examples/rust/custom-heap/Cargo.toml | 6 +- examples/rust/logging/Cargo.toml | 6 +- examples/rust/sysvar/Cargo.toml | 6 +- examples/rust/transfer-lamports/Cargo.toml | 6 +- examples/rust/transfer-tokens/Cargo.toml | 6 +- feature-proposal/cli/Cargo.toml | 10 +- feature-proposal/program/Cargo.toml | 6 +- governance/addin-api/Cargo.toml | 2 +- governance/addin-mock/program/Cargo.toml | 6 +- governance/chat/program/Cargo.toml | 6 +- governance/program/Cargo.toml | 6 +- governance/test-sdk/Cargo.toml | 6 +- governance/tools/Cargo.toml | 2 +- instruction-padding/program/Cargo.toml | 6 +- libraries/discriminator/Cargo.toml | 2 +- libraries/math/Cargo.toml | 6 +- libraries/pod/Cargo.toml | 4 +- libraries/program-error/Cargo.toml | 4 +- libraries/tlv-account-resolution/Cargo.toml | 8 +- .../type-length-value-derive-test/Cargo.toml | 2 +- libraries/type-length-value/Cargo.toml | 2 +- managed-token/program/Cargo.toml | 6 +- memo/program/Cargo.toml | 6 +- name-service/program/Cargo.toml | 6 +- pnpm-lock.yaml | 60 +- record/program/Cargo.toml | 6 +- shared-memory/program/Cargo.toml | 6 +- single-pool/cli/Cargo.toml | 22 +- single-pool/program/Cargo.toml | 8 +- stake-pool/cli/Cargo.toml | 18 +- stake-pool/program/Cargo.toml | 8 +- stateless-asks/program/Cargo.toml | 6 +- token-collection/program/Cargo.toml | 6 +- token-group/example/Cargo.toml | 6 +- token-group/interface/Cargo.toml | 2 +- token-lending/cli/Cargo.toml | 12 +- token-lending/flash_loan_receiver/Cargo.toml | 2 +- token-lending/program/Cargo.toml | 6 +- token-metadata/example/Cargo.toml | 6 +- token-metadata/interface/Cargo.toml | 2 +- token-swap/js/test/main.test.ts | 2 +- token-swap/program/Cargo.toml | 4 +- token-swap/program/fuzz/Cargo.toml | 2 +- token-upgrade/cli/Cargo.toml | 14 +- token-upgrade/program/Cargo.toml | 6 +- token-wrap/program/Cargo.toml | 2 +- token/cli/Cargo.toml | 20 +- token/client/Cargo.toml | 12 +- .../ciphertext-arithmetic/Cargo.toml | 2 +- .../proof-extraction/Cargo.toml | 2 +- .../proof-generation/Cargo.toml | 2 +- .../proof-tests/Cargo.toml | 2 +- token/program-2022-test/Cargo.toml | 6 +- token/program-2022/Cargo.toml | 8 +- token/program/Cargo.toml | 6 +- token/transfer-hook/cli/Cargo.toml | 14 +- token/transfer-hook/example/Cargo.toml | 6 +- token/transfer-hook/interface/Cargo.toml | 2 +- utils/test-client/Cargo.toml | 2 +- 73 files changed, 518 insertions(+), 514 deletions(-) diff --git a/Anchor.toml b/Anchor.toml index cef8835952f..dcc5499c718 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -1,6 +1,6 @@ [toolchain] anchor_version = "0.29.0" -solana_version = "2.0.0" +solana_version = "2.0.3" [workspace] members = [ diff --git a/Cargo.lock b/Cargo.lock index 9aa2baa2254..6c78262409c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "agave-geyser-plugin-interface" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5d4a94c93c4b42c014f04ebd5f2078b638f6905ef229ce42e2f5d8861ca5e0" +checksum = "3d86a1bd9b77d9cd269627b8512a95c5866a84bbec231bab5547d4a7674cd047" dependencies = [ "log", "solana-sdk", @@ -4999,9 +4999,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e6d9bc44f698bceca5c6bb9988bee85a2a7c58792a6ee2c15f844fad6ea3f" +checksum = "05902873408f35cda8ff1632597821273b5d7423ddd7bb488d1801dc5cdcc119" dependencies = [ "Inflector", "base64 0.22.1", @@ -5014,19 +5014,19 @@ dependencies = [ "serde_json", "solana-config-program", "solana-sdk", - "spl-token 4.0.1", - "spl-token-2022 3.0.2", - "spl-token-group-interface 0.2.3", - "spl-token-metadata-interface 0.3.3", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-2022 4.0.0", + "spl-token-group-interface 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-metadata-interface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "zstd", ] [[package]] name = "solana-accounts-db" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba0a38ecea8052d211c3c0c2c599a0a699a95e3542ed4be1e2035a6a27df5b87" +checksum = "3044de63e7fa70e4a7391b94735d34636fc0ef8cfcc11ac8e843837306e847b9" dependencies = [ "bincode", "blake3", @@ -5069,9 +5069,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e50e01104280942ed42f78ab56661ee83bb338f2060232883a3ef48a84e05cfa" +checksum = "cab11a1eb4a5fa462a966442c99c04482dce7a57e0c52ecb91f32a99dbdcc4ba" dependencies = [ "bincode", "bytemuck", @@ -5087,9 +5087,9 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7739a588a28dccbd473449886b169cdbd06a2bda20156a1052aefa85139db" +checksum = "ef39e4e89a7ff154960b4eb42483c09f9284b05193487c72678c84bd2ccda9c0" dependencies = [ "borsh 1.5.1", "futures 0.3.30", @@ -5104,9 +5104,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ecfdb1fb6954f0574ddf26218e01b27ffc2845ef8397ddf5e094cea35c6fb8" +checksum = "88ac7cdd75766c57d17b3e77cbb37fbc1ae3d4e9bd470f6e648bcbeea9679938" dependencies = [ "serde", "serde_derive", @@ -5116,9 +5116,9 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8baa7a554ecb55943cd1a5bbe65ba2fd8e5dacf65257feae221254b3b352d9" +checksum = "1987ad9ca4c1ec488a20be89d01d339a2a69882f6eb5061d8382318b69f85f35" dependencies = [ "bincode", "crossbeam-channel", @@ -5136,9 +5136,9 @@ dependencies = [ [[package]] name = "solana-bloom" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d43e996046ca38159155d2a7d0b63bfd3f382269bae93f8c6503e81bf02e43" +checksum = "0f3cd1975694845aa1092770953eb282012b2b835bcba70d73aff33ead2acb24" dependencies = [ "bv", "fnv", @@ -5153,9 +5153,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197674d85cee9aaf68b56dcf5c381eaebde0f2ef5fa57eb04873a6f7299e4b8f" +checksum = "9df996b99fb83993b20955af36cb7def334b13f0b298247114c85eb587b814c2" dependencies = [ "bincode", "byteorder", @@ -5175,9 +5175,9 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ecb5bdb9c1d26235729cb7cd16ee1e45cde4f624f4363d2c3ceb8325cae371" +checksum = "ec8fe2e4f050b209202fb23a7bef68d215401a067aec35f2b6f78b0c298364ee" dependencies = [ "bv", "bytemuck", @@ -5194,9 +5194,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bcaf1dad033e4559a82eba0e20af72d4c834be606a3b6b8c324b3916a2982c0" +checksum = "1f10f809259aab9d54e16dcb3e05ea55448c1ab42bc36583591a78c9215494c4" dependencies = [ "chrono", "clap 2.34.0", @@ -5211,9 +5211,9 @@ dependencies = [ [[package]] name = "solana-clap-v3-utils" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08d46ad0a463e679ae308b4c721bc18fc1184391f842808f58f1b15fab1e574" +checksum = "6cc19507a170a17bec4fdd79672387efc156ca9829c6151fc43fa266cbba8935" dependencies = [ "chrono", "clap 3.2.25", @@ -5229,9 +5229,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b49bd2481a210a95d5901d2f9f3108dfda222de8424276a6c05dd6fffa75ec" +checksum = "14fae0e2ad42677046dc0e58d4b752ab55ecd59b120f091cd9b4b81ec3e55316" dependencies = [ "dirs-next", "lazy_static", @@ -5245,9 +5245,9 @@ dependencies = [ [[package]] name = "solana-cli-output" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6e6a19053b01bfc043b97ca4f70b463191ec0b58d4e3e6c5e43c7c63502801" +checksum = "408a27d6560becfc89f2643a0fb302c5de77de40acb3d0edb77447be68389881" dependencies = [ "Inflector", "base64 0.22.1", @@ -5267,14 +5267,14 @@ dependencies = [ "solana-sdk", "solana-transaction-status", "solana-vote-program", - "spl-memo 4.0.1", + "spl-memo 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-client" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fd67c44dada5a711cef4e6e5925598bacf077be91e1d8284a5b2688f94b156" +checksum = "cdf0916e9c119d472ec5a59a84fd8eb6c72a7f0568036409673e2c9c7a9fc460" dependencies = [ "async-trait", "bincode", @@ -5305,9 +5305,9 @@ dependencies = [ [[package]] name = "solana-compute-budget" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391b6150c94918fba476e3089f9bcad45893b9eb07909319165ca28615e336d9" +checksum = "98d1bd1e1073998eda4e59a5c344e998c2e429053a1b340fc798987d2ba37051" dependencies = [ "rustc_version", "solana-sdk", @@ -5315,9 +5315,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bb4d28f584b60c7836f661b29c717e87e4f30623783df230a418824928512c7" +checksum = "be4fb10a978c057eb531b85f4e72dde9d61d2b348a3615f602b40cb4531abb0a" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -5325,9 +5325,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e110dda46d91a3a0faa8e781bfef6f557d1c7b2367a94413d8c02b2b46c5aadf" +checksum = "315b49d8b0a01aae38a5056f13dc0b9001e996d48807a5012c6f7629ced6b7d7" dependencies = [ "bincode", "chrono", @@ -5339,9 +5339,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1521aca8e0f2390e5536b3d6de0742a931a159467c2c4b8750919d6d2224743e" +checksum = "75f270c95e3cb85414459d05b8ec1d0ff29d44d9781fc948ddbe46011ab55fbe" dependencies = [ "async-trait", "bincode", @@ -5360,9 +5360,9 @@ dependencies = [ [[package]] name = "solana-core" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d05e7050f01bed0ba9395b73394afcfe0d2c13c4d2c00cec2c665ea2a2b887" +checksum = "c1d92b2f08798e3930fe50b09d6358a2bd5c073c68500fffc57d476883dfb96e" dependencies = [ "ahash 0.8.11", "base64 0.22.1", @@ -5397,6 +5397,7 @@ dependencies = [ "solana-bloom", "solana-client", "solana-compute-budget", + "solana-connection-cache", "solana-cost-model", "solana-entry", "solana-geyser-plugin-manager", @@ -5437,9 +5438,9 @@ dependencies = [ [[package]] name = "solana-cost-model" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e464d6d96864cd2e0711ae378d2201b3519ecd3d028807f9d336136b79e10ea9" +checksum = "f03ea474a167b642bba65389f8ab97064b8455c25abc9b9721c470bfcc215ea4" dependencies = [ "ahash 0.8.11", "lazy_static", @@ -5460,9 +5461,9 @@ dependencies = [ [[package]] name = "solana-curve25519" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb57042cc8e094a82d556db45b9a4dc28484e4241534c5cded444c9f5038cb48" +checksum = "109fa7ddac40dc7807c60c789f1db26f0aae920ecae5ab1e6132c74300a99fdf" dependencies = [ "bytemuck", "bytemuck_derive", @@ -5473,9 +5474,9 @@ dependencies = [ [[package]] name = "solana-entry" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa38a8e8044e111956df077f9b7c17bb541cdbbe4a25aed34c0ac942a03e2d0" +checksum = "33c416ec0fdea768cb2d282852e93611591691a4821665347f8da76cfee7e245" dependencies = [ "bincode", "crossbeam-channel", @@ -5495,9 +5496,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a53384d59390fd1f5972467a476bda09616a5486a82692edd38396e00b1812" +checksum = "08c3d6647891d23578a815cfca4b7d9355afe706e16c342778dd93c5d313b402" dependencies = [ "bincode", "byteorder", @@ -5512,16 +5513,16 @@ dependencies = [ "solana-metrics", "solana-sdk", "solana-version", - "spl-memo 4.0.1", + "spl-memo 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tokio", ] [[package]] name = "solana-geyser-plugin-manager" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed8822fc12c576e3e998072976622db4f3758c0db8bf7a032b97fd176737e8d" +checksum = "4ef9c649ca5e09047bc250b6df1e1e87f9ca42489e3d9b0c9fbbec80a05382fa" dependencies = [ "agave-geyser-plugin-interface", "bs58", @@ -5546,9 +5547,9 @@ dependencies = [ [[package]] name = "solana-gossip" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03de18f25a9c5a11819a6500f4515964e2f888b5d40d4ebaafaf3b1a28cb709" +checksum = "1383108156bb2ba2a9dbb18b16d3c7f6e1627c0d588127e501aec3a62ec2aef6" dependencies = [ "assert_matches", "bincode", @@ -5594,9 +5595,9 @@ dependencies = [ [[package]] name = "solana-inline-spl" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1eb51b074fb17bcc71260cc9ed4298996f10a92db070a84700b9bf0a7c0b79" +checksum = "41db2986bf08224629a6ddafcf6e4cc822c9000f315ee43327302e0130ee8c25" dependencies = [ "bytemuck", "rustc_version", @@ -5605,9 +5606,9 @@ dependencies = [ [[package]] name = "solana-ledger" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f043cc5973ec871c23e2aed0c9360310f150c1347d63689e12ea0d7c6d7ea9f" +checksum = "d51f7b0b73e0eb678f0125d90bcccb28905cfd7ba0b98447f81e0a8cf5ab146b" dependencies = [ "assert_matches", "bincode", @@ -5630,6 +5631,7 @@ dependencies = [ "num_cpus", "num_enum", "prost", + "qualifier_attr", "rand 0.8.5", "rand_chacha 0.3.1", "rayon", @@ -5659,8 +5661,8 @@ dependencies = [ "solana-transaction-status", "solana-vote", "solana-vote-program", - "spl-token 4.0.1", - "spl-token-2022 3.0.2", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-2022 4.0.0", "static_assertions", "strum 0.24.1", "strum_macros 0.24.3", @@ -5673,9 +5675,9 @@ dependencies = [ [[package]] name = "solana-loader-v4-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6f5cc41278ec9ea09f03f3c5186dc1bd189598fc3be4c64afed189c6861f7c" +checksum = "fb89d7fee9ac27ee6ead4bf81bbad181c506ac628bb3a10200e15536956c816d" dependencies = [ "log", "solana-compute-budget", @@ -5688,9 +5690,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a35060affcb1165707842f034d7eaa21ba84bde56250fcc9c93f993cee75fa2" +checksum = "20dcd2df996a278075cfa41bbc07efc442b2b88b9538018ee8831a7ba1eb9df4" dependencies = [ "env_logger", "lazy_static", @@ -5699,9 +5701,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9c56745b38f666c12270858056e4b842e2f0ab65a6c8f7365f3b8b203f5384" +checksum = "2f05d55c422b89ab28b4c277096a28b8449b2cc6c676a8b9f206f5b6fe0e9250" dependencies = [ "log", "solana-sdk", @@ -5709,9 +5711,9 @@ dependencies = [ [[package]] name = "solana-merkle-tree" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72fcd571d7ec772a2c8f0ace14ca84fec66b33b337a5cb6a36b62b5033c71454" +checksum = "6ed80bcbc059b0c7e3b1494881224fca5b32d0df3cdbc2d60c5a63855b9f3653" dependencies = [ "fast-math", "solana-program", @@ -5719,9 +5721,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea2877e1139bcf1c7f097d25a464b5e5b09bf6a2c29cd7d2df5b83d162558f4" +checksum = "af252344d7c3db5fc4584b1188801efa19c4b5186ec79fecf03172c327f68bdc" dependencies = [ "crossbeam-channel", "gethostname", @@ -5734,9 +5736,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48732f8c78e1c7ae061728ed3a28c6dcccfc47d682ffb0498078c176599b893" +checksum = "10a0ec8ca1735e594027f162c786b2d0a5876175179fef64a0c4a3d5a57868cb" dependencies = [ "bincode", "clap 3.2.25", @@ -5763,9 +5765,9 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" [[package]] name = "solana-perf" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12093f39b8e6f6e05209800a46e69ce4b8189240fd2b24a7524b2afc5d214560" +checksum = "607e921709ecc9415142bb0fbd6ff0a9ecdc3f06d1b2dd49e50fd28397065dc1" dependencies = [ "ahash 0.8.11", "bincode", @@ -5790,9 +5792,9 @@ dependencies = [ [[package]] name = "solana-poh" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6fb082e367c0a1f86ab429b04247836941cd63e946f285561d665192dd01ea" +checksum = "a6ef60354bd1097a1141f2081b102806b6414de1e644a11ef60f8fe6cff21c8b" dependencies = [ "core_affinity", "crossbeam-channel", @@ -5808,9 +5810,9 @@ dependencies = [ [[package]] name = "solana-poseidon" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b909e1b48a82394581d5b9d0e2020405fb2e0aadd0722151e43eb6ec8d02749" +checksum = "a317bd81fea0544982496b77f00548fd05d7fd6e0225336ece1b5baa166cc849" dependencies = [ "ark-bn254", "light-poseidon", @@ -5819,9 +5821,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e40f0663c34e87e1aef55bec7a46c79ffc6d39355754af28297fdad81b09bf7a" +checksum = "70306519f79aa7699264d76d7f4fe252ab22fef3a85404a748a42f8dd750653e" dependencies = [ "ark-bn254", "ark-ec", @@ -5865,9 +5867,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25de9a89f5c6a0ad2082499bfd24645bc6a7d740f277e907ccb72c367f65da7f" +checksum = "f9df6b9034e3f60922fb1c0214af5c0b4819bdca358729c4e5eb8c4a6de13329" dependencies = [ "base64 0.22.1", "bincode", @@ -5894,9 +5896,9 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e1a1af7df706972778defcc2ebc7e367b68ba2ce79bd113eb86a7f0d730acb" +checksum = "b5cce5a81c0cd91a9a4368dce2735d04eebeb690a2f9178d8438d9705e50ec04" dependencies = [ "assert_matches", "async-trait", @@ -5926,9 +5928,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c7b08722d6a7664d52df552316bf34fd7ad6c08bb11238019adf374bd2715f" +checksum = "b3209efb2a3824da1812867d3bee72991074b5bf4696e942526d3376a9da1719" dependencies = [ "crossbeam-channel", "futures-util", @@ -5951,9 +5953,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c460d20a73cdf6506493d28d384168cb51d88d6f3bab11d1fc3386701184aa" +checksum = "438a959b0fdd4462f2e3414e344eb238cfcae47954138e7c3b71c91cdddcd0f8" dependencies = [ "async-mutex", "async-trait", @@ -5977,9 +5979,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e0b49496fc9f4b2cd7c4a6e76528d5f5dbf02b358063c1ce1902fc3a5544662" +checksum = "ad3deea78e2595058eb1ed0df39d7edefa27af7dd0c48ccec52f420c5cd7d8f3" dependencies = [ "lazy_static", "num_cpus", @@ -5987,9 +5989,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0d0b85d73b120a74e6b76e02c10d958cf6f785934dd3255d326ab160d20f35f" +checksum = "a5c77daeb53dfb4505278edfce9b19a3c3f87fa087dcae7d991992482abe16fc" dependencies = [ "console", "dialoguer", @@ -6007,9 +6009,9 @@ dependencies = [ [[package]] name = "solana-rpc" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1da6f960ef08063c709af6ea665dae0910a5a96a83b9ca6fb68b7267e338a4e7" +checksum = "c017bb0895569b24f0cade001a61aaa00870e0afb5193f16cd20adfab5bc6f16" dependencies = [ "base64 0.22.1", "bincode", @@ -6056,8 +6058,8 @@ dependencies = [ "solana-version", "solana-vote", "solana-vote-program", - "spl-token 4.0.1", - "spl-token-2022 3.0.2", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-2022 4.0.0", "stream-cancel", "thiserror", "tokio", @@ -6066,9 +6068,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c82d9271f6f77b7bac38ce441cd12861226ce169fa80bcaa2577c5f993ed114" +checksum = "4c707af41ab518c8cae359fe9812c90d35f1f38bddec0cacae5a449d871a780c" dependencies = [ "async-trait", "base64 0.22.1", @@ -6093,9 +6095,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7854ed73e8fb4d7659154bb56936bae57a7fcddb72c985f90addbbd848e7a6b4" +checksum = "e112f318737465bbc72a37a67bea1af546cb48a0fa036f580b0b9d811c37c44b" dependencies = [ "anyhow", "base64 0.22.1", @@ -6117,9 +6119,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b64e712e13e6e5227fc560ea3aeea8c5c9a6162fcbc81b27e29b37f83ae716" +checksum = "987af8ea438abb5ed2154bd28eb9a4fc91b67684aab9feb6567126a564c27d52" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -6130,9 +6132,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "517b7c8c733806cff9b71b42f17b910c3cc07262f3923d87994f4bdd690d4fa1" +checksum = "9441541ee347eab8826bcf1b87ff09f6cdb7a747b15f59e28b63a391683033d1" dependencies = [ "aquamarine", "arrayref", @@ -6210,9 +6212,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f97d69fad09b8ae20b1f36ea76b57d10475b2c33d745c809274186d5a057d1" +checksum = "0f465706f7595391c7b65d19a940ed488fea5dab69eb8c9c211de87a416a0154" dependencies = [ "bincode", "bitflags 2.5.0", @@ -6259,9 +6261,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebe207139d12a438f87f353792066340c5cb31b124561715b7edfd743456424" +checksum = "44bfdd94b479f125a64f028c31ca6b018cf7ab1a5ebc974f175c54dd56ad58b1" dependencies = [ "bs58", "proc-macro2", @@ -6278,13 +6280,14 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-send-transaction-service" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe2d69ffdf1483d74d4f17fcf9343bb636e45ef80c8b73287419c4a94242883" +checksum = "de968aa5bfb90210001d104c9a59a7c7cde520f6c15be866a5bd072c5d659677" dependencies = [ "crossbeam-channel", "log", "solana-client", + "solana-connection-cache", "solana-measure", "solana-metrics", "solana-runtime", @@ -6294,9 +6297,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee8d93ae4d7718df355eea9b40a1961ed4abb9ff239a1d9938e34cd6dc42eb6" +checksum = "6b8169153b45aace9dc8a9810c08500fb9636d8bfce3798d3ae0c409a79d78d2" dependencies = [ "bincode", "log", @@ -6310,9 +6313,9 @@ dependencies = [ [[package]] name = "solana-storage-bigtable" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1bccb8bab11beb0bc3f35de7ed14f183f351cecb78f784478547c1ee5c216b" +checksum = "c41b91bcac603a0ab7ae6a06e3ea5cf8c96414d68affe6b5bda0243d2a6a61b5" dependencies = [ "backoff", "bincode", @@ -6344,9 +6347,9 @@ dependencies = [ [[package]] name = "solana-storage-proto" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "124192666aa17e73f06d031c9f2be5f6ce51b1ffb606997c7cc978ac00b751c9" +checksum = "561fb46c3630989f21a192fe5fc4a5f0c37bb10b5f5de62e5b3b8a00f635b564" dependencies = [ "bincode", "bs58", @@ -6361,9 +6364,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb2023bd1fff9d3f86331a5471c229dd166ba99405e3f1697a8ee83e909d92f" +checksum = "15a9e5052d42163a82e57e7592a510df51c537b9eacdac6a6db9ea971d77e90c" dependencies = [ "async-channel", "bytes", @@ -6395,9 +6398,9 @@ dependencies = [ [[package]] name = "solana-svm" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bbef83e5f51a96574bf3c3df4949d1f74c004d399fa22be2af21f7115e4228" +checksum = "85a997df828d0c09ed21fb15ffe451c9fef7d76d08763dd28f7e1a709e3fe902" dependencies = [ "itertools 0.12.1", "log", @@ -6421,9 +6424,9 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a7b77af664c8d2ed23b8da80b7b6980e2a34825be830bc477beae8c4f8868e" +checksum = "ee8f1408b763edff6642aafd623dba8b534d511741b9747d735c2b0c27c7404a" dependencies = [ "bincode", "log", @@ -6436,9 +6439,9 @@ dependencies = [ [[package]] name = "solana-test-validator" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9d1aca1b1a91d2977bc2c091efdc0ccb2698a076af087598a25c83d6ae45d0" +checksum = "729bf398ab355e9afd81605baff6041e648c08f441c94352a5142c2b0fd9c8da" dependencies = [ "base64 0.22.1", "bincode", @@ -6468,9 +6471,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34fe0c37051132d2f2e5cdffc1b1fdfc49831d578c7d4a9ddef242c27c78850" +checksum = "dd866005e5fb235290a21a9e21fbf71e62baa28d0314461c385fcbee36cb7b5d" dependencies = [ "bincode", "log", @@ -6483,9 +6486,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96465b880d0d8d04ec486bb8c8b962cae492aa347410699bdfac39def40d83a5" +checksum = "49982e4c3c6bec81b68fd5dffc913881f0eabed85b1f0ffb356bdf9a174e5524" dependencies = [ "async-trait", "bincode", @@ -6507,9 +6510,9 @@ dependencies = [ [[package]] name = "solana-transaction-metrics-tracker" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72fa91e537d9cc848ef0e350234598cbd4b2e22fe522667ee856ab7dbe2cdfb8" +checksum = "1bfeae9082978a685c4ddb59c522c8a373abc1b8e2aff784832c89bfec6f2994" dependencies = [ "Inflector", "base64 0.22.1", @@ -6523,9 +6526,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4d19dc5e2aa23e4f5db0e1d7e2ba5e4bba657480434b17e0dee89b2553a862" +checksum = "056d5820fb157d9a4520459157a4bd3ab6371d8217cd3ecbc308552734735cab" dependencies = [ "Inflector", "base64 0.22.1", @@ -6539,20 +6542,20 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-sdk", - "spl-associated-token-account 3.0.2", - "spl-memo 4.0.1", - "spl-token 4.0.1", - "spl-token-2022 3.0.2", - "spl-token-group-interface 0.2.3", - "spl-token-metadata-interface 0.3.3", + "spl-associated-token-account 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-memo 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-2022 4.0.0", + "spl-token-group-interface 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-metadata-interface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "solana-turbine" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686b7407386eb84985b967308031396a9edb05a3ef26ce50f31cf222d5a14d34" +checksum = "aec9e742ac44084fe408a7aa3637616ae67e196aed9d9310d14278c2b4f52ec1" dependencies = [ "bincode", "bytes", @@ -6586,9 +6589,9 @@ dependencies = [ [[package]] name = "solana-type-overrides" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c7d6ff1f04c1e88a0e8e6b8e7120b1b2cb4bce20174073d525eaf9c0ba8e52" +checksum = "56de490a66d221f1689e39177f2f8b1d179d9e0c65d21dbe1ba463129c10f48d" dependencies = [ "lazy_static", "rand 0.8.5", @@ -6596,9 +6599,9 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31db6a2a087d8e7ed611b63da782b1a92de52d3ce5be459a2d2a97f9e6d084ec" +checksum = "21a7adba62612cad0b91e4ea1a571348b6a6eea0ab5f881d195d01377bbf942f" dependencies = [ "async-trait", "solana-connection-cache", @@ -6611,9 +6614,9 @@ dependencies = [ [[package]] name = "solana-unified-scheduler-logic" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9063e5867dc59ea0dc1f85f180f836640c0ee64c457b272e45c6200157b9f41" +checksum = "9cde58f21c126a2934265f928781ccb481b2ebc54408e6f2b1f8b3e3325f8b13" dependencies = [ "assert_matches", "solana-sdk", @@ -6622,9 +6625,9 @@ dependencies = [ [[package]] name = "solana-unified-scheduler-pool" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1058f74e7aae37870cc2531ce0dd85de6146ec9f10805da1d34b1254f2383bc" +checksum = "9b695648e6797ba16ead77c41c0b21d2a6e3ed0b909512b184be93c505285cbe" dependencies = [ "assert_matches", "crossbeam-channel", @@ -6643,9 +6646,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffd50de0782f9dddbd4d38fde54ad54fc9c1e45e085be8a0b72b4c31dbb7b40" +checksum = "e8981d1fbd9fc755ce51280173647bcf8220037edbae62ddbf8cc6c4d32a0d2c" dependencies = [ "log", "rustc_version", @@ -6657,9 +6660,9 @@ dependencies = [ [[package]] name = "solana-vote" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6030bbe862fc9e0784a94a125aa9c7313e8ce413d09be46738619cc270db49ae" +checksum = "2f4bac7df996a6d238febc8be3dc35e3f58dd92a623bb5f9d8087565b8e86d00" dependencies = [ "itertools 0.12.1", "log", @@ -6672,9 +6675,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f39358335b843594a7500c55215368959f0ff441556c452de3a5e78bd1c582d" +checksum = "801834cb2fee5294604736fd51c8f6d93d58081e81b20ca995b8ed618189ab98" dependencies = [ "bincode", "log", @@ -6692,9 +6695,9 @@ dependencies = [ [[package]] name = "solana-wen-restart" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40ffdc05be435505394243a895e0cd811aebd7dc088a46ccaaa89ce134b6881" +checksum = "c4e42f68bcda98739a426171abc88de622e165bcbb947ddeefb72e4ad6411ed9" dependencies = [ "anyhow", "log", @@ -6717,9 +6720,9 @@ dependencies = [ [[package]] name = "solana-zk-elgamal-proof-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed28fed1b354551600978348528c3e4096efbc1c45dd28cd42bb8db60a42e39d" +checksum = "2dc84df116efcc6efd9a7060fdc6344c0cc83fd2304e14182f8a494b4ccbdf60" dependencies = [ "bytemuck", "num-derive", @@ -6731,9 +6734,9 @@ dependencies = [ [[package]] name = "solana-zk-sdk" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0201f503614a75a390e083f2b781b6730ecbeb605c9c99830c83ae0c92a18cd" +checksum = "b16795d365543ead535efc7ee60267104044be9d9bbf2ec288f71f29a293c95f" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -6760,9 +6763,9 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9999be8fb9725b787d0127eca01c50eb2ec3e9349f94a4e5e230e6af51b3eb" +checksum = "65e8ba9b43eb8b06c4cf2acf6485196015e733028bb78da1ad68e08ff6a76e54" dependencies = [ "bytemuck", "num-derive", @@ -6774,9 +6777,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce7a941b76d582857d388f96d3b0bdaf3adb6320756bca7334e34e573ab19445" +checksum = "7e69d5cf8dd8eb3c7d03cb02d0b2acb60c24cc3306cff0c5cac925b39831ff39" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -6836,31 +6839,31 @@ checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" [[package]] name = "spl-associated-token-account" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e688554bac5838217ffd1fab7845c573ff106b6336bf7d290db7c98d5a8efd" +version = "4.0.0" dependencies = [ "assert_matches", "borsh 1.5.1", "num-derive", "num-traits", "solana-program", - "spl-token 4.0.1", - "spl-token-2022 3.0.2", + "spl-token 6.0.0", + "spl-token-2022 4.0.1", "thiserror", ] [[package]] name = "spl-associated-token-account" version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" dependencies = [ "assert_matches", "borsh 1.5.1", "num-derive", "num-traits", "solana-program", - "spl-token 6.0.0", - "spl-token-2022 4.0.1", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-2022 4.0.0", "thiserror", ] @@ -6906,23 +6909,23 @@ dependencies = [ [[package]] name = "spl-discriminator" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d1814406e98b08c5cd02c1126f83fd407ad084adce0b05fda5730677822eac" +version = "0.3.0" dependencies = [ + "borsh 1.5.1", "bytemuck", "solana-program", - "spl-discriminator-derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-discriminator-derive 0.2.0", ] [[package]] name = "spl-discriminator" version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" dependencies = [ - "borsh 1.5.1", "bytemuck", "solana-program", - "spl-discriminator-derive 0.2.0", + "spl-discriminator-derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7208,20 +7211,20 @@ dependencies = [ [[package]] name = "spl-memo" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e9bae02de3405079a057fe244c867a08f92d48327d231fc60da831f94caf0a" +version = "5.0.0" dependencies = [ "solana-program", + "solana-program-test", + "solana-sdk", ] [[package]] name = "spl-memo" version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" dependencies = [ "solana-program", - "solana-program-test", - "solana-sdk", ] [[package]] @@ -7247,56 +7250,57 @@ dependencies = [ [[package]] name = "spl-pod" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ce669f48cf2eca1ec518916d8725596bfb655beb1c74374cf71dc6cb773c9" +version = "0.3.0" dependencies = [ + "base64 0.22.1", "borsh 1.5.1", "bytemuck", + "bytemuck_derive", + "serde", + "serde_json", "solana-program", "solana-zk-token-sdk", - "spl-program-error 0.4.1", + "spl-program-error 0.5.0", ] [[package]] name = "spl-pod" version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6166a591d93af33afd75bbd8573c5fd95fb1213f1bf254f0508c89fdb5ee156" dependencies = [ - "base64 0.22.1", "borsh 1.5.1", "bytemuck", "bytemuck_derive", - "serde", - "serde_json", "solana-program", "solana-zk-token-sdk", - "spl-program-error 0.5.0", + "spl-program-error 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "spl-program-error" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49065093ea91f57b9b2bd81493ff705e2ad4e64507a07dbc02b085778e02770e" +version = "0.5.0" dependencies = [ + "lazy_static", "num-derive", "num-traits", + "serial_test", "solana-program", - "spl-program-error-derive 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", + "spl-program-error-derive 0.4.1", "thiserror", ] [[package]] name = "spl-program-error" version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" dependencies = [ - "lazy_static", "num-derive", "num-traits", - "serial_test", "solana-program", - "solana-sdk", - "spl-program-error-derive 0.4.1", + "spl-program-error-derive 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] @@ -7455,20 +7459,6 @@ dependencies = [ "spl-token 6.0.0", ] -[[package]] -name = "spl-tlv-account-resolution" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cace91ba08984a41556efe49cbf2edca4db2f577b649da7827d3621161784bf8" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", - "spl-type-length-value 0.4.3", -] - [[package]] name = "spl-tlv-account-resolution" version = "0.7.0" @@ -7488,18 +7478,17 @@ dependencies = [ ] [[package]] -name = "spl-token" -version = "4.0.1" +name = "spl-tlv-account-resolution" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ae123223633a389f95d1da9d49c2d0a50d499e7060b9624626a69e536ad2a4" +checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" dependencies = [ - "arrayref", "bytemuck", - "num-derive", - "num-traits", - "num_enum", "solana-program", - "thiserror", + "spl-discriminator 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-pod 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-type-length-value 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7520,11 +7509,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "spl-token" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a0f06ac7f23dc0984931b1fe309468f14ea58e32660439c1cef19456f5d0e3" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive", + "num-traits", + "num_enum", + "solana-program", + "thiserror", +] + [[package]] name = "spl-token-2022" -version = "3.0.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5412f99ae7ee6e0afde00defaa354e6228e47e30c0e3adf553e2e01e6abb584" +checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" dependencies = [ "arrayref", "bytemuck", @@ -7534,13 +7538,13 @@ dependencies = [ "solana-program", "solana-security-txt", "solana-zk-token-sdk", - "spl-memo 4.0.1", - "spl-pod 0.2.2", - "spl-token 4.0.1", - "spl-token-group-interface 0.2.3", - "spl-token-metadata-interface 0.3.3", - "spl-transfer-hook-interface 0.6.3", - "spl-type-length-value 0.4.3", + "spl-memo 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-pod 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-group-interface 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-metadata-interface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-transfer-hook-interface 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-type-length-value 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] @@ -7741,27 +7745,27 @@ dependencies = [ [[package]] name = "spl-token-group-interface" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d419b5cfa3ee8e0f2386fd7e02a33b3ec8a7db4a9c7064a2ea24849dc4a273b6" +version = "0.3.0" dependencies = [ "bytemuck", "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "spl-discriminator 0.3.0", + "spl-pod 0.3.0", + "spl-program-error 0.5.0", + "spl-type-length-value 0.5.0", ] [[package]] name = "spl-token-group-interface" version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" dependencies = [ "bytemuck", "solana-program", - "spl-discriminator 0.3.0", - "spl-pod 0.3.0", - "spl-program-error 0.5.0", - "spl-type-length-value 0.5.0", + "spl-discriminator 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-pod 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7814,30 +7818,30 @@ dependencies = [ [[package]] name = "spl-token-metadata-interface" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30179c47e93625680dabb620c6e7931bd12d62af390f447bc7beb4a3a9b5feee" +version = "0.4.0" dependencies = [ "borsh 1.5.1", + "serde", + "serde_json", "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", - "spl-type-length-value 0.4.3", + "spl-discriminator 0.3.0", + "spl-pod 0.3.0", + "spl-program-error 0.5.0", + "spl-type-length-value 0.5.0", ] [[package]] name = "spl-token-metadata-interface" version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" dependencies = [ "borsh 1.5.1", - "serde", - "serde_json", "solana-program", - "spl-discriminator 0.3.0", - "spl-pod 0.3.0", - "spl-program-error 0.5.0", - "spl-type-length-value 0.5.0", + "spl-discriminator 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-pod 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-type-length-value 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7964,22 +7968,6 @@ dependencies = [ "spl-type-length-value 0.5.0", ] -[[package]] -name = "spl-transfer-hook-interface" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a98359769cd988f7b35c02558daa56d496a7e3bd8626e61f90a7c757eedb9b" -dependencies = [ - "arrayref", - "bytemuck", - "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", - "spl-tlv-account-resolution 0.6.3", - "spl-type-length-value 0.4.3", -] - [[package]] name = "spl-transfer-hook-interface" version = "0.7.0" @@ -7996,16 +7984,19 @@ dependencies = [ ] [[package]] -name = "spl-type-length-value" -version = "0.4.3" +name = "spl-transfer-hook-interface" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ce13429dbd41d2cee8a73931c05fda0b0c8ca156a8b0c19445642550bb61a" +checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" dependencies = [ + "arrayref", "bytemuck", "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "spl-discriminator 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-pod 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-tlv-account-resolution 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-type-length-value 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -8020,6 +8011,19 @@ dependencies = [ "spl-type-length-value-derive", ] +[[package]] +name = "spl-type-length-value" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-pod 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "spl-type-length-value-derive" version = "0.1.0" diff --git a/account-compression/Cargo.lock b/account-compression/Cargo.lock index 0ec096f8ba8..c5764a640be 100644 --- a/account-compression/Cargo.lock +++ b/account-compression/Cargo.lock @@ -1630,18 +1630,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", diff --git a/account-compression/sdk/package.json b/account-compression/sdk/package.json index 34412c8442a..abe259ef3c4 100644 --- a/account-compression/sdk/package.json +++ b/account-compression/sdk/package.json @@ -66,7 +66,7 @@ "devDependencies": { "@metaplex-foundation/rustbin": "^0.3.5", "@metaplex-foundation/solita": "0.20.1", - "@project-serum/anchor": "^0.26.0", + "@coral-xyz/anchor": "^0.27.0", "@solana/eslint-config-solana": "^3.0.3", "@solana/prettier-config-solana": "^0.0.5", "@types/bn.js": "^5.1.0", diff --git a/account-compression/sdk/tests/accountCompression.test.ts b/account-compression/sdk/tests/accountCompression.test.ts index 3a6d996d021..2a59e6992ac 100644 --- a/account-compression/sdk/tests/accountCompression.test.ts +++ b/account-compression/sdk/tests/accountCompression.test.ts @@ -1,7 +1,7 @@ import { strict as assert } from 'node:assert'; -import { AnchorProvider } from '@project-serum/anchor'; -import NodeWallet from '@project-serum/anchor/dist/cjs/nodewallet'; +import { AnchorProvider } from '@coral-xyz/anchor'; +import NodeWallet from '@coral-xyz/anchor/dist/cjs/nodewallet'; import { Connection, Keypair, PublicKey, TransactionInstruction } from '@solana/web3.js'; import { BN } from 'bn.js'; import * as crypto from 'crypto'; diff --git a/account-compression/sdk/tests/accounts/concurrentMerkleTreeAccount.test.ts b/account-compression/sdk/tests/accounts/concurrentMerkleTreeAccount.test.ts index 4c1658df208..247c6e7fe08 100644 --- a/account-compression/sdk/tests/accounts/concurrentMerkleTreeAccount.test.ts +++ b/account-compression/sdk/tests/accounts/concurrentMerkleTreeAccount.test.ts @@ -1,7 +1,7 @@ import { strict as assert } from 'node:assert'; -import { AnchorProvider } from '@project-serum/anchor'; -import NodeWallet from '@project-serum/anchor/dist/cjs/nodewallet'; +import { AnchorProvider } from '@coral-xyz/anchor'; +import NodeWallet from '@coral-xyz/anchor/dist/cjs/nodewallet'; import { Connection, Keypair, PublicKey } from '@solana/web3.js'; import { ALL_DEPTH_SIZE_PAIRS, ConcurrentMerkleTreeAccount, getConcurrentMerkleTreeAccountSize } from '../../src'; diff --git a/account-compression/sdk/tests/events/changelog.test.ts b/account-compression/sdk/tests/events/changelog.test.ts index aa432493ddf..a90a99c8d8b 100644 --- a/account-compression/sdk/tests/events/changelog.test.ts +++ b/account-compression/sdk/tests/events/changelog.test.ts @@ -1,8 +1,8 @@ import { strict as assert } from "node:assert"; -import { AnchorProvider } from "@project-serum/anchor"; -import NodeWallet from "@project-serum/anchor/dist/cjs/nodewallet"; -import { bs58 } from "@project-serum/anchor/dist/cjs/utils/bytes"; +import { AnchorProvider } from "@coral-xyz/anchor"; +import NodeWallet from "@coral-xyz/anchor/dist/cjs/nodewallet"; +import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes"; import { Connection, Keypair, PublicKey } from "@solana/web3.js"; import { BN } from "bn.js"; import * as crypto from "crypto"; diff --git a/account-compression/sdk/tests/utils.ts b/account-compression/sdk/tests/utils.ts index d57c297ce3f..8cddb2f9e30 100644 --- a/account-compression/sdk/tests/utils.ts +++ b/account-compression/sdk/tests/utils.ts @@ -1,4 +1,4 @@ -import { AnchorProvider } from '@project-serum/anchor'; +import { AnchorProvider } from '@coral-xyz/anchor'; import { Keypair, SendTransactionError, Signer, Transaction, TransactionInstruction } from '@solana/web3.js'; import * as crypto from 'crypto'; @@ -9,7 +9,7 @@ import { MerkleTree } from '../src/merkle-tree'; export async function confirmAndLogTx(provider: AnchorProvider, txId: string, verbose = false) { const tx = await provider.connection.confirmTransaction(txId, 'confirmed'); if (tx.value.err || verbose) { - console.log((await provider.connection.getConfirmedTransaction(txId, 'confirmed'))!.meta!.logMessages); + console.log((await provider.connection.getTransaction(txId, { commitment: 'confirmed' }))!.meta!.logMessages); } if (tx.value.err) { console.log('Transaction failed'); @@ -43,7 +43,7 @@ export async function execute( } if (verbose && txid) { - console.log((await provider.connection.getConfirmedTransaction(txid, 'confirmed'))!.meta!.logMessages); + console.log((await provider.connection.getTransaction(txid, { commitment: 'confirmed' }))!.meta!.logMessages); } return txid; diff --git a/associated-token-account/program-test/Cargo.toml b/associated-token-account/program-test/Cargo.toml index 6436eb1d0bf..be9069b8c90 100644 --- a/associated-token-account/program-test/Cargo.toml +++ b/associated-token-account/program-test/Cargo.toml @@ -11,9 +11,9 @@ version = "0.0.1" test-sbf = [] [dev-dependencies] -solana-program = "2.0.0" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program = "2.0.3" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-associated-token-account = { version = "4.0.0", path = "../program", features = ["no-entrypoint"] } spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] } diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index e27da404f5e..a8cb53b1f3c 100644 --- a/associated-token-account/program/Cargo.toml +++ b/associated-token-account/program/Cargo.toml @@ -16,7 +16,7 @@ assert_matches = "1.5.0" borsh = "1.5.1" num-derive = "0.4" num-traits = "0.2" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", ] } diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml index 0021bdfc4ab..fc7d4c68d69 100644 --- a/binary-option/program/Cargo.toml +++ b/binary-option/program/Cargo.toml @@ -9,7 +9,7 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" thiserror = "1.0" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml index 7328e9e3da4..2042a33c970 100644 --- a/binary-oracle-pair/program/Cargo.toml +++ b/binary-oracle-pair/program/Cargo.toml @@ -13,7 +13,7 @@ test-sbf = [] [dependencies] num-derive = "0.4" num-traits = "0.2" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", ] } @@ -22,8 +22,8 @@ uint = "0.9" borsh = "1.5.1" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/ci/solana-version.sh b/ci/solana-version.sh index afa8ebc1321..6699537929e 100755 --- a/ci/solana-version.sh +++ b/ci/solana-version.sh @@ -17,7 +17,7 @@ else # This file is now out of sync with the versions in Cargo.toml. # https://github.com/solana-labs/solana-program-library/pull/6182 # This will require some manual cleanup the next time the version is updated. - solana_version=v2.0.0 + solana_version=v2.0.3 fi export solana_version="$solana_version" diff --git a/examples/rust/cross-program-invocation/Cargo.toml b/examples/rust/cross-program-invocation/Cargo.toml index 5b5718ddcda..bf75f71cab2 100644 --- a/examples/rust/cross-program-invocation/Cargo.toml +++ b/examples/rust/cross-program-invocation/Cargo.toml @@ -13,11 +13,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/custom-heap/Cargo.toml b/examples/rust/custom-heap/Cargo.toml index f25234896c4..1441a103067 100644 --- a/examples/rust/custom-heap/Cargo.toml +++ b/examples/rust/custom-heap/Cargo.toml @@ -15,11 +15,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/logging/Cargo.toml b/examples/rust/logging/Cargo.toml index ce85dd80c0c..d61e234a849 100644 --- a/examples/rust/logging/Cargo.toml +++ b/examples/rust/logging/Cargo.toml @@ -13,11 +13,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/sysvar/Cargo.toml b/examples/rust/sysvar/Cargo.toml index 8459995776a..c5569ec7cbf 100644 --- a/examples/rust/sysvar/Cargo.toml +++ b/examples/rust/sysvar/Cargo.toml @@ -13,11 +13,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/transfer-lamports/Cargo.toml b/examples/rust/transfer-lamports/Cargo.toml index bc14059958c..68d09d10d31 100644 --- a/examples/rust/transfer-lamports/Cargo.toml +++ b/examples/rust/transfer-lamports/Cargo.toml @@ -12,11 +12,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/transfer-tokens/Cargo.toml b/examples/rust/transfer-tokens/Cargo.toml index 72230163bcf..2874be4fc27 100644 --- a/examples/rust/transfer-tokens/Cargo.toml +++ b/examples/rust/transfer-tokens/Cargo.toml @@ -12,12 +12,12 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../../token/program", features = [ "no-entrypoint" ] } [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/feature-proposal/cli/Cargo.toml b/feature-proposal/cli/Cargo.toml index 6d7ed43bcce..a02f92ee7fa 100644 --- a/feature-proposal/cli/Cargo.toml +++ b/feature-proposal/cli/Cargo.toml @@ -10,11 +10,11 @@ edition = "2021" [dependencies] chrono = "0.4.38" clap = "2.33.3" -solana-clap-utils = "2.0.0" -solana-cli-config = "2.0.0" -solana-client = "2.0.0" -solana-logger = "2.0.0" -solana-sdk = "2.0.0" +solana-clap-utils = "2.0.3" +solana-cli-config = "2.0.3" +solana-client = "2.0.3" +solana-logger = "2.0.3" +solana-sdk = "2.0.3" spl-feature-proposal = { version = "1.0", path = "../program", features = ["no-entrypoint"] } [[bin]] diff --git a/feature-proposal/program/Cargo.toml b/feature-proposal/program/Cargo.toml index cf8d21ce243..a0f60cbe45c 100644 --- a/feature-proposal/program/Cargo.toml +++ b/feature-proposal/program/Cargo.toml @@ -13,14 +13,14 @@ test-sbf = [] [dependencies] borsh = "1.5.1" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", ] } [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/governance/addin-api/Cargo.toml b/governance/addin-api/Cargo.toml index dccd430ffbb..bb8424d4e3f 100644 --- a/governance/addin-api/Cargo.toml +++ b/governance/addin-api/Cargo.toml @@ -10,4 +10,4 @@ edition = "2021" [dependencies] borsh = "1.5.1" spl-governance-tools = { version = "0.1.4", path = "../tools" } -solana-program = "2.0.0" +solana-program = "2.0.3" diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml index 851d345b0f0..4c500b8f6b4 100644 --- a/governance/addin-mock/program/Cargo.toml +++ b/governance/addin-mock/program/Cargo.toml @@ -19,7 +19,7 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.204" serde_derive = "1.0.103" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../../token/program", features = [ "no-entrypoint", ] } @@ -31,8 +31,8 @@ thiserror = "1.0" [dev-dependencies] assert_matches = "1.5.0" proptest = "1.5" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" } diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml index f5d4d8e0663..743a8186e14 100644 --- a/governance/chat/program/Cargo.toml +++ b/governance/chat/program/Cargo.toml @@ -19,7 +19,7 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.204" serde_derive = "1.0.103" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../../token/program", features = [ "no-entrypoint", ] } @@ -34,8 +34,8 @@ thiserror = "1.0" [dev-dependencies] assert_matches = "1.5.0" proptest = "1.5" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" } spl-governance-addin-mock = { version = "0.1.4", path = "../../addin-mock/program" } diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml index 6f2d2feb6e7..36ecb4b4944 100644 --- a/governance/program/Cargo.toml +++ b/governance/program/Cargo.toml @@ -19,7 +19,7 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.204" serde_derive = "1.0.103" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", ] } @@ -31,8 +31,8 @@ thiserror = "1.0" assert_matches = "1.5.0" base64 = "0.22" proptest = "1.5" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-governance-test-sdk = { version = "0.1.4", path = "../test-sdk" } spl-governance-addin-mock = { version = "0.1.4", path = "../addin-mock/program" } diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml index 18f431b4e1e..536d5806839 100644 --- a/governance/test-sdk/Cargo.toml +++ b/governance/test-sdk/Cargo.toml @@ -16,9 +16,9 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.204" serde_derive = "1.0.103" -solana-program = "2.0.0" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program = "2.0.3" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", ] } diff --git a/governance/tools/Cargo.toml b/governance/tools/Cargo.toml index 1e3f95bf9cb..e2375d8bd27 100644 --- a/governance/tools/Cargo.toml +++ b/governance/tools/Cargo.toml @@ -15,7 +15,7 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.204" serde_derive = "1.0.103" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", ] } diff --git a/instruction-padding/program/Cargo.toml b/instruction-padding/program/Cargo.toml index 78f3fbd9a5e..f6e07034cea 100644 --- a/instruction-padding/program/Cargo.toml +++ b/instruction-padding/program/Cargo.toml @@ -14,11 +14,11 @@ test-sbf = [] [dependencies] num_enum = "0.7.2" -solana-program = "2.0.0" +solana-program = "2.0.3" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/libraries/discriminator/Cargo.toml b/libraries/discriminator/Cargo.toml index febc3a88308..9f0d92a0e2d 100644 --- a/libraries/discriminator/Cargo.toml +++ b/libraries/discriminator/Cargo.toml @@ -13,7 +13,7 @@ borsh = ["dep:borsh"] [dependencies] borsh = { version = "1", optional = true } bytemuck = { version = "1.16.1", features = ["derive"] } -solana-program = "2.0.0" +solana-program = "2.0.3" spl-discriminator-derive = { version = "0.2.0", path = "./derive" } [lib] diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml index 1ebf27fc8d6..0c9d3a7838f 100644 --- a/libraries/math/Cargo.toml +++ b/libraries/math/Cargo.toml @@ -15,14 +15,14 @@ test-sbf = [] borsh = "1.5.1" num-derive = "0.4" num-traits = "0.2" -solana-program = "2.0.0" +solana-program = "2.0.3" thiserror = "1.0" uint = "0.9" [dev-dependencies] proptest = "1.5.0" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" libm = "0.2.8" [lib] diff --git a/libraries/pod/Cargo.toml b/libraries/pod/Cargo.toml index 3050f4eae8e..983eb539174 100644 --- a/libraries/pod/Cargo.toml +++ b/libraries/pod/Cargo.toml @@ -17,8 +17,8 @@ borsh = { version = "1.5.1", optional = true } bytemuck = { version = "1.16.1" } bytemuck_derive = { version = "1.7.0" } serde = { version = "1.0.204", optional = true } -solana-program = "2.0.0" -solana-zk-token-sdk = "2.0.0" +solana-program = "2.0.3" +solana-zk-token-sdk = "2.0.3" spl-program-error = { version = "0.5.0", path = "../program-error" } [dev-dependencies] diff --git a/libraries/program-error/Cargo.toml b/libraries/program-error/Cargo.toml index ae2c8adafa6..bc273043ad7 100644 --- a/libraries/program-error/Cargo.toml +++ b/libraries/program-error/Cargo.toml @@ -10,14 +10,14 @@ edition = "2021" [dependencies] num-derive = "0.4" num-traits = "0.2" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-program-error-derive = { version = "0.4.1", path = "./derive" } thiserror = "1.0" [dev-dependencies] lazy_static = "1.5" serial_test = "3.1" -solana-sdk = "2.0.0" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/libraries/tlv-account-resolution/Cargo.toml b/libraries/tlv-account-resolution/Cargo.toml index a817d4d461c..8cc6b6196e4 100644 --- a/libraries/tlv-account-resolution/Cargo.toml +++ b/libraries/tlv-account-resolution/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.16.1", features = ["derive"] } serde = { version = "1.0.204", optional = true } -solana-program = "2.0.0" +solana-program = "2.0.3" spl-discriminator = { version = "0.3.0", path = "../discriminator" } spl-program-error = { version = "0.5.0", path = "../program-error" } spl-pod = { version = "0.3.0", path = "../pod" } @@ -23,9 +23,9 @@ spl-type-length-value = { version = "0.5.0", path = "../type-length-value" } [dev-dependencies] futures = "0.3.30" futures-util = "0.3" -solana-client = "2.0.0" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-client = "2.0.3" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/libraries/type-length-value-derive-test/Cargo.toml b/libraries/type-length-value-derive-test/Cargo.toml index 124e1cc4015..2e0d858dec6 100644 --- a/libraries/type-length-value-derive-test/Cargo.toml +++ b/libraries/type-length-value-derive-test/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dev-dependencies] borsh = "1.5.1" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-discriminator = { version = "0.3.0", path = "../discriminator" } spl-type-length-value = { version = "0.5.0", path = "../type-length-value", features = [ "derive", diff --git a/libraries/type-length-value/Cargo.toml b/libraries/type-length-value/Cargo.toml index 2fe956ce56b..01e84f76334 100644 --- a/libraries/type-length-value/Cargo.toml +++ b/libraries/type-length-value/Cargo.toml @@ -13,7 +13,7 @@ derive = ["dep:spl-type-length-value-derive"] [dependencies] bytemuck = { version = "1.16.1", features = ["derive"] } -solana-program = "2.0.0" +solana-program = "2.0.3" spl-discriminator = { version = "0.3.0", path = "../discriminator" } spl-program-error = { version = "0.5.0", path = "../program-error" } spl-type-length-value-derive = { version = "0.1", path = "./derive", optional = true } diff --git a/managed-token/program/Cargo.toml b/managed-token/program/Cargo.toml index 0ce24f81866..c9acfeee90e 100644 --- a/managed-token/program/Cargo.toml +++ b/managed-token/program/Cargo.toml @@ -24,7 +24,7 @@ test = [] [dependencies] borsh = "1.5.1" shank = "^0.4.2" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = [ "no-entrypoint", ] } @@ -34,5 +34,5 @@ spl-token = { version = "6.0", path = "../../token/program", features = [ thiserror = "^1.0.63" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" diff --git a/memo/program/Cargo.toml b/memo/program/Cargo.toml index 762fc447e19..cdfd83a4e04 100644 --- a/memo/program/Cargo.toml +++ b/memo/program/Cargo.toml @@ -12,11 +12,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/name-service/program/Cargo.toml b/name-service/program/Cargo.toml index e40b99a7620..2be79e70498 100644 --- a/name-service/program/Cargo.toml +++ b/name-service/program/Cargo.toml @@ -17,15 +17,15 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" num-traits = "0.2" borsh = "1.5.1" num-derive = "0.4.2" thiserror = "1.0.63" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7e888559fb..2b9e6e7506d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,15 +42,15 @@ importers: specifier: ^1.3.3 version: 1.3.3 devDependencies: + '@coral-xyz/anchor': + specifier: ^0.27.0 + version: 0.27.0 '@metaplex-foundation/rustbin': specifier: ^0.3.5 version: 0.3.5 '@metaplex-foundation/solita': specifier: 0.20.1 version: 0.20.1 - '@project-serum/anchor': - specifier: ^0.26.0 - version: 0.26.0 '@solana/eslint-config-solana': specifier: ^3.0.3 version: 3.0.3(@typescript-eslint/eslint-plugin@7.17.0)(@typescript-eslint/parser@7.17.0)(eslint-plugin-jest@28.6.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-simple-import-sort@12.1.1)(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0)(eslint@8.57.0)(typescript@5.5.4) @@ -1223,8 +1223,33 @@ packages: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true - /@coral-xyz/borsh@0.26.0(@solana/web3.js@1.95.1): - resolution: {integrity: sha512-uCZ0xus0CszQPHYfWAqKS5swS1UxvePu83oOF+TWpUkedsNlg6p2p4azxZNSSqwXb9uXMFgxhuMBX9r3Xoi0vQ==} + /@coral-xyz/anchor@0.27.0: + resolution: {integrity: sha512-+P/vPdORawvg3A9Wj02iquxb4T0C5m4P6aZBVYysKl4Amk+r6aMPZkUhilBkD6E4Nuxnoajv3CFykUfkGE0n5g==} + engines: {node: '>=11'} + dependencies: + '@coral-xyz/borsh': 0.27.0(@solana/web3.js@1.95.1) + '@solana/web3.js': 1.95.1 + base64-js: 1.5.1 + bn.js: 5.2.1 + bs58: 4.0.1 + buffer-layout: 1.2.2 + camelcase: 6.3.0 + cross-fetch: 3.1.8 + crypto-hash: 1.3.0 + eventemitter3: 4.0.7 + js-sha256: 0.9.0 + pako: 2.1.0 + snake-case: 3.0.4 + superstruct: 0.15.5 + toml: 3.0.0 + transitivePeerDependencies: + - bufferutil + - encoding + - utf-8-validate + dev: true + + /@coral-xyz/borsh@0.27.0(@solana/web3.js@1.95.1): + resolution: {integrity: sha512-tJKzhLukghTWPLy+n8K8iJKgBq1yLT/AxaNd10yJrX8mI56ao5+OFAKAqW/h0i79KCvb4BK0VGO5ECmmolFz9A==} engines: {node: '>=10'} peerDependencies: '@solana/web3.js': ^1.68.0 @@ -1968,31 +1993,6 @@ packages: engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} dev: true - /@project-serum/anchor@0.26.0: - resolution: {integrity: sha512-Nq+COIjE1135T7qfnOHEn7E0q39bQTgXLFk837/rgFe6Hkew9WML7eHsS+lSYD2p3OJaTiUOHTAq1lHy36oIqQ==} - engines: {node: '>=11'} - dependencies: - '@coral-xyz/borsh': 0.26.0(@solana/web3.js@1.95.1) - '@solana/web3.js': 1.95.1 - base64-js: 1.5.1 - bn.js: 5.2.1 - bs58: 4.0.1 - buffer-layout: 1.2.2 - camelcase: 6.3.0 - cross-fetch: 3.1.8 - crypto-hash: 1.3.0 - eventemitter3: 4.0.7 - js-sha256: 0.9.0 - pako: 2.1.0 - snake-case: 3.0.4 - superstruct: 0.15.5 - toml: 3.0.0 - transitivePeerDependencies: - - bufferutil - - encoding - - utf-8-validate - dev: true - /@rollup/plugin-alias@5.1.0(rollup@4.19.0): resolution: {integrity: sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==} engines: {node: '>=14.0.0'} diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml index c19e1fdcb65..97a0f25b526 100644 --- a/record/program/Cargo.toml +++ b/record/program/Cargo.toml @@ -15,13 +15,13 @@ test-sbf = [] bytemuck = { version = "1.16.1", features = ["derive"] } num-derive = "0.4" num-traits = "0.2" -solana-program = "2.0.0" +solana-program = "2.0.3" thiserror = "1.0" spl-pod = { version = "0.3.0", path = "../../libraries/pod" } [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/shared-memory/program/Cargo.toml b/shared-memory/program/Cargo.toml index ad58d5b5d30..8050ae91190 100644 --- a/shared-memory/program/Cargo.toml +++ b/shared-memory/program/Cargo.toml @@ -12,11 +12,11 @@ test-sbf = [] [dependencies] arrayref = "0.3.8" -solana-program = "2.0.0" +solana-program = "2.0.3" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/single-pool/cli/Cargo.toml b/single-pool/cli/Cargo.toml index b212045e0c0..489c79cada5 100644 --- a/single-pool/cli/Cargo.toml +++ b/single-pool/cli/Cargo.toml @@ -17,16 +17,16 @@ serde = "1.0.204" serde_derive = "1.0.103" serde_json = "1.0.120" serde_with = "3.9.0" -solana-account-decoder = "2.0.0" -solana-clap-v3-utils = "2.0.0" -solana-cli-config = "2.0.0" -solana-cli-output = "2.0.0" -solana-client = "2.0.0" -solana-logger = "2.0.0" -solana-remote-wallet = "2.0.0" -solana-sdk = "2.0.0" -solana-transaction-status = "2.0.0" -solana-vote-program = "2.0.0" +solana-account-decoder = "2.0.3" +solana-clap-v3-utils = "2.0.3" +solana-cli-config = "2.0.3" +solana-cli-output = "2.0.3" +solana-client = "2.0.3" +solana-logger = "2.0.3" +solana-remote-wallet = "2.0.3" +solana-sdk = "2.0.3" +solana-transaction-status = "2.0.3" +solana-vote-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", ] } @@ -39,7 +39,7 @@ spl-single-pool = { version = "1.0.0", path = "../program", features = [ ] } [dev-dependencies] -solana-test-validator = "2.0.0" +solana-test-validator = "2.0.3" serial_test = "3.1.1" test-case = "3.3" tempfile = "3.10.1" diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml index ba88a56b0ce..c4e4c96b130 100644 --- a/single-pool/program/Cargo.toml +++ b/single-pool/program/Cargo.toml @@ -17,7 +17,7 @@ borsh = "1.5.1" num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.2" -solana-program = "2.0.0" +solana-program = "2.0.3" solana-security-txt = "1.1.1" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", @@ -28,9 +28,9 @@ spl-associated-token-account = { version = "4.0.0", path = "../../associated-tok thiserror = "1.0" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" -solana-vote-program = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" +solana-vote-program = "2.0.3" test-case = "3.3" bincode = "1.3.1" rand = "0.8.5" diff --git a/stake-pool/cli/Cargo.toml b/stake-pool/cli/Cargo.toml index 8258e32b003..b21b344a32c 100644 --- a/stake-pool/cli/Cargo.toml +++ b/stake-pool/cli/Cargo.toml @@ -14,15 +14,15 @@ clap = "2.33.3" serde = "1.0.204" serde_derive = "1.0.130" serde_json = "1.0.120" -solana-account-decoder = "2.0.0" -solana-clap-utils = "2.0.0" -solana-cli-config = "2.0.0" -solana-cli-output = "2.0.0" -solana-client = "2.0.0" -solana-logger = "2.0.0" -solana-program = "2.0.0" -solana-remote-wallet = "2.0.0" -solana-sdk = "2.0.0" +solana-account-decoder = "2.0.3" +solana-clap-utils = "2.0.3" +solana-cli-config = "2.0.3" +solana-cli-output = "2.0.3" +solana-client = "2.0.3" +solana-logger = "2.0.3" +solana-program = "2.0.3" +solana-remote-wallet = "2.0.3" +solana-sdk = "2.0.3" spl-associated-token-account = { version = "=4.0.0", path = "../../associated-token-account/program", features = [ "no-entrypoint", ] } diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml index ffc4056b527..94b1be949ef 100644 --- a/stake-pool/program/Cargo.toml +++ b/stake-pool/program/Cargo.toml @@ -20,7 +20,7 @@ num-traits = "0.2" num_enum = "0.7.2" serde = "1.0.204" serde_derive = "1.0.103" -solana-program = "2.0.0" +solana-program = "2.0.3" solana-security-txt = "1.1.1" spl-math = { version = "0.2", path = "../../libraries/math", features = [ "no-entrypoint", @@ -37,9 +37,9 @@ bincode = "1.3.1" [dev-dependencies] assert_matches = "1.5.0" proptest = "1.5" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" -solana-vote-program = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" +solana-vote-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", ] } diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml index 713d69d6b39..58e1146ea47 100644 --- a/stateless-asks/program/Cargo.toml +++ b/stateless-asks/program/Cargo.toml @@ -12,7 +12,7 @@ test-sbf = [] [dependencies] borsh = "1.5.1" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint", ] } @@ -22,8 +22,8 @@ spl-associated-token-account = { version = "4.0.0", path = "../../associated-tok thiserror = "1.0" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/token-collection/program/Cargo.toml b/token-collection/program/Cargo.toml index 0852e561d11..20063a72024 100644 --- a/token-collection/program/Cargo.toml +++ b/token-collection/program/Cargo.toml @@ -12,7 +12,7 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" spl-pod = { version = "0.3.0", path = "../../libraries/pod" } spl-program-error = { version = "0.5.0" , path = "../../libraries/program-error" } spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] } @@ -22,8 +22,8 @@ spl-token-metadata-interface = { version = "0.4.0", path = "../../token-metadata spl-type-length-value = { version = "0.5.0", path = "../../libraries/type-length-value" } [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-discriminator = { version = "0.3.0", path = "../../libraries/discriminator" } spl-token-client = { version = "0.11.0", path = "../../token/client" } diff --git a/token-group/example/Cargo.toml b/token-group/example/Cargo.toml index 7d023c796dc..e13edba0db4 100644 --- a/token-group/example/Cargo.toml +++ b/token-group/example/Cargo.toml @@ -12,15 +12,15 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" spl-pod = { version = "0.3.0", path = "../../libraries/pod" } spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] } spl-token-group-interface = { version = "0.3.0", path = "../interface" } spl-type-length-value = { version = "0.5.0", path = "../../libraries/type-length-value" } [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-discriminator = { version = "0.3.0", path = "../../libraries/discriminator" } spl-token-client = { version = "0.11.0", path = "../../token/client" } spl-token-metadata-interface = { version = "0.4.0", path = "../../token-metadata/interface" } diff --git a/token-group/interface/Cargo.toml b/token-group/interface/Cargo.toml index b72fc3a3f6d..198934a64aa 100644 --- a/token-group/interface/Cargo.toml +++ b/token-group/interface/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] bytemuck = "1.16.1" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-discriminator = { version = "0.3.0" , path = "../../libraries/discriminator" } spl-pod = { version = "0.3.0" , path = "../../libraries/pod", features = ["borsh"] } spl-program-error = { version = "0.5.0" , path = "../../libraries/program-error" } diff --git a/token-lending/cli/Cargo.toml b/token-lending/cli/Cargo.toml index 903db0f1d25..45db7bd46f7 100644 --- a/token-lending/cli/Cargo.toml +++ b/token-lending/cli/Cargo.toml @@ -10,12 +10,12 @@ version = "0.2.0" [dependencies] clap = "2.33.3" -solana-clap-utils = "2.0.0" -solana-cli-config = "2.0.0" -solana-client = "2.0.0" -solana-logger = "2.0.0" -solana-sdk = "2.0.0" -solana-program = "2.0.0" +solana-clap-utils = "2.0.3" +solana-cli-config = "2.0.3" +solana-client = "2.0.3" +solana-logger = "2.0.3" +solana-sdk = "2.0.3" +solana-program = "2.0.3" spl-token-lending = { version = "0.2", path="../program", features = [ "no-entrypoint" ] } spl-token = { version = "6.0", path="../../token/program", features = [ "no-entrypoint" ] } diff --git a/token-lending/flash_loan_receiver/Cargo.toml b/token-lending/flash_loan_receiver/Cargo.toml index 9bb0f4f3ae8..d1ab7ff82ff 100644 --- a/token-lending/flash_loan_receiver/Cargo.toml +++ b/token-lending/flash_loan_receiver/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] arrayref = "0.3.8" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features=["no-entrypoint"] } [lib] diff --git a/token-lending/program/Cargo.toml b/token-lending/program/Cargo.toml index c7c080a88c8..4932f36391a 100644 --- a/token-lending/program/Cargo.toml +++ b/token-lending/program/Cargo.toml @@ -16,7 +16,7 @@ arrayref = "0.3.8" bytemuck = "1.16.1" num-derive = "0.4" num-traits = "0.2" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" uint = "0.9" @@ -24,8 +24,8 @@ uint = "0.9" [dev-dependencies] assert_matches = "1.5.0" proptest = "1.5" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/token-metadata/example/Cargo.toml b/token-metadata/example/Cargo.toml index f6bb9c6d6a4..8816b77f857 100644 --- a/token-metadata/example/Cargo.toml +++ b/token-metadata/example/Cargo.toml @@ -12,15 +12,15 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] } spl-token-metadata-interface = { version = "0.4.0", path = "../interface" } spl-type-length-value = { version = "0.5.0" , path = "../../libraries/type-length-value" } spl-pod = { version = "0.3.0", path = "../../libraries/pod" } [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-token-client = { version = "0.11.0", path = "../../token/client" } test-case = "3.3" diff --git a/token-metadata/interface/Cargo.toml b/token-metadata/interface/Cargo.toml index 040ce0d6323..a9f27b2d24e 100644 --- a/token-metadata/interface/Cargo.toml +++ b/token-metadata/interface/Cargo.toml @@ -13,7 +13,7 @@ serde-traits = ["dep:serde", "spl-pod/serde-traits"] [dependencies] borsh = "1.5.1" serde = { version = "1.0.204", optional = true } -solana-program = "2.0.0" +solana-program = "2.0.3" spl-discriminator = { version = "0.3.0", path = "../../libraries/discriminator" } spl-program-error = { version = "0.5.0", path = "../../libraries/program-error" } spl-type-length-value = { version = "0.5.0", path = "../../libraries/type-length-value" } diff --git a/token-swap/js/test/main.test.ts b/token-swap/js/test/main.test.ts index 3f6aac99cdb..e0967a1bb40 100644 --- a/token-swap/js/test/main.test.ts +++ b/token-swap/js/test/main.test.ts @@ -121,7 +121,7 @@ async function getConnection(): Promise { if (connection) return connection; const url = 'http://127.0.0.1:8899'; - connection = new Connection(url, 'recent'); + connection = new Connection(url, 'processed'); const version = await connection.getVersion(); console.log('Connection to cluster established:', url, version); diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml index 906a1a500ca..2d52da5b746 100644 --- a/token-swap/program/Cargo.toml +++ b/token-swap/program/Cargo.toml @@ -17,7 +17,7 @@ arrayref = "0.3.8" enum_dispatch = "0.3.13" num-derive = "0.4" num-traits = "0.2" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-math = { version = "0.2", path = "../../libraries/math", features = [ "no-entrypoint" ] } spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint" ] } spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = [ "no-entrypoint" ] } @@ -28,7 +28,7 @@ roots = { version = "0.0.8", optional = true } [dev-dependencies] proptest = "1.5" roots = "0.0.8" -solana-sdk = "2.0.0" +solana-sdk = "2.0.3" test-case = "3.3" [lib] diff --git a/token-swap/program/fuzz/Cargo.toml b/token-swap/program/fuzz/Cargo.toml index b01b567e6b5..4cb4ecdc39f 100644 --- a/token-swap/program/fuzz/Cargo.toml +++ b/token-swap/program/fuzz/Cargo.toml @@ -11,7 +11,7 @@ publish = false [dependencies] honggfuzz = { version = "0.5.56" } arbitrary = { version = "1.3", features = ["derive"] } -solana-program = "2.0.0" +solana-program = "2.0.3" spl-math = { version = "0.2", path = "../../../libraries/math", features = [ "no-entrypoint" ] } spl-token = { version = "6.0", path = "../../../token/program", features = [ "no-entrypoint" ] } spl-token-swap = { path = "..", features = ["fuzz", "no-entrypoint"] } diff --git a/token-upgrade/cli/Cargo.toml b/token-upgrade/cli/Cargo.toml index ccd5c64dd81..27452d782ee 100644 --- a/token-upgrade/cli/Cargo.toml +++ b/token-upgrade/cli/Cargo.toml @@ -13,12 +13,12 @@ walkdir = "2" [dependencies] clap = { version = "3", features = ["cargo"] } futures-util = "0.3.30" -solana-clap-v3-utils = "2.0.0" -solana-cli-config = "2.0.0" -solana-client = "2.0.0" -solana-logger = "2.0.0" -solana-remote-wallet = "2.0.0" -solana-sdk = "2.0.0" +solana-clap-v3-utils = "2.0.3" +solana-cli-config = "2.0.3" +solana-client = "2.0.3" +solana-logger = "2.0.3" +solana-remote-wallet = "2.0.3" +solana-sdk = "2.0.3" spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] } spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] } @@ -27,7 +27,7 @@ spl-token-upgrade = { version = "0.1", path = "../program", features = ["no-entr tokio = { version = "1", features = ["full"] } [dev-dependencies] -solana-test-validator = "2.0.0" +solana-test-validator = "2.0.3" [[bin]] name = "spl-token-upgrade" diff --git a/token-upgrade/program/Cargo.toml b/token-upgrade/program/Cargo.toml index 1b4c1f81482..2ad05f11c72 100644 --- a/token-upgrade/program/Cargo.toml +++ b/token-upgrade/program/Cargo.toml @@ -15,13 +15,13 @@ test-sbf = [] num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.2" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] } thiserror = "1.0" [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-client = { version = "0.11.0", path = "../../token/client" } test-case = "3.3" diff --git a/token-wrap/program/Cargo.toml b/token-wrap/program/Cargo.toml index 986f7d4b56e..66057b8c0d0 100644 --- a/token-wrap/program/Cargo.toml +++ b/token-wrap/program/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.16.1", features = ["derive"] } num_enum = "0.7" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] } spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] } diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml index 8ebd81c7d1a..d81ed19a09c 100644 --- a/token/cli/Cargo.toml +++ b/token/cli/Cargo.toml @@ -19,15 +19,15 @@ futures = "0.3" serde = "1.0.204" serde_derive = "1.0.103" serde_json = "1.0.120" -solana-account-decoder = "2.0.0" -solana-clap-utils = "2.0.0" -solana-cli-config = "2.0.0" -solana-cli-output = "2.0.0" -solana-client = "2.0.0" -solana-logger = "2.0.0" -solana-remote-wallet = "2.0.0" -solana-sdk = "2.0.0" -solana-transaction-status = "2.0.0" +solana-account-decoder = "2.0.3" +solana-clap-utils = "2.0.3" +solana-cli-config = "2.0.3" +solana-cli-output = "2.0.3" +solana-client = "2.0.3" +solana-logger = "2.0.3" +solana-remote-wallet = "2.0.3" +solana-sdk = "2.0.3" +solana-transaction-status = "2.0.3" spl-token = { version = "6.0", path = "../program", features = [ "no-entrypoint", ] } @@ -48,7 +48,7 @@ strum_macros = "0.26" tokio = "1.39" [dev-dependencies] -solana-test-validator = "2.0.0" +solana-test-validator = "2.0.3" assert_cmd = "2.0.14" libtest-mimic = "0.7" serial_test = "3.1.1" diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml index a8a2adf2b24..762b2f3e4cb 100644 --- a/token/client/Cargo.toml +++ b/token/client/Cargo.toml @@ -12,12 +12,12 @@ async-trait = "0.1" curve25519-dalek = "3.2.1" futures = "0.3.30" futures-util = "0.3" -solana-banks-interface = "2.0.0" -solana-cli-output = { version = "2.0.0", optional = true } -solana-program-test = "2.0.0" -solana-rpc-client = "2.0.0" -solana-rpc-client-api = "2.0.0" -solana-sdk = "2.0.0" +solana-banks-interface = "2.0.3" +solana-cli-output = { version = "2.0.3", optional = true } +solana-program-test = "2.0.3" +solana-rpc-client = "2.0.3" +solana-rpc-client-api = "2.0.3" +solana-sdk = "2.0.3" # We never want the entrypoint for ATA, but we want the entrypoint for token when # testing token spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = [ diff --git a/token/confidential-transfer/ciphertext-arithmetic/Cargo.toml b/token/confidential-transfer/ciphertext-arithmetic/Cargo.toml index 75b0297b174..3f848de384a 100644 --- a/token/confidential-transfer/ciphertext-arithmetic/Cargo.toml +++ b/token/confidential-transfer/ciphertext-arithmetic/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" base64 = "0.22.1" bytemuck = "1.16.1" solana-curve25519 = "2.0.0" -solana-zk-sdk = "2.0.0" +solana-zk-sdk = "2.0.3" [dev-dependencies] spl-token-confidential-transfer-proof-generation = { version = "0.1.0", path = "../proof-generation" } diff --git a/token/confidential-transfer/proof-extraction/Cargo.toml b/token/confidential-transfer/proof-extraction/Cargo.toml index 50f7c9ba78a..8949627a946 100644 --- a/token/confidential-transfer/proof-extraction/Cargo.toml +++ b/token/confidential-transfer/proof-extraction/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] bytemuck = "1.16.1" solana-curve25519 = "2.0.0" -solana-zk-sdk = "2.0.0" +solana-zk-sdk = "2.0.3" thiserror = "1.0.63" [lib] diff --git a/token/confidential-transfer/proof-generation/Cargo.toml b/token/confidential-transfer/proof-generation/Cargo.toml index ade348ba3ea..7d580d77081 100644 --- a/token/confidential-transfer/proof-generation/Cargo.toml +++ b/token/confidential-transfer/proof-generation/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] curve25519-dalek = "3.2.1" -solana-zk-sdk = "2.0.0" +solana-zk-sdk = "2.0.3" thiserror = "1.0.63" [dev-dependencies] diff --git a/token/confidential-transfer/proof-tests/Cargo.toml b/token/confidential-transfer/proof-tests/Cargo.toml index ad1bc822dbd..d528e2367e7 100644 --- a/token/confidential-transfer/proof-tests/Cargo.toml +++ b/token/confidential-transfer/proof-tests/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dev-dependencies] curve25519-dalek = "3.2.1" -solana-zk-sdk = "2.0.0" +solana-zk-sdk = "2.0.3" thiserror = "1.0.63" spl-token-confidential-transfer-proof-extraction = { version = "0.1.0", path = "../proof-extraction" } spl-token-confidential-transfer-proof-generation = { version = "0.1.0", path = "../proof-generation" } diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml index 79101933fc0..6350ebd285a 100644 --- a/token/program-2022-test/Cargo.toml +++ b/token/program-2022-test/Cargo.toml @@ -19,9 +19,9 @@ walkdir = "2" async-trait = "0.1" borsh = "1.5.1" futures-util = "0.3" -solana-program = "2.0.0" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program = "2.0.3" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program" } spl-memo = { version = "5.0.0", path = "../../memo/program", features = [ "no-entrypoint", diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml index 3e75846bef6..18e3f95531b 100644 --- a/token/program-2022/Cargo.toml +++ b/token/program-2022/Cargo.toml @@ -22,9 +22,9 @@ bytemuck = { version = "1.16.1", features = ["derive"] } num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.2" -solana-program = "2.0.0" +solana-program = "2.0.3" solana-security-txt = "1.1.1" -solana-zk-token-sdk = "2.0.0" +solana-zk-token-sdk = "2.0.3" spl-memo = { version = "5.0", path = "../../memo/program", features = [ "no-entrypoint" ] } spl-token = { version = "6.0", path = "../program", features = ["no-entrypoint"] } spl-token-group-interface = { version = "0.3.0", path = "../../token-group/interface" } @@ -41,8 +41,8 @@ base64 = { version = "0.22.1", optional = true } lazy_static = "1.5.0" proptest = "1.5" serial_test = "3.1.1" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" spl-tlv-account-resolution = { version = "0.7.0", path = "../../libraries/tlv-account-resolution" } serde_json = "1.0.120" diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml index 077bdfef156..fbc257511c4 100644 --- a/token/program/Cargo.toml +++ b/token/program/Cargo.toml @@ -18,15 +18,15 @@ bytemuck = "1.16.1" num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.2" -solana-program = "2.0.0" +solana-program = "2.0.3" thiserror = "1.0" [dev-dependencies] lazy_static = "1.5.0" proptest = "1.5" serial_test = "3.1.1" -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/token/transfer-hook/cli/Cargo.toml b/token/transfer-hook/cli/Cargo.toml index 22243032076..3ed240276e5 100644 --- a/token/transfer-hook/cli/Cargo.toml +++ b/token/transfer-hook/cli/Cargo.toml @@ -11,12 +11,12 @@ version = "0.2.0" [dependencies] clap = { version = "3", features = ["cargo"] } futures-util = "0.3.30" -solana-clap-v3-utils = "2.0.0" -solana-cli-config = "2.0.0" -solana-client = "2.0.0" -solana-logger = "2.0.0" -solana-remote-wallet = "2.0.0" -solana-sdk = "2.0.0" +solana-clap-v3-utils = "2.0.3" +solana-cli-config = "2.0.3" +solana-client = "2.0.3" +solana-logger = "2.0.3" +solana-remote-wallet = "2.0.3" +solana-sdk = "2.0.3" spl-tlv-account-resolution = { version = "0.7.0" , path = "../../../libraries/tlv-account-resolution", features = ["serde-traits"] } spl-transfer-hook-interface = { version = "0.7.0", path = "../interface" } strum = "0.26" @@ -27,7 +27,7 @@ serde_json = "1.0.120" serde_yaml = "0.9.34" [dev-dependencies] -solana-test-validator = "2.0.0" +solana-test-validator = "2.0.3" spl-token-2022 = { version = "4.0.0", path = "../../program-2022", features = ["no-entrypoint"] } spl-token-client = { version = "0.11.0", path = "../../client" } spl-transfer-hook-example = { version = "0.6.0", path = "../example" } diff --git a/token/transfer-hook/example/Cargo.toml b/token/transfer-hook/example/Cargo.toml index 6eb58bde9c6..9df4d2abf76 100644 --- a/token/transfer-hook/example/Cargo.toml +++ b/token/transfer-hook/example/Cargo.toml @@ -15,15 +15,15 @@ forbid-additional-mints = [] [dependencies] arrayref = "0.3.8" -solana-program = "2.0.0" +solana-program = "2.0.3" spl-tlv-account-resolution = { version = "0.7.0" , path = "../../../libraries/tlv-account-resolution" } spl-token-2022 = { version = "4.0.0", path = "../../program-2022", features = ["no-entrypoint"] } spl-transfer-hook-interface = { version = "0.7.0" , path = "../interface" } spl-type-length-value = { version = "0.5.0" , path = "../../../libraries/type-length-value" } [dev-dependencies] -solana-program-test = "2.0.0" -solana-sdk = "2.0.0" +solana-program-test = "2.0.3" +solana-sdk = "2.0.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/token/transfer-hook/interface/Cargo.toml b/token/transfer-hook/interface/Cargo.toml index 2e3fb0c5edc..8ab712b9133 100644 --- a/token/transfer-hook/interface/Cargo.toml +++ b/token/transfer-hook/interface/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] arrayref = "0.3.8" bytemuck = { version = "1.16.1", features = ["derive"] } -solana-program = "2.0.0" +solana-program = "2.0.3" spl-discriminator = { version = "0.3.0" , path = "../../../libraries/discriminator" } spl-program-error = { version = "0.5.0" , path = "../../../libraries/program-error" } spl-tlv-account-resolution = { version = "0.7.0" , path = "../../../libraries/tlv-account-resolution" } diff --git a/utils/test-client/Cargo.toml b/utils/test-client/Cargo.toml index 97a7d46feb3..e496f50d08d 100644 --- a/utils/test-client/Cargo.toml +++ b/utils/test-client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" # Used to ensure that SPL programs are buildable by external clients [dependencies] -solana-sdk = "2.0.0" +solana-sdk = "2.0.3" spl-memo = { path = "../../memo/program", features = [ "no-entrypoint" ] } spl-token = { path = "../../token/program", features = [ "no-entrypoint" ] } spl-token-swap = { path = "../../token-swap/program", features = [ "no-entrypoint" ] }