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

consensus: minor fixes, error codes added

Browse Source
This commit is contained in:
aggstam
2022-10-30 03:10:32 +03:00
parent 4ba31723c1
commit 32801877bc
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/consensus/state.rs
View File

@@ -334,7 +334,7 @@ impl ValidatorState {
/// Wrapper for coins::is_leader
pub fn is_slot_leader(&self) -> (bool, usize) {
coins::is_leader(self.current_slot(), &self.consensus.coins)
coins::is_leader(self.relative_slot(self.current_slot()), &self.consensus.coins)
}
/// Generate a block proposal for the current slot, containing all
@@ -360,7 +360,7 @@ impl ValidatorState {
// TODO: Retrieve previous lead proof
let eta: [u8; 32] = *blake3::hash(b"let there be dark!").as_bytes();
// Generating leader proof
let coin = self.consensus.coins[slot as usize][idx];
let coin = self.consensus.coins[self.relative_slot(slot) as usize][idx];
let proof = lead_proof::create_lead_proof(&self.proving_key, coin)?;
let participants = self.consensus.participants.values().cloned().collect();
let metadata = Metadata::new(

18
src/consensus/task/proposal.rs
View File

@@ -50,15 +50,15 @@ pub async fn proposal_task(consensus_p2p: P2pPtr, sync_p2p: P2pPtr, state: Valid
sleep(seconds_next_slot).await;
// Node checks if epoch has changed, to broadcast a new participation message
match state.write().await.epoch_changed().await {
let epoch_changed = state.write().await.epoch_changed().await;
match epoch_changed {
Ok(changed) => {
if changed {
let lock = state.read().await;
info!("consensus: New epoch started: {}", lock.current_epoch());
let public = lock.public;
let address = lock.address;
info!("consensus: New epoch started: {}", state.read().await.current_epoch());
let public = state.read().await.public;
let address = state.read().await.address;
let mut coins = vec![];
for slot_coins in &lock.consensus.coins {
for slot_coins in &state.read().await.consensus.coins {
let mut slot_coins_inputs = vec![];
for slot_coin in slot_coins {
slot_coins_inputs.push(slot_coin.public_inputs());
@@ -89,10 +89,8 @@ pub async fn proposal_task(consensus_p2p: P2pPtr, sync_p2p: P2pPtr, state: Valid
// Node checks if it's the slot leader to generate a new proposal
// for that slot.
let lock = state.read().await;
let (won, idx) = lock.is_slot_leader();
let result = if won { lock.propose(idx) } else { Ok(None) };
let (won, idx) = state.read().await.is_slot_leader();
let result = if won { state.read().await.propose(idx) } else { Ok(None) };
let proposal = match result {
Ok(prop) => {
if prop.is_none() {