From b222d2c879f4eca32592511f40f18c34f22fde1a Mon Sep 17 00:00:00 2001 From: tecnovert Date: Wed, 26 Feb 2020 13:11:56 +0200 Subject: [PATCH] Update release notes, clear rc version, add missing params. --- configure.ac | 2 +- doc/release-notes-particl.md | 3 +++ src/usbdevice/ledgerdevice.cpp | 3 ++- src/usbdevice/ledgerdevice.h | 3 ++- src/usbdevice/rpcusbdevice.cpp | 4 +++- src/usbdevice/trezordevice.cpp | 3 ++- src/usbdevice/trezordevice.h | 3 ++- src/usbdevice/usbdevice.h | 3 ++- 8 files changed, 17 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 173f4752696f6..37aa22e6739e4 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ define(_CLIENT_VERSION_MINOR, 19) define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_PARTICL, 1) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 1) +define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/doc/release-notes-particl.md b/doc/release-notes-particl.md index 3ca50d9e3c108..a1428ddaf90a5 100644 --- a/doc/release-notes-particl.md +++ b/doc/release-notes-particl.md @@ -6,6 +6,9 @@ - Merged Bitcoin 0.19.1 backports. - Added generatemnemonic command to particl-wallet. - Qt receiving addresses table displays relative paths. + - Qt receiving addresses page can verify an address on a hardware device. + - Window -> Receiving addreses, right click on address -> Verify Address On Hardware Wallet + - Path of change address is sent to ledger hardware devices. 0.19.0.1 diff --git a/src/usbdevice/ledgerdevice.cpp b/src/usbdevice/ledgerdevice.cpp index 1b2d540024720..dc348c9d07f26 100644 --- a/src/usbdevice/ledgerdevice.cpp +++ b/src/usbdevice/ledgerdevice.cpp @@ -449,7 +449,8 @@ int CLedgerDevice::SignMessage(const std::vector &vPath, const std::st return 0; }; -int CLedgerDevice::PrepareTransaction(CMutableTransaction &tx, const CCoinsViewCache &view, const FillableSigningProvider &keystore, int nHashType) +int CLedgerDevice::PrepareTransaction(CMutableTransaction &tx, const CCoinsViewCache &view, const FillableSigningProvider &keystore, int nHashType, + int change_pos, const std::vector &change_path) { if (0 != Open()) { return errorN(1, sError, __func__, "Device not open."); diff --git a/src/usbdevice/ledgerdevice.h b/src/usbdevice/ledgerdevice.h index dbe1c031a6063..462ae7b7dcb9c 100644 --- a/src/usbdevice/ledgerdevice.h +++ b/src/usbdevice/ledgerdevice.h @@ -29,7 +29,8 @@ class CLedgerDevice : public CUSBDevice int SignMessage(const std::vector &vPath, const std::string &sMessage, std::vector &vchSig, std::string &sError) override; - int PrepareTransaction(CMutableTransaction &tx, const CCoinsViewCache &view, const FillableSigningProvider &keystore, int nHashType) override; + int PrepareTransaction(CMutableTransaction &tx, const CCoinsViewCache &view, const FillableSigningProvider &keystore, int nHashType, + int change_pos, const std::vector &change_path) override; int SignTransaction(const std::vector &vPath, const std::vector &vSharedSecret, const CMutableTransaction *tx, int nIn, const CScript &scriptCode, int hashType, const std::vector &amount, SigVersion sigversion, diff --git a/src/usbdevice/rpcusbdevice.cpp b/src/usbdevice/rpcusbdevice.cpp index 6f243c70ca58f..b2f4233b7d710 100644 --- a/src/usbdevice/rpcusbdevice.cpp +++ b/src/usbdevice/rpcusbdevice.cpp @@ -662,7 +662,9 @@ static UniValue devicesignrawtransaction(const JSONRPCRequest &request) const CTransaction txConst(mtx); // Prepare transaction - int prep = pDevice->PrepareTransaction(mtx, view, keystore, nHashType); + int change_pos = -1; + std::vector change_path; + int prep = pDevice->PrepareTransaction(mtx, view, keystore, nHashType, change_pos, change_path); if (0 != prep) { throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("PrepareTransaction failed with code %d.", prep)); } diff --git a/src/usbdevice/trezordevice.cpp b/src/usbdevice/trezordevice.cpp index ab001dca41a8a..ffbbeb4b88a0d 100644 --- a/src/usbdevice/trezordevice.cpp +++ b/src/usbdevice/trezordevice.cpp @@ -478,7 +478,8 @@ int CTrezorDevice::SignMessage(const std::vector& vPath, const std::st return 0; }; -int CTrezorDevice::PrepareTransaction(CMutableTransaction& mtx, const CCoinsViewCache& view, const FillableSigningProvider& keystore, int nHashType) +int CTrezorDevice::PrepareTransaction(CMutableTransaction& mtx, const CCoinsViewCache& view, const FillableSigningProvider& keystore, int nHashType, + int change_pos, const std::vector &change_path) { int opened = OpenIfUnlocked(sError); if (0 != opened){ diff --git a/src/usbdevice/trezordevice.h b/src/usbdevice/trezordevice.h index f8e75e9a7aef4..bde1440888757 100644 --- a/src/usbdevice/trezordevice.h +++ b/src/usbdevice/trezordevice.h @@ -51,7 +51,8 @@ class CTrezorDevice : public CUSBDevice int SignMessage(const std::vector &vPath, const std::string &sMessage, std::vector &vchSig, std::string &sError) override; - int PrepareTransaction(CMutableTransaction &tx, const CCoinsViewCache &view, const FillableSigningProvider &keystore, int nHashType) override; + int PrepareTransaction(CMutableTransaction &tx, const CCoinsViewCache &view, const FillableSigningProvider &keystore, int nHashType, + int change_pos, const std::vector &change_path) override; int SignTransaction(const std::vector &vPath, const std::vector &vSharedSecret, const CMutableTransaction *tx, int nIn, const CScript &scriptCode, int hashType, const std::vector &amount, SigVersion sigversion, diff --git a/src/usbdevice/usbdevice.h b/src/usbdevice/usbdevice.h index 3728b14598ad5..abf25d4d8bc69 100644 --- a/src/usbdevice/usbdevice.h +++ b/src/usbdevice/usbdevice.h @@ -126,7 +126,8 @@ class CUSBDevice virtual int SignMessage(const std::vector &vPath, const std::string &sMessage, std::vector &vchSig, std::string &sError) { return 0; }; - virtual int PrepareTransaction(CMutableTransaction &tx, const CCoinsViewCache &view, const FillableSigningProvider &keystore, int nHashType) { return 0; }; + virtual int PrepareTransaction(CMutableTransaction &tx, const CCoinsViewCache &view, const FillableSigningProvider &keystore, int nHashType, + int change_pos, const std::vector &change_path) { return 0; }; //int SignHash(const std::vector &vPath, const uint256 &hash, std::vector &vchSig, std::string &sError); virtual int SignTransaction(const std::vector &vPath, const std::vector &vSharedSecret, const CMutableTransaction *tx,