prepare 1.1.6 (#552)

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

diff --git a/netsync/chainmgr/handle.go b/netsync/chainmgr/handle.go
index 35d1f9a..c1538b5 100644 (file)
--- a/netsync/chainmgr/handle.go
+++ b/netsync/chainmgr/handle.go
@@ -264,7 +264,7 @@ func (m *Manager) handleTransactionMsg(peer *peers.Peer, msg *msgs.TransactionMe
        }
 
        if m.mempool.IsDust(tx) {
-               m.peers.ProcessIllegal(peer.ID(), security.LevelMsgIllegal, "receive dust tx msg")
+               log.WithFields(log.Fields{"tx_hash": tx.ID.String(), "peer": peer.Addr()}).Warn("receive dust tx msg")
                return
        }
 

diff --git a/protocol/block.go b/protocol/block.go
index 52eab1b..862c01a 100644 (file)
--- a/protocol/block.go
+++ b/protocol/block.go
@@ -331,10 +331,9 @@ func (c *Chain) reorganizeChain(blockHeader *types.BlockHeader) error {
                log.WithFields(log.Fields{"module": logModule, "height": blockHeader.Height, "hash": blockHash.String()}).Debug("attach from mainchain")
        }
 
-       if len(detachBlockHeaders) > 0 &&
-               detachBlockHeaders[len(detachBlockHeaders)-1].Height <= c.lastIrrBlockHeader.Height &&
-               irrBlockHeader.Height <= c.lastIrrBlockHeader.Height {
-               return errors.New("rollback block below the height of irreversible block")
+       if len(detachBlockHeaders) > 0 && detachBlockHeaders[len(detachBlockHeaders)-1].Height <= c.lastIrrBlockHeader.Height && irrBlockHeader.Height <= c.lastIrrBlockHeader.Height {
+               log.WithField("module", logModule).Warn("rollback block below the height of irreversible block")
+               return nil
        }
 
        consensusResults = append(consensusResults, consensusResult.Fork())

diff --git a/version/version.go b/version/version.go
index 0ea616f..b7957d6 100644 (file)
--- a/version/version.go
+++ b/version/version.go
@@ -47,7 +47,7 @@ const (
 
 var (
        // The full version string
-       Version = "1.1.5"
+       Version = "1.1.6"
        // GitCommit is set with --ldflags "-X main.gitCommit=$(git rev-parse HEAD)"
        GitCommit string
        Status    *UpdateStatus