Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,13 @@ concurrency:
cancel-in-progress: true

env:
# Solana 2.2.18 ships platform-tools v1.50 (cargo 1.85). Earlier 2.x
# versions (e.g. 2.0.21, 2.1.x) ship cargo 1.75/1.79, which cannot
# parse the `edition2024` manifests pulled in transitively by
# anchor-lang 0.31.1's solana-program 2.3.0 dep chain. The on-chain
# ABI is unchanged; only the BPF compile toolchain advances.
SOLANA_VERSION: 2.2.18
ANCHOR_VERSION: 0.31.1
# Host toolchain. Must match rust-toolchain.toml — the modern SPL crate
# ecosystem (digest 0.11 / block-buffer 0.12) requires edition2024 = 1.85+.
# The on-chain BPF build still uses Solana platform-tools' embedded Rust.
RUST_TOOLCHAIN: 1.85.0
NODE_VERSION: 20
# Aligned with the official Solana 3.x stack:
# https://solana.com/docs/intro/installation
SOLANA_VERSION: 3.0.10
ANCHOR_VERSION: 0.32.1
# Host toolchain. Must match rust-toolchain.toml.
RUST_TOOLCHAIN: 1.91.1
NODE_VERSION: 24
PNPM_VERSION: 9

jobs:
Expand Down
10 changes: 4 additions & 6 deletions Anchor.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
[toolchain]
anchor_version = "0.31.1"
# 2.2.18 ships platform-tools v1.50 (cargo 1.85), the first BPF toolchain
# that handles the `edition2024` manifests pulled in transitively by
# anchor-lang 0.31.1. Earlier 2.x versions (2.0.21, 2.1.x) ship cargo
# 1.75/1.79 and fail at dep-fetch time. On-chain runtime ABI unchanged.
solana_version = "2.2.18"
# Aligned with the official Solana 3.x stack (per
# https://solana.com/docs/intro/installation).
anchor_version = "0.32.1"
solana_version = "3.0.10"

[features]
resolution = true
Expand Down
22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ members = [
[workspace.package]
version = "0.1.0"
edition = "2021"
# MSRV pin: matches rust-toolchain.toml and Solana 2.0.x BPF compilation.
# Cargo 1.84+ uses this for MSRV-aware dependency resolution; on Cargo 1.79
# this is informational and the lockfile drives compatibility.
rust-version = "1.79"
# Aligned with the official Solana 3.x stack (rust 1.91.1 per
# https://solana.com/docs/intro/installation). Cargo's MSRV-aware resolver
# uses this when resolving dep versions.
rust-version = "1.91"
license = "Apache-2.0"
authors = ["GraveYield Protocol contributors"]
repository = "https://github.com/graveyieldprotocol/protocol"
repository = "https://github.com/GraveYield-Protocol/protocol"
homepage = "https://graveyield.xyz"
readme = "README.md"

[workspace.dependencies]
anchor-lang = "0.31.1"
anchor-spl = "0.31.1"
anchor-lang = "0.32.1"
anchor-spl = "0.32.1"

# cargo-build-sbf reads this to pick the platform-tools version for the
# BPF compile. v2.2.18's default is v1.48 (cargo 1.84), which can't parse
# the edition2024 manifests pulled in transitively by anchor-lang 0.31.1.
# v1.54 (2026-03-06) ships cargo 1.85+, which is the first BPF toolchain
# that handles edition2024 cleanly.
# BPF compile. v1.54 (2026-03-06) ships cargo 1.85+, the first BPF
# toolchain that handles edition2024 manifests. Solana 3.0.10 + Anchor
# 0.32.1 still default to older platform-tools (cargo 1.84) so the
# explicit pin remains the source of truth for our reproducible build.
[workspace.metadata.solana]
tools-version = "v1.54"

Expand Down
4 changes: 2 additions & 2 deletions indexer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"@graveyield/sdk": "workspace:*"
},
"devDependencies": {
"@types/node": "^20.19.40",
"@types/node": "^24.0.0",
"typescript": "^5.6.0"
},
"engines": {
"node": ">=20.0.0"
"node": ">=24.0.0"
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"packageManager": "pnpm@9.12.0",
"engines": {
"node": ">=20.0.0",
"node": ">=24.0.0",
"pnpm": ">=9.0.0"
},
"scripts": {
Expand All @@ -27,17 +27,17 @@
"lint:rust": "cargo clippy --all-targets -- -D warnings"
},
"devDependencies": {
"@types/node": "^20.19.40",
"@types/node": "^24.0.0",
"typescript": "^5.6.0"
},
"pnpm": {
"overrides": {
"@types/node": "^20.19.40",
"@types/node": "^24.0.0",
"@types/bn.js": "^5.1.5"
},
"peerDependencyRules": {
"allowedVersions": {
"@types/node": "^20.19.40"
"@types/node": "^24.0.0"
}
}
}
Expand Down
1 change: 0 additions & 1 deletion programs/grave-scanner/src/adapters/meteora.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// docs/PRE_MAINNET_CHECKLIST.md tracks the confirmation step.

use anchor_lang::prelude::*;
use anchor_lang::solana_program::pubkey;

use super::PoolData;
use crate::errors::GraveScannerError;
Expand Down
1 change: 0 additions & 1 deletion programs/grave-scanner/src/adapters/orca_whirlpool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// aggregation rather than a single base/quote read.

use anchor_lang::prelude::*;
use anchor_lang::solana_program::pubkey;

use super::PoolData;
use crate::errors::GraveScannerError;
Expand Down
1 change: 0 additions & 1 deletion programs/grave-scanner/src/adapters/pumpswap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// the AMM account layout differs in field offsets and the vault types.

use anchor_lang::prelude::*;
use anchor_lang::solana_program::pubkey;

use super::PoolData;
use crate::errors::GraveScannerError;
Expand Down
1 change: 0 additions & 1 deletion programs/grave-scanner/src/adapters/raydium_clmm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// single vault pair. v1.1 milestone.

use anchor_lang::prelude::*;
use anchor_lang::solana_program::pubkey;

use super::PoolData;
use crate::errors::GraveScannerError;
Expand Down
1 change: 0 additions & 1 deletion programs/grave-scanner/src/adapters/raydium_v4.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
// attestation lands).

use anchor_lang::prelude::*;
use anchor_lang::solana_program::pubkey;

use super::PoolData;
use crate::errors::GraveScannerError;
Expand Down
12 changes: 6 additions & 6 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[toolchain]
# Host toolchain for `cargo check` / `clippy` / `fmt`. The on-chain BPF build
# is performed by Solana platform-tools' embedded Rust toolchain (currently
# Solana 2.0.x), so this pin only affects host-side compilation of proc
# macros and tooling. 1.85 is required by the modern SPL crate ecosystem
# (digest 0.11 -> block-buffer 0.12 require edition2024 = Rust 1.85+).
channel = "1.85.0"
# Host toolchain for `cargo check` / `clippy` / `fmt`. The on-chain BPF
# build runs on Solana platform-tools' embedded Rust toolchain; this pin
# only affects host-side compilation of proc macros and tooling. 1.91.1
# is the version aligned with the official Solana 3.x stack
# (https://solana.com/docs/intro/installation).
channel = "1.91.1"
components = ["rustfmt", "clippy"]
profile = "minimal"
6 changes: 3 additions & 3 deletions sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
"clean": "rm -rf dist"
},
"dependencies": {
"@coral-xyz/anchor": "^0.31.1",
"@coral-xyz/anchor": "^0.32.1",
"@solana/web3.js": "^1.95.0",
"@solana/spl-token": "^0.4.6",
"bn.js": "^5.2.1"
},
"devDependencies": {
"@types/bn.js": "^5.1.5",
"@types/node": "^20.19.40",
"@types/node": "^24.0.0",
"typescript": "^5.6.0"
},
"engines": {
"node": ">=20.0.0"
"node": ">=24.0.0"
}
}