chore: update to rust 1.81.0

fvm/Cargo.toml

@@ -61,3 +61,7 @@ gas_calibration = []
 # The current implementation keeps it by default for backward compatibility reason.
 # See <https://github.com/filecoin-project/ref-fvm/issues/2001>
 verify-signature = []
+
+# Allow coverage attribute.
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage,coverage_nightly)'] }

fvm/src/engine/mod.rs

@@ -164,10 +164,9 @@ fn wasmtime_config(ec: &EngineConfig) -> anyhow::Result<wasmtime::Config> {
     c.static_memory_maximum_size(instance_memory_maximum_size);
     c.static_memory_forced(true);
 
-    // wasmtime default: true
-    // We don't want threads, there is no way to ensure determinism
-    #[cfg(feature = "wasmtime/threads")]
-    c.wasm_threads(false);
+    // Note: Threads are disabled by default.
+    // If we add the "wasmtime/threads" feature in the future,
+    // we would explicitly set c.wasm_threads(false) here.
 
     // wasmtime default: true
     // simd isn't supported in wasm-instrument, but if we add support there, we can probably enable
@@ -197,15 +196,9 @@ fn wasmtime_config(ec: &EngineConfig) -> anyhow::Result<wasmtime::Config> {
     // handled correctly in wasm-instrument
     c.wasm_multi_value(false);
 
-    // wasmtime default: false
-    // Cool proposal to allow function references, but we don't support it yet.
-    #[cfg(feature = "wasmtime/gc")]
-    c.wasm_function_references(false);
-
-    // wasmtime default: false
-    // Wasmtime function reference proposal.
-    #[cfg(feature = "wasmtime/gc")]
-    c.wasm_gc(false);
+    // Note: GC is disabled by default.
+    // If we add the "wasmtime/gc" feature in the future,
+    // we would explicitly set c.wasm_gc(false) and c.wasm_function_references(false) here.
 
     // wasmtime default: false
     //
@@ -239,12 +232,13 @@ fn wasmtime_config(ec: &EngineConfig) -> anyhow::Result<wasmtime::Config> {
     c.guard_before_linear_memory(true);
     c.parallel_compilation(true);
 
-    // Disable caching if some other crate enables it. We do our own caching.
-    #[cfg(feature = "wasmtime/cache")]
-    c.disable_cache();
+    // Note: Caching is disabled by default.
+    // If we add the "wasmtime/cache" feature in the future,
+    // we would explicitly set c.disable_cache() here.
 
-    #[cfg(feature = "wasmtime/async")]
-    c.async_support(false);
+    // Note: Async is disabled by default.
+    // If we add the "wasmtime/async" feature in the future,
+    // we would explicitly set c.async_support(false) here.
 
     // Doesn't seem to have significant impact on the time it takes to load code
     // todo(M2): make sure this is guaranteed to run in linear time.
@@ -264,10 +258,9 @@ fn wasmtime_config(ec: &EngineConfig) -> anyhow::Result<wasmtime::Config> {
     // FIP.
     c.wasm_extended_const(false);
 
-    // wasmtime default: false
-    // Disable the component module.
-    #[cfg(feature = "wasmtime/component-model")]
-    c.wasm_component_model(false);
+    // Note: Component model is disabled by default.
+    // If we add the "wasmtime/component-model" feature in the future,
+    // we would explicitly set c.wasm_component_model(false) here.
 
     Ok(c)
 }

fvm/src/executor/mod.rs

@@ -126,9 +126,9 @@ impl ApplyRet {
 /// The kind of message being applied:
 ///
 /// 1. Explicit messages may only come from account actors and charge the sending account for gas
-/// consumed.
+///    consumed.
 /// 2. Implicit messages may come from any actor, ignore the nonce, and charge no gas (but still
-/// account for it).
+///    account for it).
 #[derive(Eq, PartialEq, Copy, Clone, Debug)]
 pub enum ApplyKind {
     Explicit,

fvm/src/kernel/filecoin.rs

@@ -52,6 +52,7 @@ pub trait FilecoinKernel: Kernel {
     /// - first header is of the same or lower epoch as the second
     /// - at least one of the headers appears in the current chain at or after epoch `earliest`
     /// - the headers provide evidence of a fault (see the spec for the different fault types).
+    ///
     /// The parameters are all serialized block headers. The third "extra" parameter is consulted only for
     /// the "parent grinding fault", in which case it must be the sibling of h1 (same parent tipset) and one of the
     /// blocks in the parent of h2 (i.e. h2's grandparent).
@@ -81,13 +82,15 @@ pub trait FilecoinKernel: Kernel {
     /// The circulating supply is the sum of:
     /// - rewards emitted by the reward actor,
     /// - funds vested from lock-ups in the genesis state,
+    ///
     /// less the sum of:
     /// - funds burnt,
     /// - pledge collateral locked in storage miner actors (recorded in the storage power actor)
     /// - deal collateral locked by the storage market actor
     fn total_fil_circ_supply(&self) -> Result<TokenAmount>;
 }
 
+#[allow(clippy::duplicated_attributes)]
 #[derive(Delegate)]
 #[delegate(IpldBlockOps, where = "C: CallManager")]
 #[delegate(ActorOps, where = "C: CallManager")]

fvm/src/syscalls/filecoin.rs

@@ -100,6 +100,7 @@ pub fn verify_post(
 /// - first header is of the same or lower epoch as the second
 /// - at least one of the headers appears in the current chain at or after epoch `earliest`
 /// - the headers provide evidence of a fault (see the spec for the different fault types).
+///
 /// The parameters are all serialized block headers. The third "extra" parameter is consulted only for
 /// the "parent grinding fault", in which case it must be the sibling of h1 (same parent tipset) and one of the
 /// blocks in the parent of h2 (i.e. h2's grandparent).

fvm/tests/dummy.rs

@@ -189,7 +189,6 @@ pub struct DummyCallManager {
     pub gas_tracker: GasTracker,
     pub gas_premium: TokenAmount,
     pub origin: ActorID,
-    pub origin_address: Address,
     pub nonce: u64,
     pub test_data: Rc<RefCell<TestData>>,
     limits: DummyLimiter,
@@ -216,7 +215,6 @@ impl DummyCallManager {
                 nonce: 0,
                 test_data: rc,
                 limits: DummyLimiter::default(),
-                origin_address: Address::new_id(0),
                 gas_premium: TokenAmount::zero(),
             },
             cell_ref,
@@ -236,7 +234,6 @@ impl DummyCallManager {
                 nonce: 0,
                 test_data: rc,
                 limits: DummyLimiter::default(),
-                origin_address: Address::new_id(0),
                 gas_premium: TokenAmount::zero(),
             },
             cell_ref,
@@ -252,7 +249,7 @@ impl CallManager for DummyCallManager {
         _engine: Engine,
         _gas_limit: u64,
         origin: ActorID,
-        origin_address: Address,
+        _origin_address: Address,
         _receiver: Option<ActorID>,
         _receiver_address: Address,
         nonce: u64,
@@ -267,7 +264,6 @@ impl CallManager for DummyCallManager {
             gas_tracker: GasTracker::new(BLOCK_GAS_LIMIT, Gas::new(0), false),
             gas_premium,
             origin,
-            origin_address,
             nonce,
             test_data: rc,
             limits,

ipld/amt/benches/amt_benchmark.rs

@@ -40,7 +40,7 @@ impl<'de> Deserialize<'de> for BenchData {
     where
         D: Deserializer<'de>,
     {
-        Deserialize::deserialize(deserializer)?;
+        let _: () = Deserialize::deserialize(deserializer)?;
         Ok(Self::default())
     }
 }

ipld/amt/src/lib.rs

@@ -27,12 +27,12 @@ const MAX_HEIGHT: u32 = 64;
 
 /// MaxIndex is the maximum index for elements in the AMT. This u64::MAX-1 so we
 /// don't overflow u64::MAX when computing the length.
-pub const MAX_INDEX: u64 = std::u64::MAX - 1;
+pub const MAX_INDEX: u64 = u64::MAX - 1;
 
 fn nodes_for_height(bit_width: u32, height: u32) -> u64 {
     let height_log_two = bit_width as u64 * height as u64;
     if height_log_two >= 64 {
-        return std::u64::MAX;
+        return u64::MAX;
     }
     1 << height_log_two
 }

ipld/hamt/src/bitfield.rs

@@ -2,8 +2,6 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use std::u64;
-
 use byteorder::{BigEndian, ByteOrder};
 use fvm_ipld_encoding::de::{Deserialize, Deserializer};
 use fvm_ipld_encoding::ser::{Serialize, Serializer};
@@ -117,16 +115,16 @@ impl Bitfield {
         if bit < 64 {
             self.0[0] = set_bits_leq(self.0[0], bit);
         } else if bit < 128 {
-            self.0[0] = std::u64::MAX;
+            self.0[0] = u64::MAX;
             self.0[1] = set_bits_leq(self.0[1], bit - 64);
         } else if bit < 192 {
-            self.0[0] = std::u64::MAX;
-            self.0[1] = std::u64::MAX;
+            self.0[0] = u64::MAX;
+            self.0[1] = u64::MAX;
             self.0[2] = set_bits_leq(self.0[2], bit - 128);
         } else {
-            self.0[0] = std::u64::MAX;
-            self.0[1] = std::u64::MAX;
-            self.0[2] = std::u64::MAX;
+            self.0[0] = u64::MAX;
+            self.0[1] = u64::MAX;
+            self.0[2] = u64::MAX;
             self.0[3] = set_bits_leq(self.0[3], bit - 192);
         }
 

ipld/kamt/src/bitfield.rs

@@ -2,8 +2,6 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use std::u64;
-
 use byteorder::{BigEndian, ByteOrder};
 use fvm_ipld_encoding::de::{Deserialize, Deserializer};
 use fvm_ipld_encoding::ser::{Serialize, Serializer};
@@ -128,16 +126,16 @@ impl Bitfield {
         if bit < 64 {
             self.0[0] = set_bits_leq(self.0[0], bit);
         } else if bit < 128 {
-            self.0[0] = std::u64::MAX;
+            self.0[0] = u64::MAX;
             self.0[1] = set_bits_leq(self.0[1], bit - 64);
         } else if bit < 192 {
-            self.0[0] = std::u64::MAX;
-            self.0[1] = std::u64::MAX;
+            self.0[0] = u64::MAX;
+            self.0[1] = u64::MAX;
             self.0[2] = set_bits_leq(self.0[2], bit - 128);
         } else {
-            self.0[0] = std::u64::MAX;
-            self.0[1] = std::u64::MAX;
-            self.0[2] = std::u64::MAX;
+            self.0[0] = u64::MAX;
+            self.0[1] = u64::MAX;
+            self.0[2] = u64::MAX;
             self.0[3] = set_bits_leq(self.0[3], bit - 192);
         }
 

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.78.0"
+channel = "1.81.0"
 components = ["clippy", "llvm-tools-preview", "rustfmt"]
 targets = ["wasm32-unknown-unknown"]

sdk/src/crypto.rs

@@ -238,6 +238,7 @@ pub fn verify_post(info: &WindowPoStVerifyInfo) -> SyscallResult<bool> {
 /// - first header is of the same or lower epoch as the second
 /// - at least one of the headers appears in the current chain at or after epoch `earliest`
 /// - the headers provide evidence of a fault (see the spec for the different fault types).
+///
 /// The parameters are all serialized block headers. The third "extra" parameter is consulted only for
 /// the "parent grinding fault", in which case it must be the sibling of h1 (same parent tipset) and one of the
 /// blocks in the parent of h2 (i.e. h2's grandparent).

shared/Cargo.toml

@@ -53,3 +53,7 @@ secp256k1 = ["libsecp256k1"]
 blst = ["bls-signatures/blst"]
 testing = []
 arb = ["arbitrary", "dep:quickcheck", "num-bigint/quickcheck", "cid/arb"]
+
+# Allow coverage attribute.
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage,coverage_nightly)'] }

shared/src/address/payload.rs

@@ -6,7 +6,6 @@
 use std::array::from_fn;
 use std::convert::TryInto;
 use std::hash::Hash;
-use std::u64;
 
 use super::{
     from_leb_bytes, to_leb_bytes, Error, Protocol, BLS_PUB_LEN, MAX_SUBADDRESS_LEN,

shared/src/address/protocol.rs

@@ -2,8 +2,8 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use std::fmt;
 use std::hash::Hash;
-use std::{fmt, u64};
 
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;

shared/tests/address_test.rs

@@ -234,12 +234,12 @@ fn delegated_address() {
             expected: "f432f77777777x32lpna",
         },
         F4TestVec {
-            namespace: std::u64::MAX,
+            namespace: u64::MAX,
             subaddr: &[],
             expected: "f418446744073709551615ftnkyfaq",
         },
         F4TestVec {
-            namespace: std::u64::MAX,
+            namespace: u64::MAX,
             subaddr: &[0; MAX_SUBADDRESS_LEN],
             expected: "f418446744073709551615faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafbbuagu",
         },
@@ -291,7 +291,7 @@ fn id_address() {
             expected: "f0999999",
         },
         IDTestVec {
-            input: std::u64::MAX,
+            input: u64::MAX,
             expected: "f018446744073709551615",
         },
     ];

testing/integration/src/custom_kernel/mod.rs

@@ -30,6 +30,7 @@ pub trait CustomKernel: Kernel {
 }
 
 // our custom kernel extends the filecoin kernel
+#[allow(clippy::duplicated_attributes)]
 #[derive(Delegate)]
 #[delegate(IpldBlockOps, where = "C: CallManager")]
 #[delegate(ActorOps, where = "C: CallManager")]