mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-22 22:36:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix Two KeyManagers in scope for fundRawTransactionInternal (#1986)

Browse source 
* Fix Two KeyManagers in scope for fundRawTransactionInternal

* Only fetch txs once
This commit is contained in:
Ben Carman 2020-09-09 09:40:38 -05:00 • committed by GitHub
parent 4c0437e352
commit 5f7356c526
4 changed files with 13 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wallet-test/src/test/scala/org/bitcoins/wallet/AddressTagIntegrationTest.scala
View file

@ -83,7 +83,6 @@ class AddressTagIntegrationTest extends BitcoinSWalletTest {
.fundRawTransactionInternal(destinations = Vector(output),
feeRate = feeRate,
fromAccount = account,
keyManagerOpt = Some(wallet.keyManager),
fromTagOpt = Some(exampleTag))
}
utx <- txBuilder.buildTx()

1
wallet-test/src/test/scala/org/bitcoins/wallet/FundTransactionHandlingTest.scala
View file

@ -235,7 +235,6 @@ class FundTransactionHandlingTest extends BitcoinSWalletTest {
destinations = Vector(destination),
feeRate = feeRate,
fromAccount = account,
keyManagerOpt = Some(wallet.keyManager),
fromTagOpt = Some(tag),
markAsReserved = true
)

2
wallet/src/main/scala/org/bitcoins/wallet/Wallet.scala
View file

@ -452,7 +452,6 @@ abstract class Wallet
destinations = Vector(destination),
feeRate = feeRate,
fromAccount = fromAccount,
keyManagerOpt = Some(keyManager),
coinSelectionAlgo = algo,
fromTagOpt = None)
@ -544,7 +543,6 @@ abstract class Wallet
destinations = outputs,
feeRate = feeRate,
fromAccount = fromAccount,
keyManagerOpt = Some(keyManager),
fromTagOpt = None)
sentAmount = outputs.foldLeft(CurrencyUnits.zero)(_ + _.value)
tx <- finishSend(txBuilder, utxoInfos, sentAmount, feeRate, newTags)

57
wallet/src/main/scala/org/bitcoins/wallet/internal/FundTransactionHandling.scala
View file

@ -1,11 +1,7 @@
package org.bitcoins.wallet.internal
import org.bitcoins.core.api.wallet.db.{AccountDb, SpendingInfoDb}
import org.bitcoins.core.api.wallet.{
AddressInfo,
CoinSelectionAlgo,
CoinSelector
}
import org.bitcoins.core.api.wallet.{CoinSelectionAlgo, CoinSelector}
import org.bitcoins.core.consensus.Consensus
import org.bitcoins.core.protocol.transaction._
import org.bitcoins.core.util.FutureUtil
@ -16,8 +12,6 @@ import org.bitcoins.core.wallet.builder.{
}
import org.bitcoins.core.wallet.fee.FeeUnit
import org.bitcoins.core.wallet.utxo._
import org.bitcoins.crypto.Sign
import org.bitcoins.keymanager.bip39.BIP39KeyManager
import org.bitcoins.wallet.{Wallet, WalletLogger}
import scala.concurrent.Future
@ -49,7 +43,6 @@ trait FundTransactionHandling extends WalletLogger { self: Wallet =>
fundRawTransactionInternal(destinations = destinations,
feeRate = feeRate,
fromAccount = fromAccount,
keyManagerOpt = None,
fromTagOpt = fromTagOpt,
markAsReserved = markAsReserved)
.flatMap(_._1.buildTx())
@ -69,14 +62,13 @@ trait FundTransactionHandling extends WalletLogger { self: Wallet =>
destinations: Vector[TransactionOutput],
feeRate: FeeUnit,
fromAccount: AccountDb,
keyManagerOpt: Option[BIP39KeyManager],
coinSelectionAlgo: CoinSelectionAlgo =
CoinSelectionAlgo.AccumulateLargest,
fromTagOpt: Option[AddressTag],
markAsReserved: Boolean = false): Future[(
RawTxBuilderWithFinalizer[ShufflingNonInteractiveFinalizer],
Vector[ScriptSignatureParams[InputInfo]])] = {
def utxosF: Future[Vector[SpendingInfoDb]] =
def utxosF: Future[Vector[(SpendingInfoDb, Transaction)]] =
for {
utxos <- fromTagOpt match {
case None =>
@ -105,53 +97,30 @@ trait FundTransactionHandling extends WalletLogger { self: Wallet =>
confsOpt.isDefined && confsOpt.get < Consensus.coinbaseMaturity
}
.map(_._1)
} yield utxos.filter(utxo => !immatureCoinbases.exists(_._1 == utxo))
} yield utxoWithTxs.filter(utxo =>
!immatureCoinbases.exists(_._1 == utxo._1))
val selectedUtxosF: Future[Vector[SpendingInfoDb]] =
val selectedUtxosF: Future[Vector[(SpendingInfoDb, Transaction)]] =
for {
walletUtxos <- utxosF
utxos = CoinSelector.selectByAlgo(coinSelectionAlgo = coinSelectionAlgo,
walletUtxos = walletUtxos,
walletUtxos = walletUtxos.map(_._1),
outputs = destinations,
feeRate = feeRate)
} yield utxos
val addrInfosWithUtxoF: Future[
Vector[(SpendingInfoDb, Transaction, AddressInfo)]] =
for {
selectedUtxos <- selectedUtxosF
_ = selectedUtxosF.failed.foreach(err =>
logger.error("Error selecting utxos to fund transaction ", err))
addrInfoOptF = selectedUtxos.map { utxo =>
// .gets should be safe here because of foreign key at the database level
for {
addrInfo <- getAddressInfo(utxo, networkParameters).map(_.get)
prevTx <-
transactionDAO
.findByOutPoint(utxo.outPoint)
.map(_.get.transaction)
} yield (utxo, prevTx, addrInfo)
}
vec <- FutureUtil.collect(addrInfoOptF).map(_.toVector)
} yield vec
} yield walletUtxos.filter(utxo => utxos.contains(utxo._1))
val resultF = for {
addrInfosWithUtxo <- addrInfosWithUtxoF
selectedUtxos <- selectedUtxosF
change <- getNewChangeAddress(fromAccount)
utxoSpendingInfos = {
addrInfosWithUtxo.map {
case (utxo, prevTx, addrInfo) =>
keyManagerOpt match {
case Some(km) =>
utxo.toUTXOInfo(keyManager = km, prevTx)
case None =>
utxo.toUTXOInfo(sign = Sign.dummySign(addrInfo.pubkey), prevTx)
}
selectedUtxos.map {
case (utxo, prevTx) =>
utxo.toUTXOInfo(keyManager = self.keyManager, prevTx)
}
}
_ <-
if (markAsReserved) markUTXOsAsReserved(addrInfosWithUtxo.map(_._1))
if (markAsReserved) markUTXOsAsReserved(selectedUtxos.map(_._1))
else FutureUtil.unit
} yield {
logger.info {
@ -191,7 +160,7 @@ trait FundTransactionHandling extends WalletLogger { self: Wallet =>
if (markAsReserved) {
for {
utxos <- selectedUtxosF
_ <- unmarkUTXOsAsReserved(utxos)
_ <- unmarkUTXOsAsReserved(utxos.map(_._1))
} yield error
} else Future.failed(error)
}