Skip to content
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

Jump to bottom

Update collator candidate self-bond in Moonbeam #2174

Merged
merged 8 commits into from
Apr 3, 2023
Merged

Update collator candidate self-bond in Moonbeam #2174

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a0bb64e
changed collator bond constants in Moonbeam
Agusrodri Mar 20, 2023
d9b23ec
fix unit tests
Agusrodri Mar 21, 2023
5c4ae5d
fix reward_block_authors unit test
Agusrodri Mar 21, 2023
cc24a8e
fix reward_bock_authors_with_bond test
Agusrodri Mar 21, 2023
711b92b
fix chain_spec
Agusrodri Mar 21, 2023
90afb70
updated chain_spec collator balances
Agusrodri Mar 21, 2023
9208303
fixed initial balance in moonbeam chain_spec
Agusrodri Mar 21, 2023
ba27df0
fix constants syntax
Agusrodri Mar 21, 2023
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
8 changes: 4 additions & 4 deletions node/service/src/chain_spec/moonbeam.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub fn development_chain_spec(mnemonic: Option<String>, num_accounts: Option<u32
vec![(
accounts[0],
get_from_seed::<NimbusId>("Alice"),
1_000 * GLMR * SUPPLY_FACTOR,
20_000 * GLMR * SUPPLY_FACTOR,
)],
// Delegations
vec![],
Expand Down Expand Up @@ -138,13 +138,13 @@ pub fn get_chain_spec(para_id: ParaId) -> ChainSpec {
(
AccountId::from(hex!("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac")),
get_from_seed::<NimbusId>("Alice"),
1_000 * GLMR * SUPPLY_FACTOR,
20_000 * GLMR * SUPPLY_FACTOR,
),
// Bob -> Baltathar
(
AccountId::from(hex!("3Cd0A705a2DC65e5b1E1205896BaA2be8A07c6e0")),
get_from_seed::<NimbusId>("Bob"),
1_000 * GLMR * SUPPLY_FACTOR,
20_000 * GLMR * SUPPLY_FACTOR,
),
],
// Delegations
Expand Down Expand Up @@ -244,7 +244,7 @@ pub fn testnet_genesis(
balances: endowed_accounts
.iter()
.cloned()
.map(|k| (k, 1 << 80))
.map(|k| (k, 1 << 110))
.collect(),
},
crowdloan_rewards: CrowdloanRewardsConfig {
Expand Down
8 changes: 4 additions & 4 deletions runtime/moonbeam/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,9 +747,9 @@ impl pallet_parachain_staking::Config for Runtime {
/// Maximum delegations per delegator
type MaxDelegationsPerDelegator = ConstU32<100>;
/// Minimum stake required to become a collator
type MinCollatorStk = ConstU128<{ 1000 * currency::GLMR * currency::SUPPLY_FACTOR }>;
type MinCollatorStk = ConstU128<{ 20000 * currency::GLMR * currency::SUPPLY_FACTOR }>;
Agusrodri marked this conversation as resolved.
Show resolved Hide resolved
/// Minimum stake required to be reserved to be a candidate
type MinCandidateStk = ConstU128<{ 1000 * currency::GLMR * currency::SUPPLY_FACTOR }>;
type MinCandidateStk = ConstU128<{ 20000 * currency::GLMR * currency::SUPPLY_FACTOR }>;
/// Minimum stake required to be reserved to be a delegator
type MinDelegation = ConstU128<{ 500 * currency::MILLIGLMR * currency::SUPPLY_FACTOR }>;
/// Minimum stake required to be reserved to be a delegator
Expand Down Expand Up @@ -1623,11 +1623,11 @@ mod tests {
// staking minimums
assert_eq!(
get!(pallet_parachain_staking, MinCollatorStk, u128),
Balance::from(100 * KILOGLMR)
Balance::from(2_000_000 * GLMR)
);
assert_eq!(
get!(pallet_parachain_staking, MinCandidateStk, u128),
Balance::from(100 * KILOGLMR)
Balance::from(2_000_000 * GLMR)
);
assert_eq!(
get!(pallet_parachain_staking, MinDelegation, u128),
Expand Down
85 changes: 44 additions & 41 deletions runtime/moonbeam/tests/integration_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,14 +345,14 @@ fn verify_proxy_type_indices() {
fn join_collator_candidates() {
ExtBuilder::default()
.with_balances(vec![
(AccountId::from(ALICE), 200_000 * GLMR),
(AccountId::from(BOB), 200_000 * GLMR),
(AccountId::from(CHARLIE), 110_000 * GLMR),
(AccountId::from(DAVE), 100_000 * GLMR),
(AccountId::from(ALICE), 10_000_000 * GLMR),
(AccountId::from(BOB), 10_000_000 * GLMR),
(AccountId::from(CHARLIE), 10_000_000 * GLMR),
(AccountId::from(DAVE), 10_000_000 * GLMR),
])
.with_collators(vec![
(AccountId::from(ALICE), 100_000 * GLMR),
(AccountId::from(BOB), 100_000 * GLMR),
(AccountId::from(ALICE), 2_000_000 * GLMR),
(AccountId::from(BOB), 2_000_000 * GLMR),
])
.with_delegations(vec![
(
Expand All @@ -367,56 +367,56 @@ fn join_collator_candidates() {
assert_noop!(
ParachainStaking::join_candidates(
origin_of(AccountId::from(ALICE)),
100_000 * GLMR,
2_000_000 * GLMR,
2u32
),
pallet_parachain_staking::Error::<Runtime>::CandidateExists
);
assert_noop!(
ParachainStaking::join_candidates(
origin_of(AccountId::from(CHARLIE)),
100_000 * GLMR,
2_000_000 * GLMR,
2u32
),
pallet_parachain_staking::Error::<Runtime>::DelegatorExists
);
assert!(System::events().is_empty());
assert_ok!(ParachainStaking::join_candidates(
origin_of(AccountId::from(DAVE)),
100_000 * GLMR,
2_000_000 * GLMR,
2u32
));
assert_eq!(
last_event(),
RuntimeEvent::ParachainStaking(
pallet_parachain_staking::Event::JoinedCollatorCandidates {
account: AccountId::from(DAVE),
amount_locked: 100_000 * GLMR,
new_total_amt_locked: 310_000 * GLMR
amount_locked: 2_000_000 * GLMR,
new_total_amt_locked: 6_010_000 * GLMR
}
)
);
let candidates = ParachainStaking::candidate_pool();
assert_eq!(candidates.0[0].owner, AccountId::from(ALICE));
assert_eq!(candidates.0[0].amount, 105_000 * GLMR);
assert_eq!(candidates.0[0].amount, 2_005_000 * GLMR);
assert_eq!(candidates.0[1].owner, AccountId::from(BOB));
assert_eq!(candidates.0[1].amount, 105_000 * GLMR);
assert_eq!(candidates.0[1].amount, 2_005_000 * GLMR);
assert_eq!(candidates.0[2].owner, AccountId::from(DAVE));
assert_eq!(candidates.0[2].amount, 100_000 * GLMR);
assert_eq!(candidates.0[2].amount, 2_000_000 * GLMR);
});
}

#[test]
fn transfer_through_evm_to_stake() {
ExtBuilder::default()
.with_balances(vec![(AccountId::from(ALICE), 200_000 * GLMR)])
.with_balances(vec![(AccountId::from(ALICE), 10_000_000 * GLMR)])
.build()
.execute_with(|| {
// Charlie has no balance => fails to stake
assert_noop!(
ParachainStaking::join_candidates(
origin_of(AccountId::from(CHARLIE)),
100_000 * GLMR,
2_000_000 * GLMR,
2u32
),
DispatchError::Module(ModuleError {
Expand All @@ -425,22 +425,25 @@ fn transfer_through_evm_to_stake() {
message: Some("InsufficientBalance")
})
);
// Alice transfer from free balance 200_000 GLMR to Bob
// Alice transfer from free balance 3_000_000 GLMR to Bob
assert_ok!(Balances::transfer(
origin_of(AccountId::from(ALICE)),
AccountId::from(BOB),
200_000 * GLMR,
3_000_000 * GLMR,
));
assert_eq!(Balances::free_balance(AccountId::from(BOB)), 200_000 * GLMR);
assert_eq!(
Balances::free_balance(AccountId::from(BOB)),
3_000_000 * GLMR
);

let gas_limit = 100000u64;
let gas_price: U256 = (100 * GIGAWEI).into();
// Bob transfers 100_000 GLMR to Charlie via EVM
// Bob transfers 2_000_000 GLMR to Charlie via EVM
assert_ok!(RuntimeCall::EVM(pallet_evm::Call::<Runtime>::call {
source: H160::from(BOB),
target: H160::from(CHARLIE),
input: vec![],
value: (100_000 * GLMR).into(),
value: (2_000_000 * GLMR).into(),
gas_limit,
max_fee_per_gas: gas_price,
max_priority_fee_per_gas: None,
Expand All @@ -450,18 +453,18 @@ fn transfer_through_evm_to_stake() {
.dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
assert_eq!(
Balances::free_balance(AccountId::from(CHARLIE)),
100_000 * GLMR,
2_000_000 * GLMR,
);

// Charlie can stake now
assert_ok!(ParachainStaking::join_candidates(
origin_of(AccountId::from(CHARLIE)),
100_000 * GLMR,
2_000_000 * GLMR,
2u32
),);
let candidates = ParachainStaking::candidate_pool();
assert_eq!(candidates.0[0].owner, AccountId::from(CHARLIE));
assert_eq!(candidates.0[0].amount, 100_000 * GLMR);
assert_eq!(candidates.0[0].amount, 2_000_000 * GLMR);
});
}

Expand All @@ -470,10 +473,10 @@ fn reward_block_authors() {
ExtBuilder::default()
.with_balances(vec![
// Alice gets 10k extra tokens for her mapping deposit
(AccountId::from(ALICE), 210_000 * GLMR),
(AccountId::from(BOB), 100_000 * GLMR),
(AccountId::from(ALICE), 10_010_000 * GLMR),
(AccountId::from(BOB), 10_000_000 * GLMR),
])
.with_collators(vec![(AccountId::from(ALICE), 100_000 * GLMR)])
.with_collators(vec![(AccountId::from(ALICE), 2_000_000 * GLMR)])
.with_delegations(vec![(
AccountId::from(BOB),
AccountId::from(ALICE),
Expand All @@ -492,21 +495,21 @@ fn reward_block_authors() {
// no rewards doled out yet
assert_eq!(
Balances::usable_balance(AccountId::from(ALICE)),
100_000 * GLMR,
8_000_000 * GLMR,
);
assert_eq!(
Balances::usable_balance(AccountId::from(BOB)),
50_000 * GLMR,
9_950_000 * GLMR,
);
run_to_block(3601, Some(NimbusId::from_slice(&ALICE_NIMBUS).unwrap()));
// rewards minted and distributed
assert_eq!(
Balances::usable_balance(AccountId::from(ALICE)),
111366666658400000000000,
8980978048702400000000000,
);
assert_eq!(
Balances::usable_balance(AccountId::from(BOB)),
54133333329200000000000,
9969521950497200000000000,
);
});
}
Expand All @@ -516,11 +519,11 @@ fn reward_block_authors_with_parachain_bond_reserved() {
ExtBuilder::default()
.with_balances(vec![
// Alice gets 10k extra tokens for her mapping deposit
(AccountId::from(ALICE), 210_000 * GLMR),
(AccountId::from(BOB), 100_000 * GLMR),
(AccountId::from(CHARLIE), 100 * GLMR),
(AccountId::from(ALICE), 10_010_000 * GLMR),
(AccountId::from(BOB), 10_000_000 * GLMR),
(AccountId::from(CHARLIE), 10_000 * GLMR),
])
.with_collators(vec![(AccountId::from(ALICE), 100_000 * GLMR)])
.with_collators(vec![(AccountId::from(ALICE), 2_000_000 * GLMR)])
.with_delegations(vec![(
AccountId::from(BOB),
AccountId::from(ALICE),
Expand All @@ -543,30 +546,30 @@ fn reward_block_authors_with_parachain_bond_reserved() {
// no rewards doled out yet
assert_eq!(
Balances::usable_balance(AccountId::from(ALICE)),
100_000 * GLMR,
8_000_000 * GLMR,
);
assert_eq!(
Balances::usable_balance(AccountId::from(BOB)),
50_000 * GLMR,
9_950_000 * GLMR,
);
assert_eq!(
Balances::usable_balance(AccountId::from(CHARLIE)),
100 * GLMR,
10_000 * GLMR,
);
run_to_block(3601, Some(NimbusId::from_slice(&ALICE_NIMBUS).unwrap()));
// rewards minted and distributed
assert_eq!(
Balances::usable_balance(AccountId::from(ALICE)),
108269333328165000000000,
8688492682878000000000000,
);
assert_eq!(
Balances::usable_balance(AccountId::from(BOB)),
52584166664082500000000,
9962207316621500000000000,
);
// 30% reserved for parachain bond
assert_eq!(
Balances::usable_balance(AccountId::from(CHARLIE)),
4751500000000000000000,
310300000000000000000000,
);
});
}
Expand Down