Kernel sum and MMR sizes in block header #1163
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ignopeverell
added
the
consensus breaking
Blocks are now summed and validated based on their own totals and not the totals since genesis. This allows to get rid of BlockSum and simplified the setting of a new block's roots, kernel sum and MMR sizes. Fixes #1163
ignopeverell
changed the title
antiochp
approved these changes
Jun 16, 2018
| @@ -125,6 +127,13 @@ pub struct BlockHeader { | |||
| /// We can derive the kernel offset sum for *this* block from | |||
| /// the total kernel offset of the previous block header. | |||
| pub total_kernel_offset: BlindingFactor, | |||
| /// Total accumulated sum of kernel commitments since genesis block. | |||
| /// Should always equal the UTXO commitment sum minus supply. | |||
| pub total_kernel_sum: Commitment, | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -576,24 +596,17 @@ impl Block { | |||
|
|
|||
| // now sum the kernel_offsets up to give us | |||
| // an aggregate offset for the entire block | |||
| let total_kernel_offset = { | |||
| kernel_offsets.push(prev.total_kernel_offset); | |||
| let total_kernel_offset = committed::sum_kernel_offsets(kernel_offsets, vec![])?; | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| )?; | ||
| // take the kernel offset for this block (block offset minus previous) and | ||
| // verify outputs and kernel sums | ||
| let block_kernel_offset = if self.header.total_kernel_offset() == prev_kernel_offset.clone() |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Maybe done as a separate PR but I think we can get rid of |
|
Also I think the changes specific to fixing #1165 can be backported to master as they don't depend on the header changes? |
|
You're right on both counts. And yes, I think removing |
This was referenced Jun 21, 2018
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds the kernel sum total and output and kernel MMR sizes to block headers. This allows validation of all intermediate kernel roots during fast sync. Also allows getting rid of the
BlockSumindex.Fixes #1162, #1107, and #1165.