Fix synchronization (idena-network#1139)

ubiubi18 · Jul 23, 2023 · 4a3837e · 4a3837e
1 parent ce053e5
commit 4a3837e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/blockchain/blockchain.go b/blockchain/blockchain.go
@@ -2831,7 +2831,7 @@ func (chain *Blockchain) ValidateHeader(header, prevBlock *types.Header) error {
 			return errors.New("flag NewGenesis is required")
 		}
 	}
-	if header.ProposedHeader != nil && header.ProposedHeader.Upgrade > 0 && header.ProposedHeader.Upgrade != uint32(chain.upgrader.Target()) {
+	if header.ProposedHeader != nil && header.ProposedHeader.Upgrade > 0 && header.ProposedHeader.Upgrade != uint32(chain.upgrader.Target()) && (header.ProposedHeader.Upgrade != uint32(config.ConsensusV11) || chain.config.Consensus.Version > config.ConsensusV11) {
 		return errors.New("unknown consensus upgrade")
 	}
 	//TODO: add proposer's check??

diff --git a/docs/changelogs/v1.1.md b/docs/changelogs/v1.1.md
@@ -1,5 +1,13 @@
 # Changelog v1.1
 
+## 1.1.1 (Jul 23, 2023)
+
+### Changes
+
+- Fix synchronization ([#1139])
+
+[#1139]: https://github.com/idena-network/idena-go/pull/1139
+
 ## 1.1.0 (Jul 6, 2023)
 
 ### Fork (Upgrade 12)