Bump morley and other deps

Problem: We want to check whether this repo can be used with the latest morley and new GHC version. Solution: Bump dependencies and make required changes in the code.
tqtezos · Apr 13, 2021 · ff22a11 · ff22a11
1 parent 97743ca
commit ff22a11
Show file tree

Hide file tree

Showing 8 changed files with 157 additions and 112 deletions.
diff --git a/haskell/hpack/definitions.yaml b/haskell/hpack/definitions.yaml
@@ -73,6 +73,10 @@ _definitions:
         - -Wno-missing-local-signatures
         - -Wno-monomorphism-restriction
         - -Wno-implicit-prelude
+        - -Wno-prepositive-qualified-module
+        - -Wno-missing-safe-haskell-mode
+        - -Wno-unused-packages
+
 
   _utils:
     # Additional options, they will be merged with the ones above when both

diff --git a/haskell/nettest/FA1_2Comparison.hs b/haskell/nettest/FA1_2Comparison.hs
@@ -8,7 +8,7 @@ module FA1_2Comparison
 import qualified Data.Map as Map
 import Fmt (build)
 
-import Lorentz (BigMap(..), EntrypointRef(Call), TAddress(..), toVal)
+import Lorentz (BigMap(..), TAddress(..), toVal)
 import Michelson.Typed (convertContract, untypeValue)
 import Morley.Nettest
 import Util.Named ((.!))

diff --git a/haskell/nettest/Permit.hs b/haskell/nettest/Permit.hs
@@ -7,7 +7,7 @@ module Permit
 
 import Fmt (build)
 
-import Lorentz (Address, EntrypointRef(Call), Packed(..), TAddress(..), lPackValue, toVal)
+import Lorentz (Address, Packed(..), TAddress(..), lPackValue, toVal)
 import Michelson.Typed (convertContract, untypeValue)
 import Morley.Nettest
 

diff --git a/haskell/src/Lorentz/Contracts/Stablecoin/Metadata.hs b/haskell/src/Lorentz/Contracts/Stablecoin/Metadata.hs
@@ -214,7 +214,7 @@ getTotalSupplyView =
     , vImplementations = one $
         VIMichelsonStorageView $
           mkMichelsonStorageView @Storage @Natural Nothing [] $
-            $$(compileViewCodeTH $ WithParam $
+            $$(compileViewCodeTH $ WithParam @Natural $
               L.int #
               L.assertEq0 [mt|Unknown TOKEN ID|] #
               L.toField #sTotalSupply
@@ -247,7 +247,7 @@ isOperatorView =
             $$(compileViewCodeTH $ WithParam @FA2.OperatorParam $
               L.dip (L.toField #sOperators) #
 
-              L.getField #opTokenId # forcedCoerce_ #
+              L.getField #opTokenId # forcedCoerce_ @FA2.TokenId @Natural #
               L.int #
               L.assertEq0 [mt|Unknown TOKEN ID|] #
 
@@ -261,7 +261,7 @@ isOperatorView =
 
 mkTokenMetadataView :: FA2.TokenMetadata -> Either ViewCodeError (TZ.View (ToT Storage))
 mkTokenMetadataView md = do
-  vc <- compileViewCode $ WithParam $
+  vc <- compileViewCode $ WithParam @Natural $
           L.dip L.drop #
           L.int #
           L.assertEq0 [mt|Unknown TOKEN ID|] #

diff --git a/haskell/stack.yaml b/haskell/stack.yaml
@@ -3,56 +3,68 @@
 
 # To update hackage and stackage indexes used by CI run:
 # $ niv update hackage.nix; niv update stackage.nix
-resolver: lts-16.5
+resolver: lts-17.3
 
 packages:
 - .
 
 extra-deps:
 - git:
     https://gitlab.com/morley-framework/morley.git
-    # ^ CI cannot use ssh, so we use http clone here
+  # ^ CI cannot use ssh, so we use http clone here
   commit:
-    0cc70793711af3a1cf65ec0fac2a2c147695c1d3 # master
+    295bdad3f75d76e780ec0b64b5e2e3d8d8f41441 # morley-1.14.0
   subdirs:
     - code/cleveland
     - code/morley-client
 
+
 - git:
     https://gitlab.com/morley-framework/morley-metadata.git
     # ^ CI cannot use ssh, so we use http clone here
   commit:
-    34342cf86e51190b541a68f795899a4328a3db01 # master
+    b66b0e6bb96e1f15388594f7ec724d45b68769c5 # master
   subdirs:
     - code/morley-metadata
     - code/morley-metadata-test
 
+- git:
+    https://gitlab.com/morley-framework/indigo.git
+  commit:
+    a7c93b410683ec6d86dfcda157f6d7ab9eeda778 # master
+  subdirs:
+    - .
+
 # Stable parts of morley available from Hackage
-- morley-1.12.0
-- morley-prelude-0.3.0
-- lorentz-0.9.1
-- indigo-0.5.0
+- morley-prelude-0.4.0
+- morley-1.14.0
+- lorentz-0.11.0
 
 # Required by morley
 - tasty-hunit-compat-0.2
-- uncaught-exception-0.1.0
-- base58-bytestring-0.1.0
 - hex-text-0.1.0.0
-- pretty-terminal-0.1.0.0
+- named-0.3.0.1
 - show-type-0.1.1
+- summoner-2.0.1.1
+- generic-data-0.8.3.0
+- neat-interpolation-0.3.2.6
+- megaparsec-8.0.0
+- git: https://github.com/serokell/base-noprelude.git
+  commit: 87df0899801dcdffd08ef7c3efd3c63e67e623c2
+- git: https://github.com/serokell/galois-field.git
+  commit: 576ba98ec947370835a1f308895037c7aa7f8b71
 - git: https://github.com/int-index/caps.git
   commit: c5d61837eb358989b581ed82b1e79158c4823b1b
-- base-noprelude-4.13.0.0@sha256:3cccbfda38e1422ca5cc436d58858ba51ff9114d2ed87915a6569be11e4e5a90,6842
-- fmt-0.6.1.2@sha256:405a1bfc0ba0fd99f6eb1ee71f100045223f79204f961593012f28fd99cd1237,5319
-- named-0.3.0.1@sha256:69b9722301201f8ed8abc89c4595e22c746e944bf4cdfafa8b21b14d336b26d1,2233
-- vinyl-0.12.1@sha256:43456d4b3009646eee63953cbe539f1f4d0caf8bc3c25e841117e712836508f3,3790
-- cryptonite-0.27
+- git: https://github.com/serokell/elliptic-curve.git
+  commit: b8a3d0cf8f7bacfed77dc3b697f5d08bd33396a8
+- git: https://github.com/serokell/pairing.git
+  commit: cf86cf1f6b03f478a439703b050c520a9d455353
 
 - git:
     https://gitlab.com/morley-framework/morley-ledgers.git
     # ^ CI cannot use ssh, so we use http clone here
   commit:
-    f4e3fffca1d877e404b38c54d8e1b411641c3548 # master
+    c92008db75363a50adf469c44a39e17843c311ec # master
   subdirs:
     - code/morley-ledgers
     - code/morley-ledgers-test