blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make tx fee's burn percent in proper range (#7226) 

automerge
This commit is contained in:
Parth 2019-12-04 01:55:43 +05:30 committed by Grimes
parent ba688cf629
commit bc09365c98
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/src/fee_calculator.rs
View File

@ -28,7 +28,9 @@ pub struct FeeCalculator {
pub const DEFAULT_TARGET_LAMPORTS_PER_SIGNATURE: u64 = 10_000; pub const DEFAULT_TARGET_LAMPORTS_PER_SIGNATURE: u64 = 10_000;
pub const DEFAULT_TARGET_SIGNATURES_PER_SLOT: usize = pub const DEFAULT_TARGET_SIGNATURES_PER_SLOT: usize =
50_000 * DEFAULT_TICKS_PER_SLOT as usize / DEFAULT_TICKS_PER_SECOND as usize; 50_000 * DEFAULT_TICKS_PER_SLOT as usize / DEFAULT_TICKS_PER_SECOND as usize;
pub const DEFAULT_BURN_PERCENT: u8 = ((50usize * std::u8::MAX as usize) / 100usize) as u8;
// Percentage of tx fees to burn
pub const DEFAULT_BURN_PERCENT: u8 = 50;
impl Default for FeeCalculator { impl Default for FeeCalculator {
fn default() -> Self { fn default() -> Self {
@ -123,8 +125,8 @@ impl FeeCalculator {
/// calculate unburned fee from a fee total, returns (unburned, burned) /// calculate unburned fee from a fee total, returns (unburned, burned)
pub fn burn(&self, fees: u64) -> (u64, u64) { pub fn burn(&self, fees: u64) -> (u64, u64) {
let unburned = fees * u64::from(std::u8::MAX - self.burn_percent) / u64::from(std::u8::MAX); let burned = fees * u64::from(self.burn_percent) / 100;
(unburned, fees - unburned) (fees - burned, burned)
} }
} }
@ -137,13 +139,12 @@ mod tests {
#[test] #[test]
fn test_fee_calculator_burn() { fn test_fee_calculator_burn() {
let mut fee_calculator = FeeCalculator::default(); let mut fee_calculator = FeeCalculator::default();
assert_eq!(fee_calculator.burn(2), (1, 1)); assert_eq!(fee_calculator.burn(2), (1, 1));
fee_calculator.burn_percent = 0; fee_calculator.burn_percent = 0;
assert_eq!(fee_calculator.burn(2), (2, 0)); assert_eq!(fee_calculator.burn(2), (2, 0));
fee_calculator.burn_percent = std::u8::MAX;
fee_calculator.burn_percent = 100;
assert_eq!(fee_calculator.burn(2), (0, 2)); assert_eq!(fee_calculator.burn(2), (0, 2));
} }