Skip to content

Commit

Permalink
Merge pull request mimblewimble#92 from yeastplume/wallet_import
Browse files Browse the repository at this point in the history
Wallet Import functionality
  • Loading branch information
yeastplume authored Mar 6, 2024
2 parents 3eb74e0 + 3af84c6 commit d93dc75
Show file tree
Hide file tree
Showing 15 changed files with 736 additions and 184 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin-gui"
version = "0.1.0-alpha.5"
version = "0.1.0-alpha.6"
authors = ["Grin Developers <[email protected]>"]
description = "GUI wrapping grin and grin-wallet. Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -16,8 +16,8 @@ no-self-update = ["grin-gui-core/no-self-update"]
debug = ["iced/debug"]

[dependencies]
grin-gui-core = { version = "0.1.0-alpha.5", path = "crates/core", features = ["wgpu"]}
grin-gui-widgets = { version = "0.1.0-alpha.5", path = "crates/widgets" }
grin-gui-core = { version = "0.1.0-alpha.6", path = "crates/core", features = ["wgpu"]}
grin-gui-widgets = { version = "0.1.0-alpha.6", path = "crates/widgets" }

iced = { version = "0.10", features = ["canvas", "tokio"] }
iced_futures = { version = "0.7", features = ["async-std"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "grin-gui-core"
description = "Core GUI library for Grin GUI"
version = "0.1.0-alpha.5"
version = "0.1.0-alpha.6"
authors = ["Yeastplume", "Casper Rogild Storm"]
license = "GPL-3.0"
homepage = "https://github.com/mimblewimble/grin-gui"
Expand Down
Loading

0 comments on commit d93dc75

Please sign in to comment.