Skip to content

feat: support rpc protx-register for descriptor wallets - part VI #6003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 14, 2024
Merged

feat: support rpc protx-register for descriptor wallets - part VI #6003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ab108c
feat: implementation of RPC 'protx register' for descriptor wallets
knst Apr 12, 2024
838d06f
feat: enable descriptor wallets for more tests
knst Apr 24, 2024
b2ede8b
feat: update list of tests that still doesn't support descriptor wallets
knst May 6, 2024
a33dcb3
fix: CheckWalletOwnsScript/CheckWalletOwnsKey to use wallet instead o…
knst Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 21 additions & 34 deletions src/rpc/evo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,18 +776,23 @@ static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
ret.pushKV("signMessage", ptx.MakeSignString());
return ret;
} else {
// lets prove we own the collateral
// TODO: make collateral works with Descriptor wallets too
const LegacyScriptPubKeyMan* spk_man = wallet->GetLegacyScriptPubKeyMan();
if (!spk_man) {
throw JSONRPCError(RPC_WALLET_ERROR, "This type of wallet does not support this command");
}

CKey key;
if (!spk_man->GetKey(ToKeyID(*pkhash), key)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("collateral key not in wallet: %s", EncodeDestination(txDest)));
}
SignSpecialTxPayloadByString(tx, ptx, key);
{
LOCK(wallet->cs_wallet);
// lets prove we own the collateral
CScript scriptPubKey = GetScriptForDestination(txDest);
std::unique_ptr<SigningProvider> provider = wallet->GetSolvingProvider(scriptPubKey);

std::string signed_payload;
SigningResult err = wallet->SignMessage(ptx.MakeSignString(), *pkhash, signed_payload);
if (err == SigningResult::SIGNING_FAILED) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, SigningResultString(err));
} else if (err != SigningResult::OK){
throw JSONRPCError(RPC_WALLET_ERROR, SigningResultString(err));
}
bool invalid = false;
ptx.vchSig = DecodeBase64(signed_payload.c_str(), &invalid);
if (invalid) throw JSONRPCError(RPC_INTERNAL_ERROR, "failed to decode base64 ready signature for protx");
} // cs_wallet
SetTxPayload(tx, ptx);
return SignAndSendSpecialTx(request, chain_helper, chainman, tx, fSubmit);
}
Expand Down Expand Up @@ -1259,33 +1264,15 @@ static void protx_list_help(const JSONRPCRequest& request)
}

#ifdef ENABLE_WALLET
static bool CheckWalletOwnsKey(const CWallet* const pwallet, const CKeyID& keyID) {
if (!pwallet) {
return false;
}
const LegacyScriptPubKeyMan* const spk_man = pwallet->GetLegacyScriptPubKeyMan();
if (!spk_man) {
return false;
}
return spk_man->HaveKey(keyID);
}

static bool CheckWalletOwnsScript(const CWallet* const pwallet, const CScript& script) {
if (!pwallet) {
return false;
}
const LegacyScriptPubKeyMan* const spk_man = pwallet->GetLegacyScriptPubKeyMan();
if (!spk_man) {
return false;
}
return WITH_LOCK(pwallet->cs_wallet, return pwallet->IsMine(script)) == isminetype::ISMINE_SPENDABLE;
}

CTxDestination dest;
if (ExtractDestination(script, dest)) {
if ((std::get_if<PKHash>(&dest) && spk_man->HaveKey(ToKeyID(*std::get_if<PKHash>(&dest)))) || (std::get_if<ScriptHash>(&dest) && spk_man->HaveCScript(CScriptID{ScriptHash(*std::get_if<ScriptHash>(&dest))}))) {
return true;
}
}
return false;
static bool CheckWalletOwnsKey(const CWallet* const pwallet, const CKeyID& keyID) {
return CheckWalletOwnsScript(pwallet, GetScriptForDestination(PKHash(keyID)));
}
#endif

Expand Down
43 changes: 22 additions & 21 deletions test/functional/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
# Scripts that are run by default.
# Longest test should go first, to favor running tests in parallel
'feature_dip3_deterministicmns.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_data_recovery.py --legacy-wallet',
'feature_llmq_data_recovery.py',
'wallet_hd.py --legacy-wallet',
'wallet_hd.py --descriptors',
'wallet_backup.py --legacy-wallet',
Expand All @@ -105,9 +105,9 @@
'rpc_fundrawtransaction.py --legacy-wallet',
'rpc_fundrawtransaction.py --legacy-wallet --nohd',
'rpc_fundrawtransaction.py --descriptors',
'p2p_quorum_data.py --legacy-wallet',
'p2p_quorum_data.py',
# vv Tests less than 2m vv
'p2p_instantsend.py --legacy-wallet',
'p2p_instantsend.py',
'wallet_basic.py --legacy-wallet',
'wallet_basic.py --descriptors',
'wallet_labels.py --legacy-wallet',
Expand All @@ -120,20 +120,20 @@
'wallet_listtransactions.py --legacy-wallet',
'wallet_listtransactions.py --descriptors',
'feature_multikeysporks.py',
'feature_dip3_v19.py --legacy-wallet',
'feature_llmq_signing.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_signing.py --spork21 --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_chainlocks.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_rotation.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_connections.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_evo.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_simplepose.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_is_cl_conflicts.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_is_retroactive.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_llmq_dkgerrors.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_dip4_coinbasemerkleroots.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_asset_locks.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_mnehf.py --legacy-wallet', # NOTE: needs dash_hash to pass
'feature_dip3_v19.py',
'feature_llmq_signing.py', # NOTE: needs dash_hash to pass
'feature_llmq_signing.py --spork21', # NOTE: needs dash_hash to pass
'feature_llmq_chainlocks.py', # NOTE: needs dash_hash to pass
'feature_llmq_rotation.py', # NOTE: needs dash_hash to pass
'feature_llmq_connections.py', # NOTE: needs dash_hash to pass
'feature_llmq_evo.py', # NOTE: needs dash_hash to pass
'feature_llmq_simplepose.py', # NOTE: needs dash_hash to pass
'feature_llmq_is_cl_conflicts.py', # NOTE: needs dash_hash to pass
'feature_llmq_is_retroactive.py', # NOTE: needs dash_hash to pass
'feature_llmq_dkgerrors.py', # NOTE: needs dash_hash to pass
'feature_dip4_coinbasemerkleroots.py', # NOTE: needs dash_hash to pass
'feature_asset_locks.py', # NOTE: needs dash_hash to pass
'feature_mnehf.py', # NOTE: needs dash_hash to pass
# vv Tests less than 60s vv
'p2p_sendheaders.py', # NOTE: needs dash_hash to pass
'p2p_sendheaders_compressed.py', # NOTE: needs dash_hash to pass
Expand All @@ -151,6 +151,7 @@
'feature_abortnode.py',
# vv Tests less than 30s vv
'rpc_quorum.py --legacy-wallet',
'rpc_quorum.py --descriptors',
'wallet_keypool_topup.py --legacy-wallet',
'wallet_keypool_topup.py --descriptors',
'feature_fee_estimation.py',
Expand Down Expand Up @@ -227,7 +228,7 @@
'feature_backwards_compatibility.py --legacy-wallet',
'feature_backwards_compatibility.py --descriptors',
'wallet_txn_clone.py --mineblock',
'feature_notifications.py --legacy-wallet',
'feature_notifications.py',
'rpc_getblockfilter.py',
'rpc_invalidateblock.py',
'feature_txindex.py',
Expand Down Expand Up @@ -290,10 +291,10 @@
'p2p_unrequested_blocks.py', # NOTE: needs dash_hash to pass
'feature_shutdown.py',
'rpc_coinjoin.py',
'rpc_masternode.py --legacy-wallet',
'rpc_masternode.py',
'rpc_mnauth.py',
'rpc_verifyislock.py --legacy-wallet',
'rpc_verifychainlock.py --legacy-wallet',
'rpc_verifyislock.py',
'rpc_verifychainlock.py',
'wallet_create_tx.py --legacy-wallet',
'wallet_send.py --legacy-wallet',
'wallet_send.py --descriptors',
Expand Down