allow spending from pubkeys

peercoin · Oct 19, 2023 · 6d1f798 · 6d1f798
1 parent 32d3a24
commit 6d1f798
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
@@ -60,11 +60,11 @@ WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)
     result.txout_address.reserve(wtx.tx->vout.size());
     result.txout_address_is_mine.reserve(wtx.tx->vout.size());
     for (const auto& txout : wtx.tx->vout) {
+        CTxDestination address;
+        ExtractDestination(txout.scriptPubKey, address);
         result.txout_is_mine.emplace_back(wallet.IsMine(txout));
-        result.txout_address.emplace_back();
-        result.txout_address_is_mine.emplace_back(ExtractDestination(txout.scriptPubKey, result.txout_address.back()) ?
-                                                      wallet.IsMine(result.txout_address.back()) :
-                                                      ISMINE_NO);
+        result.txout_address.emplace_back(address);
+        result.txout_address_is_mine.emplace_back(wallet.IsMine(txout));
     }
     result.credit = CachedTxGetCredit(wallet, wtx, ISMINE_ALL);
     result.debit = CachedTxGetDebit(wallet, wtx, ISMINE_ALL);

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -2122,7 +2122,14 @@ bool DescriptorScriptPubKeyMan::SignTransaction(CMutableTransaction& tx, const s
 {
     std::unique_ptr<FlatSigningProvider> keys = std::make_unique<FlatSigningProvider>();
     for (const auto& coin_pair : coins) {
-        std::unique_ptr<FlatSigningProvider> coin_keys = GetSigningProvider(coin_pair.second.out.scriptPubKey, true);
+        std::unique_ptr<FlatSigningProvider> coin_keys;
+        // handle pubkeys gracefully
+        std::vector<valtype> vSolutions;
+        TxoutType whichType = Solver(coin_pair.second.out.scriptPubKey, vSolutions);
+        if (whichType == TxoutType::PUBKEY)
+            coin_keys = GetSigningProvider(GetScriptForDestination(PKHash(CPubKey(vSolutions[0]))), true);
+        else
+            coin_keys = GetSigningProvider(coin_pair.second.out.scriptPubKey, true);
         if (!coin_keys) {
             continue;
         }

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1384,7 +1384,14 @@ CAmount CWallet::GetDebit(const CTxIn &txin, const isminefilter& filter) const
 isminetype CWallet::IsMine(const CTxOut& txout) const
 {
     AssertLockHeld(cs_wallet);
-    return IsMine(txout.scriptPubKey);
+    isminetype result = IsMine(txout.scriptPubKey);
+    if (result == ISMINE_NO) // try pubkeyhash version of the address
+    {
+        CTxDestination address;
+        ExtractDestination(txout.scriptPubKey, address);
+        result = IsMine(address);
+    }
+    return result;
 }
 
 isminetype CWallet::IsMine(const CTxDestination& dest) const