From 9b5922bc74acb8d2710640504170ea4b388b3935 Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Fri, 21 Oct 2022 15:32:51 -0400
Subject: [PATCH] fix(rln): keep track of last loaded index

---
 waku/v2/protocol/rln/waku_rln_relay.go |  5 +++--
 waku/v2/protocol/rln/web3.go           | 13 ++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/waku/v2/protocol/rln/waku_rln_relay.go b/waku/v2/protocol/rln/waku_rln_relay.go
index 58fda8ab..029a87ca 100644
--- a/waku/v2/protocol/rln/waku_rln_relay.go
+++ b/waku/v2/protocol/rln/waku_rln_relay.go
@@ -51,8 +51,9 @@ type WakuRLNRelay struct {
 
 	RLN *r.RLN
 	// pubsubTopic is the topic for which rln relay is mounted
-	pubsubTopic  string
-	contentTopic string
+	pubsubTopic     string
+	contentTopic    string
+	lastIndexLoaded r.MembershipIndex
 
 	validMerkleRoots []r.MerkleNode
 
diff --git a/waku/v2/protocol/rln/web3.go b/waku/v2/protocol/rln/web3.go
index 5ea35ca7..9426ea9e 100644
--- a/waku/v2/protocol/rln/web3.go
+++ b/waku/v2/protocol/rln/web3.go
@@ -107,7 +107,7 @@ func (rln *WakuRLNRelay) Register(ctx context.Context) (*r.MembershipIndex, erro
 // the types of inputs to this handler matches the MemberRegistered event/proc defined in the MembershipContract interface
 type RegistrationEventHandler = func(pubkey r.IDCommitment, index r.MembershipIndex) error
 
-func processLogs(evt *contracts.RLNMemberRegistered, handler RegistrationEventHandler) error {
+func (rln *WakuRLNRelay) processLogs(evt *contracts.RLNMemberRegistered, handler RegistrationEventHandler) error {
 	if evt == nil {
 		return nil
 	}
@@ -115,7 +115,11 @@ func processLogs(evt *contracts.RLNMemberRegistered, handler RegistrationEventHa
 	var pubkey r.IDCommitment = r.Bytes32(evt.Pubkey.Bytes())
 
 	index := r.MembershipIndex(uint(evt.Index.Int64()))
+	if index <= rln.lastIndexLoaded {
+		return nil
+	}
 
+	rln.lastIndexLoaded = index
 	return handler(pubkey, index)
 }
 
@@ -171,7 +175,7 @@ func (rln *WakuRLNRelay) loadOldEvents(rlnContract *contracts.RLN, handler Regis
 			return logIterator.Error()
 		}
 
-		err = processLogs(logIterator.Event, handler)
+		err = rln.processLogs(logIterator.Event, handler)
 		if err != nil {
 			return err
 		}
@@ -192,6 +196,9 @@ func (rln *WakuRLNRelay) watchNewEvents(rlnContract *contracts.RLN, handler Regi
 			errCh <- err
 			subs.Unsubscribe()
 		}
+
+		rln.log.Error("subscribing to rln events", zap.Error(err))
+
 		return subs, err
 	})
 	defer subs.Unsubscribe()
@@ -201,7 +208,7 @@ func (rln *WakuRLNRelay) watchNewEvents(rlnContract *contracts.RLN, handler Regi
 	for {
 		select {
 		case evt := <-logSink:
-			err := processLogs(evt, handler)
+			err := rln.processLogs(evt, handler)
 			if err != nil {
 				rln.log.Error("processing rln log", zap.Error(err))
 			}