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

Added length prefixes to contract_info and cet_signatures TLVs (#2419)

Browse source
This commit is contained in:
Nadav Kohen 2020-12-22 14:13:55 -06:00 • committed by GitHub
parent 92ac986baa
commit 13c4b0d955
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/src/main/scala/org/bitcoins/core/protocol/tlv/TLV.scala
View file

@ -747,7 +747,7 @@ case class ContractInfoV0TLV(outcomes: Vector[(String, Satoshis)])
override val tpe: BigSizeUInt = ContractInfoV0TLV.tpe override val tpe: BigSizeUInt = ContractInfoV0TLV.tpe
override val value: ByteVector = { override val value: ByteVector = {
outcomes.foldLeft(ByteVector.empty) { outcomes.foldLeft(BigSizeUInt(outcomes.length).bytes) {
case (bytes, (outcome, amt)) => case (bytes, (outcome, amt)) =>
val outcomeBytes = CryptoUtil.serializeForHash(outcome) val outcomeBytes = CryptoUtil.serializeForHash(outcome)
bytes ++ BigSizeUInt bytes ++ BigSizeUInt
@ -763,18 +763,20 @@ object ContractInfoV0TLV extends TLVFactory[ContractInfoV0TLV] {
override def fromTLVValue(value: ByteVector): ContractInfoV0TLV = { override def fromTLVValue(value: ByteVector): ContractInfoV0TLV = {
val iter = ValueIterator(value) val iter = ValueIterator(value)
val builder = Vector.newBuilder[(String, Satoshis)] val numOutcomes = BigSizeUInt(iter.current)
iter.skip(numOutcomes)
while (iter.index < value.length) { val outcomes = 0.until(numOutcomes.toInt).toVector.map { _ =>
val outcomeLen = BigSizeUInt(iter.current) val outcomeLen = BigSizeUInt(iter.current)
iter.skip(outcomeLen) iter.skip(outcomeLen)
val outcome = val outcome =
new String(iter.take(outcomeLen.toInt).toArray, StandardCharsets.UTF_8) new String(iter.take(outcomeLen.toInt).toArray, StandardCharsets.UTF_8)
val amt = Satoshis(UInt64(iter.takeBits(64))) val amt = Satoshis(UInt64(iter.takeBits(64)))
builder.+=(outcome -> amt)
outcome -> amt
} }
ContractInfoV0TLV(builder.result()) ContractInfoV0TLV(outcomes)
} }
} }
@ -985,7 +987,7 @@ case class CETSignaturesV0TLV(sigs: Vector[ECAdaptorSignature])
override val tpe: BigSizeUInt = CETSignaturesV0TLV.tpe override val tpe: BigSizeUInt = CETSignaturesV0TLV.tpe
override val value: ByteVector = { override val value: ByteVector = {
sigs.foldLeft(ByteVector.empty)(_ ++ _.bytes) sigs.foldLeft(BigSizeUInt(sigs.length).bytes)(_ ++ _.bytes)
} }
} }
@ -995,14 +997,14 @@ object CETSignaturesV0TLV extends TLVFactory[CETSignaturesV0TLV] {
override def fromTLVValue(value: ByteVector): CETSignaturesV0TLV = { override def fromTLVValue(value: ByteVector): CETSignaturesV0TLV = {
val iter = ValueIterator(value) val iter = ValueIterator(value)
val builder = Vector.newBuilder[ECAdaptorSignature] val numSigs = BigSizeUInt(iter.current)
iter.skip(numSigs)
while (iter.index < value.length) { val sigs = 0.until(numSigs.toInt).toVector.map { _ =>
val sig = ECAdaptorSignature(iter.take(162)) ECAdaptorSignature(iter.take(162))
builder.+=(sig)
} }
CETSignaturesV0TLV(builder.result()) CETSignaturesV0TLV(sigs)
} }
} }