Merge pull request #24 from input-output-hk/dcoutts/update-deps

Update dependencies

Author: erikd

cabal.project

@@ -53,14 +53,14 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: 3893f21db1665e7bab9e8c6504c547fc7c28f98c
-  --sha256: 09qqcjzmjsa3r7f1yiwk4bn8bpv7nvqf7hfyg784shasspwfq8n4
+  tag: fe76ec64f6b45259cc407a6d840dad79ee6063b6
+  --sha256: 1w39806djx7vmps47vvc72i20w4dkam3l8687kkw5ih1isvl671x
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: 3893f21db1665e7bab9e8c6504c547fc7c28f98c
-  --sha256: 09qqcjzmjsa3r7f1yiwk4bn8bpv7nvqf7hfyg784shasspwfq8n4
+  tag: fe76ec64f6b45259cc407a6d840dad79ee6063b6
+  --sha256: 1w39806djx7vmps47vvc72i20w4dkam3l8687kkw5ih1isvl671x
   subdir: test
 
 source-repository-package
@@ -72,50 +72,50 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 25628ac03d574f3889771b44af07521c88dd8bf9
-  --sha256: 0fy8v5pjpc9phljcxz702n2qn020cgvms3hfzafrq21ng9fcqrij
+  tag: 3e45d5dd4942c295f0ea4bfed7c407b914b15447
+  --sha256: 0vik0qqw0p5xdrl2r84fz8jhmlzcx0b3cxpvb434ldb8xnlx8q8i
   subdir: contra-tracer
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 25628ac03d574f3889771b44af07521c88dd8bf9
-  --sha256: 0fy8v5pjpc9phljcxz702n2qn020cgvms3hfzafrq21ng9fcqrij
+  tag: 3e45d5dd4942c295f0ea4bfed7c407b914b15447
+  --sha256: 0vik0qqw0p5xdrl2r84fz8jhmlzcx0b3cxpvb434ldb8xnlx8q8i
   subdir: iohk-monitoring
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 25628ac03d574f3889771b44af07521c88dd8bf9
-  --sha256: 0fy8v5pjpc9phljcxz702n2qn020cgvms3hfzafrq21ng9fcqrij
+  tag: 3e45d5dd4942c295f0ea4bfed7c407b914b15447
+  --sha256: 0vik0qqw0p5xdrl2r84fz8jhmlzcx0b3cxpvb434ldb8xnlx8q8i
   subdir: plugins/backend-aggregation
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 25628ac03d574f3889771b44af07521c88dd8bf9
-  --sha256: 0fy8v5pjpc9phljcxz702n2qn020cgvms3hfzafrq21ng9fcqrij
+  tag: 3e45d5dd4942c295f0ea4bfed7c407b914b15447
+  --sha256: 0vik0qqw0p5xdrl2r84fz8jhmlzcx0b3cxpvb434ldb8xnlx8q8i
   subdir: plugins/backend-ekg
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 25628ac03d574f3889771b44af07521c88dd8bf9
-  --sha256: 0fy8v5pjpc9phljcxz702n2qn020cgvms3hfzafrq21ng9fcqrij
+  tag: 3e45d5dd4942c295f0ea4bfed7c407b914b15447
+  --sha256: 0vik0qqw0p5xdrl2r84fz8jhmlzcx0b3cxpvb434ldb8xnlx8q8i
   subdir: plugins/backend-monitoring
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 25628ac03d574f3889771b44af07521c88dd8bf9
-  --sha256: 0fy8v5pjpc9phljcxz702n2qn020cgvms3hfzafrq21ng9fcqrij
+  tag: 3e45d5dd4942c295f0ea4bfed7c407b914b15447
+  --sha256: 0vik0qqw0p5xdrl2r84fz8jhmlzcx0b3cxpvb434ldb8xnlx8q8i
   subdir: plugins/scribe-systemd
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 25628ac03d574f3889771b44af07521c88dd8bf9
-  --sha256: 0fy8v5pjpc9phljcxz702n2qn020cgvms3hfzafrq21ng9fcqrij
+  tag: 3e45d5dd4942c295f0ea4bfed7c407b914b15447
+  --sha256: 0vik0qqw0p5xdrl2r84fz8jhmlzcx0b3cxpvb434ldb8xnlx8q8i
   subdir: tracer-transformers
 
 source-repository-package
@@ -155,153 +155,153 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 9dd7a20af22b8e8837aa1525d827da5c986d6136
-  --sha256: 1qrbzgbyz16jsf6d7bm3nvhrx6w6xgvdws724c9p2sk7asavxcv3
+  tag: 647cd71e3c4630488e71596f5e9c26fee598b541
+  --sha256: 08vkca171019z7xql2z7lg9piz6bgy5nn7h0ja6ab0s4ngf83gii
   subdir: byron/semantics/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 9dd7a20af22b8e8837aa1525d827da5c986d6136
-  --sha256: 1qrbzgbyz16jsf6d7bm3nvhrx6w6xgvdws724c9p2sk7asavxcv3
+  tag: 647cd71e3c4630488e71596f5e9c26fee598b541
+  --sha256: 08vkca171019z7xql2z7lg9piz6bgy5nn7h0ja6ab0s4ngf83gii
   subdir: byron/ledger/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 9dd7a20af22b8e8837aa1525d827da5c986d6136
-  --sha256: 1qrbzgbyz16jsf6d7bm3nvhrx6w6xgvdws724c9p2sk7asavxcv3
+  tag: 647cd71e3c4630488e71596f5e9c26fee598b541
+  --sha256: 08vkca171019z7xql2z7lg9piz6bgy5nn7h0ja6ab0s4ngf83gii
   subdir: byron/chain/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: b39e54d109c9f66883418cd7aaf989a7ca565daf
-  --sha256: 1a4syf6zac07r3n4vblp0w0dcy8ykscn2x3qsj8svdv75s6b5xk8
+  tag: 1368966fd6d806d8eb65cd1ba193548c402355f6
+  --sha256: 0mrgby1sw2yawfhkj20zg8wl7k3v9jkcv43prfxxlakikpdkjzhp
   subdir: cardano-ledger
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: b39e54d109c9f66883418cd7aaf989a7ca565daf
-  --sha256: 1a4syf6zac07r3n4vblp0w0dcy8ykscn2x3qsj8svdv75s6b5xk8
+  tag: 1368966fd6d806d8eb65cd1ba193548c402355f6
+  --sha256: 0mrgby1sw2yawfhkj20zg8wl7k3v9jkcv43prfxxlakikpdkjzhp
   subdir: cardano-ledger/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: b39e54d109c9f66883418cd7aaf989a7ca565daf
-  --sha256: 1a4syf6zac07r3n4vblp0w0dcy8ykscn2x3qsj8svdv75s6b5xk8
+  tag: 1368966fd6d806d8eb65cd1ba193548c402355f6
+  --sha256: 0mrgby1sw2yawfhkj20zg8wl7k3v9jkcv43prfxxlakikpdkjzhp
   subdir: crypto
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: b39e54d109c9f66883418cd7aaf989a7ca565daf
-  --sha256: 1a4syf6zac07r3n4vblp0w0dcy8ykscn2x3qsj8svdv75s6b5xk8
+  tag: 1368966fd6d806d8eb65cd1ba193548c402355f6
+  --sha256: 0mrgby1sw2yawfhkj20zg8wl7k3v9jkcv43prfxxlakikpdkjzhp
   subdir: crypto/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: io-sim
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: io-sim-classes
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: network-mux
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: ouroboros-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: ouroboros-network-framework
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: ouroboros-network-testing
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: ouroboros-consensus
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: ouroboros-consensus/ouroboros-consensus-mock
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: ouroboros-consensus/ouroboros-consensus-test-infra
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: ouroboros-consensus-byron
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: ouroboros-consensus-byronspec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: ouroboros-consensus-cardano
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: typed-protocols
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 6e0651d812ea02718e2896bef30c931b1bb1e0b9
-  --sha256: 1bdii2576wvf2z0vv7sc0skyajyfxm5hzpnrjmcxbd1r2lglbp9j
+  tag: a85bd4751ca5c81c0507482848358980814e9ca3
+  --sha256: 1fhv6p1rkim6acp5m7gfkzmv9hxmpmg07qc4k03y0sxm1zgwbcjk
   subdir: typed-protocols-examples
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: df71c429494bb0aa330f720250bc5a12b2579a48
-  --sha256: 10gisf22r7xg80pamcp6dwylripy48jds07n11530ym0kjqj8hwj
+  tag: 64c2778c61245dcda13eaf16a2e0738dfacb7a16
+  --sha256: 1aybhbip4j9275npvrk4w0bch5bl7fbq8faj1qj8h51f1g0ja74l
   subdir: cardano-config

cardano-db-sync/src/Cardano/DbSync.hs

@@ -225,7 +225,7 @@ runDbSyncNodeNodeClient iocp trce plugin nodeConfig (SocketPath socketPath) = do
     (NodeToClientVersionData { networkMagic = nodeNetworkMagic (Proxy @blk) nodeConfig })
     (localInitiatorNetworkApplication trce plugin nodeConfig txv)
   where
-    errorPolicyTracer :: Tracer IO (WithAddr SockAddr ErrorPolicyTrace)
+    errorPolicyTracer :: Tracer IO (WithAddr LocalAddress ErrorPolicyTrace)
     errorPolicyTracer = toLogObject $ appendName "ErrorPolicy" trce
     muxTracer :: Show peer => Tracer IO (WithMuxBearer peer MuxTrace)
     muxTracer = toLogObject $ appendName "Mux" trce

cardano-db-sync/src/Cardano/DbSync/Tracing/ToObjectOrphans.hs

@@ -6,8 +6,6 @@
 
 module Cardano.DbSync.Tracing.ToObjectOrphans () where
 
-import qualified Codec.CBOR.Term as CBOR
-
 import           Data.Text (Text, pack)
 import           Data.Aeson ((.=))
 import           Data.Functor.Identity (Identity (..))
@@ -20,13 +18,10 @@ import           Cardano.Tracing.ToObjectOrphans ()
 
 import           Control.Monad.IO.Class (MonadIO)
 
-
-import           Network.Mux (WithMuxBearer (..))
-
 import           Ouroboros.Consensus.Byron.Ledger (ByronBlock (..))
 import           Ouroboros.Network.Block (Tip)
-import           Ouroboros.Network.NodeToClient (ConnectionId, Handshake, LocalAddress,
-                    NodeToClientVersion, TraceSendRecv)
+import           Ouroboros.Network.Codec (AnyMessage)
+import           Ouroboros.Network.NodeToClient (LocalAddress, TraceSendRecv)
 import           Ouroboros.Network.Protocol.ChainSync.Type (ChainSync)
 import           Ouroboros.Network.Subscription (SubscriptionTrace (..))
 
@@ -80,38 +75,14 @@ instance ToObject (Identity (SubscriptionTrace LocalAddress)) where
              , "event" .= show ev
              ]
 
-instance DefinePrivacyAnnotation (WithMuxBearer
-                             (ConnectionId LocalAddress)
-                             (TraceSendRecv (Handshake NodeToClientVersion CBOR.Term)))
-
-instance DefineSeverity (WithMuxBearer
-                             (ConnectionId LocalAddress)
-                             (TraceSendRecv (Handshake NodeToClientVersion CBOR.Term)))
-
-instance Transformable Text IO (WithMuxBearer
-                             (ConnectionId LocalAddress)
-                             (TraceSendRecv (Handshake NodeToClientVersion CBOR.Term))) where
-  trTransformer = defaultTextTransformer
-
-
 instance Transformable Text IO (TraceSendRecv (ChainSync ByronBlock (Tip ByronBlock))) where
   trTransformer = defaultTextTransformer
 
-
 instance DefinePrivacyAnnotation (TraceSendRecv (ChainSync ByronBlock (Tip ByronBlock)))
 
 instance DefineSeverity (TraceSendRecv (ChainSync ByronBlock (Tip ByronBlock)))
 
-instance ToObject (WithMuxBearer
-                             (ConnectionId LocalAddress)
-                             (TraceSendRecv (Handshake NodeToClientVersion CBOR.Term))) where
-  toObject _verb (WithMuxBearer b ev) =
-    mkObject [ "kind" .= ("MuxTrace" :: String)
-             , "bearer" .= show b
-             , "event" .= show ev
-             ]
-
-instance ToObject (TraceSendRecv (ChainSync ByronBlock (Tip ByronBlock))) where
+instance ToObject (AnyMessage (ChainSync ByronBlock (Tip ByronBlock))) where
   toObject _verb msg =
     mkObject [ "kind" .= ("TraceSendRecv" :: String)
              , "event" .= show msg