Rename Serialized*Size -> SerializedSprout*Size
This commit is contained in:
parent
93fcf892d4
commit
74f5b010df
|
@ -275,7 +275,7 @@ libzcash::PaymentAddress DecodePaymentAddress(const std::string& str)
|
||||||
std::vector<unsigned char> data;
|
std::vector<unsigned char> data;
|
||||||
if (DecodeBase58Check(str, data)) {
|
if (DecodeBase58Check(str, data)) {
|
||||||
const std::vector<unsigned char>& zaddr_prefix = Params().Base58Prefix(CChainParams::ZCPAYMENT_ADDRRESS);
|
const std::vector<unsigned char>& zaddr_prefix = Params().Base58Prefix(CChainParams::ZCPAYMENT_ADDRRESS);
|
||||||
if ((data.size() == libzcash::SerializedPaymentAddressSize + zaddr_prefix.size()) &&
|
if ((data.size() == libzcash::SerializedSproutPaymentAddressSize + zaddr_prefix.size()) &&
|
||||||
std::equal(zaddr_prefix.begin(), zaddr_prefix.end(), data.begin())) {
|
std::equal(zaddr_prefix.begin(), zaddr_prefix.end(), data.begin())) {
|
||||||
CSerializeData serialized(data.begin() + zaddr_prefix.size(), data.end());
|
CSerializeData serialized(data.begin() + zaddr_prefix.size(), data.end());
|
||||||
CDataStream ss(serialized, SER_NETWORK, PROTOCOL_VERSION);
|
CDataStream ss(serialized, SER_NETWORK, PROTOCOL_VERSION);
|
||||||
|
@ -314,7 +314,7 @@ libzcash::ViewingKey DecodeViewingKey(const std::string& str)
|
||||||
std::vector<unsigned char> data;
|
std::vector<unsigned char> data;
|
||||||
if (DecodeBase58Check(str, data)) {
|
if (DecodeBase58Check(str, data)) {
|
||||||
const std::vector<unsigned char>& vk_prefix = Params().Base58Prefix(CChainParams::ZCVIEWING_KEY);
|
const std::vector<unsigned char>& vk_prefix = Params().Base58Prefix(CChainParams::ZCVIEWING_KEY);
|
||||||
if ((data.size() == libzcash::SerializedViewingKeySize + vk_prefix.size()) &&
|
if ((data.size() == libzcash::SerializedSproutViewingKeySize + vk_prefix.size()) &&
|
||||||
std::equal(vk_prefix.begin(), vk_prefix.end(), data.begin())) {
|
std::equal(vk_prefix.begin(), vk_prefix.end(), data.begin())) {
|
||||||
CSerializeData serialized(data.begin() + vk_prefix.size(), data.end());
|
CSerializeData serialized(data.begin() + vk_prefix.size(), data.end());
|
||||||
CDataStream ss(serialized, SER_NETWORK, PROTOCOL_VERSION);
|
CDataStream ss(serialized, SER_NETWORK, PROTOCOL_VERSION);
|
||||||
|
@ -339,7 +339,7 @@ libzcash::SpendingKey DecodeSpendingKey(const std::string& str)
|
||||||
std::vector<unsigned char> data;
|
std::vector<unsigned char> data;
|
||||||
if (DecodeBase58Check(str, data)) {
|
if (DecodeBase58Check(str, data)) {
|
||||||
const std::vector<unsigned char>& zkey_prefix = Params().Base58Prefix(CChainParams::ZCSPENDING_KEY);
|
const std::vector<unsigned char>& zkey_prefix = Params().Base58Prefix(CChainParams::ZCSPENDING_KEY);
|
||||||
if ((data.size() == libzcash::SerializedSpendingKeySize + zkey_prefix.size()) &&
|
if ((data.size() == libzcash::SerializedSproutSpendingKeySize + zkey_prefix.size()) &&
|
||||||
std::equal(zkey_prefix.begin(), zkey_prefix.end(), data.begin())) {
|
std::equal(zkey_prefix.begin(), zkey_prefix.end(), data.begin())) {
|
||||||
CSerializeData serialized(data.begin() + zkey_prefix.size(), data.end());
|
CSerializeData serialized(data.begin() + zkey_prefix.size(), data.end());
|
||||||
CDataStream ss(serialized, SER_NETWORK, PROTOCOL_VERSION);
|
CDataStream ss(serialized, SER_NETWORK, PROTOCOL_VERSION);
|
||||||
|
|
|
@ -143,7 +143,7 @@ static bool DecryptSproutSpendingKey(const CKeyingMaterial& vMasterKey,
|
||||||
if(!DecryptSecret(vMasterKey, vchCryptedSecret, address.GetHash(), vchSecret))
|
if(!DecryptSecret(vMasterKey, vchCryptedSecret, address.GetHash(), vchSecret))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (vchSecret.size() != libzcash::SerializedSpendingKeySize)
|
if (vchSecret.size() != libzcash::SerializedSproutSpendingKeySize)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
CSecureDataStream ss(vchSecret, SER_NETWORK, PROTOCOL_VERSION);
|
CSecureDataStream ss(vchSecret, SER_NETWORK, PROTOCOL_VERSION);
|
||||||
|
|
|
@ -15,9 +15,9 @@ public:
|
||||||
friend bool operator<(const InvalidEncoding &a, const InvalidEncoding &b) { return true; }
|
friend bool operator<(const InvalidEncoding &a, const InvalidEncoding &b) { return true; }
|
||||||
};
|
};
|
||||||
|
|
||||||
const size_t SerializedPaymentAddressSize = 64;
|
const size_t SerializedSproutPaymentAddressSize = 64;
|
||||||
const size_t SerializedViewingKeySize = 64;
|
const size_t SerializedSproutViewingKeySize = 64;
|
||||||
const size_t SerializedSpendingKeySize = 32;
|
const size_t SerializedSproutSpendingKeySize = 32;
|
||||||
|
|
||||||
const size_t SerializedSaplingSpendingKeySize = 32;
|
const size_t SerializedSaplingSpendingKeySize = 32;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue