diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ec1af0afe..abaf3d723b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 defaults: - rust_image: &rust_image quay.io/tarilabs/rust_tari-build-with-deps:nightly-2020-06-10 + rust_image: &rust_image quay.io/tarilabs/rust_tari-build-with-deps:nightly-2020-01-08 commands: test: diff --git a/.github/workflows/clippy-check.yml b/.github/workflows/clippy-check.yml index 6432f5ddac..bbb4de07ca 100644 --- a/.github/workflows/clippy-check.yml +++ b/.github/workflows/clippy-check.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2020-06-10 + toolchain: nightly-2020-01-08 components: clippy, rustfmt override: true - name: Install dependencies diff --git a/Cargo.lock b/Cargo.lock index c4f7d36aef..ce32b28120 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -471,9 +471,9 @@ dependencies = [ [[package]] name = "clear_on_drop" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9cc5db465b294c3fa986d5bbb0f3017cd850bff6dd6c52f9ccff8b4d21b7b08" +checksum = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17" dependencies = [ "cc", ] @@ -3312,7 +3312,7 @@ dependencies = [ [[package]] name = "tari_base_node" -version = "0.3.0" +version = "0.4.2" dependencies = [ "chrono", "chrono-english", @@ -3525,9 +3525,9 @@ dependencies = [ [[package]] name = "tari_crypto" -version = "0.4.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18fb51209654df1a6f8e6c8aa96ffb87cd17111c76ac1dfdc688884dd964d64" +checksum = "f3f96f4d8994e0db8776e8f19415bb9be3d2adf3b2d462d86fdc0adf602bcdc4" dependencies = [ "base64 0.10.1", "blake2", diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml index ea1ec95b95..814bf2ba2f 100644 --- a/applications/tari_base_node/Cargo.toml +++ b/applications/tari_base_node/Cargo.toml @@ -20,7 +20,7 @@ tari_shutdown = { path = "../../infrastructure/shutdown", version = "^0.0" } tari_mmr = { path = "../../base_layer/mmr", version = "^0.1" } tari_wallet = { path = "../../base_layer/wallet", version = "^0.1" } tari_broadcast_channel = "^0.2" -tari_crypto = { version = "^0.4" } +tari_crypto = { version = "^0.3" } structopt = { version = "0.3.13", default_features = false } config = { version = "0.9.3" } diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 5ba439b1f6..b3ed25b235 100644 --- a/base_layer/core/Cargo.toml +++ b/base_layer/core/Cargo.toml @@ -21,7 +21,7 @@ avx2 = ["tari_crypto/avx2"] [dependencies] tari_comms = { version = "^0.1", path = "../../comms"} tari_infra_derive = { version = "^0.0", path = "../../infrastructure/derive" } -tari_crypto = { version = "^0.4" } +tari_crypto = { version = "^0.3" } tari_storage = { version = "^0.1", path = "../../infrastructure/storage" } tari_common = { version= "^0.1", path = "../../common"} tari_service_framework = { version = "^0.0", path = "../service_framework"} diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index af5eb88853..01f80b7459 100644 --- a/base_layer/key_manager/Cargo.toml +++ b/base_layer/key_manager/Cargo.toml @@ -8,7 +8,7 @@ version = "0.0.10" edition = "2018" [dependencies] -tari_crypto = { version = "^0.4" } +tari_crypto = { version = "^0.3" } rand = "0.7.2" digest = "0.8.0" sha2 = "0.8.0" diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml index 0104db22f9..74d707dfa6 100644 --- a/base_layer/mmr/Cargo.toml +++ b/base_layer/mmr/Cargo.toml @@ -21,7 +21,7 @@ criterion = "0.2" rand="0.7.0" blake2 = "0.8.0" tari_infra_derive= { path = "../../infrastructure/derive", version = "^0.0" } -tari_crypto = { version = "^0.4" } +tari_crypto = { version = "^0.3" } serde_json = "1.0" bincode = "1.1" [lib] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index 2ff7d3ce03..408d85a411 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -16,7 +16,7 @@ test-mocks = [] tari_broadcast_channel = "^0.2" tari_comms = { version = "^0.1", path = "../../comms"} tari_comms_dht = { version = "^0.1", path = "../../comms/dht"} -tari_crypto = { version = "^0.4" } +tari_crypto = { version = "^0.3" } tari_service_framework = { version = "^0.0", path = "../service_framework"} tari_shutdown = { version = "^0.0", path="../../infrastructure/shutdown" } tari_storage = {version = "^0.1", path = "../../infrastructure/storage"} diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index 6a1fc81534..80392cfddb 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -13,7 +13,7 @@ c_integration = [] [dependencies] tari_comms = { path = "../../comms", version = "^0.1"} tari_comms_dht = { path = "../../comms/dht", version = "^0.1"} -tari_crypto = { version = "^0.4" } +tari_crypto = { version = "^0.3" } tari_key_manager = {path = "../key_manager", version = "^0.0"} tari_p2p = {path = "../p2p", version = "^0.1"} tari_service_framework = { version = "^0.0", path = "../service_framework"} diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml index 0bc86d55af..e1d8e1bab4 100644 --- a/base_layer/wallet_ffi/Cargo.toml +++ b/base_layer/wallet_ffi/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] tari_comms = { path = "../../comms", version = "^0.1"} tari_comms_dht = { path = "../../comms/dht", version = "^0.1"} -tari_crypto = { version = "^0.4" } +tari_crypto = { version = "^0.3" } tari_p2p = {path = "../p2p", version = "^0.1"} tari_wallet = { path = "../wallet", version = "^0.1", features = ["test_harness", "c_integration"]} tari_shutdown = { path = "../../infrastructure/shutdown", version = "^0.0"} diff --git a/buildtools/windows_inno_installer.iss b/buildtools/windows_inno_installer.iss index ac2729c775..7ceb64498c 100644 --- a/buildtools/windows_inno_installer.iss +++ b/buildtools/windows_inno_installer.iss @@ -3,7 +3,7 @@ #define MyOrgName "Tari" #define MyAppName "Base Node" -#define MyAppVersion "0.3.0-0f59836-release" +#define MyAppVersion "?.?.?-???????-release" #define MyAppPublisher "The Tari Development Community" #define MyAppURL "https://github.com/tari-project/tari" #define MyAppSupp "Tari Website" diff --git a/comms/Cargo.toml b/comms/Cargo.toml index 08d95b518a..899c0901c7 100644 --- a/comms/Cargo.toml +++ b/comms/Cargo.toml @@ -10,7 +10,7 @@ version = "0.1.0" edition = "2018" [dependencies] -tari_crypto = { version = "^0.4" } +tari_crypto = { version = "^0.3" } tari_storage = { version="^0.1", path = "../infrastructure/storage" } tari_shutdown = { version="^0.0", path = "../infrastructure/shutdown" } @@ -19,7 +19,7 @@ blake2 = "0.8.1" bytes = { version = "0.5.x", features=["serde"] } chrono = { version = "0.4.6", features = ["serde"] } cidr = "0.1.0" -clear_on_drop = "=0.2.4" +clear_on_drop = "=0.2.3" data-encoding = "2.2.0" digest = "0.8.0" futures = { version = "^0.3", features = ["async-await"]} diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index e00804aa22..f8b9d5fb3a 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -14,7 +14,7 @@ test-mocks = [] [dependencies] tari_comms = { version = "^0.1", path = "../"} -tari_crypto = { version = "^0.4" } +tari_crypto = { version = "^0.3" } tari_utilities = { version = "^0.1" } tari_shutdown = { version = "^0.0", path = "../../infrastructure/shutdown"} tari_storage = { version = "^0.1", path = "../../infrastructure/storage"} diff --git a/rust-toolchain b/rust-toolchain index 4aec5c6b40..ee412581d8 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-06-10 +nightly-2020-01-08