• R/O
  • HTTP
  • SSH
  • HTTPS

vapor: Commit

Golang implemented sidechain for Bytom


Commit MetaInfo

Révisionf0a522057a65acf27966e5bbc48b5d6a7392587e (tree)
l'heure2020-10-26 15:26:25
AuteurPaladz <yzhu101@uott...>
CommiterGitHub

Message de Log

prepare 1.1.6 (#552)

Co-authored-by: paladz <colt@ColtdeMacBook-Pro.local>

Change Summary

Modification

--- a/netsync/chainmgr/handle.go
+++ b/netsync/chainmgr/handle.go
@@ -264,7 +264,7 @@ func (m *Manager) handleTransactionMsg(peer *peers.Peer, msg *msgs.TransactionMe
264264 }
265265
266266 if m.mempool.IsDust(tx) {
267- m.peers.ProcessIllegal(peer.ID(), security.LevelMsgIllegal, "receive dust tx msg")
267+ log.WithFields(log.Fields{"tx_hash": tx.ID.String(), "peer": peer.Addr()}).Warn("receive dust tx msg")
268268 return
269269 }
270270
--- a/protocol/block.go
+++ b/protocol/block.go
@@ -331,10 +331,9 @@ func (c *Chain) reorganizeChain(blockHeader *types.BlockHeader) error {
331331 log.WithFields(log.Fields{"module": logModule, "height": blockHeader.Height, "hash": blockHash.String()}).Debug("attach from mainchain")
332332 }
333333
334- if len(detachBlockHeaders) > 0 &&
335- detachBlockHeaders[len(detachBlockHeaders)-1].Height <= c.lastIrrBlockHeader.Height &&
336- irrBlockHeader.Height <= c.lastIrrBlockHeader.Height {
337- return errors.New("rollback block below the height of irreversible block")
334+ if len(detachBlockHeaders) > 0 && detachBlockHeaders[len(detachBlockHeaders)-1].Height <= c.lastIrrBlockHeader.Height && irrBlockHeader.Height <= c.lastIrrBlockHeader.Height {
335+ log.WithField("module", logModule).Warn("rollback block below the height of irreversible block")
336+ return nil
338337 }
339338
340339 consensusResults = append(consensusResults, consensusResult.Fork())
--- a/version/version.go
+++ b/version/version.go
@@ -47,7 +47,7 @@ const (
4747
4848 var (
4949 // The full version string
50- Version = "1.1.5"
50+ Version = "1.1.6"
5151 // GitCommit is set with --ldflags "-X main.gitCommit=$(git rev-parse HEAD)"
5252 GitCommit string
5353 Status *UpdateStatus
Afficher sur ancien navigateur de dépôt.