Skip to content

Commit 2b7066f

Browse files
authored
deps: Bump to Solana v2.2 (#117)
#### Problem Solana v2.2 crates / toolchain / suite are all released, but stake pool is still on v2.1. #### Summary of changes Bump the rust crates, toolchains, and CLI to v2.2.
1 parent ed0d213 commit 2b7066f

File tree

8 files changed

+1768
-768
lines changed

8 files changed

+1768
-768
lines changed

Cargo.lock

Lines changed: 1746 additions & 742 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ resolver = "2"
33
members = ["clients/cli", "program"]
44

55
[workspace.metadata.cli]
6-
solana = "2.1.0"
6+
solana = "2.2.0"
77

88
# Specify Rust toolchains for rustfmt, clippy, and build.
99
# Any unprovided toolchains default to stable.
1010
[workspace.metadata.toolchains]
11-
format = "nightly-2024-08-08"
12-
lint = "nightly-2024-08-08"
11+
format = "nightly-2024-11-22"
12+
lint = "nightly-2024-11-22"
1313

1414
[workspace.metadata.spellcheck]
1515
config = "scripts/spellcheck.toml"

clients/cli/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ clap = "2.33.3"
1414
serde = "1.0.217"
1515
serde_derive = "1.0.130"
1616
serde_json = "1.0.138"
17-
solana-account-decoder = "2.1.0"
18-
solana-clap-utils = "2.1.0"
19-
solana-cli-config = "2.1.0"
20-
solana-cli-output = "2.1.0"
21-
solana-client = "2.1.0"
22-
solana-logger = "2.1.0"
23-
solana-program = "2.1.0"
24-
solana-remote-wallet = "2.1.0"
25-
solana-sdk = "2.1.0"
17+
solana-account-decoder = "2.2.0"
18+
solana-clap-utils = "2.2.0"
19+
solana-cli-config = "2.2.0"
20+
solana-cli-output = "2.2.0"
21+
solana-client = "2.2.0"
22+
solana-logger = "2.2.0"
23+
solana-program = "2.2.1"
24+
solana-remote-wallet = "2.2.0"
25+
solana-sdk = "2.2.1"
2626
spl-associated-token-account = { version = "=6.0.0", features = [
2727
"no-entrypoint",
2828
] }

program/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ num-traits = "0.2"
2020
num_enum = "0.7.3"
2121
serde = "1.0.217"
2222
serde_derive = "1.0.103"
23-
solana-program = "2.1.0"
23+
solana-program = "2.2.1"
2424
solana-security-txt = "1.1.1"
2525
spl-pod = { version = "0.5.0", features = [
2626
"borsh",
@@ -34,9 +34,9 @@ bincode = "1.3.1"
3434
[dev-dependencies]
3535
assert_matches = "1.5.0"
3636
proptest = "1.6"
37-
solana-program-test = "2.1.0"
38-
solana-sdk = "2.1.0"
39-
solana-vote-program = "2.1.0"
37+
solana-program-test = "2.2.0"
38+
solana-sdk = "2.2.1"
39+
solana-vote-program = "2.2.0"
4040
spl-token = { version = "7.0", features = [
4141
"no-entrypoint",
4242
] }

program/src/big_vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub struct BigVec<'data> {
1818

1919
const VEC_SIZE_BYTES: usize = 4;
2020

21-
impl<'data> BigVec<'data> {
21+
impl BigVec<'_> {
2222
/// Get the length of the vector
2323
pub fn len(&self) -> u32 {
2424
let vec_len = array_ref![self.data, 0, VEC_SIZE_BYTES];

program/tests/helpers/mod.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -897,13 +897,11 @@ impl StakePoolAccounts {
897897
}
898898

899899
pub fn calculate_fee(&self, amount: u64) -> u64 {
900-
(amount * self.epoch_fee.numerator + self.epoch_fee.denominator - 1)
901-
/ self.epoch_fee.denominator
900+
(amount * self.epoch_fee.numerator).div_ceil(self.epoch_fee.denominator)
902901
}
903902

904903
pub fn calculate_withdrawal_fee(&self, pool_tokens: u64) -> u64 {
905-
(pool_tokens * self.withdrawal_fee.numerator + self.withdrawal_fee.denominator - 1)
906-
/ self.withdrawal_fee.denominator
904+
(pool_tokens * self.withdrawal_fee.numerator).div_ceil(self.withdrawal_fee.denominator)
907905
}
908906

909907
pub fn calculate_inverse_withdrawal_fee(&self, pool_tokens: u64) -> u64 {
@@ -916,8 +914,7 @@ impl StakePoolAccounts {
916914
}
917915

918916
pub fn calculate_sol_deposit_fee(&self, pool_tokens: u64) -> u64 {
919-
(pool_tokens * self.sol_deposit_fee.numerator + self.sol_deposit_fee.denominator - 1)
920-
/ self.sol_deposit_fee.denominator
917+
(pool_tokens * self.sol_deposit_fee.numerator).div_ceil(self.sol_deposit_fee.denominator)
921918
}
922919

923920
pub fn calculate_sol_referral_fee(&self, deposit_fee_collected: u64) -> u64 {

program/tests/withdraw_edge_cases.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ async fn success_remove_validator(multiple: u64) {
176176

177177
// round up to force one more pool token if needed
178178
let pool_tokens_post_fee =
179-
(remaining_lamports * stake_pool.pool_token_supply + stake_pool.total_lamports - 1)
180-
/ stake_pool.total_lamports;
179+
(remaining_lamports * stake_pool.pool_token_supply).div_ceil(stake_pool.total_lamports);
181180
let new_user_authority = Pubkey::new_unique();
182181
let pool_tokens = stake_pool_accounts.calculate_inverse_withdrawal_fee(pool_tokens_post_fee);
183182
let error = stake_pool_accounts

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.81.0"
2+
channel = "1.84.1"

0 commit comments

Comments
 (0)