New Conway.cddl updates

Cargo.toml

@@ -25,7 +25,9 @@ members = [
 # exclude old crate structure to avoid error in it
 exclude = [
     "rust",
-    "rust/json-gen"
+    "rust/json-gen",
+    "tools/metadata-cddl-checker",
+    "tools/plutus-datum-codegen"
 ]
 
 [profile.release]

chain/rust/src/block/serialization.rs

@@ -391,13 +391,13 @@ impl Deserialize for HeaderBody {
         (|| -> Result<_, DeserializeError> {
             let (block_number, block_number_encoding) = raw
                 .unsigned_integer_sz()
-                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(Into::<DeserializeError>::into)
+                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(|e: DeserializeError| e.annotate("block_number"))?;
             let (slot, slot_encoding) = raw
                 .unsigned_integer_sz()
-                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(Into::<DeserializeError>::into)
+                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(|e: DeserializeError| e.annotate("slot"))?;
             let (prev_hash, prev_hash_encoding) = (|| -> Result<_, DeserializeError> {
                 Ok(match raw.cbor_type()? != cbor_event::Type::Special {
@@ -444,8 +444,8 @@ impl Deserialize for HeaderBody {
                 .map_err(|e: DeserializeError| e.annotate("vrf_result"))?;
             let (block_body_size, block_body_size_encoding) = raw
                 .unsigned_integer_sz()
-                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(Into::<DeserializeError>::into)
+                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(|e: DeserializeError| e.annotate("block_body_size"))?;
             let (block_body_hash, block_body_hash_encoding) = raw
                 .bytes_sz()
@@ -600,13 +600,13 @@ impl DeserializeEmbeddedGroup for OperationalCert {
                 .map_err(|e: DeserializeError| e.annotate("hot_vkey"))?;
             let (sequence_number, sequence_number_encoding) = raw
                 .unsigned_integer_sz()
-                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(Into::<DeserializeError>::into)
+                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(|e: DeserializeError| e.annotate("sequence_number"))?;
             let (kes_period, kes_period_encoding) = raw
                 .unsigned_integer_sz()
-                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(Into::<DeserializeError>::into)
+                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(|e: DeserializeError| e.annotate("kes_period"))?;
             let (sigma, sigma_encoding) = raw
                 .bytes_sz()
@@ -716,13 +716,13 @@ impl DeserializeEmbeddedGroup for ProtocolVersion {
         (|| -> Result<_, DeserializeError> {
             let (major, major_encoding) = raw
                 .unsigned_integer_sz()
-                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(Into::<DeserializeError>::into)
+                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(|e: DeserializeError| e.annotate("major"))?;
             let (minor, minor_encoding) = raw
                 .unsigned_integer_sz()
-                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(Into::<DeserializeError>::into)
+                .map(|(x, enc)| (x, Some(enc)))
                 .map_err(|e: DeserializeError| e.annotate("minor"))?;
             Ok(ProtocolVersion {
                 major,

chain/rust/src/builders/certificate_builder.rs

@@ -6,7 +6,7 @@ use super::witness_builder::{NativeScriptWitnessInfo, RequiredWitnessSet};
 
 use crate::{
     certs::{Certificate, StakeCredential},
-    transaction::RequiredSigners,
+    RequiredSigners,
 };
 
 use cml_crypto::{Ed25519KeyHash, ScriptHash};
@@ -35,7 +35,7 @@ pub fn cert_required_wits(cert: &Certificate, required_witnesses: &mut RequiredW
             required_witnesses.add_from_credential(cert.stake_credential.clone());
         }
         Certificate::PoolRegistration(cert) => {
-            for owner in &cert.pool_params.pool_owners {
+            for owner in cert.pool_params.pool_owners.as_ref() {
                 required_witnesses.add_vkey_key_hash(*owner);
             }
             required_witnesses.add_vkey_key_hash(cert.pool_params.operator);
@@ -108,7 +108,7 @@ pub fn add_cert_vkeys(
             }
         },
         Certificate::PoolRegistration(cert) => {
-            for owner in &cert.pool_params.pool_owners {
+            for owner in cert.pool_params.pool_owners.as_ref() {
                 vkeys.insert(*owner);
             }
             vkeys.insert(cert.pool_params.operator);

chain/rust/src/builders/input_builder.rs

@@ -10,8 +10,8 @@ use crate::{
     certs::StakeCredential,
     crypto::hash::hash_plutus_data,
     plutus::PlutusData,
-    transaction::{RequiredSigners, TransactionInput, TransactionOutput},
-    NativeScript,
+    transaction::{TransactionInput, TransactionOutput},
+    NativeScript, RequiredSigners,
 };
 
 #[derive(Debug, thiserror::Error)]
@@ -140,6 +140,7 @@ impl SingleInputBuilder {
     ) -> Result<InputBuilderResult, InputBuilderError> {
         let mut required_wits = RequiredWitnessSet::default();
         required_signers
+            .as_ref()
             .iter()
             .for_each(|required_signer| required_wits.add_vkey_key_hash(*required_signer));
         input_required_wits(&self.utxo_info, &mut required_wits);

chain/rust/src/builders/mint_builder.rs

@@ -4,7 +4,7 @@ use super::witness_builder::{NativeScriptWitnessInfo, RequiredWitnessSet};
 
 use cml_core::ordered_hash_map::OrderedHashMap;
 
-use crate::{assets::AssetName, transaction::RequiredSigners, NativeScript, PolicyId};
+use crate::{assets::AssetName, NativeScript, PolicyId, RequiredSigners};
 
 #[derive(Clone)]
 pub struct MintBuilderResult {

chain/rust/src/builders/redeemer_builder.rs

@@ -4,7 +4,7 @@ use super::{
 };
 use crate::{
     address::RewardAddress,
-    plutus::{ExUnits, PlutusData, Redeemer, RedeemerTag},
+    plutus::{ExUnits, LegacyRedeemer, PlutusData, RedeemerTag, Redeemers},
     transaction::TransactionInput,
     PolicyId,
 };
@@ -22,16 +22,16 @@ impl RedeemerWitnessKey {
     }
 }
 
-impl From<&Redeemer> for RedeemerWitnessKey {
-    fn from(redeemer: &Redeemer) -> Self {
+impl From<&LegacyRedeemer> for RedeemerWitnessKey {
+    fn from(redeemer: &LegacyRedeemer) -> Self {
         Self {
             tag: redeemer.tag,
             index: redeemer.index,
         }
     }
 }
 
-/// Redeemer without the tag of index
+/// LegacyRedeemer without the tag of index
 /// This allows builder code to return partial redeemers
 /// and then later have them placed in the right context
 #[derive(Clone, Debug)]
@@ -142,6 +142,12 @@ impl RedeemerSetBuilder {
                     ex_units,
                 )));
             }
+            RedeemerTag::Proposing => {
+                todo!("https://github.com/dcSpark/cardano-multiplatform-lib/issues/323")
+            }
+            RedeemerTag::Voting => {
+                todo!("https://github.com/dcSpark/cardano-multiplatform-lib/issues/323")
+            }
         }
     }
 
@@ -211,10 +217,7 @@ impl RedeemerSetBuilder {
         }
     }
 
-    pub fn build(
-        &self,
-        default_to_dummy_exunits: bool,
-    ) -> Result<Vec<Redeemer>, RedeemerBuilderError> {
+    pub fn build(&self, default_to_dummy_exunits: bool) -> Result<Redeemers, RedeemerBuilderError> {
         let mut redeemers = Vec::new();
         // Calling iter on a BTreeMap returns a list of sorted keys
         self.remove_placeholders_and_tag(
@@ -242,12 +245,12 @@ impl RedeemerSetBuilder {
             default_to_dummy_exunits,
         )?;
 
-        Ok(redeemers)
+        Ok(Redeemers::new_arr_legacy_redeemer(redeemers))
     }
 
     fn remove_placeholders_and_tag<'a, K: Debug + Clone>(
         &self,
-        redeemers: &mut Vec<Redeemer>,
+        redeemers: &mut Vec<LegacyRedeemer>,
         tag: RedeemerTag,
         entries: &mut dyn Iterator<Item = (&'a K, &'a Option<UntaggedRedeemerPlaceholder>)>,
         default_to_dummy_exunits: bool,
@@ -280,12 +283,12 @@ impl RedeemerSetBuilder {
     fn tag_redeemer(
         tag: RedeemerTag,
         untagged_redeemers: &[Option<UntaggedRedeemer>],
-    ) -> Vec<Redeemer> {
+    ) -> Vec<LegacyRedeemer> {
         let mut result = Vec::new();
 
         for (index, untagged_redeemer) in untagged_redeemers.iter().enumerate() {
             if let Some(untagged_redeemer) = untagged_redeemer {
-                result.push(Redeemer::new(
+                result.push(LegacyRedeemer::new(
                     tag,
                     index as u64,
                     untagged_redeemer.data.clone(),
@@ -334,7 +337,7 @@ mod tests {
                 }
             };
             let missing_signers = vec![fake_raw_key_public(0).hash()];
-            InputAggregateWitnessData::PlutusScript(witness, missing_signers, None)
+            InputAggregateWitnessData::PlutusScript(witness, missing_signers.into(), None)
         };
 
         let address = Address::from_bech32("addr1qxeqxcja25k8q05evyngf4f88xn89asl54x2zg3ephgj26ndyt5qk02xmmras5pe9jz2c7tc93wu4c96rqwvg6e2v50qlpmx70").unwrap();
@@ -371,7 +374,7 @@ mod tests {
             ExUnits::new(10, 10),
         );
 
-        let redeemers = builder.build(false).unwrap();
+        let redeemers = builder.build(false).unwrap().to_flat_format();
 
         assert_eq!(redeemers.len(), 1);