wip

Author: functora

ghcjs/lightning-verifier/src/App/Widgets/Bolt11.hs

@@ -76,9 +76,14 @@ invoiceWidget ln =
              )
           <> [ pair "Signature"
                 . B11.inspectHex
-                $ B11.bolt11Signature ln
+                $ B11.bolt11SigVal sig,
+               pair "Pubkey Recovery Flag"
+                . inspect
+                $ B11.bolt11SigRecoveryFlag sig
              ]
       )
+  where
+    sig = B11.bolt11Signature ln
 
 invoiceTagWidget :: B11.Tag -> [FieldPair DynamicField Identity]
 invoiceTagWidget = \case
@@ -89,7 +94,7 @@ invoiceTagWidget = \case
   B11.DescriptionHash x -> hex "Description Hash" x
   B11.Expiry x -> pure . pair "Expiry" $ inspect x
   B11.MinFinalCltvExpiry x -> pure . pair "Min Final CLTV Expiry" $ inspect x
-  B11.OnchainFallback x -> hex "Onchain Fallback" x
+  B11.OnchainFallback -> mempty
   B11.ExtraRouteInfo -> mempty
   B11.FeatureBits x ->
     pure

pub/functora/src/bolt11/Functora/Bolt11.hs

@@ -11,6 +11,7 @@ module Functora.Bolt11
     Bolt11HrpAmt (..),
     inspectBolt11HrpAmt,
     Bolt11Hrp (..),
+    Bolt11Sig (..),
     Bolt11 (..),
     decodeBolt11,
   )
@@ -33,7 +34,10 @@ import Prelude (Show (..), error, splitAt, take)
 newtype Hex = Hex
   { unHex :: ByteString
   }
-  deriving stock (Eq, Ord, Show, Data, Generic)
+  deriving stock (Eq, Ord, Data, Generic)
+
+instance Show Hex where
+  show = inspectHex
 
 inspectHex :: forall a. (From String a) => Hex -> a
 inspectHex =
@@ -70,7 +74,7 @@ data Tag
   | DescriptionHash Hex
   | Expiry Int
   | MinFinalCltvExpiry Int
-  | OnchainFallback Hex -- TODO: address type
+  | OnchainFallback -- TODO: address type
   | ExtraRouteInfo
   | FeatureBits [Word5]
   deriving stock (Eq, Ord, Show, Generic)
@@ -149,11 +153,17 @@ data Bolt11Hrp = Bolt11Hrp
   }
   deriving stock (Eq, Ord, Show, Data, Generic)
 
+data Bolt11Sig = Bolt11Sig
+  { bolt11SigVal :: Hex,
+    bolt11SigRecoveryFlag :: Int
+  }
+  deriving stock (Eq, Ord, Show, Data, Generic)
+
 data Bolt11 = Bolt11
   { bolt11Hrp :: Bolt11Hrp,
     bolt11Timestamp :: Int, -- posix
     bolt11Tags :: [Tag], -- posix
-    bolt11Signature :: Hex
+    bolt11Signature :: Bolt11Sig
   }
   deriving stock (Eq, Ord, Show, Generic)
 
@@ -200,13 +210,13 @@ w5bs = BS.pack . fromMaybe (error "what") . Bech32.toBase256
 w5txt :: [Word5] -> Text
 w5txt = decodeUtf8 . w5bs
 
-tagParser :: [Word5] -> (Maybe Tag, [Word5])
-tagParser [] = (Nothing, [])
-tagParser ws@[_] = (Nothing, ws)
-tagParser ws@[_, _] = (Nothing, ws) -- appease the compiler warning gods
-tagParser ws
+parseTag :: [Word5] -> (Maybe Tag, [Word5])
+parseTag [] = (Nothing, [])
+parseTag ws@[_] = (Nothing, ws)
+parseTag ws@[_, _] = (Nothing, ws) -- appease the compiler warning gods
+parseTag ws
   | length ws < 8 = (Nothing, ws)
-tagParser ws@(typ : d1 : d2 : rest)
+parseTag ws@(typ : d1 : d2 : rest)
   | length rest < 7 = (Nothing, ws)
   | otherwise = (Just tag, leftovers)
   where
@@ -222,7 +232,7 @@ tagParser ws@(typ : d1 : d2 : rest)
         19 -> PayeePubkey datBs
         6 -> Expiry (w5int dat)
         24 -> MinFinalCltvExpiry (w5int dat)
-        9 -> OnchainFallback datBs
+        9 -> OnchainFallback
         3 -> ExtraRouteInfo
         5 -> FeatureBits dat
         n -> error ("unhandled typ " ++ show n)
@@ -232,24 +242,35 @@ data MSig
   | Unk [Word5]
   deriving stock (Eq, Ord, Show, Generic)
 
-tagsParser :: [Word5] -> ([Tag], MSig)
-tagsParser ws
+parseTags :: [Word5] -> ([Tag], MSig)
+parseTags ws
   | length ws == 104 = ([], Sig ws)
   | otherwise =
-      let (mtag, rest) = tagParser ws
+      let (mtag, rest) = parseTag ws
        in maybe
             ([], Unk rest)
-            (\tag -> first (tag :) (tagsParser rest))
+            (\tag -> first (tag :) (parseTags rest))
             mtag
 
 decodeBolt11 :: Text -> Either String Bolt11
 decodeBolt11 raw = do
   (rawHrp, rawDp) <- first show $ Bech32.decodeLenient raw
-  let (timestampBits, rest) = splitAt 7 $ Bech32.dataPartToWords rawDp
-      timestamp = w5int timestampBits
-      (tags, leftover) = tagsParser rest
-  sig <- case leftover of
-    Sig ws -> maybe (Left "corrupt") Right (Bech32.toBase256 ws)
-    Unk left -> Left ("corrupt, leftover: " ++ show (Hex (w5bs left)))
   hrp <- parseOnly parseHrp $ Bech32.humanReadablePartToText rawHrp
-  Right (Bolt11 hrp timestamp tags (Hex (BS.pack sig)))
+  let (ts, rest) = splitAt 7 $ Bech32.dataPartToWords rawDp
+  let (tags, leftover) = parseTags rest
+  (rawSig, recFlag) <- case leftover of
+    Sig ws -> Right $ splitAt 103 ws
+    Unk left -> Left ("corrupt, leftover: " ++ show (Hex (w5bs left)))
+  sig <-
+    maybe (Left "corrupt") Right $ Bech32.toBase256 rawSig
+  Right
+    Bolt11
+      { bolt11Hrp = hrp,
+        bolt11Timestamp = w5int ts,
+        bolt11Tags = tags,
+        bolt11Signature =
+          Bolt11Sig
+            { bolt11SigVal = Hex $ BS.pack sig,
+              bolt11SigRecoveryFlag = w5int recFlag
+            }
+      }

pub/functora/src/test/Functora/Bolt11Spec.hs

@@ -21,7 +21,39 @@ goodSamples =
               FeatureBits $ fmap toEnum [16, 8, 0]
             ],
           bolt11Signature =
-            "8d3ce9e28357337f62da0162d9454df827f83cfe499aeb1c1db349d4d81127425e434ca29929406c23bba1ae8ac6ca32880b38d4bf6ff874024cac34ba9625f101"
+            Bolt11Sig
+              { bolt11SigVal =
+                  "8d3ce9e28357337f62da0162d9454df827f83cfe499aeb1c1db349d4d81127425e434ca29929406c23bba1ae8ac6ca32880b38d4bf6ff874024cac34ba9625f1",
+                bolt11SigRecoveryFlag = 1
+              }
+        }
+    ),
+    ( "lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqsfpp3qjmp7lwpagxun9pygexvgpjdc4jdj85fr9yq20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqpqqqqq9qqqvpeuqafqxu92d8lr6fvg0r5gv0heeeqgcrqlnm6jhphu9y00rrhy4grqszsvpcgpy9qqqqqqgqqqqq7qqzqj9n4evl6mr5aj9f58zp6fyjzup6ywn3x6sk8akg5v4tgn2q8g4fhx05wf6juaxu9760yp46454gpg5mtzgerlzezqcqvjnhjh8z3g2qqdhhwkj",
+      Bolt11
+        { bolt11Hrp =
+            Bolt11Hrp
+              { bolt11HrpNet = BitcoinMainnet,
+                bolt11HrpAmt =
+                  Just
+                    Bolt11HrpAmt
+                      { bolt11HrpAmtNum = 20,
+                        bolt11HrpAmtMul = Milli
+                      }
+              },
+          bolt11Timestamp = 1496314658,
+          bolt11Tags =
+            [ PaymentHash "0001020304050607080900010203040506070809000102030405060708090102",
+              DescriptionHash
+                "3925b6f67e2c340036ed12093dd44e0368df1b6ea26c53dbe4811f58fd5db8c1",
+              OnchainFallback,
+              ExtraRouteInfo
+            ],
+          bolt11Signature =
+            Bolt11Sig
+              { bolt11SigVal =
+                  "91675cb3fad8e9d915343883a49242e074474e26d42c7ed914655689a8074553733e8e4ea5ce9b85f69e40d755a55014536b12323f8b220600c94ef2b9c51428",
+                bolt11SigRecoveryFlag = 0
+              }
         }
     )
   ]