Merge pull request #5145 from IntersectMBO/aniketd/multiasset-cddl

Fix MultiAsset CDDL spec in Mary and Alonzo

Author: lehins

eras/alonzo/impl/cddl-files/alonzo.cddl

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

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/CDDL.hs

@@ -23,7 +23,6 @@ import Test.Cardano.Ledger.Mary.CDDL hiding (
   header,
   header_body,
   mint,
-  multiasset,
   native_script,
   proposed_protocol_parameter_updates,
   protocol_param_update,
@@ -437,12 +436,6 @@ network_id = "network_id" =:= int 0 / int 1
 auxiliary_data_hash :: Rule
 auxiliary_data_hash = "auxiliary_data_hash" =:= hash32
 
-multiasset :: IsType0 a => a -> GRuleCall
-multiasset =
-  binding $ \x ->
-    "multiasset"
-      =:= mp [0 <+ asKey policy_id ==> mp [0 <+ asKey asset_name ==> x]]
-
 mint :: Rule
 mint = "mint" =:= multiasset int64
 

eras/babbage/impl/cddl-files/babbage.cddl

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

eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/CDDL.hs

@@ -23,7 +23,6 @@ import Test.Cardano.Ledger.Alonzo.CDDL hiding (
   header,
   header_body,
   language,
-  multiasset,
   operational_cert,
   plutus_data,
   plutus_script,

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

@@ -36,6 +36,7 @@ import Test.Cardano.Ledger.Babbage.CDDL hiding (
   metadata,
   mint,
   multi_host_name,
+  multiasset,
   native_script,
   nonempty_set,
   plutus_v1_script,

eras/mary/impl/cddl-files/mary.cddl

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

eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/CDDL.hs

@@ -37,7 +37,7 @@ multiasset :: IsType0 a => a -> GRuleCall
 multiasset =
   binding $ \x ->
     "multiasset"
-      =:= mp [1 <+ asKey policy_id ==> mp [1 <+ asKey asset_name ==> x]]
+      =:= mp [0 <+ asKey policy_id ==> mp [1 <+ asKey asset_name ==> x]]
 
 policy_id :: Rule
 policy_id = "policy_id" =:= script_hash