Merge branch 'elements-29.x' into merged-elements-29.x

This commit is contained in:
Byron Hambly 2026-07-27 10:43:02 +02:00
commit 7055c83b2b
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697

View file

@ -781,6 +781,7 @@ RPCHelpMan simulaterawtransaction()
static RPCHelpMan migratewallet()
{
return RPCHelpMan{"migratewallet",
"\nDISABLED\n"
"\nMigrate the wallet to a descriptor wallet.\n"
"A new wallet backup will need to be made.\n"
"\nThe migration process will create a backup of the wallet before migrating. This backup\n"
@ -819,6 +820,10 @@ static RPCHelpMan migratewallet()
wallet_name = request.params[0].get_str();
}
throw JSONRPCError(RPC_WALLET_ERROR,
"migratewallet is disabled in this version.");
/* ELEMENTS v29: disable migratewallet
SecureString wallet_pass;
wallet_pass.reserve(100);
if (!request.params[1].isNull()) {
@ -842,6 +847,7 @@ static RPCHelpMan migratewallet()
r.pushKV("backup_path", res->backup_path.utf8string());
return r;
*/
},
};
}