[Ed25519] Restore Ed25519 keypool state after importing mnemonic. WIP

dave-mann · dave-mann · commit 69b3a0b09ce9 · 2019-05-08T12:15:50.000-07:00
diff --git a/src/bdap/rpcdomainentry.cpp b/src/bdap/rpcdomainentry.cpp
@@ -54,7 +54,13 @@ static UniValue AddDomainEntry(const JSONRPCRequest& request, BDAP::ObjectType b
     CPubKey pubWalletKey;
     CharString vchDHTPubKey;
     if (!pwalletMain->GetEdKeyFromPool(pubWalletKey, vchDHTPubKey, true))
-        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
+        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: EdKeypool ran out, please call edkeypoolrefill first");
+
+    while (pDomainEntryDB->DomainEntryExistsPubKey(vchDHTPubKey)) {
+        if (!pwalletMain->GetEdKeyFromPool(pubWalletKey, vchDHTPubKey, true))
+            throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: EdKeypool ran out, please call edkeypoolrefill first");
+    };
+
     CKeyID keyWalletID = pubWalletKey.GetID();
     CDynamicAddress walletAddress = CDynamicAddress(keyWalletID);
 
@@ -84,8 +90,12 @@ static UniValue AddDomainEntry(const JSONRPCRequest& request, BDAP::ObjectType b
     // TODO: Use stealth address for the link address so linking will be private
     //now using GetKeyFromPool instead of MakeNewKey
     CPubKey pubLinkKey;
-    if (!pwalletMain->GetKeyFromPool(pubLinkKey, true))
-        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
+    CharString NAvchDHTPubKey; //not really used
+    if (!pwalletMain->GetEdKeyFromPool(pubLinkKey, NAvchDHTPubKey, true))
+        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: EdKeypool ran out, please call edkeypoolrefill first");
+
+    // if (!pwalletMain->GetKeyFromPool(pubLinkKey, true))
+    //     throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
 
     CKeyID keyLinkID = pubLinkKey.GetID();
     CDynamicAddress linkAddress = CDynamicAddress(keyLinkID);
@@ -879,7 +889,7 @@ UniValue mybdapaccounts(const JSONRPCRequest& request)
     uint32_t nCount = 1;
     for (const std::vector<unsigned char>& vchPubKey : vvchDHTPubKeys) {
         CDomainEntry entry;
-        LogPrintf("DEBUGGER ED %s - PubKey [%s]\n",__func__,stringFromVch(vchPubKey));
+        //LogPrintf("DEBUGGER ED %s - PubKey [%s]\n",__func__,stringFromVch(vchPubKey));
         if (pDomainEntryDB->ReadDomainEntryPubKey(vchPubKey, entry)) {
             UniValue oAccount(UniValue::VOBJ);
             if (BuildBDAPJson(entry, oAccount, false)) {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4382,6 +4382,8 @@ bool CWallet::SetDefaultKey(const CPubKey& vchPubKey)
 bool CWallet::NewKeyPool()
 {
     {
+        LogPrintf("DEBUGGER ED %s - made it here!\n",__func__);
+
         LOCK(cs_wallet);
         CWalletDB walletdb(strWalletFile);
         BOOST_FOREACH (int64_t nIndex, setInternalKeyPool) {
@@ -4406,6 +4408,8 @@ bool CWallet::NewKeyPool()
 bool CWallet::NewEdKeyPool()
 {
     {
+        LogPrintf("DEBUGGER ED %s - made it here!\n",__func__);
+
         LOCK(cs_wallet);
         CWalletDB walletdb(strWalletFile);
         BOOST_FOREACH (int64_t nIndex, setInternalEdKeyPool) {

Original file line number	Diff line number	Diff line change
`@@ -4382,6 +4382,8 @@ bool CWallet::SetDefaultKey(const CPubKey& vchPubKey)`
`4382`	`4382`	`bool CWallet::NewKeyPool()`
`4383`	`4383`	`{`
`4384`	`4384`	`{`
	`4385`	`+ LogPrintf("DEBUGGER ED %s - made it here!\n",__func__);`
	`4386`	`+`
`4385`	`4387`	`LOCK(cs_wallet);`
`4386`	`4388`	`CWalletDB walletdb(strWalletFile);`
`4387`	`4389`	`BOOST_FOREACH (int64_t nIndex, setInternalKeyPool) {`
`@@ -4406,6 +4408,8 @@ bool CWallet::NewKeyPool()`
`4406`	`4408`	`bool CWallet::NewEdKeyPool()`
`4407`	`4409`	`{`
`4408`	`4410`	`{`
	`4411`	`+ LogPrintf("DEBUGGER ED %s - made it here!\n",__func__);`
	`4412`	`+`
`4409`	`4413`	`LOCK(cs_wallet);`
`4410`	`4414`	`CWalletDB walletdb(strWalletFile);`
`4411`	`4415`	`BOOST_FOREACH (int64_t nIndex, setInternalEdKeyPool) {`