chore_: set store peer id when mailserver updates

status-im · Jun 7, 2024 · 969890d · 969890d
1 parent 61b0b3a
commit 969890d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 0 deletions.
diff --git a/eth-node/bridge/geth/waku.go b/eth-node/bridge/geth/waku.go
@@ -317,3 +317,6 @@ func (w *wakuFilterWrapper) ID() string {
 
 func (w *GethWakuWrapper) ConfirmMessageDelivered(hashes []common.Hash) {
 }
+
+func (w *GethWakuWrapper) SetStorePeerID(peerID peer.ID) {
+}
diff --git a/eth-node/bridge/geth/wakuv2.go b/eth-node/bridge/geth/wakuv2.go
@@ -337,3 +337,7 @@ func (w *wakuV2FilterWrapper) ID() string {
 func (w *gethWakuV2Wrapper) ConfirmMessageDelivered(hashes []common.Hash) {
 	w.waku.ConfirmMessageDelivered(hashes)
 }
+
+func (w *gethWakuV2Wrapper) SetStorePeerID(peerID peer.ID) {
+	w.waku.SetStorePeerID(peerID)
+}
diff --git a/eth-node/types/waku.go b/eth-node/types/waku.go
@@ -181,4 +181,7 @@ type Waku interface {
 
 	// ConfirmMessageDelivered updates a message has been delivered in waku
 	ConfirmMessageDelivered(hash []common.Hash)
+
+	// SetStorePeerID updates the peer id of store node
+	SetStorePeerID(peerID peer.ID)
 }
diff --git a/protocol/messenger_mailserver_cycle.go b/protocol/messenger_mailserver_cycle.go
@@ -426,6 +426,11 @@ func (m *Messenger) connectToMailserver(ms mailservers.Mailserver) error {
 			m.logger.Info("mailserver available", zap.String("address", m.mailserverCycle.activeMailserver.UniqueID()))
 			m.EmitMailserverAvailable()
 			signal.SendMailserverAvailable(m.mailserverCycle.activeMailserver.Address, m.mailserverCycle.activeMailserver.ID)
+			peerID, err := m.mailserverCycle.activeMailserver.PeerID()
+			if err != nil {
+				m.logger.Error("could not decode the peer id of mailserver", zap.Error(err))
+			}
+			m.transport.SetStorePeerID(peerID)
 
 			// Query mailserver
 			if m.config.codeControlFlags.AutoRequestHistoricMessages {

diff --git a/protocol/transport/transport.go b/protocol/transport/transport.go
@@ -732,3 +732,7 @@ func (t *Transport) ConfirmMessageDelivered(messageID string) {
 	}
 	t.waku.ConfirmMessageDelivered(commHashes)
 }
+
+func (t *Transport) SetStorePeerID(peerID peer.ID) {
+	t.waku.SetStorePeerID(peerID)
+}
diff --git a/wakuv2/waku.go b/wakuv2/waku.go
@@ -1057,6 +1057,10 @@ func (w *Waku) ConfirmMessageDelivered(hashes []gethcommon.Hash) {
 	}
 }
 
+func (w *Waku) SetStorePeerID(peerID peer.ID) {
+	w.storePeerID = peerID
+}
+
 type publishFn = func(envelope *protocol.Envelope, logger *zap.Logger) error
 
 func (w *Waku) publishEnvelope(envelope *protocol.Envelope, publishFn publishFn, logger *zap.Logger) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -317,3 +317,6 @@ func (w *wakuFilterWrapper) ID() string { @@
     func (w *GethWakuWrapper) ConfirmMessageDelivered(hashes []common.Hash) {
     }
+    func (w *GethWakuWrapper) SetStorePeerID(peerID peer.ID) {
+    }