From b6b84359ce5664bf454f2880911332f9271f8dfb Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Wed, 27 Sep 2023 08:37:29 -0400
Subject: [PATCH 1/2] fix: use https for cloning submodules instead of ssh

This simplifies the checkout process for github actions
---
 .gitmodules                                      | 2 +-
 waku/v2/protocol/rln/contracts/waku-rln-contract | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 45cc4f786..2d41b2cea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "waku/v2/protocol/rln/contracts/waku-rln-contract"]
 	path = waku/v2/protocol/rln/contracts/waku-rln-contract
-	url = git@github.com:waku-org/waku-rln-contract.git
+	url = https://github.com/waku-org/waku-rln-contract.git
diff --git a/waku/v2/protocol/rln/contracts/waku-rln-contract b/waku/v2/protocol/rln/contracts/waku-rln-contract
index 8f8dda5b7..e5eefe489 160000
--- a/waku/v2/protocol/rln/contracts/waku-rln-contract
+++ b/waku/v2/protocol/rln/contracts/waku-rln-contract
@@ -1 +1 @@
-Subproject commit 8f8dda5b7133aa8f99cbc46804972d02c22c0155
+Subproject commit e5eefe4891283cfac848cbba280ff8bbe32e1301

From 2fa8883c395ffff0e12147761f4a6a460e74248e Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Wed, 27 Sep 2023 10:11:12 -0400
Subject: [PATCH 2/2] chore: move to libs/

---
 .gitmodules                                        |  4 ++--
 .../rln/contracts => libs}/waku-rln-contract       |  0
 waku/v2/protocol/rln/contracts/import.json         | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename {waku/v2/protocol/rln/contracts => libs}/waku-rln-contract (100%)

diff --git a/.gitmodules b/.gitmodules
index 2d41b2cea..94f2ed1fe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "waku/v2/protocol/rln/contracts/waku-rln-contract"]
-	path = waku/v2/protocol/rln/contracts/waku-rln-contract
+[submodule "libs/waku-rln-contract"]
+	path = libs/waku-rln-contract
 	url = https://github.com/waku-org/waku-rln-contract.git
diff --git a/waku/v2/protocol/rln/contracts/waku-rln-contract b/libs/waku-rln-contract
similarity index 100%
rename from waku/v2/protocol/rln/contracts/waku-rln-contract
rename to libs/waku-rln-contract
diff --git a/waku/v2/protocol/rln/contracts/import.json b/waku/v2/protocol/rln/contracts/import.json
index 39559564d..f02e2e174 100644
--- a/waku/v2/protocol/rln/contracts/import.json
+++ b/waku/v2/protocol/rln/contracts/import.json
@@ -2,27 +2,27 @@
   "language": "Solidity",
   "sources": {
     "WakuRln.sol": {
-      "urls": ["./waku-rln-contract/contracts/WakuRln.sol"]
+      "urls": ["../../../../../libs/waku-rln-contract/contracts/WakuRln.sol"]
     },
     "WakuRlnRegistry.sol": {
-      "urls": ["./waku-rln-contract/contracts/WakuRlnRegistry.sol"]
+      "urls": ["../../../../../libs/waku-rln-contract/contracts/WakuRlnRegistry.sol"]
     },
     "rln-contract/PoseidonHasher.sol": {
       "urls": [
-        "./waku-rln-contract/lib/rln-contract/contracts/PoseidonHasher.sol"
+        "../../../../../libs/waku-rln-contract/lib/rln-contract/contracts/PoseidonHasher.sol"
       ]
     },
     "rln-contract/RlnBase.sol": {
-      "urls": ["./waku-rln-contract/lib/rln-contract/contracts/RlnBase.sol"]
+      "urls": ["../../../../../libs/waku-rln-contract/lib/rln-contract/contracts/RlnBase.sol"]
     },
     "rln-contract/IVerifier.sol": {
-        "urls": ["./waku-rln-contract/lib/rln-contract/contracts/IVerifier.sol"]
+        "urls": ["../../../../../libs/waku-rln-contract/lib/rln-contract/contracts/IVerifier.sol"]
       },
     "openzeppelin-contracts/contracts/access/Ownable.sol": {
-        "urls": ["./waku-rln-contract/lib/openzeppelin-contracts/contracts/access/Ownable.sol"]
+        "urls": ["../../../../../libs/waku-rln-contract/lib/openzeppelin-contracts/contracts/access/Ownable.sol"]
       },
       "openzeppelin-contracts/contracts/utils/Context.sol": {
-        "urls": ["./waku-rln-contract/lib/openzeppelin-contracts/contracts/utils/Context.sol"]
+        "urls": ["../../../../../libs/waku-rln-contract/lib/openzeppelin-contracts/contracts/utils/Context.sol"]
       }
   },
   "settings": {