mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-01-19 05:43:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add OrderedDLCPayoutCurvePieces (#4875)

Browse Source
This commit is contained in:
Chris Stewart 2022-11-03 10:18:01 -05:00 committed by GitHub
parent 92613709aa
commit 4fa31b1bc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/main/scala/org/bitcoins/core/package.scala
View File

@ -1,5 +1,9 @@
package org.bitcoins
import org.bitcoins.core.protocol.dlc.models.{
DLCPayoutCurvePiece,
OutcomePayoutPoint
}
import org.bitcoins.core.protocol.tlv.TLVPoint
import org.bitcoins.core.protocol.transaction.{
TransactionInput,
@ -97,4 +101,24 @@ package object core {
}
}
}
implicit val outcomePayoutPointOrdering: Ordering[OutcomePayoutPoint] = {
new Ordering[OutcomePayoutPoint] {
override def compare(
x: OutcomePayoutPoint,
y: OutcomePayoutPoint): Int = {
x.outcome.compare(y.outcome)
}
}
}
implicit val dlcPayoutCurvePieceOrdering: Ordering[DLCPayoutCurvePiece] = {
new Ordering[DLCPayoutCurvePiece] {
override def compare(
x: DLCPayoutCurvePiece,
y: DLCPayoutCurvePiece): Int = {
outcomePayoutPointOrdering.compare(x.leftEndpoint, y.leftEndpoint)
}
}
}
}

24
core/src/main/scala/org/bitcoins/core/protocol/dlc/models/DLCPayoutCurve.scala
View File

@ -2,7 +2,10 @@ package org.bitcoins.core.protocol.dlc.models
import org.bitcoins.core.currency.{CurrencyUnit, Satoshis}
import org.bitcoins.core.protocol.tlv._
import org.bitcoins.core.util.sorted.OrderedTLVPoints
import org.bitcoins.core.util.sorted.{
OrderedDLCPayoutCurvePieces,
OrderedTLVPoints
}
import org.bitcoins.core.util.{Indexed, NumberUtil}
import scala.math.BigDecimal.RoundingMode
@ -10,12 +13,12 @@ import scala.util.{Failure, Success, Try}
/** A DLC payout curve defined by piecewise interpolating points */
case class DLCPayoutCurve(
pieces: Vector[DLCPayoutCurvePiece],
pieces: OrderedDLCPayoutCurvePieces,
serializationVersion: DLCSerializationVersion)
extends TLVSerializable[PayoutFunctionV0TLV] {
val endpoints: Vector[OutcomePayoutPoint] = {
pieces.map(_.leftEndpoint).:+(pieces.last.rightEndpoint)
pieces.toVector.map(_.leftEndpoint).:+(pieces.last.rightEndpoint)
}
require(pieces.map(_.rightEndpoint) == endpoints.tail,
@ -24,7 +27,7 @@ case class DLCPayoutCurve(
override def toTLV: PayoutFunctionV0TLV = {
val tlvEndpoints = endpoints.map(_.toTLVPoint)
val orderedTlvPoints = OrderedTLVPoints(tlvEndpoints)
val tlvPieces = pieces.map(_.toTLV)
val tlvPieces = pieces.map(_.toTLV).toVector
PayoutFunctionV0TLV(orderedTlvPoints, tlvPieces, serializationVersion)
}
@ -75,8 +78,9 @@ case class DLCPayoutCurve(
getPayout(outcome, rounding, totalCollateral)
def flip(totalCollateral: Satoshis): DLCPayoutCurve = {
DLCPayoutCurve(pieces.map(_.flip(totalCollateral)),
serializationVersion = serializationVersion)
val flip = pieces.map(_.flip(totalCollateral)).toVector
val sorted = OrderedDLCPayoutCurvePieces(flip)
DLCPayoutCurve(sorted, serializationVersion = serializationVersion)
}
}
@ -90,8 +94,8 @@ object DLCPayoutCurve
case ((leftEndpoint, rightEndpoint), tlvPiece) =>
DLCPayoutCurvePiece.fromTLV(leftEndpoint, tlvPiece, rightEndpoint)
}
DLCPayoutCurve(pieces, tlv.serializationVersion)
val sorted = OrderedDLCPayoutCurvePieces(pieces)
DLCPayoutCurve(sorted, tlv.serializationVersion)
}
def polynomialInterpolate(
@ -118,7 +122,9 @@ object DLCPayoutCurve
piecesSoFar.:+(DLCPolynomialPayoutCurvePiece(points)))
}
}
DLCPayoutCurve(pieces, serializationVersion)
val sorted = OrderedDLCPayoutCurvePieces(pieces)
DLCPayoutCurve(sorted, serializationVersion)
}
def fromPoints(

24
core/src/main/scala/org/bitcoins/core/util/sorted/OrderedDLCPayoutCurvePieces.scala Normal file
View File

@ -0,0 +1,24 @@
package org.bitcoins.core.util.sorted
import org.bitcoins.core.protocol.dlc.models.DLCPayoutCurvePiece
case class OrderedDLCPayoutCurvePieces(
private val vec: Vector[DLCPayoutCurvePiece])
extends SortedVec[DLCPayoutCurvePiece, DLCPayoutCurvePiece](
vec,
org.bitcoins.core.dlcPayoutCurvePieceOrdering)
object OrderedDLCPayoutCurvePieces
extends SortedVecFactory[DLCPayoutCurvePiece, OrderedDLCPayoutCurvePieces] {
override def apply(
piece: DLCPayoutCurvePiece): OrderedDLCPayoutCurvePieces = {
OrderedDLCPayoutCurvePieces(Vector(piece))
}
override def fromUnsorted(
vec: Vector[DLCPayoutCurvePiece]): OrderedDLCPayoutCurvePieces = {
val sorted = vec.sorted(org.bitcoins.core.dlcPayoutCurvePieceOrdering)
OrderedDLCPayoutCurvePieces(sorted)
}
}