Merge cardano-foundation#2036

2036: cardano-node: 1.18.0 -> 1.19.0 r=KtorZ a=rvl ### Issue Number None ### Overview - Updates cardano-node and libraries to [~1.18.1~ 1.19.0 release](https://github.com/input-output-hk/cardano-node/releases/tag/1.19.0). ### Comments Source: `cardano-node/stack.yaml` Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io> Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
hasufell · Aug 20, 2020 · d7994e9 · d7994e9
2 parents c84ac72 + 375379a
commit d7994e9
Show file tree

Hide file tree

Showing 58 changed files with 324 additions and 356 deletions.
diff --git a/cardano-1.18.x.yaml → cardano-1.19.x.yaml b/cardano-1.18.x.yaml → cardano-1.19.x.yaml
@@ -1,17 +1,18 @@
-name: cardano-1.17.x
+name: cardano-1.19.x
 
 resolver: lts-14.25
 
 packages:
 - base16-0.1.2.1
 - base58-bytestring-0.1.0
-- base64-0.4.1
+- base64-0.4.2
 - bech32-1.1.0
 - bech32-th-1.0.2
-- bimap-0.4.0
-- binary-0.8.7.0
 - brick-0.47
+- binary-0.8.7.0
+- bimap-0.4.0
 - canonical-json-0.6.0.0
+- cborg-0.2.4.0
 - clock-0.8
 - config-ini-0.2.4.0
 - connection-0.3.1
@@ -20,8 +21,11 @@ packages:
 - dns-3.0.4
 - generic-monoid-0.1.0.0
 - generics-sop-0.5.1.0
+- ghc-byteorder-4.11.0.0.10
 - gray-code-0.3.1
 - hedgehog-1.0.2
+- hedgehog-corpus-0.2.0
+- hedgehog-quickcheck-0.1.1
 - hspec-2.7.0
 - hspec-core-2.7.0
 - hspec-discover-2.7.0
@@ -32,6 +36,7 @@ packages:
 - micro-recursion-schemes-5.0.2.2
 - moo-1.2
 - network-3.1.1.1
+- primitive-0.7.1.0
 - prometheus-2.1.2
 - quickcheck-instances-0.3.19
 - QuickCheck-2.12.6.1
@@ -44,17 +49,18 @@ packages:
 - systemd-2.3.0
 - tasty-hedgehog-1.0.0.2
 - text-1.2.4.0
+- text-ansi-0.1.0
 - text-zipper-0.10.1
 - th-lift-instances-0.1.14
 - time-units-1.0.0
 - transformers-except-0.1.1
 - Unique-0.4.7.6
+- word-wrap-0.4.1
 - websockets-0.12.6.1
 - Win32-2.6.2.0
-- word-wrap-0.4.1
 
 - git: https://github.com/input-output-hk/cardano-base
-  commit: 7d795c3040ea7785812efa1c97864bbb41b15d3e
+  commit: df8687488449f71dce3d881800c21e41fe1b7fc1
   subdirs:
   - binary
   - binary/test
@@ -66,7 +72,7 @@ packages:
   commit: 2547ad1e80aeabca2899951601079408becbc92c
 
 - git: https://github.com/input-output-hk/cardano-ledger-specs
-  commit: 183a70c001587d9b1977541deae28c3e44713907
+  commit: 460ee17d22cacb3ac4d90536ebe90500a356a1c9
   subdirs:
   - byron/ledger/impl
   - byron/crypto
@@ -78,18 +84,18 @@ packages:
   - semantics/small-steps-test
   - shelley/chain-and-ledger/dependencies/non-integer
   - shelley/chain-and-ledger/executable-spec
-  - shelley/chain-and-ledger/executable-spec/test
+  - shelley/chain-and-ledger/shelley-spec-ledger-test
 
 - git: https://github.com/input-output-hk/cardano-node
-  commit: ba0f96b1a9fc9232ed211e57835fd5018093069d
+  commit: 4814003f14340d5a1fc02f3ac15437387a7ada9f
   subdirs:
   - cardano-api
   - cardano-cli
   - cardano-config
   - cardano-node
 
 - git: https://github.com/input-output-hk/cardano-prelude
-  commit: 316c854d1d3089f480708ad5cd5ecf8a74423ddd
+  commit: 71ea865408f2e03e6d6832359423546699730849
   subdirs:
   - .
   - test
@@ -98,10 +104,10 @@ packages:
   commit: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49
 
 - git: https://github.com/input-output-hk/goblins
-  commit: 26d35ad52fe9ade3391532dbfeb2f416f07650bc
+  commit: 312198a1523736181ef7ddab15958bb32a9d9052
 
 - git: https://github.com/input-output-hk/iohk-monitoring-framework
-  commit: efa4b5ecd7f0a13124616b12679cd42517cd905a
+  commit: 8190b00d6930927a812baff97d02566176b6bd3b
   subdirs:
   - contra-tracer
   - iohk-monitoring
@@ -113,7 +119,7 @@ packages:
   - plugins/backend-trace-forwarder
 
 - git: https://github.com/input-output-hk/ouroboros-network
-  commit: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  commit: aecfe77de784e6c75108172802ee59d2d7087eaf
   subdirs:
   - io-sim
   - io-sim-classes
@@ -133,11 +139,6 @@ packages:
   - typed-protocols
   - typed-protocols-examples
 
-- git: https://github.com/well-typed/cborg
-  commit: 42a83192749774268337258f4f94c97584b80ca6
-  subdirs:
-  - cborg
-
 - git: https://github.com/snoyberg/http-client.git
   commit: 1a75bdfca014723dd5d40760fad854b3f0f37156
   subdirs:

diff --git a/lib/core/src/Cardano/Wallet/Orphans.hs b/lib/core/src/Cardano/Wallet/Orphans.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
@@ -7,35 +6,15 @@
 -- License: Apache-2.0
 --
 -- Module for orphans which would be too inconvenient to avoid.
+
 module Cardano.Wallet.Orphans where
 
 import Prelude
 
 import Cardano.Slotting.Slot
     ( SlotNo (..) )
 import Fmt
-    ( Buildable (..), (+|), (+||), (|+), (||+) )
-
-import qualified Ouroboros.Consensus.HardFork.History.Qry as HF
+    ( Buildable (..) )
 
 instance Buildable SlotNo where
     build (SlotNo n) = build (show n)
-
-instance Buildable (HF.Qry a) where
-    build = \case
-        HF.QPure _ -> "QPure"
-        HF.QBind q _ -> "QBind "+|q|+""
-        HF.QAbsToRelTime t -> "QAbsToRelTime "+||t||+""
-        HF.QAbsToRelSlot sl -> "QAbsToRelSlot "+||sl||+""
-        HF.QAbsToRelEpoch ep -> "QAbsToRelEpoch "+||ep||+""
-        HF.QSlotLength sl -> "QSlotLength "+||sl||+""
-        HF.QEpochSize ep -> "QEpochSize "+||ep||+""
-        -- Necessary constructors or show instances are not exported -- we can't
-        -- show these values.
-        HF.QRelToAbsTime _t -> "QRelToAbsTime ?"
-        HF.QRelToAbsSlot _slt -> "QRelToAbsSlot ?"
-        HF.QRelToAbsEpoch _epe -> "QRelToAbsEpoch ?"
-        HF.QRelTimeToSlot _t -> "QRelTimeToSlot ?"
-        HF.QRelSlotToTime _sl -> "QRelSlotToTime ?"
-        HF.QRelSlotToEpoch _sl -> "QRelSlotToEpoch ?"
-        HF.QRelEpochToSlot _ep -> "QRelEpochToSlot ?"
diff --git a/lib/core/src/Cardano/Wallet/Primitive/Slotting.hs b/lib/core/src/Cardano/Wallet/Primitive/Slotting.hs
@@ -93,8 +93,6 @@ import Data.Time.Clock
     ( NominalDiffTime, UTCTime, addUTCTime, diffUTCTime, getCurrentTime )
 import Data.Word
     ( Word32, Word64 )
-import Fmt
-    ( Buildable (..), (+||), (||+) )
 import GHC.Generics
     ( Generic )
 import GHC.Stack
@@ -111,7 +109,6 @@ import Ouroboros.Consensus.HardFork.History.Summary
 import qualified Cardano.Slotting.Slot as Cardano
 import qualified Ouroboros.Consensus.BlockchainTime.WallClock.Types as Cardano
 import qualified Ouroboros.Consensus.HardFork.History.Qry as HF
-import qualified Ouroboros.Consensus.HardFork.History.Summary as HF
 
 -- -----------------------------------------------------------------------------
 -- New Api using ouroboros-consensus. With the right interpreter, the
@@ -155,8 +152,8 @@ endTimeOfEpoch :: EpochNo -> Qry UTCTime
 endTimeOfEpoch epoch = do
     ref <- firstSlotInEpoch epoch
     refTime <- startTime ref
-    el <- HardForkQry $ HF.QEpochSize $ toCardanoEpochNo epoch
-    sl <- HardForkQry $ HF.QSlotLength ref
+    el <- HardForkQry $ HF.qryFromExpr $ HF.EEpochSize $ HF.ELit $ toCardanoEpochNo epoch
+    sl <- HardForkQry $ HF.qryFromExpr $ HF.ESlotLength $ HF.ELit ref
 
     let convert = fromRational . toRational
     let el' = convert $ Cardano.unEpochSize el
@@ -314,14 +311,6 @@ instance Monad Qry where
   return = pure
   (>>=)  = QBind
 
-instance Buildable (Qry a) where
-    build = \case
-        HardForkQry qry -> build qry
-        RelToUTCTime t -> "RelToUTCTime "+||t||+""
-        UTCTimeToRel t -> "UTCTimeToRel "+||t||+""
-        QPure _ -> "qPure"
-        QBind q _ -> "qBind " <> build q
-
 runQuery
     :: HasCallStack
     => SystemStart

diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs
@@ -626,7 +626,7 @@ fromPoolDistr
     :: SL.PoolDistr crypto
     -> Map W.PoolId Percentage
 fromPoolDistr =
-    Map.map (unsafeMkPercentage . fst)
+    Map.map (unsafeMkPercentage . SL.individualPoolStake)
     . Map.mapKeys fromPoolId
     . SL.unPoolDistr
 

diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs
@@ -147,7 +147,7 @@ import Data.Word
 import Fmt
     ( Buildable (..), listF', mapF, pretty )
 import GHC.Stack
-    ( HasCallStack, prettyCallStack )
+    ( HasCallStack )
 import Network.Mux
     ( MuxError (..), MuxErrorType (..), WithMuxBearer (..) )
 import Ouroboros.Consensus.Cardano
@@ -165,9 +165,9 @@ import Ouroboros.Consensus.HardFork.Combinator
 import Ouroboros.Consensus.HardFork.Combinator.AcrossEras
     ( MismatchEraInfo )
 import Ouroboros.Consensus.HardFork.History.Qry
-    ( Interpreter )
+    ( Interpreter, PastHorizonException (..) )
 import Ouroboros.Consensus.HardFork.History.Summary
-    ( Bound (..), PastHorizonException (..) )
+    ( Bound (..) )
 import Ouroboros.Consensus.Network.NodeToClient
     ( ClientCodecs, Codecs' (..), DefaultCodecs, clientCodecs, defaultCodecs )
 import Ouroboros.Consensus.Node.NetworkProtocolVersion
@@ -490,7 +490,7 @@ withNetworkLayer tr np addrInfo versionData action = do
         case mkTimeInterpreter getGenesisBlockDate interpreter query of
             Right r -> pure r
             Left e -> do
-                liftIO $ traceWith tr $ MsgInterpreterPastHorizon (pretty query) e
+                liftIO $ traceWith tr $ MsgInterpreterPastHorizon e
                 throwIO e
 
 type instance GetStakeDistribution (IO Shelley) m =
@@ -953,7 +953,7 @@ data NetworkLayerLog sc where
     MsgWatcherUpdate :: W.BlockHeader -> BracketLog -> NetworkLayerLog sc
     MsgChainSyncCmd :: (ChainSyncLog Text Text) -> NetworkLayerLog sc
     MsgInterpreter :: CardanoInterpreter sc -> NetworkLayerLog sc
-    MsgInterpreterPastHorizon :: Text -> PastHorizonException -> NetworkLayerLog sc
+    MsgInterpreterPastHorizon :: PastHorizonException -> NetworkLayerLog sc
     MsgQueryTime :: String -> NominalDiffTime -> NetworkLayerLog sc
 
 data QueryClientName
@@ -1048,12 +1048,8 @@ instance TPraosCrypto sc => ToText (NetworkLayerLog sc) where
         MsgChainSyncCmd a -> toText a
         MsgInterpreter interpreter ->
             "Updated the history interpreter: " <> T.pack (show interpreter)
-        MsgInterpreterPastHorizon query (PastHorizon callstack eras) ->
-            "Time interpreter queried past the horizon. " <>
-            "Query is:\n" <> query <> "\n" <>
-            "Eras are:\n" <>
-            T.unlines (map (T.pack . show) eras) <> "\n" <>
-            T.pack (prettyCallStack callstack)
+        MsgInterpreterPastHorizon e ->
+            "Time interpreter queried past the horizon: " <> T.pack (show e)
 
 instance HasPrivacyAnnotation (NetworkLayerLog b)
 instance HasSeverityAnnotation (NetworkLayerLog b) where

diff --git a/nix/.stack.nix/Win32-network.nix b/nix/.stack.nix/Win32-network.nix
diff --git a/nix/.stack.nix/byron-spec-chain.nix b/nix/.stack.nix/byron-spec-chain.nix
diff --git a/nix/.stack.nix/byron-spec-ledger.nix b/nix/.stack.nix/byron-spec-ledger.nix
diff --git a/nix/.stack.nix/cardano-api.nix b/nix/.stack.nix/cardano-api.nix
diff --git a/nix/.stack.nix/cardano-binary-test.nix b/nix/.stack.nix/cardano-binary-test.nix
diff --git a/nix/.stack.nix/cardano-binary.nix b/nix/.stack.nix/cardano-binary.nix