Skip to content

Commit

Permalink
Merge pull request #77 from mlabs-haskell/szg251/update-csl-and-oura
Browse files Browse the repository at this point in the history
Update csl, oura and pallas
  • Loading branch information
szg251 authored Sep 5, 2024
2 parents b5af06d + f2bedd7 commit a53ac2d
Show file tree
Hide file tree
Showing 9 changed files with 638 additions and 188 deletions.
8 changes: 4 additions & 4 deletions extras/tx-bakery-testsuite/tests/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions extras/tx-bakery-testsuite/tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ lbf-tx-bakery-tests-plutus-api = { path = ".extras/lbf-tx-bakery-tests-plutus-ap
lbr-prelude = { version = "0.1.1", features = ["derive"] }
lbf-prelude = { path = ".extras/lbf-prelude-0.1.0" }
plutus-ledger-api = { version = "1.0.0", features = ["lbf", "chrono"] }
tx-bakery = { version = "2.0.0-beta.1", path = ".extras/tx-bakery-v2" }
tx-bakery = { version = "2.0.0-beta.2", path = ".extras/tx-bakery-v2" }
tokio = { version = "1.24.2", features = ["full"] }
chrono = "0.4.35"
num-bigint = { version = "0.4.4", features = ["serde"] }
url = "2.5.2"
assertables = "7.0.1"
tx-bakery-ogmios = { version = "2.0.0-beta.1", path = ".extras/tx-bakery-ogmios-v2" }
tx-bakery-ogmios = { version = "2.0.0-beta.2", path = ".extras/tx-bakery-ogmios-v2" }
8 changes: 4 additions & 4 deletions tx-bakery-ogmios/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tx-bakery-ogmios/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "tx-bakery-ogmios"
version = "2.0.0-beta.1"
version = "2.0.0-beta.2"
edition = "2021"

[dependencies]
tx-bakery = { version = "2.0.0-beta.1", path = ".extras/tx-bakery-v2" }
tx-bakery = { version = "2.0.0-beta.2", path = ".extras/tx-bakery-v2" }
tokio = { version = "1.24.2", features = ["full"] }
tracing = "0.1"
anyhow = { version = "1.0.79", features = ["backtrace"] }
Expand Down
6 changes: 3 additions & 3 deletions tx-bakery/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tx-bakery/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "tx-bakery"
version = "2.0.0-beta.1"
version = "2.0.0-beta.2"
edition = "2021"
license = "Apache-2.0"
description = "Cardano transaction builder"
repository = "https://github.com/mlabs-haskell/tx-village"

[dependencies]
cardano-serialization-lib = "12.0.0-beta.9"
cardano-serialization-lib = "12.0.1"
plutus-ledger-api = { version = "1.0.0", features = ["lbf", "chrono"] }
num-bigint = { version = "0.4.4", features = ["serde"] }
serde_json = { version = "1.0.111", features = ["raw_value"] }
Expand Down
2 changes: 1 addition & 1 deletion tx-bakery/src/utils/pla_to_csl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ impl TryFromPLA<BTreeMap<TokenName, BigInt>> for csl::MintAssets {
) -> Result<Self, TryFromPLAError> {
val.iter()
.try_fold(csl::MintAssets::new(), |mut acc, (k, v)| {
acc.insert(&k.try_to_csl()?, v.try_to_csl()?)
acc.insert(&k.try_to_csl()?, &v.try_to_csl()?)
.map_err(TryFromPLAError::CSLJsError)?;
Ok(acc)
})
Expand Down
Loading

0 comments on commit a53ac2d

Please sign in to comment.