Merge #812: Update nixpkgs

bba75b0 support running joinmarket with bitcoind 29 (Erik Arvstedt)
1c786d6 update nixpkgs (Erik Arvstedt)
3a13b5f ci/test-info.nix: read scenarios from github workflow file (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK bba75b0

Tree-SHA512: 420be622af97a7879eb4f8b0705726185994398ad89b8483eef1821b7a586b70da6200f8a562b434ca5d87fff56be39f56b606e107e5dff49278dd8b0524f52d

Author: jonasnick

.github/workflows/test.yml

@@ -31,7 +31,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        scenario: [default, netns, netnsRegtest]
+        scenario:
+          - default
+          - netns
+          - netnsRegtest
+          - joinmarket-bitcoind-29
     needs: build_test_drivers
     if: needs.build_test_drivers.outputs.run_scenario_tests == 'true'
     steps:

flake.lock

@@ -251,6 +251,19 @@ in {
   }
 
   (mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = lib.versionOlder bitcoind.package.version "30";
+        message = ''
+          Joinmarket is not compatible with bitcoind >= 30.
+          (https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1775)
+
+          To fix this, add the following to your config:
+          services.bitcoind.package = config.nix-bitcoin.pkgs.bitcoind_29;
+        '';
+      }
+    ];
+
     services.bitcoind = {
       enable = true;
       disablewallet = false;

modules/joinmarket.nix

@@ -341,7 +341,7 @@ in {
     services.nbxplorer.address = netns.nbxplorer.address;
     services.btcpayserver.address = netns.btcpayserver.address;
 
-    services.joinmarket = {
+    services.joinmarket = mkIf config.services.joinmarket.enable {
       payjoinAddress = netns.joinmarket.address;
       messagingAddress = netns.joinmarket.address;
       cliExec = mkCliExec "joinmarket";

modules/netns-isolation.nix

@@ -25,6 +25,8 @@ let self = {
     mempool-nginx-conf;
   trustedcoin = pkgs.callPackage ./trustedcoin { };
 
+  bitcoind_29 = pkgs.bitcoind;
+
   pyPkgs = import ./python-packages self pkgs.python3;
   inherit (self.pyPkgs)
     nbPython3Packages

pkgs/default.nix

@@ -2,7 +2,6 @@
 pkgs: pkgsUnstable:
 {
   inherit (pkgs)
-    clboss
     elementsd
     extra-container
     fulcrum
@@ -16,6 +15,7 @@ pkgs: pkgsUnstable:
     bitcoind-knots
     btcpayserver
     charge-lnd
+    clboss
     clightning
     electrs
     lightning-loop

pkgs/pinned.nix

@@ -1,12 +1,19 @@
 pkgs: instantiateTests:
 
 let
+  scenarioNames = let
+    inherit (pkgs) lib;
+    workflowSrc = builtins.readFile ../../.github/workflows/test.yml;
+    matches = builtins.match ".*scenario:(([ \n]+-[ ]+[^ \n]+)+).*" workflowSrc;
+    scenariosStr = builtins.head matches;
+    particles = builtins.split "[ \n]+-[ ]+" scenariosStr;
+    # The first split particle is always an empty str
+    particles' = builtins.tail particles;
+  in
+    builtins.filter lib.isString particles';
+
   # `instantiateTests` prints the test name before evaluating, which is useful for debugging
-  ciTests = instantiateTests [
-    "default"
-    "netns"
-    "netnsRegtest"
-  ];
+  ciTests = instantiateTests scenarioNames;
   drivers = map (x: x.driver) ciTests;
   driverDrvs = map (x: ''"${x.drvPath}^*"'') drivers;
 in ''

test/ci/test-info.nix

@@ -302,6 +302,7 @@ buildable=(
     lndPruned
     wireguard-lndconnect
     trustedcoin
+    joinmarket-bitcoind-29
 )
 buildable() { buildTests buildable "$@"; }
 

test/nixos-search/flake.lock

@@ -213,7 +213,6 @@ let
       services.fulcrum.enable = true;
       services.liquidd.enable = true;
       services.btcpayserver.enable = true;
-      services.joinmarket.enable = true;
       services.joinmarket-ob-watcher.enable = true;
       services.backups.enable = true;
 
@@ -261,7 +260,6 @@ let
       services.electrs.enable = true;
       services.fulcrum.enable = true;
       services.btcpayserver.enable = true;
-      services.joinmarket.enable = true;
     };
 
     # netns and regtest, without secure-node.nix
@@ -342,6 +340,14 @@ let
         plugins.trustedcoin.enable = true;
       };
     };
+
+    # The full regtest test with bitcoind 29 and joinmarket enabled.
+    # Joinmarket only supports bitcoind 29.
+    joinmarket-bitcoind-29 = { config, ... }: {
+      imports = [ scenarios.regtest ];
+      services.joinmarket.enable = true;
+      services.bitcoind.package = config.nix-bitcoin.pkgs.bitcoind_29;
+    };
   } // (import ../dev/dev-scenarios.nix {
     inherit lib scenarios;
   });