Merge pull request #5472 from IntersectMBO/td/update-cuddle

Update to cuddle 1.1

Author: lehins

cabal.project

@@ -27,8 +27,8 @@ source-repository-package
 -- NOTE: If you would like to update the above,
 -- see CONTRIBUTING.md#to-update-the-referenced-agda-ledger-spec
 index-state:
-  , hackage.haskell.org 2025-09-30T00:00:00Z
-  , cardano-haskell-packages 2025-12-01T07:41:27Z
+  , hackage.haskell.org 2025-12-11T11:28:18Z
+  , cardano-haskell-packages 2025-12-10T11:48:32Z
 
 packages:
   -- == Byron era ==

doc/flake.nix

@@ -8,7 +8,7 @@
             src = lib.sourceFilesBySuffices ./. [".py" ".rst" ".hs" ".png"];
             buildInputs = with python3Packages; [
               sphinx
-              sphinx_rtd_theme
+              sphinx-rtd-theme
               sphinx-markdown-tables
               sphinxemoji
               recommonmark

eras/allegra/impl/cardano-ledger-allegra.cabal

@@ -104,7 +104,7 @@ library cddl
     base,
     cardano-ledger-allegra,
     cardano-ledger-shelley:cddl,
-    cuddle >=0.4,
+    cuddle >=1.1,
     heredoc,
 
 executable generate-cddl

eras/allegra/impl/cddl/data/allegra.cddl

@@ -199,8 +199,8 @@ unit_interval = #6.30([1, 2])
 
 ; reward_account = bytes
 reward_account = 
-  h'E090000000000000000000000000000000000000000000000000000000'
-  / h'F0A0000000000000000000000000000000000000000000000000000000'
+  h'e090000000000000000000000000000000000000000000000000000000'
+  / h'f0a0000000000000000000000000000000000000000000000000000000'
 
 relay = [single_host_addr// single_host_name// multi_host_name]
 

eras/allegra/impl/cddl/lib/Cardano/Ledger/Allegra/HuddleSpec.hs

@@ -129,7 +129,7 @@ scriptNOfKGroup ::
   forall era.
   HuddleRule "native_script" era =>
   Proxy era ->
-  Named Group
+  GroupDef
 scriptNOfKGroup p =
   "script_n_of_k"
     =:~ grp
@@ -139,7 +139,7 @@ scriptNOfKGroup p =
       ]
 
 scriptInvalidBeforeGroup ::
-  forall era. Era era => Proxy era -> Named Group
+  forall era. Era era => Proxy era -> GroupDef
 scriptInvalidBeforeGroup p =
   comment
     [str|Timelock validity intervals are half-open intervals [a, b).
@@ -149,7 +149,7 @@ scriptInvalidBeforeGroup p =
       =:~ grp [4, a (huddleRule @"slot" p)]
 
 scriptInvalidHereafterGroup ::
-  forall era. Era era => Proxy era -> Named Group
+  forall era. Era era => Proxy era -> GroupDef
 scriptInvalidHereafterGroup p =
   comment
     [str|Timelock validity intervals are half-open intervals [a, b).

eras/alonzo/impl/cardano-ledger-alonzo.cabal

@@ -124,7 +124,7 @@ library cddl
     base,
     cardano-ledger-alonzo,
     cardano-ledger-mary:cddl,
-    cuddle >=0.4,
+    cuddle >=1.1,
     heredoc,
 
 executable generate-cddl

eras/alonzo/impl/cddl/data/alonzo.cddl

@@ -217,8 +217,8 @@ unit_interval = #6.30([1, 2])
 
 ; reward_account = bytes
 reward_account = 
-  h'E090000000000000000000000000000000000000000000000000000000'
-  / h'F0A0000000000000000000000000000000000000000000000000000000'
+  h'e090000000000000000000000000000000000000000000000000000000'
+  / h'f0a0000000000000000000000000000000000000000000000000000000'
 
 relay = [single_host_addr// single_host_name// multi_host_name]
 

eras/babbage/impl/cardano-ledger-babbage.cabal

@@ -118,7 +118,7 @@ library cddl
     base,
     cardano-ledger-alonzo:cddl,
     cardano-ledger-babbage,
-    cuddle >=0.4,
+    cuddle >=1.1,
     heredoc,
 
 executable generate-cddl

eras/babbage/impl/cddl/data/babbage.cddl

@@ -338,8 +338,8 @@ unit_interval = #6.30([1, 2])
 
 ; reward_account = bytes
 reward_account = 
-  h'E090000000000000000000000000000000000000000000000000000000'
-  / h'F0A0000000000000000000000000000000000000000000000000000000'
+  h'e090000000000000000000000000000000000000000000000000000000'
+  / h'f0a0000000000000000000000000000000000000000000000000000000'
 
 relay = [single_host_addr// single_host_name// multi_host_name]
 

eras/babbage/impl/cddl/lib/Cardano/Ledger/Babbage/HuddleSpec.hs

@@ -46,15 +46,15 @@ babbageCDDL =
     , HIRule $ huddleRule @"signkey_kes" (Proxy @BabbageEra)
     ]
 
--- | Babbage changed protocol_version from Named Group to Rule to match actual block
+-- | Babbage changed protocol_version from GroupDef to Rule to match actual block
 -- serialization. See 'header_body' instance for full explanation.
 -- Ref: PR #3762, Issue #3559
 babbageProtocolVersionRule ::
   forall era. HuddleRule "major_protocol_version" era => Proxy era -> Rule
 babbageProtocolVersionRule p =
   "protocol_version" =:= arr [a $ huddleRule @"major_protocol_version" p, a VUInt]
 
--- | Babbage changed operational_cert from Named Group to Rule to match actual block
+-- | Babbage changed operational_cert from GroupDef to Rule to match actual block
 -- serialization. See 'header_body' instance for full explanation.
 -- Ref: PR #3762, Issue #3559
 babbageOperationalCertRule :: forall era. Era era => Proxy era -> Rule
@@ -267,16 +267,16 @@ instance HuddleRule "header" BabbageEra where
         , "body_signature" ==> huddleRule @"kes_signature" p
         ]
 
--- IMPORTANT: Babbage changed operational_cert and protocol_version from Named Group
+-- IMPORTANT: Babbage changed operational_cert and protocol_version from GroupDef
 -- (grp) to Rule (arr) to match actual block serialization.
 --
 -- Semantic difference:
---   * Named Group (grp): Fields are inlined directly into parent array.
+--   * GroupDef (grp): Fields are inlined directly into parent array.
 --     -> header_body becomes a 14-element flat array
 --   * Rule (arr): Fields are nested as separate sub-arrays.
 --     -> header_body becomes a 10-element array with nested structures
 --
--- Pre-Babbage eras (Shelley through Alonzo) used Named Group, but actual Babbage+
+-- Pre-Babbage eras (Shelley through Alonzo) used GroupDef, but actual Babbage+
 -- blocks serialize with Rule (nested arrays). This change corrects the CDDL spec to
 -- match the actual CBOR serialization.
 --