From 28fc42e725bd6c2a264178d12976fef59929e500 Mon Sep 17 00:00:00 2001 From: Bram Borggreve Date: Tue, 2 Jul 2024 00:25:24 +0200 Subject: [PATCH 1/2] feat: set toolchain version to 0.30.0 in Anchor.toml --- .../__snapshots__/anchor-application-generator.spec.ts.snap | 2 ++ .../__snapshots__/anchor-template-generator.spec.ts.snap | 4 ++++ .../anchor-template/files/base/Anchor.toml.template | 1 + .../anchor-template/files/basic/Anchor.toml.template | 1 + .../anchor-template/files/counter/Anchor.toml.template | 1 + .../__snapshots__/next-application-generator.spec.ts.snap | 2 ++ .../__snapshots__/react-application-generator.spec.ts.snap | 2 ++ .../__snapshots__/react-feature-generator.spec.ts.snap | 2 ++ 8 files changed, 15 insertions(+) diff --git a/packages/preset-anchor/src/generators/anchor-application/__snapshots__/anchor-application-generator.spec.ts.snap b/packages/preset-anchor/src/generators/anchor-application/__snapshots__/anchor-application-generator.spec.ts.snap index 6aecab1c..93700297 100644 --- a/packages/preset-anchor/src/generators/anchor-application/__snapshots__/anchor-application-generator.spec.ts.snap +++ b/packages/preset-anchor/src/generators/anchor-application/__snapshots__/anchor-application-generator.spec.ts.snap @@ -76,6 +76,7 @@ exports[`anchor-application generator should generate app with "basic" template "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", @@ -631,6 +632,7 @@ exports[`anchor-application generator should generate app with "counter" templat "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", diff --git a/packages/preset-anchor/src/generators/anchor-template/__snapshots__/anchor-template-generator.spec.ts.snap b/packages/preset-anchor/src/generators/anchor-template/__snapshots__/anchor-template-generator.spec.ts.snap index 7d210d8a..b6edcf2f 100644 --- a/packages/preset-anchor/src/generators/anchor-template/__snapshots__/anchor-template-generator.spec.ts.snap +++ b/packages/preset-anchor/src/generators/anchor-template/__snapshots__/anchor-template-generator.spec.ts.snap @@ -5,6 +5,7 @@ exports[`anchor-template generator should be able to generate two templates side "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", @@ -1057,6 +1058,7 @@ exports[`anchor-template generator should generate files for base template 1`] = "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", @@ -1140,6 +1142,7 @@ exports[`anchor-template generator should generate files for basic template 1`] "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", @@ -1394,6 +1397,7 @@ exports[`anchor-template generator should generate files for counter template 1` "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", diff --git a/packages/preset-anchor/src/generators/anchor-template/files/base/Anchor.toml.template b/packages/preset-anchor/src/generators/anchor-template/files/base/Anchor.toml.template index bf30e87b..28733a8b 100644 --- a/packages/preset-anchor/src/generators/anchor-template/files/base/Anchor.toml.template +++ b/packages/preset-anchor/src/generators/anchor-template/files/base/Anchor.toml.template @@ -1,4 +1,5 @@ [toolchain] +anchor_version = "0.30.0" [features] seeds = false diff --git a/packages/preset-anchor/src/generators/anchor-template/files/basic/Anchor.toml.template b/packages/preset-anchor/src/generators/anchor-template/files/basic/Anchor.toml.template index af3dd0ab..d2457399 100644 --- a/packages/preset-anchor/src/generators/anchor-template/files/basic/Anchor.toml.template +++ b/packages/preset-anchor/src/generators/anchor-template/files/basic/Anchor.toml.template @@ -1,4 +1,5 @@ [toolchain] +anchor_version = "0.30.0" [features] seeds = false diff --git a/packages/preset-anchor/src/generators/anchor-template/files/counter/Anchor.toml.template b/packages/preset-anchor/src/generators/anchor-template/files/counter/Anchor.toml.template index af3dd0ab..d2457399 100644 --- a/packages/preset-anchor/src/generators/anchor-template/files/counter/Anchor.toml.template +++ b/packages/preset-anchor/src/generators/anchor-template/files/counter/Anchor.toml.template @@ -1,4 +1,5 @@ [toolchain] +anchor_version = "0.30.0" [features] seeds = false diff --git a/packages/preset-next/src/generators/next-application/__snapshots__/next-application-generator.spec.ts.snap b/packages/preset-next/src/generators/next-application/__snapshots__/next-application-generator.spec.ts.snap index 7dc0e805..f4606fc6 100644 --- a/packages/preset-next/src/generators/next-application/__snapshots__/next-application-generator.spec.ts.snap +++ b/packages/preset-next/src/generators/next-application/__snapshots__/next-application-generator.spec.ts.snap @@ -996,6 +996,7 @@ exports[`application generator default apps should generate default app with "no "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", @@ -2688,6 +2689,7 @@ exports[`application generator default apps should generate default app with "ta "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", diff --git a/packages/preset-react/src/generators/react-application/__snapshots__/react-application-generator.spec.ts.snap b/packages/preset-react/src/generators/react-application/__snapshots__/react-application-generator.spec.ts.snap index 6ac80f8f..6c8be37d 100644 --- a/packages/preset-react/src/generators/react-application/__snapshots__/react-application-generator.spec.ts.snap +++ b/packages/preset-react/src/generators/react-application/__snapshots__/react-application-generator.spec.ts.snap @@ -964,6 +964,7 @@ exports[`react-application generator default apps should generate default app wi "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", @@ -2623,6 +2624,7 @@ exports[`react-application generator default apps should generate default app wi "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", diff --git a/packages/preset-react/src/generators/react-feature/__snapshots__/react-feature-generator.spec.ts.snap b/packages/preset-react/src/generators/react-feature/__snapshots__/react-feature-generator.spec.ts.snap index ea3f7f01..d5fd41fc 100644 --- a/packages/preset-react/src/generators/react-feature/__snapshots__/react-feature-generator.spec.ts.snap +++ b/packages/preset-react/src/generators/react-feature/__snapshots__/react-feature-generator.spec.ts.snap @@ -278,6 +278,7 @@ exports[`react-feature generator should generate files for anchor-basic feature "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", @@ -3678,6 +3679,7 @@ exports[`react-feature generator should generate files for anchor-counter featur "Anchor.toml": { "content": [ "[toolchain]", + "anchor_version = "0.30.0"", "[features]", "seeds = false", "skip-lint = false", From 3696d31232f4bbd4d3219fb4f8e52afd45cd7a45 Mon Sep 17 00:00:00 2001 From: Bram Borggreve Date: Tue, 2 Jul 2024 00:26:35 +0200 Subject: [PATCH 2/2] fix: improve Anchor version warning text --- packages/create-solana-dapp/lib/final-note.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-solana-dapp/lib/final-note.ts b/packages/create-solana-dapp/lib/final-note.ts index fdba7155..cde4368f 100644 --- a/packages/create-solana-dapp/lib/final-note.ts +++ b/packages/create-solana-dapp/lib/final-note.ts @@ -1,4 +1,4 @@ -import { bold, magentaBright, greenBright, redBright, yellowBright } from 'chalk' +import { bold, greenBright, magentaBright, yellowBright } from 'chalk' import { GetArgsResult } from './get-args-result' import { validateAnchorVersion } from './validate-anchor-version' @@ -24,7 +24,7 @@ export function finalNote(args: GetArgsResult & { target: string }): string { } else if (!valid) { lines.push( ...[ - yellowBright(`Found Anchor version ${version}. Please upgrade to Anchor ${requiredVersion}.`), + yellowBright(`Found Anchor version ${version}. Expected Anchor version ${requiredVersion}.`), 'https://www.anchor-lang.com/release-notes/0.30.0', ], )