Merge pull request #650 from wilmerpaulino/invoice-negative-amount

invoice: avoid negative msat amounts
This commit is contained in:
Olaoluwa Osuntokun 2018-01-27 18:34:56 -08:00 committed by GitHub
commit 42014f5b7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions

View File

@ -127,6 +127,10 @@ func decodeAmount(amount string) (lnwire.MilliSatoshi, error) {
// encodeAmount encodes the provided millisatoshi amount using as few characters
// as possible.
func encodeAmount(msat lnwire.MilliSatoshi) (string, error) {
if msat < 0 {
return "", fmt.Errorf("amount must be positive: %v", msat)
}
// If possible to express in BTC, that will always be the shortest
// representation.
if msat%mSatPerBtc == 0 {

View File

@ -514,6 +514,11 @@ func validateInvoice(invoice *Invoice) error {
return fmt.Errorf("net params not set")
}
// Ensure that if there is an amount set, it is not negative.
if invoice.MilliSat != nil && *invoice.MilliSat < 0 {
return fmt.Errorf("negative amount: %v", *invoice.MilliSat)
}
// The invoice must contain a payment hash.
if invoice.PaymentHash == nil {
return fmt.Errorf("no payment hash found")

View File

@ -55,6 +55,10 @@ func TestDecodeAmount(t *testing.T) {
amount: "1109p", // pBTC
valid: false, // not divisible by 10
},
{
amount: "-10p", // pBTC
valid: false, // negative amount
},
{
amount: "10p", // pBTC
valid: true,
@ -145,6 +149,10 @@ func TestEncodeAmount(t *testing.T) {
valid bool
result string
}{
{
msat: -10, // mSat
valid: false, // negative amount
},
{
msat: 1, // mSat
valid: true,