Merge branch 'master' into evgenii/assets_random_improve

Author: lisicky

rust/pkg/cardano_serialization_lib.js.flow

@@ -1952,6 +1952,12 @@ declare export class Costmdls {
    * @returns {Languages}
    */
   keys(): Languages;
+
+  /**
+   * @param {Languages} languages
+   * @returns {Costmdls}
+   */
+  retain_language_versions(languages: Languages): Costmdls;
 }
 /**
  */
@@ -2124,6 +2130,23 @@ declare export class DataHash {
    */
   static from_hex(hex: string): DataHash;
 }
+/**
+ */
+declare export class DatumSource {
+  free(): void;
+
+  /**
+   * @param {PlutusData} datum
+   * @returns {DatumSource}
+   */
+  static new(datum: PlutusData): DatumSource;
+
+  /**
+   * @param {TransactionInput} input
+   * @returns {DatumSource}
+   */
+  static new_ref_input(input: TransactionInput): DatumSource;
+}
 /**
  */
 declare export class Ed25519KeyHash {
@@ -4715,6 +4738,27 @@ declare export class PlutusScript {
    */
   language_version(): Language;
 }
+/**
+ */
+declare export class PlutusScriptSource {
+  free(): void;
+
+  /**
+   * @param {PlutusScript} script
+   * @returns {PlutusScriptSource}
+   */
+  static new(script: PlutusScript): PlutusScriptSource;
+
+  /**
+   * @param {ScriptHash} script_hash
+   * @param {TransactionInput} input
+   * @returns {PlutusScriptSource}
+   */
+  static new_ref_input(
+    script_hash: ScriptHash,
+    input: TransactionInput
+  ): PlutusScriptSource;
+}
 /**
  */
 declare export class PlutusScripts {
@@ -4797,14 +4841,26 @@ declare export class PlutusWitness {
   ): PlutusWitness;
 
   /**
-   * @returns {PlutusScript}
+   * @param {PlutusScriptSource} script
+   * @param {DatumSource} datum
+   * @param {Redeemer} redeemer
+   * @returns {PlutusWitness}
    */
-  script(): PlutusScript;
+  static new_with_ref(
+    script: PlutusScriptSource,
+    datum: DatumSource,
+    redeemer: Redeemer
+  ): PlutusWitness;
 
   /**
-   * @returns {PlutusData}
+   * @returns {PlutusScript | void}
+   */
+  script(): PlutusScript | void;
+
+  /**
+   * @returns {PlutusData | void}
    */
-  datum(): PlutusData;
+  datum(): PlutusData | void;
 
   /**
    * @returns {Redeemer}
@@ -9296,6 +9352,11 @@ declare export class TxInputsBuilder {
    */
   add_required_plutus_input_scripts(scripts: PlutusWitnesses): number;
 
+  /**
+   * @returns {TransactionInputs}
+   */
+  get_ref_inputs(): TransactionInputs;
+
   /**
    * Returns a copy of the current script input witness scripts in the builder
    * @returns {NativeScripts | void}

rust/src/crypto.rs

@@ -7,6 +7,8 @@ use crypto::bech32::Bech32 as _;
 use rand_os::OsRng;
 use std::io::{BufRead, Seek, Write};
 use std::str::FromStr;
+use std::fmt::Display;
+use std::fmt;
 
 use cryptoxide::blake2b::Blake2b;
 
@@ -1058,6 +1060,12 @@ macro_rules! impl_hash_type {
                 String::is_referenceable()
             }
         }
+
+        impl Display for $name {
+            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                write!(f, "{}", self.to_hex())
+            }
+        }
     };
 }
 

rust/src/error.rs

@@ -130,6 +130,9 @@ impl std::fmt::Display for DeserializeError {
     }
 }
 
+#[cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))]
+impl std::error::Error for DeserializeError {}
+
 impl From<DeserializeError> for JsError {
     fn from(e: DeserializeError) -> JsError {
         JsError::from_str(&e.to_string())
@@ -202,3 +205,6 @@ impl std::fmt::Display for JsError {
         write!(f, "{}", self.msg)
     }
 }
+
+#[cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))]
+impl std::error::Error for JsError {}

rust/src/lib.rs

@@ -66,6 +66,8 @@ use plutus::*;
 use schemars::JsonSchema;
 use std::cmp::Ordering;
 use std::collections::BTreeSet;
+use std::fmt::Display;
+use std::fmt;
 use utils::*;
 
 type DeltaCoin = Int;
@@ -566,7 +568,7 @@ impl TransactionBody {
 
 #[wasm_bindgen]
 #[derive(
-    Clone, Debug, Eq, Ord, PartialEq, PartialOrd, serde::Serialize, serde::Deserialize, JsonSchema,
+    Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Hash, serde::Serialize, serde::Deserialize, JsonSchema,
 )]
 pub struct TransactionInput {
     transaction_id: TransactionHash,
@@ -3153,6 +3155,12 @@ impl HeaderBody {
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct AssetName(Vec<u8>);
 
+impl Display for AssetName {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", hex::encode(&self.0))
+    }
+}
+
 impl Ord for AssetName {
     fn cmp(&self, other: &Self) -> Ordering {
         // Implementing canonical CBOR order for asset names,

rust/src/plutus.rs

@@ -386,9 +386,9 @@ impl Costmdls {
         serializer.finalize()
     }
 
-    pub(crate) fn retain_language_versions(&self, languages: Vec<Language>) -> Costmdls {
+    pub fn retain_language_versions(&self, languages: &Languages) -> Costmdls {
         let mut result = Costmdls::new();
-        for lang in languages {
+        for lang in &languages.0 {
             match self.get(&lang) {
                 Some(costmodel) => { result.insert(&lang, &costmodel); },
                 _ => {}
@@ -2362,7 +2362,7 @@ mod tests {
         let hash = hash_script_data(
             &redeemers,
             &TxBuilderConstants::plutus_vasil_cost_models()
-                .retain_language_versions(vec![Language::new_plutus_v1()]),
+                .retain_language_versions(&Languages(vec![Language::new_plutus_v1()])),
             Some(datums),
         );
         assert_eq!(hex::encode(hash.to_bytes()), "e6129f50a866d19d95bc9c95ee87b57a9e695c05d92ba2746141b03c15cf5f70");