comments

tari-project · Jul 9, 2024 · 7241adb · 7241adb
1 parent 3a05257
commit 7241adb
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 90 deletions.
diff --git a/.github/workflows/build_binaries.json b/.github/workflows/build_binaries.json
@@ -2,7 +2,7 @@
   {
     "name": "linux-x86_64",
     "runs-on": "ubuntu-20.04",
-    "rust": "nightly-2024-03-01",
+    "rust": "nightly-2024-07-07",
     "target": "x86_64-unknown-linux-gnu",
     "cross": false,
     "build_metric": true

diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml
@@ -26,7 +26,7 @@ env:
   TS_FEATURES: "default, safe"
   TS_LIBRARIES: "minotari_mining_helper_ffi"
   TARI_NETWORK_DIR: testnet
-  toolchain: nightly-2024-03-01
+  toolchain: nightly-2024-07-07
   matrix-json-file: ".github/workflows/build_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
@@ -48,7 +48,7 @@ name: Build docker images
           - xmrig
 
 env:
-  toolchain_default: nightly-2024-03-01
+  toolchain_default: nightly-2024-07-07
 
 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-2024-03-01
+        default: nightly-2024-07-07
       arch:
         type: string
         default: x86-64

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -11,7 +11,7 @@ name: Source Coverage
       - ci-coverage-*
 
 env:
-  toolchain: nightly-2024-03-01
+  toolchain: nightly-2024-07-07
 
 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-2024-03-01
+  toolchain: nightly-2024-07-07
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml
@@ -115,4 +115,4 @@ name = "mempool"
 harness = false
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tari_target_network_mainnet)', 'cfg(tari_target_network_nextnet)', 'cfg(tari_target_network_testnet)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tari_target_network_mainnet)', 'cfg(tari_target_network_nextnet)', 'cfg(tari_target_network_testnet)'] }
diff --git a/base_layer/core/src/common/limited_reader.rs b/base_layer/core/src/common/limited_reader.rs
diff --git a/base_layer/core/src/common/mod.rs b/base_layer/core/src/common/mod.rs
@@ -28,7 +28,6 @@ use crate::consensus::DomainSeparatedConsensusHasher;
 
 pub mod borsh;
 pub mod byte_counter;
-// pub mod limited_reader;
 pub mod one_sided;
 
 #[cfg(feature = "base_node")]

diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml
@@ -32,4 +32,4 @@ tari_common = { path = "../../common", features = ["build", "static-application-
 crate-type = ["cdylib"]
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tari_target_network_mainnet)', 'cfg(tari_target_network_nextnet)', 'cfg(tari_target_network_testnet)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tari_target_network_mainnet)', 'cfg(tari_target_network_nextnet)', 'cfg(tari_target_network_testnet)'] }
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-2024-03-01
-rustup default nightly-2024-03-01
+rustup toolchain add nightly-2024-07-07
+rustup default nightly-2024-07-07
 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/base_layer/wallet_ffi/wallet.h b/base_layer/wallet_ffi/wallet.h
@@ -2965,9 +2965,9 @@ TariBalance *wallet_get_balance(struct TariWallet *wallet,
  * * `page_size` - A number of items per page,
  * * `sorting` - An enum representing desired sorting,
  * * `dust_threshold` - A value filtering threshold. Outputs whose values are <= `dust_threshold` are not listed in the
- * result.
+ *   result.
  * * `error_out` - Pointer to an int which will be modified to an error code should one occur, may not be null.
- * Functions as an out parameter.
+ *   Functions as an out parameter.
  *
  * ## Returns
  * `*mut TariVector` - Returns a struct with an array pointer, length and capacity (needed for proper destruction

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-2024-03-01 as builder
+FROM quay.io/tarilabs/rust_tari-build-with-deps:nightly-2024-07-07 as builder
 
 # Copy the dependency lists
 #ADD Cargo.toml ./
 ADD . /minotari_node
 WORKDIR /minotari_node
 
-# RUN rustup component add rustfmt --toolchain nightly-2024-03-01-x86_64-unknown-linux-gnu
+# RUN rustup component add rustfmt --toolchain nightly-2024-07-07-x86_64-unknown-linux-gnu
 #ARG TBN_ARCH=native
 ARG TBN_ARCH=x86-64
 #ARG TBN_FEATURES=avx2

diff --git a/scripts/test_in_docker.sh b/scripts/test_in_docker.sh
@@ -2,8 +2,8 @@
 
 # Run the Tari test suite locally inside a suitable docker container
 
-IMAGE=quay.io/tarilabs/rust_tari-build-with-deps:nightly-2024-03-01
-TOOLCHAIN_VERSION=nightly-2024-03-01
+IMAGE=quay.io/tarilabs/rust_tari-build-with-deps:nightly-2024-07-07
+TOOLCHAIN_VERSION=nightly-2024-07-07
 CONTAINER=tari_test
 
 echo "Deleting old container"