Revert "update and versioning for v5.3.1 (#709)" (#710)

This reverts commit 3d6f4b8437.
This commit is contained in:
Yeastplume 2024-05-14 09:36:39 +01:00 committed by GitHub
parent 3d6f4b8437
commit 8069de9a56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 95 additions and 85 deletions

74
Cargo.lock generated
View file

@ -130,6 +130,16 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
[[package]]
name = "arrayvec"
version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06f59fe10306bb78facd90d28c2038ad23ffaaefa85bac43c8a434cde383334f"
dependencies = [
"nodrop",
"odds",
]
[[package]] [[package]]
name = "arrayvec" name = "arrayvec"
version = "0.4.12" version = "0.4.12"
@ -145,12 +155,6 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "arrayvec"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]] [[package]]
name = "atty" name = "atty"
version = "0.2.14" version = "0.2.14"
@ -1203,9 +1207,9 @@ dependencies = [
[[package]] [[package]]
name = "grin_api" name = "grin_api"
version = "5.3.1" version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "371de4435e3681a028a0741e4c4c9fa0be7ec95b86a89fef82e534c7de6e79ca" checksum = "fe9105a4b1db20827977575e56c8f6ea9f8f6bab2ac7f6abf95afbd29dafcd39"
dependencies = [ dependencies = [
"bytes 0.5.6", "bytes 0.5.6",
"easy-jsonrpc-mw", "easy-jsonrpc-mw",
@ -1236,9 +1240,9 @@ dependencies = [
[[package]] [[package]]
name = "grin_chain" name = "grin_chain"
version = "5.3.1" version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1987d095cb41dffb7f67f4ae97acd0141fc77df28e1af376f8b4ab784d5ab54" checksum = "c2926f3e9444ec13781ddd6eeb4e4b2f8da68986c633b6d00b7c7cc4c2e87689"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"bitflags 1.3.2", "bitflags 1.3.2",
@ -1260,9 +1264,9 @@ dependencies = [
[[package]] [[package]]
name = "grin_core" name = "grin_core"
version = "5.3.1" version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03d3887c1090b18862424ed4ad1929f6c9b81709cfcca8bf8b88c928d4af2167" checksum = "426d0e2f2fa27c26f931d4a21a236ff8ae16594151fdd0f8ce52fece85d94d89"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@ -1287,9 +1291,9 @@ dependencies = [
[[package]] [[package]]
name = "grin_keychain" name = "grin_keychain"
version = "5.3.1" version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2864c09ee9ac184a2a580a6f34debd642011a34fd40af6ab26c084b1aea951ac" checksum = "9f93a5e9c18f2b443387051512e162fb130d4597e039a51fdc00a249578de9b5"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@ -1310,9 +1314,9 @@ dependencies = [
[[package]] [[package]]
name = "grin_p2p" name = "grin_p2p"
version = "5.3.1" version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab8968c6b250cc928eb8467c0ed283d53676ae5896f8396d6136b0d2dc5fa77f" checksum = "415b7a30b128f127cd173572a9cf08c8bc072ef000ac778264b345f69e521fd8"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytes 0.5.6", "bytes 0.5.6",
@ -1333,9 +1337,9 @@ dependencies = [
[[package]] [[package]]
name = "grin_pool" name = "grin_pool"
version = "5.3.1" version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1828edf8e05010fbd3a19ff6e73740a696fbb681859617805c25eb66480ce0d8" checksum = "faa348a96f1e8721cd9109689ab2f54e8d278e32900da3d45faacee083237308"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"chrono", "chrono",
@ -1351,11 +1355,11 @@ dependencies = [
[[package]] [[package]]
name = "grin_secp256k1zkp" name = "grin_secp256k1zkp"
version = "0.7.14" version = "0.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06832645c3d28079245827908045946db48e5d62b4c54b40701c7e21327e2571" checksum = "447e2e66d2f6cc14d49afdad59a5b26f47654c845483dbb3f3403ace0dbb94b4"
dependencies = [ dependencies = [
"arrayvec 0.7.4", "arrayvec 0.3.25",
"cc", "cc",
"libc", "libc",
"rand 0.5.6", "rand 0.5.6",
@ -1366,9 +1370,9 @@ dependencies = [
[[package]] [[package]]
name = "grin_store" name = "grin_store"
version = "5.3.1" version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51a81f65738f02e2af799e3b596996a7be3087df8ae478241b41a62c00623840" checksum = "1e32cd44bbbeaf7629f3fdaf166c6d3ef7d9198f9d3bbb06a3162cd5f3a8b407"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"croaring", "croaring",
@ -1386,9 +1390,9 @@ dependencies = [
[[package]] [[package]]
name = "grin_util" name = "grin_util"
version = "5.3.1" version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e644f4a7e648c7038226417de9e2101743ce337ad60539a1ec6580571a04ad3" checksum = "68e2e83d3ca5946b958e98ed4df1f1a7cf808ea74c0e4b4026e42e4a04d9ef92"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"base64 0.12.3", "base64 0.12.3",
@ -1408,7 +1412,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet" name = "grin_wallet"
version = "5.3.1" version = "5.3.0"
dependencies = [ dependencies = [
"built", "built",
"clap", "clap",
@ -1440,7 +1444,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_api" name = "grin_wallet_api"
version = "5.3.1" version = "5.3.0"
dependencies = [ dependencies = [
"base64 0.12.3", "base64 0.12.3",
"chrono", "chrono",
@ -1465,7 +1469,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_config" name = "grin_wallet_config"
version = "5.3.1" version = "5.3.0"
dependencies = [ dependencies = [
"dirs 2.0.2", "dirs 2.0.2",
"grin_core", "grin_core",
@ -1480,7 +1484,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_controller" name = "grin_wallet_controller"
version = "5.3.1" version = "5.3.0"
dependencies = [ dependencies = [
"chrono", "chrono",
"easy-jsonrpc-mw", "easy-jsonrpc-mw",
@ -1516,7 +1520,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_impls" name = "grin_wallet_impls"
version = "5.3.1" version = "5.3.0"
dependencies = [ dependencies = [
"base64 0.12.3", "base64 0.12.3",
"blake2-rfc", "blake2-rfc",
@ -1555,7 +1559,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_libwallet" name = "grin_wallet_libwallet"
version = "5.3.1" version = "5.3.0"
dependencies = [ dependencies = [
"age", "age",
"base64 0.9.3", "base64 0.9.3",
@ -1591,7 +1595,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_util" name = "grin_wallet_util"
version = "5.3.1" version = "5.3.0"
dependencies = [ dependencies = [
"data-encoding", "data-encoding",
"ed25519-dalek", "ed25519-dalek",
@ -2509,6 +2513,12 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "odds"
version = "0.2.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4eae0151b9dacf24fcc170d9995e511669a082856a91f958a2fe380bfab3fb22"
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.19.0" version = "1.19.0"

View file

@ -1,6 +1,6 @@
[package] [package]
name = "grin_wallet" name = "grin_wallet"
version = "5.3.1" version = "5.3.0"
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.1" } grin_wallet_api = { path = "./api", version = "5.3.0" }
grin_wallet_impls = { path = "./impls", version = "5.3.1" } grin_wallet_impls = { path = "./impls", version = "5.3.0" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.3.1" } grin_wallet_libwallet = { path = "./libwallet", version = "5.3.0" }
grin_wallet_controller = { path = "./controller", version = "5.3.1" } grin_wallet_controller = { path = "./controller", version = "5.3.0" }
grin_wallet_config = { path = "./config", version = "5.3.1" } grin_wallet_config = { path = "./config", version = "5.3.0" }
grin_wallet_util = { path = "./util", version = "5.3.1" } grin_wallet_util = { path = "./util", version = "5.3.0" }
##### Grin Imports ##### Grin Imports
# For Release # For Release
grin_core = "5.3.1" grin_core = "5.3.0"
grin_keychain = "5.3.1" grin_keychain = "5.3.0"
grin_util = "5.3.1" grin_util = "5.3.0"
grin_api = "5.3.1" grin_api = "5.3.0"
# For beta release # For beta release

View file

@ -1,6 +1,6 @@
[package] [package]
name = "grin_wallet_api" name = "grin_wallet_api"
version = "5.3.1" version = "5.3.0"
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.1" } grin_wallet_libwallet = { path = "../libwallet", version = "5.3.0" }
grin_wallet_config = { path = "../config", version = "5.3.1" } grin_wallet_config = { path = "../config", version = "5.3.0" }
grin_wallet_impls = { path = "../impls", version = "5.3.1" } grin_wallet_impls = { path = "../impls", version = "5.3.0" }
grin_wallet_util = { path = "../util", version = "5.3.1" } grin_wallet_util = { path = "../util", version = "5.3.0" }
##### Grin Imports ##### Grin Imports
# For Release # For Release
grin_core = "5.3.1" grin_core = "5.3.0"
grin_keychain = "5.3.1" grin_keychain = "5.3.0"
grin_util = "5.3.1" grin_util = "5.3.0"
# For beta release # For beta release

View file

@ -1,6 +1,6 @@
[package] [package]
name = "grin_wallet_config" name = "grin_wallet_config"
version = "5.3.1" version = "5.3.0"
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.1" } grin_wallet_util = { path = "../util", version = "5.3.0" }
##### Grin Imports ##### Grin Imports
# For Release # For Release
grin_core = "5.3.1" grin_core = "5.3.0"
grin_util = "5.3.1" grin_util = "5.3.0"
# For beta release # For beta release

View file

@ -1,6 +1,6 @@
[package] [package]
name = "grin_wallet_controller" name = "grin_wallet_controller"
version = "5.3.1" version = "5.3.0"
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.1" } grin_wallet_util = { path = "../util", version = "5.3.0" }
grin_wallet_api = { path = "../api", version = "5.3.1" } grin_wallet_api = { path = "../api", version = "5.3.0" }
grin_wallet_impls = { path = "../impls", version = "5.3.1" } grin_wallet_impls = { path = "../impls", version = "5.3.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.3.1" } grin_wallet_libwallet = { path = "../libwallet", version = "5.3.0" }
grin_wallet_config = { path = "../config", version = "5.3.1" } grin_wallet_config = { path = "../config", version = "5.3.0" }
##### Grin Imports ##### Grin Imports
# For Release # For Release
grin_core = "5.3.1" grin_core = "5.3.0"
grin_keychain = "5.3.1" grin_keychain = "5.3.0"
grin_util = "5.3.1" grin_util = "5.3.0"
grin_api = "5.3.1" grin_api = "5.3.0"
# For beta release # For beta release
@ -72,7 +72,7 @@ remove_dir_all = "0.7"
##### Grin Imports ##### Grin Imports
# For Release # For Release
grin_chain = "5.3.1" grin_chain = "5.3.0"
# For beta release # For beta release

View file

@ -1,6 +1,6 @@
[package] [package]
name = "grin_wallet_impls" name = "grin_wallet_impls"
version = "5.3.1" version = "5.3.0"
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.1" } grin_wallet_util = { path = "../util", version = "5.3.0" }
grin_wallet_config = { path = "../config", version = "5.3.1" } grin_wallet_config = { path = "../config", version = "5.3.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.3.1" } grin_wallet_libwallet = { path = "../libwallet", version = "5.3.0" }
##### Grin Imports ##### Grin Imports
# For Release # For Release
grin_core = "5.3.1" grin_core = "5.3.0"
grin_keychain = "5.3.1" grin_keychain = "5.3.0"
grin_chain = "5.3.1" grin_chain = "5.3.0"
grin_util = "5.3.1" grin_util = "5.3.0"
grin_api = "5.3.1" grin_api = "5.3.0"
grin_store = "5.3.1" grin_store = "5.3.0"
# For beta release # For beta release

View file

@ -1,6 +1,6 @@
[package] [package]
name = "grin_wallet_libwallet" name = "grin_wallet_libwallet"
version = "5.3.1" version = "5.3.0"
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.1" } grin_wallet_util = { path = "../util", version = "5.3.0" }
grin_wallet_config = { path = "../config", version = "5.3.1" } grin_wallet_config = { path = "../config", version = "5.3.0" }
##### Grin Imports ##### Grin Imports
# For Release # For Release
grin_core = "5.3.1" grin_core = "5.3.0"
grin_keychain = "5.3.1" grin_keychain = "5.3.0"
grin_util = "5.3.1" grin_util = "5.3.0"
grin_store = "5.3.1" grin_store = "5.3.0"
# For beta release # For beta release

View file

@ -1,6 +1,6 @@
[package] [package]
name = "grin_wallet_util" name = "grin_wallet_util"
version = "5.3.1" version = "5.3.0"
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,7 +21,7 @@ thiserror = "1"
##### Grin Imports ##### Grin Imports
# For Release # For Release
grin_util = "5.3.1" grin_util = "5.3.0"
# For beta release # For beta release