diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2020-04-29 17:00:24 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2020-11-04 12:10:23 -0500 |
| commit | bd7398cc6258c258e9f4411c50630ec4a552341b (patch) | |
| tree | 210adf4d98bc95729d11c4bdd6ac367b37b14c95 /src/wallet/scriptpubkeyman.h | |
| parent | 5f720544f34dedf75b063b962845fa8eca604514 (diff) | |
| download | bitcoin-bd7398cc6258c258e9f4411c50630ec4a552341b.tar.xz | |
wallet: have ScriptPubKeyMan::Upgrade check against the new version
Instead of using CanSupportFeature and relying on nWalletMaxVersion,
take the new version we are upgrading to and use IsSupportedFeature
with that and the previous wallet version.
Diffstat (limited to 'src/wallet/scriptpubkeyman.h')
| -rw-r--r-- | src/wallet/scriptpubkeyman.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index 14fb1fa89f..afbb1922c9 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -206,7 +206,7 @@ public: virtual bool CanGetAddresses(bool internal = false) const { return false; } /** Upgrades the wallet to the specified version */ - virtual bool Upgrade(int prev_version, bilingual_str& error) { return false; } + virtual bool Upgrade(int prev_version, int new_version, bilingual_str& error) { return false; } virtual bool HavePrivateKeys() const { return false; } @@ -371,7 +371,7 @@ public: bool SetupGeneration(bool force = false) override; - bool Upgrade(int prev_version, bilingual_str& error) override; + bool Upgrade(int prev_version, int new_version, bilingual_str& error) override; bool HavePrivateKeys() const override; |