Upgrade dependencies (does not compile)

IntersectMBO · Dec 10, 2024 · 72b5b85 · 72b5b85
1 parent a001c63
commit 72b5b85
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/cabal.project b/cabal.project
@@ -14,9 +14,9 @@ repository cardano-haskell-packages
 -- update either of these.
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2024-10-22T14:26:27Z
+  , hackage.haskell.org 2024-12-10T00:00:00Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2024-10-30T11:23:17Z
+  , cardano-haskell-packages 2024-11-27T20:49:28Z
 
 packages:
   ouroboros-consensus
@@ -55,8 +55,8 @@ allow-newer: plutus-core:cardano-crypto-class
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 890eec1bbb17068ee7df84c468e1c6bc39643d3a
-  --sha256: 0944wg2nqazmhlmsynwgdwxxj6ay0hb9qig9l128isb2cjia0hlp
+  tag: 391a2c5cfd30d2234097e000dbd8d9db21ef94d7
+  --sha256: sha256-cw1BmYagp37B1n4PVWJF4AJ8nc/MYjSRlTLEWwL+EEk=
   subdir:
     -- cardano-binary
     cardano-crypto-class
@@ -71,8 +71,8 @@ source-repository-package
   -- !WARNING!:
   -- MAKE SURE THIS POINTS TO A COMMIT IN `MAlonzo-code` BEFORE MERGE!
   subdir: generated
-  tag: 544ab20985e3374a1d672354e25d8ca0ca89e7e4
-  --sha256: sha256-bhh09OZkHazXCPjsiU/50Hrmfg52i+6UORTZ6/bAx6c=
+  tag: cc93692f5a57a9a66956b232662152676f659954
+  --sha256: sha256-s9ikqfXmz1wBrk4qEFR/iOloKvMOPGTB5IpHO34NSLE=
 -- NOTE: If you would like to update the above, look for the `MAlonzo-code`
 -- branch in the `formal-ledger-specifications` repo and copy the SHA of
 -- the commit you need. The `MAlonzo-code` branch functions like an alternative
@@ -92,7 +92,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: ebba3fb4554a04ddaa4734f9083afebd64c81099
+  tag: a549a45ef73ad9d71903ad1816f2b53360ab310d
   --sha256: 0944wg2nqazmhlmsynwgdwxxj6ay0hb9qig9l128isb2cjia0hlp
   subdir:
       eras/allegra/impl

diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal
@@ -135,17 +135,17 @@ library
     cardano-crypto-class,
     cardano-crypto-wrapper,
     cardano-ledger-allegra ^>=1.6,
-    cardano-ledger-alonzo ^>=1.11,
-    cardano-ledger-api ^>=1.9.3,
+    cardano-ledger-alonzo ^>=1.12,
+    cardano-ledger-api ^>=1.10,
     cardano-ledger-babbage ^>=1.10,
-    cardano-ledger-binary ^>=1.4,
+    cardano-ledger-binary ^>=1.5,
     cardano-ledger-byron ^>=1.0.1,
-    cardano-ledger-conway ^>=1.17.2,
-    cardano-ledger-core ^>=1.15,
+    cardano-ledger-conway ^>=1.18,
+    cardano-ledger-core ^>=1.16,
     cardano-ledger-mary ^>=1.7,
-    cardano-ledger-shelley ^>=1.14,
+    cardano-ledger-shelley ^>=1.15,
     cardano-prelude,
-    cardano-protocol-tpraos ^>=1.2,
+    cardano-protocol-tpraos ^>=1.3,
     cardano-slotting,
     cardano-strict-containers,
     cborg ^>=0.2.2,
@@ -535,7 +535,7 @@ library unstable-cardano-tools
     cardano-ledger-mary,
     cardano-ledger-shelley,
     cardano-prelude,
-    cardano-protocol-tpraos ^>=1.2,
+    cardano-protocol-tpraos ^>=1.3,
     cardano-slotting,
     cardano-strict-containers,
     cborg ^>=0.2.2,

diff --git a/...us-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos/Common.hs b/...us-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos/Common.hs
@@ -261,11 +261,11 @@ data PraosCanBeLeader c = PraosCanBeLeader
   deriving (Generic)
 
 data PraosCredentialsSource c
-  = PraosCredentialsUnsound (OCert.OCert c) (SL.UnsoundPureSignKeyKES c)
+  = PraosCredentialsUnsound (OCert.OCert c) (KES.UnsoundPureSignKeyKES (KES c))
   deriving (Generic)
 
-instance (NoThunks (SL.UnsoundPureSignKeyKES c), Crypto c) => NoThunks (PraosCredentialsSource c)
-instance (NoThunks (SL.UnsoundPureSignKeyKES c), Crypto c) => NoThunks (PraosCanBeLeader c)
+instance (NoThunks (KES.UnsoundPureSignKeyKES (KES c)), Crypto c) => NoThunks (PraosCredentialsSource c)
+instance (NoThunks (KES.UnsoundPureSignKeyKES (KES c)), Crypto c) => NoThunks (PraosCanBeLeader c)
 
 instantiatePraosCredentials :: ( KES.UnsoundPureKESAlgorithm (KES c)
                                , MonadST m

diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal
@@ -278,7 +278,7 @@ library
     bytestring >=0.10 && <0.13,
     cardano-binary,
     cardano-crypto-class,
-    cardano-ledger-core ^>=1.15,
+    cardano-ledger-core ^>=1.16,
     cardano-prelude,
     cardano-slotting,
     cardano-strict-containers,