Skip to content

Commit 3eb74e0

Browse files
authored
Merge pull request #90 from yeastplume/alpha4_bugfixes
Various bugfixes from Alpha
2 parents 06f45a6 + 9c96020 commit 3eb74e0

File tree

9 files changed

+839
-796
lines changed

9 files changed

+839
-796
lines changed

Cargo.lock

Lines changed: 148 additions & 147 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grin-gui"
3-
version = "0.1.0-alpha.4"
3+
version = "0.1.0-alpha.5"
44
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
55
description = "GUI wrapping grin and grin-wallet. Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
66
license = "Apache-2.0"
@@ -16,8 +16,8 @@ no-self-update = ["grin-gui-core/no-self-update"]
1616
debug = ["iced/debug"]
1717

1818
[dependencies]
19-
grin-gui-core = { version = "0.1.0-alpha.4", path = "crates/core", features = ["wgpu"]}
20-
grin-gui-widgets = { version = "0.1.0-alpha.4", path = "crates/widgets" }
19+
grin-gui-core = { version = "0.1.0-alpha.5", path = "crates/core", features = ["wgpu"]}
20+
grin-gui-widgets = { version = "0.1.0-alpha.5", path = "crates/widgets" }
2121

2222
iced = { version = "0.10", features = ["canvas", "tokio"] }
2323
iced_futures = { version = "0.7", features = ["async-std"] }
@@ -54,6 +54,7 @@ lazy_static = "1"
5454
serde = { version = "1.0", features=['derive'] }
5555
serde_json = "1.0.59"
5656
reqwest = { version = "0.11", features = ["json", "blocking"] }
57+
uuid = "0.8.2"
5758

5859

5960
[target.'cfg(target_os = "linux")'.dependencies]

crates/core/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "grin-gui-core"
33
description = "Core GUI library for Grin GUI"
4-
version = "0.1.0-alpha.4"
4+
version = "0.1.0-alpha.5"
55
authors = ["Yeastplume", "Casper Rogild Storm"]
66
license = "GPL-3.0"
77
homepage = "https://github.com/mimblewimble/grin-gui"
@@ -98,6 +98,7 @@ log4rs = { version = "0.12", features = [
9898
] }
9999
backtrace = "0.3"
100100
lazy_static = "1"
101+
uuid = "0.8.2"
101102

102103
iced = { version = "0.10", features = ["advanced", "tokio"] }
103104
iced_futures = { version = "0.7", features = ["async-std"] }

0 commit comments

Comments
 (0)