Dev (#5)

fix fee calculation for compulsory list
vladmelnyk · Feb 7, 2019 · 136b9a9 · 136b9a9
1 parent a45b44b
commit 136b9a9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group = 'com.coinselection'
-version = '0.0.4'
+version = '0.0.5'
 buildscript {
     ext.kotlin_version = '1.3.11'
     ext.spring_boot_version = '2.0.6.RELEASE'

diff --git a/src/main/kotlin/com.coinselection/BtcCoinSelectionProvider.kt b/src/main/kotlin/com.coinselection/BtcCoinSelectionProvider.kt
@@ -77,6 +77,11 @@ class BtcCoinSelectionProvider(
                                                compulsoryUtxoList: List<UnspentOutput>): UtxoSumCalculationData? {
         val cumulativeHolder = CumulativeHolder.defaultInit()
         cumulativeHolder.appendFee(costCalculator.getBaseFee())
+        val selectedCompulsoryUtxoList = compulsoryUtxoList
+                .asSequence()
+                .take(maxNumberOfInputs)
+                .onEach { appendSumAndFee(cumulativeHolder, costCalculator, sum = it.amount) }
+                .toList()
         val selectedUtxoList = utxoListRearanged
                 .asSequence()
                 .takeWhile { sumIsLessThanTarget(cumulativeHolder, targetValue) }
@@ -86,7 +91,7 @@ class BtcCoinSelectionProvider(
         if (sumIsLessThanTarget(cumulativeHolder, targetValue)) {
             return null
         }
-        return UtxoSumCalculationData(compulsoryUtxoList + selectedUtxoList, cumulativeHolder)
+        return UtxoSumCalculationData(selectedCompulsoryUtxoList + selectedUtxoList, cumulativeHolder)
     }
 
     private fun fallbackLargestFirstSelection(utxoListRearanged: List<UnspentOutput>,
@@ -99,7 +104,7 @@ class BtcCoinSelectionProvider(
         } else {
             val cumulativeHolder = dataPair.cumulativeHolder
             cumulativeHolder.appendFee(costCalculator.getBaseFee())
-            UtxoSumCalculationData(compulsoryUtxoList + dataPair.utxoList, cumulativeHolder)
+            UtxoSumCalculationData(dataPair.utxoList, cumulativeHolder)
         }
     }
 

diff --git a/src/test/kotlin/com/coinselection/BtcCoinSelectionProviderTest.kt b/src/test/kotlin/com/coinselection/BtcCoinSelectionProviderTest.kt
@@ -72,6 +72,10 @@ class BtcCoinSelectionProviderTest {
         val coinSelectionResult = coinSelectionProvider.provide(utxoList, targetValue, smartFeePerByte, compulsoryUtxoList = compulsoryUtxoList)
         Assertions.assertNotNull(coinSelectionResult!!.selectedUtxos)
         Assertions.assertTrue(coinSelectionResult.selectedUtxos!!.containsAll(compulsoryUtxoList))
+        val totalFeeExpected = calculateTransactionFee(coinSelectionResult.selectedUtxos!!.size, 2, smartFeePerByte)
+        val totalFee = coinSelectionResult.totalFee
+        Assertions.assertEquals(totalFeeExpected, totalFee)
+
     }
 
     private fun createUnspentOutput(value: Double): UnspentOutput {