blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Calculate proofs collected and don't encrypt if there are none (#6698)

This commit is contained in:
sakridge 2019-11-05 11:38:50 -08:00 committed by GitHub
parent 7203036e3e
commit c312d4fba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/storage_stage.rs
View File

@ -369,11 +369,12 @@ impl StorageStage {
fn process_turn( fn process_turn(
storage_keypair: &Arc<Keypair>, storage_keypair: &Arc<Keypair>,
state: &Arc<RwLock<StorageStateInner>>, state: &Arc<RwLock<StorageStateInner>>,
_blocktree: &Arc<Blocktree>, blocktree: &Arc<Blocktree>,
blockhash: Hash, blockhash: Hash,
slot: Slot, slot: Slot,
slots_per_segment: u64, slots_per_segment: u64,
instruction_sender: &InstructionSender, instruction_sender: &InstructionSender,
total_proofs: usize,
) -> Result<()> { ) -> Result<()> {
let mut seed = [0u8; 32]; let mut seed = [0u8; 32];
let signature = storage_keypair.sign(&blockhash.as_ref()); let signature = storage_keypair.sign(&blockhash.as_ref());
@ -395,6 +396,10 @@ impl StorageStage {
w_state.storage_blockhash = blockhash; w_state.storage_blockhash = blockhash;
} }
if total_proofs == 0 {
return Ok(());
}
// Regenerate the answers // Regenerate the answers
let num_segments = get_segment_from_slot(slot, slots_per_segment) as usize; let num_segments = get_segment_from_slot(slot, slots_per_segment) as usize;
if num_segments == 0 { if num_segments == 0 {
@ -427,7 +432,7 @@ impl StorageStage {
let mut statew = state.write().unwrap(); let mut statew = state.write().unwrap();
match chacha_cbc_encrypt_file_many_keys( match chacha_cbc_encrypt_file_many_keys(
_blocktree, blocktree,
segment as u64, segment as u64,
statew.slots_per_segment, statew.slots_per_segment,
&mut statew.storage_keys, &mut statew.storage_keys,
@ -453,7 +458,8 @@ impl StorageStage {
account: Account, account: Account,
storage_state: &Arc<RwLock<StorageStateInner>>, storage_state: &Arc<RwLock<StorageStateInner>>,
current_key_idx: &mut usize, current_key_idx: &mut usize,
) { ) -> usize {
let mut proofs_collected = 0;
if let Ok(StorageContract::ArchiverStorage { proofs, .. }) = account.state() { if let Ok(StorageContract::ArchiverStorage { proofs, .. }) = account.state() {
//convert slot to segment //convert slot to segment
let segment = get_segment_from_slot(slot, slots_per_segment); let segment = get_segment_from_slot(slot, slots_per_segment);
@ -484,11 +490,13 @@ impl StorageStage {
.entry(account_id) .entry(account_id)
.or_default() .or_default()
.push(proof.clone()); .push(proof.clone());
proofs_collected += 1;
} }
} }
debug!("storage proof: slot: {}", slot); debug!("storage proof: slot: {}", slot);
} }
} }
proofs_collected
} }
fn process_entries( fn process_entries(
@ -518,8 +526,9 @@ impl StorageStage {
let archiver_accounts = archiver_accounts(bank.as_ref()); let archiver_accounts = archiver_accounts(bank.as_ref());
// find proofs, and use them to update // find proofs, and use them to update
// the storage_keys with their signatures // the storage_keys with their signatures
let mut total_proofs = 0;
for (account_id, account) in archiver_accounts.into_iter() { for (account_id, account) in archiver_accounts.into_iter() {
Self::collect_proofs( total_proofs += Self::collect_proofs(
bank.slot(), bank.slot(),
bank.slots_per_segment(), bank.slots_per_segment(),
account_id, account_id,
@ -538,6 +547,7 @@ impl StorageStage {
bank.slot(), bank.slot(),
bank.slots_per_segment(), bank.slots_per_segment(),
instruction_sender, instruction_sender,
total_proofs,
); );
Self::submit_verifications( Self::submit_verifications(
get_segment_from_slot(bank.slot(), bank.slots_per_segment()), get_segment_from_slot(bank.slot(), bank.slots_per_segment()),