From 67ee374c2e3e1fed476e3860b623ea98a0dfa4c1 Mon Sep 17 00:00:00 2001
From: fryorcraken <commits@fryorcraken.xyz>
Date: Sat, 12 Apr 2025 10:46:45 +1000
Subject: [PATCH] fix chat2 compilation

---
 apps/chat2/chat2.nim              | 21 +++++++++++++--------
 apps/chat2/config_chat2.nim       | 13 +++++++++++++
 waku/waku_rln_relay/rln_relay.nim |  2 +-
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
index 3723291e3..b09afff44 100644
--- a/apps/chat2/chat2.nim
+++ b/apps/chat2/chat2.nim
@@ -553,14 +553,19 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
       echo "rln-relay preparation is in progress..."
 
       let rlnConf = WakuRlnConfig(
-        rlnRelayDynamic: conf.rlnRelayDynamic,
-        rlnRelayCredIndex: conf.rlnRelayCredIndex,
-        rlnRelayEthContractAddress: conf.rlnRelayEthContractAddress,
-        rlnRelayEthClientAddress: string(conf.rlnRelayethClientAddress),
-        rlnRelayCredPath: conf.rlnRelayCredPath,
-        rlnRelayCredPassword: conf.rlnRelayCredPassword,
-        rlnRelayUserMessageLimit: conf.rlnRelayUserMessageLimit,
-        rlnEpochSizeSec: conf.rlnEpochSizeSec,
+        dynamic: conf.rlnRelayDynamic,
+        credIndex: conf.rlnRelayCredIndex,
+        chainId: conf.rlnRelayChainId,
+        ethContractAddress: conf.rlnRelayEthContractAddress,
+        ethClientAddress: string(conf.rlnRelayethClientAddress),
+        creds: some(
+          RlnRelayCreds(
+            path: conf.rlnRelayCredPath, password: conf.rlnRelayCredPassword
+          )
+        ),
+        userMessageLimit: conf.rlnRelayUserMessageLimit,
+        epochSizeSec: conf.rlnEpochSizeSec,
+        treePath: conf.rlnRelayTreePath,
       )
 
       waitFor node.mountRlnRelay(rlnConf, spamHandler = some(spamHandler))
diff --git a/apps/chat2/config_chat2.nim b/apps/chat2/config_chat2.nim
index 4bdc0d586..830222cd9 100644
--- a/apps/chat2/config_chat2.nim
+++ b/apps/chat2/config_chat2.nim
@@ -213,6 +213,13 @@ type
       name: "rln-relay"
     .}: bool
 
+    rlnRelayChainId* {.
+      desc:
+        "Chain ID of the provided contract (optional, will fetch from RPC provider if not used)",
+      defaultValue: 0,
+      name: "rln-relay-chain-id"
+    .}: uint
+
     rlnRelayCredPath* {.
       desc: "The path for peristing rln-relay credential",
       defaultValue: "",
@@ -273,6 +280,12 @@ type
       name: "rln-relay-epoch-sec"
     .}: uint64
 
+    rlnRelayTreePath* {.
+      desc: "Path to the RLN merkle tree sled db (https://github.com/spacejam/sled)",
+      defaultValue: "",
+      name: "rln-relay-tree-path"
+    .}: string
+
 # NOTE: Keys are different in nim-libp2p
 proc parseCmdArg*(T: type crypto.PrivateKey, p: string): T =
   try:
diff --git a/waku/waku_rln_relay/rln_relay.nim b/waku/waku_rln_relay/rln_relay.nim
index 4eb91e364..a41b1e249 100644
--- a/waku/waku_rln_relay/rln_relay.nim
+++ b/waku/waku_rln_relay/rln_relay.nim
@@ -47,7 +47,7 @@ type RlnRelayConf* {.requiresInit.} = object of RootObj
   epochSizeSec*: uint64
   userMessageLimit*: uint64
 
-type WakuRlnConfig* {.requiresInit.} = object of RlnRelayConf
+type WakuRlnConfig* = object of RlnRelayConf
   onFatalErrorAction*: OnFatalErrorHandler
 
 proc createMembershipList*(