Merge pull request #5217 from IntersectMBO/aniketd/oset-cddl

Conway/Dijkstra CDDL: OSet for certs and proposals

Author: aniketd

eras/conway/impl/cddl-files/conway.cddl

@@ -337,9 +337,9 @@ plutus_v2_script = distinct_VBytes
 
 plutus_v3_script = distinct_VBytes
 
-certificates = nonempty_set<certificate>
+certificates = nonempty_oset<certificate>
 
-nonempty_set<a0> = #6.258([+ a0])/ [+ a0]
+nonempty_oset<a0> = #6.258([+ a0])/ [+ a0]
 
 stake_credential = credential
 
@@ -501,6 +501,8 @@ posInt64 = 1 .. 9223372036854775807
 ; representation for empty redeemers.
 script_data_hash = hash32
 
+nonempty_set<a0> = #6.258([+ a0])/ [+ a0]
+
 required_signers = nonempty_set<addr_keyhash>
 
 network_id = 0/ 1
@@ -528,7 +530,7 @@ voting_procedure = [vote, anchor/ nil]
 
 vote = 0 .. 2
 
-proposal_procedures = nonempty_set<proposal_procedure>
+proposal_procedures = nonempty_oset<proposal_procedure>
 
 proposal_procedure = [deposit : coin, reward_account, gov_action, anchor]
 

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/CDDL.hs

@@ -17,6 +17,7 @@ import Cardano.Ledger.Conway (ConwayEra)
 import Codec.CBOR.Cuddle.Comments ((//-))
 import Codec.CBOR.Cuddle.Huddle
 import Data.Function (($))
+import Data.Text (Text)
 import Data.Word (Word64)
 import GHC.Num (Integer)
 import Test.Cardano.Ledger.Babbage.CDDL hiding (
@@ -201,10 +202,10 @@ proposal_procedure =
       ]
 
 proposal_procedures :: Rule
-proposal_procedures = "proposal_procedures" =:= nonempty_set proposal_procedure
+proposal_procedures = "proposal_procedures" =:= nonempty_oset proposal_procedure
 
 certificates :: Rule
-certificates = "certificates" =:= nonempty_set certificate
+certificates = "certificates" =:= nonempty_oset certificate
 
 gov_action :: Rule
 gov_action =
@@ -842,14 +843,22 @@ conway_script =
 -- tooling to account for this future breaking change sooner rather than
 -- later, in order to provide a smooth transition for their users.
 set :: IsType0 t0 => t0 -> GRuleCall
-set = binding $ \x -> "set" =:= tag 258 (arr [0 <+ a x]) / sarr [0 <+ a x]
+set = set_len_spec "set" 0
 
 -- | Conway era introduces an optional 258 tag for sets, which will
 -- become mandatory in the second era after Conway. We recommend all the
 -- tooling to account for this future breaking change sooner rather than
 -- later, in order to provide a smooth transition for their users.
 nonempty_set :: IsType0 t0 => t0 -> GRuleCall
-nonempty_set = binding $ \x ->
-  "nonempty_set"
-    =:= tag 258 (arr [1 <+ a x])
-    / sarr [1 <+ a x]
+nonempty_set = set_len_spec "nonempty_set" 1
+
+-- | An OSet is a Set that preserves the order of its elements.
+oset :: IsType0 t0 => t0 -> GRuleCall
+oset = set_len_spec "oset" 0
+
+-- | An NonEmpty OSet is a NonEmpty Set that preserves the order of its elements.
+nonempty_oset :: IsType0 t0 => t0 -> GRuleCall
+nonempty_oset = set_len_spec "nonempty_oset" 1
+
+set_len_spec :: IsType0 t0 => Text -> Word64 -> t0 -> GRuleCall
+set_len_spec label n = binding $ \x -> label =:= tag 258 (arr [n <+ a x]) / sarr [n <+ a x]

eras/dijkstra/cddl-files/dijkstra.cddl

@@ -337,9 +337,9 @@ plutus_v2_script = distinct_VBytes
 
 plutus_v3_script = distinct_VBytes
 
-certificates = nonempty_set<certificate>
+certificates = nonempty_oset<certificate>
 
-nonempty_set<a0> = #6.258([+ a0])/ [+ a0]
+nonempty_oset<a0> = #6.258([+ a0])/ [+ a0]
 
 stake_credential = credential
 
@@ -501,6 +501,8 @@ posInt64 = 1 .. 9223372036854775807
 ; representation for empty redeemers.
 script_data_hash = hash32
 
+nonempty_set<a0> = #6.258([+ a0])/ [+ a0]
+
 required_signers = nonempty_set<addr_keyhash>
 
 network_id = 0/ 1
@@ -528,7 +530,7 @@ voting_procedure = [vote, anchor/ nil]
 
 vote = 0 .. 2
 
-proposal_procedures = nonempty_set<proposal_procedure>
+proposal_procedures = nonempty_oset<proposal_procedure>
 
 proposal_procedure = [deposit : coin, reward_account, gov_action, anchor]
 

eras/dijkstra/testlib/Test/Cardano/Ledger/Dijkstra/CDDL.hs

@@ -169,10 +169,10 @@ proposal_procedure =
       ]
 
 proposal_procedures :: Rule
-proposal_procedures = "proposal_procedures" =:= nonempty_set proposal_procedure
+proposal_procedures = "proposal_procedures" =:= nonempty_oset proposal_procedure
 
 certificates :: Rule
-certificates = "certificates" =:= nonempty_set certificate
+certificates = "certificates" =:= nonempty_oset certificate
 
 gov_action :: Rule
 gov_action =