[Wallet] HD Wallet, staking chain counter.

furszy · furszy · commit 9a7d0fd138eb · 2020-03-04T11:22:49.000-03:00
diff --git a/src/wallet/hdchain.cpp b/src/wallet/hdchain.cpp
@@ -12,6 +12,9 @@ bool CHDChain::SetNull()
 {
     nVersion = CURRENT_VERSION;
     seed_id = CKeyID();
+    nExternalChainCounter = 0;
+    nInternalChainCounter = 0;
+    nStakingChainCounter = 0;
     return IsNull();
 }
 
diff --git a/src/wallet/hdchain.h b/src/wallet/hdchain.h
@@ -5,6 +5,14 @@
 
 #include "key.h"
 
+namespace HDChain {
+    namespace ChangeType {
+        static const uint8_t EXTERNAL = 0;
+        static const uint8_t INTERNAL = 1;
+        static const uint8_t STAKING = 2;
+    };
+}
+
 /* Simple HD chain data model */
 class CHDChain
 {
@@ -17,6 +25,7 @@ class CHDChain
     // Single account counters.
     uint32_t nExternalChainCounter{0};
     uint32_t nInternalChainCounter{0};
+    uint32_t nStakingChainCounter{0};
 
     CHDChain() { SetNull(); }
 
@@ -29,6 +38,7 @@ class CHDChain
         // Single account counters.
         READWRITE(nExternalChainCounter);
         READWRITE(nInternalChainCounter);
+        READWRITE(nStakingChainCounter);
     }
 
     bool SetNull();
@@ -37,8 +47,17 @@ class CHDChain
     bool SetSeed(const CKeyID& seedId);
     CKeyID GetID() const { return seed_id; }
 
-    uint32_t& GetChainCounter(const bool& internal = false) {
-        return internal ? nInternalChainCounter : nExternalChainCounter;
+    uint32_t& GetChainCounter(const uint8_t& type = HDChain::ChangeType::EXTERNAL) {
+        switch (type) {
+            case HDChain::ChangeType::EXTERNAL:
+                return nExternalChainCounter;
+            case HDChain::ChangeType::INTERNAL:
+                return nInternalChainCounter;
+            case HDChain::ChangeType::STAKING:
+                return nStakingChainCounter;
+            default:
+                throw std::runtime_error("HD chain type doesn't exist.");
+        }
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@ bool CHDChain::SetNull()`
`12`	`12`	`{`
`13`	`13`	`nVersion = CURRENT_VERSION;`
`14`	`14`	`seed_id = CKeyID();`
	`15`	`+ nExternalChainCounter = 0;`
	`16`	`+ nInternalChainCounter = 0;`
	`17`	`+ nStakingChainCounter = 0;`
`15`	`18`	`return IsNull();`
`16`	`19`	`}`
`17`	`20`