Node: don't protect from self (#3318)

wormhole-foundation · Aug 23, 2023 · 753185e · 753185e
1 parent e4fc447
commit 753185e
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/node/pkg/p2p/p2p.go b/node/pkg/p2p/p2p.go
@@ -566,21 +566,23 @@ func Run(
 									zap.String("from", envelope.GetFrom().String()))
 							} else {
 								guardianAddr := eth_common.BytesToAddress(s.GuardianAddr)
-								prevPeerId, ok := components.ProtectedHostByGuardianKey[guardianAddr]
-								if ok {
-									if prevPeerId != peerId {
-										logger.Info("p2p_guardian_peer_changed",
-											zap.String("guardian_addr", guardianAddr.String()),
-											zap.String("prevPeerId", prevPeerId.String()),
-											zap.String("newPeerId", peerId.String()),
-										)
-										components.ConnMgr.Unprotect(prevPeerId, "heartbeat")
+								if guardianAddr != ethcrypto.PubkeyToAddress(gk.PublicKey) {
+									prevPeerId, ok := components.ProtectedHostByGuardianKey[guardianAddr]
+									if ok {
+										if prevPeerId != peerId {
+											logger.Info("p2p_guardian_peer_changed",
+												zap.String("guardian_addr", guardianAddr.String()),
+												zap.String("prevPeerId", prevPeerId.String()),
+												zap.String("newPeerId", peerId.String()),
+											)
+											components.ConnMgr.Unprotect(prevPeerId, "heartbeat")
+											components.ConnMgr.Protect(peerId, "heartbeat")
+											components.ProtectedHostByGuardianKey[guardianAddr] = peerId
+										}
+									} else {
 										components.ConnMgr.Protect(peerId, "heartbeat")
 										components.ProtectedHostByGuardianKey[guardianAddr] = peerId
 									}
-								} else {
-									components.ConnMgr.Protect(peerId, "heartbeat")
-									components.ProtectedHostByGuardianKey[guardianAddr] = peerId
 								}
 							}
 						} else {