Skip to content

Solana contracts/v1.6.1 candidate #1565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toblich merged 11 commits into from
Feb 24, 2026
Merged

Solana contracts/v1.6.1 candidate #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
178b706
Fee Quoter changes to support ton and aptos (#1518)
agusaldasoro Jan 12, 2026
fc74e71
Bump versios (#1550)
agusaldasoro Jan 14, 2026
58388e6
Add cpi event
toblich Feb 20, 2026
10b851b
Reenable tests
toblich Feb 24, 2026
e9ac7e4
Fix ping-pong test setup
toblich Feb 24, 2026
0adbbe6
Fix devenv CI setup and enable verbose logs in some integration tests
toblich Feb 24, 2026
570217d
devenv go mod tidy
toblich Feb 24, 2026
4d63623
Fix CI command
toblich Feb 24, 2026
d77686e
Fix CI command
toblich Feb 24, 2026
3a0e3da
Disable broken tests again, unrelated to these changes
toblich Feb 24, 2026
bf6ed2e
Update changelog and remove `-candidate` version suffix
toblich Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 6 additions & 9 deletions chains/solana/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@

This document describes the changes introduced in the different versions of the **Chainlink CCIP Solana programs**, located in [`chains/solana/contracts/programs`](https://github.com/smartcontractkit/chainlink-ccip/tree/main/chains/solana/contracts/programs).

<!-- --- -->
<!-- ## [Unreleased] (1.6.1) -->
<!-- ### Added
- (Placeholder for upcoming features) -->
---

## [1.6.1]

<!-- ### Changed -->
<!-- - (Placeholder for changes) -->
### Added

<!-- ### Fixed
- (Placeholder for bug fixes) -->
- [FeeQuoter] Support for other non-EVM families
- [RMNRemote] Support for backwards-compatible CPI Events without requiring additional accounts

---

Expand All @@ -21,7 +19,6 @@ This document describes the changes introduced in the different versions of the

- [Token Pools] Allow setting rate limit with rate and capacity set to 0 [#1290](https://github.com/smartcontractkit/chainlink-ccip/pull/1290)


---

## [0.1.2]
Expand Down
24 changes: 12 additions & 12 deletions chains/solana/contracts/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions chains/solana/contracts/programs/base-token-pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "base-token-pool"
version = "1.6.0"
version = "1.6.1"
description = "Created with Anchor"
edition = "2021"

Expand All @@ -19,9 +19,14 @@ default = []
anchor-lang = { version = "0.29.0", features = ["init-if-needed"] }
anchor-spl = "0.29.0"
solana-program = "1.17.25" # pin solana to 1.17
spl-math = { version = "0.2.0", features = [ "no-entrypoint" ] }
rmn_remote = {path = "../rmn-remote", features = ["cpi"]}
spl-math = { version = "0.2.0", features = ["no-entrypoint"] }
rmn_remote = { version = "1.6.1", path = "../rmn-remote", features = [
"cpi",
] }

[lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = ['cfg(target_os, values("solana"))', 'cfg(feature, values("anchor-debug", "custom-panic"))']
check-cfg = [
'cfg(target_os, values("solana"))',
'cfg(feature, values("anchor-debug", "custom-panic"))',
]
19 changes: 13 additions & 6 deletions chains/solana/contracts/programs/burnmint-token-pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "burnmint-token-pool"
version = "1.6.0"
version = "1.6.1"
description = "Created with Anchor"
edition = "2021"

Expand All @@ -19,14 +19,21 @@ default = []
anchor-lang = { version = "0.29.0", features = ["init-if-needed"] }
anchor-spl = "0.29.0"
solana-program = "1.17.25" # pin solana to 1.17
spl-math = { version = "0.2.0", features = [ "no-entrypoint" ] }
base-token-pool = { version = "1.6.0", path = "../base-token-pool/", features = ["no-entrypoint"] }
rmn_remote = {path = "../rmn-remote", features = ["cpi"]}
ccip_common = {path = "../ccip-common"}
spl-math = { version = "0.2.0", features = ["no-entrypoint"] }
base-token-pool = { version = "1.6.1", path = "../base-token-pool/", features = [
"no-entrypoint",
] }
rmn_remote = { version = "1.6.1", path = "../rmn-remote", features = [
"cpi",
] }
ccip_common = { version = "1.6.1", path = "../ccip-common" }

[build-dependencies]
build_commit = { path = "../../crates/build-commit" }

[lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = ['cfg(target_os, values("solana"))', 'cfg(feature, values("anchor-debug", "custom-panic"))']
check-cfg = [
'cfg(target_os, values("solana"))',
'cfg(feature, values("anchor-debug", "custom-panic"))',
]
9 changes: 6 additions & 3 deletions chains/solana/contracts/programs/ccip-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ccip_common"
version = "0.1.1"
version = "1.6.1"
edition = "2021"

[lib]
Expand All @@ -17,11 +17,14 @@ cpi = ["no-entrypoint"]
default = ["no-entrypoint"]

[dependencies]
solana-program = "1.17.25" # pin solana to 1.17
solana-program = "1.17.25" # pin solana to 1.17
anchor-lang = { version = "0.29.0", features = ["init-if-needed"] }
anchor-spl = "0.29.0"
ethnum = "1.5"

[lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = ['cfg(target_os, values("solana"))', 'cfg(feature, values("anchor-debug", "custom-panic"))']
check-cfg = [
'cfg(target_os, values("solana"))',
'cfg(feature, values("anchor-debug", "custom-panic"))',
]
18 changes: 17 additions & 1 deletion chains/solana/contracts/programs/ccip-common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,27 @@ pub enum CommonCcipError {
InvalidEVMAddress,
#[msg("Invalid SVM address")]
InvalidSVMAddress,
#[msg("Invalid TVM address")]
InvalidTVMAddress,
#[msg("Invalid Aptos address")]
InvalidAptosAddress,
#[msg("Invalid Sui address")]
InvalidSuiAddress,
}

// https://github.com/smartcontractkit/chainlink/blob/ff8a597fd9df653f8967427498eaa5a04b19febb/contracts/src/v0.8/ccip/libraries/Internal.sol#L276
// bytes4(keccak256("CCIP ChainFamilySelector APTOS"));
pub const CHAIN_FAMILY_SELECTOR_APTOS: u32 = 0xac77ffec;

// bytes4(keccak256("CCIP ChainFamilySelector EVM"));
pub const CHAIN_FAMILY_SELECTOR_EVM: u32 = 0x2812d52c;

// bytes4(keccak256("CCIP ChainFamilySelector SUI"));
pub const CHAIN_FAMILY_SELECTOR_SUI: u32 = 0xc4e05953;

// bytes4(keccak256("CCIP ChainFamilySelector SVM"));
pub const CHAIN_FAMILY_SELECTOR_SVM: u32 = 0x1e10bdc4;

// byte4(keccak256("CCIP ChainFamilySelector TVM"));
pub const CHAIN_FAMILY_SELECTOR_TVM: u32 = 0x647e2ba9;

// Duplicates the router ID to declare router accounts that must be visible from the common crate,
Expand Down
Loading
Loading