chaingen: Track expected blk heights separately. #1101
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
dnldd
changed the title
NextBlock & SetTip reorg.
davecgh
requested changes
Mar 1, 2018
blockchain/chaingen/generator.go
Outdated
| blockHeight, ok := g.blockHeights[blockHash] | ||
| if !ok { | ||
| panic(fmt.Sprintf("No block height found for block hash %s", | ||
| blockHash.String())) |
There was a problem hiding this comment.
No need to call String, it's already a fmt.Stringer.
blockchain/chaingen/generator.go
Outdated
| @@ -1666,18 +1668,23 @@ func (g *Generator) connectBlockTickets(b *wire.MsgBlock) { | |||
| } | |||
|
|
|||
| // Extract the ticket purchases (sstx) from the block. | |||
| height := b.Header.Height | |||
| blockHash := b.BlockHash() | |||
| blockHeight, ok := g.blockHeights[blockHash] | |||
There was a problem hiding this comment.
Rather than repeating this everywhere, please just create a function that panics.
func (g *Generator) blockHeight(hash chainhash.Hash) uint32 {
height, ok := g.blockHeights[hash]
if !ok {
panic(fmt.Sprintf("no block height found for block %s", hash)
}
}Then, you can simply do:
blockHeight := g.blockHeight(blockHash)Also, notice the lowercase panic message to be consistent with everything else.
blockchain/chaingen/generator.go
Outdated
| @@ -1691,8 +1698,13 @@ func (g *Generator) disconnectBlockTickets(b *wire.MsgBlock) { | |||
| "the current tip %s", b.BlockHash(), g.tip.BlockHash())) | |||
| } | |||
|
|
|||
| blockHash := b.BlockHash() | |||
| blockHeight, ok := g.blockHeights[blockHash] | |||
There was a problem hiding this comment.
With aforementioned suggestion, this reduces to:
blockHeight := g.blockHeight(blockHash)
blockchain/chaingen/generator.go
Outdated
| @@ -1707,7 +1719,13 @@ func (g *Generator) disconnectBlockTickets(b *wire.MsgBlock) { | |||
|
|
|||
| // Move tickets that are no longer mature from the live ticket pool to | |||
| // the immature ticket pool. | |||
| prevBlockHeight := blockHeight - 1 | |||
|
|
|||
| prevBlockHeight := g.blockHeights[b.Header.PrevBlock] | |||
There was a problem hiding this comment.
And
prevBlockHeight := g.blockHeight(b.Header.PrevBlock)
blockchain/chaingen/generator.go
Outdated
| @@ -1785,11 +1802,25 @@ func (g *Generator) SetTip(blockName string) { | |||
| // As long as the two branches are not at the same height, add | |||
| // the tip of the longest one to the appropriate connect or | |||
| // disconnect list and move its tip back to its previous block. | |||
| if oldBranch.Header.Height > newBranch.Header.Height { | |||
| oldBranchHeight, ok := g.blockHeights[oldBranch.BlockHash()] | |||
There was a problem hiding this comment.
oldBranchHeight := g.blockHeight(oldBranch.BlockHash())
newBranchHeight := g.blockHeight(newBranch.BlockHash())
blockchain/chaingen/generator.go
Outdated
| @@ -2085,9 +2116,10 @@ func (g *Generator) NextBlock(blockName string, spend *SpendableOut, ticketSpend | |||
| // it. | |||
| g.originalParents[blockHash] = prevHash | |||
| } | |||
| g.connectLiveTickets(&blockHash, nextHeight, ticketWinners, | |||
| g.connectLiveTickets(&blockHash, block.Header.Height, ticketWinners, | |||
There was a problem hiding this comment.
I'm fairly certain this shouldn't be changed. Just because the block header height changed making it invalid does not mean the rest of the state should be made invalid to match.
blockchain/chaingen/generator.go
Outdated
| ticketPurchases) | ||
| g.blocks[blockHash] = &block | ||
| g.blockHeights[blockHash] = block.Header.Height |
There was a problem hiding this comment.
This should be nextHeight, not the potentially invalid value from the header.
blockchain/chaingen/generator.go
Outdated
| delete(g.blocksByName, oldBlockName) | ||
| delete(g.wonTickets, oldBlockHash) | ||
|
|
||
| // Add new entries. | ||
| newBlockHash := newBlock.BlockHash() | ||
| g.blocks[newBlockHash] = newBlock | ||
| g.blockHeights[newBlockHash] = newBlock.Header.Height |
There was a problem hiding this comment.
The existing height in should be reinserted for the new hash, not the now potentially invalid one.
wonTickets := g.wonTickets[oldBlockHash]
existingHeight := g.blockHeight(oldBlockHash)
...
g.blockHeights[newBlockHash] = existingHeight
blockchain/chaingen/generator.go
Outdated
| @@ -176,6 +177,7 @@ func MakeGenerator(params *chaincfg.Params) (Generator, error) { | |||
| tip: genesis, | |||
| tipName: "genesis", | |||
| blocks: map[chainhash.Hash]*wire.MsgBlock{genesisHash: genesis}, | |||
| blockHeights: map[chainhash.Hash]uint32{genesis.BlockHash(): genesis.Header.Height}, | |||
There was a problem hiding this comment.
The genesis height is always zero. Better to hard code that to assert it.
map[chainhash.Hash]uint32{genesis.BlockHash(): 0},
davecgh
changed the title
davecgh
approved these changes
Mar 2, 2018
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.
No description provided.