Merge branch 'master' of https://github.com/sidan-lab/sidan-csl-rs

sidan-lab · Feb 23, 2024 · 4e5d7c8 · 4e5d7c8
2 parents dda4ea5 + 4e978f8
commit 4e5d7c8
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sidan-csl-rs"
-version = "0.1.10"
+version = "0.1.11"
 edition = "2021"
 license = "MIT"
 description = "Wrapper around the cardano-serialization-lib for easier transaction building, heavily inspired by cardano-cli APIs"

diff --git a/src/builder/core.rs b/src/builder/core.rs
@@ -33,6 +33,7 @@ impl MeshTxBuilderCore {
                 reference_inputs: vec![],
                 mints: vec![],
                 change_address: "".to_string(),
+                change_datum: None,
                 metadata: vec![],
                 validity_range: ValidityRange {
                     invalid_before: None,
@@ -344,6 +345,7 @@ impl MeshTxBuilderCore {
             type_: "Hash".to_string(),
             data,
         });
+        self.tx_output = Some(tx_output);
         self
     }
 
@@ -357,6 +359,7 @@ impl MeshTxBuilderCore {
             type_: "Inline".to_string(),
             data,
         });
+        self.tx_output = Some(tx_output);
         self
     }
 
@@ -557,6 +560,14 @@ impl MeshTxBuilderCore {
         self
     }
 
+    pub fn change_output_datum(&mut self, data: String) -> &mut MeshTxBuilderCore {
+        self.mesh_tx_builder_body.change_datum = Some(Datum {
+            type_: "Inline".to_string(),
+            data,
+        });
+        self
+    }
+
     pub fn invalid_before(&mut self, slot: u64) -> &mut MeshTxBuilderCore {
         self.mesh_tx_builder_body.validity_range.invalid_before = Some(slot);
         self
@@ -733,7 +744,7 @@ impl MeshTxBuilderCore {
                             csl::plutus::PlutusDatumSchema::DetailedSchema,
                         )
                         .unwrap(),
-                    ))
+                    ));
                 }
                 "Inline" => {
                     output_builder = output_builder.with_plutus_data(
@@ -742,7 +753,7 @@ impl MeshTxBuilderCore {
                             csl::plutus::PlutusDatumSchema::DetailedSchema,
                         )
                         .unwrap(),
-                    )
+                    );
                 }
                 _ => {}
             };
@@ -960,10 +971,24 @@ impl MeshTxBuilderCore {
     }
 
     fn add_change(&mut self, change_address: String) {
-        let _ = self
-            .tx_builder
-            .add_change_if_needed(&csl::address::Address::from_bech32(&change_address).unwrap())
-            .unwrap();
+        if self.mesh_tx_builder_body.change_datum.clone().is_some() {
+            self.tx_builder
+                .add_change_if_needed_with_datum(
+                    &csl::address::Address::from_bech32(&change_address).unwrap(),
+                    &csl::OutputDatum::new_data(
+                        &csl::plutus::PlutusData::from_json(
+                            &self.mesh_tx_builder_body.change_datum.clone().unwrap().data,
+                            csl::plutus::PlutusDatumSchema::DetailedSchema,
+                        )
+                        .unwrap(),
+                    ),
+                )
+                .unwrap();
+        } else {
+            self.tx_builder
+                .add_change_if_needed(&csl::address::Address::from_bech32(&change_address).unwrap())
+                .unwrap();
+        }
     }
 
     // fn add_collateral_return(&mut self, change_address: String) {

diff --git a/src/model/builder.rs b/src/model/builder.rs
@@ -7,6 +7,7 @@ pub struct MeshTxBuilderBody {
     pub reference_inputs: Vec<RefTxIn>,
     pub mints: Vec<MintItem>,
     pub change_address: String,
+    pub change_datum: Option<Datum>,
     pub metadata: Vec<Metadata>,
     pub validity_range: ValidityRange,
     pub signing_key: Vec<String>,

diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -167,8 +167,15 @@ mod int_tests {
             "addr_test1vpw22xesfv0hnkfw4k5vtrz386tfgkxu6f7wfadug7prl7s6gt89x".to_string(),
         )
         .change_address(wallet_address.to_string())
+        .change_output_datum(
+            to_string(&json!({
+              "constructor": 0,
+              "fields": [],
+            }))
+            .unwrap(),
+        )
         .complete_sync(None);
-
+        println!("{}", mesh.tx_hex);
         assert!(mesh.tx_hex != *"");
     }
 }