update cml (to non merged branch)

Cargo.toml

@@ -9,3 +9,10 @@ members = [
     "indexer/plan-visualizer",
     "indexer/task-docgen"
 ]
+
+
+[workspace.dependencies]
+cml-chain = { git = "https://github.com/dcSpark/cardano-multiplatform-lib", branch = "new-conway-cddl-updates" }
+cml-core = { git = "https://github.com/dcSpark/cardano-multiplatform-lib", branch = "new-conway-cddl-updates" }
+cml-crypto = { git = "https://github.com/dcSpark/cardano-multiplatform-lib", branch = "new-conway-cddl-updates" }
+cml-multi-era = { git = "https://github.com/dcSpark/cardano-multiplatform-lib", branch = "new-conway-cddl-updates" }

indexer/Cargo.toml

@@ -21,10 +21,10 @@ tasks = { path = "tasks" }
 # [indexer]
 anyhow = { version = "1.0.69" }
 async-trait = { version = "0.1.64" }
-cml-chain = { version = "5.2.0" }
-cml-core = { version = "5.2.0" }
-cml-crypto = { version = "5.2.0" }
-cml-multi-era = { version = "5.2.0" }
+cml-chain = { workspace = true }
+cml-core = { workspace = true }
+cml-crypto = { workspace = true }
+cml-multi-era = { workspace = true }
 clap = { version = "3.1", features = ["derive"] }
 ctrlc = { version = "3.2.4", features = ["termination"] }
 dotenv = { version = "0.15.0" }

indexer/reparse/Cargo.toml

@@ -10,10 +10,10 @@ entity = { path = "../entity" }
 
 # [reparse]
 anyhow = { version = "1.0.69" }
-cml-chain = { version = "5.2.0" }
-cml-core = { version = "5.2.0" }
-cml-crypto = { version = "5.2.0" }
-cml-multi-era = { version = "5.2.0" }
+cml-chain = { workspace = true }
+cml-core = { workspace = true }
+cml-crypto = { workspace = true }
+cml-multi-era = { workspace = true }
 dotenv = { version = "0.15.0" }
 futures = { version = "0.3.21" }
 hex = { version = "0.4.0" }

indexer/tasks/Cargo.toml

@@ -12,10 +12,10 @@ entity = { path = "../entity" }
 
 # [tasks]
 anyhow = { version = "1.0.69" }
-cml-chain = { version = "5.2.0" }
-cml-core = { version = "5.2.0" }
-cml-crypto = { version = "5.2.0" }
-cml-multi-era = { version = "5.2.0" }
+cml-chain = { workspace = true }
+cml-core = { workspace = true }
+cml-crypto = { workspace = true }
+cml-multi-era = { workspace = true }
 cardano-projected-nft = { git = "https://github.com/dcSpark/projected-nft-whirlpool.git", rev = "13f81e8666743fefd14c5e1affb1cd828d8c473b" }
 cfg-if = { version = "1.0.0" }
 cryptoxide = { version = "0.4.2" }

indexer/tasks/src/byron/byron_txs.rs

@@ -23,7 +23,7 @@ carp_task! {
   execute |previous_data, task| handle_tx(
       task.db_tx,
       task.block,
-      &previous_data.byron_block.as_ref().unwrap(),
+      previous_data.byron_block.as_ref().unwrap(),
       task.config.readonly,
       task.config.include_payload
   );

indexer/tasks/src/genesis/genesis_txs.rs

@@ -34,7 +34,7 @@ carp_task! {
   execute |previous_data, task| handle_txs(
       task.db_tx,
       task.block,
-      &previous_data.genesis_block.as_ref().unwrap(),
+      previous_data.genesis_block.as_ref().unwrap(),
       task.config.include_payload
   );
   merge_result |previous_data, result| {

indexer/tasks/src/multiera/dex/common.rs

@@ -9,6 +9,7 @@ use cml_chain::json::plutus_datums::{
     decode_plutus_datum_to_json_str, decode_plutus_datum_to_json_value,
     CardanoNodePlutusDatumSchema,
 };
+use cml_chain::NonemptySetPlutusData;
 use entity::dex_swap::Operation;
 use entity::sea_orm::{DatabaseTransaction, Set};
 use std::collections::{BTreeMap, BTreeSet};
@@ -18,7 +19,7 @@ use std::collections::{BTreeMap, BTreeSet};
 pub fn filter_outputs_and_datums_by_hash(
     outputs: &[cml_multi_era::utils::MultiEraTransactionOutput],
     payment_hashes: &[&str],
-    plutus_data: &[cml_chain::plutus::PlutusData],
+    plutus_data: &Option<NonemptySetPlutusData>,
 ) -> Vec<(
     cml_multi_era::utils::MultiEraTransactionOutput,
     cml_chain::plutus::PlutusData,
@@ -41,7 +42,7 @@ pub fn filter_outputs_and_datums_by_hash(
 pub fn filter_outputs_and_datums_by_address(
     outputs: &[cml_multi_era::utils::MultiEraTransactionOutput],
     addresses: &[&str],
-    plutus_data: &[cml_chain::plutus::PlutusData],
+    plutus_data: &Option<NonemptySetPlutusData>,
 ) -> Vec<(
     cml_multi_era::utils::MultiEraTransactionOutput,
     cml_chain::plutus::PlutusData,

indexer/tasks/src/multiera/dex/minswap_v1.rs

@@ -33,7 +33,7 @@ impl Dex for MinSwapV1 {
         if let Some((output, datum)) = filter_outputs_and_datums_by_hash(
             &tx.outputs(),
             &[POOL_SCRIPT_HASH1, POOL_SCRIPT_HASH2],
-            &tx_witness.plutus_datums.clone().unwrap_or_default(),
+            &tx_witness.plutus_datums,
         )
         .first()
         {
@@ -77,7 +77,7 @@ impl Dex for MinSwapV1 {
         if let Some((main_output, main_datum)) = filter_outputs_and_datums_by_hash(
             &tx.outputs(),
             &[POOL_SCRIPT_HASH1, POOL_SCRIPT_HASH2],
-            &tx_witness.plutus_datums.clone().unwrap_or_default(),
+            &tx_witness.plutus_datums,
         )
         .first()
         {
@@ -109,7 +109,7 @@ impl Dex for MinSwapV1 {
             for (input, input_datum) in filter_outputs_and_datums_by_address(
                 &inputs,
                 &[BATCH_ORDER_ADDRESS1, BATCH_ORDER_ADDRESS2],
-                &tx_witness.plutus_datums.clone().unwrap_or_default(),
+                &tx_witness.plutus_datums,
             ) {
                 let input_datum = datum_to_json(&input_datum)?;
 

indexer/tasks/src/multiera/dex/sundaeswap_v1.rs

@@ -33,7 +33,7 @@ impl Dex for SundaeSwapV1 {
         if let Some((output, datum)) = filter_outputs_and_datums_by_hash(
             &tx.outputs(),
             &[POOL_SCRIPT_HASH],
-            &tx_witness.plutus_datums.clone().unwrap_or_default(),
+            &tx_witness.plutus_datums,
         )
         .first()
         {
@@ -77,7 +77,7 @@ impl Dex for SundaeSwapV1 {
         if let Some((main_output, main_datum)) = filter_outputs_and_datums_by_hash(
             &tx.outputs(),
             &[POOL_SCRIPT_HASH],
-            &tx_witness.plutus_datums.clone().unwrap_or_default(),
+            &tx_witness.plutus_datums,
         )
         .first()
         {
@@ -109,7 +109,7 @@ impl Dex for SundaeSwapV1 {
             for (input, input_datum) in filter_outputs_and_datums_by_hash(
                 &inputs,
                 &[REQUEST_SCRIPT_HASH],
-                &tx_witness.plutus_datums.clone().unwrap_or_default(),
+                &tx_witness.plutus_datums.clone(),
             ) {
                 let input_datum = datum_to_json(&input_datum)?;
 

indexer/tasks/src/multiera/dex/wingriders_v1.rs

@@ -1,4 +1,5 @@
 use cml_chain::byron::ByronTxOut;
+use cml_chain::plutus::LegacyRedeemer;
 use cml_core::serialization::{FromBytes, Serialize};
 use cml_crypto::RawBytesEncoding;
 use cml_multi_era::utils::MultiEraTransactionOutput;
@@ -36,7 +37,7 @@ impl Dex for WingRidersV1 {
         if let Some((output, datum)) = filter_outputs_and_datums_by_hash(
             &tx.outputs(),
             &[POOL_SCRIPT_HASH],
-            &tx_witness.plutus_datums.clone().unwrap_or_default(),
+            &tx_witness.plutus_datums,
         )
         .first()
         {
@@ -91,12 +92,33 @@ impl Dex for WingRidersV1 {
         if let Some((pool_output, _)) = filter_outputs_and_datums_by_hash(
             &tx.outputs(),
             &[POOL_SCRIPT_HASH],
-            &tx_witness.plutus_datums.clone().unwrap_or_default(),
+            &tx_witness.plutus_datums,
         )
         .first()
         {
             let redeemers = tx_witness.redeemers.clone().ok_or("No redeemers")?;
 
+            let redeemers = match redeemers {
+                cml_chain::plutus::Redeemers::ArrLegacyRedeemer {
+                    arr_legacy_redeemer,
+                    arr_legacy_redeemer_encoding: _,
+                } => arr_legacy_redeemer,
+                cml_chain::plutus::Redeemers::MapRedeemerKeyToRedeemerVal {
+                    map_redeemer_key_to_redeemer_val,
+                    map_redeemer_key_to_redeemer_val_encoding: _,
+                } => map_redeemer_key_to_redeemer_val
+                    .take()
+                    .into_iter()
+                    .map(|(key, val)| LegacyRedeemer {
+                        tag: key.tag,
+                        index: key.index,
+                        data: val.data,
+                        ex_units: val.ex_units,
+                        encodings: None,
+                    })
+                    .collect(),
+            };
+
             // Get pool input from redemeers
             let pool_input_redeemer = redeemers.first().ok_or("No redeemers")?;
             let pool_input = datum_to_json(&pool_input_redeemer.data)?["fields"][0]["int"]
@@ -138,11 +160,9 @@ impl Dex for WingRidersV1 {
                 let input = inputs.get(redeemer).ok_or("Failed to pair output")?.clone();
 
                 // get information about swap from pool plutus data
-                let parent_datum = get_plutus_datum_for_output(
-                    &inputs[parent],
-                    &tx_witness.plutus_datums.clone().unwrap_or_default(),
-                )
-                .unwrap();
+                let parent_datum =
+                    get_plutus_datum_for_output(&inputs[parent], &tx_witness.plutus_datums)
+                        .unwrap();
 
                 let parent_datum = datum_to_json(&parent_datum)?;
 
@@ -158,11 +178,8 @@ impl Dex for WingRidersV1 {
                 let asset2 = build_asset(parse_asset_item(1, 0)?, parse_asset_item(1, 1)?);
 
                 // get actual plutus datum
-                let input_datum = get_plutus_datum_for_output(
-                    &input,
-                    &tx_witness.plutus_datums.clone().unwrap_or_default(),
-                )
-                .unwrap();
+                let input_datum =
+                    get_plutus_datum_for_output(&input, &tx_witness.plutus_datums).unwrap();
                 let input_datum = datum_to_json(&input_datum)?;
                 // identify operation: 0 = swap
                 let operation = input_datum["fields"][1]["constructor"]

indexer/tasks/src/multiera/multiera_asset_utxo.rs

@@ -72,11 +72,14 @@ async fn handle(
     for (tx_body, cardano_transaction) in block.1.transaction_bodies().iter().zip(multiera_txs) {
         let collateral_inputs = tx_body
             .collateral_inputs()
-            .cloned()
-            .unwrap_or_default()
-            .into_iter()
-            .map(MultiEraTransactionInput::Shelley)
-            .collect::<Vec<_>>();
+            .map(|collateral_inputs| {
+                collateral_inputs
+                    .iter()
+                    .cloned()
+                    .map(MultiEraTransactionInput::Shelley)
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_else(std::vec::Vec::new);
 
         for input in tx_body.inputs().iter().chain(collateral_inputs.iter()) {
             let utxo = multiera_used_inputs_to_outputs_map

indexer/tasks/src/multiera/multiera_datum.rs

@@ -65,19 +65,16 @@ async fn handle_datum(
         .zip(block.1.transaction_witness_sets().iter())
         .zip(multiera_txs)
     {
-        for datum in tx_witness_set
-            .plutus_datums
-            .clone()
-            .unwrap_or_default()
-            .iter()
-        {
-            let hash = datum.hash();
-            hash_to_tx
-                .entry(hash)
-                .or_insert_with(|| cardano_transaction.id);
-            hash_to_data
-                .entry(hash)
-                .or_insert_with(|| datum.to_cbor_bytes());
+        if let Some(plutus_datums) = &tx_witness_set.plutus_datums {
+            for datum in plutus_datums.iter() {
+                let hash = datum.hash();
+                hash_to_tx
+                    .entry(hash)
+                    .or_insert_with(|| cardano_transaction.id);
+                hash_to_data
+                    .entry(hash)
+                    .or_insert_with(|| datum.to_cbor_bytes());
+            }
         }
         for output in tx_body.outputs().iter() {
             let output = match output {

indexer/tasks/src/multiera/multiera_projected_nft.rs

@@ -1,5 +1,5 @@
 use cardano_projected_nft::{Owner, Redeem, State, Status};
-use cml_chain::plutus::{Redeemer, RedeemerTag};
+use cml_chain::plutus::{LegacyRedeemer, PlutusData, RedeemerTag, Redeemers};
 use cml_chain::transaction::DatumOption;
 use cml_core::serialization::{FromBytes, Serialize};
 use cml_crypto::{Ed25519KeyHash, RawBytesEncoding, TransactionHash};
@@ -705,23 +705,44 @@ fn extract_operation_and_datum(
     Ok(result)
 }
 
-fn get_projected_nft_redeemers(redeemers: &[Redeemer]) -> Result<BTreeMap<i64, Redeem>, DbErr> {
-    let mut result = BTreeMap::new();
+fn get_projected_nft_redeemers(redeemers: &Redeemers) -> Result<BTreeMap<i64, Redeem>, DbErr> {
+    fn build_map<'a>(
+        redeemers: impl Iterator<Item = (RedeemerTag, u64, &'a PlutusData)>,
+    ) -> BTreeMap<i64, Redeem> {
+        let mut result = BTreeMap::new();
 
-    for redeemer in redeemers {
-        if redeemer.tag != RedeemerTag::Spend {
-            continue;
-        }
-
-        match Redeem::try_from(redeemer.data.to_cbor_bytes().as_slice()) {
-            Ok(redeem) => {
-                result.insert(redeemer.index as i64, redeem);
+        for (tag, index, data) in redeemers {
+            if tag != RedeemerTag::Spend {
+                continue;
             }
-            Err(err) => {
-                tracing::info!("Can't parse redeemer: {err}");
+
+            match Redeem::try_from(data.to_cbor_bytes().as_slice()) {
+                Ok(redeem) => {
+                    result.insert(index as i64, redeem);
+                }
+                Err(err) => {
+                    tracing::info!("Can't parse redeemer: {err}");
+                }
             }
         }
+
+        result
     }
 
-    Ok(result)
+    match redeemers {
+        Redeemers::ArrLegacyRedeemer {
+            arr_legacy_redeemer,
+            arr_legacy_redeemer_encoding: _,
+        } => Ok(build_map(arr_legacy_redeemer.iter().map(|redeemeer| {
+            (redeemeer.tag, redeemeer.index, &redeemeer.data)
+        }))),
+        Redeemers::MapRedeemerKeyToRedeemerVal {
+            map_redeemer_key_to_redeemer_val,
+            map_redeemer_key_to_redeemer_val_encoding: _,
+        } => Ok(build_map(
+            map_redeemer_key_to_redeemer_val
+                .iter()
+                .map(|(key, val)| (key.tag, key.index, &val.data)),
+        )),
+    }
 }