Page MenuHomePhabricator
Files F13711295

D1505.id4134.diff
No OneTemporary
Actions

D1505.id4134.diff
View Options

diff --git a/src/dstencode.h b/src/dstencode.h
--- a/src/dstencode.h
+++ b/src/dstencode.h
@@ -19,6 +19,5 @@
// Temporary workaround. Don't rely on global state, pass all parameters in new
// code.
std::string EncodeDestination(const CTxDestination &);
-bool IsValidDestinationString(const std::string &addr);
#endif // BITCOIN_DSTENCODE_H
diff --git a/src/dstencode.cpp b/src/dstencode.cpp
--- a/src/dstencode.cpp
+++ b/src/dstencode.cpp
@@ -32,11 +32,3 @@
std::string EncodeDestination(const CTxDestination &dst) {
return EncodeDestination(dst, GetConfig());
}
-
-CTxDestination DecodeDestination(const std::string &addr) {
- return DecodeDestination(addr, Params());
-}
-
-bool IsValidDestinationString(const std::string &addr) {
- return IsValidDestinationString(addr, Params());
-}
diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp
--- a/src/qt/bitcoinaddressvalidator.cpp
+++ b/src/qt/bitcoinaddressvalidator.cpp
@@ -6,6 +6,7 @@
#include "bitcoinaddressvalidator.h"
#include "cashaddr.h"
+#include "config.h"
#include "dstencode.h"
/* Base58 characters are:
@@ -84,7 +85,8 @@
Q_UNUSED(pos);
// Validate the passed Bitcoin address
- if (IsValidDestinationString(input.toStdString())) {
+ if (IsValidDestinationString(input.toStdString(),
+ GetConfig().GetChainParams())) {
return QValidator::Acceptable;
}
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -115,16 +115,17 @@
#endif
}
-static std::string MakeAddrInvalid(std::string addr) {
+static std::string MakeAddrInvalid(std::string addr, const Config &config) {
if (addr.size() < 2) {
return "";
}
// Checksum is at the end of the address. Swapping chars to make it invalid.
std::swap(addr[addr.size() - 1], addr[addr.size() - 2]);
- if (!IsValidDestinationString(addr)) {
+ if (!IsValidDestinationString(addr, config.GetChainParams())) {
return addr;
}
+
return "";
}
@@ -136,7 +137,7 @@
0xb6, 0x7d, 0x06, 0x52, 0x99, 0x92, 0x59, 0x15, 0xae, 0xb1};
const CTxDestination dstKey = CKeyID(uint160(dummydata));
- return MakeAddrInvalid(EncodeDestination(dstKey, config));
+ return MakeAddrInvalid(EncodeDestination(dstKey, config), config);
}
// Addresses are stored in the database with the encoding that the client was
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -477,7 +477,8 @@
// normal URI
SendCoinsRecipient recipient;
if (GUIUtil::parseBitcoinURI(scheme, s, &recipient)) {
- if (!IsValidDestinationString(recipient.address.toStdString())) {
+ if (!IsValidDestinationString(recipient.address.toStdString(),
+ GetConfig().GetChainParams())) {
Q_EMIT message(
tr("URI handling"),
tr("Invalid payment address %1").arg(recipient.address),
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -108,7 +108,7 @@
public:
explicit WalletModel(const PlatformStyle *platformStyle, CWallet *wallet,
- OptionsModel *optionsModel, QObject *parent = 0);
+ OptionsModel *optionsModel, QObject *parent = nullptr);
~WalletModel();
// Returned by sendCoins
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -12,6 +12,7 @@
#include "recentrequeststablemodel.h"
#include "transactiontablemodel.h"
+#include "config.h"
#include "dstencode.h"
#include "keystore.h"
#include "net.h" // for g_connman
@@ -160,8 +161,9 @@
void WalletModel::updateAddressBook(const QString &address,
const QString &label, bool isMine,
const QString &purpose, int status) {
- if (addressTableModel)
+ if (addressTableModel) {
addressTableModel->updateEntry(address, label, isMine, purpose, status);
+ }
}
void WalletModel::updateWatchOnlyFlag(bool fHaveWatchonly) {
@@ -170,7 +172,8 @@
}
bool WalletModel::validateAddress(const QString &address) {
- return IsValidDestinationString(address.toStdString());
+ return IsValidDestinationString(address.toStdString(),
+ GetConfig().GetChainParams());
}
WalletModel::SendCoinsReturn

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 11:24 (16 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5573402
Default Alt Text
D1505.id4134.diff (4 KB)

Event Timeline