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

Simplify Transaction Broadcast (#1872)

Browse Source 
* Simplify transaction broadcast

* Assert tx in db, add note on privacy leak
This commit is contained in:
Ben Carman 2020-08-25 07:09:09 -05:00 committed by GitHub
parent f468fff7ea
commit 10425760c3
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node-test/src/test/scala/org/bitcoins/node/BroadcastTransactionTest.scala
View File

@ -67,6 +67,10 @@ class BroadcastTransactionTest extends NodeUnitTest {
def attemptBroadcast(tx: Transaction): Future[Unit] = {
for {
_ <- node.broadcastTransaction(tx)
txOpt <- node.txDAO.findByHash(tx.txId)
_ = assert(
txOpt.isDefined,
"Transaction was not added to BroadcastableTransaction database")
_ <- TestAsyncUtil.awaitConditionF(() => hasSeenTx(tx),
duration = 1.second,
maxTries = 25)

14
node/src/main/scala/org/bitcoins/node/Node.scala
View File

@ -207,14 +207,22 @@ trait Node extends NodeApi with ChainQueryApi with P2PLogger {
logger.error(s"Error when writing broadcastable TX to DB", exception)
case Success(written) =>
logger.debug(
s"Wrote tx=${written.transaction.txIdBE} to broadcastable table")
s"Wrote tx=${written.transaction.txIdBE.hex} to broadcastable table")
}
for {
_ <- addToDbF
peerMsgSender <- peerMsgSenderF
_ = logger.info(s"Sending out inv for tx=${transaction.txIdBE}")
_ <- peerMsgSender.sendInventoryMessage(transaction)
// Note: This is a privacy leak and should be fixed in the future. Ideally, we should
// be using an inventory message to broadcast the transaction to help hide the fact that
// this transaction belongs to us. However, currently it is okay for us to use a transaction
// message because a Bitcoin-S node currently doesn't have a mempool and only
// broadcasts/relays transactions from its own wallet.
// See https://developer.bitcoin.org/reference/p2p_networking.html#tx
_ =
logger.info(s"Sending out tx message for tx=${transaction.txIdBE.hex}")
_ <- peerMsgSender.sendTransactionMessage(transaction)
} yield ()
}