zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make CWallet::DefaultReceiverTypes height-dependent. 

Addresses https://github.com/zcash/zcash/pull/5700#discussion_r830538538
This commit is contained in:
Kris Nuttycombe 2022-03-20 12:27:12 -06:00
parent 87cc0d22db
commit 9220ebb0de
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/rpcwallet.cpp
View File

@ -3110,7 +3110,9 @@ UniValue z_getaddressforaccount(const UniValue& params, bool fHelp)
throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: the Orchard wallet experimental extensions are disabled.");
}
LOCK(pwalletMain->cs_wallet);
// cs_main is required for obtaining the current height, for
// CWallet::DefaultReceiverTypes
LOCK2(cs_main, pwalletMain->cs_wallet);
int64_t accountInt = params[0].get_int64();
if (accountInt < 0 || accountInt >= ZCASH_LEGACY_ACCOUNT) {
@ -3136,7 +3138,7 @@ UniValue z_getaddressforaccount(const UniValue& params, bool fHelp)
}
if (receivers.empty()) {
// Default is the best and second-best shielded pools, and the transparent pool.
receivers = CWallet::DefaultReceiverTypes();
receivers = CWallet::DefaultReceiverTypes(chainActive.Height());
}
std::optional<libzcash::diversifier_index_t> j = std::nullopt;

17
src/wallet/wallet.cpp
View File

@ -61,7 +61,9 @@ const char * DEFAULT_WALLET_DAT = "wallet.dat";
*/
CFeeRate CWallet::minTxFee = CFeeRate(DEFAULT_TRANSACTION_MINFEE);
std::set<ReceiverType> CWallet::DefaultReceiverTypes() {
std::set<ReceiverType> CWallet::DefaultReceiverTypes(int nHeight) {
// For now, just ignore the height information because the default
// is always the same.
return {ReceiverType::P2PKH, ReceiverType::Sapling, ReceiverType::Orchard};
}
@ -860,7 +862,16 @@ std::pair<PaymentAddress, RecipientType> CWallet::GetPaymentAddressForRecipient(
const uint256& txid,
const libzcash::RecipientAddress& recipient) const
{
AssertLockHeld(cs_wallet);
auto self = this;
auto nHeight = chainActive.Height();
auto wtxPtr = mapWallet.find(txid);
if (wtxPtr != mapWallet.end()) {
nHeight = wtxPtr->second.GetDepthInMainChain();
}
auto ufvk = self->GetUFVKForReceiver(RecipientAddressToReceiver(recipient));
std::pair<PaymentAddress, RecipientType> defaultAddress = std::visit(match {
[&](const CKeyID& addr) {
@ -909,7 +920,7 @@ std::pair<PaymentAddress, RecipientType> CWallet::GetPaymentAddressForRecipient(
if (j.value().second) {
// std::get is safe here because we know we have a valid Sapling diversifier index
auto defaultUA = std::get<std::pair<UnifiedAddress, diversifier_index_t>>(
ufvk->Address(j.value().first, CWallet::DefaultReceiverTypes()));
ufvk->Address(j.value().first, CWallet::DefaultReceiverTypes(nHeight)));
return std::make_pair(PaymentAddress{defaultUA.first}, RecipientType::WalletExternalAddress);
} else {
return std::make_pair(PaymentAddress{addr}, RecipientType::WalletInternalAddress);
@ -932,7 +943,7 @@ std::pair<PaymentAddress, RecipientType> CWallet::GetPaymentAddressForRecipient(
if (j.has_value()) {
if (j.value().second) {
// Attempt to reproduce the original unified address
auto genResult = ufvk->Address(j.value().first, CWallet::DefaultReceiverTypes());
auto genResult = ufvk->Address(j.value().first, CWallet::DefaultReceiverTypes(nHeight));
auto defaultUA = std::get_if<std::pair<UnifiedAddress, diversifier_index_t>>(&genResult);
if (defaultUA != nullptr) {
return std::make_pair(PaymentAddress{defaultUA->first}, RecipientType::WalletExternalAddress);

6
src/wallet/wallet.h
View File

@ -1741,10 +1741,10 @@ public:
static CAmount GetRequiredFee(unsigned int nTxBytes);
/**
* The current set of default receiver types used when the wallet generates
* unified addresses
* The set of default receiver types used when the wallet generates
* unified addresses, as of the specified chain height.
*/
static std::set<libzcash::ReceiverType> DefaultReceiverTypes();
static std::set<libzcash::ReceiverType> DefaultReceiverTypes(int nHeight);
private:
bool NewKeyPool();