Merge pull request #909 from lochjin/dev2.0

fix:Unable to transmit evm-tx in non-SnapSync mode

Author: dindinw

p2p/synch/meerevm.go

@@ -32,9 +32,6 @@ func (ps *PeerSync) checkMeerConnection(pe *peers.Peer) bool {
 	if !pe.IsSupportMeerP2PBridging() {
 		return false
 	}
-	if !pe.IsSnap() {
-		return false
-	}
 	if pe.Direction() != network.DirOutbound {
 		return false
 	}

p2p/synch/mempool.go

@@ -60,7 +60,7 @@ func (ps *PeerSync) OnMemPool(sp *peers.Peer, msg *MsgMemPool) error {
 	// per message.  The NewMsgInvSizeHint function automatically limits
 	// the passed hint to the maximum allowed, so it's safe to pass it
 	// without double checking it here.
-	txDescs := ps.sy.p2p.TxMemPool().TxDescs(ps.sy.p2p.Consensus().Config().TranferTxLegacyMode && !sp.IsSupportMeerpoolTransmission())
+	txDescs := ps.sy.p2p.TxMemPool().TxDescs(!sp.IsSupportMeerpoolTransmission())
 
 	invs := []*pb.InvVect{}
 	for _, txDesc := range txDescs {

p2p/synch/peersync.go

@@ -491,8 +491,7 @@ func (ps *PeerSync) RelayInventory(nds []*notify.NotifyData) {
 			switch value := nd.Data.(type) {
 			case *types.TxDesc:
 				if types.IsCrossChainVMTx(value.Tx.Tx) {
-					if !ps.sy.p2p.Consensus().Config().TranferTxLegacyMode ||
-						pe.IsSupportMeerpoolTransmission() {
+					if pe.IsSupportMeerpoolTransmission() {
 						continue
 					}
 				}