Merge branch 'master' into staging_master

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	api/Cargo.toml
#	api/src/foreign.rs
#	api/src/owner.rs
#	config/Cargo.toml
#	controller/Cargo.toml
#	controller/tests/common/mod.rs
#	impls/Cargo.toml
#	libwallet/Cargo.toml
#	util/Cargo.toml
This commit is contained in:
ardocrat
2026-06-23 13:10:57 +03:00
11 changed files with 122 additions and 43 deletions
+4 -4
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_impls"
version = "5.4.0-alpha.1"
version = "5.4.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Concrete types derived from libwallet traits"
license = "Apache-2.0"
@@ -49,9 +49,9 @@ hyper-util = { version = "0.1.20", features = ["tokio"] }
http-body-util = "0.1.3"
bytes = "1.11.1"
grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" }
grin_wallet_util = { path = "../util", version = "5.4.1" }
grin_wallet_config = { path = "../config", version = "5.4.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.4.1" }
##### Grin Imports