RC2 0.13.0 (exonum#1596)

CHANGELOG.md

@@ -5,7 +5,7 @@ The project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
 ## Unreleased
 
-## 0.13.0-rc.1 - 2019-12-04
+## 0.13.0-rc.2 - 2019-12-04
 
 ### Breaking changes
 

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-cli"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 authors = ["The Exonum Team <[email protected]>"]
 edition = "2018"
 homepage = "https://exonum.com/"
@@ -12,8 +12,8 @@ categories = ["command-line-interface", "configuration"]
 description = "Helper crate for secure and convenient configuration of the Exonum nodes."
 
 [dependencies]
-exonum = { version = "0.13.0-rc.1", path = "../exonum" }
-exonum-supervisor = { version = "0.13.0-rc.1", path = "../services/supervisor" }
+exonum = { version = "0.13.0-rc.2", path = "../exonum" }
+exonum-supervisor = { version = "0.13.0-rc.2", path = "../services/supervisor" }
 structopt = "0.3.1"
 serde = "1.0.101"
 serde_derive = "1.0.101"

components/build/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-build"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 edition = "2018"
 authors = ["The Exonum Team <[email protected]>"]
 homepage = "https://exonum.com/"

components/crypto/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-crypto"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 edition = "2018"
 authors = ["The Exonum Team <[email protected]>"]
 homepage = "https://exonum.com/"
@@ -26,7 +26,7 @@ failure = "0.1.5"
 toml = "0.5.0"
 uuid = "0.8"
 exonum_sodiumoxide = { version = "0.0.23", optional = true}
-exonum-proto = { path = "../proto", version = "0.13.0-rc.1", optional = true}
+exonum-proto = { path = "../proto", version = "0.13.0-rc.2", optional = true}
 protobuf = { version = "2.8.1", features = ["with-serde"] }
 bit-vec = "0.6.1"
 
@@ -40,4 +40,4 @@ with-protobuf = ["exonum-proto"]
 with-serde = []
 
 [build-dependencies]
-exonum-build = { version = "0.13.0-rc.1", path = "../build" }
+exonum-build = { version = "0.13.0-rc.2", path = "../build" }

components/derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-derive"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 edition = "2018"
 authors = ["The Exonum Team <[email protected]>"]
 homepage = "https://exonum.com/"

components/keys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-keys"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 edition = "2018"
 authors = ["The Exonum Team <[email protected]>"]
 homepage = "https://exonum.com/"
@@ -19,7 +19,7 @@ serde = "1.0.10"
 serde_derive = "1.0.64"
 toml = "0.5.0"
 
-exonum-crypto = { version = "0.13.0-rc.1", path = "../crypto" }
+exonum-crypto = { version = "0.13.0-rc.2", path = "../crypto" }
 
 [dev-dependencies]
 tempdir = "0.3.7"

components/merkledb/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-merkledb"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 edition = "2018"
 authors = ["The Exonum Team <[email protected]>"]
 homepage = "https://exonum.com/"
@@ -19,8 +19,8 @@ bincode = "1.1"
 byteorder = "1.3"
 chrono = "0.4.6"
 enum-primitive-derive = "0.1"
-exonum-crypto = { path = "../crypto", version = "0.13.0-rc.1", features = ["with-serde"]}
-exonum-proto = { path = "../proto", version = "0.13.0-rc.1", optional = true }
+exonum-crypto = { path = "../crypto", version = "0.13.0-rc.2", features = ["with-serde"]}
+exonum-proto = { path = "../proto", version = "0.13.0-rc.2", optional = true }
 failure = "0.1"
 hex = "0.4"
 leb128 = "0.2"
@@ -39,7 +39,7 @@ protobuf = { version = "2.8.1", features = ["with-serde"], optional = true }
 [dev-dependencies]
 assert_matches = "1.3.0"
 criterion = "0.3"
-exonum-derive = { version = "0.13.0-rc.1", path = "../derive" }
+exonum-derive = { version = "0.13.0-rc.2", path = "../derive" }
 rand = "0.7"
 proptest = "0.9"
 modifier = "0.1"
@@ -65,4 +65,4 @@ rocksdb_bzip2 = ["rocksdb/bzip2"]
 name = "blockchain"
 
 [build-dependencies]
-exonum-build = { version = "0.13.0-rc.1", path = "../build" }
+exonum-build = { version = "0.13.0-rc.2", path = "../build" }

components/merkledb/README.md

@@ -31,7 +31,7 @@ Include `exonum-merkledb` as a dependency in your `Cargo.toml`:
 
 ```toml
 [dependencies]
-exonum-merkledb = "0.13.0-rc.1"
+exonum-merkledb = "0.13.0-rc.2"
 
 ```
 

components/proto/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-proto"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 edition = "2018"
 authors = ["The Exonum Team <[email protected]>"]
 homepage = "https://exonum.com/"
@@ -19,13 +19,13 @@ protobuf = { version = "2.8.1", features = ["with-serde"] }
 bit-vec = "0.6.1"
 serde = "1.0.101"
 serde_derive = "1.0.101"
-exonum-derive = { path = "../derive", version = "0.13.0-rc.1"}
+exonum-derive = { path = "../derive", version = "0.13.0-rc.2"}
 protobuf-convert = "0.2.0"
 
 [features]
 default = ["with-serde"]
 with-serde = []
 
 [build-dependencies]
-exonum-build = { version = "0.13.0-rc.1", path = "../build" }
+exonum-build = { version = "0.13.0-rc.2", path = "../build" }
 

examples/cryptocurrency-advanced/backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-cryptocurrency-advanced"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 edition = "2018"
 authors = ["The Exonum Team <[email protected]>"]
 homepage = "https://exonum.com/"
@@ -15,26 +15,26 @@ description = "Exonum blockchain example implementing a cryptocurrency."
 travis-ci = { repository = "exonum/exonum" }
 
 [dependencies]
-exonum = { version = "0.13.0-rc.1", path = "../../../exonum" }
-exonum-derive = { version = "0.13.0-rc.1", path = "../../../components/derive" }
-exonum-merkledb = { version = "0.13.0-rc.1", path = "../../../components/merkledb" }
-exonum-crypto = { version = "0.13.0-rc.1", path = "../../../components/crypto"}
-exonum-proto = { version = "0.13.0-rc.1", path = "../../../components/proto" }
-exonum-cli = { version = "0.13.0-rc.1", path = "../../../cli" }
+exonum = { version = "0.13.0-rc.2", path = "../../../exonum" }
+exonum-derive = { version = "0.13.0-rc.2", path = "../../../components/derive" }
+exonum-merkledb = { version = "0.13.0-rc.2", path = "../../../components/merkledb" }
+exonum-crypto = { version = "0.13.0-rc.2", path = "../../../components/crypto"}
+exonum-proto = { version = "0.13.0-rc.2", path = "../../../components/proto" }
+exonum-cli = { version = "0.13.0-rc.2", path = "../../../cli" }
 serde = "1.0.0"
 serde_derive = "1.0.0"
 failure = "0.1.5"
 protobuf = "2.8.0"
 
 [dev-dependencies]
-exonum-testkit = { version = "0.13.0-rc.1", path = "../../../test-suite/testkit" }
+exonum-testkit = { version = "0.13.0-rc.2", path = "../../../test-suite/testkit" }
 serde_json = "1.0.0"
 pretty_assertions = "0.6.1"
 assert_matches = "1.2.0"
 hex = "0.4"
 
 [build-dependencies]
-exonum-build = { version = "0.13.0-rc.1", path = "../../../components/build" }
+exonum-build = { version = "0.13.0-rc.2", path = "../../../components/build" }
 
 [features]
 default = ["with-serde"]

examples/cryptocurrency-advanced/cryptocurrency_advanced.yaml

@@ -22,7 +22,7 @@ supervisor_mode: "simple"
 artifacts:
   cryptocurrency:
     runtime: rust
-    name: "exonum-cryptocurrency-advanced:0.13.0-rc.1"
+    name: "exonum-cryptocurrency-advanced:0.13.0-rc.2"
 
 instances:
   crypto:

examples/cryptocurrency-advanced/docker/Dockerfile

@@ -18,7 +18,7 @@ RUN curl -sL https://deb.nodesource.com/setup_8.x | bash \
   && apt-get install -y nodejs
 
 WORKDIR /usr/src
-RUN git clone --branch v0.13.0-rc.1 https://github.com/exonum/exonum.git \
+RUN git clone --branch v0.13.0-rc.2 https://github.com/exonum/exonum.git \
   && mv /root/.cargo/bin/* /usr/bin \
   && cd exonum/examples/cryptocurrency-advanced/backend \
   && cargo update && cargo install --path . \

examples/cryptocurrency/Cargo.toml

@@ -17,23 +17,23 @@ description = "Minimal Exonum blockchain example implementing a simple cryptocur
 travis-ci = { repository = "exonum/exonum" }
 
 [dependencies]
-exonum = { version = "0.13.0-rc.1", path = "../../exonum" }
-exonum-derive = { version = "0.13.0-rc.1", path = "../../components/derive" }
-exonum-keys = { version = "0.13.0-rc.1", path = "../../components/keys" }
-exonum-merkledb = { version = "0.13.0-rc.1", path = "../../components/merkledb" }
-exonum-proto = { version = "0.13.0-rc.1", path = "../../components/proto" }
-exonum-crypto = { version = "0.13.0-rc.1", path = "../../components/crypto" }
+exonum = { version = "0.13.0-rc.2", path = "../../exonum" }
+exonum-derive = { version = "0.13.0-rc.2", path = "../../components/derive" }
+exonum-keys = { version = "0.13.0-rc.2", path = "../../components/keys" }
+exonum-merkledb = { version = "0.13.0-rc.2", path = "../../components/merkledb" }
+exonum-proto = { version = "0.13.0-rc.2", path = "../../components/proto" }
+exonum-crypto = { version = "0.13.0-rc.2", path = "../../components/crypto" }
 failure = "0.1.5"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 protobuf = "2.8.0"
 
 [dev-dependencies]
-exonum-testkit = { version = "0.13.0-rc.1", path = "../../test-suite/testkit" }
+exonum-testkit = { version = "0.13.0-rc.2", path = "../../test-suite/testkit" }
 rand = "0.7"
 pretty_assertions = "0.6.1"
 assert_matches = "1.2.0"
 
 [build-dependencies]
-exonum-build = { version = "0.13.0-rc.1", path = "../../components/build" }
+exonum-build = { version = "0.13.0-rc.2", path = "../../components/build" }

examples/sample_runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-sample-runtime"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 authors = ["The Exonum Team <[email protected]>"]
 edition = "2018"
 homepage = "https://exonum.com/"
@@ -13,8 +13,8 @@ description = "Minimal Exonum blockchain example implementing a simple runtime."
 [dependencies]
 futures = "0.1.25"
 
-exonum = { version = "0.13.0-rc.1", path = "../../exonum" }
-exonum-derive = { version = "0.13.0-rc.1", path = "../../components/derive" }
-exonum-merkledb = { version = "0.13.0-rc.1", path = "../../components/merkledb" }
-exonum-supervisor = { version = "0.13.0-rc.1", path = "../../services/supervisor" }
+exonum = { version = "0.13.0-rc.2", path = "../../exonum" }
+exonum-derive = { version = "0.13.0-rc.2", path = "../../components/derive" }
+exonum-merkledb = { version = "0.13.0-rc.2", path = "../../components/merkledb" }
+exonum-supervisor = { version = "0.13.0-rc.2", path = "../../services/supervisor" }
 protobuf-convert = "0.2.0"

examples/timestamping/backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum-timestamping"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 edition = "2018"
 publish = false
 authors = ["The Exonum Team <[email protected]>"]
@@ -12,13 +12,13 @@ license = "Apache-2.0"
 travis-ci = { repository = "exonum/exonum" }
 
 [dependencies]
-exonum = { version = "0.13.0-rc.1", path = "../../../exonum" }
-exonum-crypto = { version = "0.13.0-rc.1", path = "../../../components/crypto" }
-exonum-derive = { version = "0.13.0-rc.1", path = "../../../components/derive" }
-exonum-merkledb = { version = "0.13.0-rc.1", path = "../../../components/merkledb" }
-exonum-cli = { version = "0.13.0-rc.1", path = "../../../cli" }
-exonum-time = { version = "0.13.0-rc.1", path = "../../../services/time" }
-exonum-proto = { version = "0.13.0-rc.1", path = "../../../components/proto" }
+exonum = { version = "0.13.0-rc.2", path = "../../../exonum" }
+exonum-crypto = { version = "0.13.0-rc.2", path = "../../../components/crypto" }
+exonum-derive = { version = "0.13.0-rc.2", path = "../../../components/derive" }
+exonum-merkledb = { version = "0.13.0-rc.2", path = "../../../components/merkledb" }
+exonum-cli = { version = "0.13.0-rc.2", path = "../../../cli" }
+exonum-time = { version = "0.13.0-rc.2", path = "../../../services/time" }
+exonum-proto = { version = "0.13.0-rc.2", path = "../../../components/proto" }
 serde = "1.0.10"
 serde_derive = "1.0.10"
 serde_json = "1.0.2"
@@ -28,11 +28,11 @@ chrono = { version = "0.4.6", features = ["serde"] }
 protobuf = "2.8.0"
 
 [dev-dependencies]
-exonum-testkit = { version = "0.13.0-rc.1", path = "../../../test-suite/testkit" }
+exonum-testkit = { version = "0.13.0-rc.2", path = "../../../test-suite/testkit" }
 pretty_assertions = "0.6.1"
 
 [build-dependencies]
-exonum-build = { version = "0.13.0-rc.1", path = "../../../components/build" }
+exonum-build = { version = "0.13.0-rc.2", path = "../../../components/build" }
 
 [features]
 default = ["with-serde"]

examples/timestamping/docker/Dockerfile

@@ -18,7 +18,7 @@ RUN curl -sL https://deb.nodesource.com/setup_8.x | bash \
   && apt-get install -y nodejs
 
 WORKDIR /usr/src
-RUN git clone --branch v0.13.0-rc.1 https://github.com/exonum/exonum.git \
+RUN git clone --branch v0.13.0-rc.2 https://github.com/exonum/exonum.git \
   && mv /root/.cargo/bin/* /usr/bin \
   && cd exonum/examples/timestamping/backend \
   && cargo update && cargo install --path . \

examples/timestamping/timestamping.yaml

@@ -22,10 +22,10 @@ supervisor_mode: "simple"
 artifacts:
   time:
     runtime: rust
-    name: "exonum-time:0.13.0-rc.1"
+    name: "exonum-time:0.13.0-rc.2"
   timestamping:
     runtime: rust
-    name: "exonum-timestamping:0.13.0-rc.1"
+    name: "exonum-timestamping:0.13.0-rc.2"
 
 instances:
   time:

exonum/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "exonum"
-version = "0.13.0-rc.1"
+version = "0.13.0-rc.2"
 edition = "2018"
 authors = ["The Exonum Team <[email protected]>"]
 homepage = "https://exonum.com/"
@@ -56,11 +56,11 @@ zeroize = "1.0"
 semver = "0.9.0"
 
 exonum_sodiumoxide = { version = "0.0.23", optional = true }
-exonum-crypto = { version = "0.13.0-rc.1", path = "../components/crypto" }
-exonum-derive = { version = "0.13.0-rc.1", path = "../components/derive" }
-exonum-keys = { version = "0.13.0-rc.1", path = "../components/keys" }
-exonum-merkledb = { version = "0.13.0-rc.1", path = "../components/merkledb" }
-exonum-proto = { version = "0.13.0-rc.1", path = "../components/proto" }
+exonum-crypto = { version = "0.13.0-rc.2", path = "../components/crypto" }
+exonum-derive = { version = "0.13.0-rc.2", path = "../components/derive" }
+exonum-keys = { version = "0.13.0-rc.2", path = "../components/keys" }
+exonum-merkledb = { version = "0.13.0-rc.2", path = "../components/merkledb" }
+exonum-proto = { version = "0.13.0-rc.2", path = "../components/proto" }
 
 [dev-dependencies]
 criterion = "0.3.0"
@@ -93,7 +93,7 @@ rocksdb_zstd = ["exonum-merkledb/rocksdb_zstd"]
 rocksdb_bzip2 = ["exonum-merkledb/rocksdb_bzip2"]
 
 [build-dependencies]
-exonum-build = { version = "0.13.0-rc.1", path = "../components/build" }
+exonum-build = { version = "0.13.0-rc.2", path = "../components/build" }
 
 [package.metadata.docs.rs]
 dependencies = [ "protobuf-compiler" ]

exonum/build.rs

@@ -1,6 +1,6 @@
 // spell-checker:ignore rustc
 
-use exonum_build::{ProtoSources, ProtobufGenerator};
+use exonum_build::ProtobufGenerator;
 
 use std::{env, fs::File, io::Write, path::Path, process::Command};
 
@@ -35,19 +35,6 @@ fn main() {
 
     create_path_to_protobuf_schema_env();
 
-    let crypto_protos = ProtoSources::Path("../components/crypto/src/proto/schema");
-    let common_protos = ProtoSources::Path("../components/proto/src/proto");
-
-    // Exonum crypto.
-    ProtobufGenerator::with_mod_name("exonum_crypto_proto_mod.rs")
-        .with_input_dir(&crypto_protos.path())
-        .generate();
-
-    // Exonum proto.
-    ProtobufGenerator::with_mod_name("exonum_common_proto_mod.rs")
-        .with_input_dir(&common_protos.path())
-        .generate();
-
     ProtobufGenerator::with_mod_name("exonum_proto_mod.rs")
         .with_input_dir("src/proto/schema/exonum")
         .with_crypto()