From 7d54484c89e71963533ee50ee06b24f18424bb6c Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Wed, 28 Feb 2024 21:53:36 -0500
Subject: [PATCH] cont

---
 src/system/modules/bitcoin/default.nix        | 24 ++++++++++++++++++-
 .../modules/core-lightning/default.nix        |  2 +-
 .../modules/c-lightning-REST/default.nix      |  0
 .../core-lightning/modules/default.nix        |  5 ++++
 .../bitcoin/modules/electrs/default.nix       | 19 +++++++++++----
 src/system/modules/default.nix                |  1 -
 6 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix

diff --git a/src/system/modules/bitcoin/default.nix b/src/system/modules/bitcoin/default.nix
index 59852fe..b62372a 100644
--- a/src/system/modules/bitcoin/default.nix
+++ b/src/system/modules/bitcoin/default.nix
@@ -38,7 +38,29 @@ in
         testnet = false;
         user = "bitcoind";
         group = "bitcoin";
-        #extraConfig = TODO;
+        configFile = /var/lib/bitcoind/bitcoin.conf;
+
+        rpc = {
+          "btcd" = {
+            #passwordHMAC = #CHECK IF THIS IS SAFE TO EXPOSE!!;
+          };
+          port = 8332;
+        };
+
+        extraConfig = ''
+          server=1
+          mempoolfullrbf=1
+          v2transport=1
+
+          rpcbind=127.0.0.1
+          rpcallowip=127.0.0.1
+
+          proxy=127.0.0.1:9050
+          listen=1
+          listenonion=1
+          torcontrol=127.0.0.1:9051
+          torenablecircuit=1
+        '';
       };
     };
   };
diff --git a/src/system/modules/bitcoin/modules/core-lightning/default.nix b/src/system/modules/bitcoin/modules/core-lightning/default.nix
index 912e8cb..c851f6f 100644
--- a/src/system/modules/bitcoin/modules/core-lightning/default.nix
+++ b/src/system/modules/bitcoin/modules/core-lightning/default.nix
@@ -47,7 +47,7 @@ in
 
         PrivateTmp = true;
         ProtectSystem = "full";
-        NoNetPrivileges = true;
+        NoNewPrivileges = true;
         PrivateDevies = true;
       };
       Install = {
diff --git a/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix b/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix b/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix
index e69de29..2b2fd49 100644
--- a/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix
+++ b/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./c-lightning-REST
+  ];
+}
diff --git a/src/system/modules/bitcoin/modules/electrs/default.nix b/src/system/modules/bitcoin/modules/electrs/default.nix
index a082b48..9c988e4 100644
--- a/src/system/modules/bitcoin/modules/electrs/default.nix
+++ b/src/system/modules/bitcoin/modules/electrs/default.nix
@@ -21,14 +21,25 @@ in
 
     systemd.services.electrs = {
       Unit = {
-        after = [ "network.target" "bitcoind.service" ];
-        wantedBy = [ "multi-user.target" ];
+        Description = "Electrs Bitcoin Indexer";
+        After = [ "network.target" "bitcoind.service" ];
+        Requires = [ "bitcoind.service" ];
       };
       Service = {
-        ExecStart = "${pkgs.electrs}/bin/electrs --conf=...";
-        Restart = "always";
+        ExecStartPre = "/usr/bin/sleep 10";
+        ExecStart = "${pkgs.electrs}/bin/electrs";
+
         User = "electrs";
         Group = "bitcoin";
+        Type = "simple";
+
+        KillMode = "process";
+        TimeoutSec = "60";
+        Restart = "always";
+        RestartSec = "60";
+      };
+      Install = {
+        WantedBy = [ "multi-user.target" ];
       };
     };
   };
diff --git a/src/system/modules/default.nix b/src/system/modules/default.nix
index 7af4fab..7e1d613 100644
--- a/src/system/modules/default.nix
+++ b/src/system/modules/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
     ./bitcoin
-    ./security
   ];
 }