diff options
| author | fanquake <fanquake@gmail.com> | 2019-08-06 09:31:09 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-08-06 09:39:26 +0800 |
| commit | 31d98584f3c570961359c308619f5cf2e9178482 (patch) | |
| tree | 2b59ec404a6c65be80edabcdc762f454eff69a1b /src/interfaces | |
| parent | 62117f9f363ea669c6cc9cebf81d55a9581cedb6 (diff) | |
| parent | fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234 (diff) | |
| download | bitcoin-31d98584f3c570961359c308619f5cf2e9178482.tar.xz | |
Merge #16497: gui: Generate bech32 addresses by default (take 2, fixup)
fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234 gui: Generate bech32 addresses by default (take 2, fixup) (MarcoFalke)
Pull request description:
This commit was missing from my previous pull request for some reason :thinking: :
* gui: Generate bech32 addresses by default #15711
ACKs for top commit:
jonasschnelli:
Tested ACK fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234
promag:
ACK fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234.
fanquake:
ACK fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234
Tree-SHA512: 4a38df929d7704bf08e50a2e814b2e6cd25c4165d040a84287045b44e32f4708750845520d64170ea58e41de3ca496da4625d3eb375f9528b21b364c22068a6b
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/node.cpp | 1 | ||||
| -rw-r--r-- | src/interfaces/node.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index fd2fb6531b..bcd226edd9 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -198,6 +198,7 @@ public: return GuessVerificationProgress(Params().TxData(), tip); } bool isInitialBlockDownload() override { return ::ChainstateActive().IsInitialBlockDownload(); } + bool isAddressTypeSet() override { return !::gArgs.GetArg("-addresstype", "").empty(); } bool getReindex() override { return ::fReindex; } bool getImporting() override { return ::fImporting; } void setNetworkActive(bool active) override diff --git a/src/interfaces/node.h b/src/interfaces/node.h index bb4b3e1fae..b93b52c5cc 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -150,6 +150,9 @@ public: //! Is initial block download. virtual bool isInitialBlockDownload() = 0; + //! Is -addresstype set. + virtual bool isAddressTypeSet() = 0; + //! Get reindex. virtual bool getReindex() = 0; |