Merge pull request #954 from IntersectMBO/jordan/10.6-node-release

Upgrade ledger, consensus, network, plutus for cardano-node 10.6

Author: carbolymer

.github/workflows/hls.yml

@@ -14,7 +14,7 @@ jobs:
   test-hls-works:
     env:
       # Modify this value to "invalidate" the cache.
-      HLS_CACHE_VERSION: "2025-09-04"
+      HLS_CACHE_VERSION: "2025-09-23"
 
     runs-on: ubuntu-latest
     timeout-minutes: 90

cabal.project

@@ -13,16 +13,20 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2025-09-10T10:05:13Z
-  , cardano-haskell-packages 2025-06-20T09:11:51Z
+  , hackage.haskell.org 2025-09-11T01:58:40Z
+  , cardano-haskell-packages 2025-10-21T11:16:53Z
 
 packages:
     cardano-api
     cardano-api-gen
     cardano-wasm
-    cardano-rpc
+    -- TODO fix potential issues with build-type: Custom and protoc and reenable
+    -- cardano-rpc
 
-constraints: process >= 1.6.26.1
+extra-packages: Cabal, process
+
+if impl(ghc < 9.8)
+  constraints: interpolatedstring-perl6:setup.time source
 
 -- It may slow down build plan preparation, but without it cabal has problems
 -- with solving constraints. Remove this when not needed anymore.
@@ -56,18 +60,19 @@ if impl (ghc >= 9.12)
     -- https://github.com/kapralVV/Unique/issues/11
     , Unique:hashable
 
+
 -- WASM compilation specific
 
 if arch(wasm32)
   source-repository-package
     type: git
-    location: https://github.com/amesgen/plutus.git
-    tag: dc1edea4458d6fb794b245a26c730620265645f3
+    location: https://github.com/intersectmbo/plutus.git
+    tag: 5f3517c6937a24dc4d852cda079b2c3cdcaa5ef0
     subdir:
       plutus-core
       plutus-ledger-api
       plutus-tx
-    --sha256: sha256-QBtLmoS54b5QMAKIDOJIM6lmRC+1leBpuGKaFc7QQos=
+    --sha256: sha256-+GhWhzGQ94KfxHKS6Bycfxf+TWVkMyWDY/51EFipkZI=
 
   package plutus-core
     flags: +do-not-build-plutus-exec
@@ -81,11 +86,11 @@ if arch(wasm32)
   source-repository-package
     type: git
     location: https://github.com/palas/ouroboros-network.git
-    tag: ef3e30603e4e45dac336a085114ee22b7aa8c9ed
+    tag: 2fddbdb8ed23b63a43852bb98bd6ddc1a6d96d98
     subdir:
       ouroboros-network
       ouroboros-network-framework
-    --sha256: sha256-+IdAmWJqzRy+erKONywtk+5YLrm63q942nZavoEA4E4=
+    --sha256: sha256-OAPsul8TaOpNwd2BlTE0jwqWiRk83rNVSxtIA5Se9Kg=
 
   source-repository-package
     type: git
@@ -135,6 +140,22 @@ if arch(wasm32)
     tag: ab92e48e9fdf3abe214f85fdbe5301c1280e14e9
     --sha256: sha256-U+ln/gbXoQZpNjZHydNa0FG/9GdJFgL1+T3+7KTzDWo=
 
+  source-repository-package
+    type: git
+    location: https://github.com/palas/kes-agent
+    tag: a234ca2beede6fb557dfb4ce829b52874cc94613
+    --sha256: sha256-k6PJC2uYr4VP+erPrVCFHMAbJaGMqESRowSvoB/w0ss=
+    subdir:
+      kes-agent
+
+  source-repository-package
+    type: git
+    location: https://github.com/palas/fs-sim
+    tag: c39efe618cf63df909e8e0acab31684b10223550
+    --sha256: sha256-zHJfVFEzdeq9WhInEIRCJ1OQTYM06k++9gzfUaG//S8=
+    subdir:
+      fs-sim
+
   package cardano-crypto-praos
     flags: -external-libsodium-vrf
 
@@ -154,5 +175,4 @@ if arch(wasm32)
 
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
--- temporary! Please read the section in CONTRIBUTING about updating dependencies.
-
+-- temporary! Please read the section in CONTRIBUTING about updating dependencies.

cardano-api/cardano-api.cabal

@@ -129,9 +129,10 @@ library
     cardano-ledger-api >=1.11,
     cardano-ledger-babbage >=1.11,
     cardano-ledger-binary >=1.6,
-    cardano-ledger-byron >=1.1,
+    cardano-ledger-byron >=1.2,
     cardano-ledger-conway >=1.19,
-    cardano-ledger-core >=1.17,
+    cardano-ledger-core >=1.17 && <1.19,
+    cardano-ledger-dijkstra >=0.1,
     cardano-ledger-mary >=1.8,
     cardano-ledger-shelley >=1.16,
     cardano-protocol-tpraos >=1.4,
@@ -153,24 +154,23 @@ library
     iproute,
     memory,
     microlens,
-    microlens-aeson,
     mono-traversable,
     mtl,
     network,
     network-mux,
     nothunks,
     ordered-containers,
-    ouroboros-consensus ^>=0.27,
-    ouroboros-consensus-cardano ^>=0.25.1,
-    ouroboros-consensus-diffusion ^>=0.23,
-    ouroboros-consensus-protocol ^>=0.12,
+    ouroboros-consensus ^>=0.28,
+    ouroboros-consensus-cardano ^>=0.26,
+    ouroboros-consensus-diffusion ^>=0.24,
+    ouroboros-consensus-protocol ^>=0.13,
     ouroboros-network,
-    ouroboros-network-api >=0.14,
+    ouroboros-network-api >=0.15,
     ouroboros-network-framework,
-    ouroboros-network-protocols >=0.14,
+    ouroboros-network-protocols >=0.15,
     parsec,
-    plutus-core,
-    plutus-ledger-api ^>=1.45,
+    plutus-core ^>=1.53,
+    plutus-ledger-api ^>=1.53,
     pretty-simple,
     prettyprinter,
     prettyprinter-ansi-terminal,
@@ -188,7 +188,7 @@ library
     time,
     transformers,
     transformers-except ^>=0.1.3,
-    typed-protocols ^>=0.3,
+    typed-protocols ^>=1.0,
     validation,
     vector,
     yaml,
@@ -311,19 +311,21 @@ library gen
 
   build-depends:
     FailT,
-    QuickCheck,
+    QuickCheck <2.16,
     aeson >=1.5.6.0,
     base16-bytestring,
     bytestring,
     cardano-api,
     cardano-binary >=1.6 && <1.8,
     cardano-crypto-class ^>=2.2.1,
     cardano-crypto-test ^>=1.6,
+    cardano-crypto-wrapper,
     cardano-ledger-alonzo >=1.8.1,
     cardano-ledger-babbage,
-    cardano-ledger-byron-test >=1.5,
+    cardano-ledger-byron,
     cardano-ledger-conway,
     cardano-ledger-core >=1.14,
+    cardano-ledger-dijkstra >=0.1,
     cardano-ledger-mary,
     cardano-ledger-shelley >=1.13,
     cardano-strict-containers,
@@ -345,9 +347,12 @@ test-suite cardano-api-test
   hs-source-dirs: test/cardano-api-test
   main-is: cardano-api-test.hs
   type: exitcode-stdio-1.0
+
+  if arch(wasm32)
+    buildable: False
   build-depends:
     FailT,
-    QuickCheck,
+    QuickCheck <2.16,
     aeson >=1.5.6.0,
     base16-bytestring,
     bytestring,
@@ -359,11 +364,12 @@ test-suite cardano-api-test
     cardano-crypto-tests ^>=2.2,
     cardano-crypto-wrapper,
     cardano-ledger-alonzo,
-    cardano-ledger-api >=1.9,
+    cardano-ledger-api >=1.11,
     cardano-ledger-binary,
     cardano-ledger-conway,
     cardano-ledger-core >=1.14,
     cardano-ledger-mary,
+    cardano-ledger-shelley,
     cardano-protocol-tpraos,
     cardano-slotting,
     cborg,
@@ -373,13 +379,11 @@ test-suite cardano-api-test
     hedgehog >=1.1,
     hedgehog-extras,
     hedgehog-quickcheck,
-    interpolatedstring-perl6,
     microlens,
     mtl,
     ouroboros-consensus,
-    ouroboros-consensus-cardano,
     ouroboros-consensus-protocol,
-    plutus-ledger-api,
+    raw-strings-qq,
     tasty,
     tasty-hedgehog,
     tasty-quickcheck,
@@ -421,6 +425,9 @@ test-suite cardano-api-golden
   hs-source-dirs: test/cardano-api-golden
   main-is: cardano-api-golden.hs
   type: exitcode-stdio-1.0
+
+  if arch(wasm32)
+    buildable: False
   build-depends:
     aeson,
     base64-bytestring,
@@ -432,7 +439,7 @@ test-suite cardano-api-golden
     cardano-crypto-class ^>=2.2.1,
     cardano-data >=1.0,
     cardano-ledger-alonzo,
-    cardano-ledger-api >=1.9,
+    cardano-ledger-api >=1.11,
     cardano-ledger-binary,
     cardano-ledger-core >=1.14,
     cardano-ledger-shelley,
@@ -443,8 +450,8 @@ test-suite cardano-api-golden
     hedgehog >=1.1,
     hedgehog-extras ^>=0.10,
     microlens,
-    plutus-core ^>=1.45,
-    plutus-ledger-api,
+    plutus-core ^>=1.53,
+    plutus-ledger-api ^>=1.53,
     tasty,
     tasty-discover,
     tasty-hedgehog,

cardano-api/gen/Test/Gen/Cardano/Api/Era.hs

@@ -36,6 +36,7 @@ shelleyBasedEraTestConstraints = \case
   ShelleyBasedEraAlonzo -> id
   ShelleyBasedEraBabbage -> id
   ShelleyBasedEraConway -> id
+  ShelleyBasedEraDijkstra -> id
 
 conwayEraOnwardsTestConstraints
   :: ()
@@ -48,3 +49,4 @@ conwayEraOnwardsTestConstraints
   -> a
 conwayEraOnwardsTestConstraints = \case
   ConwayEraOnwardsConway -> id
+  ConwayEraOnwardsDijkstra -> id

cardano-api/gen/Test/Gen/Cardano/Api/Orphans.hs

@@ -24,16 +24,19 @@ import Cardano.Ledger.Address ()
 import Cardano.Ledger.Alonzo.PParams qualified as Ledger
 import Cardano.Ledger.Alonzo.Scripts qualified as Alonzo
 import Cardano.Ledger.Babbage.PParams qualified as Ledger
-import Cardano.Ledger.BaseTypes (textToDns, textToUrl)
+import Cardano.Ledger.BaseTypes
 import Cardano.Ledger.BaseTypes qualified as Ledger
 import Cardano.Ledger.Coin qualified as L
 import Cardano.Ledger.Conway.Governance qualified as Ledger
 import Cardano.Ledger.Conway.PParams qualified as Ledger
 import Cardano.Ledger.Core qualified as Ledger
+import Cardano.Ledger.Dijkstra (DijkstraEra)
+import Cardano.Ledger.Dijkstra.PParams
 import Cardano.Ledger.HKD (HKD, NoUpdate (..))
 import Cardano.Ledger.Keys (VRFVerKeyHash (..))
 import Cardano.Ledger.Mary.Value qualified as ConcreteValue
 import Cardano.Ledger.Mary.Value qualified as Ledger
+import Cardano.Ledger.Plutus.CostModels qualified as L
 import Cardano.Ledger.Plutus.CostModels qualified as Ledger
 import Cardano.Ledger.Plutus.Language qualified as L
 import Cardano.Ledger.Plutus.Language qualified as Ledger
@@ -79,6 +82,7 @@ import Test.QuickCheck
   , scale
   , shrinkBoundedEnum
   , sublistOf
+  , suchThatMap
   , vectorOf
   )
 import Test.QuickCheck.Gen (Gen (MkGen))
@@ -392,7 +396,7 @@ multiAssetFromListBounded =
 instance Arbitrary L.GovActionId where
   arbitrary = L.GovActionId <$> arbitrary <*> arbitrary
 
-deriving instance Arbitrary (L.GovPurposeId p era)
+deriving instance Arbitrary (L.GovPurposeId p)
 
 instance Arbitrary L.DRep where
   arbitrary =
@@ -736,7 +740,7 @@ instance Arbitrary Alonzo.CostModels where
 
 genValidCostModel :: Ledger.Language -> Gen Ledger.CostModel
 genValidCostModel lang = do
-  newParamValues <- vectorOf (Ledger.costModelParamsCount lang) arbitrary
+  newParamValues <- vectorOf (L.costModelInitParamCount lang) arbitrary
   either (\err -> error $ "Corrupt cost model: " ++ show err) pure $
     Ledger.mkCostModel lang newParamValues
 
@@ -772,12 +776,12 @@ genCostModelValues lang = do
   Positive sub <- arbitrary
   (,) lang'
     <$> oneof
-      [ listAtLeast (Ledger.costModelParamsCount lang)
+      [ listAtLeast (L.costModelInitParamCount lang)
       , take (tooFew sub) <$> arbitrary
       ]
  where
   lang' = fromIntegral (fromEnum lang)
-  tooFew sub = Ledger.costModelParamsCount lang - sub
+  tooFew sub = L.costModelInitParamCount lang - sub
   listAtLeast :: Int -> Gen [Int64]
   listAtLeast x = do
     NonNegative y <- arbitrary
@@ -805,3 +809,25 @@ obtainArbitraryConstraints era f = case era of
   ShelleyBasedEraAlonzo -> f
   ShelleyBasedEraBabbage -> f
   ShelleyBasedEraConway -> f
+  ShelleyBasedEraDijkstra -> f
+
+instance Arbitrary (DijkstraPParams Identity DijkstraEra) where
+  arbitrary = genericArbitraryU
+
+instance Arbitrary (DijkstraPParams StrictMaybe DijkstraEra) where
+  arbitrary = genericArbitraryU
+
+instance Arbitrary PositiveInterval where
+  arbitrary = do
+    p <- chooseInt (0, maxDecimalsWord64)
+    let y = 10 ^ p :: Word64
+    x <- choose (1, 10 ^ (maxDecimalsWord64 :: Int))
+    pure $ unsafeBoundedRational $ promoteRatio (x % y)
+
+instance (Arbitrary a, HasZero a) => Arbitrary (NonZero a) where
+  arbitrary = arbitrary `suchThatMap` nonZero
+
+instance Arbitrary (L.CompactForm Coin) where
+  arbitrary =
+    L.CompactCoin <$> oneof [choose (0, 1000000), fromIntegral <$> (arbitrary :: Gen Word), arbitrary]
+  shrink (L.CompactCoin i) = L.CompactCoin <$> shrink i