From ddb08adbbd56e3e4fd6b2bf29c7789a690144f91 Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Thu, 24 Aug 2023 10:25:17 -0400
Subject: [PATCH] chore: set limit to 5000 to not choke eth1 node and start rln
 before relay

---
 waku/v2/node/wakunode2.go                          | 14 +++++++-------
 waku/v2/node/wakunode2_rln.go                      |  4 ++++
 waku/v2/protocol/rln/group_manager/dynamic/web3.go |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/waku/v2/node/wakunode2.go b/waku/v2/node/wakunode2.go
index 349159fd..5297e28c 100644
--- a/waku/v2/node/wakunode2.go
+++ b/waku/v2/node/wakunode2.go
@@ -413,6 +413,13 @@ func (w *WakuNode) Start(ctx context.Context) error {
 		}
 	}
 
+	if w.opts.enableRLN {
+		err = w.startRlnRelay(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
 	w.relay.SetHost(host)
 
 	if w.opts.enableRelay {
@@ -492,13 +499,6 @@ func (w *WakuNode) Start(ctx context.Context) error {
 		}
 	}
 
-	if w.opts.enableRLN {
-		err = w.startRlnRelay(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
 	return nil
 }
 
diff --git a/waku/v2/node/wakunode2_rln.go b/waku/v2/node/wakunode2_rln.go
index 0b964e9f..33a28792 100644
--- a/waku/v2/node/wakunode2_rln.go
+++ b/waku/v2/node/wakunode2_rln.go
@@ -24,6 +24,10 @@ func (w *WakuNode) setupRLNRelay() error {
 	var err error
 	var groupManager rln.GroupManager
 
+	if !w.opts.enableRLN {
+		return nil
+	}
+
 	if !w.opts.rlnRelayDynamic {
 		w.log.Info("setting up waku-rln-relay in off-chain mode")
 
diff --git a/waku/v2/protocol/rln/group_manager/dynamic/web3.go b/waku/v2/protocol/rln/group_manager/dynamic/web3.go
index 2c44b435..4e8509f0 100644
--- a/waku/v2/protocol/rln/group_manager/dynamic/web3.go
+++ b/waku/v2/protocol/rln/group_manager/dynamic/web3.go
@@ -107,7 +107,7 @@ func (gm *DynamicGroupManager) watchNewEvents(ctx context.Context, rlnContract *
 	}
 }
 
-const maxBatchSize = uint64(5000000) // TODO: tune this
+const maxBatchSize = uint64(5000)
 const additiveFactorMultiplier = 0.10
 const multiplicativeDecreaseDivisor = 2