Hashable-independent Aeson instances

.github/workflows/applications.yml

@@ -10,20 +10,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.7']
-        cabal: ['3.8']
+        ghc: ['8.10.7', '9.2', '9.6']
+        cabal: ['3.10']
         os: ['ubuntu-20.04', 'ubuntu-22.04', 'macOS-latest']
         cabalcache: ['true']
         flags: ['+build-tool']
         include:
         - os: 'ubuntu-22.04'
-          ghc: '8.10.7'
-          cabal: '3.8'
+          ghc: '9.6'
+          cabal: '3.10'
           cabalcache: 'true'
           flags: '-build-tool +no-advice'
         - os: 'ubuntu-22.04'
           ghc: '9.0.2'
-          cabal: '3.8'
+          cabal: '3.10'
           cabalcache: 'true'
           flags: '+build-tool'
         # include:
@@ -51,20 +51,15 @@ jobs:
         sudo apt-get install -y z3
     - name: Install z3 (ubuntu-22.04)
       if: contains(matrix.os, 'ubuntu-22.04')
-      uses: pavpanchekha/setup-z3@v0.3.0
+      # uses: pavpanchekha/setup-z3@v0.3.0
+      uses: larskuhtz/setup-z3@c209497f76e03a4c71ec92c0c6621fb3e1ea5fba
       with:
         version: "4.11.2"
         architecture: "x64"
-    - name: Install z3 (ubuntu-18.04)
-      if: contains(matrix.os, 'ubuntu-18.04')
-      uses: pavpanchekha/setup-z3@v0.3.0
-      with:
-        version: "4.8.10"
-        architecture: "x64"
-        distribution: "ubuntu-18.04"
     - name: Install z3 (macOS)
       if: contains(matrix.os, 'mac')
-      uses: pavpanchekha/setup-z3@v0.3.0
+      # uses: pavpanchekha/setup-z3@v0.3.0
+      uses: larskuhtz/setup-z3@c209497f76e03a4c71ec92c0c6621fb3e1ea5fba
       with:
         version: "4.8.10"
         architecture: "x64"
@@ -113,14 +108,13 @@ jobs:
           benchmarks: True
           documentation: False
           optimization: 1
-          flags: ${{ matrix.flags }}
+          flags: ${{ matrix.flags }} +cryptonite-ed25519
         EOF
     - name: Extend cabal.project.local for GHC-9.0.2
       if: "startsWith(matrix.ghc, '9')"
       shell: bash
       run: |
         cat >> cabal.project.local <<EOF
-        allow-newer: hashable:*
         package pact
           ghc-options: -Wwarn -Wunused-packages
         EOF
@@ -155,7 +149,7 @@ jobs:
         cabal freeze
     - name: Sync from cabal cache
       if: matrix.cabalcache == 'true'
-      uses: larskuhtz/cabal-cache-action@ecc751af6d31b3ed5a3b4aefdefd0ed6ef4cb414
+      uses: larskuhtz/cabal-cache-action@018b7ae0c480ba3dc4fa0cfa3a0bc1f05b7724b3
       with:
         bucket: "kadena-cabal-cache"
         region: "us-east-1"
@@ -222,7 +216,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - ghc: "8.10.7"
+        - ghc: "9.6"
           os: "ubuntu-20.04"
     env:
       OS: ${{ matrix.os }}
@@ -255,7 +249,7 @@ jobs:
         EOF
     - name: Docker meta
       id: meta
-      uses: docker/metadata-action@v3
+      uses: docker/metadata-action@v4
       with:
         images: ghcr.io/kadena-io/pact
         tags: |
@@ -280,7 +274,7 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push
       id: docker_build
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         push: true
         context: .

cabal.project

@@ -1,15 +1,49 @@
 packages: .
 
-allow-older: libBF:hashable
-
 -- these upper bounds are required in order to not break payload validation in chainweb
 constraints: base16-bytestring <1
 constraints: prettyprinter <1.6.1
-constraints: hashable <1.3.1
 constraints: base64-bytestring <1.1
-constraints: unordered-containers <0.2.16
+
+allow-newer: base64-bytestring:*
+allow-newer: base16-bytestring:*
+allow-newer: prettyprinter:*
 
 -- test upper bounds
 constraints: hspec-golden <0.2,
-             any.happy == 1.19.12
 
+-- The following fork provides trifecta-2.`1.1.1 which is compatible with
+-- hashable >=1.4 and prettyprinter <1.7
+--
+-- trifeta >=2.1.2 requires a prettyprinter >=1.7, which isn't supported by
+-- pact (since it would break mainnet replays). trifecta ==2.1.1 does not 
+-- support hashable >=1.4.
+--
+source-repository-package
+  type: git
+  tag: f991ffb74a1a1ab86f14e751d7c4f4ba549785b3
+  location: https://github.com/hackage-package-forks/trifecta
+
+source-repository-package
+  type: git
+  tag: f8314fe8313702b07102a9f8330ad91630d1b124
+  location: https://github.com/kadena-io/pact-json
+
+-- Required for GHC-9.6
+
+allow-newer: *:template-haskell
+allow-newer: *:base
+
+-- Patch merged into master (upcoming verison 10.0). We are currently using 9.2
+source-repository-package
+  type: git
+  tag: b66e3a04c20f753213fe7e5115a95b3fe34109f9
+  location: https://github.com/larskuhtz/sbv
+
+-- Servant is notoriously forcing outdated upper bounds onto its users.
+-- It is usually safe to just ignore those.
+--
+allow-newer: servant-server:*
+allow-newer: servant-client-core:*
+allow-newer: servant-client:*
+allow-newer: servant:*