mirror of
https://github.com/bitcoin-s/bitcoin-s.git
synced 2025-02-24 15:02:17 +01:00
wallet: Rework where we fetch the number of block confirmations for a tx in the wallet (#5738)
* wallet: Rework where we fetch the number of block confirmations for a tx in the wallet * fix reserve handling
This commit is contained in:
Chris Stewart
GitHub
parent
30663fe622
commit
8917188220
2 changed files with 71 additions and 93 deletions
|
|
@ -442,7 +442,8 @@ case class TransactionProcessing(
|
|||
toBeUpdated = outputsBeingSpent.flatMap(
|
||||
markAsSpent(_, transaction.txIdBE)
|
||||
)
|
||||
processed <- utxoHandling.updateUtxoSpentConfirmedStates(toBeUpdated)
|
||||
withBlocks <- utxoHandling.getDbsByRelevantBlock(toBeUpdated)
|
||||
processed <- utxoHandling.updateUtxoSpentConfirmedStates(withBlocks)
|
||||
} yield {
|
||||
processed
|
||||
}
|
||||
|
|
@ -619,19 +620,25 @@ case class TransactionProcessing(
|
|||
)
|
||||
|
||||
val updateTxDbF = insertTransaction(transaction, blockHashOpt)
|
||||
|
||||
val withBlocksF = updateTxDbF.flatMap(_ =>
|
||||
utxoHandling.getDbsByRelevantBlock(Vector(foundTxo)))
|
||||
// Update Txo State
|
||||
updateTxDbF.flatMap(_ =>
|
||||
utxoHandling.updateUtxoReceiveConfirmedStates(foundTxo).flatMap {
|
||||
case Some(txo) =>
|
||||
withBlocksF.flatMap { withBlocks =>
|
||||
utxoHandling
|
||||
.updateUtxoReceiveConfirmedStates(withBlocks)
|
||||
.flatMap { txos =>
|
||||
if (txos.length == 1) {
|
||||
val txo = txos.head
|
||||
logger.debug(
|
||||
s"Updated block_hash of txo=${txo.txid.hex} new block hash=${blockHash.hex}"
|
||||
)
|
||||
Future.successful(txo)
|
||||
case None =>
|
||||
} else {
|
||||
// State was not updated so we need to update it so it's block hash is in the database
|
||||
spendingInfoDAO.update(foundTxo)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
case None =>
|
||||
logger.debug(
|
||||
s"Skipping further processing of transaction=${transaction.txIdBE.hex}, already processed."
|
||||
|
|
|
|||
|
|
@ -157,28 +157,15 @@ case class UtxoHandling(
|
|||
}
|
||||
|
||||
private[wallet] def updateUtxoSpentConfirmedStates(
|
||||
txo: SpendingInfoDb
|
||||
): Future[Option[SpendingInfoDb]] = {
|
||||
updateUtxoSpentConfirmedStates(Vector(txo)).map(_.headOption)
|
||||
}
|
||||
|
||||
private[wallet] def updateUtxoSpentConfirmedStates(
|
||||
txos: Vector[SpendingInfoDb]
|
||||
relevantBlocks: Map[Option[BlockHashWithConfs], Vector[SpendingInfoDb]]
|
||||
): Future[Vector[SpendingInfoDb]] = {
|
||||
updateUtxoStates(txos, UtxoHandling.updateSpentTxoWithConfs)
|
||||
updateUtxoStates(relevantBlocks, UtxoHandling.updateSpentTxoWithConfs)
|
||||
}
|
||||
|
||||
private[wallet] def updateUtxoReceiveConfirmedStates(
|
||||
txo: SpendingInfoDb
|
||||
): Future[Option[SpendingInfoDb]] = {
|
||||
updateUtxoReceiveConfirmedStates(Vector(txo))
|
||||
.map(_.headOption)
|
||||
}
|
||||
|
||||
private[wallet] def updateUtxoReceiveConfirmedStates(
|
||||
txos: Vector[SpendingInfoDb]
|
||||
relevantBlocks: Map[Option[BlockHashWithConfs], Vector[SpendingInfoDb]]
|
||||
): Future[Vector[SpendingInfoDb]] = {
|
||||
updateUtxoStates(txos, UtxoHandling.updateReceivedTxoWithConfs)
|
||||
updateUtxoStates(relevantBlocks, UtxoHandling.updateReceivedTxoWithConfs)
|
||||
}
|
||||
|
||||
/** Returns a map of the SpendingInfoDbs with their relevant block. If the
|
||||
|
|
@ -189,7 +176,7 @@ case class UtxoHandling(
|
|||
*/
|
||||
private[wallet] def getDbsByRelevantBlock(
|
||||
spendingInfoDbs: Vector[SpendingInfoDb]
|
||||
): Future[Map[Option[DoubleSha256DigestBE], Vector[SpendingInfoDb]]] = {
|
||||
): Future[Map[Option[BlockHashWithConfs], Vector[SpendingInfoDb]]] = {
|
||||
val txIds =
|
||||
spendingInfoDbs.map { db =>
|
||||
db.spendingTxIdOpt match {
|
||||
|
|
@ -200,7 +187,7 @@ case class UtxoHandling(
|
|||
}
|
||||
}
|
||||
|
||||
transactionDAO.findByTxIdBEs(txIds).map { txDbs =>
|
||||
val blockHashMapF = transactionDAO.findByTxIdBEs(txIds).map { txDbs =>
|
||||
val blockHashMap = txDbs.map(db => db.txIdBE -> db.blockHashOpt).toMap
|
||||
val blockHashAndDb = spendingInfoDbs.map { txo =>
|
||||
val txToUse = txo.state match {
|
||||
|
|
@ -216,6 +203,8 @@ case class UtxoHandling(
|
|||
blockHashOpt -> vec.map(_._2)
|
||||
}
|
||||
}
|
||||
|
||||
blockHashMapF.flatMap(getConfirmationsForBlocks)
|
||||
}
|
||||
|
||||
/** Updates all the given SpendingInfoDbs to the correct state based on how
|
||||
|
|
@ -227,26 +216,10 @@ case class UtxoHandling(
|
|||
* of confirmations
|
||||
*/
|
||||
private def updateUtxoStates(
|
||||
spendingInfoDbs: Vector[SpendingInfoDb],
|
||||
txsByBlock: Map[Option[BlockHashWithConfs], Vector[SpendingInfoDb]],
|
||||
fn: (SpendingInfoDb, Int, Int) => SpendingInfoDb
|
||||
): Future[Vector[SpendingInfoDb]] = {
|
||||
val relevantBlocksF
|
||||
: Future[Map[Option[DoubleSha256DigestBE], Vector[SpendingInfoDb]]] = {
|
||||
getDbsByRelevantBlock(spendingInfoDbs)
|
||||
}
|
||||
|
||||
// fetch all confirmations for those blocks, do it in parallel
|
||||
// as an optimzation, previously we would fetch sequentially
|
||||
val blocksWithConfsF
|
||||
: Future[Map[Option[BlockHashWithConfs], Vector[SpendingInfoDb]]] = {
|
||||
for {
|
||||
relevantBlocks <- relevantBlocksF
|
||||
blocksWithConfirmations <- getConfirmationsForBlocks(relevantBlocks)
|
||||
} yield blocksWithConfirmations
|
||||
}
|
||||
|
||||
val toUpdateF = blocksWithConfsF.map { txsByBlock =>
|
||||
val toUpdateFs: Vector[SpendingInfoDb] = txsByBlock.flatMap {
|
||||
val toUpdates: Vector[SpendingInfoDb] = txsByBlock.flatMap {
|
||||
case (Some(blockHashWithConfs), txos) =>
|
||||
blockHashWithConfs.confirmationsOpt match {
|
||||
case None =>
|
||||
|
|
@ -263,18 +236,10 @@ case class UtxoHandling(
|
|||
)
|
||||
txos
|
||||
}.toVector
|
||||
|
||||
toUpdateFs
|
||||
}
|
||||
|
||||
for {
|
||||
toUpdate <- toUpdateF
|
||||
_ =
|
||||
if (toUpdate.nonEmpty)
|
||||
logger.info(s"${toUpdate.size} txos are now confirmed!")
|
||||
if (toUpdates.nonEmpty)
|
||||
logger.info(s"${toUpdates.size} txos are now confirmed!")
|
||||
else logger.trace("No txos to be confirmed")
|
||||
updated <- spendingInfoDAO.upsertAllSpendingInfoDb(toUpdate)
|
||||
} yield updated
|
||||
spendingInfoDAO.upsertAllSpendingInfoDb(toUpdates)
|
||||
}
|
||||
|
||||
/** Fetches confirmations for the given blocks in parallel */
|
||||
|
|
@ -429,19 +394,21 @@ case class UtxoHandling(
|
|||
utxos: Vector[SpendingInfoDb]
|
||||
): Future[Vector[SpendingInfoDb]] = {
|
||||
logger.info(s"Unreserving utxos ${utxos.map(_.outPoint)}")
|
||||
val updatedUtxosF = Future {
|
||||
val updatedUtxosF
|
||||
: Future[Map[Option[BlockHashWithConfs], Vector[SpendingInfoDb]]] = {
|
||||
// make sure exception isn't thrown outside of a future to fix
|
||||
// see: https://github.com/bitcoin-s/bitcoin-s/issues/3813
|
||||
val unreserved = utxos.filterNot(_.state == TxoState.Reserved)
|
||||
require(
|
||||
unreserved.isEmpty,
|
||||
s"Some utxos are not reserved, got $unreserved"
|
||||
)
|
||||
|
||||
if (unreserved.nonEmpty) {
|
||||
val exn = new IllegalArgumentException(
|
||||
s"Some utxos are not reserved, got unreserved=$unreserved utxos=$utxos")
|
||||
Future.failed(exn)
|
||||
} else {
|
||||
// unmark all utxos are reserved
|
||||
val updatedUtxos = utxos
|
||||
.map(_.copyWithState(TxoState.PendingConfirmationsReceived))
|
||||
updatedUtxos
|
||||
getDbsByRelevantBlock(updatedUtxos)
|
||||
}
|
||||
}
|
||||
|
||||
for {
|
||||
|
|
@ -450,8 +417,9 @@ case class UtxoHandling(
|
|||
updatedConfirmed <- updateUtxoReceiveConfirmedStates(updatedUtxos)
|
||||
|
||||
// update the utxos that are in blocks but not considered confirmed yet
|
||||
pendingConf = updatedUtxos.filterNot(utxo =>
|
||||
updatedConfirmed.exists(_.outPoint == utxo.outPoint))
|
||||
pendingConf = updatedUtxos.values.flatten
|
||||
.filterNot(utxo => updatedConfirmed.exists(_.outPoint == utxo.outPoint))
|
||||
.toVector
|
||||
updated <- spendingInfoDAO.updateAllSpendingInfoDb(
|
||||
pendingConf ++ updatedConfirmed
|
||||
)
|
||||
|
|
@ -478,9 +446,12 @@ case class UtxoHandling(
|
|||
_ = logger.debug(s"Updating states of ${infos.size} pending utxos...")
|
||||
receivedUtxos = infos.filter(_.state.isInstanceOf[ReceivedState])
|
||||
spentUtxos = infos.filter(_.state.isInstanceOf[SpentState])
|
||||
updatedReceivedInfos <- updateUtxoReceiveConfirmedStates(receivedUtxos)
|
||||
updatedSpentInfos <- updateUtxoSpentConfirmedStates(spentUtxos)
|
||||
} yield (updatedReceivedInfos ++ updatedSpentInfos).toVector
|
||||
receivedWithBlocks <- getDbsByRelevantBlock(receivedUtxos)
|
||||
spentWithBlocks <- getDbsByRelevantBlock(spentUtxos)
|
||||
updatedReceivedInfos <- updateUtxoReceiveConfirmedStates(
|
||||
receivedWithBlocks)
|
||||
updatedSpentInfos <- updateUtxoSpentConfirmedStates(spentWithBlocks)
|
||||
} yield (updatedReceivedInfos ++ updatedSpentInfos)
|
||||
}
|
||||
|
||||
/** Inserts the UTXO at the given index into our DB, swallowing the error if
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue