Skip to content

Commit

Permalink
Port rpc wallet
Browse files Browse the repository at this point in the history
  • Loading branch information
timemarkovqtum committed Jul 1, 2024
1 parent c23147c commit e53ee0f
Show file tree
Hide file tree
Showing 9 changed files with 617 additions and 41 deletions.
17 changes: 15 additions & 2 deletions src/wallet/receive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,17 @@ CAmount CachedTxGetImmatureCredit(const CWallet& wallet, const CWalletTx& wtx, c
return 0;
}

CAmount CachedTxGetStakeCredit(const CWallet& wallet, const CWalletTx& wtx, const isminefilter& filter)
{
AssertLockHeld(wallet.cs_wallet);

if (wallet.IsTxImmatureCoinStake(wtx) && wallet.IsTxInMainChain(wtx)) {
return GetCachableAmount(wallet, wtx, CWalletTx::IMMATURE_CREDIT, filter);
}

return 0;
}

CAmount CachedTxGetAvailableCredit(const CWallet& wallet, const CWalletTx& wtx, const isminefilter& filter)
{
AssertLockHeld(wallet.cs_wallet);
Expand All @@ -164,7 +175,7 @@ CAmount CachedTxGetAvailableCredit(const CWallet& wallet, const CWalletTx& wtx,
bool allow_cache = (filter & ISMINE_ALL) && (filter & ISMINE_ALL) != ISMINE_ALL;

// Must wait until coinbase is safely deep enough in the chain before valuing it
if (wallet.IsTxImmatureCoinBase(wtx))
if (wallet.IsTxImmature(wtx))
return 0;

if (allow_cache && wtx.m_amounts[CWalletTx::AVAILABLE_CREDIT].m_cached[filter]) {
Expand Down Expand Up @@ -314,6 +325,8 @@ Balance GetBalance(const CWallet& wallet, const int min_depth, bool avoid_reuse)
}
ret.m_mine_immature += CachedTxGetImmatureCredit(wallet, wtx, ISMINE_SPENDABLE);
ret.m_watchonly_immature += CachedTxGetImmatureCredit(wallet, wtx, ISMINE_WATCH_ONLY);
ret.m_mine_stake += CachedTxGetStakeCredit(wallet, wtx, ISMINE_SPENDABLE);
ret.m_watchonly_stake += CachedTxGetStakeCredit(wallet, wtx, ISMINE_WATCH_ONLY);
}
}
return ret;
Expand All @@ -333,7 +346,7 @@ std::map<CTxDestination, CAmount> GetAddressBalances(const CWallet& wallet)
if (!CachedTxIsTrusted(wallet, wtx, trusted_parents))
continue;

if (wallet.IsTxImmatureCoinBase(wtx))
if (wallet.IsTxImmature(wtx))
continue;

int nDepth = wallet.GetTxDepthInMainChain(wtx);
Expand Down
2 changes: 2 additions & 0 deletions src/wallet/receive.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ CAmount CachedTxGetDebit(const CWallet& wallet, const CWalletTx& wtx, const ismi
CAmount CachedTxGetChange(const CWallet& wallet, const CWalletTx& wtx);
CAmount CachedTxGetImmatureCredit(const CWallet& wallet, const CWalletTx& wtx, const isminefilter& filter)
EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet);
CAmount CachedTxGetStakeCredit(const CWallet& wallet, const CWalletTx& wtx, const isminefilter& filter)
EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet);
CAmount CachedTxGetAvailableCredit(const CWallet& wallet, const CWalletTx& wtx, const isminefilter& filter = ISMINE_SPENDABLE)
EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet);
struct COutputEntry
Expand Down
83 changes: 75 additions & 8 deletions src/wallet/rpc/backup.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ RPCHelpMan importprivkey()

CKey key = DecodeSecret(strSecret);
if (!key.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key encoding");
if (pwallet->m_wallet_unlock_staking_only)
throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Wallet is unlocked for staking only.");

CPubKey pubkey = key.GetPubKey();
CHECK_NONFATAL(key.VerifyPubKey(pubkey));
Expand Down Expand Up @@ -232,7 +234,7 @@ RPCHelpMan importaddress()
"Note: Use \"getwalletinfo\" to query the scanning progress.\n"
"Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" for descriptor wallets.\n",
{
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The Bitcoin address (or hex-encoded script)"},
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The Qtum address (or hex-encoded script)"},
{"label", RPCArg::Type::STR, RPCArg::Default{""}, "An optional label"},
{"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Scan the chain and mempool for wallet transactions."},
{"p2sh", RPCArg::Type::BOOL, RPCArg::Default{false}, "Add the P2SH version of the script as well"},
Expand Down Expand Up @@ -305,7 +307,7 @@ RPCHelpMan importaddress()

pwallet->ImportScriptPubKeys(strLabel, scripts, /*have_solving_data=*/false, /*apply_label=*/true, /*timestamp=*/1);
} else {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address or script");
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qtum address or script");
}
}
if (fRescan)
Expand Down Expand Up @@ -646,7 +648,7 @@ RPCHelpMan dumpprivkey()
"Then the importprivkey can be used with this output\n"
"Note: This command is only compatible with legacy wallets.\n",
{
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The bitcoin address for the private key"},
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The qtum address for the private key"},
},
RPCResult{
RPCResult::Type::STR, "key", "The private key"
Expand All @@ -670,7 +672,9 @@ RPCHelpMan dumpprivkey()
std::string strAddress = request.params[0].get_str();
CTxDestination dest = DecodeDestination(strAddress);
if (!IsValidDestination(dest)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qtum address");
if (pwallet->m_wallet_unlock_staking_only)
throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Wallet is unlocked for staking only.");
}
auto keyid = GetKeyForDestination(spk_man, dest);
if (keyid.IsNull()) {
Expand Down Expand Up @@ -915,6 +919,10 @@ static std::string RecurseImportData(const CScript& script, ImportData& import_d
case TxoutType::NONSTANDARD:
case TxoutType::WITNESS_UNKNOWN:
case TxoutType::WITNESS_V1_TAPROOT:
case TxoutType::CREATE_SENDER:
case TxoutType::CALL_SENDER:
case TxoutType::CREATE:
case TxoutType::CALL:
return "unrecognized script";
} // no default case, so the compiler can warn about missing cases
NONFATAL_UNREACHABLE();
Expand Down Expand Up @@ -1431,7 +1439,7 @@ RPCHelpMan importmulti()
"block from time %d, which is after or within %d seconds of key creation, and "
"could contain transactions pertaining to the key. As a result, transactions "
"and coins using this key may not appear in the wallet. This error could be "
"caused by pruning or data corruption (see bitcoind log for details) and could "
"caused by pruning or data corruption (see qtumd log for details) and could "
"be dealt with by downloading and rescanning the relevant blocks (see -reindex "
"option and rescanblockchain RPC).",
GetImportTimestamp(request, now), scannedTime - TIMESTAMP_WINDOW - 1, TIMESTAMP_WINDOW)));
Expand Down Expand Up @@ -1461,6 +1469,14 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
const bool active = data.exists("active") ? data["active"].get_bool() : false;
const bool internal = data.exists("internal") ? data["internal"].get_bool() : false;
const std::string label{LabelFromValue(data["label"])};
const bool importForStaking = data.exists("importforstaking") ? data["importforstaking"].get_bool() : false;

// Check import for staking param
bool isLegacy = (descriptor.rfind("pkh(", 0) == 0 || descriptor.rfind("pk(", 0) == 0);
if(importForStaking && !isLegacy)
{
throw JSONRPCError(RPC_INVALID_PARAMETER, "importforstaking can only be used for pkh or pk descriptors.");
}

// Parse descriptor string
FlatSigningProvider keys;
Expand Down Expand Up @@ -1578,6 +1594,12 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
}
}

// Refresh address stake cache
if(isLegacy)
{
wallet.RefreshAddressStakeCache();
}

result.pushKV("success", UniValue(true));
} catch (const UniValue& e) {
result.pushKV("success", UniValue(false));
Expand All @@ -1587,6 +1609,49 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
return result;
}

static UniValue ProcessDescriptorData(CWallet& wallet, UniValue data, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
{
// Insert descriptor
UniValue result = ProcessDescriptorImport(wallet, data, timestamp);

// Insert pk or pkh descriptor if needed
const bool importForStaking = data.exists("importforstaking") ? data["importforstaking"].get_bool() : false;
if(result["success"].get_bool() && importForStaking)
{
// Check if is pk or pkh descriptor
std::string descriptor = data["desc"].get_str();
std::string tmpDesc;
bool isPkh = false;
if(descriptor.rfind("pkh(", 0) == 0)
{
tmpDesc = "pk";
isPkh = true;
}
else if(descriptor.rfind("pk(", 0) == 0)
{
tmpDesc = "pkh";
isPkh = false;
}
else
{
return result;
}

// Compute second descriptor
size_t checksize = GetDescriptorChecksum(descriptor).size() + 1;
size_t pos = isPkh ? 3 : 2;
size_t len = descriptor.size() - checksize - pos;
tmpDesc = tmpDesc + descriptor.substr(pos, len);
tmpDesc = tmpDesc + "#" + GetDescriptorChecksum(tmpDesc);

// Insert second descriptor
data.pushKV("desc", tmpDesc);
result = ProcessDescriptorImport(wallet, data, timestamp);
}

return result;
}

RPCHelpMan importdescriptors()
{
return RPCHelpMan{"importdescriptors",
Expand All @@ -1612,6 +1677,7 @@ RPCHelpMan importdescriptors()
},
{"internal", RPCArg::Type::BOOL, RPCArg::Default{false}, "Whether matching outputs should be treated as not incoming payments (e.g. change)"},
{"label", RPCArg::Type::STR, RPCArg::Default{""}, "Label to assign to the address, only allowed with internal=false. Disabled for ranged descriptors"},
{"importforstaking", RPCArg::Type::BOOL, RPCArg::Default{false}, "Import corresponding pk or pkh descriptor as both are needed for staking, only apply for pk or pkh descriptors."},
},
},
},
Expand All @@ -1637,7 +1703,8 @@ RPCHelpMan importdescriptors()
RPCExamples{
HelpExampleCli("importdescriptors", "'[{ \"desc\": \"<my descriptor>\", \"timestamp\":1455191478, \"internal\": true }, "
"{ \"desc\": \"<my descriptor 2>\", \"label\": \"example 2\", \"timestamp\": 1455191480 }]'") +
HelpExampleCli("importdescriptors", "'[{ \"desc\": \"<my descriptor>\", \"timestamp\":1455191478, \"active\": true, \"range\": [0,100], \"label\": \"<my bech32 wallet>\" }]'")
HelpExampleCli("importdescriptors", "'[{ \"desc\": \"<my descriptor>\", \"timestamp\":1455191478, \"active\": true, \"range\": [0,100], \"label\": \"<my bech32 wallet>\" }]'") +
HelpExampleCli("importdescriptors", "'[{ \"desc\": \"<my descriptor>\", \"timestamp\":1455191478, \"importforstaking\":true}]'")
},
[&](const RPCHelpMan& self, const JSONRPCRequest& main_request) -> UniValue
{
Expand Down Expand Up @@ -1679,7 +1746,7 @@ RPCHelpMan importdescriptors()
for (const UniValue& request : requests.getValues()) {
// This throws an error if "timestamp" doesn't exist
const int64_t timestamp = std::max(GetImportTimestamp(request, now), minimum_timestamp);
const UniValue result = ProcessDescriptorImport(*pwallet, request, timestamp);
const UniValue result = ProcessDescriptorData(*pwallet, request, timestamp);
response.push_back(result);

if (lowest_timestamp > timestamp ) {
Expand Down Expand Up @@ -1729,7 +1796,7 @@ RPCHelpMan importdescriptors()
"block from time %d, which is after or within %d seconds of key creation, and "
"could contain transactions pertaining to the desc. As a result, transactions "
"and coins using this desc may not appear in the wallet. This error could be "
"caused by pruning or data corruption (see bitcoind log for details) and could "
"caused by pruning or data corruption (see qtumd log for details) and could "
"be dealt with by downloading and rescanning the relevant blocks (see -reindex "
"option and rescanblockchain RPC).",
GetImportTimestamp(request, now), scanned_time - TIMESTAMP_WINDOW - 1, TIMESTAMP_WINDOW)));
Expand Down
Loading

0 comments on commit e53ee0f

Please sign in to comment.