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

Set recovery id properly for buildLnInvoiceSignature (#4379)

Browse source
This commit is contained in:
benthecarman 2022-06-11 09:36:19 -05:00 • committed by GitHub
parent efc1f9fb77
commit ab215e26df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core-test/src/test/scala/org/bitcoins/core/protocol/ln/LnInvoiceUnitTest.scala
View file

@ -5,6 +5,7 @@ import org.bitcoins.core.protocol.ln.LnParams.{
LnBitcoinMainNet,
LnBitcoinTestNet
}
import org.bitcoins.core.protocol.ln.LnTag.{DescriptionTag, PaymentHashTag}
import org.bitcoins.core.protocol.ln.channel.ShortChannelId
import org.bitcoins.core.protocol.ln.currency.{
MicroBitcoins,
@ -22,7 +23,7 @@ import org.bitcoins.core.util.Bech32
import org.bitcoins.crypto._
import org.bitcoins.testkitcore.gen.ln.LnInvoiceGen
import org.bitcoins.testkitcore.util.BitcoinSUnitTest
import scodec.bits.ByteVector
import scodec.bits._
class LnInvoiceUnitTest extends BitcoinSUnitTest {
behavior of "LnInvoice"
@ -565,4 +566,15 @@ class LnInvoiceUnitTest extends BitcoinSUnitTest {
"lntbs42949672960n1p3qavpxpp59mdvu0tw0mzf2kl96ddfcm0597nuxwp42tzsehrn66jrmlg7nu8sdqqcqzpgxqyz5vqsp5y70pg45suf546mses9cp54fk4uke2rmppk9dy4926prhe5v54g4s9qyyssqmtpasu8map7hegdxfzmgusuqnkrssy6m34wcup3lmu0mae3xtht5d49204a3wm9wpklalx49g33cer5gqfractwt79vrc8p7wlpsdlqp296km0"
assert(LnInvoice.fromStringT(str).isSuccess)
}
it must "build an invoice with a recoverable pub key" in {
val priv = ECPrivateKey.fromBytes(
hex"deeb3f23a850090b9033e3400584923a281d3c7d914a6d1587369abe2071d8c5")
val hrp = LnHumanReadablePart.fromLnParams(LnParams.LnBitcoinRegTest)
val tags = LnTaggedFields(
Vector(PaymentHashTag(Sha256Digest.empty), DescriptionTag("test")))
val invoice = LnInvoice.build(hrp, tags, priv)
assert(invoice.nodeId == NodeId(priv.publicKey))
}
}

5
core/src/main/scala/org/bitcoins/core/protocol/ln/LnInvoice.scala
View file

@ -275,7 +275,10 @@ object LnInvoice extends StringFactory[LnInvoice] {
val sigHash = buildSigHashData(hrp, timestamp, lnTags)
val sig = privateKey.sign(sigHash)
LnInvoiceSignature(recoverId = UInt8.zero, signature = sig)
val (pub1, _) = CryptoUtil.recoverPublicKey(sig, sigHash.bytes)
val recoveryId = if (privateKey.publicKey == pub1) UInt8.zero else UInt8.one
LnInvoiceSignature(recoverId = recoveryId, signature = sig)
}
/** The easiest way to create a [[org.bitcoins.core.protocol.ln.LnInvoice LnInvoice]]