Merge pull request #5484 from IntersectMBO/td/fix-multiasset-cddl

Fix MultiAsset cddl definition in dijkstra

Author: lehins

eras/conway/impl/cddl/lib/Cardano/Ledger/Conway/HuddleSpec.hs

@@ -16,8 +16,6 @@
 module Cardano.Ledger.Conway.HuddleSpec (
   module Cardano.Ledger.Babbage.HuddleSpec,
   conwayCDDL,
-  conwayMultiasset,
-  conwayValueRule,
   conwayMintRule,
   conwayWithdrawalsRule,
   conwayRedeemer,

eras/dijkstra/impl/cddl/data/dijkstra.cddl

@@ -181,7 +181,7 @@ value = coin/ [coin, multiasset<positive_coin>]
 
 coin = uint
 
-multiasset<a0> = {* policy_id => {+ asset_name => a0}}
+multiasset<a0> = {+ policy_id => {+ asset_name => a0}}
 
 policy_id = script_hash
 

eras/dijkstra/impl/cddl/lib/Cardano/Ledger/Dijkstra/HuddleSpec.hs

@@ -16,6 +16,8 @@
 module Cardano.Ledger.Dijkstra.HuddleSpec (
   module Cardano.Ledger.Conway.HuddleSpec,
   dijkstraCDDL,
+  dijkstraMultiasset,
+  dijkstraValueRule,
   guardsRule,
   subTransactionsRule,
   subTransactionRule,
@@ -265,6 +267,34 @@ auxiliaryDataMapRule p =
           ]
       )
 
+dijkstraValueRule ::
+  forall era.
+  ( HuddleRule "policy_id" era
+  , HuddleRule "asset_name" era
+  , HuddleRule "positive_coin" era
+  ) =>
+  Proxy era ->
+  Rule
+dijkstraValueRule p =
+  "value"
+    =:= huddleRule @"coin" p
+    / sarr [a $ huddleRule @"coin" p, a $ dijkstraMultiasset p (huddleRule @"positive_coin" p)]
+
+dijkstraMultiasset ::
+  forall era a.
+  (HuddleRule "policy_id" era, HuddleRule "asset_name" era, IsType0 a) =>
+  Proxy era ->
+  a ->
+  GRuleCall
+dijkstraMultiasset p =
+  binding $ \x ->
+    "multiasset"
+      =:= mp
+        [ 1
+            <+ asKey (huddleRule @"policy_id" p)
+            ==> mp [1 <+ asKey (huddleRule @"asset_name" p) ==> x]
+        ]
+
 instance HuddleRule "bounded_bytes" DijkstraEra where
   huddleRule _ = boundedBytesRule
 
@@ -495,7 +525,7 @@ instance HuddleRule "required_signers" DijkstraEra where
       =:= maybeTaggedNonemptySet (huddleRule @"addr_keyhash" p)
 
 instance HuddleRule "value" DijkstraEra where
-  huddleRule = conwayValueRule @DijkstraEra
+  huddleRule = dijkstraValueRule @DijkstraEra
 
 instance HuddleRule "mint" DijkstraEra where
   huddleRule = conwayMintRule @DijkstraEra

eras/dijkstra/impl/test/Test/Cardano/Ledger/Dijkstra/Binary/CddlSpec.hs

@@ -39,7 +39,7 @@ spec = do
     let v = eraProtVerHigh @DijkstraEra
     describe "Ruby-based" $ beforeAllCddlFile 3 readDijkstraCddlFiles $ do
       cddlRoundTripCborSpec @(Value DijkstraEra) v "positive_coin"
-      xdescribe "fix Multiasset" $ do
+      describe "MultiAsset" $ do
         cddlRoundTripCborSpec @(Value DijkstraEra) v "value"
       xdescribe "fix TxBody" $ do
         cddlRoundTripAnnCborSpec @(TxBody TopTx DijkstraEra) v "transaction_body"
@@ -85,7 +85,7 @@ spec = do
     describe "Huddle" $ specWithHuddle dijkstraCDDL 100 $ do
       huddleRoundTripCborSpec @(Value DijkstraEra) v "positive_coin"
       huddleRoundTripArbitraryValidate @(Value DijkstraEra) v "value"
-      xdescribe "fix MultiAsset" $ do
+      describe "MultiAsset" $ do
         huddleRoundTripCborSpec @(Value DijkstraEra) v "value"
       xdescribe "fix TxBody" $ do
         huddleRoundTripAnnCborSpec @(TxBody TopTx DijkstraEra) v "transaction_body"