mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-26 01:29:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve logging around signDLC (#4299)

Browse source 
* Improve logging around signDLC

* Improve logging so we can see what specific transaction fails when processing a block
This commit is contained in:
Chris Stewart 2022-04-28 17:09:27 -05:00 • committed by GitHub
parent f4d864fab8
commit 79b4f096ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala
View file

@ -869,7 +869,7 @@ abstract class DLCWallet
def registerDLCAccept(
accept: DLCAccept): Future[(DLCDb, Vector[DLCCETSignaturesDb])] = {
logger.debug(
logger.info(
s"Checking if DLC Accept with tempContractId ${accept.tempContractId.hex} has already been registered")
val dbsF = for {
dlcDbOpt <- dlcDAO.findByTempContractId(accept.tempContractId)
@ -892,7 +892,8 @@ abstract class DLCWallet
dlc.isInitiator,
s"We cannot register a DLCAccept if we are not the initiator, got $dlc")
logger.debug(s"DLC Offer (${dlc.dlcId.hex}) found, adding accept data")
logger.info(
s"DLC Offer contractId=${dlc.contractIdOpt.map(_.toHex)} dlcId=(${dlc.dlcId.hex}) found, adding accept data")
val dlcId = dlc.dlcId
lazy val dlcAcceptDb = DLCAcceptDbHelper.fromDLCAccept(dlcId, accept)
@ -998,8 +999,8 @@ abstract class DLCWallet
.updateFundingOutPoint(outPoint))
} yield (updatedDLCDb, sigsDbs)
case (dlc, Some(_)) =>
logger.debug(
s"DLC Accept (${dlc.contractIdOpt.get.toHex}) has already been registered")
logger.info(
s"DLC Accept contractId=(${dlc.contractIdOpt.get.toHex}) dlcId=${dlc.dlcId.hex} has already been registered")
dlcSigsDAO
.findByDLCId(dlc.dlcId)
.map(sigOpt => (dlc, sigOpt))
@ -1030,6 +1031,8 @@ abstract class DLCWallet
* This is the second step of the initiator
*/
override def signDLC(accept: DLCAccept): Future[DLCSign] = {
logger.info(
s"Received accept message, tempContractId=${accept.tempContractId.hex}")
for {
(dlc, cetSigsDbs) <- registerDLCAccept(accept)
// .get should be safe now
@ -1094,6 +1097,8 @@ abstract class DLCWallet
status <- findDLC(dlcId)
_ <- dlcConfig.walletCallbacks.executeOnDLCStateChange(logger, status.get)
} yield {
logger.info(
s"Done creating sign message with contractId=${contractId.toHex} tempContractId=${dlc.tempContractId.hex}")
//?? is signer.signRefundTx persisted anywhere ??
DLCSign(cetSigs,
signerOpt.map(_.signRefundTx).get,

9
wallet/src/main/scala/org/bitcoins/wallet/internal/TransactionProcessing.scala
View file

@ -407,7 +407,7 @@ private[bitcoins] trait TransactionProcessing extends WalletLogger {
}
}
for {
val processTxF = for {
receivedSpendingInfoDbs <- receivedSpendingInfoDbsF
receivedStart = TimeUtil.currentEpochMs
incoming <- processReceivedUtxos(
@ -439,6 +439,13 @@ private[bitcoins] trait TransactionProcessing extends WalletLogger {
} yield {
ProcessTxResult(incoming, outgoing)
}
processTxF.failed.foreach { case err =>
logger.error(
s"Failed to process transaction=${transaction.txIdBE.hex} blockHash=${blockHashOpt}",
err)
}
processTxF
}
/** If the given UTXO is marked as unspent and returns it so it can be updated