mtl-2.3 (#1709)

* mtl-2.3

* update wai-middleware-validation pin

* upper bound on hashable

cabal.project

@@ -66,7 +66,7 @@ source-repository-package
     type: git
     location: https://github.com/kadena-io/pact-json.git
     tag: 1d260bfaa48312b54851057885de4c43c420e35f
-    --sha256: sha256-EIIsBSy+1nJBs1/QtbnNrJFserA19R43ZUV+rX4l+Ds=
+    --sha256: 0fzq4mzaszj5clvixx9mn1x6r4dcrnwvbl2znd0p5mmy5h2jr0hh
 
 source-repository-package
     type: git
@@ -95,8 +95,8 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/kadena-io/wai-middleware-validation.git
-    tag: f783ba7fc52e161b245d82acadffc4517bc8cdf5
-    --sha256: 182yffj2rbv2asmq589r16mb45q9d0gvdhsxvsnmjyw89dcpyadn
+    tag: e0437bf82e9b4d3fec5ad42ef6e860f4bd04e1b4
+    --sha256: 1az7jcggcj275djnfsvhdg3n7hjrj6vp8rj137fxrg4hazh0hyzv
 
 source-repository-package
   type: git
@@ -113,13 +113,6 @@ source-repository-package
     tag: d8019c3404d6f3b3c0b0416e9899cfdf614ef425
     --sha256: 09msayidg23rsdz97fcfqqalm4pbawx3c1qihgab8hnlmjxby103
 
--- Inherited from pact:
-source-repository-package
-    type: git
-    location: https://github.com/hackage-package-forks/trifecta
-    tag: f991ffb74a1a1ab86f14e751d7c4f4ba549785b3
-    --sha256: 0flnwyjm40zcssq5xfn9h5p24f07npgapr6cx1ni43vx0sbjkqlv
-
 -- Patch merged into master (upcoming version 10.0). We are currently using 9.2
 source-repository-package
     type: git
@@ -148,10 +141,17 @@ allow-newer: servant:*
 
 -- these are more liberal than necessary, but since everything works fine
 -- with this there's no reason to constrain it more than necessary.
+-- These packages are tightly bound to the GHC version and these 
+-- settings ensure that we use the versions that are shipped with the
+-- GHC version that we are using.
 allow-newer: *:base
 allow-newer: *:tempalte-haskell
 allow-newer: *:ghc-prim
 
+-- Pact uses a vendored version of trifecta that has outdated 
+-- upper bounds
+allow-newer: trifecta:*
+
 -- wai-middleware-validation dependencies
 
 allow-newer: wai-middleware-validation:*

chainweb.cabal

@@ -371,7 +371,7 @@ library
         , merkle-log >=0.2
         , mmorph >= 1.1
         , monad-control >= 1.0
-        , mtl >= 2.2
+        , mtl >= 2.3
         , mwc-random >= 0.13
         , mwc-probability >= 2.0 && <2.4
         , network >= 3.1.2
@@ -538,7 +538,7 @@ test-suite chainweb-tests
         , lens-aeson >= 1.2.2
         , loglevel >= 0.1
         , merkle-log >=0.2
-        , mtl >= 2.2
+        , mtl >= 2.3
         , network >= 3.1.2
         , http-client-tls >=0.3
         , pact
@@ -702,7 +702,7 @@ executable cwtool
         , loglevel >= 0.1
         , memory >=0.14
         , merkle-log >=0.2
-        , mtl >= 2.2
+        , mtl >= 2.3
         , network >= 3.1.2
         , optparse-applicative >= 0.14
         , pact
@@ -776,7 +776,7 @@ benchmark bench
         , lens >= 4.17
         , loglevel >= 0.1
         , merkle-log >=0.2
-        , mtl >= 2.2
+        , mtl >= 2.3
         , pact
         , random >= 1.2
         , text >= 2.0

src/Chainweb/BlockHeader/Validation.hs

@@ -94,6 +94,7 @@ import Control.Lens
 import Control.Monad
 import Control.Monad.Catch
 import Control.Monad.Except
+import Control.Monad.Trans.Class
 
 import Data.Foldable
 import qualified Data.HashMap.Strict as HM

src/Chainweb/Chainweb.hs

@@ -108,7 +108,6 @@ import Control.DeepSeq
 import Control.Lens hiding ((.=), (<.>))
 import Control.Monad
 import Control.Monad.Catch (fromException, throwM)
-import Control.Monad.Writer
 
 import Data.Foldable
 import Data.Function (on)

src/Chainweb/CutDB/RestAPI/Server.hs

@@ -34,6 +34,7 @@ module Chainweb.CutDB.RestAPI.Server
 
 import Control.Lens (view)
 import Control.Monad.Except
+import Control.Monad.IO.Class
 
 import Data.IxSet.Typed
 import Data.Proxy

src/Chainweb/Pact/Backend/DbCache.hs

@@ -32,6 +32,7 @@ module Chainweb.Pact.Backend.DbCache
 
 import Control.DeepSeq (NFData(..))
 import Control.Lens hiding ((.=))
+import Control.Monad (forM, unless)
 import Control.Monad.State.Strict
 
 import qualified Crypto.Hash as C (hash)

src/Chainweb/Pact/RestAPI/Server.hs

@@ -35,6 +35,7 @@ import Control.Concurrent.STM (atomically, retry)
 import Control.Concurrent.STM.TVar
 import Control.DeepSeq
 import Control.Lens (set, view, preview)
+import Control.Monad ((<$!>), forM, mzero, when, void)
 import Control.Monad.Catch hiding (Handler)
 import Control.Monad.Reader
 import Control.Monad.State.Strict

test/Chainweb/Test/Pact/Checkpointer.hs

@@ -13,6 +13,7 @@ import Control.Concurrent.MVar
 import Control.DeepSeq
 import Control.Exception
 import Control.Lens hiding ((.=))
+import Control.Monad (when, void)
 import Control.Monad.Reader
 
 import Data.Aeson (Value(..), object, (.=), Key)

test/Chainweb/Test/Pact/DbCacheTest.hs

@@ -5,6 +5,7 @@ module Chainweb.Test.Pact.DbCacheTest (tests) where
 
 import Chainweb.Pact.Backend.DbCache
 
+import Control.Monad (void)
 import Control.Monad.State.Strict
 
 import Data.Aeson

test/Chainweb/Test/Pact/PactReplay.hs

@@ -9,6 +9,7 @@
 module Chainweb.Test.Pact.PactReplay where
 
 import Control.Concurrent.MVar
+import Control.Monad (forM_, unless, void)
 import Control.Monad.Catch
 import Control.Monad.Reader
 import Control.Monad.State

tools/db-checksum/CheckpointerDBChecksum.hs

@@ -15,6 +15,7 @@ module CheckpointerDBChecksum where
 import Configuration.Utils hiding (Error, Lens', action, encode)
 
 import Control.Exception.Safe (tryAny)
+import Control.Monad (foldM, when, void)
 import Control.Monad.Reader
 
 import Crypto.Hash

tools/header-dump/HeaderDump.hs

@@ -60,6 +60,7 @@ import Control.Lens hiding ((.=))
 import Control.Monad
 import Control.Monad.Catch (MonadThrow, throwM)
 import Control.Monad.Except
+import Control.Monad.IO.Class
 
 import Data.Aeson.Encode.Pretty hiding (Config)
 import Data.Aeson.Lens

tools/txstream/TxStream.hs

@@ -37,6 +37,7 @@ import Configuration.Utils
 
 import Control.Arrow ((&&&))
 import Control.Lens hiding ((.=))
+import Control.Monad ((<=<), when)
 import Control.Monad.Reader
 
 import Data.Aeson.Encode.Pretty hiding (Config)