Merge pull request #842 from lochjin/dev2.0

fix:snap-sync abnormal jamming
Qitmeer · Dec 3, 2024 · 8ccbc74 · 8ccbc74
2 parents 8d0a998 + b3a013e
commit 8ccbc74
Show file tree

Hide file tree

Showing 18 changed files with 147 additions and 57 deletions.
diff --git a/core/blockchain/snap.go b/core/blockchain/snap.go
@@ -174,10 +174,13 @@ func (b *BlockChain) ProcessBlockBySnap(sds []*SnapData) (meerdag.IBlock, error)
 						}
 						tx.Object = vtx
 					}
-					_, err = b.MeerVerifyTx(vtx, view)
-					if err != nil {
-						return returnFun(err)
+					if vtx.ExportData != nil {
+						err = b.meerChain.MeerPool().CheckMeerChangeExportTx(vtx.ETx, vtx.ExportData, view)
+						if err != nil {
+							return returnFun(err)
+						}
 					}
+
 					err = b.connectVMTransaction(tx, vtx, nil, view)
 					if err != nil {
 						return returnFun(err)

diff --git a/core/json/node.go b/core/json/node.go
@@ -59,6 +59,7 @@ type GetPeerInfoResult struct {
 	Tasks          int                  `json:"tasks,omitempty"`
 	Broadcast      int                  `json:"broadcast,omitempty"`
 	Snap           bool                 `json:"snap,omitempty"`
+	SnapSync       bool                 `json:"snapsync,omitempty"`
 	MeerState      *MeerState           `json:"meerstate,omitempty"`
 }
 

diff --git a/meerevm/meer/meerchain.go b/meerevm/meer/meerchain.go
@@ -568,7 +568,7 @@ func (b *MeerChain) VerifyTx(tx *mmeer.VMTx, utxoView *utxo.UtxoViewpoint) (int6
 			return 0, err
 		}
 		if tx.ExportData != nil {
-			err = b.meerpool.checkMeerChangeExportTx(txe, tx.ExportData, utxoView)
+			err = b.meerpool.CheckMeerChangeExportTx(txe, tx.ExportData, utxoView)
 			if err != nil {
 				return 0, err
 			}
@@ -695,6 +695,9 @@ func (b *MeerChain) SyncTo(target common.Hash) error {
 		if system.InterruptRequested(b.consensus.Interrupt()) {
 			return errors.New("System interrupt")
 		}
+		if b.IsShutdown() {
+			return errors.New("MeerChain is shutdown")
+		}
 	}
 }
 

diff --git a/meerevm/meer/meerchange.go b/meerevm/meer/meerchange.go
@@ -41,7 +41,7 @@ func (m *MeerPool) checkMeerChangeTxs(block *types.Block, receipts types.Receipt
 					if err != nil {
 						return err
 					}
-					err = m.checkMeerChangeExportTx(tx, ccExportEvent, nil)
+					err = m.CheckMeerChangeExportTx(tx, ccExportEvent, nil)
 					if err != nil {
 						m.ethTxPool.RemoveTx(tx.Hash(), true)
 						return err
@@ -65,7 +65,7 @@ func (m *MeerPool) HasUtxo(txid *hash.Hash, idx uint32) bool {
 	return err == nil && ue != nil
 }
 
-func (m *MeerPool) checkMeerChangeExportTx(tx *types.Transaction, ced *meerchange.MeerchangeExportData, utxoView *utxo.UtxoViewpoint) error {
+func (m *MeerPool) CheckMeerChangeExportTx(tx *types.Transaction, ced *meerchange.MeerchangeExportData, utxoView *utxo.UtxoViewpoint) error {
 	ops, err := ced.GetOutPoints()
 	if err != nil {
 		return err

diff --git a/p2p/api.go b/p2p/api.go
@@ -75,6 +75,7 @@ func (api *PublicP2PAPI) GetPeerInfo(verbose *bool, pid *string) (interface{}, e
 			ReConnect: p.ReConnect,
 			Active:    active,
 			Snap:      p.IsSnap(),
+			SnapSync:  p.SnapSync,
 		}
 		info.Protocol = p.Protocol
 		info.Services = p.Services.String()

diff --git a/p2p/peers/peer.go b/p2p/peers/peer.go
@@ -383,6 +383,9 @@ func (p *Peer) StatsSnapshot() (*StatsSnap, error) {
 	if p.getMeerState() != nil {
 		ss.MeerState = common.NewMeerState(p.getMeerState())
 	}
+	if p.chainState != nil {
+		ss.SnapSync = p.chainState.SnapSync
+	}
 	return ss, nil
 }
 
@@ -776,6 +779,16 @@ func (p *Peer) GetMeerState() *v2.MeerState {
 	return p.getMeerState()
 }
 
+func (p *Peer) IsSnapSync() bool {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+
+	if p.chainState == nil {
+		return false
+	}
+	return p.chainState.SnapSync
+}
+
 func (p *Peer) getMeerState() *v2.MeerState {
 	if p.chainState == nil {
 		return nil

diff --git a/p2p/peers/statssnap.go b/p2p/peers/statssnap.go
@@ -41,6 +41,7 @@ type StatsSnap struct {
 	Tasks          int
 	Broadcast      int
 	MeerState      *common.MeerState
+	SnapSync       bool
 }
 
 func (p *StatsSnap) IsRelay() bool {

diff --git a/p2p/proto/v1/messages.ssz.go b/p2p/proto/v1/messages.ssz.go
diff --git a/p2p/proto/v2/chainstate.pb.go b/p2p/proto/v2/chainstate.pb.go
diff --git a/p2p/proto/v2/chainstate.proto b/p2p/proto/v2/chainstate.proto
@@ -16,4 +16,5 @@ message ChainState {
   v1.GraphState graphState = 6;
   bytes  userAgent = 7 [(gogoproto.moretags) = "ssz-max:\"256\""];
   MeerState meerState =8;
+  bool snapSync = 9;
 }
diff --git a/p2p/proto/v2/messages.ssz.go b/p2p/proto/v2/messages.ssz.go
diff --git a/p2p/synch/chainstate_v2.go b/p2p/synch/chainstate_v2.go
@@ -131,6 +131,7 @@ func (s *Sync) getChainStateV2() *v2.ChainState {
 		UserAgent:       []byte(s.p2p.Config().UserAgent),
 		DisableRelayTx:  s.p2p.Config().DisableRelayTx,
 		MeerState:       s.getMeerState(),
+		SnapSync:        s.peerSync.IsSnapSync(),
 	}
 
 	return cs

diff --git a/p2p/synch/getblockdatas.go b/p2p/synch/getblockdatas.go
@@ -111,7 +111,7 @@ func (s *Sync) getMerkleBlockDataHandler(ctx context.Context, msg interface{}, s
 }
 
 func (ps *PeerSync) processGetBlockDatas(pe *peers.Peer, blocks []*hash.Hash) *ProcessResult {
-	if !ps.isSyncPeer(pe) || !pe.IsConnected() {
+	if !ps.isSyncPeer(pe) || !pe.IsConnected() || pe.IsSnapSync() {
 		err := fmt.Errorf("no sync peer:%v", pe.GetID())
 		log.Trace(err.Error(), "processID", ps.getProcessID())
 		return nil

diff --git a/p2p/synch/handshake.go b/p2p/synch/handshake.go
@@ -70,7 +70,6 @@ func (ps *PeerSync) processConnected(msg *ConnectedMsg) {
 func (ps *PeerSync) immediatelyConnected(pe *peers.Peer) {
 	pe.HSlock.Lock()
 	defer pe.HSlock.Unlock()
-
 	ps.Connection(pe)
 }
 

diff --git a/p2p/synch/meerevm.go b/p2p/synch/meerevm.go
@@ -25,12 +25,12 @@ func (ps *PeerSync) connectMeerEVM(pe *peers.Peer) {
 		if err != nil {
 			log.Error("invalid enode: %v", err)
 		}
-		meerP2P.AddTrustedPeer(node)
+		meerP2P.AddPeer(node)
 	} else if len(meers.ENR) > 0 {
 		node, err := enode.Parse(enode.ValidSchemes, meers.ENR)
 		if err != nil {
 			log.Error("invalid enr: %v", err)
 		}
-		meerP2P.AddTrustedPeer(node)
+		meerP2P.AddPeer(node)
 	}
 }