Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-08-04 05:54:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Diff-minimise

Browse Source
This commit is contained in:
Luke Dashjr 2023-07-27 18:41:51 +00:00
parent 6e80cf2bbd
commit 816d59c61a
2 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/wallet/rpc/backup.cpp
View File

@ -255,15 +255,15 @@ RPCHelpMan importaddress()
// Use legacy spkm only if the wallet does not support descriptors. // Use legacy spkm only if the wallet does not support descriptors.
bool use_legacy = !pwallet->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS); bool use_legacy = !pwallet->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS);
if (!use_legacy) { if (use_legacy) {
// In case the wallet is blank
EnsureLegacyScriptPubKeyMan(*pwallet, true);
} else {
// We don't allow mixing watch-only descriptors with spendable ones. // We don't allow mixing watch-only descriptors with spendable ones.
if (!pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) { if (!pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
throw JSONRPCError(RPC_WALLET_ERROR, "Cannot import address in wallet with private keys enabled. " throw JSONRPCError(RPC_WALLET_ERROR, "Cannot import address in wallet with private keys enabled. "
"Create wallet with no private keys to watch specific addresses/scripts"); "Create wallet with no private keys to watch specific addresses/scripts");
} }
} else {
// In case the wallet is blank
EnsureLegacyScriptPubKeyMan(*pwallet, /*also_create=*/true);
} }
const std::string strLabel{LabelFromValue(request.params[1])}; const std::string strLabel{LabelFromValue(request.params[1])};
@ -308,14 +308,15 @@ RPCHelpMan importaddress()
if (fP2SH) { if (fP2SH) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Cannot use the p2sh flag with an address - use a script instead"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Cannot use the p2sh flag with an address - use a script instead");
} }
if (OutputTypeFromDestination(dest) == OutputType::BECH32M) {
if (use_legacy)
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Bech32m addresses cannot be imported into legacy wallets");
}
pwallet->MarkDirty(); pwallet->MarkDirty();
if (use_legacy) { if (use_legacy) {
if (OutputTypeFromDestination(dest) == OutputType::BECH32M) { pwallet->ImportScriptPubKeys(strLabel, {GetScriptForDestination(dest)}, /*have_solving_data=*/false, /*apply_label=*/true, /*timestamp=*/1);
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Bech32m addresses cannot be imported into legacy wallets");
}
pwallet->ImportScriptPubKeys(strLabel, {GetScriptForDestination(dest)}, /*have_solving_data=*/false, /*apply_label=*/true, /*timestamp=*/1);
} else { } else {
import_descriptor("addr(" + address + ")", strLabel); import_descriptor("addr(" + address + ")", strLabel);
} }
@ -324,13 +325,16 @@ RPCHelpMan importaddress()
if (use_legacy) { if (use_legacy) {
std::vector<unsigned char> data(ParseHex(hex)); std::vector<unsigned char> data(ParseHex(hex));
CScript redeem_script(data.begin(), data.end()); CScript redeem_script(data.begin(), data.end());
std::set<CScript> scripts = {redeem_script};
pwallet->ImportScripts(scripts, /*timestamp=*/0); std::set<CScript> scripts = {redeem_script};
if (fP2SH) { pwallet->ImportScripts(scripts, /*timestamp=*/0);
scripts.insert(GetScriptForDestination(ScriptHash(redeem_script)));
} if (fP2SH) {
pwallet->ImportScriptPubKeys(strLabel, scripts, /*have_solving_data=*/false, /*apply_label=*/true, /*timestamp=*/1); scripts.insert(GetScriptForDestination(ScriptHash(redeem_script)));
}
pwallet->ImportScriptPubKeys(strLabel, scripts, /*have_solving_data=*/false, /*apply_label=*/true, /*timestamp=*/1);
} else { } else {
// P2SH Not allowed. Can't detect inner P2SH function from a raw hex. // P2SH Not allowed. Can't detect inner P2SH function from a raw hex.
if (fP2SH) throw JSONRPCError(RPC_WALLET_ERROR, "P2SH import feature disabled for descriptors' wallet. " if (fP2SH) throw JSONRPCError(RPC_WALLET_ERROR, "P2SH import feature disabled for descriptors' wallet. "

27
test/functional/test_framework/test_node.py
View File

@ -950,3 +950,30 @@ class RPCOverloadWrapper():
import_res = self.importdescriptors(req) import_res = self.importdescriptors(req)
if not import_res[0]['success']: if not import_res[0]['success']:
raise JSONRPCException(import_res[0]['error']) raise JSONRPCException(import_res[0]['error'])
def _deleted_importaddress(self, address, label=None, rescan=None, p2sh=None):
wallet_info = self.getwalletinfo()
if 'descriptors' not in wallet_info or ('descriptors' in wallet_info and not wallet_info['descriptors']):
return self.__getattr__('importaddress')(address, label, rescan, p2sh)
is_hex = False
try:
int(address ,16)
is_hex = True
desc = descsum_create('raw(' + address + ')')
except Exception:
desc = descsum_create('addr(' + address + ')')
reqs = [{
'desc': desc,
'timestamp': 0 if rescan else 'now',
'label': label if label else ''
}]
if is_hex and p2sh:
reqs.append({
'desc': descsum_create('p2sh(raw(' + address + '))'),
'timestamp': 0 if rescan else 'now',
'label': label if label else ''
})
import_res = self.importdescriptors(reqs)
for res in import_res:
if not res['success']:
raise JSONRPCException(res['error'])