From dcff6ce7156349e5cc36ee0d7c781bf138373d23 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 4 Jul 2024 09:43:23 +0900 Subject: [PATCH] Bump HWI --- BTCPayServer.Hwi/Deployment/HwiVersions.cs | 24 +++++++++++++++++++++- BTCPayServer.Vault/Version.csproj | 2 +- Build/RELEASE.md | 2 +- Build/debian-x64/Dockerfile | 4 ++-- Build/linux-x64/Dockerfile | 4 ++-- Build/osx-x64/Dockerfile | 4 ++-- Build/win-x64/Dockerfile | 4 ++-- 7 files changed, 33 insertions(+), 11 deletions(-) diff --git a/BTCPayServer.Hwi/Deployment/HwiVersions.cs b/BTCPayServer.Hwi/Deployment/HwiVersions.cs index 1bfbcd4..6f9e3b7 100644 --- a/BTCPayServer.Hwi/Deployment/HwiVersions.cs +++ b/BTCPayServer.Hwi/Deployment/HwiVersions.cs @@ -80,7 +80,29 @@ public class HwiVersions } }; - public static HwiVersion Latest => v2_1_1; + public static HwiVersion v3_0_0 { get; } = new HwiVersion() + { + Windows = new HwiDownloadInfo() + { + Link = "https://github.com/bitcoin-core/HWI/releases/download/3.0.0/hwi-3.0.0-windows-x86_64.zip", + Hash = "38b3f02374c300516b4583a1195ffe1cac1159f9885b8ab434fd450e290c907a", + Extractor = new ZipExtractor() + }, + Linux = new HwiDownloadInfo() + { + Link = "https://github.com/bitcoin-core/HWI/releases/download/3.0.0/hwi-3.0.0-linux-x86_64.tar.gz", + Hash = "9b70aab37a1265457de4aaa242bd24a0abef5056357d8337bd79232e9b85bc1c", + Extractor = new TarExtractor() + }, + Mac = new HwiDownloadInfo() + { + Link = "https://github.com/bitcoin-core/HWI/releases/download/3.0.0/hwi-3.0.0-mac-x86_64.tar.gz", + Hash = "d05c046d5718bf92b348a786aad15cb0f0132fcccf57a646758610240327a977", + Extractor = new TarExtractor() + } + }; + + public static HwiVersion Latest => v3_0_0; } public class HwiVersion diff --git a/BTCPayServer.Vault/Version.csproj b/BTCPayServer.Vault/Version.csproj index b0dacfa..998c8ff 100644 --- a/BTCPayServer.Vault/Version.csproj +++ b/BTCPayServer.Vault/Version.csproj @@ -1,5 +1,5 @@  - 2.0.9 + 2.0.10 diff --git a/Build/RELEASE.md b/Build/RELEASE.md index 225f877..be9e472 100644 --- a/Build/RELEASE.md +++ b/Build/RELEASE.md @@ -1,5 +1,5 @@ ## Changelog -* Fix: Impossible to sign big transactions on windows (#77) +* Bump HWI to 3.0.0 (Adding support to Trezor Safe 3) You may want to follow the [documented](https://github.com/btcpayserver/BTCPayServer.Vault/blob/master/docs/HowToVerify.md) process to verify that the binaries are built by Nicolas Dorier. diff --git a/Build/debian-x64/Dockerfile b/Build/debian-x64/Dockerfile index fe86456..a673662 100644 --- a/Build/debian-x64/Dockerfile +++ b/Build/debian-x64/Dockerfile @@ -5,9 +5,9 @@ RUN apt-get update RUN apt-get install -y --no-install-recommends imagemagick ### -RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/2.3.1/hwi-2.3.1-linux-x86_64.tar.gz && \ +RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/3.0.0/hwi-3.0.0-linux-x86_64.tar.gz && \ tar -zxvf /tmp/hwi.tar.gz -C /tmp hwi && \ - echo "9519023b3a485b68668675db8ab70be2e338be100fd2731eeddd6d34fc440580 /tmp/hwi" | sha256sum -c - && \ + echo "9b70aab37a1265457de4aaa242bd24a0abef5056357d8337bd79232e9b85bc1c /tmp/hwi" | sha256sum -c - && \ rm /tmp/hwi.tar.gz SHELL ["/bin/bash", "-c"] diff --git a/Build/linux-x64/Dockerfile b/Build/linux-x64/Dockerfile index c8d1005..a39c6e0 100644 --- a/Build/linux-x64/Dockerfile +++ b/Build/linux-x64/Dockerfile @@ -1,8 +1,8 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder -RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/2.1.1/hwi-2.1.1-linux-amd64.tar.gz && \ +RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/3.0.0/hwi-3.0.0-linux-x86_64.tar.gz && \ tar -zxvf /tmp/hwi.tar.gz -C /tmp hwi && \ - echo "7f4cbe4e5c2cd1ac892f9bd8ac35fb1f837b6a547b528b61aca895a212a90062 /tmp/hwi" | sha256sum -c - && \ + echo "9b70aab37a1265457de4aaa242bd24a0abef5056357d8337bd79232e9b85bc1c /tmp/hwi" | sha256sum -c - && \ rm /tmp/hwi.tar.gz WORKDIR /source diff --git a/Build/osx-x64/Dockerfile b/Build/osx-x64/Dockerfile index b920c23..8f4a6ba 100644 --- a/Build/osx-x64/Dockerfile +++ b/Build/osx-x64/Dockerfile @@ -7,9 +7,9 @@ RUN apt-get install -y --no-install-recommends imagemagick RUN apt-get install -y --no-install-recommends git icnsutils -RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/2.3.1/hwi-2.3.1-mac-x86_64.tar.gz && \ +RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/3.0.0/hwi-3.0.0-mac-x86_64.tar.gz && \ tar -zxvf /tmp/hwi.tar.gz -C /tmp hwi && \ - echo "9059b8f7cf6fe42f6e37cd8015cd11cb8fb736650797b25da849c625ed61ea62 /tmp/hwi" | sha256sum -c - && \ + echo "d05c046d5718bf92b348a786aad15cb0f0132fcccf57a646758610240327a977 /tmp/hwi" | sha256sum -c - && \ rm /tmp/hwi.tar.gz WORKDIR /source diff --git a/Build/win-x64/Dockerfile b/Build/win-x64/Dockerfile index dce7c0b..8b5dc70 100644 --- a/Build/win-x64/Dockerfile +++ b/Build/win-x64/Dockerfile @@ -6,9 +6,9 @@ RUN apt-get install -y --no-install-recommends imagemagick ### RUN apt-get install -y --no-install-recommends nsis unzip wine xxd osslsigncode openssl -RUN wget -qO "/tmp/hwi.zip" https://github.com/bitcoin-core/HWI/releases/download/2.3.1/hwi-2.3.1-windows-x86_64.zip && \ +RUN wget -qO "/tmp/hwi.zip" https://github.com/bitcoin-core/HWI/releases/download/3.0.0/hwi-3.0.0-windows-x86_64.zip && \ unzip "/tmp/hwi.zip" -d "/tmp" && \ - echo "460c8b83a9d8888ad769ffdc34dbe3ad7ecd27b22035494bdeb268d943be1791 /tmp/hwi.exe" | sha256sum -c - && \ + echo "38b3f02374c300516b4583a1195ffe1cac1159f9885b8ab434fd450e290c907a /tmp/hwi.exe" | sha256sum -c - && \ rm "/tmp/hwi.zip" && \ # Need to setup with rcedit because https://github.com/dotnet/sdk/issues/3943 # I prebuild the binaries with VS 2019 on commit b807b34a644c86c0b0d89c7f073967e79202731a