lnd-client wip

Author: functora

pub/lnd-client/cabal.project

@@ -1,6 +1,7 @@
 allow-newer: *
 packages:
   *.cabal
+  ../functora/*.cabal
   ../network-bitcoin/*.cabal
   ../proto-lens/discrimination-ieee754/*.cabal
   ../proto-lens/proto-lens/*.cabal

pub/lnd-client/lnd-client.cabal

@@ -5,15 +5,15 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:               lnd-client
-version:            0.1.0.2
+version:            0.1.0.3
 synopsis:           Lightning Network Daemon (LND) client library for Haskell
 description:        You can find documentation at <https://hackage.haskell.org/package/lnd-client>
 category:           Lightning, Bitcoin, Finance, Network, Payments
-homepage:           https://github.com/coingaming/lnd-client#readme
-bug-reports:        https://github.com/coingaming/lnd-client/issues
-author:             21it <21[email protected]>, Mikhail Prushinskiy <[email protected]>, Artem Markov <[email protected]>
-maintainer:         21it <21[email protected]>, Mikhail Prushinskiy <[email protected]>, Artem Markov <[email protected]>
-copyright:          2022 Yolo <[email protected]>
+homepage:           https://github.com/functora.github.io/pub#readme
+bug-reports:        https://github.com/functora.github.io/pub/issues
+author:             functora <[email protected]>
+maintainer:         functora <[email protected]>
+copyright:          2025 functora <[email protected]>
 license:            BSD3
 license-file:       LICENSE
 build-type:         Simple
@@ -23,7 +23,8 @@ extra-source-files:
 
 source-repository head
   type: git
-  location: https://github.com/coingaming/lnd-client
+  location: https://github.com/functora.github.io/pub
+  subdir: lnd-client
 
 flag ghcid
   manual: True
@@ -89,7 +90,6 @@ library
       LndClient.Import.External
       LndClient.LndTest
       LndClient.Log
-      LndClient.Orphan
       LndClient.QRCode
       LndClient.RPC.Generic
       LndClient.RPC.Katip
@@ -149,7 +149,8 @@ library
       TypeOperators
       FlexibleContexts
       FlexibleInstances
-  ghc-options: -Weverything -Werror -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures
+      DeriveDataTypeable
+  ghc-options: -Weverything -Werror -Wno-missing-export-lists -Wno-missing-kind-signatures -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures
   build-depends:
       JuicyPixels >=3.3.3 && <3.4
     , aeson >=1.4.4.0
@@ -161,9 +162,12 @@ library
     , chronos >=1.0.7 && <1.2
     , containers >=0.6.0.1 && <0.6.6
     , cryptohash-sha256 >=0.11.101.0 && <0.12
+    , crypton-x509 ==1.7.5.*
+    , crypton-x509-store
     , cryptonite >=0.25 && <0.31
     , envparse ==0.4.1.*
     , extra >=1.6.18 && <1.8
+    , functora
     , http2 >=3.0.3
     , http2-client >=0.10.0.0
     , http2-client-grpc >=0.8.0.0
@@ -182,14 +186,10 @@ library
     , stm >=2.5.0.0 && <2.5.1
     , template-haskell >=2.14.0.0 && <2.19
     , text >=1.2.3.1 && <2.1
-    , time
     , tls
     , unbounded-delays >=0.1.1.0 && <0.1.2
     , universum >=1.5.0 && <1.8
     , unliftio >=0.2.12
-    , witch
-    , x509 ==1.7.5.*
-    , x509-store
   default-language: Haskell2010
   if impl(ghc >= 8.10.7)
     ghc-options: -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -fenable-th-splice-warnings -fprint-potential-instances
@@ -218,7 +218,8 @@ library lnd-client-tkit
       TypeOperators
       FlexibleContexts
       FlexibleInstances
-  ghc-options: -Weverything -Werror -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures
+      DeriveDataTypeable
+  ghc-options: -Weverything -Werror -Wno-missing-export-lists -Wno-missing-kind-signatures -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures
   build-depends:
       base >=4.7 && <5
     , http2-client-grpc
@@ -251,7 +252,8 @@ executable lnd-client-prof
       TypeOperators
       FlexibleContexts
       FlexibleInstances
-  ghc-options: -Weverything -Werror -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -main-is LndClient.Main -O2 -optc-O3 -funfolding-use-threshold=16 -threaded -rtsopts "-with-rtsopts=-N -s -p -h -xt" -prof -fprof-auto -optl-fuse-ld=gold
+      DeriveDataTypeable
+  ghc-options: -Weverything -Werror -Wno-missing-export-lists -Wno-missing-kind-signatures -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -main-is LndClient.Main -O2 -optc-O3 -funfolding-use-threshold=16 -threaded -rtsopts "-with-rtsopts=-N -s -p -h -xt" -prof -fprof-auto -optl-fuse-ld=gold
   ld-options: -fuse-ld=gold
   build-depends:
       async
@@ -321,7 +323,6 @@ executable lnd-client-prof
         LndClient.Import.External
         LndClient.LndTest
         LndClient.Log
-        LndClient.Orphan
         LndClient.QRCode
         LndClient.RPC.Generic
         LndClient.RPC.Katip
@@ -376,9 +377,12 @@ executable lnd-client-prof
       , chronos >=1.0.7 && <1.2
       , containers >=0.6.0.1 && <0.6.6
       , cryptohash-sha256 >=0.11.101.0 && <0.12
+      , crypton-x509 ==1.7.5.*
+      , crypton-x509-store
       , cryptonite >=0.25 && <0.31
       , envparse ==0.4.1.*
       , extra >=1.6.18 && <1.8
+      , functora
       , http2 >=3.0.3
       , http2-client >=0.10.0.0
       , http2-client-grpc >=0.8.0.0
@@ -397,14 +401,10 @@ executable lnd-client-prof
       , stm >=2.5.0.0 && <2.5.1
       , template-haskell >=2.14.0.0 && <2.19
       , text >=1.2.3.1 && <2.1
-      , time
       , tls
       , unbounded-delays >=0.1.1.0 && <0.1.2
       , universum >=1.5.0 && <1.8
       , unliftio >=0.2.12
-      , witch
-      , x509 ==1.7.5.*
-      , x509-store
   else
     build-depends:
         lnd-client
@@ -437,7 +437,8 @@ test-suite lnd-client-test
       TypeOperators
       FlexibleContexts
       FlexibleInstances
-  ghc-options: -Weverything -Werror -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -O2 -optc-O3 -funfolding-use-threshold=16 -threaded -rtsopts -with-rtsopts=-N -optl-fuse-ld=gold
+      DeriveDataTypeable
+  ghc-options: -Weverything -Werror -Wno-missing-export-lists -Wno-missing-kind-signatures -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -O2 -optc-O3 -funfolding-use-threshold=16 -threaded -rtsopts -with-rtsopts=-N -optl-fuse-ld=gold
   ld-options: -fuse-ld=gold
   build-depends:
       async
@@ -508,7 +509,6 @@ test-suite lnd-client-test
         LndClient.Import.External
         LndClient.LndTest
         LndClient.Log
-        LndClient.Orphan
         LndClient.QRCode
         LndClient.RPC.Generic
         LndClient.RPC.Katip
@@ -563,9 +563,12 @@ test-suite lnd-client-test
       , chronos >=1.0.7 && <1.2
       , containers >=0.6.0.1 && <0.6.6
       , cryptohash-sha256 >=0.11.101.0 && <0.12
+      , crypton-x509 ==1.7.5.*
+      , crypton-x509-store
       , cryptonite >=0.25 && <0.31
       , envparse ==0.4.1.*
       , extra >=1.6.18 && <1.8
+      , functora
       , http2 >=3.0.3
       , http2-client >=0.10.0.0
       , http2-client-grpc >=0.8.0.0
@@ -584,14 +587,10 @@ test-suite lnd-client-test
       , stm >=2.5.0.0 && <2.5.1
       , template-haskell >=2.14.0.0 && <2.19
       , text >=1.2.3.1 && <2.1
-      , time
       , tls
       , unbounded-delays >=0.1.1.0 && <0.1.2
       , universum >=1.5.0 && <1.8
       , unliftio >=0.2.12
-      , witch
-      , x509 ==1.7.5.*
-      , x509-store
   else
     build-depends:
         lnd-client

pub/lnd-client/package.yaml

@@ -1,10 +1,10 @@
 name: lnd-client
-version: 0.1.0.2
-github: "coingaming/lnd-client"
+version: 0.1.0.3
+github: "functora.github.io/pub/lnd-client"
 license: BSD3
-author: "21it <[email protected]>, Mikhail Prushinskiy <[email protected]>, Artem Markov <[email protected]>"
-maintainer: "21it <[email protected]>, Mikhail Prushinskiy <[email protected]>, Artem Markov <[email protected]>"
-copyright: "2022 Yolo <[email protected]>"
+author: "functora <[email protected]>"
+maintainer: "functora <[email protected]>"
+copyright: "2025 functora <[email protected]>"
 synopsis: Lightning Network Daemon (LND) client library for Haskell
 category: Lightning, Bitcoin, Finance, Network, Payments
 description: You can find documentation at <https://hackage.haskell.org/package/lnd-client>
@@ -18,9 +18,8 @@ _deps: &deps
     # foundation
     - base >= 4.7 && < 5
     - universum             >= 1.5.0 && < 1.8
-    - witch
+    - functora
     # time
-    - time
     - chronos               >= 1.0.7 && < 1.2
     - unbounded-delays      >= 0.1.1.0 && < 0.1.2
     # storage
@@ -44,8 +43,8 @@ _deps: &deps
     # crypto
     - cryptonite            >= 0.25 && < 0.31
     - cryptohash-sha256     >= 0.11.101.0 && < 0.12
-    - x509                  >= 1.7.5 && < 1.7.6
-    - x509-store
+    - crypton-x509          >= 1.7.5 && < 1.7.6
+    - crypton-x509-store
     - pem                   >= 0.2.4 && < 0.3
     # bitcoin
     - network-bitcoin       >= 1.8.3
@@ -97,12 +96,14 @@ default-extensions:
   - TypeOperators
   - FlexibleContexts
   - FlexibleInstances
+  - DeriveDataTypeable
 ghc-options:
   # For details on warnings: https://downloads.haskell.org/~ghc/master/users-guide/using-warnings.html
   # Enable all warnings with -Weverything, then disable the ones we don’t care about
   - -Weverything
   - -Werror
   - -Wno-missing-export-lists
+  - -Wno-missing-kind-signatures
   - -Wno-missing-exported-signatures # missing-exported-signatures turns off the more strict -Wmissing-signatures. See https://ghc.haskell.org/trac/ghc/ticket/14794#ticket
   - -Wno-missing-import-lists # Requires explicit imports of _every_ function (e.g. ‘$’); too strict
   - -Wno-missed-specialisations # When GHC can’t specialize a polymorphic function. No big deal and requires fixing underlying libraries to solve.

pub/lnd-client/script/generate-protoc.sh

@@ -7,5 +7,5 @@ protoc \
     --plugin=protoc-gen-haskell=`which proto-lens-protoc` \
     --proto_path=proto \
     --haskell_out=./src \
-    --haskell_opt='Opt{ imports = [], pragmas = ["DeriveGeneric"], stockInstances = ["GHC.Generics.Generic"], defaultInstances = [] }' \
+    --haskell_opt='Opt{ imports = [], pragmas = ["DeriveDataTypeable", "DeriveGeneric"], stockInstances = ["Data.Data.Data", "GHC.Generics.Generic"], defaultInstances = [] }' \
 	./proto/**/*.proto

pub/lnd-client/src/LndClient/Data/AddHodlInvoice.hs

@@ -16,9 +16,7 @@ data AddHodlInvoiceRequest = AddHodlInvoiceRequest
     valueMsat :: Msat,
     expiry :: Maybe Seconds
   }
-  deriving stock (Eq, Show, Generic)
-
-instance Out AddHodlInvoiceRequest
+  deriving stock (Eq, Ord, Show, Read, Data, Generic)
 
 instance ToGrpc AddHodlInvoiceRequest LnGRPC.AddHoldInvoiceRequest where
   toGrpc x =
@@ -30,7 +28,11 @@ instance ToGrpc AddHodlInvoiceRequest LnGRPC.AddHoldInvoiceRequest where
     where
       msg gMemo gHash gValue gExp =
         defMessage
-          & LnGRPC.memo .~ gMemo
-          & LnGRPC.hash .~ gHash
-          & LnGRPC.valueMsat .~ gValue
-          & LnGRPC.expiry .~ gExp
+          & LnGRPC.memo
+          .~ gMemo
+          & LnGRPC.hash
+          .~ gHash
+          & LnGRPC.valueMsat
+          .~ gValue
+          & LnGRPC.expiry
+          .~ gExp

pub/lnd-client/src/LndClient/Data/AddInvoice.hs

@@ -16,18 +16,14 @@ data AddInvoiceRequest = AddInvoiceRequest
     memo :: Maybe Text,
     expiry :: Maybe Seconds
   }
-  deriving stock (Eq, Show, Generic)
-
-instance Out AddInvoiceRequest
+  deriving stock (Eq, Ord, Show, Read, Data, Generic)
 
 data AddInvoiceResponse = AddInvoiceResponse
   { rHash :: RHash,
     paymentRequest :: PaymentRequest,
     addIndex :: AddIndex
   }
-  deriving stock (Eq, Show, Generic)
-
-instance Out AddInvoiceResponse
+  deriving stock (Eq, Ord, Show, Read, Data, Generic)
 
 instance ToGrpc AddInvoiceRequest LnGRPC.Invoice where
   toGrpc x =
@@ -38,9 +34,12 @@ instance ToGrpc AddInvoiceRequest LnGRPC.Invoice where
     where
       msg gMemo gValue gExp =
         defMessage
-          & LnGRPC.memo .~ gMemo
-          & LnGRPC.valueMsat .~ gValue
-          & LnGRPC.expiry .~ gExp
+          & LnGRPC.memo
+          .~ gMemo
+          & LnGRPC.valueMsat
+          .~ gValue
+          & LnGRPC.expiry
+          .~ gExp
 
 instance FromGrpc AddInvoiceResponse LnGRPC.AddInvoiceResponse where
   fromGrpc x =

pub/lnd-client/src/LndClient/Data/Channel.hs

@@ -31,17 +31,13 @@ data Channel = Channel
     numUpdates :: Word64,
     prv :: Bool
   }
-  deriving stock (Eq, Ord, Show, Generic)
-
-instance Out Channel
+  deriving stock (Eq, Ord, Show, Read, Data, Generic)
 
 data PendingUpdate (a :: TxKind) = PendingUpdate
   { txid :: TxId a,
     outputIndex :: Vout a
   }
-  deriving stock (Eq, Ord, Show, Generic)
-
-instance Out (PendingUpdate a)
+  deriving stock (Eq, Ord, Show, Read, Data, Generic)
 
 instance FromGrpc Channel LnGRPC.Channel where
   fromGrpc x =