Update release notes, clear rc version, add missing params.

particl · Feb 26, 2020 · b222d2c · b222d2c
1 parent 888a84f
commit b222d2c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 7 deletions.
diff --git 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
@@ -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
@@ -449,7 +449,8 @@ int CLedgerDevice::SignMessage(const std::vector<uint32_t> &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<uint32_t> &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
@@ -29,7 +29,8 @@ class CLedgerDevice : public CUSBDevice
 
     int SignMessage(const std::vector<uint32_t> &vPath, const std::string &sMessage, std::vector<uint8_t> &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<uint32_t> &change_path) override;
 
     int SignTransaction(const std::vector<uint32_t> &vPath, const std::vector<uint8_t> &vSharedSecret, const CMutableTransaction *tx,
         int nIn, const CScript &scriptCode, int hashType, const std::vector<uint8_t> &amount, SigVersion sigversion,

diff --git 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<uint32_t> 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
@@ -478,7 +478,8 @@ int CTrezorDevice::SignMessage(const std::vector<uint32_t>& 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<uint32_t> &change_path)
 {
     int opened = OpenIfUnlocked(sError);
     if (0 !=  opened){

diff --git a/src/usbdevice/trezordevice.h b/src/usbdevice/trezordevice.h
@@ -51,7 +51,8 @@ class CTrezorDevice : public CUSBDevice
 
     int SignMessage(const std::vector<uint32_t> &vPath, const std::string &sMessage, std::vector<uint8_t> &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<uint32_t> &change_path) override;
 
     int SignTransaction(const std::vector<uint32_t> &vPath, const std::vector<uint8_t> &vSharedSecret, const CMutableTransaction *tx,
         int nIn, const CScript &scriptCode, int hashType, const std::vector<uint8_t> &amount, SigVersion sigversion,

diff --git a/src/usbdevice/usbdevice.h b/src/usbdevice/usbdevice.h
@@ -126,7 +126,8 @@ class CUSBDevice
 
     virtual int SignMessage(const std::vector<uint32_t> &vPath, const std::string &sMessage, std::vector<uint8_t> &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<uint32_t> &change_path) { return 0; };
 
     //int SignHash(const std::vector<uint32_t> &vPath, const uint256 &hash, std::vector<uint8_t> &vchSig, std::string &sError);
     virtual int SignTransaction(const std::vector<uint32_t> &vPath, const std::vector<uint8_t> &vSharedSecret, const CMutableTransaction *tx,