Replace UtxoPriorityMode by ChangeOutputType

Author: galpHub

divi/src/MinimumFeeCoinSelectionAlgorithm.cpp

@@ -27,11 +27,11 @@ MinimumFeeCoinSelectionAlgorithm::MinimumFeeCoinSelectionAlgorithm(
     const CKeyStore& keyStore,
     const I_SignatureSizeEstimator& estimator,
     const CFeeRate& minRelayTxFee,
-    const UtxoPriorityMode utxoPriorityMode
+    const ChangeOutputType changeOutputType
     ): keyStore_(keyStore)
     , estimator_(estimator)
     , minRelayTxFee_(minRelayTxFee)
-    , utxoPriorityMode_(utxoPriorityMode)
+    , changeOutputType_(changeOutputType)
 {
 }
 
@@ -40,7 +40,7 @@ std::set<COutput> MinimumFeeCoinSelectionAlgorithm::SelectCoins(
     const std::vector<COutput>& vCoins,
     CAmount& fees) const
 {
-    const unsigned nominalChangeOutputSize = (utxoPriorityMode_ == UtxoPriorityMode::MINIMUM_COIN_AGE)? 59u: 34u; // Vault? Vault-Change : P2PKH change address
+    const unsigned nominalChangeOutputSize = static_cast<unsigned>(changeOutputType_); // Vault? Vault-Change : P2PKH change address
     CTransaction initialTransaction = CTransaction(transactionToSelectCoinsFor);
     const unsigned initialByteSize = ::GetSerializeSize(initialTransaction, SER_NETWORK, PROTOCOL_VERSION);
 
@@ -79,7 +79,7 @@ std::set<COutput> MinimumFeeCoinSelectionAlgorithm::SelectCoins(
         inputsToSpendAndSignatureSizeEstimates.end(),
         [totalAmountNeeded,this](const InputToSpendAndSigSize& inputA, const InputToSpendAndSigSize& inputB)
         {
-            if(utxoPriorityMode_ == UtxoPriorityMode::MINIMUM_COIN_AGE && inputA.outputRef->nDepth != inputB.outputRef->nDepth)
+            if(changeOutputType_ == ChangeOutputType::VAULT && inputA.outputRef->nDepth != inputB.outputRef->nDepth)
             {
                 return inputA.outputRef->nDepth < inputB.outputRef->nDepth;
             }

divi/src/MinimumFeeCoinSelectionAlgorithm.h

@@ -5,11 +5,6 @@ class CKeyStore;
 class I_SignatureSizeEstimator;
 class CFeeRate;
 
-enum UtxoPriorityMode
-{
-    MINIMUM_FEES,
-    MINIMUM_COIN_AGE,
-};
 enum class ChangeOutputType
 {
     P2PKH = 34u,
@@ -33,13 +28,13 @@ class MinimumFeeCoinSelectionAlgorithm final: public I_CoinSelectionAlgorithm
     const CKeyStore& keyStore_;
     const I_SignatureSizeEstimator& estimator_;
     const CFeeRate& minRelayTxFee_;
-    const UtxoPriorityMode utxoPriorityMode_;
+    const ChangeOutputType changeOutputType_;
 public:
     MinimumFeeCoinSelectionAlgorithm(
         const CKeyStore& keyStore,
         const I_SignatureSizeEstimator& estimator,
         const CFeeRate& minRelayTxFee,
-        const UtxoPriorityMode utxoPriorityMode = UtxoPriorityMode::MINIMUM_FEES);
+        const ChangeOutputType changeOutputType);
     bool isSelectable(const COutput& coin) const override { return true; };
     std::set<COutput> SelectCoins(
         const CMutableTransaction& transactionToSelectCoinsFor,

divi/src/rpcwallet.cpp

@@ -471,7 +471,8 @@ class AccountCoinSelector final: public I_FilteredCoinSelector
             new MinimumFeeCoinSelectionAlgorithm(
                 wallet,
                 signatureSizeEstimator_,
-                FeeAndPriorityCalculator::instance().getMinimumRelayFeeRate()));
+                FeeAndPriorityCalculator::instance().getMinimumRelayFeeRate(),
+                ChangeOutputType::P2PKH));
     }
     ~AccountCoinSelector(){ coinSelector_.reset(); }
 
@@ -511,7 +512,7 @@ class VaultCoinSelector final: public I_FilteredCoinSelector
                 wallet,
                 signatureSizeEstimator_,
                 FeeAndPriorityCalculator::instance().getMinimumRelayFeeRate(),
-                UtxoPriorityMode::MINIMUM_COIN_AGE));
+                ChangeOutputType::VAULT));
     }
     ~VaultCoinSelector(){ coinSelector_.reset(); }
 

divi/src/test/MinimumFeeCoinSelectionAlgorithm_tests.cpp

@@ -52,7 +52,7 @@ class MinimumFeeCoinSelectionAlgorithmTestFixture
         , keyIds()
         , mockSignatureSizeEstimator()
         , feeRate(10000)
-        , algorithm(keystore_,mockSignatureSizeEstimator,feeRate)
+        , algorithm(keystore_,mockSignatureSizeEstimator,feeRate,ChangeOutputType::P2PKH)
         , scriptGenerator()
         , smallScriptSigReqScript(scriptGenerator(25))
         , largeScriptSigReqScript(scriptGenerator(25))