Merge branch 'master' into evgenii/ordered_datum_map

Emurgo · Feb 6, 2023 · b337499 · b337499
2 parents 5e2dd0d + 38bbca6
commit b337499
Show file tree

Hide file tree

Showing 9 changed files with 244 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cardano-serialization-lib",
-  "version": "11.2.1",
+  "version": "11.3.0",
   "description": "(De)serialization functions for the Cardano blockchain along with related utility functions",
   "scripts": {
     "rust:build-nodejs": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=nodejs; cd ..; npm run js:ts-json-gen; cd rust; wasm-pack pack) && npm run js:flowgen",

diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cardano-serialization-lib"
-version = "11.2.1"
+version = "11.3.0"
 edition = "2018"
 authors = ["EMURGO"]
 license = "MIT"

diff --git a/rust/json-gen/Cargo.lock b/rust/json-gen/Cargo.lock
diff --git a/rust/pkg/cardano_serialization_lib.js.flow b/rust/pkg/cardano_serialization_lib.js.flow
@@ -3954,6 +3954,11 @@ declare export class MintBuilder {
    */
   get_plutus_witnesses(): PlutusWitnesses;
 
+  /**
+   * @returns {TransactionInputs}
+   */
+  get_ref_inputs(): TransactionInputs;
+
   /**
    * @returns {Redeemers}
    */
@@ -5007,6 +5012,10 @@ declare export class PlutusScriptSource {
   static new(script: PlutusScript): PlutusScriptSource;
 
   /**
+   * !!! DEPRECATED !!!
+   * This constructor has missed information about plutus script language vesrion. That can affect
+   * the script data hash calculation.
+   * Use `.new_ref_input_with_lang_ver` instead
    * @param {ScriptHash} script_hash
    * @param {TransactionInput} input
    * @returns {PlutusScriptSource}
@@ -5131,6 +5140,16 @@ declare export class PlutusWitness {
     redeemer: Redeemer
   ): PlutusWitness;
 
+  /**
+   * @param {PlutusScriptSource} script
+   * @param {Redeemer} redeemer
+   * @returns {PlutusWitness}
+   */
+  static new_with_ref_without_datum(
+    script: PlutusScriptSource,
+    redeemer: Redeemer
+  ): PlutusWitness;
+
   /**
    * @returns {PlutusScript | void}
    */

diff --git a/rust/src/tx_builder.rs b/rust/src/tx_builder.rs
diff --git a/rust/src/tx_builder/mint_builder.rs b/rust/src/tx_builder/mint_builder.rs
@@ -148,9 +148,11 @@ impl MintBuilder {
             match script_mint {
                 ScriptMint::Plutus(plutus_mints) => {
                     for (redeemer, _) in &plutus_mints.redeemer_mints {
-                        if let PlutusScriptSourceEnum::Script(script) = &plutus_mints.script {
-                            plutus_witnesses.push(PlutusWitness::new_without_datum(script, redeemer));
-                        }
+                        plutus_witnesses.push(
+                            PlutusWitness::new_with_ref_without_datum(
+                                &PlutusScriptSource(plutus_mints.script.clone()),
+                                redeemer)
+                        );
                     }
                 },
                 _ => {},
@@ -159,6 +161,21 @@ impl MintBuilder {
         PlutusWitnesses(plutus_witnesses)
     }
 
+    pub fn get_ref_inputs(&self) -> TransactionInputs {
+        let mut reference_inputs = Vec::new();
+        for script_mint in self.mints.values() {
+            match script_mint {
+                ScriptMint::Plutus(plutus_mints) => {
+                    if let PlutusScriptSourceEnum::RefInput(ref_input, _, _) = &plutus_mints.script {
+                        reference_inputs.push(ref_input.clone());
+                    }
+                },
+                _ => {},
+            }
+        }
+        TransactionInputs(reference_inputs)
+    }
+
     pub fn get_redeeemers(&self) -> Result<Redeemers, JsError> {
         let mut redeeemers = Vec::new();
         let mut index = BigNum::zero();

diff --git a/rust/src/tx_builder/tx_inputs_builder.rs b/rust/src/tx_builder/tx_inputs_builder.rs
@@ -89,6 +89,14 @@ impl PlutusScriptSource {
         Self(PlutusScriptSourceEnum::Script(script.clone()))
     }
 
+    /// !!! DEPRECATED !!!
+    /// This constructor has missed information about plutus script language vesrion. That can affect
+    /// the script data hash calculation.
+    /// Use `.new_ref_input_with_lang_ver` instead
+    #[deprecated(
+    since = "11.3.0",
+    note = "This constructor has missed information about plutus script language vesrion. That can affect the script data hash calculation. Use `.new_ref_input_with_lang_ver` instead."
+    )]
     pub fn new_ref_input(script_hash: &ScriptHash, input: &TransactionInput) -> Self {
         Self(PlutusScriptSourceEnum::RefInput(input.clone(),
                                               script_hash.clone(),
@@ -157,6 +165,14 @@ impl PlutusWitness {
         }
     }
 
+    pub fn new_with_ref_without_datum(script: &PlutusScriptSource, redeemer: &Redeemer) -> Self {
+        Self {
+            script: script.0.clone(),
+            datum: None,
+            redeemer: redeemer.clone(),
+        }
+    }
+
     pub fn script(&self) -> Option<PlutusScript> {
         match &self.script {
             PlutusScriptSourceEnum::Script(script) => Some(script.clone()),

diff --git a/rust/src/tx_builder_constants.rs b/rust/src/tx_builder_constants.rs
@@ -11,7 +11,7 @@ pub struct TxBuilderConstants();
 #[wasm_bindgen]
 impl TxBuilderConstants {
     pub fn plutus_default_cost_models() -> Costmdls {
-        TxBuilderConstants::plutus_alonzo_cost_models()
+        TxBuilderConstants::plutus_vasil_cost_models()
     }
 
     pub fn plutus_alonzo_cost_models() -> Costmdls {