TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-11-30 09:33:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1840 from nspcc-dev/consensus/fix-verification-panic

Browse source 
consensus: fix panic during verifyBlock
This commit is contained in:
Roman Khimov 2021-03-18 19:23:26 +03:00 committed by GitHub
commit a6f2870a2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/consensus/consensus.go
View file

@ -648,9 +648,6 @@ func convertKeys(validators []crypto.PublicKey) (pubs []*keys.PublicKey) {
func (s *service) newBlockFromContext(ctx *dbft.Context) block.Block { func (s *service) newBlockFromContext(ctx *dbft.Context) block.Block {
block := new(neoBlock) block := new(neoBlock)
if ctx.TransactionHashes == nil {
return nil
}
block.Block.Network = s.ProtocolConfiguration.Magic block.Block.Network = s.ProtocolConfiguration.Magic
block.Block.Timestamp = ctx.Timestamp / nsInMs block.Block.Timestamp = ctx.Timestamp / nsInMs
@ -658,7 +655,7 @@ func (s *service) newBlockFromContext(ctx *dbft.Context) block.Block {
if s.ProtocolConfiguration.StateRootInHeader { if s.ProtocolConfiguration.StateRootInHeader {
sr, err := s.Chain.GetStateModule().GetStateRoot(ctx.BlockIndex - 1) sr, err := s.Chain.GetStateModule().GetStateRoot(ctx.BlockIndex - 1)
if err != nil { if err != nil {
return nil s.log.Fatal(fmt.Sprintf("failed to get state root: %s", err.Error()))
} }
block.StateRootEnabled = true block.StateRootEnabled = true
block.PrevStateRoot = sr.Root block.PrevStateRoot = sr.Root
@ -672,11 +669,11 @@ func (s *service) newBlockFromContext(ctx *dbft.Context) block.Block {
validators, err = s.Chain.GetNextBlockValidators() validators, err = s.Chain.GetNextBlockValidators()
} }
if err != nil { if err != nil {
return nil s.log.Fatal(fmt.Sprintf("failed to get validators: %s", err.Error()))
} }
script, err := smartcontract.CreateMultiSigRedeemScript(s.dbft.Context.M(), validators) script, err := smartcontract.CreateMultiSigRedeemScript(s.dbft.Context.M(), validators)
if err != nil { if err != nil {
return nil s.log.Fatal(fmt.Sprintf("failed to create multisignature script: %s", err.Error()))
} }
block.Block.NextConsensus = crypto.Hash160(script) block.Block.NextConsensus = crypto.Hash160(script)
block.Block.PrevHash = ctx.PrevHash block.Block.PrevHash = ctx.PrevHash
@ -685,6 +682,7 @@ func (s *service) newBlockFromContext(ctx *dbft.Context) block.Block {
primaryIndex := byte(ctx.PrimaryIndex) primaryIndex := byte(ctx.PrimaryIndex)
block.Block.PrimaryIndex = primaryIndex block.Block.PrimaryIndex = primaryIndex
// it's OK to have ctx.TransactionsHashes == nil here
hashes := make([]util.Uint256, len(ctx.TransactionHashes)) hashes := make([]util.Uint256, len(ctx.TransactionHashes))
copy(hashes, ctx.TransactionHashes) copy(hashes, ctx.TransactionHashes)
block.Block.MerkleRoot = hash.CalcMerkleRoot(hashes) block.Block.MerkleRoot = hash.CalcMerkleRoot(hashes)