mirror of
https://github.com/mimblewimble/grin-wallet.git
synced 2025-01-21 03:21:08 +03:00
Update working version on master (#713)
* Update working version on master * update cargo lock
This commit is contained in:
parent
8069de9a56
commit
765f11b168
8 changed files with 286 additions and 361 deletions
491
Cargo.lock
generated
491
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
30
Cargo.toml
30
Cargo.toml
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "grin_wallet"
|
name = "grin_wallet"
|
||||||
version = "5.3.0"
|
version = "5.4.0-alpha.1"
|
||||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||||
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
|
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
|
@ -30,21 +30,21 @@ semver = "0.10"
|
||||||
rustyline = "6"
|
rustyline = "6"
|
||||||
lazy_static = "1"
|
lazy_static = "1"
|
||||||
|
|
||||||
grin_wallet_api = { path = "./api", version = "5.3.0" }
|
grin_wallet_api = { path = "./api", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_impls = { path = "./impls", version = "5.3.0" }
|
grin_wallet_impls = { path = "./impls", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_libwallet = { path = "./libwallet", version = "5.3.0" }
|
grin_wallet_libwallet = { path = "./libwallet", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_controller = { path = "./controller", version = "5.3.0" }
|
grin_wallet_controller = { path = "./controller", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_config = { path = "./config", version = "5.3.0" }
|
grin_wallet_config = { path = "./config", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_util = { path = "./util", version = "5.3.0" }
|
grin_wallet_util = { path = "./util", version = "5.4.0-alpha.1" }
|
||||||
|
|
||||||
|
|
||||||
##### Grin Imports
|
##### Grin Imports
|
||||||
|
|
||||||
# For Release
|
# For Release
|
||||||
grin_core = "5.3.0"
|
# grin_core = "5.4.0-alpha.1"
|
||||||
grin_keychain = "5.3.0"
|
# grin_keychain = "5.4.0-alpha.1"
|
||||||
grin_util = "5.3.0"
|
# grin_util = "5.4.0-alpha.1"
|
||||||
grin_api = "5.3.0"
|
# grin_api = "5.4.0-alpha.1"
|
||||||
|
|
||||||
# For beta release
|
# For beta release
|
||||||
|
|
||||||
|
@ -54,10 +54,10 @@ grin_api = "5.3.0"
|
||||||
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||||
|
|
||||||
# For bleeding edge
|
# For bleeding edge
|
||||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
|
|
||||||
# For local testing
|
# For local testing
|
||||||
# grin_core = { path = "../grin/core"}
|
# grin_core = { path = "../grin/core"}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "grin_wallet_api"
|
name = "grin_wallet_api"
|
||||||
version = "5.3.0"
|
version = "5.4.0-alpha.1"
|
||||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||||
description = "Grin Wallet API"
|
description = "Grin Wallet API"
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
|
@ -22,17 +22,17 @@ ring = "0.16"
|
||||||
base64 = "0.12"
|
base64 = "0.12"
|
||||||
ed25519-dalek = "1.0.0-pre.4"
|
ed25519-dalek = "1.0.0-pre.4"
|
||||||
|
|
||||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.3.0" }
|
grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_config = { path = "../config", version = "5.3.0" }
|
grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_impls = { path = "../impls", version = "5.3.0" }
|
grin_wallet_impls = { path = "../impls", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_util = { path = "../util", version = "5.3.0" }
|
grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
|
||||||
|
|
||||||
##### Grin Imports
|
##### Grin Imports
|
||||||
|
|
||||||
# For Release
|
# For Release
|
||||||
grin_core = "5.3.0"
|
# grin_core = "5.4.0-alpha.1"
|
||||||
grin_keychain = "5.3.0"
|
# grin_keychain = "5.4.0-alpha.1"
|
||||||
grin_util = "5.3.0"
|
# grin_util = "5.4.0-alpha.1"
|
||||||
|
|
||||||
# For beta release
|
# For beta release
|
||||||
|
|
||||||
|
@ -41,9 +41,9 @@ grin_util = "5.3.0"
|
||||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||||
|
|
||||||
# For bleeding edge
|
# For bleeding edge
|
||||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
|
|
||||||
# For local testing
|
# For local testing
|
||||||
# grin_core = { path = "../../grin/core"}
|
# grin_core = { path = "../../grin/core"}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "grin_wallet_config"
|
name = "grin_wallet_config"
|
||||||
version = "5.3.0"
|
version = "5.4.0-alpha.1"
|
||||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
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."
|
description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
|
@ -16,13 +16,13 @@ serde_derive = "1"
|
||||||
toml = "0.5"
|
toml = "0.5"
|
||||||
dirs = "2.0"
|
dirs = "2.0"
|
||||||
|
|
||||||
grin_wallet_util = { path = "../util", version = "5.3.0" }
|
grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
|
||||||
|
|
||||||
##### Grin Imports
|
##### Grin Imports
|
||||||
|
|
||||||
# For Release
|
# For Release
|
||||||
grin_core = "5.3.0"
|
# grin_core = "5.4.0-alpha.1"
|
||||||
grin_util = "5.3.0"
|
# grin_util = "5.4.0-alpha.1"
|
||||||
|
|
||||||
# For beta release
|
# For beta release
|
||||||
|
|
||||||
|
@ -30,8 +30,8 @@ grin_util = "5.3.0"
|
||||||
#grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
#grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||||
|
|
||||||
# For bleeding edge
|
# For bleeding edge
|
||||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
|
|
||||||
# For local testing
|
# For local testing
|
||||||
# grin_core = { path = "../../grin/core"}
|
# grin_core = { path = "../../grin/core"}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "grin_wallet_controller"
|
name = "grin_wallet_controller"
|
||||||
version = "5.3.0"
|
version = "5.4.0-alpha.1"
|
||||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||||
description = "Controllers for grin wallet instantiation"
|
description = "Controllers for grin wallet instantiation"
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
|
@ -30,19 +30,19 @@ lazy_static = "1"
|
||||||
thiserror = "1"
|
thiserror = "1"
|
||||||
qr_code = "1.1.0"
|
qr_code = "1.1.0"
|
||||||
|
|
||||||
grin_wallet_util = { path = "../util", version = "5.3.0" }
|
grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_api = { path = "../api", version = "5.3.0" }
|
grin_wallet_api = { path = "../api", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_impls = { path = "../impls", version = "5.3.0" }
|
grin_wallet_impls = { path = "../impls", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.3.0" }
|
grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_config = { path = "../config", version = "5.3.0" }
|
grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
|
||||||
|
|
||||||
##### Grin Imports
|
##### Grin Imports
|
||||||
|
|
||||||
# For Release
|
# For Release
|
||||||
grin_core = "5.3.0"
|
# grin_core = "5.4.0-alpha.1"
|
||||||
grin_keychain = "5.3.0"
|
# grin_keychain = "5.4.0-alpha.1"
|
||||||
grin_util = "5.3.0"
|
# grin_util = "5.4.0-alpha.1"
|
||||||
grin_api = "5.3.0"
|
# grin_api = "5.4.0-alpha.1"
|
||||||
|
|
||||||
# For beta release
|
# For beta release
|
||||||
|
|
||||||
|
@ -52,10 +52,10 @@ grin_api = "5.3.0"
|
||||||
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||||
|
|
||||||
# For bleeding edge
|
# For bleeding edge
|
||||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
|
|
||||||
# For local testing
|
# For local testing
|
||||||
# grin_core = { path = "../../grin/core"}
|
# grin_core = { path = "../../grin/core"}
|
||||||
|
@ -72,14 +72,14 @@ remove_dir_all = "0.7"
|
||||||
##### Grin Imports
|
##### Grin Imports
|
||||||
|
|
||||||
# For Release
|
# For Release
|
||||||
grin_chain = "5.3.0"
|
# grin_chain = "5.4.0-alpha.1"
|
||||||
|
|
||||||
# For beta release
|
# For beta release
|
||||||
|
|
||||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||||
|
|
||||||
# For bleeding edge
|
# For bleeding edge
|
||||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
|
|
||||||
# For local testing
|
# For local testing
|
||||||
# grin_chain = { path = "../../grin/chain"}
|
# grin_chain = { path = "../../grin/chain"}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "grin_wallet_impls"
|
name = "grin_wallet_impls"
|
||||||
version = "5.3.0"
|
version = "5.4.0-alpha.1"
|
||||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||||
description = "Concrete types derived from libwallet traits"
|
description = "Concrete types derived from libwallet traits"
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
|
@ -36,19 +36,19 @@ sysinfo = "0.29"
|
||||||
base64 = "0.12.0"
|
base64 = "0.12.0"
|
||||||
url = "2.1"
|
url = "2.1"
|
||||||
|
|
||||||
grin_wallet_util = { path = "../util", version = "5.3.0" }
|
grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_config = { path = "../config", version = "5.3.0" }
|
grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.3.0" }
|
grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" }
|
||||||
|
|
||||||
##### Grin Imports
|
##### Grin Imports
|
||||||
|
|
||||||
# For Release
|
# For Release
|
||||||
grin_core = "5.3.0"
|
# grin_core = "5.4.0-alpha.1"
|
||||||
grin_keychain = "5.3.0"
|
# grin_keychain = "5.4.0-alpha.1"
|
||||||
grin_chain = "5.3.0"
|
# grin_chain = "5.4.0-alpha.1"
|
||||||
grin_util = "5.3.0"
|
# grin_util = "5.4.0-alpha.1"
|
||||||
grin_api = "5.3.0"
|
# grin_api = "5.4.0-alpha.1"
|
||||||
grin_store = "5.3.0"
|
# grin_store = "5.4.0-alpha.1"
|
||||||
|
|
||||||
# For beta release
|
# For beta release
|
||||||
|
|
||||||
|
@ -60,12 +60,12 @@ grin_store = "5.3.0"
|
||||||
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||||
|
|
||||||
# For bleeding edge
|
# For bleeding edge
|
||||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
|
|
||||||
# For local testing
|
# For local testing
|
||||||
# grin_core = { path = "../../grin/core"}
|
# grin_core = { path = "../../grin/core"}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "grin_wallet_libwallet"
|
name = "grin_wallet_libwallet"
|
||||||
version = "5.3.0"
|
version = "5.4.0-alpha.1"
|
||||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||||
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
|
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
|
@ -36,16 +36,16 @@ bech32 = "0.7"
|
||||||
byteorder = "1.3"
|
byteorder = "1.3"
|
||||||
num-bigint = "0.2"
|
num-bigint = "0.2"
|
||||||
|
|
||||||
grin_wallet_util = { path = "../util", version = "5.3.0" }
|
grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
|
||||||
grin_wallet_config = { path = "../config", version = "5.3.0" }
|
grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
|
||||||
|
|
||||||
##### Grin Imports
|
##### Grin Imports
|
||||||
|
|
||||||
# For Release
|
# For Release
|
||||||
grin_core = "5.3.0"
|
# grin_core = "5.4.0-alpha.1"
|
||||||
grin_keychain = "5.3.0"
|
# grin_keychain = "5.4.0-alpha.1"
|
||||||
grin_util = "5.3.0"
|
# grin_util = "5.4.0-alpha.1"
|
||||||
grin_store = "5.3.0"
|
# grin_store = "5.4.0-alpha.1"
|
||||||
|
|
||||||
# For beta release
|
# For beta release
|
||||||
|
|
||||||
|
@ -55,10 +55,10 @@ grin_store = "5.3.0"
|
||||||
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||||
|
|
||||||
# For bleeding edge
|
# For bleeding edge
|
||||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
|
|
||||||
# For local testing
|
# For local testing
|
||||||
# grin_core = { path = "../../grin/core"}
|
# grin_core = { path = "../../grin/core"}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "grin_wallet_util"
|
name = "grin_wallet_util"
|
||||||
version = "5.3.0"
|
version = "5.4.0-alpha.1"
|
||||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||||
description = "Util, for generic utilities and to re-export grin crates"
|
description = "Util, for generic utilities and to re-export grin crates"
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
|
@ -21,14 +21,14 @@ thiserror = "1"
|
||||||
##### Grin Imports
|
##### Grin Imports
|
||||||
|
|
||||||
# For Release
|
# For Release
|
||||||
grin_util = "5.3.0"
|
# grin_util = "5.4.0-alpha.1"
|
||||||
|
|
||||||
# For beta release
|
# For beta release
|
||||||
|
|
||||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||||
|
|
||||||
# For bleeding edge
|
# For bleeding edge
|
||||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||||
|
|
||||||
# For local testing
|
# For local testing
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue