From b99df80b962e51fb0a0c15575d1e8fedafb7aea3 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Wed, 25 Jun 2025 16:28:58 +0100 Subject: [PATCH 01/10] Fix CI --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 019c71c..0cefd97 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,6 +75,7 @@ jobs: - name: Install Solana uses: solana-program/actions/install-solana@v1 with: + base-url: "https://release.anza.xyz" version: ${{ matrix.solana }} - name: Install Rustfmt uses: dtolnay/rust-toolchain@master From 0861f1c2f773233bc380e01ef04c586272005743 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Wed, 25 Jun 2025 16:33:21 +0100 Subject: [PATCH 02/10] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0cefd97..5c88f94 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,7 +75,7 @@ jobs: - name: Install Solana uses: solana-program/actions/install-solana@v1 with: - base-url: "https://release.anza.xyz" + base_url: "https://release.anza.xyz" version: ${{ matrix.solana }} - name: Install Rustfmt uses: dtolnay/rust-toolchain@master From fc9105da8b5f0fecc563b3b87a35822b1581221d Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Wed, 25 Jun 2025 16:35:43 +0100 Subject: [PATCH 03/10] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c88f94..25677e8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,7 +75,7 @@ jobs: - name: Install Solana uses: solana-program/actions/install-solana@v1 with: - base_url: "https://release.anza.xyz" + base_url: https://release.anza.xyz version: ${{ matrix.solana }} - name: Install Rustfmt uses: dtolnay/rust-toolchain@master From 4ed6f15ece549ecd7786ffefbd02d82b7b28d409 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Wed, 25 Jun 2025 16:47:25 +0100 Subject: [PATCH 04/10] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 25677e8..ae40c54 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,7 +75,7 @@ jobs: - name: Install Solana uses: solana-program/actions/install-solana@v1 with: - base_url: https://release.anza.xyz + base_url: 'https://release.anza.xyz' version: ${{ matrix.solana }} - name: Install Rustfmt uses: dtolnay/rust-toolchain@master From 55dea50d617a131f0ea27a1ecfbd1e6937a32dd3 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Wed, 25 Jun 2025 17:11:34 +0100 Subject: [PATCH 05/10] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ae40c54..5c88f94 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,7 +75,7 @@ jobs: - name: Install Solana uses: solana-program/actions/install-solana@v1 with: - base_url: 'https://release.anza.xyz' + base_url: "https://release.anza.xyz" version: ${{ matrix.solana }} - name: Install Rustfmt uses: dtolnay/rust-toolchain@master From 16f00c90dd528b7d5a0c4c794591a0c84ad3e0aa Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Wed, 25 Jun 2025 17:20:28 +0100 Subject: [PATCH 06/10] Update solanaCli.ts --- utils/solanaCli.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/solanaCli.ts b/utils/solanaCli.ts index 5eccedc..d388921 100644 --- a/utils/solanaCli.ts +++ b/utils/solanaCli.ts @@ -12,7 +12,7 @@ export async function patchSolanaDependencies( ctx: Pick ): Promise { const patchMap: Record = { - '1.17': ['-p ahash@0.8.11 --precise 0.8.6'], + '1.17': ['-p ahash@0.8.12 --precise 0.8.6'], }; const patches = patchMap[ctx.solanaVersion.withoutPatch] ?? []; From 42d007bd834445fc951a0db32855409d8673c38c Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Thu, 26 Jun 2025 11:40:14 +0100 Subject: [PATCH 07/10] Test base64ct patch for Anchor --- template/anchor/base/program/Cargo.toml.njk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/template/anchor/base/program/Cargo.toml.njk b/template/anchor/base/program/Cargo.toml.njk index 7118782..1890feb 100644 --- a/template/anchor/base/program/Cargo.toml.njk +++ b/template/anchor/base/program/Cargo.toml.njk @@ -22,3 +22,6 @@ idl-build = ["anchor-lang/idl-build"] [dependencies] anchor-lang = "{{ anchorVersion.full }}" solana-program = "~{{ solanaVersion.withoutPatch }}" + +[patch.crates-io] +base64ct = "1.7.3" From ec939b6f44c29983f2b88e62d3a7e753a640b4d0 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Thu, 26 Jun 2025 11:44:06 +0100 Subject: [PATCH 08/10] Test base64ct patch for Anchor --- template/anchor/base/program/Cargo.toml.njk | 3 --- utils/solanaCli.ts | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/template/anchor/base/program/Cargo.toml.njk b/template/anchor/base/program/Cargo.toml.njk index 1890feb..7118782 100644 --- a/template/anchor/base/program/Cargo.toml.njk +++ b/template/anchor/base/program/Cargo.toml.njk @@ -22,6 +22,3 @@ idl-build = ["anchor-lang/idl-build"] [dependencies] anchor-lang = "{{ anchorVersion.full }}" solana-program = "~{{ solanaVersion.withoutPatch }}" - -[patch.crates-io] -base64ct = "1.7.3" diff --git a/utils/solanaCli.ts b/utils/solanaCli.ts index d388921..9929e81 100644 --- a/utils/solanaCli.ts +++ b/utils/solanaCli.ts @@ -9,13 +9,21 @@ import { import { VersionWithoutPatch } from './versionCore'; export async function patchSolanaDependencies( - ctx: Pick + ctx: Pick< + RenderContext, + 'solanaVersion' | 'targetDirectory' | 'programFramework' + > ): Promise { const patchMap: Record = { '1.17': ['-p ahash@0.8.12 --precise 0.8.6'], }; const patches = patchMap[ctx.solanaVersion.withoutPatch] ?? []; + + if (ctx.programFramework === 'anchor') { + patches.push('-p base64ct@1.8.0 --precise 1.7.3'); + } + await Promise.all( patches.map(async (patch) => waitForCommand( From 7a5431c3ccf0515ba1427c9c85c169f3696b7ee4 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Thu, 26 Jun 2025 12:23:16 +0100 Subject: [PATCH 09/10] wip --- .github/workflows/main.yml | 2 +- utils/solanaCli.ts | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c88f94..53dd954 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ env: ANCHOR_VERSION: 0.30.0 NODE_VERSION : 20 SOLANA_VERSION: 1.18.18 - TOOLCHAIN: 1.81.0 + TOOLCHAIN: 1.85.0 jobs: lint: diff --git a/utils/solanaCli.ts b/utils/solanaCli.ts index 9929e81..d388921 100644 --- a/utils/solanaCli.ts +++ b/utils/solanaCli.ts @@ -9,21 +9,13 @@ import { import { VersionWithoutPatch } from './versionCore'; export async function patchSolanaDependencies( - ctx: Pick< - RenderContext, - 'solanaVersion' | 'targetDirectory' | 'programFramework' - > + ctx: Pick ): Promise { const patchMap: Record = { '1.17': ['-p ahash@0.8.12 --precise 0.8.6'], }; const patches = patchMap[ctx.solanaVersion.withoutPatch] ?? []; - - if (ctx.programFramework === 'anchor') { - patches.push('-p base64ct@1.8.0 --precise 1.7.3'); - } - await Promise.all( patches.map(async (patch) => waitForCommand( From 65632c1ffd99507781acc0619efdce2ab515f4af Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Thu, 26 Jun 2025 12:32:15 +0100 Subject: [PATCH 10/10] Update main.yml --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53dd954..9e1d572 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,10 +7,10 @@ on: branches: [main] env: - ANCHOR_VERSION: 0.30.0 + ANCHOR_VERSION: 0.30.1 NODE_VERSION : 20 SOLANA_VERSION: 1.18.18 - TOOLCHAIN: 1.85.0 + TOOLCHAIN: 1.81.0 jobs: lint: @@ -39,7 +39,7 @@ jobs: project: ["counter-anchor", "counter-shank"] solana: ["1.17.34", "1.18.18"] include: - - anchor: "0.30.0" + - anchor: "0.30.1" project: "counter-anchor" solana: "1.18.18" - anchor: "0.29.0"