From 47e99f56038f5c567a6832654053e82c28f65de9 Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Thu, 2 Jul 2020 12:23:54 +0100 Subject: [PATCH] Versioning for 4.0.0 (#459) --- Cargo.lock | 54 +++++++++++++++++++++++++------------------ Cargo.toml | 14 +++++------ api/Cargo.toml | 10 ++++---- config/Cargo.toml | 4 ++-- controller/Cargo.toml | 12 +++++----- impls/Cargo.toml | 8 +++---- libwallet/Cargo.toml | 6 ++--- util/Cargo.toml | 26 ++++++++++----------- 8 files changed, 71 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0987c02..d98a99e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1166,8 +1166,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "grin_api" -version = "4.0.0-rc.1" -source = "git+https://github.com/mimblewimble/grin?tag=v4.0.0-rc.1#098d25e5696d1d97e4fbfabb80f27063caccd0f3" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a93ece4d2d0a666abdb9f7302bb5b222634cfe799f8e4479f62db33d607de161" dependencies = [ "bytes", "easy-jsonrpc-mw", @@ -1199,8 +1200,9 @@ dependencies = [ [[package]] name = "grin_chain" -version = "4.0.0-rc.1" -source = "git+https://github.com/mimblewimble/grin?tag=v4.0.0-rc.1#098d25e5696d1d97e4fbfabb80f27063caccd0f3" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb37f860e7fa0babfa476c253a5af2dfab10428010ba1f73174b4cdd3dd1b71" dependencies = [ "bit-vec", "bitflags 1.2.1", @@ -1223,8 +1225,9 @@ dependencies = [ [[package]] name = "grin_core" -version = "4.0.0-rc.1" -source = "git+https://github.com/mimblewimble/grin?tag=v4.0.0-rc.1#098d25e5696d1d97e4fbfabb80f27063caccd0f3" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2836604ab90c84b0771907ccf148231b7afee17f78ab2aab63827e0fbc5dd7b3" dependencies = [ "blake2-rfc", "byteorder", @@ -1249,8 +1252,9 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "4.0.0-rc.1" -source = "git+https://github.com/mimblewimble/grin?tag=v4.0.0-rc.1#098d25e5696d1d97e4fbfabb80f27063caccd0f3" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9928fc153d6020ef16653ecee351614d959f8b350ccd8860fd05ceaf6a9aab47" dependencies = [ "blake2-rfc", "byteorder", @@ -1271,8 +1275,9 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "4.0.0-rc.1" -source = "git+https://github.com/mimblewimble/grin?tag=v4.0.0-rc.1#098d25e5696d1d97e4fbfabb80f27063caccd0f3" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006ff9b3fc1a87dd173ef2e7b77c27bc0041da3b0a2b3f9a599761f428884d7d" dependencies = [ "bitflags 1.2.1", "chrono", @@ -1292,8 +1297,9 @@ dependencies = [ [[package]] name = "grin_pool" -version = "4.0.0-rc.1" -source = "git+https://github.com/mimblewimble/grin?tag=v4.0.0-rc.1#098d25e5696d1d97e4fbfabb80f27063caccd0f3" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1d370e29a545e1ca52d36c15b5a556384b75cbe28dc01a240ed76f84139aeb" dependencies = [ "blake2-rfc", "chrono", @@ -1326,8 +1332,9 @@ dependencies = [ [[package]] name = "grin_store" -version = "4.0.0-rc.1" -source = "git+https://github.com/mimblewimble/grin?tag=v4.0.0-rc.1#098d25e5696d1d97e4fbfabb80f27063caccd0f3" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b75656ebb44fcfb79f5132fbcf7047b21a883cd51867fe0526f155dc394c26" dependencies = [ "byteorder", "croaring-mw", @@ -1346,8 +1353,9 @@ dependencies = [ [[package]] name = "grin_util" -version = "4.0.0-rc.1" -source = "git+https://github.com/mimblewimble/grin?tag=v4.0.0-rc.1#098d25e5696d1d97e4fbfabb80f27063caccd0f3" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b6be8797b694e05c8e3f81ddcd6f8c7a2bf2860279564efed8cd7934decdc9" dependencies = [ "backtrace", "base64 0.12.1", @@ -1367,7 +1375,7 @@ dependencies = [ [[package]] name = "grin_wallet" -version = "4.0.0-rc.1" +version = "4.0.0" dependencies = [ "built", "clap", @@ -1395,7 +1403,7 @@ dependencies = [ [[package]] name = "grin_wallet_api" -version = "4.0.0-rc.1" +version = "4.0.0" dependencies = [ "base64 0.12.1", "chrono", @@ -1419,7 +1427,7 @@ dependencies = [ [[package]] name = "grin_wallet_config" -version = "4.0.0-rc.1" +version = "4.0.0" dependencies = [ "dirs 2.0.2", "grin_wallet_util", @@ -1432,7 +1440,7 @@ dependencies = [ [[package]] name = "grin_wallet_controller" -version = "4.0.0-rc.1" +version = "4.0.0" dependencies = [ "chrono", "easy-jsonrpc-mw", @@ -1462,7 +1470,7 @@ dependencies = [ [[package]] name = "grin_wallet_impls" -version = "4.0.0-rc.1" +version = "4.0.0" dependencies = [ "blake2-rfc", "byteorder", @@ -1497,7 +1505,7 @@ dependencies = [ [[package]] name = "grin_wallet_libwallet" -version = "4.0.0-rc.1" +version = "4.0.0" dependencies = [ "age", "base64 0.9.3", @@ -1529,7 +1537,7 @@ dependencies = [ [[package]] name = "grin_wallet_util" -version = "4.0.0-rc.1" +version = "4.0.0" dependencies = [ "data-encoding", "ed25519-dalek", diff --git a/Cargo.toml b/Cargo.toml index 3868b908..374f07da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet" -version = "4.0.0-rc.1" +version = "4.0.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -31,13 +31,13 @@ semver = "0.10" rustyline = "6" lazy_static = "1" -grin_wallet_api = { path = "./api", version = "4.0.0-rc.1" } -grin_wallet_impls = { path = "./impls", version = "4.0.0-rc.1" } -grin_wallet_libwallet = { path = "./libwallet", version = "4.0.0-rc.1" } -grin_wallet_controller = { path = "./controller", version = "4.0.0-rc.1" } -grin_wallet_config = { path = "./config", version = "4.0.0-rc.1" } +grin_wallet_api = { path = "./api", version = "4.0.0" } +grin_wallet_impls = { path = "./impls", version = "4.0.0" } +grin_wallet_libwallet = { path = "./libwallet", version = "4.0.0" } +grin_wallet_controller = { path = "./controller", version = "4.0.0" } +grin_wallet_config = { path = "./config", version = "4.0.0" } -grin_wallet_util = { path = "./util", version = "4.0.0-rc.1" } +grin_wallet_util = { path = "./util", version = "4.0.0" } [build-dependencies] built = { version = "0.4", features = ["git2"]} diff --git a/api/Cargo.toml b/api/Cargo.toml index 1a61a3b9..bbd977fd 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_api" -version = "4.0.0-rc.1" +version = "4.0.0" authors = ["Grin Developers "] description = "Grin Wallet API" license = "Apache-2.0" @@ -24,10 +24,10 @@ ring = "0.16" base64 = "0.12" ed25519-dalek = "1.0.0-pre.3" -grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0-rc.1" } -grin_wallet_config = { path = "../config", version = "4.0.0-rc.1" } -grin_wallet_impls = { path = "../impls", version = "4.0.0-rc.1" } -grin_wallet_util = { path = "../util", version = "4.0.0-rc.1" } +grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0" } +grin_wallet_config = { path = "../config", version = "4.0.0" } +grin_wallet_impls = { path = "../impls", version = "4.0.0" } +grin_wallet_util = { path = "../util", version = "4.0.0" } [dev-dependencies] serde_json = "1" diff --git a/config/Cargo.toml b/config/Cargo.toml index dbaec5b3..4096a4cb 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_config" -version = "4.0.0-rc.1" +version = "4.0.0" authors = ["Grin Developers "] description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -16,7 +16,7 @@ serde_derive = "1" toml = "0.5" dirs = "2.0" -grin_wallet_util = { path = "../util", version = "4.0.0-rc.1" } +grin_wallet_util = { path = "../util", version = "4.0.0" } [dev-dependencies] pretty_assertions = "0.6" diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 860f57a1..1b71aa32 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_controller" -version = "4.0.0-rc.1" +version = "4.0.0" authors = ["Grin Developers "] description = "Controllers for grin wallet instantiation" license = "Apache-2.0" @@ -30,12 +30,12 @@ chrono = { version = "0.4.11", features = ["serde"] } easy-jsonrpc-mw = "0.5.4" lazy_static = "1" -grin_wallet_util = { path = "../util", version = "4.0.0-rc.1" } +grin_wallet_util = { path = "../util", version = "4.0.0" } -grin_wallet_api = { path = "../api", version = "4.0.0-rc.1" } -grin_wallet_impls = { path = "../impls", version = "4.0.0-rc.1" } -grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0-rc.1" } -grin_wallet_config = { path = "../config", version = "4.0.0-rc.1" } +grin_wallet_api = { path = "../api", version = "4.0.0" } +grin_wallet_impls = { path = "../impls", version = "4.0.0" } +grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0" } +grin_wallet_config = { path = "../config", version = "4.0.0" } [dev-dependencies] ed25519-dalek = "1.0.0-pre.3" diff --git a/impls/Cargo.toml b/impls/Cargo.toml index 0a5a9748..968ca0c2 100644 --- a/impls/Cargo.toml +++ b/impls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_impls" -version = "4.0.0-rc.1" +version = "4.0.0" authors = ["Grin Developers "] description = "Concrete types derived from libwallet traits" license = "Apache-2.0" @@ -41,6 +41,6 @@ regex = "1.3" timer = "0.2" sysinfo = "0.14" -grin_wallet_util = { path = "../util", version = "4.0.0-rc.1" } -grin_wallet_config = { path = "../config", version = "4.0.0-rc.1" } -grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0-rc.1" } +grin_wallet_util = { path = "../util", version = "4.0.0" } +grin_wallet_config = { path = "../config", version = "4.0.0" } +grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0" } diff --git a/libwallet/Cargo.toml b/libwallet/Cargo.toml index eda54b27..ff3eaee3 100644 --- a/libwallet/Cargo.toml +++ b/libwallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_libwallet" -version = "4.0.0-rc.1" +version = "4.0.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -36,6 +36,6 @@ secrecy = "0.6" bech32 = "0.7" byteorder = "1.3" -grin_wallet_util = { path = "../util", version = "4.0.0-rc.1" } -grin_wallet_config = { path = "../config", version = "4.0.0-rc.1" } +grin_wallet_util = { path = "../util", version = "4.0.0" } +grin_wallet_config = { path = "../config", version = "4.0.0" } diff --git a/util/Cargo.toml b/util/Cargo.toml index 4747a18a..9c0d5035 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_util" -version = "4.0.0-rc.1" +version = "4.0.0" authors = ["Grin Developers "] description = "Util, for generic utilities and to re-export grin crates" license = "Apache-2.0" @@ -18,21 +18,21 @@ data-encoding = "2" sha3 = "0.8" # For Release -# grin_core = "3.1.0" -# grin_keychain = "3.1.0" -# grin_chain = "3.1.0" -# grin_util = "3.1.0" -# grin_api = "3.1.0" -# grin_store = "3.1.0" +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" # For beta release -grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1"} -grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } -grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } -grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } -grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } -grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } +# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1"} +# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } +# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } +# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } +# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } +# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-rc.1" } # For bleeding edge # grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }