merge conflicts

src/consensus/state.rs

@@ -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 {