Browse Source
Bugfix: Use time instead of block height for Sapling key metadata
metaverse
Jack Grigg
6 years ago
No known key found for this signature in database
GPG Key ID: 1B8D649257DB0829
1 changed files with
6 additions and
3 deletions
-
src/wallet/rpcdump.cpp
|
|
@ -593,9 +593,12 @@ public: |
|
|
|
} |
|
|
|
|
|
|
|
// Sapling addresses can't have been used in transactions prior to activation.
|
|
|
|
m_wallet->mapSaplingZKeyMetadata[ivk].nCreateTime = std::max( |
|
|
|
1, // In case a code fork sets Sapling to always be active
|
|
|
|
params.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight); |
|
|
|
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; |
|
|
|
} |
|
|
|