fix:unable to switch sync mode

Qitmeer · Dec 6, 2024 · bfc14b6 · bfc14b6
1 parent 7032ea9
commit bfc14b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/consensus/model/block_chain.go b/consensus/model/block_chain.go
@@ -28,4 +28,5 @@ type BlockChain interface {
 	ForeachBlueBlocks(start Block, depth uint, powType pow.PowType, fn func(block Block, header *types.BlockHeader) error) error
 	GetUtxo(outpoint types.TxOutPoint) (interface{}, error)
 	VerifyMeerTx(tx Tx) error
+	IsSnapSyncing() bool
 }
diff --git a/meerevm/meer/meerchain.go b/meerevm/meer/meerchain.go
@@ -323,6 +323,9 @@ func (b *MeerChain) OnStateChange(header *types.Header, state *state.StateDB, bo
 		return
 	}
 	if b.block == nil {
+		if b.consensus.BlockChain().IsSnapSyncing() {
+			return
+		}
 		log.Error("No meer block for state change", "hash", header.Hash().String())
 		return
 	}

diff --git a/p2p/synch/peersync.go b/p2p/synch/peersync.go
@@ -173,11 +173,15 @@ func (ps *PeerSync) handleStallSample() {
 	if atomic.LoadInt32(&ps.shutdown) != 0 {
 		return
 	}
+	if ps.IsSnapSync() {
+		return
+	}
 	lbid := ps.Chain().BlockDAG().GetLastBlockID()
 	if ps.lastBlockID != lbid {
+		ps.lastBlockID = lbid
 		return
 	}
-	ps.lastBlockID = lbid
+	ps.Chain().MeerChain().Downloader().Progress()
 	ps.TryAgainUpdateSyncPeer(true)
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
     	if b.block == nil {
+    		if b.consensus.BlockChain().IsSnapSyncing() {
+    			return
+    		}
     		log.Error("No meer block for state change", "hash", header.Hash().String())
     		return
     	}
@@ Expand Down @@