wallet: Properly set hd chain counters when loading

achow101 · achow101 · commit 70134eb34f58 · 2021-12-08T11:22:29.000-05:00
When build CHDChains out of CKeyMetadata, the chain counters are
actually 1 based, not 0 based, so 1 must be added to each index.
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -556,9 +556,9 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
                 }
                 if (internal) {
                     chain.nVersion = CHDChain::VERSION_HD_CHAIN_SPLIT;
-                    chain.nInternalChainCounter = std::max(chain.nInternalChainCounter, index);
+                    chain.nInternalChainCounter = std::max(chain.nInternalChainCounter, index + 1);
                 } else {
-                    chain.nExternalChainCounter = std::max(chain.nExternalChainCounter, index);
+                    chain.nExternalChainCounter = std::max(chain.nExternalChainCounter, index + 1);
                 }
             }
         } else if (strType == DBKeys::WATCHMETA) {

Original file line number	Diff line number	Diff line change
`@@ -556,9 +556,9 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,`
`556`	`556`	`}`
`557`	`557`	`if (internal) {`
`558`	`558`	`chain.nVersion = CHDChain::VERSION_HD_CHAIN_SPLIT;`
`559`		`- chain.nInternalChainCounter = std::max(chain.nInternalChainCounter, index);`
	`559`	`+ chain.nInternalChainCounter = std::max(chain.nInternalChainCounter, index + 1);`
`560`	`560`	`} else {`
`561`		`- chain.nExternalChainCounter = std::max(chain.nExternalChainCounter, index);`
	`561`	`+ chain.nExternalChainCounter = std::max(chain.nExternalChainCounter, index + 1);`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`	`} else if (strType == DBKeys::WATCHMETA) {`