Merge fort-nix/nix-bitcoin#478: Update nixpkgs

f234e59ca5 nbPython3Packages: fix clightning pkgs (Erik Arvstedt)
6bdf0ac3fb update nixpkgs{,-unstable} (Jonas Nick)
900836fe0d joinmarket: add private python package set (Erik Arvstedt)
ca834cce84 joinmarket: simplify pkgs (Erik Arvstedt)
43ee7668ab joinmarket: explicitly create no descriptor wallet (Jonas Nick)
408486ac9c tests: update nbxplorer (Erik Arvstedt)
aa21fb454e tests: disable `btcpayserver.lbtc` for regtest (Erik Arvstedt)
7de56b019f nbxplorer: use postgresql (Erik Arvstedt)
29d2ffc111 defaultHardening: allow `clone3` system call (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK f234e59ca5

Tree-SHA512: 1d3e76f096746eadb4596fb87dfd654cd3c85c88bb437eb5ed601ff8513e5272b6f1266bba64e5bfe9147ff2530ab3bc421c7c2659e793e6dbe12fdf4451310a

examples/configuration.nix

@@ -268,5 +268,5 @@
   # The nix-bitcoin release version that your config is compatible with.
   # When upgrading to a backwards-incompatible release, nix-bitcoin will display an
   # an error and provide hints for migrating your config to the new release.
-  nix-bitcoin.configVersion = "0.0.65";
+  nix-bitcoin.configVersion = "0.0.70";
 }

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1648297722,
+        "lastModified": 1649676176,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1648965846,
+        "lastModified": 1651571855,
-        "narHash": "sha256-xaO0KS+sgZLYrhaQNjVe6eRcOUIM1mEkAjT+dRbPblU=",
+        "narHash": "sha256-KZie6c2J2DUPLjG2PkYSwGLvD6RygA3TxZSPQpctbNI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0aac710801aec4ba545527cf41a5706028fe6271",
+        "rev": "fd43ce017d4c95f47166d28664a004f57458a0b1",
         "type": "github"
       },
       "original": {
@@ -33,11 +33,11 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1648219316,
+        "lastModified": 1651634615,
-        "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
+        "narHash": "sha256-VtvcS61bLh5mIBm9cV3idUHdlfPRFus/NwdJfaj5s8o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
+        "rev": "abfd31179174133ab8131139d650297bf4da63b7",
         "type": "github"
       },
       "original": {

modules/backups.nix

@@ -121,6 +121,8 @@ in {
         fi
       '';
 
-      services.backups.postgresqlDatabases = mkIf config.services.btcpayserver.enable [ "btcpaydb" ];
+      services.backups.postgresqlDatabases = mkIf config.services.btcpayserver.enable (
+        [ "btcpaydb" ] ++ optional cfg.with-bulk-data "nbxplorer"
+      );
     };
 }

modules/btcpayserver.nix

@@ -136,11 +136,17 @@ in {
     };
     services.postgresql = {
       enable = true;
-      ensureDatabases = [ "btcpaydb" ];
+      ensureDatabases = [ "btcpaydb" "nbxplorer" ];
-      ensureUsers = [{
+      ensureUsers = [
+        {
           name = cfg.btcpayserver.user;
           ensurePermissions."DATABASE btcpaydb" = "ALL PRIVILEGES";
-      }];
+        }
+        {
+          name = cfg.nbxplorer.user;
+          ensurePermissions."DATABASE nbxplorer" = "ALL PRIVILEGES";
+        }
+      ];
     };
 
     systemd.tmpfiles.rules = [
@@ -162,10 +168,12 @@ in {
           lbtcrpcurl=http://${nbLib.addressWithPort liquidd.rpc.address liquidd.rpc.port}
           lbtcnodeendpoint=${nbLib.addressWithPort liquidd.address liquidd.whitelistedPort}
         ''}
+        postgres=User ID=${cfg.nbxplorer.user};Host=/run/postgresql;Database=nbxplorer
+        automigrate=1
       '';
     in rec {
       wantedBy = [ "multi-user.target" ];
-      requires = [ "bitcoind.service" ] ++ optional cfg.btcpayserver.lbtc "liquidd.service";
+      requires = [ "bitcoind.service" "postgresql.service" ] ++ optional cfg.btcpayserver.lbtc "liquidd.service";
       after = requires;
       preStart = ''
         install -m 600 ${configFile} '${cfg.nbxplorer.dataDir}/settings.config'

modules/joinmarket.nix

@@ -290,6 +290,7 @@ in {
             echo "Create watch-only wallet ${cfg.rpcWalletFile}"
             if ! output=$(${bitcoind.cli}/bin/bitcoin-cli -named createwallet \
                             wallet_name="${cfg.rpcWalletFile}" \
+                            descriptors=false \
                             ${optionalString (!bitcoind.regtest) "disable_private_keys=true"} 2>&1
                          ); then
               # Ignore error if bitcoind wallet already exists

modules/versioning.nix

@@ -202,6 +202,17 @@ let
           config to your node.
       '';
     }
+    {
+      version = "0.0.70";
+      condition = config.services.nbxplorer.enable;
+      message = ''
+        The nbxplorer database backend has changed from DBTrie to Postgresql.
+        The new `services.postgresql` database name is `nbxplorer`.
+        The migration happens automatically after deploying.
+        Migration time for a large server with a 5GB DBTrie database takes about 40 minutes.
+        See also: https://github.com/dgarage/NBXplorer/blob/master/docs/Postgres-Migration.md
+      '';
+    }
   ];
 
   mkOnionServiceChange = service: {

pkgs/clightning-plugins/default.nix

@@ -14,7 +14,10 @@ let
 
   plugins = with nbPython3Packages; {
     helpme = { description = "Walks you through setting up a c-lightning node, offering advice for common problems"; };
-    monitor = { description = "Helps you analyze the health of your peers and channels"; };
+    monitor = {
+      description = "Helps you analyze the health of your peers and channels";
+      extraPkgs = [ packaging ];
+    };
     prometheus = {
       description = "Lightning node exporter for the prometheus timeseries server";
       extraPkgs = [ prometheus_client ];

pkgs/default.nix

@@ -9,7 +9,7 @@ let self = {
   cl-rest = pkgs.callPackage ./cl-rest { };
   clboss = pkgs.callPackage ./clboss { };
   clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);
-  joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; };
+  joinmarket = pkgs.callPackage ./joinmarket { nbPythonPackageOverrides = import ./python-packages self; };
   lndinit = pkgs.callPackage ./lndinit { };
   liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
   rtl = pkgs.callPackage ./rtl { };

pkgs/joinmarket/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPython3Packages, pkgs }:
+{ stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPythonPackageOverrides, pkgs }:
 
 let
   version = "0.9.5";
@@ -17,7 +17,17 @@ let
     ];
   };
 
-  runtimePackages = with nbPython3Packages; [
+  pyPkgs = (python3.override {
+    packageOverrides = (self: super: let
+      overrides = nbPythonPackageOverrides self super;
+    in
+      overrides // {
+        cryptography = overrides.cryptography_3_3_2;
+      }
+    );
+  }).pkgs;
+
+  runtimePackages = with pyPkgs; [
     joinmarketbase
     joinmarketclient
     joinmarketbitcoin

pkgs/lib.nix

@@ -33,7 +33,7 @@ let self = {
       # @system-service whitelist and docker seccomp blacklist (except for "clone"
       # which is a core requirement for systemd services)
       # @system-service is defined in src/shared/seccomp-util.c (systemd source)
-      SystemCallFilter = [ "@system-service" "~add_key clone3  kcmp keyctl mbind move_pages name_to_handle_at personality process_vm_readv process_vm_writev request_key set_mempolicy setns unshare userfaultfd" ];
+      SystemCallFilter = [ "@system-service" "~add_key kcmp keyctl mbind move_pages name_to_handle_at personality process_vm_readv process_vm_writev request_key set_mempolicy setns unshare userfaultfd" ];
       SystemCallArchitectures = "native";
   };
 

pkgs/pinned.nix

@@ -2,18 +2,18 @@
 pkgs: pkgsUnstable:
 {
   inherit (pkgs)
-    bitcoin
-    bitcoind
     charge-lnd
-    clightning
     extra-container
-    hwi
     lndconnect;
 
   inherit (pkgsUnstable)
+    bitcoin
+    bitcoind
     btcpayserver
+    clightning
     electrs
     elementsd
+    hwi
     lightning-loop
     lightning-pool
     lnd

pkgs/python-packages/coincurve/default.nix

@@ -3,11 +3,11 @@ autoconf, automake, libtool, libffi, requests }:
 
 buildPythonPackage rec {
   pname = "coincurve";
-  version = "15.0.0";
+  version = "17.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ras7qb4ib9sik703fcb9f3jrgq7nx5wvdgx9k1pshmrxl8lnlh6";
+    hash = "sha256-aNpVr/iYcClS/aPuBP1u1gu2uR+RnGknB4btdmtUi5M";
   };
 
   doCheck = false;

pkgs/python-packages/default.nix

@@ -4,6 +4,8 @@ let
 
   joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
   clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; };
+
+  unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
 in {
   bencoderpyx = callPackage ./bencoderpyx {};
   coincurve = callPackage ./coincurve {};
@@ -26,17 +28,21 @@ in {
 
   ## Specific versions of packages that already exist in nixpkgs
 
-  # base58 2.1.0, required by pyln-proto
-  base58 = callPackage ./specific-versions/base58.nix {};
-
   # cryptography 3.3.2, required by joinmarketdaemon
-  cryptography = callPackage ./specific-versions/cryptography {};
+  # Used in the private python package set for joinmarket (../joinmarket/default.nix)
+  cryptography_3_3_2 = callPackage ./specific-versions/cryptography {
     cryptography_vectors = callPackage ./specific-versions/cryptography/vectors.nix {};
+  };
+
+  # cryptography 36.0.0, required by pyln-proto.
+  cryptography = callPackage "${unstable}/pkgs/development/python-modules/cryptography" {
+    Security = self.darwin.apple_sdk.frameworks.Security;
+  };
 
   # autobahn 20.12.3, required by joinmarketclient
   autobahn = callPackage ./specific-versions/autobahn.nix {};
 
-  # tubes 0.2.0, required by klein
+  # tubes 0.2.0, required by jmclient (via pkg `klein`)
   tubes = callPackage ./specific-versions/tubes.nix {};
 
   # recommonmark 0.7.1, required by pyln-client

pkgs/python-packages/jmbitcoin/default.nix

@@ -1,4 +1,4 @@
-{ version, src, lib, buildPythonPackage, fetchurl, future, coincurve, urldecode, pyaes, python-bitcointx, joinmarketbase }:
+{ version, src, lib, buildPythonPackage, fetchurl, urldecode, pyaes, python-bitcointx, joinmarketbase }:
 
 buildPythonPackage rec {
   pname = "joinmarketbitcoin";
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   postUnpack = "sourceRoot=$sourceRoot/jmbitcoin";
 
-  propagatedBuildInputs = [ future coincurve urldecode pyaes python-bitcointx ];
+  propagatedBuildInputs = [ urldecode pyaes python-bitcointx ];
 
   checkInputs = [ joinmarketbase ];
 

pkgs/python-packages/jmclient/default.nix

@@ -1,4 +1,4 @@
-{ version, src, lib, buildPythonPackage, fetchurl, future, configparser, joinmarketbase, joinmarketdaemon, mnemonic, argon2_cffi, bencoderpyx, pyaes, joinmarketbitcoin, txtorcon, klein, pyjwt, autobahn, cryptography }:
+{ version, src, lib, buildPythonPackage, fetchurl, future, configparser, joinmarketbase, joinmarketdaemon, mnemonic, argon2_cffi, bencoderpyx, pyaes, joinmarketbitcoin, klein, pyjwt, autobahn }:
 
 buildPythonPackage rec {
   pname = "joinmarketclient";
@@ -6,10 +6,9 @@ buildPythonPackage rec {
 
   postUnpack = "sourceRoot=$sourceRoot/jmclient";
 
-  checkInputs = [ joinmarketbitcoin joinmarketdaemon txtorcon ];
+  checkInputs = [ joinmarketbitcoin joinmarketdaemon ];
 
-  # configparser may need to be compiled with python_version<"3.2"
+  propagatedBuildInputs = [ future configparser joinmarketbase mnemonic argon2_cffi bencoderpyx pyaes klein pyjwt autobahn ];
-  propagatedBuildInputs = [ future configparser joinmarketbase mnemonic argon2_cffi bencoderpyx pyaes klein pyjwt autobahn cryptography ];
 
   patchPhase = ''
     substituteInPlace setup.py \

pkgs/python-packages/jmdaemon/default.nix

@@ -1,4 +1,4 @@
-{ version, src, lib, buildPythonPackage, fetchurl, future, txtorcon, cryptography, pyopenssl, libnacl, joinmarketbase }:
+{ version, src, lib, buildPythonPackage, fetchurl, txtorcon, cryptography, pyopenssl, libnacl, joinmarketbase }:
 
 buildPythonPackage rec {
   pname = "joinmarketdaemon";
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   postUnpack = "sourceRoot=$sourceRoot/jmdaemon";
 
-  propagatedBuildInputs = [ future txtorcon cryptography pyopenssl libnacl joinmarketbase ];
+  propagatedBuildInputs = [ txtorcon cryptography pyopenssl libnacl joinmarketbase ];
 
   meta = with lib; {
     description = "Client library for Bitcoin coinjoins";

pkgs/python-packages/pyln-bolt7/default.nix

@@ -1,22 +1,17 @@
-{ buildPythonPackage, clightning, pyln-proto }:
+{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-proto }:
 
 buildPythonPackage rec {
   pname = "pyln-bolt7";
-
+  # The version is defined here:
-  # See fn `bolt_meta` in
+  # https://github.com/ElementsProject/lightning/blob/master/contrib/pyln-spec/bolt7/pyproject.toml
-  # https://github.com/ElementsProject/lightning/blob/master/contrib/pyln-spec/bolt7/setup.py
+  version = "1.0.2.186.post0";
-  version = "1.0.2.186";
+  format = "pyproject";
 
   inherit (clightning) src;
 
+  nativeBuildInputs = [ poetry-core ];
   propagatedBuildInputs = [ pyln-proto ];
+  checkInputs = [ pytestCheckHook ];
 
   postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-spec/bolt7";
-
-  # TODO-EXTERNAL:
-  # Remove when this fix is released
-  # https://github.com/ElementsProject/lightning/pull/4910
-  postPatch = ''
-    sed -i 's|pyln.proto|pyln-proto|' requirements.txt
-  '';
 }

pkgs/python-packages/pyln-client/default.nix

@@ -1,14 +1,27 @@
-{ buildPythonPackage, clightning, pyln-bolt7, recommonmark, setuptools-scm }:
+{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-bolt7, pyln-proto }:
 
 buildPythonPackage rec {
   pname = "pyln-client";
   version = clightning.version;
+  format = "pyproject";
 
   inherit (clightning) src;
 
-  propagatedBuildInputs = [ pyln-bolt7 recommonmark setuptools-scm ];
+  nativeBuildInputs = [ poetry-core ];
 
-  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+  propagatedBuildInputs = [
+    pyln-bolt7
+    pyln-proto
+  ];
+
+  checkInputs = [ pytestCheckHook ];
 
   postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}";
+
+  # Fix version typo in pyproject.toml
+  # TODO-EXTERNAL:
+  # This is already fixed upstream. Remove this after the next clightning release.
+  postPatch = ''
+    sed -i 's|pyln-bolt7 = "^1.0.186"|pyln-bolt7 = "^1.0.2.186"|' pyproject.toml
+  '';
 }

pkgs/python-packages/pyln-proto/default.nix

@@ -1,38 +1,30 @@
-{ buildPythonPackage, clightning
+{ buildPythonPackage
+, clightning
+, poetry-core
+, pytestCheckHook
 , bitstring
 , cryptography
 , coincurve
 , base58
-, mypy
-, pycparser
-, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "pyln-proto";
   version = clightning.version;
+  format = "pyproject";
 
   inherit (clightning) src;
 
+  nativeBuildInputs = [ poetry-core ];
+
   propagatedBuildInputs = [
     bitstring
     cryptography
     coincurve
-    pycparser
     base58
-    mypy
-    setuptools-scm
   ];
 
-  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+  checkInputs = [ pytestCheckHook ];
 
   postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-proto";
-  postPatch = ''
-    sed -i '
-      s|pycparser==2.20|pycparser~=2.20|
-      s|coincurve ~= 13.0|coincurve == 15.0.0|
-      s|base58 ~= 2.0.1|base58 == 2.1.0|
-      s|mypy==0.790|mypy == 0.812|
-    ' requirements.txt
-  '';
 }

pkgs/python-packages/specific-versions/base58.nix

@@ -1,34 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pyhamcrest
-, pytest-benchmark
-, pytestCheckHook
-, pythonOlder
-}:
-
-buildPythonPackage rec {
-  pname = "base58";
-  version = "2.1.0";
-  disabled = pythonOlder "3.5";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-FxpUe0o8YeGuOAciSm967HXjZMQ5XnViZJ1zNXaAAaI=";
-  };
-
-  checkInputs = [
-    pyhamcrest
-    pytest-benchmark
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [ "base58" ];
-
-  meta = with lib; {
-    description = "Base58 and Base58Check implementation";
-    homepage = "https://github.com/keis/base58";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nyanloutre ];
-  };
-}

test/nixos-search/flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1644229661,
+        "lastModified": 1649676176,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
         "type": "github"
       },
       "original": {
@@ -15,17 +15,34 @@
         "type": "github"
       }
     },
+    "nixos-org-configurations": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648674978,
+        "narHash": "sha256-7lVlPb9/Lu3M9xPzwdvtgqkeQI4FAMv+T3v+yT54ZZ0=",
+        "owner": "NixOS",
+        "repo": "nixos-org-configurations",
+        "rev": "76c0687ac275235142dae7c855aab2885302298c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-org-configurations",
+        "type": "github"
+      }
+    },
     "nixos-search": {
       "inputs": {
         "flake-utils": "flake-utils",
+        "nixos-org-configurations": "nixos-org-configurations",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1648850703,
+        "lastModified": 1650836881,
-        "narHash": "sha256-nZeV3sV3UU9NzJPSGrPN8/clecTqx9byQUtTjS7XMXk=",
+        "narHash": "sha256-FKsTNQWq8lv6+Qr6LouEukTsJIGEU51H1cWc1PSOtvU=",
         "owner": "nixos",
         "repo": "nixos-search",
-        "rev": "6ba56bc7e96ce83a5d33868b38acb04ebbc688e1",
+        "rev": "eea6cd3ffb4d3d39956316d6e976b9d5ce52d508",
         "type": "github"
       },
       "original": {
@@ -36,11 +53,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1642903813,
+        "lastModified": 1650701402,
-        "narHash": "sha256-0lNfGW8sNfyTrixoQhVG00Drl/ECaf5GbfKAQ1ZDoyE=",
+        "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "689b76bcf36055afdeb2e9852f5ecdd2bf483f87",
+        "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
         "type": "github"
       },
       "original": {

test/tests.nix

@@ -95,6 +95,7 @@ let
       };
       # Needed to test macaroon creation
       environment.systemPackages = mkIfTest "btcpayserver" (with pkgs; [ openssl xxd ]);
+      test.data.btcpayserver-lbtc = config.services.btcpayserver.lbtc;
 
       tests.joinmarket = cfg.joinmarket.enable;
       tests.joinmarket-yieldgenerator = cfg.joinmarket.yieldgenerator.enable;
@@ -264,6 +265,21 @@ let
 
       # `validatepegin` is incompatible with regtest
       services.liquidd.validatepegin = mkForce false;
+
+      # TODO-EXTERNAL:
+      # Reenable `btcpayserver.lbtc` in regtest (and add test in tests.py)
+      # when nbxplorer can parse liquidd regtest blocks.
+      #
+      # When `btcpayserver.lbtc` is enabled in regtest, nxbplorer tries to
+      # generate regtest blocks, which fails because no liquidd wallet exists.
+      # When blocks are pre-generated via `liquidd.postStart`, nbxplorer
+      # fails to parse the blocks:
+      #   info: NBXplorer.Indexer.LBTC: Full node version detected: 210002
+      #   info: NBXplorer.Indexer.LBTC: NBXplorer is correctly whitelisted by the node
+      #     fail: NBXplorer.Indexer.LBTC: Unhandled exception in the indexer, retrying in 10 seconds
+      #       System.IO.EndOfStreamException: No more byte to read
+      #         at NBitcoin.BitcoinStream.ReadWriteBytes(Span`1 data)
+      services.btcpayserver.lbtc = mkForce false;
     };
 
     ## Examples / debug helper

test/tests.py

@@ -188,7 +188,7 @@ def _():
 def _():
     assert_running("nbxplorer")
     machine.wait_until_succeeds(log_has_string("nbxplorer", "BTC: RPC connection successful"))
-    if "liquidd" in enabled_tests:
+    if test_data["btcpayserver-lbtc"]:
         machine.wait_until_succeeds(log_has_string("nbxplorer", "LBTC: RPC connection successful"))
     wait_for_open_port(ip("nbxplorer"), 24444)
 
@@ -398,13 +398,7 @@ def _():
         )
         succeed("runuser -u operator -- pool orders list")
     if enabled("btcpayserver"):
-        machine.wait_until_succeeds(log_has_string("nbxplorer", f"BTC: Starting scan at block {num_blocks}"))
+        machine.wait_until_succeeds(log_has_string("nbxplorer", f"At height: {num_blocks}"))
-        # TODO-EXTERNAL:
-        # nbxplorer 2.2.16 currently fails with with lbtc (liquidd) on regtest
-        # LBTC: Full node version detected: 210000
-        # LBTC: RPC connection successful
-        # LBTC: Failed to connect to RPC
-        # System.IO.EndOfStreamException: No more byte to read
 
 if "netns-isolation" in enabled_tests:
     def ip(name):