github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-20 00:28:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #833 from ardocrat/merge_master_staging

Browse Source 
Merge master staging
This commit is contained in:
ardocrat
2026-10-15 22:48:41 +03:00
committed by GitHub
parent 90846a4212 005c7e12df
commit f72076c1c2
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+7 -7
View File
@@ -2433,7 +2433,7 @@ dependencies = [
[[package]]
name = "grin_wallet"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"built",
"clap",
@@ -2462,7 +2462,7 @@ dependencies = [
[[package]]
name = "grin_wallet_api"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"base64 0.12.3",
"chrono",
@@ -2487,7 +2487,7 @@ dependencies = [
[[package]]
name = "grin_wallet_config"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"dirs 2.0.2",
"grin_core",
@@ -2503,7 +2503,7 @@ dependencies = [
[[package]]
name = "grin_wallet_controller"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"easy-jsonrpc-mw",
"ed25519-dalek",
@@ -2534,7 +2534,7 @@ dependencies = [
[[package]]
name = "grin_wallet_impls"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"arti-client",
"base64 0.12.3",
@@ -2581,7 +2581,7 @@ dependencies = [
[[package]]
name = "grin_wallet_libwallet"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"age",
"base64 0.9.3",
@@ -2619,7 +2619,7 @@ dependencies = [
[[package]]
name = "grin_wallet_util"
version = "5.5.0"
version = "5.5.1"
dependencies = [
"data-encoding",
"ed25519-dalek",
Cargo.toml
+6 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
@@ -38,11 +38,11 @@ rustyline = "9"
lazy_static = "1"
uuid = { version = "1.23.4", features = ["v4"] }
grin_wallet_api = { path = "./api", version = "5.5.0" }
grin_wallet_impls = { path = "./impls", version = "5.5.0" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.5.0" }
grin_wallet_controller = { path = "./controller", version = "5.5.0" }
grin_wallet_config = { path = "./config", version = "5.5.0" }
grin_wallet_api = { path = "./api", version = "5.5.1" }
grin_wallet_impls = { path = "./impls", version = "5.5.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.5.1" }
grin_wallet_controller = { path = "./controller", version = "5.5.1" }
grin_wallet_config = { path = "./config", version = "5.5.1" }
##### Grin Imports
api/Cargo.toml
+5 -5
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Grin Wallet API"
license = "Apache-2.0"
@@ -22,10 +22,10 @@ ring = "0.17.14"
base64 = "0.12"
ed25519-dalek = "2"
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.0" }
grin_wallet_config = { path = "../config", version = "5.5.0" }
grin_wallet_impls = { path = "../impls", version = "5.5.0" }
grin_wallet_util = { path = "../util", version = "5.5.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.1" }
grin_wallet_config = { path = "../config", version = "5.5.1" }
grin_wallet_impls = { path = "../impls", version = "5.5.1" }
grin_wallet_util = { path = "../util", version = "5.5.1" }
##### Grin Imports
config/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_config"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
controller/Cargo.toml
+6 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_controller"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Controllers for grin wallet instantiation"
license = "Apache-2.0"
@@ -25,11 +25,11 @@ lazy_static = "1"
thiserror = "1"
qr_code = "1.1.0"
grin_wallet_util = { path = "../util", version = "5.5.0" }
grin_wallet_api = { path = "../api", version = "5.5.0" }
grin_wallet_impls = { path = "../impls", version = "5.5.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.0" }
grin_wallet_config = { path = "../config", version = "5.5.0" }
grin_wallet_util = { path = "../util", version = "5.5.1" }
grin_wallet_api = { path = "../api", version = "5.5.1" }
grin_wallet_impls = { path = "../impls", version = "5.5.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.1" }
grin_wallet_config = { path = "../config", version = "5.5.1" }
##### Grin Imports
impls/Cargo.toml
+4 -4
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_impls"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Concrete types derived from libwallet traits"
license = "Apache-2.0"
@@ -47,9 +47,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.5.0" }
grin_wallet_config = { path = "../config", version = "5.5.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.0" }
grin_wallet_util = { path = "../util", version = "5.5.1" }
grin_wallet_config = { path = "../config", version = "5.5.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.5.1" }
##### Grin Imports
libwallet/Cargo.toml
+3 -3
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_libwallet"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
@@ -42,8 +42,8 @@ num-bigint = "0.2"
chacha20 = "0.8.1"
hmac = { version = "0.12.0", features = ["std"]}
grin_wallet_util = { path = "../util", version = "5.5.0" }
grin_wallet_config = { path = "../config", version = "5.5.0" }
grin_wallet_util = { path = "../util", version = "5.5.1" }
grin_wallet_config = { path = "../config", version = "5.5.1" }
##### Grin Imports
util/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_util"
version = "5.5.0"
version = "5.5.1"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Util, for generic utilities and to re-export grin crates"
license = "Apache-2.0"