Skip to content

Polkadot SDK stable2412 #1017

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

Closed
vklachkov wants to merge 2 commits into from
Closed

Polkadot SDK stable2412 #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf0909d
update saturating calculation (#1016)
zjb0807 Jan 14, 2025
58e611c
stable2412
vklachkov Jan 29, 2025
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
64 changes: 32 additions & 32 deletions Cargo.dev.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,40 +32,40 @@ resolver = "2"
split-debuginfo = "unpacked"

[workspace.dependencies]
log = { version = "0.4.20", default-features = false }
log = { version = "0.4.25", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.189" }
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] }
serde = { version = "1.0.214" }
parity-scale-codec = { version = "3.6.12", default-features = false, features = ["max-encoded-len"] }

cumulus-pallet-xcm = { version = "0.17.0", default-features = false }
cumulus-primitives-core = { version = "0.16.0", default-features = false }
frame-benchmarking = { version = "38.0.0", default-features = false }
frame-support = { version = "38.0.0", default-features = false }
frame-system = { version = "38.0.0", default-features = false }
pallet-balances = { version = "39.0.0", default-features = false }
pallet-elections-phragmen = { version = "39.0.0", default-features = false }
pallet-message-queue = { version = "41.0.1", default-features = false }
pallet-preimage = { version = "38.0.0", default-features = false }
pallet-root-testing = { version = "14.0.0", default-features = false }
pallet-scheduler = { version = "39.0.0", default-features = false }
pallet-timestamp = { version = "37.0.0", default-features = false }
pallet-treasury = { version = "37.0.0", default-features = false }
pallet-xcm = { version = "17.0.0", default-features = false }
polkadot-parachain-primitives = { version = "14.0.0", default-features = false }
polkadot-runtime-common = { version = "17.0.0", default-features = false }
polkadot-runtime-parachains = { version = "17.0.1", default-features = false }
sp-api = { version = "34.0.0", default-features = false }
sp-application-crypto = { version = "38.0.0", default-features = false }
cumulus-pallet-xcm = { version = "0.18.0", default-features = false }
cumulus-primitives-core = { version = "0.17.0", default-features = false }
frame-benchmarking = { version = "39.0.0", default-features = false }
frame-support = { version = "39.0.0", default-features = false }
frame-system = { version = "39.1.0", default-features = false }
pallet-balances = { version = "40.0.0", default-features = false }
pallet-elections-phragmen = { version = "40.0.0", default-features = false }
pallet-message-queue = { version = "42.0.0", default-features = false }
pallet-preimage = { version = "39.0.0", default-features = false }
pallet-root-testing = { version = "15.0.0", default-features = false }
pallet-scheduler = { version = "40.0.0", default-features = false }
pallet-timestamp = { version = "38.0.0", default-features = false }
pallet-treasury = { version = "38.0.0", default-features = false }
pallet-xcm = { version = "18.0.0", default-features = false }
polkadot-parachain-primitives = { version = "15.0.0", default-features = false }
polkadot-runtime-common = { version = "18.0.0", default-features = false }
polkadot-runtime-parachains = { version = "18.0.1", default-features = false }
sp-api = { version = "35.0.0", default-features = false }
sp-application-crypto = { version = "39.0.0", default-features = false }
sp-arithmetic = { version = "26.0.0", default-features = false }
sp-core = { version = "34.0.0", default-features = false }
sp-io = { version = "38.0.0", default-features = false }
sp-runtime = { version = "39.0.1", default-features = false }
sp-runtime-interface = { version = "28.0.0", default-features = false }
sp-staking = { version = "36.0.0", default-features = false }
sp-core = { version = "35.0.0", default-features = false }
sp-io = { version = "39.0.0", default-features = false }
sp-runtime = { version = "40.1.0", default-features = false }
sp-runtime-interface = { version = "29.0.0", default-features = false }
sp-staking = { version = "37.0.0", default-features = false }
sp-std = { version = "14.0.0", default-features = false }
sp-storage = { version = "21.0.0", default-features = false }
xcm = { version = "14.2.0", package = "staging-xcm", default-features = false }
xcm-builder = { version = "17.0.1", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "17.0.0", package = "staging-xcm-executor", default-features = false }
sp-storage = { version = "22.0.0", default-features = false }
xcm = { version = "15.0.1", package = "staging-xcm", default-features = false }
xcm-builder = { version = "18.0.0", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "18.0.0", package = "staging-xcm-executor", default-features = false }

xcm-simulator = { version = "17.0.0" }
xcm-simulator = { version = "18.0.0" }
4 changes: 2 additions & 2 deletions rewards/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl<T: Config> Pallet<T> {
.saturating_mul(total_reward.to_owned().saturated_into::<u128>().into())
.checked_div(initial_total_shares.to_owned().saturated_into::<u128>().into())
.unwrap_or_default()
.as_u128()
.saturated_into::<u128>()
.saturated_into()
};
*total_reward = total_reward.saturating_add(reward_inflation);
Expand Down Expand Up @@ -239,7 +239,7 @@ impl<T: Config> Pallet<T> {
.saturating_mul(withdrawn_reward.to_owned().saturated_into::<u128>().into())
.checked_div(old_share.saturated_into::<u128>().into())
.unwrap_or_default()
.as_u128()
.saturated_into::<u128>()
.saturated_into();

if let Some((total_reward, total_withdrawn_reward)) =
Expand Down
4 changes: 2 additions & 2 deletions rewards/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ use std::collections::HashMap;
use crate as rewards;

pub type AccountId = u128;
pub type Balance = u64;
pub type Share = u64;
pub type Balance = u128;
pub type Share = u128;
pub type PoolId = u32;
pub type CurrencyId = u32;

Expand Down
34 changes: 30 additions & 4 deletions rewards/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,18 @@ fn add_share_should_work() {
);

// overflow occurs when saturating calculation
assert_ok!(RewardsModule::add_share(&ALICE, &DOT_POOL, u64::MAX));
assert_ok!(RewardsModule::add_share(&ALICE, &DOT_POOL, u128::MAX));

assert_eq!(
RewardsModule::pool_infos(DOT_POOL),
PoolInfo {
total_shares: u64::MAX,
rewards: vec![(NATIVE_COIN, (u64::MAX, u64::MAX))].into_iter().collect()
total_shares: u128::MAX,
rewards: vec![(NATIVE_COIN, (u128::MAX, u128::MAX))].into_iter().collect()
}
);
assert_eq!(
RewardsModule::shares_and_withdrawn_rewards(DOT_POOL, ALICE),
(u64::MAX, vec![(NATIVE_COIN, u64::MAX)].into_iter().collect())
(u128::MAX, vec![(NATIVE_COIN, u128::MAX)].into_iter().collect())
);
});
}
Expand Down Expand Up @@ -663,3 +663,29 @@ fn minimal_share_should_be_enforced() {
assert_ok!(RewardsModule::transfer_share_and_rewards(&ALICE, &DOT_POOL, 5, &BOB));
});
}

#[test]
fn overflow_should_work() {
ExtBuilder::default().build().execute_with(|| {
assert_ok!(RewardsModule::add_share(&ALICE, &DOT_POOL, 10));

// The DOT pool accumulate 21 rewards in the NATIVE COIN
assert_ok!(RewardsModule::accumulate_reward(&DOT_POOL, NATIVE_COIN, 21));
assert_eq!(
RewardsModule::pool_infos(DOT_POOL),
PoolInfo {
total_shares: 10,
rewards: vec![(NATIVE_COIN, (21, 0))].into_iter().collect()
}
);

assert_ok!(RewardsModule::add_share(&ALICE, &DOT_POOL, u128::MAX));
assert_eq!(
RewardsModule::pool_infos(DOT_POOL),
PoolInfo {
total_shares: u128::MAX,
rewards: vec![(NATIVE_COIN, (u128::MAX, u128::MAX))].into_iter().collect()
}
);
});
}
Loading