Skip to content

Commit

Permalink
Merge branch 'develop' into v0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@ark930
ark930 committed May 7, 2024
2 parents 34b319a + 84cbc0e commit 50205ab
Show file tree
Hide file tree
Showing 38 changed files with 2,819 additions and 829 deletions.
1 change: 1 addition & 0 deletions Cargo.lock
View file

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

6 changes: 5 additions & 1 deletion pallets/clouds-convert/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ parameter_types! {
pub const Week: BlockNumber = 50400; // a week
pub const MaxBlock: BlockNumber = 10512000; // four years
pub const Multiplier: Balance = 10_u128.pow(12);
pub const VoteWeightMultiplier: Balance = 3;
pub const VoteWeightMultiplier: Balance = 1;
pub const MaxPositions: u32 = 10;
pub const MarkupRefreshLimit: u32 = 100;
}

impl bifrost_ve_minting::Config for Runtime {
Expand All @@ -198,6 +200,8 @@ impl bifrost_ve_minting::Config for Runtime {
type MaxBlock = MaxBlock;
type Multiplier = Multiplier;
type VoteWeightMultiplier = VoteWeightMultiplier;
type MaxPositions = MaxPositions;
type MarkupRefreshLimit = MarkupRefreshLimit;
}

pub struct ExtBuilder {
Expand Down
2 changes: 1 addition & 1 deletion pallets/clouds-convert/src/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ fn clouds_to_vebnc_should_work() {
// check the veBNC balance of Bob
assert_eq!(
<Runtime as crate::Config>::VeMinting::balance_of(&BOB, None).unwrap(),
bob_old_vebnc_balance + 79817139200
bob_old_vebnc_balance + 19939046400
);

// check the new pool balance
Expand Down
50 changes: 26 additions & 24 deletions pallets/farming/src/benchmarking.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ use crate::{Pallet as Farming, *};
benchmarks! {
on_initialize {}:{Farming::<T>::on_initialize(BlockNumberFor::<T>::from(10u32));}
create_farming_pool {
let caller: T::AccountId = whitelisted_caller();
let token_amount = BalanceOf::<T>::unique_saturated_from(1000u128);
let default_currency_id = CurrencyIdOf::<T>::default();
let tokens_proportion = vec![(default_currency_id, Perbill::from_percent(100))];
Expand All @@ -37,7 +38,7 @@ benchmarks! {
}: _(RawOrigin::Root,
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
Expand All @@ -55,15 +56,15 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5,
));
let charge_rewards = vec![(default_currency_id,BalanceOf::<T>::unique_saturated_from(300000u128))];
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards, false));
}: _(RawOrigin::Signed(caller.clone()), 0, token_amount, None)

withdraw {
Expand All @@ -77,15 +78,15 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5,
));
let charge_rewards = vec![(default_currency_id,BalanceOf::<T>::unique_saturated_from(300000u128))];
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards, false));
assert_ok!(Farming::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, token_amount, None));
}: _(RawOrigin::Signed(caller.clone()), 0, None)

Expand All @@ -100,15 +101,15 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5,
));
let charge_rewards = vec![(default_currency_id,BalanceOf::<T>::unique_saturated_from(300000u128))];
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards, false));
assert_ok!(Farming::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, token_amount, None));
System::<T>::set_block_number(System::<T>::block_number() + BlockNumberFor::<T>::from(10u32));
Farming::<T>::on_initialize(BlockNumberFor::<T>::from(0u32));
Expand All @@ -125,15 +126,15 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5,
));
let charge_rewards = vec![(default_currency_id,BalanceOf::<T>::unique_saturated_from(300000u128))];
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards, false));
assert_ok!(Farming::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, token_amount, Some((BalanceOf::<T>::unique_saturated_from(100u128), BlockNumberFor::<T>::from(100u32)))));
// System::<T>::set_block_number(System::<T>::block_number() + BlockNumberFor::<T>::from(10u32));
}: _(RawOrigin::Signed(caller.clone()), 0)
Expand All @@ -149,15 +150,15 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5,
));
let charge_rewards = vec![(default_currency_id,BalanceOf::<T>::unique_saturated_from(300000u128))];
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards, false));
assert_ok!(Farming::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, token_amount, None));
}: _(RawOrigin::Signed(caller.clone()), 0)

Expand All @@ -174,14 +175,14 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards.clone())),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards.clone())),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5,
));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards, false));
System::<T>::set_block_number(System::<T>::block_number() + BlockNumberFor::<T>::from(10u32));
Farming::<T>::on_initialize(BlockNumberFor::<T>::from(0u32));
assert_ok!(Farming::<T>::close_pool(RawOrigin::Root.into(), pid));
Expand All @@ -195,7 +196,7 @@ benchmarks! {
Some(BlockNumberFor::<T>::from(7u32)),
Some(BlockNumberFor::<T>::from(6u32)),
Some(5),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards))
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards))
)

force_retire_pool {
Expand All @@ -211,14 +212,14 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards.clone())),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards.clone())),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5,
));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards, false));
System::<T>::set_block_number(System::<T>::block_number() + BlockNumberFor::<T>::from(10u32));
Farming::<T>::on_initialize(BlockNumberFor::<T>::from(0u32));
assert_ok!(Farming::<T>::close_pool(RawOrigin::Root.into(), pid));
Expand All @@ -238,7 +239,7 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards.clone())),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards.clone())),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
Expand All @@ -248,6 +249,7 @@ benchmarks! {
}: _(RawOrigin::Root,pid)

edit_pool {
let caller: T::AccountId = whitelisted_caller();
let token_amount = BalanceOf::<T>::unique_saturated_from(1000u128);
let default_currency_id = CurrencyIdOf::<T>::default();
let tokens_proportion = vec![(default_currency_id, Perbill::from_percent(100))];
Expand All @@ -256,7 +258,7 @@ benchmarks! {
assert_ok!(Farming::<T>::create_farming_pool(RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards.clone())),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards.clone())),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
Expand All @@ -281,13 +283,13 @@ benchmarks! {
assert_ok!(Farming::<T>::create_farming_pool(RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards, false));
System::<T>::set_block_number(System::<T>::block_number() + BlockNumberFor::<T>::from(10u32));
Farming::<T>::on_initialize(BlockNumberFor::<T>::from(0u32));
}: _(RawOrigin::Root, 0)
Expand All @@ -303,15 +305,15 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5,
));
let charge_rewards = vec![(default_currency_id,BalanceOf::<T>::unique_saturated_from(300000u128))];
}: _(RawOrigin::Signed(caller.clone()), 0, charge_rewards)
}: _(RawOrigin::Signed(caller.clone()), 0, charge_rewards, false)

force_gauge_claim {
let caller: T::AccountId = whitelisted_caller();
Expand All @@ -324,15 +326,15 @@ benchmarks! {
RawOrigin::Root.into(),
tokens_proportion.clone(),
basic_rewards.clone(),
Some((default_currency_id, BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
Some((BlockNumberFor::<T>::from(1000u32), gauge_basic_rewards)),
BalanceOf::<T>::unique_saturated_from(0u128),
BlockNumberFor::<T>::from(0u32),
BlockNumberFor::<T>::from(7u32),
BlockNumberFor::<T>::from(6u32),
5,
));
let charge_rewards = vec![(default_currency_id,BalanceOf::<T>::unique_saturated_from(300000u128))];
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards));
assert_ok!(Farming::<T>::charge(RawOrigin::Signed(caller.clone()).into(), 0, charge_rewards, false));
assert_ok!(Farming::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, token_amount, Some((BalanceOf::<T>::unique_saturated_from(100u128), BlockNumberFor::<T>::from(100u32)))));
assert_ok!(Farming::<T>::set_retire_limit(RawOrigin::Root.into(), 10));
}: _(RawOrigin::Root, 0)
Expand Down
Loading

0 comments on commit 50205ab

Please sign in to comment.