Merge pull request #1 from kda-community/enis/update-pact

Update Pact and embeed kadena-signing-api

Author: CryptoPascal31

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.8.4', '8.10.7', '9.0.2']
+        ghc: ['9.6.4']
         cabal: ['3.8']
         os: ['ubuntu-20.04', 'ubuntu-22.04', 'macOS-latest']
 
@@ -29,12 +29,20 @@ jobs:
         ghc --version
         cabal --version
 
-    # Project Setup
-    - name: Create cabal.project.local
-      if: matrix.ghc == '9.0.2' || matrix.ghc == '8.10.7'
+    # System dependencies
+    - if: startsWith(matrix.os, 'macOS')
+      name: Set up system depdendencies
       run: |
+        brew install openssl
+
         cat > cabal.project.local <<EOF
-        allow-newer: *:base
+        package *
+          extra-include-dirs:
+              /opt/homebrew/include
+              /opt/homebrew/opt/openssl/include
+          extra-lib-dirs:
+              /opt/homebrew/lib
+              /opt/homebrew/opt/openssl/lib
         EOF
 
     # dist cache
@@ -92,7 +100,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7"]
+        ghc: ["9.6.4"]
         os: ["ubuntu-20.04"]
 
     steps:

cabal.project

@@ -7,15 +7,15 @@ package pact
 
 source-repository-package
     type: git
-    location: https://github.com/mightybyte/HsYAML.git
-    tag: 2ad3cbd1c84f8ab362cf1f5fd4bb3e869dfcc102
-    --sha256: 1cmwavqz7vdpjvfybxbjphnw7448xy0353wmy9h29ix24lv8w7rr
+    location: https://github.com/kadena-io/HsYAML.git
+    tag: b3c49dbceb39733dfc07c22f2097d3c74fc86e74
+    --sha256: sha256-lnnUni7D949nM4faMrORMetZi5wJy2Qhchm9ne6Cqv8=
 
 source-repository-package
     type: git
-    location: https://github.com/mightybyte/HsYAML-aeson.git
-    tag: 077110e5e52dc91d593c546dd1baaafd3066558d
-    --sha256: 1r91ldq4sb49wqg1agvbjj21z6nwiyk3yx4r80arz0fhcv083czv
+    location: https://github.com/kadena-io/HsYAML-aeson.git
+    tag: 84292468200166b96ff4e8c7324ee01e6ab6d181
+    --sha256: sha256-zaDcqwSs4ASb7PO3+E9oGzmSXlSt7bL1NiP0red7CiY=
 
 source-repository-package
     type: git
@@ -26,36 +26,23 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/kadena-io/chainweb-api.git
-    tag: b3e28d62c622ebda0d84e136ea6c995d5f97e46f
-    --sha256: 1m9x9n5mwmv97fkv2z3hvlhlj59xm2mpsc816hzriw28pv1jb9zh
+    tag: 1b2de025cfdc09698bfb1ec3807cd85405d6a339
+    --sha256: sha256-06jvD1kmkmthcRkyWhVLTbytwabghInxqXQD/Lm7kbA=
 
 source-repository-package
     type: git
-    location: https://github.com/pcapriotti/optparse-applicative
-    tag: 9399fd0f745e4d4d71e8bba03d402648b767363c
-    --sha256: 0gkgccix898mafrs25fajqwxbb7zmg30livrj7b79knd6a5sqj76
+    location: https://github.com/kadena-io/pact.git
+    tag: a1c7906efbf32095883e71594a53a21162fbe5a7
+    --sha256: sha256-Mtgz/ilxa81TDUoBKQv5x3BlOftFjNV1Ak0uYzSguNQ=
 
 source-repository-package
-    type: git
-    location: https://github.com/kadena-io/pact.git
-    tag: 83c5944991d6edcd34d79f9fbf8e537d060689c6
-    --sha256: 0l59xi2by6l6gi10r8c437m7ics29215zr0zl1syyr3039vgmv0x
+  type: git
+  location: https://github.com/kadena-io/pact-json.git
+  tag: 1d260bfaa48312b54851057885de4c43c420e35f
+  --sha256: 0fzq4mzaszj5clvixx9mn1x6r4dcrnwvbl2znd0p5mmy5h2jr0hh
 
 source-repository-package
-    type: git
-    location: https://github.com/kadena-io/signing-api.git
-    tag: b60553cc61fa15c26763ca59974e0de3512b2d66
-    --sha256: 1xi6g67grs2dm4z4jj4l6h3lz0zy3pgi7xj2yy3y1d07m6gfwbrx
-    subdir: kadena-signing-api
-
-allow-newer: hashable:base
-allow-newer: chainweb-api:aeson
-
--- bounds from pact
-constraints: aeson <2
-constraints: base16-bytestring <1
-constraints: base64-bytestring <1.1
-constraints: hashable <1.3.1
-constraints: prettyprinter <1.6.1
-constraints: unordered-containers <0.2.16
-constraints: tls <1.7.0
+  type: git
+  location: https://github.com/kadena-io/kadena-ethereum-bridge.git
+  tag: a32d901e4a79be62af9c27c01152c9a4c3912a62
+  --sha256: sha256-xdawv/tdjh61MbJKcBqm9Fje36+gVljuZsAxOTX1gP0=

flake.lock

@@ -12,7 +12,7 @@
           kdaToolProject =
             final.haskell-nix.project' {
               src = ./.;
-              compiler-nix-name = "ghc8107";
+              compiler-nix-name = "ghc964";
               shell.tools = {
                 cabal = {};
               };

flake.nix

@@ -28,6 +28,8 @@ library
     Commands.Sign
     Commands.Verify
     Commands.WalletSign
+    Kadena.SigningApi
+    Kadena.SigningTypes
     Keys
     Logger
     TxTemplate
@@ -43,7 +45,7 @@ library
       Decimal
     , HsYAML
     , HsYAML-aeson
-    , aeson < 2
+    , aeson
     , async
     , attoparsec
     , base >= 4.13 && < 5
@@ -68,7 +70,6 @@ library
     , http-client
     , http-client-tls
     , http-types
-    , kadena-signing-api
     , katip
     , lens
     , lens-aeson
@@ -79,13 +80,15 @@ library
     , network-uri
     , optparse-applicative
     , pact
+    , pact-json
     , process
     , resource-pool
     , retry
     , safe-exceptions
     , scientific
     , servant
     , servant-client
+    , split
     , stm
     , stm-linkedlist
     , string-conv
@@ -149,7 +152,6 @@ test-suite kda-tool-tests
     , http-client
     , http-client-tls
     , http-types
-    , kadena-signing-api
     , katip
     , lens
     , lens-aeson
@@ -160,12 +162,14 @@ test-suite kda-tool-tests
     , network-uri
     , optparse-applicative
     , pact
+    , pact-json
     , process
     , resource-pool
     , retry
     , scientific
     , servant
     , servant-client
+    , split
     , stm
     , stm-linkedlist
     , string-conv

kda-tool.cabal

@@ -9,11 +9,11 @@ module AppMain where
 import           Control.Monad.IO.Class
 import           Data.Aeson
 import           Data.Default
+import           Data.String (fromString)
 import           Katip
 import           Network.HTTP.Client hiding (withConnection)
 import           Network.HTTP.Client.TLS
 import           Options.Applicative
-import           Options.Applicative.Help.Pretty hiding ((</>))
 import           System.Directory
 import           System.FilePath
 import           System.IO
@@ -81,7 +81,7 @@ appMain = do
       , header "kda - Command line tool for interacting with the Kadena blockchain"
       , footerDoc (Just theFooter)
       ]
-    theFooter = string $ unlines
+    theFooter = fromString $ unlines
       [ "Run the following command to enable tab completion:"
       , ""
       , "source <(kda --bash-completion-script `which kda`)"