github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
mohab metwally
2022-11-25 19:54:11 +02:00
parent 30ba9705ed
commit fba4c940ad
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/consensus/state.rs
View File

@@ -478,7 +478,7 @@ impl ValidatorState {
for i in 0..constants::EPOCH_LENGTH {
let coin = LeadCoin::new(
eta,
LOTTERY_HEAD_START, // TODO: TESTNET: Why is this constant being used?
constants::LOTTERY_HEAD_START, // TODO: TESTNET: Why is this constant being used?
slot+i as u64,
epoch_secrets.secret_keys[i].inner(),
epoch_secrets.merkle_roots[i],
@@ -847,7 +847,6 @@ impl ValidatorState {
return Err(Error::ProposalPublicValuesMismatched)
}
// Verify proposal public inputs
let prop_sn = lf.public_inputs[constants::PI_NULLIFIER_INDEX];
for sn in &self.consensus.leaders_nullifiers {