From 52b175772f2ae604cee99ac4c299be11d6455319 Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Wed, 18 Oct 2023 16:24:26 -0300
Subject: [PATCH] Bring oxen-encoding back in as a submodule

As long as it's loaded before oxen-mq or libquic, this should end up
being the one that gets used in oxen-mq/libquic, and so we don't have to
update those when we want something in a newer oxen-encoding.
---
 .gitmodules             | 3 +++
 external/CMakeLists.txt | 3 +++
 external/oxen-encoding  | 1 +
 3 files changed, 7 insertions(+)
 create mode 160000 external/oxen-encoding

diff --git a/.gitmodules b/.gitmodules
index 73f0a7935..60d221105 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,3 +35,6 @@
 [submodule "external/span-lite"]
 	path = external/span-lite
 	url = https://github.com/martinmoene/span-lite.git
+[submodule "external/oxen-encoding"]
+	path = external/oxen-encoding
+	url = https://github.com/oxen-io/oxen-encoding.git
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 2b09d0ee5..f901be4c3 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -26,7 +26,9 @@ if(SUBMODULE_CHECK)
     message(STATUS "Checking submodules")
     check_submodule(CLI11)
     check_submodule(cpr)
+    check_submodule(ghc-filesystem)
     check_submodule(nlohmann)
+    check_submodule(oxen-encoding)
     check_submodule(oxen-libquic)
     check_submodule(oxen-mq)
     check_submodule(pybind11)
@@ -58,6 +60,7 @@ macro(system_or_submodule BIGNAME smallname pkgconf subdir)
   endif()
 endmacro()
 
+system_or_submodule(OXENC oxenc liboxenc>=1.0.10 oxen-encoding)
 system_or_submodule(OXENMQ oxenmq liboxenmq>=1.2.14 oxen-mq)
 
 set(JSON_BuildTests OFF CACHE INTERNAL "")
diff --git a/external/oxen-encoding b/external/oxen-encoding
new file mode 160000
index 000000000..a7de63756
--- /dev/null
+++ b/external/oxen-encoding
@@ -0,0 +1 @@
+Subproject commit a7de63756dcc5c31cb899a4b810e6434b1a7c01c