Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Bolt 11 official test vectors #1870

Merged
merged 5 commits into from
Sep 14, 2021
Merged

Update Bolt 11 official test vectors #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7b4b3b
Update Bolt 11 official test vectors
t-bast Jul 12, 2021
d12b942
Reject sub-millisatoshi precision
t-bast Aug 18, 2021
db60ccd
Update test vectors
t-bast Aug 23, 2021
0d4195d
Update failure test vectors
t-bast Aug 25, 2021
8d42235
Update non-recoverable sig test vector
t-bast Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions eclair-core/src/main/scala/fr/acinq/eclair/payment/PaymentRequest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import scodec.codecs.{list, ubyte}
import scodec.{Codec, Err}

import scala.concurrent.duration._
import scala.util.Try
import scala.util.{Failure, Success, Try}

/**
* Lightning Payment Request
Expand Down Expand Up @@ -462,17 +462,19 @@ object PaymentRequest {
case _ => 'm'
}

def decode(input: String): Option[MilliSatoshi] =
def decode(input: String): Try[Option[MilliSatoshi]] =
(input match {
case "" => None
case a if a.last == 'p' => Some(MilliSatoshi(a.dropRight(1).toLong / 10L)) // 1 pico-bitcoin == 0.1 milli-satoshis
case a if a.last == 'n' => Some(MilliSatoshi(a.dropRight(1).toLong * 100L))
case a if a.last == 'u' => Some(MilliSatoshi(a.dropRight(1).toLong * 100000L))
case a if a.last == 'm' => Some(MilliSatoshi(a.dropRight(1).toLong * 100000000L))
case a => Some(MilliSatoshi(a.toLong * 100000000000L))
}).flatMap {
case MilliSatoshi(0) => None
case amount => Some(amount)
case "" => Success(None)
case a if a.last == 'p' && a.dropRight(1).last != '0' => Failure(new IllegalArgumentException("invalid sub-millisatoshi precision"))
case a if a.last == 'p' => Success(Some(MilliSatoshi(a.dropRight(1).toLong / 10L))) // 1 pico-bitcoin == 0.1 milli-satoshis
case a if a.last == 'n' => Success(Some(MilliSatoshi(a.dropRight(1).toLong * 100L)))
case a if a.last == 'u' => Success(Some(MilliSatoshi(a.dropRight(1).toLong * 100000L)))
case a if a.last == 'm' => Success(Some(MilliSatoshi(a.dropRight(1).toLong * 100000000L)))
case a => Success(Some(MilliSatoshi(a.toLong * 100000000000L)))
}).map {
case None => None
case Some(MilliSatoshi(0)) => None
case Some(amount) => Some(amount)
}

def encode(amount: Option[MilliSatoshi]): String = {
Expand Down Expand Up @@ -513,7 +515,10 @@ object PaymentRequest {
val pub = Crypto.recoverPublicKey(signature, Crypto.sha256(message), recid)
// README: since we use pubkey recovery to compute the node id from the message and signature, we don't check the signature.
// If instead we read the node id from the `n` field (which nobody uses afaict) then we would have to check the signature.
val amount_opt = Amount.decode(hrp.drop(prefix.length))
val amount_opt = Amount.decode(hrp.drop(prefix.length)) match {
case Success(value) => value
case Failure(e) => throw e
}
PaymentRequest(
prefix = prefix,
amount = amount_opt,
Expand Down
Loading