From 600530712945e6d01eb4e1ee5dd206f2d2ab26ee Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Mon, 11 Feb 2019 08:02:11 +0000
Subject: [PATCH] Enable validatepegin in liquid module

---
 modules/liquid.nix      | 3 +--
 modules/nix-bitcoin.nix | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/liquid.nix b/modules/liquid.nix
index 151c37e..7b7bd6b 100644
--- a/modules/liquid.nix
+++ b/modules/liquid.nix
@@ -26,8 +26,6 @@ let
 
     # Extra config options (from liquidd nixos service)
     ${cfg.extraConfig}
-
-    validatepegin=0
   '';
   cmdlineOptions = concatMapStringsSep " " (arg: "'${arg}'") [
     "-datadir=${cfg.dataDir}"
@@ -186,6 +184,7 @@ in {
         chmod o-rw  '${cfg.dataDir}/liquid.conf'
         chown '${cfg.user}:${cfg.group}' '${cfg.dataDir}/liquid.conf'
         echo "rpcpassword=$(cat /secrets/liquid-rpcpassword)" >> '${cfg.dataDir}/liquid.conf'
+        echo "mainchainrpcpassword=$(cat /secrets/bitcoin-rpcpassword)" >> '${cfg.dataDir}/liquid.conf'
       '';
       serviceConfig = {
         Type = "simple";
diff --git a/modules/nix-bitcoin.nix b/modules/nix-bitcoin.nix
index ea276a0..8740761 100644
--- a/modules/nix-bitcoin.nix
+++ b/modules/nix-bitcoin.nix
@@ -144,6 +144,10 @@ in {
     services.liquidd.enable = cfg.modules == "all";
     services.liquidd.rpcuser = "liquidrpc";
     services.liquidd.prune = 1000;
+    services.liquidd.extraConfig = "
+      mainchainrpcuser=${config.services.bitcoind.rpcuser}
+      mainchainrpcport=8332
+    ";
 
     services.lightning-charge.enable = cfg.modules == "all";
     services.nanopos.enable = cfg.modules == "all";