Merge branch 'master' into ptr-addr-u64

Author: rooooooooob

doc/getting-started/generating-transactions.md

@@ -25,17 +25,19 @@ Fees are automatically calculated and sent to a change address in the example.
 
 ```javascript
 // instantiate the tx builder with the Cardano protocol parameters - these may change later on
-const txBuilder = CardanoWasm.TransactionBuilder.new(
-    // all of these are taken from the mainnet genesis settings
-    // linear fee parameters (a*size + b)
-    CardanoWasm.LinearFee.new(CardanoWasm.BigNum.from_str('44'), CardanoWasm.BigNum.from_str('155381')),
-    // minimum utxo value
-    CardanoWasm.BigNum.from_str('1000000'),
-    // pool deposit
-    CardanoWasm.BigNum.from_str('500000000'),
-    // key deposit
-    CardanoWasm.BigNum.from_str('2000000')
+const linearFee = CardanoWasm.LinearFee.new(
+    CardanoWasm.BigNum.from_str('44'),
+    CardanoWasm.BigNum.from_str('155381')
 );
+const txBuilderCfg = CardanoWasm.TransactionBuilderConfigBuilder.new()
+    .fee_algo(linearFee)
+    .pool_deposit(CardanoWasm.BigNum.from_str('500000000'))
+    .key_deposit(CardanoWasm.BigNum.from_str('2000000'))
+    .max_value_size(4000)
+    .max_tx_size(8000)
+    .coins_per_utxo_word(CardanoWasm.BigNum.from_str('34482'))
+    .build();
+const txBuilder = CardanoWasm.TransactionBuilder.new(txBuilderCfg);
 
 // add a keyhash input - for ADA held in a Shelley-era normal address (Base, Enterprise, Pointer)
 const prvKey = CardanoWasm.PrivateKey.from_bech32("ed25519e_sk16rl5fqqf4mg27syjzjrq8h3vq44jnnv52mvyzdttldszjj7a64xtmjwgjtfy25lu0xmv40306lj9pcqpa6slry9eh3mtlqvfjz93vuq0grl80");
@@ -80,22 +82,27 @@ txBuilder.add_output(
 txBuilder.set_ttl(410021);
 
 // calculate the min fee required and send any change to an address
-txBuilder.add_change_if_needed(shelleyChangeAddress)
+txBuilder.add_change_if_needed(shelleyChangeAddress);
 
 // once the transaction is ready, we build it to get the tx body without witnesses
 const txBody = txBuilder.build();
 const txHash = CardanoWasm.hash_transaction(txBody);
 const witnesses = CardanoWasm.TransactionWitnessSet.new();
 
 // add keyhash witnesses
-const vkeyWitnesses = CardanoWasm.VkeyWitnesses.new();
+const vkeyWitnesses = CardanoWasm.Vkeywitnesses.new();
 const vkeyWitness = CardanoWasm.make_vkey_witness(txHash, prvKey);
 vkeyWitnesses.add(vkeyWitness);
 witnesses.set_vkeys(vkeyWitnesses);
 
 // add bootstrap (Byron-era) witnesses
+const cip1852Account = CardanoWasm.Bip32PrivateKey.from_bech32('xprv1hretan5mml3tq2p0twkhq4tz4jvka7m2l94kfr6yghkyfar6m9wppc7h9unw6p65y23kakzct3695rs32z7vaw3r2lg9scmfj8ec5du3ufydu5yuquxcz24jlkjhsc9vsa4ufzge9s00fn398svhacse5su2awrw');
 const bootstrapWitnesses = CardanoWasm.BootstrapWitnesses.new();
-const bootstrapWitness = CardanoWasm.make_icarus_bootstrap_witness(txHash,byronAddress,getCip1852Account());
+const bootstrapWitness = CardanoWasm.make_icarus_bootstrap_witness(
+    txHash,
+    byronAddress,
+    cip1852Account,
+);
 bootstrapWitnesses.add(bootstrapWitness);
 witnesses.set_bootstraps(bootstrapWitnesses);
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cardano-serialization-lib",
-  "version": "10.0.3",
+  "version": "10.0.4",
   "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; wasm-pack pack) && npm run js:flowgen",

package.json

@@ -1,12 +1,13 @@
 [package]
 name = "cardano-serialization-lib"
-version = "10.0.3"
+version = "10.0.4"
 edition = "2018"
 authors = ["EMURGO"]
 license = "MIT"
 description = "(De)serialization functions for the Cardano blockchain along with related utility functions"
 documentation = "https://docs.cardano.org/cardano-components/cardano-serialization-lib"
 repository = "https://github.com/Emurgo/cardano-serialization-lib"
+readme="../README.md"
 exclude = [
     "pkg/*",
 ]

rust/Cargo.lock

@@ -1272,12 +1272,12 @@ mod tests {
         // witness_set should have fixed length array
         let mut witness_set = TransactionWitnessSet::new();
         witness_set.set_plutus_data(&list);
-        assert_eq!("a1048101", hex::encode(witness_set.to_bytes()));
+        assert_eq!("a1049f01ff", hex::encode(witness_set.to_bytes()));
 
         list = PlutusList::new();
         list.add(&datum);
         witness_set.set_plutus_data(&list);
-        assert_eq!(format!("a10481{}", datum_cli), hex::encode(witness_set.to_bytes()));
+        assert_eq!(format!("a1049f{}ff", datum_cli), hex::encode(witness_set.to_bytes()));
     }
 
     #[test]
@@ -1287,4 +1287,33 @@ mod tests {
         let new_bytes = datums.to_bytes();
         assert_eq!(orig_bytes, new_bytes);
     }
+
+    #[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, 29773, 100, 29773, 100, 29773, 100, 29773, 100, 29773,
+            100, 29773, 100, 100, 100, 29773, 100, 150000, 32, 150000, 32, 150000, 32,
+            150000, 1000, 0, 1, 150000, 32, 150000, 1000, 0, 8, 148000, 425507, 118,
+            0, 1, 1, 150000, 1000, 0, 8, 150000, 112536, 247, 1, 150000, 10000, 1,
+            136542, 1326, 1, 1000, 150000, 1000, 1, 150000, 32, 150000, 32, 150000,
+            32, 1, 1, 150000, 1, 150000, 4, 103599, 248, 1, 103599, 248, 1, 145276,
+            1366, 1, 179690, 497, 1, 150000, 32, 150000, 32, 150000, 32, 150000, 32,
+            150000, 32, 150000, 32, 148000, 425507, 118, 0, 1, 1, 61516, 11218, 0, 1,
+            150000, 32, 148000, 425507, 118, 0, 1, 1, 148000, 425507, 118, 0, 1, 1,
+            2477736, 29175, 4, 0, 82363, 4, 150000, 5000, 0, 1, 150000, 32, 197209, 0,
+            1, 1, 150000, 32, 150000, 32, 150000, 32, 150000, 32, 150000, 32, 150000,
+            32, 150000, 32, 3345831, 1, 1,
+        ];
+        let cm = arr.iter().fold((CostModel::new(), 0), |(mut cm, i), x| {
+            cm.set(i, &Int::new_i32(x.clone()));
+            (cm, i + 1)
+        }).0;
+        let mut cms = Costmdls::new();
+        cms.insert(&Language::new_plutus_v1(), &cm);
+        assert_eq!(
+            hex::encode(cms.language_views_encoding()),
+            "a141005901d59f1a000302590001011a00060bc719026d00011a000249f01903e800011a000249f018201a0025cea81971f70419744d186419744d186419744d186419744d186419744d186419744d18641864186419744d18641a000249f018201a000249f018201a000249f018201a000249f01903e800011a000249f018201a000249f01903e800081a000242201a00067e2318760001011a000249f01903e800081a000249f01a0001b79818f7011a000249f0192710011a0002155e19052e011903e81a000249f01903e8011a000249f018201a000249f018201a000249f0182001011a000249f0011a000249f0041a000194af18f8011a000194af18f8011a0002377c190556011a0002bdea1901f1011a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000242201a00067e23187600010119f04c192bd200011a000249f018201a000242201a00067e2318760001011a000242201a00067e2318760001011a0025cea81971f704001a000141bb041a000249f019138800011a000249f018201a000302590001011a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a00330da70101ff"
+        );
+    }
 }

rust/Cargo.toml

@@ -1806,10 +1806,7 @@ impl cbor_event::se::Serialize for TransactionWitnessSet {
         }
         if let Some(field) = &self.plutus_data {
             serializer.write_unsigned_integer(4)?;
-            serializer.write_array(cbor_event::Len::Len(field.len() as u64))?;
-            for i in 0..field.len() {
-              field.get(i).serialize(serializer)?;
-            }
+            field.serialize(serializer)?;
         }
         if let Some(field) = &self.redeemers {
             serializer.write_unsigned_integer(5)?;