Merge pull request #9 from sidan-lab/feature/update_csl

bump cardano serialisation lib version
sidan-lab · May 12, 2024 · 35e6226 · 35e6226
2 parents dc3bdfc + 8fbe045
commit 35e6226
Show file tree

Hide file tree

Showing 16 changed files with 349 additions and 205 deletions.
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 getrandom = { version = "0.2", features = ["js"] }
-cardano-serialization-lib = "11.5.0"
+cardano-serialization-lib = "12.0.0-alpha.30"
 hex = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -21,15 +21,15 @@ async-trait = "0.1.79"
 # non-wasm
 [target.'cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))'.dependencies]
 uplc = "=1.0.26-alpha"
-wasm-bindgen = { version = "=0.2.87", features = ["serde-serialize"] }
+wasm-bindgen = { version = "=0.2.90", features = ["serde-serialize"] }
 rand_os = "0.1"
 noop_proc_macro = "0.3.0"
 pallas = "0.22.0"
 
 # wasm
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
 uplc = "0.0.29"
-wasm-bindgen = { version = "=0.2.87", features = ["serde-serialize"] }
+wasm-bindgen = { version = "=0.2.90", features = ["serde-serialize"] }
 rand_os = { version = "0.1", features = ["wasm-bindgen"] }
 js-sys = "=0.3.61"
 wasm-bindgen-futures = "=0.4.34"

diff --git a/rust/src/builder/core.rs b/rust/src/builder/core.rs
@@ -100,7 +100,7 @@ impl IMeshTxBuilderCore for MeshTxBuilder {
         self.serialize_tx_body();
         self.mesh_csl.tx_builder = build_tx_builder();
         self.mesh_csl.tx_inputs_builder =
-            csl::tx_builder::tx_inputs_builder::TxInputsBuilder::new();
+            csl::TxInputsBuilder::new();
         self
     }
 
@@ -402,6 +402,7 @@ impl IMeshTxBuilderCore for MeshTxBuilder {
         tx_index: u32,
         spending_script_hash: &str,
         version: LanguageVersion,
+        script_size: usize,
     ) -> &mut Self {
         let tx_in_item = self.tx_in_item.take();
         if tx_in_item.is_none() {
@@ -417,6 +418,7 @@ impl IMeshTxBuilderCore for MeshTxBuilder {
                         tx_index,
                         spending_script_hash: spending_script_hash.to_string(),
                         language_version: version,
+                        script_size,
                     }));
                 self.tx_in_item = Some(TxIn::ScriptTxIn(input));
             }
@@ -486,6 +488,7 @@ impl IMeshTxBuilderCore for MeshTxBuilder {
         tx_index: u32,
         spending_script_hash: &str,
         version: LanguageVersion,
+        script_size: usize,
     ) -> &mut Self {
         let mint_item = self.mint_item.take();
         if mint_item.is_none() {
@@ -497,6 +500,7 @@ impl IMeshTxBuilderCore for MeshTxBuilder {
             tx_index,
             spending_script_hash: spending_script_hash.to_string(),
             language_version: version,
+            script_size,
         }));
         self.mint_item = Some(mint_item);
         self
@@ -686,7 +690,7 @@ impl IMeshTxBuilderCore for MeshTxBuilder {
     }
 
     fn add_all_collaterals(&mut self, collaterals: Vec<PubKeyTxIn>) {
-        let mut collateral_builder = csl::tx_builder::tx_inputs_builder::TxInputsBuilder::new();
+        let mut collateral_builder = csl::TxInputsBuilder::new();
         for collateral in collaterals {
             self.mesh_csl
                 .add_collateral(&mut collateral_builder, collateral)
@@ -701,7 +705,7 @@ impl IMeshTxBuilderCore for MeshTxBuilder {
     }
 
     fn add_all_mints(&mut self, mints: Vec<MintItem>) {
-        let mut mint_builder = csl::tx_builder::mint_builder::MintBuilder::new();
+        let mut mint_builder = csl::MintBuilder::new();
         for (index, mint) in mints.into_iter().enumerate() {
             match mint.type_.as_str() {
                 "Plutus" => self

diff --git a/rust/src/builder/interface.rs b/rust/src/builder/interface.rs
@@ -250,6 +250,7 @@ pub trait IMeshTxBuilderCore {
     /// * `tx_index` - The transaction index
     /// * `spending_script_hash` - The spending script hash
     /// * `version` - The language version
+    /// * `scrip_size` - Size of the script
     ///
     /// ### Returns
     ///
@@ -260,6 +261,7 @@ pub trait IMeshTxBuilderCore {
         tx_index: u32,
         spending_script_hash: &str,
         version: LanguageVersion,
+        script_size: usize,
     ) -> &mut Self;
 
     /// ## Transaction building method
@@ -346,6 +348,7 @@ pub trait IMeshTxBuilderCore {
     /// * `tx_index` - The transaction index
     /// * `spending_script_hash` - The spending script hash
     /// * `version` - The language version
+    /// * `script_size` - Size of the script
     ///
     /// ### Returns
     ///
@@ -356,6 +359,7 @@ pub trait IMeshTxBuilderCore {
         tx_index: u32,
         spending_script_hash: &str,
         version: LanguageVersion,
+        script_size: usize,
     ) -> &mut Self;
 
     /// ## Transaction building method

diff --git a/rust/src/core/algo/tx_eval.rs b/rust/src/core/algo/tx_eval.rs
@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 use cardano_serialization_lib as csl;
-use csl::error::JsError;
+use csl::JsError;
 use pallas::ledger::primitives::alonzo::RedeemerTag as PRedeemerTag;
 use pallas::ledger::primitives::conway::PlutusV2Script;
 use std::collections::HashMap;
@@ -11,7 +11,7 @@ use crate::core::constants::{get_v1_cost_models, get_v2_cost_models};
 use crate::core::tx_parser::{IMeshTxParser, MeshTxParser};
 use crate::model::{Action, Asset, Budget, RedeemerTag, UTxO, UtxoOutput};
 use crate::service::IEvaluator;
-use cardano_serialization_lib::address::Address;
+use csl::Address;
 use pallas::codec::minicbor::Decoder;
 use pallas::codec::utils::{Bytes, CborWrap, KeyValuePairs};
 use pallas::ledger::primitives::babbage::{
@@ -158,11 +158,9 @@ fn to_pallas_script_ref(utxo_output: &UtxoOutput) -> Result<Option<CborWrap<Scri
 
 fn to_pallas_datum(utxo_output: &UtxoOutput) -> Result<Option<DatumOption>, JsError> {
     if let Some(inline_datum) = &utxo_output.plutus_data {
-        let csl_plutus_data = csl::plutus::PlutusData::from_json(
-            inline_datum,
-            csl::plutus::PlutusDatumSchema::DetailedSchema,
-        )
-        .map_err(|err| JsError::from_str(&format!("Invalid plutus data found: {}", err)))?;
+        let csl_plutus_data =
+            csl::PlutusData::from_json(inline_datum, csl::PlutusDatumSchema::DetailedSchema)
+                .map_err(|err| JsError::from_str(&format!("Invalid plutus data found: {}", err)))?;
 
         let plutus_data_bytes = csl_plutus_data.to_bytes();
         let datum = CborWrap(