Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e4364e3
First experiments with Sassafras equivocations report
davxy Sep 12, 2022
b267418
Preparation for sassafras client tests
davxy Sep 20, 2022
1292e86
Cleanup and first working client test with multiple peers
davxy Sep 23, 2022
d0c8bc2
Merge branch 'davxy-sassafras-protocol' into davxy/sassafras-protocol…
davxy Sep 24, 2022
0a20351
Dummy commit
davxy Sep 24, 2022
326ac44
Conflicts resolution
davxy Sep 24, 2022
5b43f28
Test code refactory
davxy Sep 27, 2022
2dd6086
Better submit-tickets extrinsic tag
davxy Sep 27, 2022
829b90b
Refactory of client tests
davxy Oct 6, 2022
a2d66b6
Aux data revert implementation
davxy Oct 6, 2022
ca4b563
Handle skipped epochs on block-import
davxy Oct 7, 2022
e7be289
Skipped epoch test and fix
davxy Oct 11, 2022
7690a5c
Fix to epoch start slot computation
davxy Oct 14, 2022
6c20538
Minor tweaks
davxy Oct 17, 2022
2361064
Trivial comments refactory
davxy Oct 24, 2022
a26a31e
Do not alter original epoch changes node on epoch skip
davxy Oct 24, 2022
f3ebc2b
Insert tickets aux data after block import
davxy Oct 24, 2022
84bfdff
Tests environment refactory
davxy Oct 24, 2022
cfe639e
Use in-memory keystore for tests
davxy Oct 24, 2022
51e81a2
Push lock file
davxy Oct 24, 2022
04e92f6
Use test accounts keyring
davxy Oct 24, 2022
193134a
Test for secondary slots claims
davxy Oct 24, 2022
8bd8aed
Improved tests after epoch changes tree fix
davxy Oct 25, 2022
76c24bd
Tests for blocks verification
davxy Oct 29, 2022
950020b
Next epoch tickets incremental sort
davxy Oct 29, 2022
94e9ee8
Incremental sortition test
davxy Oct 29, 2022
d1a7edd
Set proper tickets tx longevity
davxy Oct 29, 2022
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
Prev Previous commit
Next Next commit
Insert tickets aux data after block import
  • Loading branch information
davxy committed Oct 24, 2022
commit f3ebc2bd9dfcb0fc1855403e4e45df1db5e777a6
34 changes: 22 additions & 12 deletions client/consensus/sassafras/src/authorship.rs
Original file line number Diff line number Diff line change
Expand Up @@ -401,12 +401,15 @@ async fn start_tickets_worker<B, C, SC>(
};
let epoch_identifier = EpochIdentifier { position, hash: notification.hash, number };

let tickets = epoch_changes
.shared_data()
.epoch_mut(&epoch_identifier)
.map(|epoch| generate_epoch_tickets(epoch, &keystore))
.unwrap_or_default();
let mut epoch = match epoch_changes.shared_data().epoch(&epoch_identifier).cloned() {
Some(epoch) => epoch,
None => {
warn!(target: "🌳 sassafras", "Unexpected missing epoch data for {:?}", epoch_identifier);
continue
},
};

let tickets = generate_epoch_tickets(&mut epoch, &keystore);
if tickets.is_empty() {
continue
}
Expand All @@ -425,13 +428,20 @@ async fn start_tickets_worker<B, C, SC>(
Ok(false) => Some("Unknown reason".to_string()),
_ => None,
};
if let Some(err) = err {
error!(target: "sassafras", "🌳 Unable to submit tickets: {}", err);
// Remove tickets from epoch tree node.
epoch_changes
.shared_data()
.epoch_mut(&epoch_identifier)
.map(|epoch| epoch.tickets_aux.clear());

match err {
None => {
// Cache tickets in the epoch changes tree
epoch_changes
.shared_data()
.epoch_mut(&epoch_identifier)
.map(|target_epoch| target_epoch.tickets_aux = epoch.tickets_aux);
// TODO-SASS-P4: currently we don't persist the tickets proofs
// Thus on reboot/crash we are loosing them.
},
Some(err) => {
error!(target: "sassafras", "🌳 Unable to submit tickets: {}", err);
},
}
}
}
Expand Down