Merge fort-nix/nix-bitcoin#418: update nixpkgs

b3e868d0af tests/regtest: disable incompatible `validatepegin` for liquidd (Erik Arvstedt)
c30fe1919b netns-isolation: don't auto-assign IPv6 addrs to peer links (Erik Arvstedt)
6584540828 makeShell: make help message extensible (Erik Arvstedt)
0478354477 versioning: move variable (Erik Arvstedt)
8616254d63 bitcoind-rpc-public-whitelist: remove waitfornewblock (Erik Arvstedt)
083e141e3e tests/btcpayserver: test bitcoind P2P connection in regtest (Erik Arvstedt)
82c92df162 tests/regtest: fix restarting bitcoind (Erik Arvstedt)
49086abcc5 liquidd: use systemd startup notification (Erik Arvstedt)
b83fd845c2 update nixpkgs (nixbitcoin)
852c112603 Use HTTPS URL for spark-wallet GitHub node packages (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK b3e868d0af
  jonasnick:
    utACK b3e868d0af

Tree-SHA512: 300410157a54f90f40abda064ed9b8f2310e3002bd2eac0527404d5402cd7d87c2d2d1d79d68cf1569841645c333b281d706607deae9461e1ef07f6c20427297

modules/bitcoind-rpc-public-whitelist.nix

@@ -25,7 +25,6 @@
   "gettxoutsetinfo"
   "scantxoutset"
   "verifytxoutproof"
-  "waitfornewblock"
   # Mining
   "getblocktemplate"
   "getmininginfo"

modules/btcpayserver.nix

@@ -159,10 +159,10 @@ in {
           lbtcnodeendpoint=${nbLib.addressWithPort liquidd.address liquidd.whitelistedPort}
         ''}
       '';
-    in {
+    in rec {
       wantedBy = [ "multi-user.target" ];
-      requires = [ "bitcoind.service" ];
-      after = [ "bitcoind.service" ];
+      requires = [ "bitcoind.service" ] ++ optional cfg.btcpayserver.lbtc "liquidd.service";
+      after = requires;
       preStart = ''
         install -m 600 ${configFile} '${cfg.nbxplorer.dataDir}/settings.config'
         {

modules/liquid.nix

@@ -168,6 +168,11 @@ let
   bitcoind = config.services.bitcoind;
 
   configFile = pkgs.writeText "elements.conf" ''
+    # We're already logging via journald
+    nodebuglogfile=1
+
+    startupnotify=/run/current-system/systemd/bin/systemd-notify --ready
+
     chain=${bitcoind.makeNetworkName "liquidv1" ''
       regtest
       [regtest]'' # Add [regtest] config section
@@ -229,6 +234,12 @@ in {
   inherit options;
 
   config = mkIf cfg.enable {
+    assertions = [
+      { assertion = bitcoind.regtest -> cfg.validatepegin != true;
+        message = "liquidd: `validatepegin` is incompatible with regtest.";
+      }
+    ];
+
     services.bitcoind.enable = true;
 
     environment.systemPackages = [
@@ -253,7 +264,8 @@ in {
         } >> '${cfg.dataDir}/elements.conf'
       '';
       serviceConfig = nbLib.defaultHardening // {
-        Type = "simple";
+        Type = "notify";
+        NotifyAccess = "all";
         User = cfg.user;
         Group = cfg.group;
         ExecStart = "${nbPkgs.elementsd}/bin/elementsd -datadir='${cfg.dataDir}'";

modules/netns-isolation.nix

@@ -173,6 +173,8 @@ in {
             ${ip} link add ${veth} type veth peer name ${peer}
             ${ip} link set ${veth} netns ${netnsName}
             ${ipNetns} addr add ${v.address}/24 dev ${veth}
+            # The peer link is never used directly, so don't auto-assign an IPv6 address
+            echo 1 > /proc/sys/net/ipv6/conf/${peer}/disable_ipv6
             ${ip} link set ${peer} up
             ${ipNetns} link set ${veth} up
             ${ip} link set ${peer} master nb-br

modules/versioning.nix

@@ -22,8 +22,6 @@ let
     };
   };
 
-  version = config.nix-bitcoin.configVersion;
-
   # Sorted by increasing version numbers
   changes = [
     {
@@ -197,6 +195,8 @@ let
       '';
   };
 
+  version = config.nix-bitcoin.configVersion;
+
   incompatibleChanges = optionals
     (version != null && versionOlder lastChange)
     (builtins.filter (change: versionOlder change && (change.condition or true)) changes);