-
Notifications
You must be signed in to change notification settings - Fork 134
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update grin to latest master, change versioning label to include cont…
…racts
- Loading branch information
1 parent
d8d1269
commit 6655b42
Showing
8 changed files
with
221 additions
and
231 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "grin_wallet" | ||
| version = "5.3.0" | ||
| version = "5.4.0-contracts.0" | ||
| authors = ["Grin Developers <[email protected]>"] | ||
| description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." | ||
| license = "Apache-2.0" | ||
|
|
@@ -30,21 +30,21 @@ semver = "0.10" | |
| rustyline = "6" | ||
| lazy_static = "1" | ||
|
|
||
| grin_wallet_api = { path = "./api", version = "5.3.0" } | ||
| grin_wallet_impls = { path = "./impls", version = "5.3.0" } | ||
| grin_wallet_libwallet = { path = "./libwallet", version = "5.3.0" } | ||
| grin_wallet_controller = { path = "./controller", version = "5.3.0" } | ||
| grin_wallet_config = { path = "./config", version = "5.3.0" } | ||
| grin_wallet_util = { path = "./util", version = "5.3.0" } | ||
| grin_wallet_api = { path = "./api", version = "5.4.0-contracts.0" } | ||
| grin_wallet_impls = { path = "./impls", version = "5.4.0-contracts.0" } | ||
| grin_wallet_libwallet = { path = "./libwallet", version = "5.4.0-contracts.0" } | ||
| grin_wallet_controller = { path = "./controller", version = "5.4.0-contracts.0" } | ||
| grin_wallet_config = { path = "./config", version = "5.4.0-contracts.0" } | ||
| grin_wallet_util = { path = "./util", version = "5.4.0-contracts.0" } | ||
|
|
||
|
|
||
| ##### Grin Imports | ||
|
|
||
| # For Release | ||
| # grin_core = "5.3.0" | ||
| # grin_keychain = "5.3.0" | ||
| # grin_util = "5.3.0" | ||
| # grin_api = "5.3.0" | ||
| # grin_core = "5.4.0-contracts.0" | ||
| # grin_keychain = "5.4.0-contracts.0" | ||
| # grin_util = "5.4.0-contracts.0" | ||
| # grin_api = "5.4.0-contracts.0" | ||
|
|
||
| # For beta release | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "grin_wallet_api" | ||
| version = "5.3.0" | ||
| version = "5.4.0-contracts.0" | ||
| authors = ["Grin Developers <[email protected]>"] | ||
| description = "Grin Wallet API" | ||
| license = "Apache-2.0" | ||
|
|
@@ -22,17 +22,17 @@ ring = "0.16" | |
| base64 = "0.12" | ||
| ed25519-dalek = "1.0.0-pre.4" | ||
|
|
||
| grin_wallet_libwallet = { path = "../libwallet", version = "5.3.0" } | ||
| grin_wallet_config = { path = "../config", version = "5.3.0" } | ||
| grin_wallet_impls = { path = "../impls", version = "5.3.0" } | ||
| grin_wallet_util = { path = "../util", version = "5.3.0" } | ||
| grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-contracts.0" } | ||
| grin_wallet_config = { path = "../config", version = "5.4.0-contracts.0" } | ||
| grin_wallet_impls = { path = "../impls", version = "5.4.0-contracts.0" } | ||
| grin_wallet_util = { path = "../util", version = "5.4.0-contracts.0" } | ||
|
|
||
| ##### Grin Imports | ||
|
|
||
| # For Release | ||
| # grin_core = "5.3.0" | ||
| # grin_keychain = "5.3.0" | ||
| # grin_util = "5.3.0" | ||
| # grin_core = "5.4.0-contracts.0" | ||
| # grin_keychain = "5.4.0-contracts.0" | ||
| # grin_util = "5.4.0-contracts.0" | ||
|
|
||
| # For beta release | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "grin_wallet_config" | ||
| version = "5.3.0" | ||
| version = "5.4.0-contracts.0" | ||
| authors = ["Grin Developers <[email protected]>"] | ||
| description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." | ||
| license = "Apache-2.0" | ||
|
|
@@ -16,13 +16,13 @@ serde_derive = "1" | |
| toml = "0.5" | ||
| dirs = "2.0" | ||
|
|
||
| grin_wallet_util = { path = "../util", version = "5.3.0" } | ||
| grin_wallet_util = { path = "../util", version = "5.4.0-contracts.0" } | ||
|
|
||
| ##### Grin Imports | ||
|
|
||
| # For Release | ||
| # grin_core = "5.3.0" | ||
| # grin_util = "5.3.0" | ||
| # grin_core = "5.4.0-contracts.0" | ||
| # grin_util = "5.4.0-contracts.0" | ||
|
|
||
| # For beta release | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "grin_wallet_controller" | ||
| version = "5.3.0" | ||
| version = "5.4.0-contracts.0" | ||
| authors = ["Grin Developers <[email protected]>"] | ||
| description = "Controllers for grin wallet instantiation" | ||
| license = "Apache-2.0" | ||
|
|
@@ -30,19 +30,19 @@ lazy_static = "1" | |
| thiserror = "1" | ||
| qr_code = "1.1.0" | ||
|
|
||
| grin_wallet_util = { path = "../util", version = "5.3.0" } | ||
| grin_wallet_api = { path = "../api", version = "5.3.0" } | ||
| grin_wallet_impls = { path = "../impls", version = "5.3.0" } | ||
| grin_wallet_libwallet = { path = "../libwallet", version = "5.3.0" } | ||
| grin_wallet_config = { path = "../config", version = "5.3.0" } | ||
| grin_wallet_util = { path = "../util", version = "5.4.0-contracts.0" } | ||
| grin_wallet_api = { path = "../api", version = "5.4.0-contracts.0" } | ||
| grin_wallet_impls = { path = "../impls", version = "5.4.0-contracts.0" } | ||
| grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-contracts.0" } | ||
| grin_wallet_config = { path = "../config", version = "5.4.0-contracts.0" } | ||
|
|
||
| ##### Grin Imports | ||
|
|
||
| # For Release | ||
| # grin_core = "5.3.0" | ||
| # grin_keychain = "5.3.0" | ||
| # grin_util = "5.3.0" | ||
| # grin_api = "5.3.0" | ||
| # grin_core = "5.4.0-contracts.0" | ||
| # grin_keychain = "5.4.0-contracts.0" | ||
| # grin_util = "5.4.0-contracts.0" | ||
| # grin_api = "5.4.0-contracts.0" | ||
|
|
||
| # For beta release | ||
|
|
||
|
|
@@ -72,7 +72,7 @@ remove_dir_all = "0.7" | |
| ##### Grin Imports | ||
|
|
||
| # For Release | ||
| # grin_chain = "5.3.0" | ||
| # grin_chain = "5.4.0-contracts.0" | ||
|
|
||
| # For beta release | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "grin_wallet_impls" | ||
| version = "5.3.0" | ||
| version = "5.4.0-contracts.0" | ||
| authors = ["Grin Developers <[email protected]>"] | ||
| description = "Concrete types derived from libwallet traits" | ||
| license = "Apache-2.0" | ||
|
|
@@ -36,19 +36,19 @@ sysinfo = "0.29" | |
| base64 = "0.12.0" | ||
| url = "2.1" | ||
|
|
||
| grin_wallet_util = { path = "../util", version = "5.3.0" } | ||
| grin_wallet_config = { path = "../config", version = "5.3.0" } | ||
| grin_wallet_libwallet = { path = "../libwallet", version = "5.3.0" } | ||
| grin_wallet_util = { path = "../util", version = "5.4.0-contracts.0" } | ||
| grin_wallet_config = { path = "../config", version = "5.4.0-contracts.0" } | ||
| grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-contracts.0" } | ||
|
|
||
| ##### Grin Imports | ||
|
|
||
| # For Release | ||
| # grin_core = "5.3.0" | ||
| # grin_keychain = "5.3.0" | ||
| # grin_chain = "5.3.0" | ||
| # grin_util = "5.3.0" | ||
| # grin_api = "5.3.0" | ||
| # grin_store = "5.3.0" | ||
| # grin_core = "5.4.0-contracts.0" | ||
| # grin_keychain = "5.4.0-contracts.0" | ||
| # grin_chain = "5.4.0-contracts.0" | ||
| # grin_util = "5.4.0-contracts.0" | ||
| # grin_api = "5.4.0-contracts.0" | ||
| # grin_store = "5.4.0-contracts.0" | ||
|
|
||
| # For beta release | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "grin_wallet_libwallet" | ||
| version = "5.3.0" | ||
| version = "5.4.0-contracts.0" | ||
| authors = ["Grin Developers <[email protected]>"] | ||
| description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." | ||
| license = "Apache-2.0" | ||
|
|
@@ -37,8 +37,8 @@ bech32 = "0.7" | |
| byteorder = "1.3" | ||
| num-bigint = "0.2" | ||
|
|
||
| grin_wallet_util = { path = "../util", version = "5.3.0" } | ||
| grin_wallet_config = { path = "../config", version = "5.3.0" } | ||
| grin_wallet_util = { path = "../util", version = "5.4.0-contracts.0" } | ||
| grin_wallet_config = { path = "../config", version = "5.4.0-contracts.0" } | ||
|
|
||
| grin_secp256k1zkp = { version = "0.7.12", features = ["bullet-proof-sizing"]} | ||
|
|
||
|
|
@@ -49,10 +49,10 @@ hmac = { version = "0.12.0", features = ["std"]} | |
| ##### Grin Imports | ||
|
|
||
| # For Release | ||
| # grin_core = "5.3.0" | ||
| # grin_keychain = "5.3.0" | ||
| # grin_util = "5.3.0" | ||
| # grin_store = "5.3.0" | ||
| # grin_core = "5.4.0-contracts.0" | ||
| # grin_keychain = "5.4.0-contracts.0" | ||
| # grin_util = "5.4.0-contracts.0" | ||
| # grin_store = "5.4.0-contracts.0" | ||
|
|
||
| # For beta release | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "grin_wallet_util" | ||
| version = "5.3.0" | ||
| version = "5.4.0-contracts.0" | ||
| authors = ["Grin Developers <[email protected]>"] | ||
| description = "Util, for generic utilities and to re-export grin crates" | ||
| license = "Apache-2.0" | ||
|
|
@@ -21,7 +21,7 @@ thiserror = "1" | |
| ##### Grin Imports | ||
|
|
||
| # For Release | ||
| # grin_util = "5.3.0" | ||
| # grin_util = "5.4.0-contracts.0" | ||
|
|
||
| # For beta release | ||
|
|
||
|
|
||