Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update versioning, dependencies for 5.3.0 release #708

Merged
merged 1 commit into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
563 changes: 287 additions & 276 deletions Cargo.lock

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "5.2.0-beta.1"
version = "5.3.0"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -30,21 +30,21 @@ semver = "0.10"
rustyline = "6"
lazy_static = "1"

grin_wallet_api = { path = "./api", version = "5.2.0-beta.1" }
grin_wallet_impls = { path = "./impls", version = "5.2.0-beta.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.2.0-beta.1" }
grin_wallet_controller = { path = "./controller", version = "5.2.0-beta.1" }
grin_wallet_config = { path = "./config", version = "5.2.0-beta.1" }
grin_wallet_util = { path = "./util", version = "5.2.0-beta.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 Imports

# For Release
#grin_core = "4.0.0"
#grin_keychain = "4.0.0"
#grin_util = "4.0.0"
#grin_api = "4.0.0"
grin_core = "5.3.0"
grin_keychain = "5.3.0"
grin_util = "5.3.0"
grin_api = "5.3.0"

# For beta release

Expand All @@ -54,10 +54,10 @@ grin_wallet_util = { path = "./util", version = "5.2.0-beta.1" }
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# For bleeding edge
grin_core = { 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_api = { 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_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }

# For local testing
# grin_core = { path = "../grin/core"}
Expand Down
22 changes: 11 additions & 11 deletions api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "5.2.0-beta.1"
version = "5.3.0"
authors = ["Grin Developers <[email protected]>"]
description = "Grin Wallet API"
license = "Apache-2.0"
Expand All @@ -22,17 +22,17 @@ ring = "0.16"
base64 = "0.12"
ed25519-dalek = "1.0.0-pre.4"

grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.1" }
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
grin_wallet_impls = { path = "../impls", version = "5.2.0-beta.1" }
grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
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 Imports

# For Release
#grin_core = "4.0.0"
#grin_keychain = "4.0.0"
#grin_util = "4.0.0"
grin_core = "5.3.0"
grin_keychain = "5.3.0"
grin_util = "5.3.0"

# For beta release

Expand All @@ -41,9 +41,9 @@ grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# For bleeding edge
grin_core = { 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_core = { 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" }

# For local testing
# grin_core = { path = "../../grin/core"}
Expand Down
12 changes: 6 additions & 6 deletions config/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_config"
version = "5.2.0-beta.1"
version = "5.3.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"
Expand All @@ -16,22 +16,22 @@ serde_derive = "1"
toml = "0.5"
dirs = "2.0"

grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
grin_wallet_util = { path = "../util", version = "5.3.0" }

##### Grin Imports

# For Release
#grin_core = "4.0.0"
#grin_util = "4.0.0"
grin_core = "5.3.0"
grin_util = "5.3.0"

# For beta release

#grin_core = { 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
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_util = { 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" }

# For local testing
# grin_core = { path = "../../grin/core"}
Expand Down
32 changes: 16 additions & 16 deletions controller/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_controller"
version = "5.2.0-beta.1"
version = "5.3.0"
authors = ["Grin Developers <[email protected]>"]
description = "Controllers for grin wallet instantiation"
license = "Apache-2.0"
Expand Down Expand Up @@ -30,19 +30,19 @@ lazy_static = "1"
thiserror = "1"
qr_code = "1.1.0"

grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
grin_wallet_api = { path = "../api", version = "5.2.0-beta.1" }
grin_wallet_impls = { path = "../impls", version = "5.2.0-beta.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.1" }
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
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 Imports

# For Release
#grin_core = "4.0.0"
#grin_keychain = "4.0.0"
#grin_util = "4.0.0"
#grin_api = "4.0.0"
grin_core = "5.3.0"
grin_keychain = "5.3.0"
grin_util = "5.3.0"
grin_api = "5.3.0"

# For beta release

Expand All @@ -52,10 +52,10 @@ grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# For bleeding edge
grin_core = { 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_api = { 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_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }

# For local testing
# grin_core = { path = "../../grin/core"}
Expand All @@ -72,14 +72,14 @@ remove_dir_all = "0.7"
##### Grin Imports

# For Release
# grin_chain = "4.0.0"
grin_chain = "5.3.0"

# For beta release

# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# 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
# grin_chain = { path = "../../grin/chain"}
Expand Down
32 changes: 16 additions & 16 deletions impls/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_impls"
version = "5.2.0-beta.1"
version = "5.3.0"
authors = ["Grin Developers <[email protected]>"]
description = "Concrete types derived from libwallet traits"
license = "Apache-2.0"
Expand Down Expand Up @@ -36,19 +36,19 @@ sysinfo = "0.29"
base64 = "0.12.0"
url = "2.1"

grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.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 Imports

# For Release
#grin_core = "4.0.0"
#grin_keychain = "4.0.0"
#grin_chain = "4.0.0"
#grin_util = "4.0.0"
#grin_api = "4.0.0"
#grin_store = "4.0.0"
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"

# For beta release

Expand All @@ -60,12 +60,12 @@ grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.1" }
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# For bleeding edge
grin_core = { 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_util = { 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_core = { 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_util = { 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" }

# For local testing
# grin_core = { path = "../../grin/core"}
Expand Down
21 changes: 11 additions & 10 deletions libwallet/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_libwallet"
version = "5.2.0-beta.1"
version = "5.3.0"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -36,15 +36,16 @@ bech32 = "0.7"
byteorder = "1.3"
num-bigint = "0.2"

grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
grin_wallet_util = { path = "../util", version = "5.3.0" }
grin_wallet_config = { path = "../config", version = "5.3.0" }

##### Grin Imports

# For Release
#grin_core = "4.0.0"
#grin_keychain = "4.0.0"
#grin_util = "4.0.0"
grin_core = "5.3.0"
grin_keychain = "5.3.0"
grin_util = "5.3.0"
grin_store = "5.3.0"

# For beta release

Expand All @@ -54,10 +55,10 @@ grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# For bleeding edge
grin_core = { 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_store = { 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_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }

# For local testing
# grin_core = { path = "../../grin/core"}
Expand Down
6 changes: 3 additions & 3 deletions util/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_util"
version = "5.2.0-beta.1"
version = "5.3.0"
authors = ["Grin Developers <[email protected]>"]
description = "Util, for generic utilities and to re-export grin crates"
license = "Apache-2.0"
Expand All @@ -21,14 +21,14 @@ thiserror = "1"
##### Grin Imports

# For Release
#grin_util = "4.0.0"
grin_util = "5.3.0"

# For beta release

# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }

# 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

Expand Down
Loading