bump cml dep to 5.2.0

dcSpark · Mar 18, 2024 · 2c2b09b · 2c2b09b
1 parent 577b658
commit 2c2b09b
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/indexer/Cargo.toml b/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.0.0" }
-cml-core = { version = "5.0.0" }
-cml-crypto = { version = "5.0.0" }
-cml-multi-era = { version = "5.0.0" }
+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" }
 clap = { version = "3.1", features = ["derive"] }
 ctrlc = { version = "3.2.4", features = ["termination"] }
 dotenv = { version = "0.15.0" }

diff --git a/indexer/reparse/Cargo.toml b/indexer/reparse/Cargo.toml
@@ -10,10 +10,10 @@ entity = { path = "../entity" }
 
 # [reparse]
 anyhow = { version = "1.0.69" }
-cml-chain = { version = "5.0.0" }
-cml-core = { version = "5.0.0" }
-cml-crypto = { version = "5.0.0" }
-cml-multi-era = { version = "5.0.0" }
+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" }
 dotenv = { version = "0.15.0" }
 futures = { version = "0.3.21" }
 hex = { version = "0.4.0" }

diff --git a/indexer/tasks/Cargo.toml b/indexer/tasks/Cargo.toml
@@ -12,10 +12,10 @@ entity = { path = "../entity" }
 
 # [tasks]
 anyhow = { version = "1.0.69" }
-cml-chain = { version = "5.0.0" }
-cml-core = { version = "5.0.0" }
-cml-crypto = { version = "5.0.0" }
-cml-multi-era = { version = "5.0.0" }
+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" }
 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" }

diff --git a/indexer/tasks/src/byron/byron_txs.rs b/indexer/tasks/src/byron/byron_txs.rs
@@ -1,5 +1,6 @@
 use crate::{dsl::task_macro::*, era_common::transactions_from_hashes, utils::blake2b256};
 use cml_core::serialization::ToBytes;
+use cml_crypto::RawBytesEncoding;
 use cml_multi_era::byron::block::ByronBlock;
 use cml_multi_era::MultiEraBlock;
 use entity::sea_orm::Set;
@@ -48,7 +49,7 @@ async fn handle_tx(
                 .body
                 .tx_payload
                 .iter()
-                .map(|tx| tx.byron_tx.hash().to_vec())
+                .map(|tx| tx.byron_tx.hash().to_raw_bytes().to_vec())
                 .collect::<Vec<Vec<u8>>>(),
             _ => vec![],
         };
@@ -70,7 +71,7 @@ async fn handle_tx(
             };
 
             TransactionActiveModel {
-                hash: Set(tx.byron_tx.hash().to_vec()),
+                hash: Set(tx.byron_tx.hash().to_raw_bytes().to_vec()),
                 block_id: Set(database_block.id),
                 tx_index: Set(idx as i32),
                 payload: Set(tx_payload),

diff --git a/indexer/tasks/src/multiera/multiera_cip25entry.rs b/indexer/tasks/src/multiera/multiera_cip25entry.rs
@@ -1,8 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use crate::config::EmptyConfig::EmptyConfig;
-use cml_chain::crypto::ScriptHash;
-use cml_core::metadata::TransactionMetadatum;
+use cml_chain::{auxdata::TransactionMetadatum, crypto::ScriptHash};
 use cml_core::serialization::FromBytes;
 use entity::{
     prelude::*,

diff --git a/indexer/tasks/src/multiera/multiera_metadata.rs b/indexer/tasks/src/multiera/multiera_metadata.rs
@@ -1,5 +1,4 @@
-use cml_chain::auxdata::AuxiliaryData;
-use cml_core::metadata::Metadata;
+use cml_chain::auxdata::{AuxiliaryData, Metadata};
 use cml_core::serialization::Serialize;
 use std::collections::BTreeMap;
 

diff --git a/indexer/tasks/src/multiera/multiera_txs.rs b/indexer/tasks/src/multiera/multiera_txs.rs
@@ -1,4 +1,5 @@
 use cml_core::serialization::Serialize;
+use cml_crypto::RawBytesEncoding;
 use std::collections::{BTreeSet, HashSet};
 
 use super::multiera_block::MultieraBlockTask;
@@ -45,7 +46,7 @@ async fn handle_tx(
                 .1
                 .transaction_bodies()
                 .iter()
-                .map(|tx_body| tx_body.hash().to_vec())
+                .map(|tx_body| tx_body.hash().to_raw_bytes().to_vec())
                 .collect::<Vec<_>>()
                 .as_slice(),
         )
@@ -72,7 +73,7 @@ async fn handle_tx(
                 vec![]
             };
             TransactionActiveModel {
-                hash: Set(tx.hash().to_vec()),
+                hash: Set(tx.hash().to_raw_bytes().to_vec()),
                 block_id: Set(database_block.id),
                 tx_index: Set(idx as i32),
                 payload: Set(tx_payload),

diff --git a/indexer/tasks/src/multiera/utils/cip25_parse.rs b/indexer/tasks/src/multiera/utils/cip25_parse.rs
@@ -3,8 +3,7 @@
 
 use std::collections::{BTreeMap, BTreeSet};
 
-use cml_chain::crypto::ScriptHash;
-use cml_core::metadata::TransactionMetadatum;
+use cml_chain::{auxdata::TransactionMetadatum, crypto::ScriptHash};
 use cml_core::serialization::{Serialize, ToBytes};
 
 use super::user_asset::{AssetName, Cip25ParseError, Payload, PolicyId};