diff --git a/COPYING b/COPYING index 2dd806c6c..12c43330c 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ Copyright (c) 2016-2019 The Zcash developers Copyright (c) 2009-2019 The Bitcoin Core developers Copyright (c) 2009-2019 Bitcoin Developers -Copyright (c) 2018-2020 The BitcoinZ Community +Copyright (c) 2018-2022 The BitcoinZ Community Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 30d55fb62..e154d47a7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# BitcoinZ 2.0.8 +# BitcoinZ 2.0.8-1 **Keep running wallet to strengthen the BitcoinZ network. Backup your wallet in many locations & keep your coins wallet offline.** ### Ports: diff --git a/configure.ac b/configure.ac index 7f0df9106..f3f59aca7 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 8) -define(_CLIENT_VERSION_BUILD, 50) +define(_CLIENT_VERSION_BUILD, 51) 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) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 3547e241c..691df59aa 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +bitcoinz (2.0.8-1) stable; urgency=low + + * 2.0.8-1 release. + + -- The BitcoinZ Community Nov 2022 + bitcoinz (2.0.8) stable; urgency=low * 2.0.8 release. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 7df13dec6..37db22d53 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoinz-2.0.8" +name: "bitcoinz-2.0.8-1" enable_cache: true distro: "debian" suites: diff --git a/doc/man/bitcoinz-cli.1 b/doc/man/bitcoinz-cli.1 index 34c461886..87e3d7680 100644 --- a/doc/man/bitcoinz-cli.1 +++ b/doc/man/bitcoinz-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOINZ-CLI "1" "Sep 2022" "bitcoinz-cli v2.0.8" "User Commands" +.TH BITCOINZ-CLI "1" "Sep 2022" "bitcoinz-cli v2.0.8-1" "User Commands" .SH NAME -bitcoinz-cli \- manual page for bitcoinz-cli v2.0.8 +bitcoinz-cli \- manual page for bitcoinz-cli v2.0.8-1 .SH DESCRIPTION -BitcoinZ RPC client version v2.0.8 +BitcoinZ RPC client version v2.0.8-1 .PP In order to ensure you are adequately protecting your privacy when using BitcoinZ, please see . diff --git a/doc/man/bitcoinz-tx.1 b/doc/man/bitcoinz-tx.1 index 9eb45c1c9..5fc1712ff 100644 --- a/doc/man/bitcoinz-tx.1 +++ b/doc/man/bitcoinz-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOINZ-TX "1" "Sep 2022" "bitcoinz-tx v2.0.8" "User Commands" +.TH BITCOINZ-TX "1" "Sep 2022" "bitcoinz-tx v2.0.8-1" "User Commands" .SH NAME -bitcoinz-tx \- manual page for bitcoinz-tx v2.0.8 +bitcoinz-tx \- manual page for bitcoinz-tx v2.0.8-1 .SH DESCRIPTION -BitcoinZ bitcoinz\-tx utility version v2.0.8 +BitcoinZ bitcoinz\-tx utility version v2.0.8-1 .SS "Usage:" .TP bitcoinz\-tx [options] [commands] diff --git a/doc/man/bitcoinzd.1 b/doc/man/bitcoinzd.1 index ee85749ca..a275b3366 100644 --- a/doc/man/bitcoinzd.1 +++ b/doc/man/bitcoinzd.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOINZD "1" "Sep 2022" "bitcoinzd v2.0.8" "User Commands" +.TH BITCOINZD "1" "Sep 2022" "bitcoinzd v2.0.8-1" "User Commands" .SH NAME -bitcoinzd \- manual page for bitcoinzd v2.0.8 +bitcoinzd \- manual page for bitcoinzd v2.0.8-1 .SH DESCRIPTION -BitcoinZ Daemon version v2.0.8 +BitcoinZ Daemon version v2.0.8-1 .PP In order to ensure you are adequately protecting your privacy when using BitcoinZ, please see . diff --git a/doc/release-notes/release-notes-2.0.8-1.md b/doc/release-notes/release-notes-2.0.8-1.md new file mode 100644 index 000000000..790ce1135 --- /dev/null +++ b/doc/release-notes/release-notes-2.0.8-1.md @@ -0,0 +1,20 @@ +Notable changes +=============== + +Debug.log file Flooding (low impact) Update +--------------------------------------------- + +By the node version 2.0.7-10 we added the possibility to add an OP code with an Hex encoded string in the transactions that also give an unexpected output format if it is used. This unexpected output format is `OP_RETURN __` . + +Now, when the Insight option is activated, the node try to find the spent index information about this `OP_RETURN` code that are not existing as the spent amount is zero (0). And this trigger an error in the debug.log file for each Raw DATA. + +Error in the log file for Insight : `ERROR: Unable to get spent index information` +Check https://github.com/btcz/bitcoinz/issues/71 for more details. + +Changelog +========= + +Marcelus (3) + In the wallet class make a test to know if it's an TX_NULL_DATA. + In the main class make a test to know if outputValue is zero (0) so no spent info possible. + Update version to 2.0.8-1 diff --git a/doc/release-notes/release-notes-2.0.8-RC1.md b/doc/release-notes/release-notes-2.0.8-RC1.md deleted file mode 100644 index 4c7be84fe..000000000 --- a/doc/release-notes/release-notes-2.0.8-RC1.md +++ /dev/null @@ -1,2 +0,0 @@ -Notable changes -=============== diff --git a/doc/release-notes/release-notes-2.0.8.md b/doc/release-notes/release-notes-2.0.8.md new file mode 100644 index 000000000..2029962e2 --- /dev/null +++ b/doc/release-notes/release-notes-2.0.8.md @@ -0,0 +1,22 @@ +Notable changes +=============== + +Private viewing keys (PVK) +-------------------------- + +Implement Sapling viewing keys zcash/zcash#3060 +Add support for importing and exporting sapling ivk #3060 zcash/zcash#3822 + +Changelog +========= + +Marcelus (9): + Incorporation of ZEC changes into BTCZ + - Add z_gettreestate RPC + - Fix the use of 0 as expiryheight in createrawtransaction, to disable expiry + - Bitcoin 0.12 wallet PRs 1 + - Fix GHSA-xwpp-3gx9-68rr + - Wallet interface refactor + - Update z_viewtransaction + - insightexplorer: LOCK(cs_main) during rpcs + - Return address and type of imported key in z_importkey diff --git a/src/clientversion.h b/src/clientversion.h index be5b3698b..88a2676ea 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin Core developers // Copyright (c) 2016-2019 The Zcash developers -// Copyright (c) 2017-2020 The BitcoinZ Community +// Copyright (c) 2017-2022 The BitcoinZ Community // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php . @@ -19,7 +19,7 @@ #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 8 -#define CLIENT_VERSION_BUILD 50 +#define CLIENT_VERSION_BUILD 51 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/main.cpp b/src/main.cpp index c812bc79d..11f7d7f94 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1637,8 +1637,16 @@ bool GetSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value) if (mempool.getSpentIndex(key, value)) return true; - if (!pblocktree->ReadSpentIndex(key, value)) + // In either case, we need to get more info ... + if (!pblocktree->ReadSpentIndex(key, value)) { + + // Check if its an OP_RETURN code. GITHUB ISSUE #71 + // Only return error if it's a valid address + CTxDestination dest = DestFromAddressHash(value.addressType, value.addressHash); + if (IsValidDestination(dest)) { return error("Unable to get spent index information"); + } + } return true; } diff --git a/src/metrics.cpp b/src/metrics.cpp index 05a6472fb..6dce4e25e 100644 --- a/src/metrics.cpp +++ b/src/metrics.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2020 The BitcoinZ community +// Copyright (c) 2022 The BitcoinZ community // Copyright (c) 2016 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php . @@ -461,7 +461,7 @@ void ThreadShowMetricsScreen() std::cout << std::endl; // Thank you text - std::cout << _("BTCZ Node Version 2.0.8 (YODA) - Protocol 770008") << std::endl; + std::cout << _("BTCZ Node Version 2.0.8-1 (YODA) - Protocol 770008") << std::endl; std::cout << _("Thank you for running a BitcoinZ node!") << std::endl; std::cout << _("You're helping to strengthen the network and contributing to a social good :)") << std::endl; } diff --git a/src/spentindex.h b/src/spentindex.h index 9f85c62b0..21962c183 100644 --- a/src/spentindex.h +++ b/src/spentindex.h @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin Core developers +// Copyright (c) 2018-2022 BitcoinZ core Team // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php . diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index c8f634b5d..4a965ef88 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2478,13 +2478,23 @@ void CWalletTx::GetAmounts(list& listReceived, else if (!(fIsMine & filter)) continue; - // In either case, we need to get the destination address CTxDestination address; + + // In either case, we need to get the destination address if (!ExtractDestination(txout.scriptPubKey, address)) { + address = CNoDestination(); + + // Check if its an OP code. GITHUB ISSUE #71 + vector addresses; + txnouttype typeRet; + int nRequiredRet; + ExtractDestinations(txout.scriptPubKey, typeRet, addresses, nRequiredRet); + if (typeRet != TX_NULL_DATA) + { LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n", this->GetHash().ToString()); - address = CNoDestination(); + } } COutputEntry output = {address, txout.nValue, (int)i};