From 76ea066809527a387a6d245fa5f03bbc66c125b9 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 15 Nov 2024 14:27:07 +0100 Subject: [PATCH 1/2] trustedcoin: 0.8.2 -> 2024-11-15 Supports bitcoind 28.0. --- pkgs/trustedcoin/default.nix | 16 ++++++++++------ test/tests.py | 1 - 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/trustedcoin/default.nix b/pkgs/trustedcoin/default.nix index 0a03e10..b80912d 100644 --- a/pkgs/trustedcoin/default.nix +++ b/pkgs/trustedcoin/default.nix @@ -1,20 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo123Module, fetchFromGitHub }: -buildGoModule rec { +buildGo123Module rec { pname = "trustedcoin"; - version = "0.8.2"; + version = "2024-11-15"; src = fetchFromGitHub { owner = "nbd-wtf"; repo = pname; - rev = "v${version}"; - hash = "sha256-M1z5Vn3UGLJHdCZxud8jM2ewiW90zzC7Vaidv3yGNAE="; + rev = "92e6f2129f85548693b4a44b39eab9e5ade8c23d"; + hash = "sha256-Blw2s0JECe01s3Wn6gY3Ladd81+wWBBeXarICa0l/bU="; }; - vendorHash = "sha256-hKaSB8/pymA7o2LuUpLjLZYn37JzEBn3a/3vkGbhLdM="; + vendorHash = "sha256-fW+EoNPC0mH8C06Q6GXNwFdzE7oQT+qd+B7hGGml+hc="; subPackages = [ "." ]; + preCheck = '' + ln -s $TMP/go/bin/trustedcoin . + ''; + meta = with lib; { description = "Light bitcoin node implementation"; homepage = "https://github.com/nbd-wtf/trustedcoin"; diff --git a/test/tests.py b/test/tests.py index 67cdce4..3dfb11d 100644 --- a/test/tests.py +++ b/test/tests.py @@ -448,7 +448,6 @@ def _(): machine.wait_until_succeeds(log_has_string("clightning", str)) expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+bitcoind RPC working") - 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+returning block {num_blocks}") From 2f986c80e5d7950ef7f0cd14f672e82b5fe2027c Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 29 Oct 2024 10:25:35 +0000 Subject: [PATCH 2/2] update nixpkgs bitcoin: 27.1 -> 28.0 bitcoind: 27.1 -> 28.0 clboss: 0.13.3 -> 0.14.0 --- flake.lock | 12 ++++++------ modules/lnd.nix | 6 ++++++ pkgs/pinned.nix | 4 ++-- test/nixos-search/flake.lock | 18 +++++++++--------- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 0eb96e4..95f482c 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728279793, - "narHash": "sha256-W3D5YpNrUVTFPVU4jiEiboaaUDShaiH5fRl9aJLqUnU=", + "lastModified": 1730170245, + "narHash": "sha256-PRq4vJjDa+m1mNwkV9H7zVzMhuMqsHJrTGx0iJZ0e0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f85a2d005e83542784a755ca8da112f4f65c4aa4", + "rev": "30c9efeef01e2ad4880bff6a01a61dd99536b3c9", "type": "github" }, "original": { diff --git a/modules/lnd.nix b/modules/lnd.nix index 701bb90..6d2fcf2 100644 --- a/modules/lnd.nix +++ b/modules/lnd.nix @@ -211,6 +211,12 @@ in { zmqpubrawblock = mkDefault "tcp://${bitcoindRpcAddress}:28332"; zmqpubrawtx = mkDefault "tcp://${bitcoindRpcAddress}:28333"; + + # TODO-EXTERNAL: remove when https://github.com/lightningnetwork/lnd/issues/9163 + # has been fixed. + extraConfig = '' + deprecatedrpc=warnings + ''; }; environment.systemPackages = [ cfg.package (hiPrio cfg.cli) ]; diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index cc91099..2e94654 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -2,8 +2,6 @@ pkgs: pkgsUnstable: { inherit (pkgs) - bitcoin - bitcoind charge-lnd elementsd extra-container @@ -12,6 +10,8 @@ pkgs: pkgsUnstable: lndconnect; inherit (pkgsUnstable) + bitcoin + bitcoind btcpayserver clboss clightning diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock index 020f1a2..75b6f7b 100644 --- a/test/nixos-search/flake.lock +++ b/test/nixos-search/flake.lock @@ -21,11 +21,11 @@ "nixos-infra": { "flake": false, "locked": { - "lastModified": 1727984934, - "narHash": "sha256-6+6qpApRNuBTIoioP7FWRCRCM/Ew/DZ3Sl1z/6K6VgY=", + "lastModified": 1729889784, + "narHash": "sha256-xlauiZTSuG0u7HaEZGsvGYr21hiDVyE8dJGgNNACMAw=", "owner": "NixOS", "repo": "infra", - "rev": "8be4953d68ce81455787cd60e82086022855a3c2", + "rev": "e89dac731911c342179295a90c8095928a404f32", "type": "github" }, "original": { @@ -43,11 +43,11 @@ "npmlock2nix": "npmlock2nix" }, "locked": { - "lastModified": 1728300736, - "narHash": "sha256-bZJLu5HP36ar6CVUJ7mzMh8hpt3QGqL+aBkwAPtBU3w=", + "lastModified": 1730051716, + "narHash": "sha256-3dQLrg5/cQJ5Xs8TW6wwtxLaETRHA/q41zOO5yirfC0=", "owner": "nixos", "repo": "nixos-search", - "rev": "9f3a9703b8433cbe19a941cfcd32e503515b50a2", + "rev": "bc0aa355ea460461c6e2f99c8df7c6550e8d936f", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": {