From 775239e68109e0eb362f0b1454360a214f6a562b Mon Sep 17 00:00:00 2001 From: cronicc Date: Wed, 14 Oct 2020 20:59:51 +0000 Subject: [PATCH 1/8] Extend fetch-params.ps1: * ability to set zend datadir via DATADIR env var * refactor download logic and move into function --- zcutil/fetch-params.ps1 | 138 ++++++++++++++++++---------------------- zcutil/setup_zend.bat | 3 +- 2 files changed, 63 insertions(+), 78 deletions(-) diff --git a/zcutil/fetch-params.ps1 b/zcutil/fetch-params.ps1 index 76db018b30..de27976ee9 100644 --- a/zcutil/fetch-params.ps1 +++ b/zcutil/fetch-params.ps1 @@ -1,17 +1,40 @@ -Get-Date -"Download Script Started" +# Fuction to get datadir name from $Env:DATADIR, default value "Zen" if env is unset -# Create directories and zen.conf - -if(!(Test-Path -Path "$env:APPDATA\ZcashParams")){ - New-Item -ItemType directory -Path "$env:APPDATA\ZcashParams" +function Get-Datadir { + if (-not [Environment]::GetEnvironmentVariable('DATADIR')) { + return "Zen" + } + return "$Env:DATADIR" } -if(!(Test-Path -Path "$env:APPDATA\sphereDatadir")){ - New-Item -ItemType directory -Path "$env:APPDATA\sphereDatadir" -} -if(!(Test-Path -Path "$env:APPDATA\sphereDatadir\zen.conf")){ - New-Item -Path "$env:APPDATA\sphereDatadir\" -Name "zen.conf" -ItemType "file" - Add-Content -Path "$env:APPDATA\sphereDatadir\zen.conf" -Value rpcuser=zenrpc,rpcpassword=fortytwo + +# Function to download and check file + +function Start-DownloadCheckFile ($url, $maxAttempts, $filepath, $hash) { + $dlFilepath = "$filepath" + '.dl' + if (!(Test-Path -Path "$filepath")) { + Write-Host "$(Get-Date -Format 'o'): Downloading $url" + $attemptCount = 0 + Do { + $Failed = $false + $attemptCount++ + Try { + $wc.DownloadFile($url, $dlFilepath) + } catch { + $Failed = $true + } + } while ($Failed -and ($attemptCount -lt $maxAttempts)) + if (!(Test-Path -Path "$dlFilepath")) { + throw "$(Get-Date -Format 'o'): Failed to download $url" + } + if ($(CertUtil -hashfile $dlFilepath SHA256)[1] -replace " ","" -eq $hash) { + Rename-Item -Path "$dlFilepath" -NewName "$filepath" + Write-Host "$(Get-Date -Format 'o'): $filepath downloaded and checked" + } else { + throw "$(Get-Date -Format 'o'): $dlFilepath checksum verification failed" + } + } else { + Write-Host "$(Get-Date -Format 'o'): File $filepath exists" + } } # Define download URLs for file @@ -30,15 +53,6 @@ $Checksum_saplingspendparams = "8e48ffd23abb3a5fd9c5589204f32d9c31285a04b78096ba $Checksum_saplingoutputparams = "2f0ebbcbb9bb0bcffe95a397e7eba89c29eb4dde6191c339db88570e3f3fb0e4" $Checksum_sproutgroth16params = "b685d700c60328498fbde589c8c7c484c722b788b265b72af448a5bf0ee55b50" -$wc = New-Object System.Net.WebClient -$wc.Proxy = [System.Net.WebRequest]::DefaultWebProxy -$wc.Proxy.Credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - -# Set the maximum number of attempts in case download fails - -$maxAttempts = 5 - # Define destination file paths: $Destination = "$env:APPDATA\ZcashParams\" @@ -49,70 +63,40 @@ $Dest_saplingspendparams = "$Destination" + 'sapling-spend.params' $Dest_saplingoutputparams = "$Destination" + 'sapling-output.params' $Dest_sproutgroth16params = "$Destination" + 'sprout-groth16.params' -$DestDl_sproutprovingkey = "$Destination" + 'sprout-proving.key.dl' -$DestDl_sproutverifyingkey = "$Destination" + 'sprout-verifying.key.dl' -$DestDl_saplingspendparams = "$Destination" + 'sapling-spend.params.dl' -$DestDl_saplingoutputparams = "$Destination" + 'sapling-output.params.dl' -$DestDl_sproutgroth16params = "$Destination" + 'sprout-groth16.params.dl' +# Initialize WebClient -# Download files +$wc = New-Object System.Net.WebClient +$wc.Proxy = [System.Net.WebRequest]::DefaultWebProxy +$wc.Proxy.Credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -if (!(Test-Path -Path "$Dest_sproutprovingkey")) { - $attemptCount = 0 -Do { - $attemptCount++ - $wc.DownloadFile($Source_sproutprovingkey, $DestDl_sproutprovingkey) -} while (($(CertUtil -hashfile $DestDl_sproutprovingkey SHA256)[1] -replace " ","" -ne ($Checksum_sproutprovingkey)) -and ($attemptCount -le $maxAttempts)) -Rename-Item -Path "$DestDl_sproutprovingkey" -NewName "sprout-proving.key" -} +# Set the maximum number of attempts in case download fails -Get-Date -"sprout-proving.key checked or downloaded" +$maxAttempts = 5 -if (!(Test-Path -Path "$Dest_sproutverifyingkey")) { - $attemptCount = 0 -Do { - $attemptCount++ - $wc.DownloadFile($Source_sproutverifyingkey, $DestDl_sproutverifyingkey) -} while (($(CertUtil -hashfile $DestDl_sproutverifyingkey SHA256)[1] -replace " ","" -ne ($Checksum_sproutverifyingkey)) -and ($attemptCount -le $maxAttempts)) -Rename-Item -Path "$DestDl_sproutverifyingkey" -NewName "sprout-verifying.key" -} +# Set datadir -Get-Date -"sprout-verifying.key checked or downloaded" +$zenDatadir = Get-Datadir -if (!(Test-Path -Path "$Dest_saplingspendparams")) { - $attemptCount = 0 -Do { - $attemptCount++ - $wc.DownloadFile($Source_saplingspendparams, $DestDl_saplingspendparams) -} while (($(CertUtil -hashfile $DestDl_saplingspendparams SHA256)[1] -replace " ","" -ne ($Checksum_saplingspendparams)) -and ($attemptCount -le $maxAttempts)) -Rename-Item -Path "$DestDl_saplingspendparams" -NewName "sapling-spend.params" -} +Write-Host "$(Get-Date -Format 'o'): Download Script Started" -Get-Date -"sapling-spend.params checked or downloaded" +# Create directories and zen.conf -if (!(Test-Path -Path "$Dest_saplingoutputparams")) { - $attemptCount = 0 -Do { - $attemptCount++ - $wc.DownloadFile($Source_saplingoutputparams, $DestDl_saplingoutputparams) -} while (($(CertUtil -hashfile $DestDl_saplingoutputparams SHA256)[1] -replace " ","" -ne ($Checksum_saplingoutputparams)) -and ($attemptCount -le $maxAttempts)) -Rename-Item -Path "$DestDl_saplingoutputparams" -NewName "sapling-output.params" +if (!(Test-Path -Path "$env:APPDATA\ZcashParams")) { + New-Item -ItemType directory -Path "$env:APPDATA\ZcashParams" } - -Get-Date -"sapling-output.params checked or downloaded" - -if (!(Test-Path -Path "$Dest_sproutgroth16params")) { - $attemptCount = 0 -Do { - $attemptCount++ - $wc.DownloadFile($Source_sproutgroth16params, $DestDl_sproutgroth16params) -} while (($(CertUtil -hashfile $DestDl_sproutgroth16params SHA256)[1] -replace " ","" -ne ($Checksum_sproutgroth16params)) -and ($attemptCount -le $maxAttempts)) -Rename-Item -Path "$DestDl_sproutgroth16params" -NewName "sprout-groth16.params" +if (!(Test-Path -Path "$env:APPDATA\$zenDatadir")) { + New-Item -ItemType directory -Path "$env:APPDATA\$zenDatadir" +} +if (!(Test-Path -Path "$env:APPDATA\$zenDatadir\zen.conf")) { + New-Item -Path "$env:APPDATA\$zenDatadir\" -Name "zen.conf" -ItemType "file" + Add-Content -Path "$env:APPDATA\$zenDatadir\zen.conf" -Value rpcuser=zenrpc,rpcpassword=fortytwo } -Get-Date -"sprout-groth16.params checked or downloaded" +# Download files + +Start-DownloadCheckFile $Source_sproutprovingkey $maxAttempts $Dest_sproutprovingkey $Checksum_sproutprovingkey +Start-DownloadCheckFile $Source_sproutverifyingkey $maxAttempts $Dest_sproutverifyingkey $Checksum_sproutverifyingkey +Start-DownloadCheckFile $Source_saplingspendparams $maxAttempts $Dest_saplingspendparams $Checksum_saplingspendparams +Start-DownloadCheckFile $Source_saplingoutputparams $maxAttempts $Dest_saplingoutputparams $Checksum_saplingoutputparams +Start-DownloadCheckFile $Source_sproutgroth16params $maxAttempts $Dest_sproutgroth16params $Checksum_sproutgroth16params diff --git a/zcutil/setup_zend.bat b/zcutil/setup_zend.bat index a3c7763ec4..6f900a3e87 100644 --- a/zcutil/setup_zend.bat +++ b/zcutil/setup_zend.bat @@ -1,3 +1,4 @@ @echo off set COMPLUS_version=v4.0.30319 -PowerShell.exe -ExecutionPolicy Bypass -File .\fetch-params.ps1 > log.txt +PowerShell.exe -ExecutionPolicy Bypass -File .\fetch-params.ps1 +EXIT /b %ERRORLEVEL% From fd4f93e7880ed5384eb52276c8d20fcf91c89433 Mon Sep 17 00:00:00 2001 From: cronicc Date: Thu, 15 Oct 2020 06:18:18 +0000 Subject: [PATCH 2/8] Set mainnet/testnet checkpoint blocks --- src/chainparams.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b622ea32a8..a636dc1bd1 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -149,11 +149,12 @@ class CMainParams : public CChainParams { ( 543000, uint256S("0x00000000111469e247ecb152e57c371147775b56173260950075dcb471614fed")) ( 596000, uint256S("0x000000000656846513b2d3faf3a70f59dc22fffcb8e14401ec5a17eec8994410")) ( 671000, uint256S("0x00000000097174dacaf850075917d1a24145fce88a800881ece709bb8f8746cf")) - ( 724100, uint256S("0x000000000ab34fd9c61be9f10a11a97f63a0f26c8f530e67a6397fb9934709dc")), - 1589319810, // * UNIX timestamp of last checkpoint block - 14588555, // * total number of transactions between genesis and last checkpoint + ( 724100, uint256S("0x000000000ab34fd9c61be9f10a11a97f63a0f26c8f530e67a6397fb9934709dc")) + ( 812000, uint256S("0x0000000000bccf70e0d2caa0473279decddb798f456d5a4bb399898e00eb4ce9")), + 1602660459, // * UNIX timestamp of last checkpoint block + 17503039, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) - 11604 // * estimated number of transactions per day after checkpoint + 12416 // * estimated number of transactions per day after checkpoint // total number of tx / (checkpoint block height / (24 * 24)) }; @@ -245,11 +246,12 @@ class CTestNetParams : public CMainParams { (467550, uint256S("0x0007f73f339ea99e920e83da38d7537ce7d0028d48e709c88b1b89adf521b4f9")) (520000, uint256S("0x00052e65426a0ffbb90893208a6c89a82816abbed328fa2be5a647828609e61a")) (595000, uint256S("0x0000da85ddc79fdd297e996d6b6b887fc5b345619b7a6726c496941dcf830966")) - (643000, uint256S("0x0000cabf39e3ac435d54b95c32e6173d6bb1b060066ecb7453d2146a0dd40947")), - 1589272118, // * UNIX timestamp of last checkpoint block - 1325872, // * total number of transactions between genesis and last checkpoint + (643000, uint256S("0x0000cabf39e3ac435d54b95c32e6173d6bb1b060066ecb7453d2146a0dd40947")) + (729000, uint256S("0x00013f6d5315f29094287bf0981b177098c5d467422bc4ab7764f88f11333f5f")), + 1602709259, // * UNIX timestamp of last checkpoint block + 1474883, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) - 1187 // total number of tx / (checkpoint block height / (24 * 24)) + 1165 // total number of tx / (checkpoint block height / (24 * 24)) }; // commented out - seems to make no sense but kept around for reference just in case From 202a20e9dcfc42d918620667074f431777fa9164 Mon Sep 17 00:00:00 2001 From: cronicc Date: Thu, 15 Oct 2020 06:34:16 +0000 Subject: [PATCH 3/8] Set next deprecation block 920000 * next deprecation in April 2021 --- src/deprecation.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deprecation.h b/src/deprecation.h index 72027c0426..71835c4366 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -5,7 +5,7 @@ #ifndef ZCASH_DEPRECATION_H #define ZCASH_DEPRECATION_H -static const int APPROX_RELEASE_HEIGHT = 727104; +static const int APPROX_RELEASE_HEIGHT = 815168; static const int WEEKS_UNTIL_DEPRECATION = 26; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); From acbd31af7929300b49d65f640066f3db67de695b Mon Sep 17 00:00:00 2001 From: cronicc Date: Thu, 15 Oct 2020 06:52:53 +0000 Subject: [PATCH 4/8] Set version to 2.0.22, set copyright year 2020 --- README.md | 2 +- configure.ac | 6 +++--- src/clientversion.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6dfdcfb3b4..2242e5e70b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zen 2.0.21-1-bitcore +Zen 2.0.22-bitcore ============== What is Horizen? diff --git a/configure.ac b/configure.ac index deb46ab861..e14291db5c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,12 +2,12 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 21) -define(_CLIENT_VERSION_BUILD, 51) +define(_CLIENT_VERSION_REVISION, 22) +define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2019) +define(_COPYRIGHT_YEAR, 2020) AC_INIT([Zcash],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/zcash/zcash/issues],[zcash]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) diff --git a/src/clientversion.h b/src/clientversion.h index a289b9fce3..04a0dfe08a 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -34,8 +34,8 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 21 -#define CLIENT_VERSION_BUILD 51 +#define CLIENT_VERSION_REVISION 22 +#define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true @@ -44,7 +44,7 @@ * Copyright year (2009-this) * Todo: update this when changing our copyright comments in the source */ -#define COPYRIGHT_YEAR 2019 +#define COPYRIGHT_YEAR 2020 #endif //HAVE_CONFIG_H From b86f8c26fd195e1bf6d47cfd3c3ac7b562ea84bf Mon Sep 17 00:00:00 2001 From: cronicc Date: Thu, 15 Oct 2020 06:54:01 +0000 Subject: [PATCH 5/8] Rename threads from zcash to horizen --- src/init.cpp | 4 ++-- src/miner.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index a1522dda52..1f67120a6e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -188,7 +188,7 @@ void Shutdown() /// for example if the data directory was found to be locked. /// Be sure that anything that writes files or flushes caches only does this if the respective /// module was initialized. - RenameThread("zcash-shutoff"); + RenameThread("horizen-shutoff"); mempool.AddTransactionsUpdated(1); StopHTTPRPC(); @@ -637,7 +637,7 @@ void CleanupBlockRevFiles() void ThreadImport(std::vector vImportFiles) { - RenameThread("zcash-loadblk"); + RenameThread("horizen-loadblk"); // -reindex if (fReindex) { CImportingNow imp; diff --git a/src/miner.cpp b/src/miner.cpp index 10618475da..0ec0dbc3b2 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -639,7 +639,7 @@ void static BitcoinMiner() { LogPrintf("HorizenMiner started\n"); SetThreadPriority(THREAD_PRIORITY_LOWEST); - RenameThread("zen-miner"); + RenameThread("horizzen-miner"); const CChainParams& chainparams = Params(); #ifdef ENABLE_WALLET From 6928378714f138b26ba461105c4cc1d29f7f0659 Mon Sep 17 00:00:00 2001 From: cronicc Date: Thu, 15 Oct 2020 07:20:29 +0000 Subject: [PATCH 6/8] Regenerate man pages --- doc/man/zen-cli.1 | 14 +++++++------- doc/man/zen-tx.1 | 14 +++++++------- doc/man/zend.1 | 21 +++++++++++++-------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/doc/man/zen-cli.1 b/doc/man/zen-cli.1 index 5213c73900..dd20978ac6 100644 --- a/doc/man/zen-cli.1 +++ b/doc/man/zen-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZEN-CLI "1" "May 2020" "zen-cli v2.0.21-1" "User Commands" +.TH ZEN-CLI "1" "October 2020" "zen-cli v2.0.22" "User Commands" .SH NAME -zen-cli \- manual page for zen-cli v2.0.21-1 +zen-cli \- manual page for zen-cli v2.0.22 .SH DESCRIPTION -Horizen RPC client version v2.0.21-1 +Horizen RPC client version v2.0.22 .SS "Usage:" .TP zen\-cli [options] [params] @@ -64,10 +64,10 @@ Timeout in seconds during HTTP requests, or 0 for no timeout. (default: 900) .SH COPYRIGHT -Copyright (C) 2009-2019 The Bitcoin Core Developers -Copyright (C) 2015-2019 The Zcash Developers -Copyright (C) 2015-2019 Zdeveloper.org -Copyright (C) 2015-2019 Zen Blockchain Foundation +Copyright (C) 2009-2020 The Bitcoin Core Developers +Copyright (C) 2015-2020 The Zcash Developers +Copyright (C) 2015-2020 Zdeveloper.org +Copyright (C) 2015-2020 Zen Blockchain Foundation This is experimental software. diff --git a/doc/man/zen-tx.1 b/doc/man/zen-tx.1 index df15679ab3..62f07dbc77 100644 --- a/doc/man/zen-tx.1 +++ b/doc/man/zen-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZEN-TX "1" "May 2020" "zen-tx v2.0.21-1" "User Commands" +.TH ZEN-TX "1" "October 2020" "zen-tx v2.0.22" "User Commands" .SH NAME -zen-tx \- manual page for zen-tx v2.0.21-1 +zen-tx \- manual page for zen-tx v2.0.22 .SH DESCRIPTION -Zencash zen\-tx utility version v2.0.21-1 +Zencash zen\-tx utility version v2.0.22 .SS "Usage:" .TP zen\-tx [options] [commands] @@ -85,10 +85,10 @@ set=NAME:JSON\-STRING Set register NAME to given JSON\-STRING .SH COPYRIGHT -Copyright (C) 2009-2019 The Bitcoin Core Developers -Copyright (C) 2015-2019 The Zcash Developers -Copyright (C) 2015-2019 Zdeveloper.org -Copyright (C) 2015-2019 Zen Blockchain Foundation +Copyright (C) 2009-2020 The Bitcoin Core Developers +Copyright (C) 2015-2020 The Zcash Developers +Copyright (C) 2015-2020 Zdeveloper.org +Copyright (C) 2015-2020 Zen Blockchain Foundation This is experimental software. diff --git a/doc/man/zend.1 b/doc/man/zend.1 index dac984151c..99812d0264 100644 --- a/doc/man/zend.1 +++ b/doc/man/zend.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZEND "1" "May 2020" "zend v2.0.21-1" "User Commands" +.TH ZEND "1" "October 2020" "zend v2.0.22" "User Commands" .SH NAME -zend \- manual page for zend v2.0.21-1 +zend \- manual page for zend v2.0.22 .SH DESCRIPTION -Zen Daemon version v2.0.21-1 +Zen Daemon version v2.0.22 .SS "Usage:" .TP zend [options] @@ -51,7 +51,7 @@ Specify data directory \fB\-disabledeprecation=\fR .IP Disable block\-height node deprecation and automatic shutdown (example: -\fB\-disabledeprecation\fR=\fI\,2\/\fR.0.21-1) +\fB\-disabledeprecation\fR=\fI\,2\/\fR.0.22) .HP \fB\-exportdir=\fR .IP @@ -214,6 +214,11 @@ Tor control port to use if onion listening enabled (default: .IP Tor control port password (default: empty) .HP +\fB\-tlsfallbacknontls=\fR<0 or 1> +.IP +If a TLS connection fails, the next connection attempt of the same peer +(based on IP address) takes place without TLS (default: 1) +.HP \fB\-tlsvalidate=\fR<0 or 1> .IP Connect to peers only with valid certificates (default: 0) @@ -518,10 +523,10 @@ Number of seconds between metrics refreshes (default: 1 if running in a console, 600 otherwise) .SH COPYRIGHT -Copyright (C) 2009-2019 The Bitcoin Core Developers -Copyright (C) 2015-2019 The Zcash Developers -Copyright (C) 2015-2019 Zdeveloper.org -Copyright (C) 2015-2019 Zen Blockchain Foundation +Copyright (C) 2009-2020 The Bitcoin Core Developers +Copyright (C) 2015-2020 The Zcash Developers +Copyright (C) 2015-2020 Zdeveloper.org +Copyright (C) 2015-2020 Zen Blockchain Foundation This is experimental software. From 4756f63591f93801a4b69a19b27a5538aa07f439 Mon Sep 17 00:00:00 2001 From: cronicc Date: Thu, 15 Oct 2020 08:10:50 +0000 Subject: [PATCH 7/8] Add release-notes --- doc/authors.md | 17 ++-- doc/release-notes/release-notes-2.0.22.md | 100 ++++++++++++++++++++++ 2 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 doc/release-notes/release-notes-2.0.22.md diff --git a/doc/authors.md b/doc/authors.md index 9970985a77..8ca99e90f8 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,23 +1,23 @@ Zcash Contributors ================== -Jack Grigg (768) +Jack Grigg (773) Simon Liu (338) FranckDG (219) Sean Bowe (204) Daira Hopwood (142) Wladimir J. van der Laan (122) +cronicc (121) Nathan Wilcox (106) -cronicc (103) Jay Graber (75) +Taylor Hornby (74) Jonas Schnelli (74) -Taylor Hornby (73) +Alberto Sala (53) Cory Fields (45) Kevin Gallagher (38) -MarcoOl94 (32) +MarcoOl94 (34) pierstab (29) syd (28) -Alberto Sala (27) Pieter Wuille (24) joshuayabut (20) nomnombtc (18) @@ -27,6 +27,7 @@ Luke Dashjr (12) MarcoFalke (11) Jake Tarren (11) hellcatz (10) +abi87 (10) Ariel Gabizon (10) tarrenj (8) kozyilmaz (8) @@ -39,12 +40,12 @@ root (7) Philip Kaufmann (7) PeaStew (7) Pavel Janík (6) -abi87 (5) Patrick Strateman (5) Johnathan Corgan (5) Daniel Cousens (5) str4d (4) kpcyrd (4) +alsala (4) Reza Barazesh (4) Per Grön (4) João Barbosa (4) @@ -73,6 +74,7 @@ dexX7 (2) daniel (2) codeparticle (2) calebogden (2) +ca333 (2) aniemerg (2) Stephen (2) Scott (2) @@ -106,6 +108,7 @@ Alex van der Peet (2) Alberto Garoffolo (2) Adam Weiss (2) Adam Brown (2) +​Felix Ippolitov (1) pier (1) nickolay (1) mrbandrews (1) @@ -113,11 +116,11 @@ koljenovic (1) kazcw (1) isle2983 (1) fgius (1) -ca333 (1) ayleph (1) Tom Ritter (1) Stefano (1) S. Matthew English (1) +PowerVANO (1) Paragon Initiative Enterprises, LLC (1) Oleksandr Iozhytsia (1) Miles Manley (1) diff --git a/doc/release-notes/release-notes-2.0.22.md b/doc/release-notes/release-notes-2.0.22.md new file mode 100644 index 0000000000..3b49ccc6b7 --- /dev/null +++ b/doc/release-notes/release-notes-2.0.22.md @@ -0,0 +1,100 @@ +Notable changes +=============== + +* Soft Fork at mainnet block 835968/testnet block 735700 with minor changes to OP_CBAH handling +* Extend OP_CBAH unit tests +* Security hardening of TLS P2P code, only allow PFS ciphers, limit TLS versions to 1.2/1.3 +* Extend TLS unit tests +* Extend the 'getblock' RPC command with additional verbosity level, adding transaction information in the format of the getrawtransaction RPC call +* Add fetch-params.ps1 powershell script for Windows trusted setup DL and verification +* Fix for gcc10 compatibility +* Updates of dependencies OpenSSL, Univalue, libsodium +* Rename GH organization to HorizenOfficial + +Changelog +========= + +Alberto Sala (26): + WIP:Replay protection fixes + Added gtest for new rpfixfork in forkmanager + Added py test for tx_null_replay with different msg sizes pre-post rp fix fork + Added some ut for checkblockatheight scripts + First implementation for verifying cbh script before cpu intensive sign verification + Added py test for replay protection fixes + Moved code for checking rp data from tx checker obj into a suited function commonly used; removed noisy traces + Minor changes to py test + Fixes and comments after albene code review + Removed status handling from rp attribute class and modified checker function + Removed redundant check for rp attributes + Added bool data member in rpAttributes to be set when cbh opcode is found in a script + Restored exact comparison against sizeof uint256 for hash in Solver; renamed test and fixed type in func name + WIP: preliminary modifications and traces, to be continued + Prevented TLS1.0/1.1 and added ciphers for PFS support in TLS 1.2; Moved net cleanup func from global obj dtor to static func; - Handled to error in TLS separatedly from others in order not to use non-TLS connection if this happens; Used non deprecated api in creating ssl ctx; added fix for Secure Client-Initiated Renegotiation DoS threat; added py test; added more traces and a new 'tls' category + Non-tls compatibility achieved via a build defined macro, is now set via -tlsfallbacknontls zend option + tls py test: using ciphers supported by several openssl versions for portability + Modifications after code review + Modifications after code review + Removed useless option setting + Modification to the list of cipher to support in TLS1.2 + Fixed typo on tlsprotocols.py test + Removed #if0 block + Fix wrong bool condition assignment + Removed unused var in GetChance() func + Absorbing pr https://github.com/HorizenOfficial/zen/pull/321 with minor change + +Jack Grigg (5): + Add test vectors for small-order Ed25519 pubkeys + Patch libsodium 1.0.15 pubkey validation onto 1.0.18 + Patch libsodium 1.0.15 signature validation onto 1.0.18 + test: Minor tweaks to comments in LibsodiumPubkeyValidation + depends: Remove comments from libsodium signature validation patch + +MarcoOl94 (2): + Porting getblock verbose improvement + Modified help of getblock + +PowerVANO (1): + Added setup_zend.bat and fetch-params.ps1 + +Taylor Hornby (1): + Avoid names starting with __. + +abi87 (5): + Cleanup headers and forward declarations + Added py test description + First changes following final code review + Renamed enum to allow for windows compilation + Fixed socket fd check for portability + +alsala (4): + tls py test: fixed setting of unsupported cipher; fixed tls1.3 protocol connection + Fixed typo in a comment + Update src/net.h + Update src/init.cpp + +ca333 (1): + update libsodium to v1.0.18 + +cronicc (18): + Update openssl from 1.1.1d to 1.1.1g + Update univalue to v1.1.1 + Fix MacOS build issue "conversion from 'size_t' (aka 'unsigned long') to 'const UniValue' is ambiguous" + Replace calls to deprecated method push_back(Pair()) with pushKV() + Disable aria2 installation on MacOS and use wget as alternative downloader + CI fixes: + Rename org to HorizenOfficial + Remove redundant Building section from README + Update src/net.cpp + Update src/net.cpp + Fix typo + Set rpfix fork activation height + Extend fetch-params.ps1: + Set mainnet/testnet checkpoint blocks + Set next deprecation block 920000 + Set version to 2.0.22, set copyright year 2020 + Rename zcash-shutoff thread to zen-shutoff + Regenerate man pages + +​Felix Ippolitov (1): + Fix build with gcc10 + From 24a24f243add8cca1428bb07be3f8cee801b5b7d Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 19 Oct 2020 08:56:24 +0000 Subject: [PATCH 8/8] Update release-notes --- doc/authors.md | 6 +++--- doc/release-notes/release-notes-2.0.22.md | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/doc/authors.md b/doc/authors.md index 8ca99e90f8..f5c258a488 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -6,13 +6,13 @@ Simon Liu (338) FranckDG (219) Sean Bowe (204) Daira Hopwood (142) +cronicc (122) Wladimir J. van der Laan (122) -cronicc (121) Nathan Wilcox (106) Jay Graber (75) Taylor Hornby (74) Jonas Schnelli (74) -Alberto Sala (53) +Alberto Sala (58) Cory Fields (45) Kevin Gallagher (38) MarcoOl94 (34) @@ -24,10 +24,10 @@ nomnombtc (18) Paige Peterson (13) fanquake (12) Luke Dashjr (12) +abi87 (11) MarcoFalke (11) Jake Tarren (11) hellcatz (10) -abi87 (10) Ariel Gabizon (10) tarrenj (8) kozyilmaz (8) diff --git a/doc/release-notes/release-notes-2.0.22.md b/doc/release-notes/release-notes-2.0.22.md index 3b49ccc6b7..ce29ef6a71 100644 --- a/doc/release-notes/release-notes-2.0.22.md +++ b/doc/release-notes/release-notes-2.0.22.md @@ -6,15 +6,15 @@ Notable changes * Security hardening of TLS P2P code, only allow PFS ciphers, limit TLS versions to 1.2/1.3 * Extend TLS unit tests * Extend the 'getblock' RPC command with additional verbosity level, adding transaction information in the format of the getrawtransaction RPC call -* Add fetch-params.ps1 powershell script for Windows trusted setup DL and verification +* Add fetch-params.ps1 powershell script for Windows trusted setup DL and verification * Fix for gcc10 compatibility * Updates of dependencies OpenSSL, Univalue, libsodium -* Rename GH organization to HorizenOfficial +* Rename GH organization to HorizenOfficial Changelog ========= -Alberto Sala (26): +Alberto Sala (31): WIP:Replay protection fixes Added gtest for new rpfixfork in forkmanager Added py test for tx_null_replay with different msg sizes pre-post rp fix fork @@ -41,6 +41,11 @@ Alberto Sala (26): Fix wrong bool condition assignment Removed unused var in GetChance() func Absorbing pr https://github.com/HorizenOfficial/zen/pull/321 with minor change + Added checks for minimal encoding height in rp + Added UTs for rp data encodings + Further modif and UT tests for minimal encoding + Modified check of minimal push using the same code of interpreter.cpp + Added test of tx with non minimal encoding in py script Jack Grigg (5): Add test vectors for small-order Ed25519 pubkeys @@ -59,12 +64,13 @@ PowerVANO (1): Taylor Hornby (1): Avoid names starting with __. -abi87 (5): +abi87 (6): Cleanup headers and forward declarations Added py test description First changes following final code review Renamed enum to allow for windows compilation Fixed socket fd check for portability + Removed pass-by-value alsala (4): tls py test: fixed setting of unsupported cipher; fixed tls1.3 protocol connection @@ -75,7 +81,7 @@ alsala (4): ca333 (1): update libsodium to v1.0.18 -cronicc (18): +cronicc (19): Update openssl from 1.1.1d to 1.1.1g Update univalue to v1.1.1 Fix MacOS build issue "conversion from 'size_t' (aka 'unsigned long') to 'const UniValue' is ambiguous" @@ -92,8 +98,9 @@ cronicc (18): Set mainnet/testnet checkpoint blocks Set next deprecation block 920000 Set version to 2.0.22, set copyright year 2020 - Rename zcash-shutoff thread to zen-shutoff + Rename threads from zcash to horizen Regenerate man pages + Add release-notes ​Felix Ippolitov (1): Fix build with gcc10