Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 9e6ab03

Browse files
authored
Update Solana to 1.16.1 and Rust to 1.69 (#4592)
#### Problem The 1.16 Solana crates are out, but SPL is still on 1.14 and needs the new functionality. #### Solution Update the: * rust version to 1.69 * nightly to 2023-04-19 * solana tools to 1.16.1 * solana crates to 1.16.1 * borsh to 0.10 And fix: * new clippy warnings * deprecated warnings in the new solana crates
1 parent ca7d387 commit 9e6ab03

File tree

102 files changed

+1592
-1118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1592
-1118
lines changed

.github/workflows/pull-request-token.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ jobs:
204204

205205
- name: Set env vars
206206
run: |
207-
echo "RUST_STABLE_VERSION=1.66.1" >> $GITHUB_ENV
207+
echo "RUST_STABLE_VERSION=1.69.0" >> $GITHUB_ENV
208208
source ci/rust-version.sh
209209
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
210210
source ci/solana-version.sh
@@ -231,9 +231,9 @@ jobs:
231231
232232
- name: Build and test token-2022 twoxtx (TEMPORARY)
233233
run: |
234+
cargo build-sbf --manifest-path token/program-2022/Cargo.toml
235+
cargo build-sbf --manifest-path instruction-padding/program/Cargo.toml
234236
./token/twoxtx-setup.sh
235-
./token/twoxtx-solana/cargo-build-sbf --manifest-path token/program-2022/Cargo.toml
236-
./token/twoxtx-solana/cargo-build-sbf --manifest-path instruction-padding/program/Cargo.toml
237237
./token/twoxtx-solana/cargo-test-sbf --manifest-path token/program-2022-test/Cargo.toml -- --nocapture
238238
239239
js-test:

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
uses: actions-rs/[email protected]
100100
with:
101101
crate: cargo-audit
102-
version: 0.16.0 # TODO use latest once repo uses Rust v1.63+
102+
version: 0.17.6
103103

104104
- name: Run Cargo Audit
105105
run: ./ci/do-audit.sh

Anchor.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
anchor_version = "0.24.2"
2-
solana_version = "1.14.12"
2+
solana_version = "1.16.1"
33

44
[workspace]
55
members = [

0 commit comments

Comments
 (0)