Merge branch 'master' into evgenii/non-protocol-entities-json

Author: vsubhuman

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cardano-serialization-lib",
-  "version": "11.0.0",
+  "version": "11.0.5",
   "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",

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "cardano-serialization-lib"
-version = "11.0.0"
+version = "11.0.5"
 edition = "2018"
 authors = ["EMURGO"]
 license = "MIT"

rust/Cargo.lock

@@ -1059,6 +1059,13 @@ declare export class BigNum {
    * @returns {boolean}
    */
   less_than(rhs_value: BigNum): boolean;
+
+  /**
+   * @param {BigNum} a
+   * @param {BigNum} b
+   * @returns {BigNum}
+   */
+  static max(a: BigNum, b: BigNum): BigNum;
 }
 /**
  */

rust/Cargo.toml

@@ -1,9 +1,5 @@
 #![allow(dead_code)]
-use crate::{
-    to_bignum, Address, BaseAddress, Bip32PrivateKey, DataHash, Ed25519KeyHash, Ed25519Signature,
-    NetworkInfo, StakeCredential, TransactionHash, TransactionIndex, TransactionInput,
-    TransactionOutput, Value, Vkey,
-};
+use crate::{to_bignum, Address, BaseAddress, Bip32PrivateKey, DataHash, Ed25519KeyHash, Ed25519Signature, NetworkInfo, StakeCredential, TransactionHash, TransactionIndex, TransactionInput, TransactionOutput, Value, Vkey, PolicyID};
 
 pub(crate) fn fake_bytes_32(x: u8) -> Vec<u8> {
     vec![
@@ -69,3 +65,7 @@ pub(crate) fn fake_vkey() -> Vkey {
 pub(crate) fn fake_signature(x: u8) -> Ed25519Signature {
     Ed25519Signature::from_bytes([x; 64].to_vec()).unwrap()
 }
+
+pub(crate) fn fake_policy_id(x: u8) -> PolicyID {
+    PolicyID::from([x; 28])
+}

rust/json-gen/Cargo.lock

@@ -256,6 +256,17 @@ impl DataCost {
             }
         }
     }
+
+    // <TODO:REMOVE_AFTER_BABBAGE>
+    pub(crate) fn coins_per_word(&self) -> Result<Coin, JsError> {
+        match &self.0 {
+            DataCostEnum::CoinsPerByte(coins_per_byte) => {
+                coins_per_byte
+                    .checked_mul(&BigNum::from_str("8")?)
+            },
+            DataCostEnum::CoinsPerWord(coins_per_word) => Ok(coins_per_word.clone()),
+        }
+    }
 }
 
 #[wasm_bindgen]

rust/pkg/cardano_serialization_lib.js.flow

@@ -385,6 +385,17 @@ impl Costmdls {
         }
         serializer.finalize()
     }
+
+    pub(crate) fn retain_language_versions(&self, languages: Vec<Language>) -> Costmdls {
+        let mut result = Costmdls::new();
+        for lang in languages {
+            match self.get(&lang) {
+                Some(costmodel) => { result.insert(&lang, &costmodel); },
+                _ => {}
+            }
+        }
+        result
+    }
 }
 
 #[wasm_bindgen]
@@ -1909,6 +1920,7 @@ impl Deserialize for Strings {
 mod tests {
     use super::*;
     use hex::*;
+    use crate::tx_builder_constants::TxBuilderConstants;
 
     #[test]
     pub fn plutus_constr_data() {
@@ -2074,6 +2086,7 @@ mod tests {
         assert_eq!(datum, datum2);
     }
 
+    #[test]
     pub fn test_cost_model() {
         let arr = vec![
             197209, 0, 1, 1, 396231, 621, 0, 1, 150000, 1000, 0, 1, 150000, 32, 2477736, 29175, 4,
@@ -2294,4 +2307,64 @@ mod tests {
             "816cdf6d4d8cba3ad0188ca643db95ddf0e03cdfc0e75a9550a72a82cb146222"
         );
     }
+
+    #[test]
+    fn test_known_plutus_data_hash_with_no_datums() {
+        let mut costmodels = Costmdls::new();
+        costmodels.insert(
+            &Language::new_plutus_v2(),
+            &TxBuilderConstants::plutus_vasil_cost_models().get(&Language::new_plutus_v2()).unwrap(),
+        );
+        let hash = hash_script_data(
+            &Redeemers(vec![
+                Redeemer::new(
+                    &RedeemerTag::new_spend(),
+                    &BigNum::zero(),
+                    &PlutusData::new_empty_constr_plutus_data(&BigNum::zero()),
+                    &ExUnits::new(&to_bignum(842996), &to_bignum(246100241)),
+                ),
+            ]),
+            &costmodels,
+            None,
+        );
+        assert_eq!(hex::encode(hash.to_bytes()), "ac71f2adcaecd7576fa658098b12001dec03ce5c27dbb890e16966e3e135b3e2");
+    }
+
+    #[test]
+    fn test_known_plutus_data_hash_2() {
+        let datums = PlutusList::from(vec![
+            PlutusData::new_constr_plutus_data(
+                &ConstrPlutusData::new(
+                    &BigNum::zero(),
+                    &PlutusList::from(vec![
+                        PlutusData::new_bytes(
+                            hex::decode("45F6A506A49A38263C4A8BBB2E1E369DD8732FB1F9A281F3E8838387").unwrap(),
+                        ),
+                        PlutusData::new_integer(&BigInt::from_str("60000000").unwrap()),
+                        PlutusData::new_bytes(
+                            hex::decode("EE8E37676F6EBB8E031DFF493F88FF711D24AA68666A09D61F1D3FB3").unwrap(),
+                        ),
+                        PlutusData::new_bytes(
+                            hex::decode("43727970746F44696E6F3036333039").unwrap(),
+                        ),
+                    ]),
+                )
+            )
+        ]);
+        let redeemers = Redeemers(vec![
+            Redeemer::new(
+                &RedeemerTag::new_spend(),
+                &BigNum::one(),
+                &PlutusData::new_empty_constr_plutus_data(&BigNum::one()),
+                &ExUnits::new(&to_bignum(61300), &to_bignum(18221176)),
+            ),
+        ]);
+        let hash = hash_script_data(
+            &redeemers,
+            &TxBuilderConstants::plutus_vasil_cost_models()
+                .retain_language_versions(vec![Language::new_plutus_v1()]),
+            Some(datums),
+        );
+        assert_eq!(hex::encode(hash.to_bytes()), "e6129f50a866d19d95bc9c95ee87b57a9e695c05d92ba2746141b03c15cf5f70");
+    }
 }