From 95123a234aea21e935e96593ccfa562ca39398d8 Mon Sep 17 00:00:00 2001 From: vantuz-subhuman Date: Sun, 6 Feb 2022 23:32:29 +0300 Subject: [PATCH 1/2] Flowgen update. Version bump 10.0.0 --- package-lock.json | 2 +- package.json | 2 +- rust/Cargo.lock | 4 +--- rust/Cargo.toml | 2 +- rust/pkg/cardano_serialization_lib.js.flow | 14 +++++++------- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b8e57fd..ff4f9abd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cardano-serialization-lib", - "version": "10.0.0-beta.9", + "version": "10.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 099c3e94..33bf0e92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cardano-serialization-lib", - "version": "10.0.0-beta.9", + "version": "10.0.0", "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", diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 80bed476..18e43155 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "aho-corasick" version = "0.7.15" @@ -52,7 +50,7 @@ checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" [[package]] name = "cardano-serialization-lib" -version = "10.0.0-beta.9" +version = "10.0.0" dependencies = [ "bech32", "cbor_event", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index b2d4afb2..32c0b78a 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cardano-serialization-lib" -version = "10.0.0-beta.9" +version = "10.0.0" edition = "2018" authors = ["EMURGO"] license = "MIT" diff --git a/rust/pkg/cardano_serialization_lib.js.flow b/rust/pkg/cardano_serialization_lib.js.flow index 13ea2a51..709579e7 100644 --- a/rust/pkg/cardano_serialization_lib.js.flow +++ b/rust/pkg/cardano_serialization_lib.js.flow @@ -165,6 +165,13 @@ 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 {string} password * @param {string} salt @@ -189,13 +196,6 @@ 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; - /** */ From c2065317bcad216e2386e5baf9f335ea6bc6df19 Mon Sep 17 00:00:00 2001 From: vantuz-subhuman Date: Mon, 7 Feb 2022 00:14:33 +0300 Subject: [PATCH 2/2] Changed the order of the arguments in the `with_asset_and_min_required_coin` function in the transaction-output-builder --- rust/pkg/cardano_serialization_lib.js.flow | 6 +++--- rust/src/output_builder.rs | 2 +- rust/src/tx_builder.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rust/pkg/cardano_serialization_lib.js.flow b/rust/pkg/cardano_serialization_lib.js.flow index 709579e7..524ccbae 100644 --- a/rust/pkg/cardano_serialization_lib.js.flow +++ b/rust/pkg/cardano_serialization_lib.js.flow @@ -5707,13 +5707,13 @@ declare export class TransactionOutputAmountBuilder { ): TransactionOutputAmountBuilder; /** - * @param {BigNum} coins_per_utxo_word * @param {MultiAsset} multiasset + * @param {BigNum} coins_per_utxo_word * @returns {TransactionOutputAmountBuilder} */ with_asset_and_min_required_coin( - coins_per_utxo_word: BigNum, - multiasset: MultiAsset + multiasset: MultiAsset, + coins_per_utxo_word: BigNum ): TransactionOutputAmountBuilder; /** diff --git a/rust/src/output_builder.rs b/rust/src/output_builder.rs index a6306a64..07487afc 100644 --- a/rust/src/output_builder.rs +++ b/rust/src/output_builder.rs @@ -76,7 +76,7 @@ impl TransactionOutputAmountBuilder { cfg } - pub fn with_asset_and_min_required_coin(&self, coins_per_utxo_word: &Coin, multiasset: &MultiAsset) -> Result { + pub fn with_asset_and_min_required_coin(&self, multiasset: &MultiAsset, coins_per_utxo_word: &Coin) -> Result { let min_possible_coin = min_pure_ada(&coins_per_utxo_word, self.data_hash.is_some())?; let mut value = Value::new(&min_possible_coin); value.set_multiasset(multiasset); diff --git a/rust/src/tx_builder.rs b/rust/src/tx_builder.rs index 8666a566..b6fff864 100644 --- a/rust/src/tx_builder.rs +++ b/rust/src/tx_builder.rs @@ -897,7 +897,7 @@ impl TransactionBuilder { ).as_positive_multiasset(); self.add_output(&output_builder - .with_asset_and_min_required_coin(&self.config.coins_per_utxo_word, &multiasset)? + .with_asset_and_min_required_coin(&multiasset, &self.config.coins_per_utxo_word)? .build()? ) } @@ -3862,7 +3862,7 @@ mod tests { &TransactionOutputBuilder::new() .with_address(&address) .next().unwrap() - .with_asset_and_min_required_coin(&tx_builder.config.coins_per_utxo_word, &multiasset).unwrap() + .with_asset_and_min_required_coin(&multiasset, &tx_builder.config.coins_per_utxo_word).unwrap() .build().unwrap() ).unwrap();