Solana contracts/v1.6.1 candidate (#1565)

* Fee Quoter changes to support ton and aptos (#1518)

* Fee Quoter changes to support ton and aptos

* add tests for other families

* Add tests for all remote chain selectors

* Bump versios (#1550)

* Bump versios

* Bump all contracts

* Add cpi event

* Reenable tests

* Fix ping-pong test setup

* Fix devenv CI setup and enable verbose logs in some integration tests

* devenv go mod tidy

* Fix CI command

* Fix CI command

* Disable broken tests again, unrelated to these changes

* Update changelog and remove `-candidate` version suffix

---------

Co-authored-by: Tobías Lichtig <toblich@users.noreply.github.com>

Author: agusaldasoro

chains/solana/CHANGELOG.md

@@ -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
 
 ---
 
@@ -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]

chains/solana/contracts/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "base-token-pool"
-version = "1.6.0"
+version = "1.6.1"
 description = "Created with Anchor"
 edition = "2021"
 
@@ -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"))',
+]

chains/solana/contracts/programs/base-token-pool/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "burnmint-token-pool"
-version = "1.6.0"
+version = "1.6.1"
 description = "Created with Anchor"
 edition = "2021"
 
@@ -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"))',
+]

chains/solana/contracts/programs/burnmint-token-pool/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ccip_common"
-version = "0.1.1"
+version = "1.6.1"
 edition = "2021"
 
 [lib]
@@ -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"))',
+]

chains/solana/contracts/programs/ccip-common/Cargo.toml

@@ -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,