Merge branch 'master' into bump-bindgen

Author: vsubhuman

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cardano-serialization-lib",
-  "version": "10.0.0-beta.8",
+  "version": "10.0.0-beta.9",
   "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,6 +1,6 @@
 [package]
 name = "cardano-serialization-lib"
-version = "10.0.0-beta.8"
+version = "10.0.0-beta.9"
 edition = "2018"
 authors = ["EMURGO"]
 license = "MIT"

rust/Cargo.lock

@@ -5,6 +5,42 @@
  * @flow
  */
 
+/**
+ * @param {Uint8Array} bytes
+ * @returns {TransactionMetadatum}
+ */
+declare export function encode_arbitrary_bytes_as_metadatum(
+  bytes: Uint8Array
+): TransactionMetadatum;
+
+/**
+ * @param {TransactionMetadatum} metadata
+ * @returns {Uint8Array}
+ */
+declare export function decode_arbitrary_bytes_from_metadatum(
+  metadata: TransactionMetadatum
+): Uint8Array;
+
+/**
+ * @param {string} json
+ * @param {number} schema
+ * @returns {TransactionMetadatum}
+ */
+declare export function encode_json_str_to_metadatum(
+  json: string,
+  schema: number
+): TransactionMetadatum;
+
+/**
+ * @param {TransactionMetadatum} metadatum
+ * @param {number} schema
+ * @returns {string}
+ */
+declare export function decode_metadatum_to_json_str(
+  metadatum: TransactionMetadatum,
+  schema: number
+): string;
+
 /**
  * @param {TransactionHash} tx_body_hash
  * @param {ByronAddress} addr
@@ -129,56 +165,6 @@ declare export function encode_json_str_to_native_script(
   schema: number
 ): NativeScript;
 
-/**
- * @param {Transaction} tx
- * @param {LinearFee} linear_fee
- * @returns {BigNum}
- */
-declare export function min_fee(tx: Transaction, linear_fee: LinearFee): BigNum;
-
-/**
- * @param {Uint8Array} bytes
- * @returns {TransactionMetadatum}
- */
-declare export function encode_arbitrary_bytes_as_metadatum(
-  bytes: Uint8Array
-): TransactionMetadatum;
-
-/**
- * @param {TransactionMetadatum} metadata
- * @returns {Uint8Array}
- */
-declare export function decode_arbitrary_bytes_from_metadatum(
-  metadata: TransactionMetadatum
-): Uint8Array;
-
-/**
- * @param {string} json
- * @param {number} schema
- * @returns {TransactionMetadatum}
- */
-declare export function encode_json_str_to_metadatum(
-  json: string,
-  schema: number
-): TransactionMetadatum;
-
-/**
- * @param {TransactionMetadatum} metadatum
- * @param {number} schema
- * @returns {string}
- */
-declare export function decode_metadatum_to_json_str(
-  metadatum: TransactionMetadatum,
-  schema: number
-): string;
-
-/**
- * @param {Transaction} tx
- * @param {LinearFee} linear_fee
- * @returns {BigNum}
- */
-declare export function min_fee(tx: Transaction, linear_fee: LinearFee): BigNum;
-
 /**
  * @param {string} password
  * @param {string} salt
@@ -203,6 +189,13 @@ declare export function decrypt_with_password(
   data: string
 ): string;
 
+/**
+ * @param {Transaction} tx
+ * @param {LinearFee} linear_fee
+ * @returns {BigNum}
+ */
+declare export function min_fee(tx: Transaction, linear_fee: LinearFee): BigNum;
+
 /**
  */
 
@@ -272,6 +265,14 @@ declare export var NetworkIdKind: {|
   +Mainnet: 1, // 1
 |};
 
+/**
+ */
+
+declare export var StakeCredKind: {|
+  +Key: 0, // 0
+  +Script: 1, // 1
+|};
+
 /**
  */
 
@@ -300,15 +301,6 @@ declare export var RedeemerTagKind: {|
   +Reward: 3, // 3
 |};
 
-/**
- * Used to choosed the schema for a script JSON string
- */
-
-declare export var ScriptSchema: {|
-  +Wallet: 0, // 0
-  +Node: 1, // 1
-|};
-
 /**
  */
 
@@ -330,11 +322,12 @@ declare export var MetadataJsonSchema: {|
 |};
 
 /**
+ * Used to choosed the schema for a script JSON string
  */
 
-declare export var StakeCredKind: {|
-  +Key: 0, // 0
-  +Script: 1, // 1
+declare export var ScriptSchema: {|
+  +Wallet: 0, // 0
+  +Node: 1, // 1
 |};
 
 /**
@@ -347,14 +340,6 @@ declare export var CoinSelectionStrategyCIP2: {|
   +RandomImproveMultiAsset: 3, // 3
 |};
 
-/**
- */
-
-declare export var StakeCredKind: {|
-  +Key: 0, // 0
-  +Script: 1, // 1
-|};
-
 /**
  */
 declare export class Address {
@@ -3161,17 +3146,17 @@ declare export class PlutusScript {
   static from_bytes(bytes: Uint8Array): PlutusScript;
 
   /**
-   * * Creates a new Plutus script from the RAW bytes of the compiled script.
-   * * This does NOT include any CBOR encoding around these bytes (e.g. from "cborBytes" in cardano-cli)
-   * * If you creating this from those you should use PlutusScript::from_bytes() instead.
+   * Creates a new Plutus script from the RAW bytes of the compiled script.
+   * This does NOT include any CBOR encoding around these bytes (e.g. from "cborBytes" in cardano-cli)
+   * If you creating this from those you should use PlutusScript::from_bytes() instead.
    * @param {Uint8Array} bytes
    * @returns {PlutusScript}
    */
   static new(bytes: Uint8Array): PlutusScript;
 
   /**
-   * * The raw bytes of this compiled Plutus script.
-   * * If you need "cborBytes" for cardano-cli use PlutusScript::to_bytes() instead.
+   * The raw bytes of this compiled Plutus script.
+   * If you need "cborBytes" for cardano-cli use PlutusScript::to_bytes() instead.
    * @returns {Uint8Array}
    */
   bytes(): Uint8Array;
@@ -4992,6 +4977,13 @@ declare export class TransactionBody {
   /**
    * @returns {Mint | void}
    */
+  mint(): Mint | void;
+
+  /**
+   * This function returns the mint value of the transaction
+   * Use `.mint()` instead.
+   * @returns {Mint | void}
+   */
   multiassets(): Mint | void;
 
   /**

rust/Cargo.toml

@@ -96,7 +96,8 @@ fn fake_full_tx(tx_builder: &TransactionBuilder, body: TransactionBody) -> Resul
         0 => None,
         _x => {
             // TODO: figure out how to populate fake witnesses for these
-            return Err(JsError::from_str("Script inputs not supported yet"))
+            // return Err(JsError::from_str("Script inputs not supported yet"))
+            None
         },
     };
     let bootstrap_keys = match tx_builder.input_types.bootstraps.len() {

rust/pkg/cardano_serialization_lib.js.flow

@@ -898,19 +898,33 @@ pub fn hash_plutus_data(plutus_data: &PlutusData) -> DataHash {
 }
 #[wasm_bindgen]
 pub fn hash_script_data(redeemers: &Redeemers, cost_models: &Costmdls, datums: Option<PlutusList>) -> ScriptDataHash {
-    /*
-    ; script data format:
-    ; [ redeemers | datums | language views ]
-    ; The redeemers are exactly the data present in the transaction witness set.
-    ; Similarly for the datums, if present. If no datums are provided, the middle
-    ; field is an empty string.
-    */
     let mut buf = Vec::new();
-    buf.extend(redeemers.to_bytes());
-    if let Some(d) = &datums {
-        buf.extend(d.to_bytes());
+    if redeemers.len() == 0 && datums.is_some() {
+        /*
+        ; Finally, note that in the case that a transaction includes datums but does not
+        ; include any redeemers, the script data format becomes (in hex):
+        ; [ 80 | datums | A0 ]
+        ; corresponding to a CBOR empty list and an empty map (our apologies).
+        */
+        buf.push(0x80);
+        if let Some(d) = &datums {
+            buf.extend(d.to_bytes());
+        }
+        buf.push(0xA0);
+    } else {
+        /*
+        ; script data format:
+        ; [ redeemers | datums | language views ]
+        ; The redeemers are exactly the data present in the transaction witness set.
+        ; Similarly for the datums, if present. If no datums are provided, the middle
+        ; field is an empty string.
+        */
+        buf.extend(redeemers.to_bytes());
+        if let Some(d) = &datums {
+            buf.extend(d.to_bytes());
+        }
+        buf.extend(cost_models.language_views_encoding());
     }
-    buf.extend(cost_models.language_views_encoding());
     ScriptDataHash::from(blake2b256(&buf))
 }