[wallet] v2 wallet format compatibility

Author: MarkLTZ

src/chain.h

@@ -223,6 +223,9 @@ class CBlockIndex
     //! (memory only) Sequential id assigned to distinguish order in which blocks are received.
     int32_t nSequenceId;
 
+    // The time at which this block was first seen locally.
+    int64_t nArrivalTime;
+
     //! (memory only) Maximum nTime in the chain up to and including this block.
     unsigned int nTimeMax;
 
@@ -255,6 +258,7 @@ class CBlockIndex
         nTime           = 0;
         nBits           = 0;
         nNonce          = uint256();
+        nArrivalTime    = -1;
         nSolution.clear();
     }
 
@@ -335,6 +339,11 @@ class CBlockIndex
 
     static constexpr int nMedianTimeSpan = 11;
 
+    int64_t GetBlockArrivalTime() const
+    {
+        return nArrivalTime;
+    }
+
     int64_t GetMedianTimePast() const
     {
         int64_t pmedian[nMedianTimeSpan];
@@ -448,6 +457,7 @@ class CDiskBlockIndex : public CBlockIndex
         READWRITE(nTime);
         READWRITE(nBits);
         READWRITE(nNonce);
+        READWRITE(nArrivalTime);
         READWRITE(nSolution);
 
         // Only read/write nSproutValue if the client version used to create

src/rpc/blockchain.cpp

@@ -158,6 +158,7 @@ UniValue blockheaderToJSON(const CBlockIndex* tip, const CBlockIndex* blockindex
     result.pushKV("bits", strprintf("%08x", blockindex->nBits));
     result.pushKV("difficulty", GetDifficulty(blockindex));
     result.pushKV("chainwork", blockindex->nChainWork.GetHex());
+    result.pushKV("arrivaltime", blockindex->GetBlockArrivalTime());
     result.pushKV("nTx", (uint64_t)blockindex->nTx);
 
     if (blockindex->pprev)

src/txdb.cpp

@@ -537,6 +537,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts(const Consensus::Params& consensusParams,
                 pindexNew->nTime            = diskindex.nTime;
                 pindexNew->nBits            = diskindex.nBits;
                 pindexNew->nNonce           = diskindex.nNonce;
+                pindexNew->nArrivalTime     = diskindex.nArrivalTime;
                 pindexNew->nSolution        = diskindex.nSolution;
                 pindexNew->nStatus          = diskindex.nStatus;
                 pindexNew->nCachedBranchId  = diskindex.nCachedBranchId;

src/validation.cpp

@@ -3677,6 +3677,7 @@ void CChainState::ReceivedBlockTransactions(const CBlock& block, CBlockIndex* pi
             {
                 LOCK(cs_nBlockSequenceId);
                 pindex->nSequenceId = nBlockSequenceId++;
+                pindex->nArrivalTime = GetAdjustedTime();
             }
             if (m_chain.Tip() == nullptr || !setBlockIndexCandidates.value_comp()(pindex, m_chain.Tip())) {
                 setBlockIndexCandidates.insert(pindex);

src/wallet/walletdb.cpp

@@ -24,20 +24,20 @@ const std::string ACENTRY{"acentry"};
 const std::string BESTBLOCK_NOMERKLE{"bestblock_nomerkle"};
 const std::string BESTBLOCK{"bestblock"};
 const std::string CRYPTED_KEY{"ckey"};
-const std::string SPROUT_CRYPTED_KEY{"sprout_ckey"};
-const std::string SAPLING_CRYPTED_KEY{"sapling_ckey"};
+const std::string SPROUT_CRYPTED_KEY{"czkey"};
+const std::string SAPLING_CRYPTED_KEY{"csapzkey"};
 const std::string CSCRIPT{"cscript"};
 const std::string DEFAULTKEY{"defaultkey"};
 const std::string DESTDATA{"destdata"};
 const std::string FLAGS{"flags"};
-const std::string HDCHAIN{"hdchain"};
-const std::string SAPLING_HDCHAIN{"sapling_hdchain"};
+const std::string HDCHAIN{"base_hdchain"};
+const std::string ZEC_HDCHAIN{"hdchain"};
 const std::string KEYMETA{"keymeta"};
-const std::string SPROUT_KEYMETA{"sprout_keymeta"};
-const std::string SAPLING_KEYMETA{"sapling_keymeta"};
+const std::string SPROUT_KEYMETA{"zkeymeta"};
+const std::string SAPLING_KEYMETA{"sapzkeymeta"};
 const std::string KEY{"key"};
-const std::string SPROUT_KEY{"sprout_key"};
-const std::string SAPLING_KEY{"sapling_key"};
+const std::string SPROUT_KEY{"zkey"};
+const std::string SAPLING_KEY{"sapzkey"};
 const std::string MASTER_KEY{"mkey"};
 const std::string MINVERSION{"minversion"};
 const std::string NAME{"name"};
@@ -56,11 +56,11 @@ const std::string WATCHMETA{"watchmeta"};
 const std::string SPROUT_WATCHMETA{"sprout_watchmeta"};
 const std::string SAPLING_WATCHMETA{"sapling_watchmeta"};
 const std::string WATCHS{"watchs"};
-const std::string SPROUT_WATCHS{"sprout_watchs"};
+const std::string SPROUT_WATCHS{"vkey"};
 const std::string SAPLING_WATCHS{"sapling_watchs"};
-const std::string SAPLING_ADDRESS{"sapling_address"};
-const std::string ZEC_HDSEED{"zec_hdseed"};
-const std::string ZEC_CRYPTED_HDSEED{"zec_chdseed"};
+const std::string SAPLING_ADDRESS{"sapzaddr"};
+const std::string ZEC_HDSEED{"hdseed"};
+const std::string ZEC_CRYPTED_HDSEED{"chdseed"};
 const std::string WITNESSCACHESIZE{"witnesscachesize"};
 } // namespace DBKeys
 
@@ -527,8 +527,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             wss.nSaplingKeyMeta++;
 
             pwallet->LoadSaplingZKeyMetadata(ivk, keyMeta);
-        } else if (strType == DBKeys::SAPLING_ADDRESS)
-        {
+        } else if (strType == DBKeys::SAPLING_ADDRESS) {
             libzcash::SaplingPaymentAddress addr;
             ssKey >> addr;
             libzcash::SaplingIncomingViewingKey ivk;
@@ -623,7 +622,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             CHDChain chain;
             ssValue >> chain;
             pwallet->SetHDChain(chain, true);
-        } else if (strType == DBKeys::SAPLING_HDCHAIN) {
+        } else if (strType == DBKeys::ZEC_HDCHAIN) {
             CZecHDChain chain;
             ssValue >> chain;
             pwallet->SetZecHDChain(chain, true);
@@ -1042,7 +1041,7 @@ bool WalletBatch::WriteCryptedZecHDSeed(const uint256& seedFp, const std::vector
 
 bool WalletBatch::WriteZecHDChain(const CZecHDChain& chain)
 {
-    return WriteIC(DBKeys::SAPLING_HDCHAIN, chain);
+    return WriteIC(DBKeys::ZEC_HDCHAIN, chain);
 }
 
 bool WalletBatch::WriteZKey(const libzcash::SproutPaymentAddress& addr, const libzcash::SproutSpendingKey& key, const CKeyMetadata &keyMeta)

src/wallet/walletdb.h

@@ -68,7 +68,7 @@ extern const std::string DEFAULTKEY;
 extern const std::string DESTDATA;
 extern const std::string FLAGS;
 extern const std::string HDCHAIN;
-extern const std::string SAPLING_HDCHAIN;
+extern const std::string ZEC_HDCHAIN;
 extern const std::string KEY;
 extern const std::string SPROUT_KEY;
 extern const std::string SAPLING_KEY;
@@ -173,7 +173,8 @@ class CKeyMetadata
 {
 public:
     static const int VERSION_BASIC=1;
-    static const int VERSION_WITH_HDDATA=10;
+    static const int VERSION_WITH_ZEC_HDDATA=10;
+    static const int VERSION_WITH_HDDATA=11;
     static const int VERSION_WITH_KEY_ORIGIN = 12;
     static const int CURRENT_VERSION=VERSION_WITH_KEY_ORIGIN;
     int nVersion;
@@ -200,12 +201,15 @@ class CKeyMetadata
     inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(this->nVersion);
         READWRITE(nCreateTime);
-        if (this->nVersion >= VERSION_WITH_HDDATA)
+        if (this->nVersion >= VERSION_WITH_ZEC_HDDATA)
         {
             READWRITE(hdKeypath);
-            READWRITE(hd_seed_id);
             READWRITE(seedFp);
         }
+        if (this->nVersion >= VERSION_WITH_HDDATA)
+        {
+            READWRITE(hd_seed_id);
+        }
         if (this->nVersion >= VERSION_WITH_KEY_ORIGIN)
         {
             READWRITE(key_origin);