[HDChain] Chain counter type supporting Standard and Sapling counters.

furszy · furszy · commit 417df65d34ce · 2020-08-02T23:03:40.000-03:00
diff --git a/src/wallet/hdchain.h b/src/wallet/hdchain.h
@@ -13,9 +13,14 @@ namespace HDChain {
         static const uint8_t INTERNAL = 1;
         static const uint8_t STAKING = 2;
     };
+
+    namespace ChainCounterType {
+        static const uint8_t Standard  = 0;
+        static const uint8_t Sapling   = 1;
+    };
 }
 
-/* Simple HD chain data model */
+/* Simple HD chain data model for regular and sapling addresses */
 class CHDChain
 {
 private:
@@ -28,19 +33,24 @@ class CHDChain
     uint32_t nExternalChainCounter{0};
     uint32_t nInternalChainCounter{0};
     uint32_t nStakingChainCounter{0};
+    // Chain counter type
+    uint8_t chainType;
 
-    CHDChain() { SetNull(); }
+    CHDChain(const uint8_t& _chainType = HDChain::ChainCounterType::Standard) : chainType(_chainType) { SetNull(); }
 
     ADD_SERIALIZE_METHODS;
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(nVersion);
         READWRITE(seed_id);
+        READWRITE(chainType);
         // Single account counters.
         READWRITE(nExternalChainCounter);
-        READWRITE(nInternalChainCounter);
-        READWRITE(nStakingChainCounter);
+        if (chainType != HDChain::ChainCounterType::Standard) {
+            READWRITE(nInternalChainCounter);
+            READWRITE(nStakingChainCounter);
+        }
     }
 
     bool SetNull();
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -284,7 +284,10 @@ bool CWalletDB::WriteMinVersion(int nVersion)
 bool CWalletDB::WriteHDChain(const CHDChain& chain)
 {
     nWalletDBUpdated++;
-    return Write(std::string("hdchain"), chain);
+    std::string key = std::string("hdchain");
+    if (chain.chainType == HDChain::ChainCounterType::Sapling)
+        key += std::string("_sap");
+    return Write(key, chain);
 }
 
 bool CWalletDB::ReadAccount(const std::string& strAccount, CAccount& account)
@@ -682,7 +685,7 @@ bool ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, CW
                 strErr = "Error reading wallet database: LoadDestData failed";
                 return false;
             }
-        } else if (strType == "hdchain") {
+        } else if (strType == "hdchain") { // Regular key chain counter
             CHDChain chain;
             ssValue >> chain;
             pwallet->GetScriptPubKeyMan()->SetHDChain(chain, true);

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,10 @@ bool CWalletDB::WriteMinVersion(int nVersion)`
`284`	`284`	`bool CWalletDB::WriteHDChain(const CHDChain& chain)`
`285`	`285`	`{`
`286`	`286`	`nWalletDBUpdated++;`
`287`		`- return Write(std::string("hdchain"), chain);`
	`287`	`+ std::string key = std::string("hdchain");`
	`288`	`+ if (chain.chainType == HDChain::ChainCounterType::Sapling)`
	`289`	`+ key += std::string("_sap");`
	`290`	`+ return Write(key, chain);`
`288`	`291`	`}`
`289`	`292`
`290`	`293`	`bool CWalletDB::ReadAccount(const std::string& strAccount, CAccount& account)`
`@@ -682,7 +685,7 @@ bool ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, CW`
`682`	`685`	`strErr = "Error reading wallet database: LoadDestData failed";`
`683`	`686`	`return false;`
`684`	`687`	`}`
`685`		`- } else if (strType == "hdchain") {`
	`688`	`+ } else if (strType == "hdchain") { // Regular key chain counter`
`686`	`689`	`CHDChain chain;`
`687`	`690`	`ssValue >> chain;`
`688`	`691`	`pwallet->GetScriptPubKeyMan()->SetHDChain(chain, true);`