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

Fix broadcasting witness vs legacy txs (#3841)

Browse source 
* Fix broadcasting witness vs legacy txs

* Fix version test
This commit is contained in:
benthecarman 2021-11-22 08:25:58 -05:00 • committed by GitHub
parent 155301fc1d
commit 90e01d7fc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core-test/src/test/scala/org/bitcoins/core/p2p/VersionMessageTest.scala
View file

@ -27,7 +27,7 @@ class VersionMessageTest extends BitcoinSUnitTest {
val inet = InetAddress(ipArr)
val versionMessage = VersionMessage(MainNet, inet, inet, relay = false)
assert(versionMessage.addressReceiveServices.nodeNone)
assert(versionMessage.addressReceiveServices.nodeWitness)
versionMessage.addressReceiveIpAddress must be(inet)
versionMessage.addressReceivePort must be(MainNet.port)

4
core/src/main/scala/org/bitcoins/core/p2p/NetworkPayload.scala
View file

@ -1414,9 +1414,9 @@ object VersionMessage extends Factory[VersionMessage] {
val nonce = UInt64.zero
VersionMessage(
version = ProtocolVersion.default,
services = ServiceIdentifier.NODE_NONE,
services = ServiceIdentifier.NODE_WITNESS,
timestamp = Int64(java.time.Instant.now.getEpochSecond),
addressReceiveServices = ServiceIdentifier.NODE_NONE,
addressReceiveServices = ServiceIdentifier.NODE_WITNESS,
addressReceiveIpAddress = receivingIpAddress,
addressReceivePort = network.port,
addressTransServices = ServiceIdentifier.NODE_NETWORK,

11
core/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala
View file

@ -100,6 +100,10 @@ sealed abstract class Transaction extends NetworkElement {
}
lazy val totalOutput: CurrencyUnit = outputs.map(_.value).sum
def toBaseTx: BaseTransaction = {
BaseTransaction(version, inputs, outputs, lockTime)
}
}
object Transaction extends Factory[Transaction] {
@ -176,9 +180,6 @@ case object EmptyTransaction extends NonWitnessTransaction {
override def inputs: Vector[TransactionInput] = Vector.empty
override def outputs: Vector[TransactionOutput] = Vector.empty
override def lockTime: UInt32 = TransactionConstants.lockTime
def toBaseTx: BaseTransaction =
BaseTransaction(version, inputs, outputs, lockTime)
}
case class WitnessTransaction(
@ -193,10 +194,6 @@ case class WitnessTransaction(
s"Must have same amount of inputs and witnesses in witness tx, inputs=${inputs.length} witnesses=${witness.length}"
)
def toBaseTx: BaseTransaction = {
BaseTransaction(version, inputs, outputs, lockTime)
}
/** The txId for the witness transaction from satoshi's original serialization */
override def txId: DoubleSha256Digest = {
toBaseTx.txId

17
node/src/main/scala/org/bitcoins/node/networking/peer/DataMessageHandler.scala
View file

@ -8,7 +8,7 @@ import org.bitcoins.core.gcs.BlockFilter
import org.bitcoins.core.p2p._
import org.bitcoins.crypto.DoubleSha256DigestBE
import org.bitcoins.node.config.NodeAppConfig
import org.bitcoins.node.models.BroadcastAbleTransactionDAO
import org.bitcoins.node.models._
import org.bitcoins.node.{Node, P2PLogger}
import scala.concurrent.{ExecutionContext, Future, Promise}
@ -171,13 +171,20 @@ case class DataMessageHandler(
getData.inventories.foreach { inv =>
logger.debug(s"Looking for inv=$inv")
inv.typeIdentifier match {
case TypeIdentifier.MsgTx | TypeIdentifier.MsgWitnessTx =>
txDAO.findByHash(inv.hash).map {
case Some(tx) =>
peerMsgSender.sendTransactionMessage(tx.transaction)
case msgTx @ (TypeIdentifier.MsgTx | TypeIdentifier.MsgWitnessTx) =>
txDAO.findByHash(inv.hash).flatMap {
case Some(BroadcastAbleTransaction(tx)) =>
val txToBroadcast =
if (msgTx == TypeIdentifier.MsgTx) {
// send non-witness serialization
tx.toBaseTx
} else tx // send normal serialization
peerMsgSender.sendTransactionMessage(txToBroadcast)
case None =>
logger.warn(
s"Got request to send data with hash=${inv.hash}, but found nothing")
Future.unit
}
case other @ (TypeIdentifier.MsgBlock |
TypeIdentifier.MsgFilteredBlock |