Skip to content

Commit 69048f1

Browse files
authored
Merge pull request #358 from Emurgo/release/10.0.0
Release / 10.0.0
2 parents 3c958de + 11bf9df commit 69048f1

File tree

7 files changed

+17
-19
lines changed

7 files changed

+17
-19
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cardano-serialization-lib",
3-
"version": "10.0.0-beta.9",
3+
"version": "10.0.0",
44
"description": "(De)serialization functions for the Cardano blockchain along with related utility functions",
55
"scripts": {
66
"rust:build-nodejs": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=nodejs; wasm-pack pack) && npm run js:flowgen",

rust/Cargo.lock

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cardano-serialization-lib"
3-
version = "10.0.0-beta.9"
3+
version = "10.0.0"
44
edition = "2018"
55
authors = ["EMURGO"]
66
license = "MIT"

rust/pkg/cardano_serialization_lib.js.flow

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,13 @@ declare export function encode_json_str_to_native_script(
165165
schema: number
166166
): NativeScript;
167167

168+
/**
169+
* @param {Transaction} tx
170+
* @param {LinearFee} linear_fee
171+
* @returns {BigNum}
172+
*/
173+
declare export function min_fee(tx: Transaction, linear_fee: LinearFee): BigNum;
174+
168175
/**
169176
* @param {string} password
170177
* @param {string} salt
@@ -189,13 +196,6 @@ declare export function decrypt_with_password(
189196
data: string
190197
): string;
191198

192-
/**
193-
* @param {Transaction} tx
194-
* @param {LinearFee} linear_fee
195-
* @returns {BigNum}
196-
*/
197-
declare export function min_fee(tx: Transaction, linear_fee: LinearFee): BigNum;
198-
199199
/**
200200
*/
201201

@@ -5707,13 +5707,13 @@ declare export class TransactionOutputAmountBuilder {
57075707
): TransactionOutputAmountBuilder;
57085708

57095709
/**
5710-
* @param {BigNum} coins_per_utxo_word
57115710
* @param {MultiAsset} multiasset
5711+
* @param {BigNum} coins_per_utxo_word
57125712
* @returns {TransactionOutputAmountBuilder}
57135713
*/
57145714
with_asset_and_min_required_coin(
5715-
coins_per_utxo_word: BigNum,
5716-
multiasset: MultiAsset
5715+
multiasset: MultiAsset,
5716+
coins_per_utxo_word: BigNum
57175717
): TransactionOutputAmountBuilder;
57185718

57195719
/**

rust/src/output_builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl TransactionOutputAmountBuilder {
7676
cfg
7777
}
7878

79-
pub fn with_asset_and_min_required_coin(&self, coins_per_utxo_word: &Coin, multiasset: &MultiAsset) -> Result<TransactionOutputAmountBuilder, JsError> {
79+
pub fn with_asset_and_min_required_coin(&self, multiasset: &MultiAsset, coins_per_utxo_word: &Coin) -> Result<TransactionOutputAmountBuilder, JsError> {
8080
let min_possible_coin = min_pure_ada(&coins_per_utxo_word, self.data_hash.is_some())?;
8181
let mut value = Value::new(&min_possible_coin);
8282
value.set_multiasset(multiasset);

rust/src/tx_builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ impl TransactionBuilder {
897897
).as_positive_multiasset();
898898

899899
self.add_output(&output_builder
900-
.with_asset_and_min_required_coin(&self.config.coins_per_utxo_word, &multiasset)?
900+
.with_asset_and_min_required_coin(&multiasset, &self.config.coins_per_utxo_word)?
901901
.build()?
902902
)
903903
}
@@ -3862,7 +3862,7 @@ mod tests {
38623862
&TransactionOutputBuilder::new()
38633863
.with_address(&address)
38643864
.next().unwrap()
3865-
.with_asset_and_min_required_coin(&tx_builder.config.coins_per_utxo_word, &multiasset).unwrap()
3865+
.with_asset_and_min_required_coin(&multiasset, &tx_builder.config.coins_per_utxo_word).unwrap()
38663866
.build().unwrap()
38673867
).unwrap();
38683868

0 commit comments

Comments
 (0)