min-ada calculation update, Version bump: 11.0.1

Author: vsubhuman

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cardano-serialization-lib",
-  "version": "11.0.1-alpha.5",
+  "version": "11.0.1",
   "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.1-alpha.5"
+version = "11.0.1"
 edition = "2018"
 authors = ["EMURGO"]
 license = "MIT"

rust/Cargo.lock

@@ -408,6 +408,13 @@ impl Value {
                 .unwrap_or(true)
     }
 
+    pub(crate) fn has_assets(&self) -> bool {
+        match &self.multiasset {
+            Some(ma) => { ma.len() > 0 }
+            _ => false
+        }
+    }
+
     pub fn coin(&self) -> Coin {
         self.coin
     }
@@ -1378,33 +1385,35 @@ impl MinOutputAdaCalculator {
     }
 
     pub fn calculate_ada(&self) -> Result<BigNum, JsError> {
-        let has_data_hash = self.output.has_data_hash().clone();
         let coins_per_byte = self.data_cost.coins_per_byte();
         let mut output: TransactionOutput = self.output.clone();
         fn calc_required_coin(
             output: &TransactionOutput,
             coins_per_byte: &Coin,
-            has_data_hash: bool,
         ) -> Result<Coin, JsError> {
             // Adding extra words to the estimate
             // <TODO:REMOVE_AFTER_BABBAGE>
-            let compatibility_extra_bytes = if has_data_hash { 160 } else { 80 };
+            let compatibility_extra_bytes = if output.amount().has_assets() {
+                if output.has_data_hash() { 160 } else { 80 }
+            } else {
+                0
+            };
             //according to https://hydra.iohk.io/build/15339994/download/1/babbage-changes.pdf
             //See on the page 9 getValue txout
             BigNum::from(output.to_bytes().len())
                 .checked_add(&to_bignum(160 + compatibility_extra_bytes))?
                 .checked_mul(&coins_per_byte)
         }
         for _ in 0..3 {
-            let required_coin = calc_required_coin(&output, &coins_per_byte, has_data_hash)?;
+            let required_coin = calc_required_coin(&output, &coins_per_byte)?;
             if output.amount.coin.less_than(&required_coin) {
                 output.amount.coin = required_coin.clone();
             } else {
                 return Ok(required_coin);
             }
         }
         output.amount.coin = to_bignum(u64::MAX);
-        calc_required_coin(&output, &coins_per_byte, has_data_hash)
+        calc_required_coin(&output, &coins_per_byte)
     }
 
     fn create_fake_output() -> Result<TransactionOutput, JsError> {