From ae115c817d9013a345c038bb67a0252015cb5637 Mon Sep 17 00:00:00 2001 From: Steven Luscher Date: Fri, 28 Mar 2025 22:34:38 +0000 Subject: [PATCH 1/3] Upgrade from `@solana/web3.js` to `@solana/kit` --- locales/en-US.json | 2 +- locales/fr-FR.json | 2 +- template/anchor/clients/js/clients/js/test/_setup.ts | 2 +- template/anchor/clients/js/clients/js/test/create.test.ts | 2 +- .../anchor/clients/js/clients/js/test/increment.test.ts.njk | 2 +- template/clients/js/clients/js/package.json.njk | 4 ++-- template/shank/clients/js/clients/js/test/_setup.ts | 2 +- template/shank/clients/js/clients/js/test/create.test.ts | 2 +- .../shank/clients/js/clients/js/test/increment.test.ts.njk | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/locales/en-US.json b/locales/en-US.json index 1f01e45..05e42bd 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -33,7 +33,7 @@ "selectOptions": { "js": { "title": "JavaScript Client", - "desc": "A TypeScript library compatible with the new web3.js" + "desc": "A TypeScript library compatible with @solana/kit" }, "rust": { "title": "Rust Client", diff --git a/locales/fr-FR.json b/locales/fr-FR.json index b96a230..8d7df3b 100644 --- a/locales/fr-FR.json +++ b/locales/fr-FR.json @@ -33,7 +33,7 @@ "selectOptions": { "js": { "title": "Client JavaScript", - "desc": "Une librairie TypeScript compatible avec le nouveau web3.js" + "desc": "Une librairie TypeScript compatible avec @solana/kit" }, "rust": { "title": "Client Rust", diff --git a/template/anchor/clients/js/clients/js/test/_setup.ts b/template/anchor/clients/js/clients/js/test/_setup.ts index c88a54a..6aa35b4 100644 --- a/template/anchor/clients/js/clients/js/test/_setup.ts +++ b/template/anchor/clients/js/clients/js/test/_setup.ts @@ -21,7 +21,7 @@ import { setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, signTransactionMessageWithSigners, -} from '@solana/web3.js'; +} from '@solana/kit'; import { getCreateInstruction } from '../src'; type Client = { diff --git a/template/anchor/clients/js/clients/js/test/create.test.ts b/template/anchor/clients/js/clients/js/test/create.test.ts index 2c12a7e..cde9463 100644 --- a/template/anchor/clients/js/clients/js/test/create.test.ts +++ b/template/anchor/clients/js/clients/js/test/create.test.ts @@ -3,7 +3,7 @@ import { appendTransactionMessageInstruction, generateKeyPairSigner, pipe, -} from '@solana/web3.js'; +} from '@solana/kit'; import test from 'ava'; import { Counter, fetchCounter, getCreateInstruction } from '../src'; import { diff --git a/template/anchor/clients/js/clients/js/test/increment.test.ts.njk b/template/anchor/clients/js/clients/js/test/increment.test.ts.njk index d759883..4428a74 100644 --- a/template/anchor/clients/js/clients/js/test/increment.test.ts.njk +++ b/template/anchor/clients/js/clients/js/test/increment.test.ts.njk @@ -6,7 +6,7 @@ import { isSolanaError, lamports, pipe, -} from '@solana/web3.js'; +} from '@solana/kit'; import test from 'ava'; import { {{ programName | snakeCase | upper }}_ERROR__INVALID_AUTHORITY, diff --git a/template/clients/js/clients/js/package.json.njk b/template/clients/js/clients/js/package.json.njk index fc4c773..e67e4a7 100644 --- a/template/clients/js/clients/js/package.json.njk +++ b/template/clients/js/clients/js/package.json.njk @@ -42,12 +42,12 @@ "homepage": "{{ repositoryUrl }}#readme", "license": "MIT", "peerDependencies": { - "@solana/web3.js": "^2.0.0" + "@solana/kit": "^2.1.0" }, "devDependencies": { "@ava/typescript": "^4.1.0", "@solana/eslint-config-solana": "^3.0.3", - "@solana/web3.js": "^2.0.0", + "@solana/kit": "^2.1.0", "@types/node": "^20", "@typescript-eslint/eslint-plugin": "^7.16.1", "@typescript-eslint/parser": "^7.16.1", diff --git a/template/shank/clients/js/clients/js/test/_setup.ts b/template/shank/clients/js/clients/js/test/_setup.ts index aaabfc2..c2a2977 100644 --- a/template/shank/clients/js/clients/js/test/_setup.ts +++ b/template/shank/clients/js/clients/js/test/_setup.ts @@ -22,7 +22,7 @@ import { setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, signTransactionMessageWithSigners, -} from '@solana/web3.js'; +} from '@solana/kit'; import { findCounterPda, getCreateInstructionAsync } from '../src'; type Client = { diff --git a/template/shank/clients/js/clients/js/test/create.test.ts b/template/shank/clients/js/clients/js/test/create.test.ts index b1a5376..0b12bb3 100644 --- a/template/shank/clients/js/clients/js/test/create.test.ts +++ b/template/shank/clients/js/clients/js/test/create.test.ts @@ -2,7 +2,7 @@ import { Account, appendTransactionMessageInstruction, pipe, -} from '@solana/web3.js'; +} from '@solana/kit'; import test from 'ava'; import { Counter, diff --git a/template/shank/clients/js/clients/js/test/increment.test.ts.njk b/template/shank/clients/js/clients/js/test/increment.test.ts.njk index ba3e576..b8b760b 100644 --- a/template/shank/clients/js/clients/js/test/increment.test.ts.njk +++ b/template/shank/clients/js/clients/js/test/increment.test.ts.njk @@ -5,7 +5,7 @@ import { isSolanaError, lamports, pipe, -} from '@solana/web3.js'; +} from '@solana/kit'; import test from 'ava'; import { {{ programName | snakeCase | upper }}_ERROR__INVALID_PDA, From f3be5c455d2c9cf6aedb10bcaf97471626bad8ed Mon Sep 17 00:00:00 2001 From: Steven Luscher Date: Fri, 28 Mar 2025 15:55:46 -0700 Subject: [PATCH 2/3] Create lazy-bats-shake.md --- .changeset/lazy-bats-shake.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/lazy-bats-shake.md diff --git a/.changeset/lazy-bats-shake.md b/.changeset/lazy-bats-shake.md new file mode 100644 index 0000000..aa331fb --- /dev/null +++ b/.changeset/lazy-bats-shake.md @@ -0,0 +1,5 @@ +--- +"create-solana-program": patch +--- + +Upgrade to `@solana/kit`; the new name for the 2.0 lineage of `@solana/web3.js` From a21410cae2db79f3cee1a241fb9a6be631ec3883 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Mon, 31 Mar 2025 13:08:34 +0100 Subject: [PATCH 3/3] Update changeset --- .changeset/lazy-bats-shake.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changeset/lazy-bats-shake.md b/.changeset/lazy-bats-shake.md index aa331fb..595139d 100644 --- a/.changeset/lazy-bats-shake.md +++ b/.changeset/lazy-bats-shake.md @@ -1,5 +1,5 @@ --- -"create-solana-program": patch +"create-solana-program": minor --- -Upgrade to `@solana/kit`; the new name for the 2.0 lineage of `@solana/web3.js` +Upgraded to `@solana/kit`; the new name for the 2.0 lineage of `@solana/web3.js`