From 76ea066809527a387a6d245fa5f03bbc66c125b9 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 15 Nov 2024 14:27:07 +0100 Subject: [PATCH] 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}")