Merge pull request #2429 from subspace/update-rust

Update Rust to latest nightly

.github/workflows/rust.yml

@@ -52,10 +52,7 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - name: cargo fmt
-        uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1
-        with:
-          command: fmt
-          args: --all -- --check
+        run: cargo fmt --all -- --check
 
   cargo-clippy:
     strategy:
@@ -104,10 +101,8 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - name: cargo clippy
-        uses: actions-rs/clippy-check@b5b5f21f4797c02da247df37026fcd0a5024aa4d # @v1.0.7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --locked --all-targets --features "runtime-benchmarks" -- -D warnings
+        run: |
+          cargo -Zgitoxide -Zgit clippy --locked --all-targets --features "runtime-benchmarks" -- -D warnings
 
   cargo-docs:
     runs-on: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
@@ -131,7 +126,7 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - name: Check Documentation
-        run: cargo doc --locked --all --no-deps --lib
+        run: cargo -Zgitoxide -Zgit doc --locked --all --no-deps --lib
         env:
           RUSTDOCFLAGS: "-D rustdoc::broken-intra-doc-links -D rustdoc::private_intra_doc_links"
 
@@ -187,7 +182,5 @@ jobs:
           tool: cargo-nextest
 
       - name: cargo nextest run --locked
-        uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1
-        with:
-          command: nextest
-          args: run --locked
+        run: |
+          cargo -Zgitoxide -Zgit nextest run --locked

.github/workflows/rustdoc.yml

@@ -39,7 +39,7 @@ jobs:
 
       # Build the rust crate docs
       - name: Build Documentation
-        run: cargo doc --all --no-deps --lib
+        run: cargo -Zgitoxide -Zgit doc --all --no-deps --lib
         env:
           RUSTDOCFLAGS: "-Z unstable-options --enable-index-page"
 

.github/workflows/snapshot-build.yml

@@ -191,25 +191,19 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - name: Build farmer (Linux and Windows)
-        uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1
-        with:
-          command: build
-          args: --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer
+        run: |
+          cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer
         if: runner.os != 'macOS'
 
       # We build macOS without `numa` feature, primarily because of https://github.com/HadrienG2/hwlocality/issues/31
       - name: Build farmer (macOS)
-        uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1
-        with:
-          command: build
-          args: --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer --no-default-features
+        run: |
+          cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer --no-default-features
         if: runner.os == 'macOS'
 
       - name: Build node
-        uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1
-        with:
-          command: build
-          args: --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-node
+        run: |
+          cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-node
 
       - name: Sign Application (macOS)
         run: |

Dockerfile-bootstrap-node

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2023-10-16
+ARG RUSTC_VERSION=nightly-2024-01-19
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583
@@ -41,7 +41,7 @@ COPY test /code/test
 # Up until this line all Rust images in this repo should be the same to share the same layers
 
 RUN \
-    /root/.cargo/bin/cargo build \
+    /root/.cargo/bin/cargo -Zgitoxide -Zgit build \
         --locked \
         -Z build-std \
         --profile $PROFILE \

Dockerfile-bootstrap-node.aarch64

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2023-10-16
+ARG RUSTC_VERSION=nightly-2024-01-19
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583
@@ -54,7 +54,7 @@ RUN \
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends g++-9-multilib
 
 RUN \
-    /root/.cargo/bin/cargo build \
+    /root/.cargo/bin/cargo -Zgitoxide -Zgit build \
         --locked \
         -Z build-std \
         --profile $PROFILE \

Dockerfile-farmer

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2023-10-16
+ARG RUSTC_VERSION=nightly-2024-01-19
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583
@@ -41,7 +41,7 @@ COPY test /code/test
 # Up until this line all Rust images in this repo should be the same to share the same layers
 
 RUN \
-    /root/.cargo/bin/cargo build \
+    /root/.cargo/bin/cargo -Zgitoxide -Zgit build \
         --locked \
         -Z build-std \
         --profile $PROFILE \

Dockerfile-farmer.aarch64

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2023-10-16
+ARG RUSTC_VERSION=nightly-2024-01-19
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583
@@ -54,7 +54,7 @@ RUN \
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends g++-9-multilib
 
 RUN \
-    /root/.cargo/bin/cargo build \
+    /root/.cargo/bin/cargo -Zgitoxide -Zgit build \
         --locked \
         -Z build-std \
         --profile $PROFILE \

Dockerfile-node

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2023-10-16
+ARG RUSTC_VERSION=nightly-2024-01-19
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583
@@ -43,7 +43,7 @@ COPY test /code/test
 ARG SUBSTRATE_CLI_GIT_COMMIT_HASH
 
 RUN \
-    /root/.cargo/bin/cargo build \
+    /root/.cargo/bin/cargo -Zgitoxide -Zgit build \
         --locked \
         -Z build-std \
         --profile $PROFILE \

Dockerfile-node.aarch64

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2023-10-16
+ARG RUSTC_VERSION=nightly-2024-01-19
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583
@@ -51,7 +51,7 @@ RUN \
         libc6-dev-arm64-cross
 
 RUN \
-    /root/.cargo/bin/cargo build \
+    /root/.cargo/bin/cargo -Zgitoxide -Zgit build \
         --locked \
         -Z build-std \
         --profile $PROFILE \

Dockerfile-runtime

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2023-10-16
+ARG RUSTC_VERSION=nightly-2024-01-19
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583
@@ -41,7 +41,7 @@ COPY test /code/test
 # Up until this line all Rust images in this repo should be the same to share the same layers
 
 RUN \
-    /root/.cargo/bin/cargo build \
+    /root/.cargo/bin/cargo -Zgitoxide -Zgit build \
         --locked \
         -Z build-std \
         --profile $PROFILE \

crates/pallet-domains/src/staking.rs

@@ -386,9 +386,11 @@ pub(crate) fn do_convert_previous_epoch_deposits<T: Config>(
     let maybe_pending_deposit = deposit.pending.take();
     // if it is one of the previous domain epoch, then calculate shares for the epoch and update known deposit
     deposit.pending = if let Some(PendingDeposit {
-                                                effective_domain_epoch,
-                                                amount,
-                                            }) = maybe_pending_deposit && let Some(epoch_share_price) = OperatorEpochSharePrice::<T>::get(operator_id, effective_domain_epoch)
+        effective_domain_epoch,
+        amount,
+    }) = maybe_pending_deposit
+        && let Some(epoch_share_price) =
+            OperatorEpochSharePrice::<T>::get(operator_id, effective_domain_epoch)
     {
         let new_shares = epoch_share_price.stake_to_shares::<T>(amount);
         deposit.known.shares = deposit
@@ -411,21 +413,24 @@ pub(crate) fn do_convert_previous_epoch_withdrawal<T: Config>(
     withdrawal: &mut Withdrawal<BalanceOf<T>, T::Share, DomainBlockNumberFor<T>>,
 ) -> Result<(), Error> {
     let withdrawal_in_shares = withdrawal.withdrawal_in_shares.take();
-    withdrawal.withdrawal_in_shares =
-        if let Some((domain_epoch, domain_block_number, shares)) = withdrawal_in_shares && let Some(epoch_share_price) = OperatorEpochSharePrice::<T>::get(operator_id, domain_epoch){
-            let withdrawal_amount = epoch_share_price.shares_to_stake::<T>(shares);
-            withdrawal.total_withdrawal_amount = withdrawal
-                .total_withdrawal_amount
-                .checked_add(&withdrawal_amount)
-                .ok_or(Error::BalanceOverflow)?;
-            let (domain_id, _) = domain_epoch.deconstruct();
-            withdrawal
-                .withdrawals
-                .push_back((domain_id, domain_block_number, withdrawal_amount));
-            None
-        } else {
-            withdrawal_in_shares
-        };
+    withdrawal.withdrawal_in_shares = if let Some((domain_epoch, domain_block_number, shares)) =
+        withdrawal_in_shares
+        && let Some(epoch_share_price) =
+            OperatorEpochSharePrice::<T>::get(operator_id, domain_epoch)
+    {
+        let withdrawal_amount = epoch_share_price.shares_to_stake::<T>(shares);
+        withdrawal.total_withdrawal_amount = withdrawal
+            .total_withdrawal_amount
+            .checked_add(&withdrawal_amount)
+            .ok_or(Error::BalanceOverflow)?;
+        let (domain_id, _) = domain_epoch.deconstruct();
+        withdrawal
+            .withdrawals
+            .push_back((domain_id, domain_block_number, withdrawal_amount));
+        None
+    } else {
+        withdrawal_in_shares
+    };
 
     Ok(())
 }
@@ -836,7 +841,10 @@ pub(crate) fn do_unlock_funds<T: Config>(
             *maybe_withdrawal = None;
             // if there is no deposit or pending deposits, then clean up the deposit state as well
             Deposits::<T>::mutate_exists(operator_id, nominator_id, |maybe_deposit| {
-                if let Some(deposit) = maybe_deposit && deposit.known.shares.is_zero() && deposit.pending.is_none() {
+                if let Some(deposit) = maybe_deposit
+                    && deposit.known.shares.is_zero()
+                    && deposit.pending.is_none()
+                {
                     *maybe_deposit = None
                 }
             });

crates/pallet-domains/src/tests.rs

@@ -1023,7 +1023,7 @@ fn test_invalid_domain_extrinsic_root_proof() {
         );
 
         let bad_receipt_at = 8;
-        let valid_bundle_digests = vec![ValidBundleDigest {
+        let valid_bundle_digests = [ValidBundleDigest {
             bundle_index: 0,
             bundle_digest: vec![(Some(vec![1, 2, 3]), ExtrinsicDigest::Data(vec![4, 5, 6]))],
         }];

crates/pallet-rewards/src/lib.rs

@@ -113,7 +113,7 @@ impl<T: Config> Pallet<T> {
         // Block author may equivocate, in which case they'll not be present here
         if let Some(block_author) = T::FindBlockRewardAddress::find_block_reward_address() {
             let reward = T::BlockReward::get();
-            T::Currency::deposit_creating(&block_author, reward);
+            let _imbalance = T::Currency::deposit_creating(&block_author, reward);
             T::OnReward::on_reward(block_author.clone(), reward);
 
             Self::deposit_event(Event::BlockReward {
@@ -127,7 +127,7 @@ impl<T: Config> Pallet<T> {
         let reward = T::VoteReward::get();
 
         for voter in T::FindVotingRewardAddresses::find_voting_reward_addresses() {
-            T::Currency::deposit_creating(&voter, reward);
+            let _imbalance = T::Currency::deposit_creating(&voter, reward);
             T::OnReward::on_reward(voter.clone(), reward);
 
             Self::deposit_event(Event::VoteReward { voter, reward });

crates/pallet-transaction-fees/src/lib.rs

@@ -264,7 +264,7 @@ where
             // Issue storage fees reward.
             let storage_fees_reward = storage_fees_escrow_reward + collected_storage_fees_reward;
             if !storage_fees_reward.is_zero() {
-                T::Currency::deposit_creating(&block_author, storage_fees_reward);
+                let _imbalance = T::Currency::deposit_creating(&block_author, storage_fees_reward);
                 Self::deposit_event(Event::<T>::StorageFeesReward {
                     who: block_author.clone(),
                     amount: storage_fees_reward,
@@ -273,7 +273,8 @@ where
 
             // Issue compute fees reward.
             if !collected_fees.compute.is_zero() {
-                T::Currency::deposit_creating(&block_author, collected_fees.compute);
+                let _imbalance =
+                    T::Currency::deposit_creating(&block_author, collected_fees.compute);
                 Self::deposit_event(Event::<T>::ComputeFeesReward {
                     who: block_author.clone(),
                     amount: collected_fees.compute,
@@ -282,7 +283,7 @@ where
 
             // Issue tips reward.
             if !collected_fees.tips.is_zero() {
-                T::Currency::deposit_creating(&block_author, collected_fees.tips);
+                let _imbalance = T::Currency::deposit_creating(&block_author, collected_fees.tips);
                 Self::deposit_event(Event::<T>::TipsReward {
                     who: block_author,
                     amount: collected_fees.tips,

crates/sp-domains/src/merkle_tree.rs

@@ -1,5 +1,4 @@
 use crate::OperatorPublicKey;
-use blake2::digest::typenum::U32;
 use blake2::digest::FixedOutput;
 use blake2::{Blake2b, Digest};
 use parity_scale_codec::{Decode, Encode};
@@ -27,12 +26,12 @@ pub struct Witness {
 }
 
 #[derive(Clone)]
-pub struct Blake2b256Algorithm(Blake2b<U32>);
+pub struct Blake2b256Algorithm;
 
 impl Default for Blake2b256Algorithm {
     #[inline]
     fn default() -> Self {
-        Self(Blake2b::new())
+        Self
     }
 }
 

crates/subspace-archiving/tests/integration/archiver.rs

@@ -276,7 +276,7 @@ fn archiver() {
 
     // Check archived bytes for block with index `2` in each archived segment
     {
-        let archived_segment = archived_segments.get(0).unwrap();
+        let archived_segment = archived_segments.first().unwrap();
         let last_archived_block = archived_segment.segment_header.last_archived_block();
         assert_eq!(last_archived_block.number, 2);
         assert_eq!(last_archived_block.partial_archived(), Some(108352733));
@@ -360,7 +360,7 @@ fn archiver() {
 
     // Archived segment should fit exactly into the last archived segment (rare case)
     {
-        let archived_segment = archived_segments.get(0).unwrap();
+        let archived_segment = archived_segments.first().unwrap();
         let last_archived_block = archived_segment.segment_header.last_archived_block();
         assert_eq!(last_archived_block.number, 3);
         assert_eq!(last_archived_block.partial_archived(), None);

crates/subspace-farmer/src/bin/subspace-farmer/commands/farm.rs

@@ -231,11 +231,7 @@ impl FromStr for DiskFarm {
 
             match key {
                 "path" => {
-                    plot_directory.replace(
-                        PathBuf::try_from(value).map_err(|error| {
-                            format!("Failed to parse `path` \"{value}\": {error}")
-                        })?,
-                    );
+                    plot_directory.replace(PathBuf::from(value));
                 }
                 "size" => {
                     allocated_plotting_space.replace(

crates/subspace-networking/src/utils/unique_record_binary_heap.rs

@@ -45,6 +45,8 @@ where
     RecordKey: From<K>,
     K: Clone,
 {
+    // TODO: False-positive in clippy: https://github.com/rust-lang/rust-clippy/issues/12154
+    #[allow(clippy::unconditional_recursion)]
     fn eq(&self, other: &Self) -> bool {
         self.peer_distance().eq(&other.peer_distance())
     }

crates/subspace-proof-of-space/src/chiapos/table.rs

@@ -13,7 +13,8 @@ use alloc::vec::Vec;
 use chacha20::cipher::{KeyIvInit, StreamCipher, StreamCipherSeek};
 use chacha20::{ChaCha8, Key, Nonce};
 use core::mem;
-use core::simd::{Simd, SimdUint};
+use core::simd::num::SimdUint;
+use core::simd::Simd;
 #[cfg(any(feature = "parallel", test))]
 use rayon::prelude::*;
 use seq_macro::seq;