check_compact retains leaves and roots until parents are pruned (#753)

* wip * failing test for being too eager when pruning a sibling * commit * rustfmt * [WIP] modified get_shift and get_leaf_shift to account for leaving "pruned but not compacted" leaves in place Note: this currently breaks check_compact as nothing else is aware of the modified behavior * rustfmt * commit * rustfmt * basic prune/compact/shift working * rustfmt * commit * rustfmt * next_pruned_idx working (I think) * commit * horizon test uncovered some subtle issues - wip * rustfmt * cleanup * rustfmt * commit * cleanup * cleanup * commit * rustfmt * contains -> binary_search * rustfmt * no need for height==0 special case * wip - works for single compact, 2nd one breaks the mmr hashes * commit * rustfmt * fixed it (needs a lot of cleanup) we were not traversing all the way up to the peak if we pruned an entire tree so rm_log and prune list were inconsistent * multiple compact steps are working data file not being copmacted currently (still to investigate) * cleanup store tests * cleanup * cleanup up debug * rustfmt * take kernel offsets into account when summing kernels and outputs for full txhashset validation validate chain state pre and post compaction * rustfmt * fix wallet refresh (we need block height to be refreshed on non-coinbase outputs) otherwise we cannot spend them... * rustfmt
2018-03-13 14:22:34 -04:00
parent e268993f5e
commit 65633c7611
16 changed files with 1004 additions and 293 deletions
@@ -118,18 +118,35 @@ impl OutputHandler {
 		include_proof: bool,
 	) -> BlockOutputs {
 		let header = w(&self.chain).get_header_by_height(block_height).unwrap();
-		let block = w(&self.chain).get_block(&header.hash()).unwrap();
-		let outputs = block
-			.outputs
-			.iter()
-			.filter(|output| commitments.is_empty() || commitments.contains(&output.commit))
-			.map(|output| {
-				OutputPrintable::from_output(output, w(&self.chain), &header, include_proof)
-			})
-			.collect();
-		BlockOutputs {
-			header: BlockHeaderInfo::from_header(&header),
-			outputs: outputs,
+
+		// TODO - possible to compact away blocks we care about
+		// in the period between accepting the block and refreshing the wallet
+		if let Ok(block) = w(&self.chain).get_block(&header.hash()) {
+			let outputs = block
+				.outputs
+				.iter()
+				.filter(|output| commitments.is_empty() || commitments.contains(&output.commit))
+				.map(|output| {
+					OutputPrintable::from_output(output, w(&self.chain), &header, include_proof)
+				})
+				.collect();
+
+			BlockOutputs {
+				header: BlockHeaderInfo::from_header(&header),
+				outputs: outputs,
+			}
+		} else {
+			debug!(
+				LOGGER,
+				"could not find block {:?} at height {}, maybe compacted?",
+				&header.hash(),
+				block_height,
+			);
+
+			BlockOutputs {
+				header: BlockHeaderInfo::from_header(&header),
+				outputs: vec![],
+			}
 		}
 	}