diff --git a/Cargo.toml b/Cargo.toml index cef602e..8a2c17a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,4 +5,4 @@ members = ["abci", "proto-compiler", "proto"] [workspace.package] rust-version = "1.80" -version = "1.1.0" +version = "1.2.1+1.3.0" diff --git a/abci/Cargo.toml b/abci/Cargo.toml index 2b6067e..6436de3 100644 --- a/abci/Cargo.toml +++ b/abci/Cargo.toml @@ -60,11 +60,11 @@ url = { version = "2.5.0" } semver = { version = "1.0.22" } lhash = { version = "1.1.0", features = ["sha256"], optional = true } hex = { version = "0.4.3" } -tokio-util = { version = "0.7.10", features = [ +tokio-util = { version = "0.7.12", features = [ "net", "codec", ], default-features = false, optional = true } -tokio = { version = "1.37.0", features = [ +tokio = { version = "1.40", features = [ "net", "io-util", "rt-multi-thread", @@ -79,7 +79,7 @@ bincode = { version = "2.0.0-rc.3" } blake2 = { version = "0.10.6" } bollard = { version = "0.17" } futures = { version = "0.3.30" } -tokio = { version = "1.39", features = ["macros", "signal", "time", "io-std"] } +tokio = { version = "1.40", features = ["macros", "signal", "time", "io-std"] } hex = { version = "0.4.3" } lazy_static = { version = "1.4.0" } pollster = { version = "0.3.0" } diff --git a/scripts/release.sh b/scripts/release.sh index 2da38a4..9a3bdd0 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -86,20 +86,20 @@ if [ $VERBOSE -eq 1 ]; then set -x fi -rs_tenderdash_abci_version="${rs_tenderdash_abci_version#v}+${td_version}" # remove 'v' if it exists and suffix build mtd +rs_tenderdash_abci_version_build="${rs_tenderdash_abci_version#v}+${td_version}" # remove 'v' if it exists and suffix build mtd -echo "INFO: Preparing release of rs-tenderdash-abci version $rs_tenderdash_abci_version with Tenderdash version $td_version" +echo "INFO: Preparing release of rs-tenderdash-abci version $rs_tenderdash_abci_version_build with Tenderdash version $td_version" echo INFO: Update the version in the Cargo.toml files. set -ex # Update the version in the Cargo.toml files. -sed -i "s/^version = .*/version = \"$rs_tenderdash_abci_version\"/" ./Cargo.toml +sed -i "s/^version = .*/version = \"$rs_tenderdash_abci_version_build\"/" ./Cargo.toml sed -i "s/^\s*const DEFAULT_VERSION: &str = \".*\";/const DEFAULT_VERSION: \&str = \"v$td_version\";/" ./proto/build.rs cargo fmt -- ./proto/build.rs 2>/dev/null if [ -d "$PLATFORM_DIR" ]; then - rs_tenderdash="git = \"https:\/\/github.com\/dashpay\/rs-tenderdash-abci\", version = \"$rs_tenderdash_abci_version\", tag = \"v$rs_tenderdash_abci_version\"" + rs_tenderdash="git = \"https:\/\/github.com\/dashpay\/rs-tenderdash-abci\", version = \"$rs_tenderdash_abci_version\", tag = \"v$rs_tenderdash_abci_version_build\"" echo "INFO: Updating references to tenderdash-abci / tenderdash-proto in $PLATFORM_DIR" sed -i "s/^tenderdash-abci = { git = .*, version = [^,\}]*, tag = [^,\}]*/tenderdash-abci = { $rs_tenderdash/" "${PLATFORM_DIR}"/packages/*/Cargo.toml