Segwit light for spending coins.

Handle segwit-light properly when spending coins, either for staking
or normal transactions in the wallet.  Depending on when a transaction
was confirmed, we need to make sure to include the right outpoint (with
txid or bare txid) in the transaction spending an output.  This is done
through a custom UTXO hasher used in the wallet, which specifically
works for CWalletTx.

Author: domob1812

divi/src/primitives/transaction.h

@@ -139,6 +139,8 @@ class CTransaction
 
     CTransaction& operator=(const CTransaction& tx);
 
+    virtual ~CTransaction() = default;
+
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>

divi/src/wallet.cpp

@@ -12,6 +12,7 @@
 #include "checkpoints.h"
 #include <chain.h>
 #include <chainparams.h>
+#include "ForkActivation.h"
 #include "net.h"
 #include "script/script.h"
 #include "script/sign.h"
@@ -175,17 +176,42 @@ std::set<CTxDestination> AddressBookManager::GetAccountAddresses(std::string str
 namespace
 {
 
-/** Dummy UTXO hasher for the wallet.  For now, this just always returns
- *  the normal txid, but we will later change it to return the proper hash
- *  for a WalletTx.  */
+/** UTXO hasher for wallet transactions.  It uses the transaction's known block
+ *  hash (from CMerkleTx) to determine the activation state of segwit light.  */
 class WalletUtxoHasher : public TransactionUtxoHasher
 {
 
+private:
+
+  const I_MerkleTxConfirmationNumberCalculator& confirmationNumberCalculator_;
+  const CChain& chainActive_;
+
 public:
 
+  WalletUtxoHasher(const I_MerkleTxConfirmationNumberCalculator& calc, const CChain& chain)
+    : confirmationNumberCalculator_(calc), chainActive_(chain)
+  {}
+
   OutputHash GetUtxoHash(const CTransaction& tx) const override
   {
-    return OutputHash(tx.GetHash());
+    const CMerkleTx* mtx = dynamic_cast<const CMerkleTx*>(&tx);
+    assert(mtx != nullptr);
+
+    const auto conf = confirmationNumberCalculator_.FindConfirmedBlockIndexAndDepth(*mtx);
+    const CBlockIndex* pindexBlock = conf.first;
+
+    /* If the transaction is not yet confirmed in a block, we use the current
+       tip to determine the segwit-light activation status.  This is not
+       perfect around the activation time, but there is nothing we can do
+       in that case anyway.  Mempool and wallet discourage spending unconfirmed
+       outputs around the segwit-light fork anyway.  */
+    if (conf.second <= 0)
+        pindexBlock = chainActive_.Tip();
+
+    assert(pindexBlock != nullptr);
+    const ActivationState as(pindexBlock);
+
+    return OutputHash(as.IsActive(Fork::SegwitLight) ? mtx->GetBareTxid() : mtx->GetHash());
   }
 
 };
@@ -210,7 +236,7 @@ CWallet::CWallet(const CChain& chain, const BlockMap& blockMap
     , transactionRecord_(new WalletTransactionRecord(cs_wallet,strWalletFile) )
     , outputTracker_( new SpentOutputTracker(*transactionRecord_,*confirmationNumberCalculator_) )
     , pwalletdbEncryption()
-    , utxoHasher(new WalletUtxoHasher() )
+    , utxoHasher(new WalletUtxoHasher(*confirmationNumberCalculator_, chain) )
     , orderedTransactionIndex()
     , nWalletVersion(FEATURE_BASE)
     , nWalletMaxVersion(FEATURE_BASE)
@@ -3094,4 +3120,4 @@ void CWallet::LockFully()
     LOCK(cs_wallet);
     walletStakingOnly = false;
     Lock();
-}
+}