Update deps

tari-project · Mar 25, 2024 · 67a85f4 · 67a85f4
1 parent e0ad342
commit 67a85f4
Show file tree

Hide file tree

Showing 32 changed files with 68 additions and 82 deletions.
diff --git a/.github/workflows/base_node_binaries.json b/.github/workflows/base_node_binaries.json
@@ -2,7 +2,7 @@
   {
     "name": "linux-x86_64",
     "runs-on": "ubuntu-20.04",
-    "rust": "nightly-2023-12-12",
+    "rust": "nightly-2024-03-01",
     "target": "x86_64-unknown-linux-gnu",
     "cross": false
   },

diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml
@@ -25,7 +25,7 @@ env:
   TBN_FEATURES: "default, safe"
   TBN_LIBRARIES: "minotari_mining_helper_ffi"
   TARI_NETWORK_DIR: testnet
-  toolchain: nightly-2023-12-12
+  toolchain: nightly-2024-03-01
   matrix-json-file: ".github/workflows/base_node_binaries.json"
   CARGO_HTTP_MULTIPLEXING: false
   CARGO_UNSTABLE_SPARSE_REGISTRY: true

diff --git a/.github/workflows/build_dockers.yml b/.github/workflows/build_dockers.yml
@@ -47,7 +47,7 @@ name: Build docker images
           - xmrig
 
 env:
-  toolchain_default: nightly-2023-12-12
+  toolchain_default: nightly-2024-03-01
 
 concurrency:
   # https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix

diff --git a/.github/workflows/build_dockers_workflow.yml b/.github/workflows/build_dockers_workflow.yml
@@ -14,7 +14,7 @@ name: Build docker images - workflow_call/on-demand
       toolchain:
         type: string
         description: 'Rust toolchain'
-        default: nightly-2023-12-12
+        default: nightly-2024-03-01
       arch:
         type: string
         default: x86-64

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ name: CI
   merge_group:
 
 env:
-  toolchain: nightly-2023-12-12
+  toolchain: nightly-2024-03-01
   CARGO_HTTP_MULTIPLEXING: false
   CARGO_TERM_COLOR: always
   CARGO_UNSTABLE_SPARSE_REGISTRY: true

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -11,7 +11,7 @@ name: Source Coverage
       - ci-coverage-*
 
 env:
-  toolchain: nightly-2023-12-12
+  toolchain: nightly-2024-03-01
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -27,7 +27,7 @@ name: Integration tests
         type: string
 
 env:
-  toolchain: nightly-2023-12-12
+  toolchain: nightly-2024-03-01
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_app_grpc/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 tari_common_types = {  path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_core = { path = "../../base_layer/core" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_script = { path = "../../infrastructure/tari_script" }
 tari_utilities = { version = "0.7" }
 

diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml
@@ -13,7 +13,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_contacts = { path = "../../base_layer/contacts" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_key_manager = { path = "../../base_layer/key_manager" }
 tari_libtor = { path = "../../infrastructure/libtor", optional = true }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }

diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml
@@ -14,7 +14,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 minotari_app_utilities = { path = "../minotari_app_utilities", features = ["miner_input"] }
 minotari_app_grpc = { path = "../minotari_app_grpc" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_utilities = { version = "0.7" }
 
 base64 = "0.13.0"

diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml
@@ -15,7 +15,7 @@ tari_comms = { path = "../../comms/core", features = ["rpc"] }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_libtor = { path = "../../infrastructure/libtor", optional = true }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
 tari_storage = {path="../../infrastructure/storage"}

diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml
@@ -32,7 +32,7 @@ crate-type = ["staticlib","cdylib"]
 [dev-dependencies]
 chrono = { version = "0.4.19", default-features = false }
 rand = "0.8"
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 
 [build-dependencies]
 cbindgen = "0.24.3"

diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml
@@ -7,7 +7,7 @@ version = "1.0.0-pre.11a"
 edition = "2018"
 
 [dependencies]
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_utilities = { version = "0.7" }
 tari_common = {  path = "../../common", version = "1.0.0-pre.11a" }
 

diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml
@@ -12,7 +12,7 @@ tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.11a" }
 tari_common_types = {  path = "../../base_layer/common_types", version = "1.0.0-pre.11a" }
 tari_comms = {  path = "../../comms/core", version = "1.0.0-pre.11a" }
 tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.11a" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_p2p = {  path = "../p2p", features = ["auto-update"], version = "1.0.0-pre.11a" }
 tari_service_framework = {  path = "../service_framework", version = "1.0.0-pre.11a" }
 tari_shutdown = {  path = "../../infrastructure/shutdown", version = "1.0.0-pre.11a" }

diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml
@@ -31,7 +31,7 @@ tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-p
 tari_comms = { path = "../../comms/core", version = "1.0.0-pre.11a" }
 tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.11a" }
 tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.0.0-pre.11a" }
-tari_crypto = { version = "0.20", features = ["borsh"] }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update", features = ["borsh"] }
 tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-pre.11a" }
 tari_mmr = { path = "../../base_layer/mmr", optional = true , version = "1.0.0-pre.11a"}
 tari_p2p = { path = "../../base_layer/p2p", version = "1.0.0-pre.11a" }
@@ -94,7 +94,7 @@ tiny-keccak = { package = "tari-tiny-keccak", version = "2.0.2", features = [
 criterion = { version = "0.4.0" }
 tari_p2p = { path = "../../base_layer/p2p", features = ["test-mocks"] }
 tari_test_utils = { path = "../../infrastructure/test_utils" }
-curve25519-dalek = { package = "tari-curve25519-dalek", version = "4.0.3" }
+curve25519-dalek = { version = "=4.1.1" }
 # SQLite required for the integration tests
 libsqlite3-sys = { version = "0.25.1", features = ["bundled"] }
 config = { version = "0.13.0" }

diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_utilities = { version = "0.7" }
 tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.11a" }
 tari_common_types = {  path = "../../base_layer/common_types", version = "1.0.0-pre.11a"}

diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml
@@ -12,7 +12,7 @@ default = []
 
 [dependencies]
 tari_utilities = { version = "0.7" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_common = { path = "../../common", version = "1.0.0-pre.11a" }
 thiserror = "1.0"
 borsh = "1.2"

diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 tari_comms = {  path = "../../comms/core", version = "1.0.0-pre.11a" }
 tari_comms_dht = {  path = "../../comms/dht", version = "1.0.0-pre.11a" }
 tari_common = {  path = "../../common", version = "1.0.0-pre.11a" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_service_framework = {  path = "../service_framework", version = "1.0.0-pre.11a" }
 tari_shutdown = {  path = "../../infrastructure/shutdown", version = "1.0.0-pre.11a" }
 tari_storage = {  path = "../../infrastructure/storage", version = "1.0.0-pre.11a" }

diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 tari_comms = { path = "../../comms/core" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_common = { path = "../../common" }
 tari_core = { path = "../core", default-features = false, features = ["transactions", "base_node_proto", "base_node"] }
 tari_common_types = {  path = "../../base_layer/common_types", version = "1.0.0-pre.11a" }

diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml
@@ -12,7 +12,7 @@ tari_common = { path = "../../common", version = "1.0.0-pre.11a" }
 tari_common_types = {  path = "../../base_layer/common_types", version = "1.0.0-pre.11a" }
 tari_comms = {  path = "../../comms/core", version = "1.0.0-pre.11a" }
 tari_comms_dht = {  path = "../../comms/dht", version = "1.0.0-pre.11a" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_key_manager = {  path = "../key_manager", features = ["key_manager_service"], version = "1.0.0-pre.11a" }
 tari_p2p = {  path = "../p2p", features = ["auto-update"], version = "1.0.0-pre.11a"}
 tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-pre.11a" }

diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml
@@ -12,7 +12,7 @@ tari_common = { path="../../common" }
 tari_common_types = { path="../common_types" }
 tari_comms = {  path = "../../comms/core", features = ["c_integration"]}
 tari_comms_dht = {  path = "../../comms/dht", default-features = false }
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_key_manager = {  path = "../key_manager" }
 tari_p2p = {  path = "../p2p" }
 tari_script = { path = "../../infrastructure/tari_script" }

diff --git a/base_layer/wallet_ffi/README.md b/base_layer/wallet_ffi/README.md
@@ -132,8 +132,8 @@ Install [Rust](https://www.rust-lang.org/tools/install)
 
 Install the following tools and system images
 ```Shell Script
-rustup toolchain add nightly-2023-12-12
-rustup default nightly-2023-12-12
+rustup toolchain add nightly-2024-03-01
+rustup default nightly-2024-03-01
 rustup component add rustfmt --toolchain nightly
 rustup component add clippy
 rustup target add x86_64-apple-ios aarch64-apple-ios # iPhone and emulator cross compiling

diff --git a/buildtools/docker/base_node.Dockerfile b/buildtools/docker/base_node.Dockerfile
@@ -1,13 +1,13 @@
 # syntax=docker/dockerfile:1
 #FROM rust:1.42.0 as builder
-FROM quay.io/tarilabs/rust_tari-build-with-deps:nightly-2023-12-12 as builder
+FROM quay.io/tarilabs/rust_tari-build-with-deps:nightly-2024-03-01 as builder
 
 # Copy the dependency lists
 #ADD Cargo.toml ./
 ADD . /minotari_node
 WORKDIR /minotari_node
 
-# RUN rustup component add rustfmt --toolchain nightly-2023-12-12-x86_64-unknown-linux-gnu
+# RUN rustup component add rustfmt --toolchain nightly-2024-03-01-x86_64-unknown-linux-gnu
 #ARG TBN_ARCH=native
 ARG TBN_ARCH=x86-64
 #ARG TBN_FEATURES=avx2

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -14,7 +14,7 @@ build = ["toml", "prost-build"]
 static-application-info = ["git2"]
 
 [dependencies]
-tari_crypto = { version = "0.20" }
+tari_crypto = { git = "https://github.com/AaronFeickert/tari-crypto", branch = "range-proof-update" }
 tari_features = { path = "./tari_features", version = "1.0.0-pre.11a"}
 
 anyhow = "1.0.53"