aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

consensus: set Nonce and ValidUntilBlock on proposal

Browse source 
Related #841.
This commit is contained in:
Evgenii Stratonikov 2020-04-20 10:57:09 +03:00
parent c10c7d2100
commit 3657f2e21d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/consensus/consensus.go
View file

@ -2,6 +2,7 @@ package consensus
import ( import (
"errors" "errors"
"math/rand"
"sort" "sort"
"time" "time"
@ -348,7 +349,9 @@ func (s *service) verifyBlock(b block.Block) bool {
coreb := &b.(*neoBlock).Block coreb := &b.(*neoBlock).Block
for _, tx := range coreb.Transactions { for _, tx := range coreb.Transactions {
if err := s.Chain.VerifyTx(tx, coreb); err != nil { if err := s.Chain.VerifyTx(tx, coreb); err != nil {
s.log.Warn("invalid transaction in proposed block", zap.Stringer("hash", tx.Hash())) s.log.Warn("invalid transaction in proposed block",
zap.Stringer("hash", tx.Hash()),
zap.Error(err))
return false return false
} }
} }
@ -462,6 +465,8 @@ func (s *service) getVerifiedTx(count int) []block.Transaction {
for { for {
minerTx := transaction.NewMinerTX() minerTx := transaction.NewMinerTX()
minerTx.Outputs = txOuts minerTx.Outputs = txOuts
minerTx.ValidUntilBlock = s.dbft.BlockIndex
minerTx.Nonce = rand.Uint32()
res[0] = minerTx res[0] = minerTx
if tx, _, _ := s.Chain.GetTransaction(res[0].Hash()); tx == nil { if tx, _, _ := s.Chain.GetTransaction(res[0].Hash()); tx == nil {