Move AddSpendingKeyToWallet
This commit is contained in:
parent
a0783bb957
commit
fcab001b1e
|
@ -563,67 +563,6 @@ UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys)
|
||||||
return exportfilepath.string();
|
return exportfilepath.string();
|
||||||
}
|
}
|
||||||
|
|
||||||
class AddSpendingKeyToWallet : public boost::static_visitor<bool>
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
CWallet *m_wallet;
|
|
||||||
const Consensus::Params ¶ms;
|
|
||||||
public:
|
|
||||||
AddSpendingKeyToWallet(CWallet *wallet, const Consensus::Params ¶ms) :
|
|
||||||
m_wallet(wallet), params(params) {}
|
|
||||||
|
|
||||||
bool operator()(const libzcash::SproutSpendingKey &sk) const {
|
|
||||||
auto addr = sk.address();
|
|
||||||
// Don't throw error in case a key is already there
|
|
||||||
if (m_wallet->HaveSproutSpendingKey(addr)) {
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
m_wallet->MarkDirty();
|
|
||||||
|
|
||||||
if (!m_wallet-> AddSproutZKey(sk)) {
|
|
||||||
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding spending key to wallet");
|
|
||||||
}
|
|
||||||
|
|
||||||
m_wallet->mapSproutZKeyMetadata[addr].nCreateTime = 1;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator()(const libzcash::SaplingExtendedSpendingKey &sk) const {
|
|
||||||
auto fvk = sk.expsk.full_viewing_key();
|
|
||||||
auto ivk = fvk.in_viewing_key();
|
|
||||||
auto addr = sk.DefaultAddress();
|
|
||||||
{
|
|
||||||
// Don't throw error in case a key is already there
|
|
||||||
if (m_wallet->HaveSaplingSpendingKey(fvk)) {
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
m_wallet->MarkDirty();
|
|
||||||
|
|
||||||
if (!m_wallet-> AddSaplingZKey(sk, addr)) {
|
|
||||||
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding spending key to wallet");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sapling addresses can't have been used in transactions prior to activation.
|
|
||||||
if (params.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight == Consensus::NetworkUpgrade::ALWAYS_ACTIVE) {
|
|
||||||
m_wallet->mapSaplingZKeyMetadata[ivk].nCreateTime = 1;
|
|
||||||
} else {
|
|
||||||
// Friday, 26 October 2018 00:00:00 GMT - definitely before Sapling activates
|
|
||||||
m_wallet->mapSaplingZKeyMetadata[ivk].nCreateTime = 1540512000;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator()(const libzcash::InvalidEncoding& no) const {
|
|
||||||
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid spending key");
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
UniValue z_importkey(const UniValue& params, bool fHelp)
|
UniValue z_importkey(const UniValue& params, bool fHelp)
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include "key_io.h"
|
#include "key_io.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
|
#include "rpc/protocol.h"
|
||||||
#include "script/script.h"
|
#include "script/script.h"
|
||||||
#include "script/sign.h"
|
#include "script/sign.h"
|
||||||
#include "timedata.h"
|
#include "timedata.h"
|
||||||
|
@ -4567,3 +4568,53 @@ boost::optional<libzcash::SpendingKey> GetSpendingKeyForPaymentAddress::operator
|
||||||
// Defaults to InvalidEncoding
|
// Defaults to InvalidEncoding
|
||||||
return libzcash::SpendingKey();
|
return libzcash::SpendingKey();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool AddSpendingKeyToWallet::operator()(const libzcash::SproutSpendingKey &sk) const {
|
||||||
|
auto addr = sk.address();
|
||||||
|
// Don't throw error in case a key is already there
|
||||||
|
if (m_wallet->HaveSproutSpendingKey(addr)) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
m_wallet->MarkDirty();
|
||||||
|
|
||||||
|
if (!m_wallet-> AddSproutZKey(sk)) {
|
||||||
|
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding spending key to wallet");
|
||||||
|
}
|
||||||
|
|
||||||
|
m_wallet->mapSproutZKeyMetadata[addr].nCreateTime = 1;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AddSpendingKeyToWallet::operator()(const libzcash::SaplingExtendedSpendingKey &sk) const {
|
||||||
|
auto fvk = sk.expsk.full_viewing_key();
|
||||||
|
auto ivk = fvk.in_viewing_key();
|
||||||
|
auto addr = sk.DefaultAddress();
|
||||||
|
{
|
||||||
|
// Don't throw error in case a key is already there
|
||||||
|
if (m_wallet->HaveSaplingSpendingKey(fvk)) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
m_wallet->MarkDirty();
|
||||||
|
|
||||||
|
if (!m_wallet-> AddSaplingZKey(sk, addr)) {
|
||||||
|
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding spending key to wallet");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sapling addresses can't have been used in transactions prior to activation.
|
||||||
|
if (params.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight == Consensus::NetworkUpgrade::ALWAYS_ACTIVE) {
|
||||||
|
m_wallet->mapSaplingZKeyMetadata[ivk].nCreateTime = 1;
|
||||||
|
} else {
|
||||||
|
// Friday, 26 October 2018 00:00:00 GMT - definitely before Sapling activates
|
||||||
|
m_wallet->mapSaplingZKeyMetadata[ivk].nCreateTime = 1540512000;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AddSpendingKeyToWallet::operator()(const libzcash::InvalidEncoding& no) const {
|
||||||
|
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid spending key");
|
||||||
|
}
|
||||||
|
|
|
@ -1376,4 +1376,19 @@ public:
|
||||||
boost::optional<libzcash::SpendingKey> operator()(const libzcash::InvalidEncoding& no) const;
|
boost::optional<libzcash::SpendingKey> operator()(const libzcash::InvalidEncoding& no) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class AddSpendingKeyToWallet : public boost::static_visitor<bool>
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
CWallet *m_wallet;
|
||||||
|
const Consensus::Params ¶ms;
|
||||||
|
public:
|
||||||
|
AddSpendingKeyToWallet(CWallet *wallet, const Consensus::Params ¶ms) :
|
||||||
|
m_wallet(wallet), params(params) {}
|
||||||
|
|
||||||
|
bool operator()(const libzcash::SproutSpendingKey &sk) const;
|
||||||
|
bool operator()(const libzcash::SaplingExtendedSpendingKey &sk) const;
|
||||||
|
bool operator()(const libzcash::InvalidEncoding& no) const;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif // BITCOIN_WALLET_WALLET_H
|
#endif // BITCOIN_WALLET_WALLET_H
|
||||||
|
|
Loading…
Reference in New Issue