Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

ECIP-1039: Monetary policy rounding specification #7067

Merged
merged 4 commits into from
Nov 24, 2017
Merged

ECIP-1039: Monetary policy rounding specification #7067

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ca57d7
ECIP-1039: Monetary policy rounding specification
sorpaas Nov 16, 2017
b35cc3f
Change reward calculation to only use divide once
sorpaas Nov 16, 2017
bef85fb
Add test for ECIP1017 at block 250000000
sorpaas Nov 24, 2017
8e89be7
Wrong era used in ECIP1017 test
sorpaas Nov 24, 2017
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
11 changes: 10 additions & 1 deletion ethcore/src/ethereum/ethash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,12 @@ fn ecip1017_eras_block_reward(era_rounds: u64, mut reward: U256, block_number:u6
} else {
block_number / era_rounds
};
let mut divi = U256::from(1);
for _ in 0..eras {
reward = reward / U256::from(5) * U256::from(4);
reward = reward * U256::from(4);
divi = divi * U256::from(5);
}
reward = reward / divi;
(eras, reward)
}

Expand Down Expand Up @@ -517,6 +520,12 @@ mod tests {
let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
assert_eq!(15, eras);
assert_eq!(U256::from_str("271000000000000").unwrap(), reward);

let block_number = 250000000;
let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
assert_eq!(48, eras);
assert!(U256::from_str("65697BFA9ACB").unwrap() != reward);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line is redundant

assert_eq!(U256::from_str("65697BFA9ACD").unwrap(), reward);
}

#[test]
Expand Down