can parse bolt11 onchain fallback address with both ghc and ghcjs

Author: functora

ghcjs/lightning-verifier/default.nix

@@ -122,6 +122,8 @@ in rec {
         --compilation_level ADVANCED_OPTIMIZATIONS \
         --externs ${app}/bin/${label}.jsexe/all.js.externs \
         --externs ${./static}/app.js \
+        --externs ${./static/hs-bitcoin-hash.js} \
+        --externs ${./static/hs-bitcoin-keys.js} \
         --externs ${./static}/material-components-web.min.js \
         --externs ${./static}/material-components-web-elm.min.js \
         --output_wrapper "%output%//# sourceMappingURL=all.js.map" \

ghcjs/lightning-verifier/lightning-verifier.cabal

@@ -99,6 +99,7 @@ common pkg
     , base16-bytestring
     , base64-bytestring
     , binary
+    , bitcoin-address
     , bytestring
     , containers
     , functora-ghcjs

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

@@ -4,6 +4,7 @@ module App.Widgets.Bolt11
 where
 
 import App.Types
+import qualified Bitcoin.Address as Btc
 import qualified Data.ByteString.Base16 as B16
 import qualified Data.Text.Encoding as T
 import qualified Functora.Bolt11 as B11
@@ -90,18 +91,28 @@ invoiceTagWidget = \case
   B11.PaymentHash x -> hex "Preimage Hash" x
   B11.PaymentSecret x -> hex "Payment Secret" x
   B11.Description x -> pure . pair "Description" $ inspect x
+  B11.AdditionalMetadata x -> w5s "Additional Metadata" x
   B11.PayeePubkey x -> hex "Payee Pubkey" x
   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 -> mempty
+  B11.OnchainFallback x -> do
+    --
+    -- TODO : do not ignore failure?
+    --
+    txt <- either (const mempty) pure . decodeUtf8' $ Btc.renderAddress x
+    pure $ pair "Onchain Fallback" $ from @Prelude.Text @MisoString txt
   B11.ExtraRouteInfo -> mempty
-  B11.FeatureBits x ->
-    pure
-      . pair "Feature Bits"
-      . from @Prelude.String @MisoString
-      $ Prelude.show x
+  B11.FeatureBits x -> w5s "Feature Bits" x
+  B11.UnknownTag {} -> mempty
+  B11.UnparsedTag {} -> mempty
   where
+    w5s :: MisoString -> [B11.Word5] -> [FieldPair DynamicField Identity]
+    w5s x =
+      pure
+        . pair x
+        . inspect
+        . fmap fromEnum
     hex :: MisoString -> B11.Hex -> [FieldPair DynamicField Identity]
     hex x =
       pure

ghcjs/lightning-verifier/static/hs-bitcoin-hash.js

@@ -135,6 +135,32 @@
                   ver = "1.7.16";
                   sha256 = "Eu6I/ZARmObjCfpymyybQDPpakMcqCf3W9gYrT7AR3g=";
                 } {};
+                bech32 = self.callHackageDirect {
+                  pkg = "bech32";
+                  ver = "1.1.1";
+                  sha256 = "3bzizRrab+AmN3RQoDbbGIr8mc/z0qf7Ki4dsyjD5dM=";
+                } {};
+                bitcoin-address = self.callHackageDirect {
+                  pkg = "bitcoin-address";
+                  ver = "0.1";
+                  sha256 = "s4v3i6pV02anbYgLqAsbeX3ypzUXhSOqMrkbFxV/jj0=";
+                } {};
+                bitcoin-hash = self.callHackageDirect {
+                  pkg = "bitcoin-hash";
+                  ver = "0.1";
+                  sha256 = "c18kUghhJB0GjLxHHrgJ8djtNlQXbsJcbnM61zvHwzY=";
+                } {};
+                secp256k1-haskell = self.callHackageDirect {
+                  pkg = "secp256k1-haskell";
+                  ver = "0.6.1";
+                  sha256 = "R4zG6prtWN2bX++hMhVt4VMQoyAVbBZnkMcMA0zFoiQ=";
+                } {};
+                base16 = doJailbreak (self.callHackageDirect {
+                  pkg = "base16";
+                  ver = "0.3.2.0";
+                  sha256 = "EziiFX/1e105Y7zbO0DLwF6yCzYv4IX/vF9l7B55o7Y=";
+                } {});
+                libsecp256k1 = pkgs.secp256k1;
                 #
                 # Local
                 #
@@ -178,6 +204,24 @@
                     ./../pub/functora/src
                   )
                   {};
+                bitcoin-script =
+                  self.callCabal2nix
+                  "bitcoin-script"
+                  (
+                    pkgs.nix-gitignore.gitignoreSourcePure
+                    ./../pub/haskell-bitcoin-script/.gitignore
+                    ./../pub/haskell-bitcoin-script
+                  )
+                  {};
+                bitcoin-keys =
+                  self.callCabal2nix
+                  "bitcoin-keys"
+                  (
+                    pkgs.nix-gitignore.gitignoreSourcePure
+                    ./../pub/hs-bitcoin-keys/.gitignore
+                    ./../pub/hs-bitcoin-keys/bitcoin-keys
+                  )
+                  {};
               }
             );
         });

ghcjs/lightning-verifier/static/hs-bitcoin-keys.js

@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Data.Bitcoin.Script
   ( decode,

ghcjs/overlays.nix

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
@@ -51,7 +52,14 @@ instance Show Prv where
 -- @
 prvRaw :: Prv -> B.ByteString
 {-# INLINE prvRaw #-}
-prvRaw (Prv (K.SecKey x)) = x
+prvRaw (Prv x) = getSecKey x
+
+#if MIN_VERSION_secp256k1_haskell(1,0,0)
+getSecKey :: K.SecKey -> B.ByteString
+getSecKey (K.SecKey x) = x
+#else
+getSecKey = K.getSecKey
+#endif
 
 -- | Construct a 'Prv' key from its raw 32 bytes (big-endian).
 --
@@ -153,14 +161,23 @@ newtype Tweak = Tweak K.Tweak
   deriving newtype (Eq)
 
 instance Ord Tweak where
-  compare (Tweak (K.Tweak a)) (Tweak (K.Tweak b)) = compare a b
+  compare (Tweak a) (Tweak b) = compare (getTweak a) (getTweak b)
+
+#if MIN_VERSION_secp256k1_haskell(1,0,0)
+getTweak :: K.Tweak -> B.ByteString
+getTweak (K.Tweak x) = x
+#else
+getTweak = K.getTweak
+#endif
 
 -- | Big-endian base-16.
 instance Show Tweak where
-  showsPrec n (Tweak (K.Tweak x)) =
+  showsPrec n (Tweak x) =
     showParen (n > 10) $
       showString "Tweak "
-        . mappend (BL8.unpack (BB.toLazyByteString (BB.byteStringHex x)))
+        . mappend
+          ( BL8.unpack (BB.toLazyByteString (BB.byteStringHex (getTweak x)))
+          )
 
 -- | Construct a 'Tweak' from its raw 32 bytes (big-endian).
 --
@@ -171,5 +188,10 @@ parseTweak x = do
   guard (B.length x == 32)
   Tweak <$> K.tweak x
 
+#if MIN_VERSION_secp256k1_haskell(1,0,0)
 withCtx :: (K.Ctx -> a) -> a
 withCtx f = Unsafe.unsafePerformIO $ K.withContext (pure . f)
+#else
+withCtx :: a -> a
+withCtx = id
+#endif