chore: set limit to 5000 to not choke eth1 node and start rln before …

…relay
waku-org · Aug 24, 2023 · ddb08ad · ddb08ad
1 parent 624fe1b
commit ddb08ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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