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

add validator rewards pools (#4742)

Browse Source 
* add validator rewards pools

* populate rewards syscall
This commit is contained in:
Rob Walker
2019-06-20 12:22:29 -07:00
committed by GitHub
parent 6854c64a09
commit 1f0f947ed2
8 changed files with 138 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
runtime/src/bank.rs
View File

@ -27,15 +27,16 @@ use solana_metrics::{
use solana_sdk::account::Account;
use solana_sdk::fee_calculator::FeeCalculator;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::hash::{extend_and_hash, hashv, Hash};
use solana_sdk::hash::{extend_and_hash, Hash};
use solana_sdk::inflation::Inflation;
use solana_sdk::native_loader;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, Signature};
use solana_sdk::syscall::current;
use solana_sdk::syscall::fees;
use solana_sdk::syscall::slot_hashes::{self, SlotHashes};
use solana_sdk::syscall::tick_height;
use solana_sdk::syscall::{
current, fees, rewards,
slot_hashes::{self, SlotHashes},
tick_height,
};
use solana_sdk::system_transaction;
use solana_sdk::timing::{duration_as_ms, duration_as_ns, duration_as_us, MAX_RECENT_BLOCKHASHES};
use solana_sdk::transaction::{Result, Transaction, TransactionError};
@ -264,6 +265,8 @@ impl Default for BlockhashQueue {
}
}
pub const DUMMY_REPLICATOR_POINTS: u64 = 100;
impl Bank {
pub fn new(genesis_block: &GenesisBlock) -> Self {
Self::new_with_paths(&genesis_block, None)
@ -357,7 +360,7 @@ impl Bank {
self.ancestors.insert(p.slot(), i + 1);
});
self.update_rewards(parent.epoch(), parent.last_blockhash());
self.update_rewards(parent.epoch());
self.update_current();
self.update_fees();
self
@ -435,7 +438,7 @@ impl Bank {
}
// update reward for previous epoch
fn update_rewards(&mut self, epoch: u64, blockhash: Hash) {
fn update_rewards(&mut self, epoch: u64) {
if epoch == self.epoch() {
return;
}
@ -450,33 +453,29 @@ impl Bank {
// years_elapsed = slots_elapsed / slots/year
let period = self.epoch_schedule.get_slots_in_epoch(epoch) as f64 / self.slots_per_year;
// validators
{
let validator_rewards =
(self.inflation.validator(year) * self.capitalization() as f64 * period) as u64;
let validator_rewards =
self.inflation.validator(year) * self.capitalization() as f64 * period;
// claim points and create a pool
let mining_pool = self
.stakes
.write()
.unwrap()
.create_mining_pool(epoch, validator_rewards);
let validator_points = self.stakes.write().unwrap().claim_points();
self.store_account(
&Pubkey::new(
hashv(&[
blockhash.as_ref(),
"StakeMiningPool".as_ref(),
&serialize(&epoch).unwrap(),
])
.as_ref(),
),
&mining_pool,
);
let replicator_rewards =
self.inflation.replicator(year) * self.capitalization() as f64 * period;
self.capitalization
.fetch_add(validator_rewards as usize, Ordering::Relaxed);
}
let replicator_points = DUMMY_REPLICATOR_POINTS; // TODO: real value for points earned last epoch
self.store_account(
&rewards::id(),
&rewards::create_account(
1,
validator_rewards / validator_points as f64,
replicator_rewards / replicator_points as f64,
),
);
self.capitalization.fetch_add(
(validator_rewards + replicator_rewards) as usize,
Ordering::Relaxed,
);
}
fn set_hash(&self) -> bool {
@ -1390,8 +1389,7 @@ mod tests {
use solana_sdk::instruction::InstructionError;
use solana_sdk::poh_config::PohConfig;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::syscall::fees::Fees;
use solana_sdk::syscall::tick_height::TickHeight;
use solana_sdk::syscall::{fees::Fees, rewards::Rewards, tick_height::TickHeight};
use solana_sdk::system_instruction;
use solana_sdk::system_transaction;
use solana_sdk::timing::DEFAULT_TICKS_PER_SLOT;
@ -1474,6 +1472,8 @@ mod tests {
}
bank.store_account(&vote_id, &vote_account);
let validator_points = bank.stakes.read().unwrap().points();
// put a child bank in epoch 1, which calls update_rewards()...
let bank1 = Bank::new_from_parent(
&bank,
@ -1482,18 +1482,22 @@ mod tests {
);
// verify that there's inflation
assert_ne!(bank1.capitalization(), bank.capitalization());
// verify the inflation is in rewards pools
// verify the inflation is represented in validator_points *
let inflation = bank1.capitalization() - bank.capitalization();
let validator_rewards: u64 = bank1
.stakes
.read()
.unwrap()
.mining_pools()
.map(|(_key, account)| account.lamports)
.sum();
let rewards = bank1
.get_account(&rewards::id())
.map(|account| Rewards::from(&account).unwrap())
.unwrap();
assert_eq!(validator_rewards, inflation);
assert!(
((rewards.validator_point_value * validator_points as f64
+ rewards.replicator_point_value * DUMMY_REPLICATOR_POINTS as f64) - // TODO: need replicator points per-epoch
inflation as f64)
.abs()
< 1.0 // rounding, truncating
);
}
#[test]

21
runtime/src/genesis_utils.rs
View File

@ -1,9 +1,9 @@
use solana_sdk::account::Account;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::genesis_block::{Builder, GenesisBlock};
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_program;
use solana_stake_api::stake_state;
use solana_stake_api;
use solana_vote_api::vote_state;
// The default stake placed with the bootstrap leader
@ -38,8 +38,8 @@ pub fn create_genesis_block_with_leader(
bootstrap_leader_stake_lamports,
);
let genesis_block = GenesisBlock::new(
&[
let mut builder = Builder::new()
.accounts(&[
// the mint
(
mint_keypair.pubkey(),
@ -56,22 +56,23 @@ pub fn create_genesis_block_with_leader(
// passive bootstrap leader stake, duplicates above temporarily
(
staking_keypair.pubkey(),
stake_state::create_stake_account(
solana_stake_api::stake_state::create_stake_account(
&voting_keypair.pubkey(),
&vote_state,
bootstrap_leader_stake_lamports,
),
),
],
&[
])
.native_instruction_processors(&[
solana_bpf_loader_program!(),
solana_vote_program!(),
solana_stake_program!(),
],
);
]);
builder = solana_stake_api::rewards_pools::genesis(builder);
GenesisBlockInfo {
genesis_block,
genesis_block: builder.build(),
mint_keypair,
voting_keypair,
}

20
runtime/src/stakes.rs
View File

@ -2,7 +2,7 @@
//! node stakes
use solana_sdk::account::Account;
use solana_sdk::pubkey::Pubkey;
use solana_stake_api::stake_state::{create_mining_pool, StakeState};
use solana_stake_api::stake_state::StakeState;
use solana_vote_api::vote_state::VoteState;
use std::collections::HashMap;
@ -136,6 +136,14 @@ impl Stakes {
_ => false,
})
}
pub fn rewards_pools(&self) -> impl Iterator<Item = (&Pubkey, &Account)> {
self.stake_accounts
.iter()
.filter(|(_key, account)| match StakeState::from(account) {
Some(StakeState::RewardsPool) => true,
_ => false,
})
}
pub fn highest_staked_node(&self) -> Option<Pubkey> {
self.vote_accounts
@ -146,7 +154,7 @@ impl Stakes {
}
/// currently unclaimed points
pub fn points(&mut self) -> u64 {
pub fn points(&self) -> u64 {
self.points
}
@ -156,14 +164,6 @@ impl Stakes {
self.points = 0;
points
}
/// claims points
/// makes a pool with the lamports and points spread over those points and
pub fn create_mining_pool(&mut self, epoch: u64, lamports: u64) -> Account {
let points = self.claim_points();
create_mining_pool(lamports, epoch, lamports as f64 / points as f64)
}
}
#[cfg(test)]