gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove granularity from genesis (bp #8514) (#8518)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2020-03-02 15:42:46 -08:00
committed by GitHub
parent 0d4131ae68
commit dad62e132e
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
genesis/src/genesis_accounts.rs
View File

@ -178,13 +178,10 @@ fn add_stakes(
genesis_config: &mut GenesisConfig, genesis_config: &mut GenesisConfig,
staker_infos: &[StakerInfo], staker_infos: &[StakerInfo],
unlock_info: &UnlockInfo, unlock_info: &UnlockInfo,
granularity: u64,
) -> u64 { ) -> u64 {
staker_infos staker_infos
.iter() .iter()
.map(|staker_info| { .map(|staker_info| create_and_add_stakes(genesis_config, staker_info, unlock_info, None))
create_and_add_stakes(genesis_config, staker_info, unlock_info, granularity)
})
.sum::<u64>() .sum::<u64>()
} }
@ -196,22 +193,15 @@ pub fn add_genesis_accounts(genesis_config: &mut GenesisConfig, mut issued_lampo
genesis_config, genesis_config,
&BATCH_FOUR_STAKER_INFOS, &BATCH_FOUR_STAKER_INFOS,
&UNLOCKS_ALL_AT_9_MONTHS, &UNLOCKS_ALL_AT_9_MONTHS,
1_000_000 * LAMPORTS_PER_SOL,
) + add_stakes( ) + add_stakes(
genesis_config, genesis_config,
&FOUNDATION_STAKER_INFOS, &FOUNDATION_STAKER_INFOS,
&UNLOCKS_ALL_DAY_ZERO, &UNLOCKS_ALL_DAY_ZERO,
1_000_000 * LAMPORTS_PER_SOL, ) + add_stakes(genesis_config, &GRANTS_STAKER_INFOS, &UNLOCKS_ALL_DAY_ZERO)
) + add_stakes( + add_stakes(
genesis_config,
&GRANTS_STAKER_INFOS,
&UNLOCKS_ALL_DAY_ZERO,
1_000_000 * LAMPORTS_PER_SOL,
) + add_stakes(
genesis_config, genesis_config,
&COMMUNITY_STAKER_INFOS, &COMMUNITY_STAKER_INFOS,
&UNLOCKS_ALL_DAY_ZERO, &UNLOCKS_ALL_DAY_ZERO,
1_000_000 * LAMPORTS_PER_SOL,
); );
// "one thanks" (community pool) gets 500_000_000SOL (total) - above distributions // "one thanks" (community pool) gets 500_000_000SOL (total) - above distributions
@ -223,7 +213,7 @@ pub fn add_genesis_accounts(genesis_config: &mut GenesisConfig, mut issued_lampo
lamports: 500_000_000 * LAMPORTS_PER_SOL - issued_lamports, lamports: 500_000_000 * LAMPORTS_PER_SOL - issued_lamports,
}, },
&UNLOCKS_ALL_DAY_ZERO, &UNLOCKS_ALL_DAY_ZERO,
1_000_000 * LAMPORTS_PER_SOL, None,
); );
} }

5
genesis/src/stakes.rs
View File

@ -41,8 +41,9 @@ pub fn create_and_add_stakes(
// description of how the stakes' lockups will expire // description of how the stakes' lockups will expire
unlock_info: &UnlockInfo, unlock_info: &UnlockInfo,
// the largest each stake account should be, in lamports // the largest each stake account should be, in lamports
granularity: u64, granularity: Option<u64>,
) -> u64 { ) -> u64 {
let granularity = granularity.unwrap_or(std::u64::MAX);
let authorized = Authorized::auto( let authorized = Authorized::auto(
&staker_info &staker_info
.staker .staker
@ -163,7 +164,7 @@ mod tests {
) { ) {
assert_eq!( assert_eq!(
total_lamports, total_lamports,
create_and_add_stakes(genesis_config, staker_info, unlock_info, granularity) create_and_add_stakes(genesis_config, staker_info, unlock_info, Some(granularity))
); );
assert_eq!(genesis_config.accounts.len(), len); assert_eq!(genesis_config.accounts.len(), len);
assert_eq!( assert_eq!(