GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup positional indexes for rewind, introducing block markers (#759)

Browse Source 
* Cleanup MMRs positional indexes. Get rid of the kernel position index.
Introduced a new block marker index that keeps, for each block, the
respective positions in the output and kernel MMRs. This is now sufficient
for rewind.
* Block marker compaction
This commit is contained in:
Ignotus Peverell
2018-03-08 21:36:51 +00:00
committed by GitHub
parent a059bbde0d
commit ab4b2a19e3
9 changed files with 57 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/handlers.rs
+1 -1
View File
@@ -124,7 +124,7 @@ impl OutputHandler {
.iter()
.filter(|output| commitments.is_empty() || commitments.contains(&output.commit))
.map(|output| {
OutputPrintable::from_output(output, w(&self.chain), &block, include_proof)
OutputPrintable::from_output(output, w(&self.chain), &header, include_proof)
})
.collect();
BlockOutputs {
api/src/types.rs
+4 -4
View File
@@ -244,7 +244,7 @@ impl OutputPrintable {
pub fn from_output(
output: &core::Output,
chain: Arc<chain::Chain>,
block: &core::Block,
block_header: &core::BlockHeader,
include_proof: bool,
) -> OutputPrintable {
let output_type = if output
@@ -274,7 +274,7 @@ impl OutputPrintable {
.features
.contains(core::transaction::OutputFeatures::COINBASE_OUTPUT) && !spent
{
merkle_proof = chain.get_merkle_proof(&out_id, &block).ok()
merkle_proof = chain.get_merkle_proof(&out_id, &block_header).ok()
};
OutputPrintable {
@@ -563,7 +563,7 @@ impl BlockPrintable {
.outputs
.iter()
.map(|output| {
OutputPrintable::from_output(output, chain.clone(), &block, include_proof)
OutputPrintable::from_output(output, chain.clone(), &block.header, include_proof)
})
.collect();
let kernels = block
@@ -602,7 +602,7 @@ impl CompactBlockPrintable {
let block = chain.get_block(&cb.hash()).unwrap();
let out_full = cb.out_full
.iter()
.map(|x| OutputPrintable::from_output(x, chain.clone(), &block, false))
.map(|x| OutputPrintable::from_output(x, chain.clone(), &block.header, false))
.collect();
let kern_full = cb.kern_full
.iter()