Have wallet shuffle inputs and outputs (#1721)

bitcoin-s · Aug 5, 2020 · d9024b1 · d9024b1
1 parent 4323cd7
commit d9024b1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/core/src/main/scala/org/bitcoins/core/wallet/builder/RawTxFinalizer.scala b/core/src/main/scala/org/bitcoins/core/wallet/builder/RawTxFinalizer.scala
@@ -319,19 +319,25 @@ case class ShufflingNonInteractiveFinalizer(
       ec: ExecutionContext): Future[Transaction] = {
     val addChange = ChangeFinalizer(inputInfos, feeRate, changeSPK)
 
-    val sanityCheck = SanityCheckFinalizer(
-      inputInfos = inputInfos,
-      expectedOutputSPKs = txBuilderResult.outputs.map(_.scriptPubKey),
-      expectedFeeRate = feeRate,
-      changeSPKs = Vector(changeSPK))
+    val shuffled = addChange.andThen(ShuffleFinalizer)
 
-    val addWitnessData = AddWitnessDataFinalizer(inputInfos)
+    shuffled.buildTx(txBuilderResult).flatMap { tempTx =>
+      val tempTxBuilderResult = RawTxBuilderResult.fromTransaction(tempTx)
 
-    addChange
-      .andThen(ShuffleFinalizer)
-      .andThen(sanityCheck)
-      .andThen(addWitnessData)
-      .buildTx(txBuilderResult)
+      val shuffledInputInfos = tempTxBuilderResult.inputs
+        .map(input => inputInfos.find(_.outPoint == input.previousOutput).get)
+
+      val sanityCheck =
+        SanityCheckFinalizer(inputInfos = shuffledInputInfos,
+                             expectedOutputSPKs =
+                               tempTxBuilderResult.outputs.map(_.scriptPubKey),
+                             expectedFeeRate = feeRate,
+                             changeSPKs = Vector(changeSPK))
+
+      sanityCheck
+        .andThen(AddWitnessDataFinalizer(shuffledInputInfos))
+        .buildTx(tempTxBuilderResult)
+    }
   }
 }
 

diff --git a/wallet-test/src/test/scala/org/bitcoins/wallet/WalletSendingTest.scala b/wallet-test/src/test/scala/org/bitcoins/wallet/WalletSendingTest.scala
@@ -39,8 +39,8 @@ class WalletSendingTest extends BitcoinSWalletTest {
       tx <- wallet.sendToAddress(testAddress, amountToSend, feeRateOpt)
     } yield {
       assert(
-        tx.outputs.head == TransactionOutput(amountToSend,
-                                             testAddress.scriptPubKey))
+        tx.outputs.contains(
+          TransactionOutput(amountToSend, testAddress.scriptPubKey)))
     }
   }
 

diff --git a/wallet/src/main/scala/org/bitcoins/wallet/Wallet.scala b/wallet/src/main/scala/org/bitcoins/wallet/Wallet.scala
@@ -20,7 +20,7 @@ import org.bitcoins.core.util.{BitcoinScriptUtil, FutureUtil}
 import org.bitcoins.core.wallet.builder.{
   RawTxBuilderWithFinalizer,
   RawTxSigner,
-  StandardNonInteractiveFinalizer
+  ShufflingNonInteractiveFinalizer
 }
 import org.bitcoins.core.wallet.fee.FeeUnit
 import org.bitcoins.core.wallet.utxo.TxoState.{
@@ -337,7 +337,7 @@ abstract class Wallet
     * finalizing and signing the transaction, then correctly processing and logging it
     */
   private def finishSend(
-      txBuilder: RawTxBuilderWithFinalizer[StandardNonInteractiveFinalizer],
+      txBuilder: RawTxBuilderWithFinalizer[ShufflingNonInteractiveFinalizer],
       utxoInfos: Vector[ScriptSignatureParams[InputInfo]],
       sentAmount: CurrencyUnit,
       feeRate: FeeUnit,
@@ -395,7 +395,7 @@ abstract class Wallet
       changeAddr <- getNewChangeAddress(fromAccount.hdAccount)
 
       output = TransactionOutput(amount, address.scriptPubKey)
-      txBuilder = StandardNonInteractiveFinalizer.txBuilderFrom(
+      txBuilder = ShufflingNonInteractiveFinalizer.txBuilderFrom(
         Vector(output),
         utxos,
         feeRate,

diff --git a/wallet/src/main/scala/org/bitcoins/wallet/internal/FundTransactionHandling.scala b/wallet/src/main/scala/org/bitcoins/wallet/internal/FundTransactionHandling.scala
@@ -6,7 +6,7 @@ import org.bitcoins.core.protocol.transaction._
 import org.bitcoins.core.wallet.builder.{
   RawTxBuilder,
   RawTxBuilderWithFinalizer,
-  StandardNonInteractiveFinalizer
+  ShufflingNonInteractiveFinalizer
 }
 import org.bitcoins.core.wallet.fee.FeeUnit
 import org.bitcoins.core.wallet.utxo.{
@@ -74,7 +74,7 @@ trait FundTransactionHandling extends WalletLogger { self: Wallet =>
         CoinSelectionAlgo.AccumulateLargest,
       fromTagOpt: Option[AddressTag],
       markAsReserved: Boolean = false): Future[(
-      RawTxBuilderWithFinalizer[StandardNonInteractiveFinalizer],
+      RawTxBuilderWithFinalizer[ShufflingNonInteractiveFinalizer],
       Vector[ScriptSignatureParams[InputInfo]])] = {
     val utxosF = for {
       utxos <- fromTagOpt match {
@@ -170,7 +170,7 @@ trait FundTransactionHandling extends WalletLogger { self: Wallet =>
       val txBuilder =
         RawTxBuilder().setLockTime(lockTime) ++= destinations ++= inputs
 
-      val finalizer = StandardNonInteractiveFinalizer(
+      val finalizer = ShufflingNonInteractiveFinalizer(
         utxoSpendingInfos.map(_.inputInfo),
         feeRate,
         change.scriptPubKey)