From f06ee984352b36a3e2b95f553120d05529ae5aea Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Fri, 17 Nov 2023 20:48:42 +0000
Subject: [PATCH 1/2] update nixpkgs

btcpayserver: 1.11.6 -> 1.11.7
electrs: 0.9.13 -> 0.10.1
fulcrum: 1.9.2 -> 1.9.7
---
 flake.lock      | 18 +++++++++---------
 pkgs/pinned.nix |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index e43c53d..a63c3cc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691100095,
-        "narHash": "sha256-qp+M5l18qHRmvUkYOqoi5AaspX7ZbqsVf6S8qQgEnFs=",
+        "lastModified": 1699821751,
+        "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=",
         "owner": "erikarvstedt",
         "repo": "extra-container",
-        "rev": "9a594f75cc782c481df9d108624409d429a23f19",
+        "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697851979,
-        "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=",
+        "lastModified": 1701053011,
+        "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8",
+        "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1697915759,
-        "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
+        "lastModified": 1701040486,
+        "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
+        "rev": "45827faa2132b8eade424f6bdd48d8828754341a",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
index 5af635e..69ca811 100644
--- a/pkgs/pinned.nix
+++ b/pkgs/pinned.nix
@@ -5,7 +5,6 @@ pkgs: pkgsUnstable:
     bitcoin
     bitcoind
     charge-lnd
-    electrs
     elementsd
     extra-container
     lndconnect;
@@ -13,6 +12,7 @@ pkgs: pkgsUnstable:
   inherit (pkgsUnstable)
     btcpayserver
     clightning
+    electrs
     fulcrum
     hwi
     lightning-loop

From 457f066e081f6858033863dffd02c668403c2f56 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 20 Nov 2023 12:41:46 +0100
Subject: [PATCH 2/2] tests/trustedcoin: fix

Sometimes trustedcoin outputs `tip: 0`.
Check for `returning block` instead.
---
 test/tests.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/tests.py b/test/tests.py
index 784a5e6..a122a6d 100644
--- a/test/tests.py
+++ b/test/tests.py
@@ -451,8 +451,7 @@ def _():
     expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+estimatefees error: none of the esploras returned usable responses")
     if "regtest" in enabled_tests:
         num_blocks = test_data["num_blocks"]
-        expect_clightning_log(f"plugin-trustedcoin[^^]\[0m\s+tip: {num_blocks}")
-        expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+returning block")
+        expect_clightning_log(f"plugin-trustedcoin[^^]\[0m\s+returning block {num_blocks}")
 
 
 if "netns-isolation" in enabled_tests: