Hashable-independent Aeson instances

.github/workflows/applications.yml

@@ -13,20 +13,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'
         - os: 'ubuntu-22.04'
           ghc: '9.0.2'
-          cabal: '3.8'
+          cabal: '3.10'
           cabalcache: 'true'
           flags: '+build-tool'
         # include:
@@ -111,14 +111,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
@@ -220,7 +219,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - ghc: "8.10.7"
+        - ghc: "9.6"
           os: "ubuntu-20.04"
     env:
       OS: ${{ matrix.os }}

cabal.project

@@ -1,18 +1,52 @@
 packages: .
 
-allow-older: libBF:hashable
-
 -- temporary upper bounds
 constraints: sbv <10
 
 -- these upper bounds are required in order to not break payload validation in chainweb
-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: base64-bytestring <1.1
+
+allow-newer: base64-bytestring:*
+allow-newer: base16-bytestring:*
+allow-newer: prettyprinter:*
 
 -- test upper bounds
 constraints: hspec-golden <0.2,
 
+-- 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:*

pact.cabal

@@ -46,6 +46,9 @@ flag tests-in-lib
   default:     False
   manual:      True
 
+-- -------------------------------------------------------------------------- --
+-- Pact library
+
 library
 
   -- common to all configurations:
@@ -87,6 +90,7 @@ library
     Pact.Native.Keysets
     Pact.Native.Decrypt
     Pact.Native.Pairing
+    Pact.Native.Pairing.GaloisField
     Pact.Parse
     Pact.PersistPactDb
     Pact.Persist
@@ -119,6 +123,7 @@ library
     Pact.Types.Native
     Pact.Types.PactError
     Pact.Types.PactValue
+    Pact.Types.PactValue.Arbitrary
     Pact.Types.Parser
     Pact.Types.Principal
     Pact.Types.Advice
@@ -133,6 +138,8 @@ library
     Pact.Types.SizeOf
     Pact.Types.SPV
     Pact.Types.Term
+    Pact.Types.Term.Arbitrary
+    Pact.Types.Term.Internal
     Pact.Types.Type
     Pact.Types.Util
     Pact.Types.Version
@@ -150,7 +157,7 @@ library
   build-depends:
     , Decimal >=0.4.2
     , QuickCheck >=2.12.6.1
-    , aeson >=0.11.3.0
+    , aeson >=2
     , attoparsec >=0.13.0.2
     -- note: this is the real constraint, but due to base changes
     -- we split for compat.
@@ -169,24 +176,25 @@ library
     , errors >=2.3
     , exceptions >=0.8.3
     , filepath >=1.4.1.0
-    , hashable >=1.2.4.0
+    , hashable >=1.4
     , lens >=4.14
     , lens-aeson >=1.0.0.5
     , megaparsec >=9
     , mtl >=2.2.1
+    , pact-json >=0.1
     , pact-time >=0.2
     , parsers >=0.12.4
     , prettyprinter >=1.2
     , prettyprinter-ansi-terminal >=1.1
     , quickcheck-instances >=0.3
     , reflection
+    , scientific >= 0.3
     , safe-exceptions
     , semigroupoids >=5.0
     , servant
     , text >=1.2.2.1
-    , transformers >=0.5.2.0
-    , trifecta >=2.1
-    , unordered-containers >=0.2.7.2
+    , trifecta >=2.1.1.1
+    , unordered-containers >=0.2.19
     , utf8-string >=1.0.1.1
     , vector >=0.11.0.0
     , vector-algorithms >=0.7
@@ -232,8 +240,8 @@ library
       , direct-sqlite >=2.3.27
       , memory
       , safe-exceptions >=0.1.5.0
-      , servant-client
-      , servant-client-core
+      , servant-client >=0.16
+      , servant-client-core >=0.16
       , statistics >=0.13.3
       , yaml
     if flag(build-tool)
@@ -299,17 +307,19 @@ library
         , neat-interpolation >=0.4
         , optparse-applicative >=0.12.1.0
         , sbv >=9.0
+        , semigroupoids >=5.0
         , servant-server
+        , transformers >= 0.5.2.0 && < 0.7
         , wai-cors
         , warp
+      if !os(windows)
+        build-depends: unix
     if flag(cryptonite-ed25519)
       cpp-options: -DCRYPTONITE_ED25519
     else
       build-depends:
         , crypto-api
         , ed25519-donna
-    if !os(windows)
-      build-depends: unix
     if flag(tests-in-lib)
       hs-source-dirs: tests
       build-depends:
@@ -319,6 +329,9 @@ library
         , hw-hspec-hedgehog >=0.1
         , intervals
 
+-- -------------------------------------------------------------------------- --
+-- Executables and Benchmarks
+
 executable pact
   if impl(ghcjs) || !flag(build-tool)
     buildable: False
@@ -356,6 +369,9 @@ executable gasmodel
   ghc-prof-options:    -fprof-auto -fprof-auto-calls
   default-language:    Haskell2010
 
+-- -------------------------------------------------------------------------- --
+-- Test Suite
+
 test-suite hspec
   main-is:          PactTests.hs
   type:             exitcode-stdio-1.0
@@ -372,7 +388,6 @@ test-suite hspec
     , containers
     , data-default
     , hspec
-    , hspec-core
     , pact
     , unordered-containers
 
@@ -382,21 +397,28 @@ test-suite hspec
     RoundTripSpec
     PrincipalSpec
     SizeOfSpec
+    Test.Pact.Native.Pairing
 
   if !impl(ghcjs)
     other-modules:
       PactTestsSpec
       ParserSpec
       SchemeSpec
       SignatureSpec
+      Test.Pact.Utils.LegacyValue
 
     build-depends:
+      , QuickCheck
       , base16-bytestring
       , directory
       , errors
       , filepath
+      -- only used via CPP min version macro:
+      , pact-json >= 0.1
       , lens
       , mtl
+      , mod
+      , semirings
       , text
       , transformers
       , vector
@@ -428,24 +450,20 @@ test-suite hspec
 
       build-depends:
         , Decimal
-        , QuickCheck
         , deepseq
         , directory
         , exceptions
         , hedgehog >=1.0.1
         , hspec-golden >=0.1.0.2
-        , hspec-expectations
         , hspec-hedgehog
         , groups
         , http-client
         , hw-hspec-hedgehog >=0.1
         , intervals
         , mmorph
         , neat-interpolation
-        , semirings
-        , prettyprinter
         , sbv
-        , servant-client
+        , servant-client >=0.16
         , temporary >=1.3
         , yaml
         , process