This commit is contained in:
nicolas.dorier 2020-06-30 10:12:38 +09:00
parent 4d98778551
commit f2cf5ab802
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
10 changed files with 34 additions and 13 deletions

View File

@ -79,6 +79,27 @@ namespace BTCPayServer.Hwi.Deployment
Extractor = new TarExtractor()
}
};
public static HwiVersion v1_1_2 { get; } = new HwiVersion()
{
Windows = new HwiDownloadInfo()
{
Link = "https://github.com/bitcoin-core/HWI/releases/download/1.1.2/hwi-1.1.2-windows-amd64.zip",
Hash = "0f3fb7c89740ac2cf245bb8e743c5dd7e686efbda8c4a288869621a63bc32ced",
Extractor = new ZipExtractor()
},
Linux = new HwiDownloadInfo()
{
Link = "https://github.com/bitcoin-core/HWI/releases/download/1.1.2/hwi-1.1.2-linux-amd64.tar.gz",
Hash = "fd6cca20aaa24f4ae4332ca01f1d4c2711247e3ccb8bbea44ee93456f211ea4b",
Extractor = new TarExtractor()
},
Mac = new HwiDownloadInfo()
{
Link = "https://github.com/bitcoin-core/HWI/releases/download/1.1.2/hwi-1.1.2-mac-amd64.tar.gz",
Hash = "630aef7a02cbc08fae95e79bb9c01684650426a6f8e5383cfb040093b05aa0f1",
Extractor = new TarExtractor()
}
};
}
public class HwiVersion

View File

@ -19,7 +19,7 @@ namespace BTCPayServer.Vault
static async Task Main(string[] args)
{
// This line will download hwi program in the process current directory
await HwiVersions.v1_0_3.Current.EnsureIsDeployed();
await HwiVersions.v1_1_2.Current.EnsureIsDeployed();
var hwiClient = new HwiClient(Network.Main);

View File

@ -43,7 +43,7 @@ namespace BTCPayServer.Vault.Tests
public static async Task<HwiTester> CreateAsync(ILoggerFactory loggerFactory)
{
var hwi = await HwiVersions.v1_1_1.Current.EnsureIsDeployed();
var hwi = await HwiVersions.v1_1_2.Current.EnsureIsDeployed();
return new HwiTester(loggerFactory, hwi);
}

View File

@ -23,7 +23,7 @@ namespace Microsoft.Extensions.DependencyInjection
if (services == null)
throw new ArgumentNullException(nameof(services));
services.AddCors();
services.AddSingleton(HwiVersions.v1_0_3);
services.AddSingleton(HwiVersions.v1_1_2);
services.AddHostedService<HwiDownloadTask>();
services.AddScoped<HwiServer>();
services.AddSingleton<ITransport>(provider =>

View File

@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<Version>1.0.3</Version>
<Version>1.0.4</Version>
</PropertyGroup>
</Project>

View File

@ -1,5 +1,5 @@
## Changelog
* Bump of hwi to 1.1.1
* Bump of hwi to 1.1.2
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.

View File

@ -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/1.1.1/hwi-1.1.1-linux-amd64.tar.gz && \
RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/1.1.2/hwi-1.1.2-linux-amd64.tar.gz && \
tar -zxvf /tmp/hwi.tar.gz -C /tmp hwi && \
echo "e786797701e454415ed170ee9aed4c81a33f1adef6821bb4bd0f92d1df9d3b23 /tmp/hwi" | sha256sum -c - && \
echo "fd6cca20aaa24f4ae4332ca01f1d4c2711247e3ccb8bbea44ee93456f211ea4b /tmp/hwi" | sha256sum -c - && \
rm /tmp/hwi.tar.gz
SHELL ["/bin/bash", "-c"]

View File

@ -1,8 +1,8 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 AS builder
RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/1.1.1/hwi-1.1.1-linux-amd64.tar.gz && \
RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/1.1.2/hwi-1.1.2-linux-amd64.tar.gz && \
tar -zxvf /tmp/hwi.tar.gz -C /tmp hwi && \
echo "e786797701e454415ed170ee9aed4c81a33f1adef6821bb4bd0f92d1df9d3b23 /tmp/hwi" | sha256sum -c - && \
echo "fd6cca20aaa24f4ae4332ca01f1d4c2711247e3ccb8bbea44ee93456f211ea4b /tmp/hwi" | sha256sum -c - && \
rm /tmp/hwi.tar.gz
WORKDIR /source

View File

@ -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/1.1.1/hwi-1.1.1-mac-amd64.tar.gz && \
RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/1.1.2/hwi-1.1.2-mac-amd64.tar.gz && \
tar -zxvf /tmp/hwi.tar.gz -C /tmp hwi && \
echo "1f48ac21c42579aa88c98e02571ed4d2dfa48f973cd6904984bc9a8b304816ad /tmp/hwi" | sha256sum -c - && \
echo "630aef7a02cbc08fae95e79bb9c01684650426a6f8e5383cfb040093b05aa0f1 /tmp/hwi" | sha256sum -c - && \
rm /tmp/hwi.tar.gz
WORKDIR /source

View File

@ -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/1.1.1/hwi-1.1.1-windows-amd64.zip && \
RUN wget -qO "/tmp/hwi.zip" https://github.com/bitcoin-core/HWI/releases/download/1.1.2/hwi-1.1.2-windows-amd64.zip && \
unzip "/tmp/hwi.zip" -d "/tmp" && \
echo "c36bd39635097c4fa952aceca3f4c7c74be2035a31c39a10a33dae53996630aa /tmp/hwi.exe" | sha256sum -c - && \
echo "0f3fb7c89740ac2cf245bb8e743c5dd7e686efbda8c4a288869621a63bc32ced /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