feat: forbid wallet upgrade from non-HD to HD by upgradewallet

dashpay · Jan 25, 2024 · a78fbc2 · a78fbc2
1 parent 0127da8
commit a78fbc2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4897,7 +4897,14 @@ bool CWallet::UpgradeWallet(int version, bilingual_str& error)
         return false;
     }
 
+    // Discourage users to skip passphrase for HD wallets
+    if (nMaxVersion >= FEATURE_HD && !IsHDEnabled()) {
+        error = Untranslated("You should use upgradetohd RPC to upgrade non-HD wallet to HD");
+        return false;
+    }
+
     SetMaxVersion(nMaxVersion);
+
     return true;
 }
 

diff --git a/test/functional/wallet_upgradewallet.py b/test/functional/wallet_upgradewallet.py
@@ -17,6 +17,7 @@
     assert_equal,
     assert_greater_than_or_equal,
     assert_is_hex_string,
+    assert_raises_rpc_error,
 )
 
 
@@ -125,14 +126,14 @@ def run_test(self):
         assert_equal('hdseedid' in wallet.getwalletinfo(), False)
         # calling upgradewallet with explicit version number
         # should return nothing if successful
-        assert_equal(wallet.upgradewallet(120200), "")
+        assert_raises_rpc_error(-4, "You should use upgradetohd RPC to upgrade non-HD wallet to HD", wallet.upgradewallet, 120200)
 
-        new_version = wallet.getwalletinfo()["walletversion"]
-        # upgraded wallet should have version 120200
-        #assert_equal(new_version, 120200)
-        # after conversion master key hash should not be present yet
         assert 'hdchainid' not in wallet.getwalletinfo()
+
         assert_equal(wallet.upgradetohd(), True)
+        new_version = wallet.getwalletinfo()["walletversion"]
+        # after conversion master key hash should not be present yet
+        assert 'hdchainid' in wallet.getwalletinfo()
         assert_equal(new_version, 120200)
         assert_is_hex_string(wallet.getwalletinfo()['hdchainid'])