Switch to rust 2024 edition (fvm v3) (#2166)

* chore: port v3 to 2024 edition

* chore: cargo fmt for 2024 edition

* fix: correctly deserialize test vectors

Author: Stebalien

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "fvm",
     "sdk",
@@ -10,7 +10,7 @@ members = [
 [workspace.package]
 version = "3.13.1"
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/filecoin-project/ref-fvm"
 authors = ["Protocol Labs", "Filecoin Core Devs"]
 

fvm/src/blockstore/buffered.rs

@@ -6,7 +6,7 @@ use std::cell::RefCell;
 use std::collections::HashMap;
 use std::io::Read;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use cid::Cid;
 use fvm_ipld_blockstore::{Blockstore, Buffered};
 use fvm_ipld_encoding::{CBOR, DAG_CBOR, IPLD_RAW};
@@ -168,7 +168,7 @@ fn take_reachable(cache: &mut HashMap<Cid, Vec<u8>>, root: &Cid) -> Result<Vec<(
             (hash, length) => {
                 return Err(anyhow!(
                     "cid {k} has unexpected multihash (code={hash}, len={length})"
-                ))
+                ));
             }
         }
         if k.hash().code() == IDENTITY {
@@ -240,7 +240,7 @@ where
 mod tests {
     use fvm_ipld_blockstore::{Blockstore, MemoryBlockstore};
     use fvm_ipld_encoding::CborStore;
-    use fvm_shared::{commcid, IDENTITY_HASH};
+    use fvm_shared::{IDENTITY_HASH, commcid};
     use multihash_codetable::{Code, Multihash};
     use serde::{Deserialize, Serialize};
 

fvm/src/call_manager/default.rs

@@ -2,32 +2,32 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 use std::rc::Rc;
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use cid::Cid;
 use derive_more::{Deref, DerefMut};
 use fvm_ipld_amt::Amt;
-use fvm_ipld_encoding::{to_vec, CBOR};
+use fvm_ipld_encoding::{CBOR, to_vec};
 use fvm_shared::address::{Address, Payload};
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::{ErrorNumber, ExitCode};
 use fvm_shared::event::StampedEvent;
 use fvm_shared::sys::BlockId;
-use fvm_shared::{ActorID, MethodNum, METHOD_SEND};
+use fvm_shared::{ActorID, METHOD_SEND, MethodNum};
 use num_traits::Zero;
 
 use super::state_access_tracker::{ActorAccessState, StateAccessTracker};
 use super::{Backtrace, CallManager, InvocationResult, NO_DATA_BLOCK_ID};
 use crate::blockstore::DiscardBlockstore;
-use crate::call_manager::backtrace::Frame;
 use crate::call_manager::FinishRet;
+use crate::call_manager::backtrace::Frame;
 use crate::eam_actor::EAM_ACTOR_ID;
 use crate::engine::Engine;
 use crate::gas::{Gas, GasTracker};
 use crate::kernel::{
     Block, BlockRegistry, ClassifyResult, ExecutionError, Kernel, Result, SyscallError,
 };
-use crate::machine::limiter::MemoryLimiter;
 use crate::machine::Machine;
+use crate::machine::limiter::MemoryLimiter;
 use crate::state_tree::ActorState;
 use crate::syscalls::error::Abort;
 use crate::syscalls::{charge_for_exec, update_gas_available};

fvm/src/call_manager/mod.rs

@@ -6,12 +6,12 @@ use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::ExitCode;
 use fvm_shared::{ActorID, MethodNum};
 
+use crate::Kernel;
 use crate::engine::Engine;
 use crate::gas::{Gas, GasCharge, GasTimer, GasTracker, PriceList};
 use crate::kernel::{self, Result};
 use crate::machine::{Machine, MachineContext};
 use crate::state_tree::ActorState;
-use crate::Kernel;
 
 pub mod backtrace;
 mod state_access_tracker;

fvm/src/call_manager/state_access_tracker.rs

@@ -4,8 +4,8 @@ use std::cell::RefCell;
 use std::iter;
 
 use anyhow::Context;
-use fvm_shared::address::{Address, Protocol};
 use fvm_shared::ActorID;
+use fvm_shared::address::{Address, Protocol};
 
 use crate::history_map::HistoryMap;
 use crate::kernel::{ClassifyResult, Result};

fvm/src/engine/mod.rs

@@ -5,12 +5,12 @@ mod concurrency;
 mod instance_pool;
 
 use std::any::{Any, TypeId};
-use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::collections::HashMap;
+use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::ops::Deref;
 use std::sync::{Arc, Mutex};
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use cid::Cid;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_shared::error::ExitCode;
@@ -22,15 +22,15 @@ use wasmtime::{
     Val, ValType, WasmBacktraceDetails,
 };
 
+use crate::Kernel;
 use crate::gas::{Gas, GasTimer, WasmGasPrices};
 use crate::machine::limiter::MemoryLimiter;
 use crate::machine::{Machine, NetworkConfig};
 use crate::syscalls::error::Abort;
 use crate::syscalls::{
-    bind_syscalls, charge_for_exec, charge_for_init, record_init_time, update_gas_available,
-    InvocationData,
+    InvocationData, bind_syscalls, charge_for_exec, charge_for_init, record_init_time,
+    update_gas_available,
 };
-use crate::Kernel;
 
 use self::concurrency::EngineConcurrency;
 use self::instance_pool::InstancePool;
@@ -517,7 +517,7 @@ impl Engine {
         let module = match cache.get(k) {
             Some(m) => m.module.clone(),
             None => {
-                let module = Module::deserialize(&self.inner.engine, compiled)?;
+                let module = unsafe { Module::deserialize(&self.inner.engine, compiled)? };
                 cache.insert(
                     *k,
                     ModuleRecord {

fvm/src/executor/default.rs

@@ -3,9 +3,9 @@
 use std::ops::{Deref, DerefMut};
 use std::result::Result as StdResult;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use cid::Cid;
-use fvm_ipld_encoding::{RawBytes, CBOR};
+use fvm_ipld_encoding::{CBOR, RawBytes};
 use fvm_shared::address::Payload;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::{ErrorNumber, ExitCode};
@@ -16,12 +16,12 @@ use fvm_shared::{ActorID, IPLD_RAW, METHOD_SEND};
 use num_traits::Zero;
 
 use super::{ApplyFailure, ApplyKind, ApplyRet, Executor};
-use crate::call_manager::{backtrace, Backtrace, CallManager, InvocationResult};
+use crate::call_manager::{Backtrace, CallManager, InvocationResult, backtrace};
 use crate::eam_actor::EAM_ACTOR_ID;
 use crate::engine::EnginePool;
 use crate::gas::{Gas, GasCharge, GasOutputs};
 use crate::kernel::{Block, ClassifyResult, Context as _, ExecutionError, Kernel};
-use crate::machine::{Machine, BURNT_FUNDS_ACTOR_ID, REWARD_ACTOR_ID};
+use crate::machine::{BURNT_FUNDS_ACTOR_ID, Machine, REWARD_ACTOR_ID};
 use crate::trace::ExecutionTrace;
 
 /// The default [`Executor`].

fvm/src/executor/mod.rs

@@ -16,9 +16,9 @@ use fvm_shared::receipt::Receipt;
 use num_traits::Zero;
 pub use threaded::ThreadedExecutor;
 
+use crate::Kernel;
 use crate::call_manager::Backtrace;
 use crate::trace::ExecutionTrace;
-use crate::Kernel;
 
 /// An executor executes messages on the underlying machine/kernel. It's responsible for:
 ///

fvm/src/gas/charge.rs

@@ -4,8 +4,8 @@
 
 use std::borrow::Cow;
 
-use super::timer::GasDuration;
 use super::Gas;
+use super::timer::GasDuration;
 
 /// Single gas charge in the VM. Contains information about what gas was for, as well
 /// as the amount of gas needed for computation and storage respectively.

fvm/src/gas/mod.rs

@@ -11,7 +11,7 @@ use num_traits::Zero;
 
 pub use self::charge::GasCharge;
 pub(crate) use self::outputs::GasOutputs;
-pub use self::price_list::{price_list_by_network_version, PriceList, WasmGasPrices};
+pub use self::price_list::{PriceList, WasmGasPrices, price_list_by_network_version};
 pub use self::timer::{GasInstant, GasTimer};
 use crate::kernel::{ClassifyResult, ExecutionError, Result};
 
@@ -302,9 +302,10 @@ mod tests {
         assert_eq!(t.gas_used(), Gas::new(15));
         t.apply_charge(GasCharge::new("", Gas::new(5), Gas::zero()))?;
         assert_eq!(t.gas_used(), Gas::new(20));
-        assert!(t
-            .apply_charge(GasCharge::new("", Gas::new(1), Gas::zero()))
-            .is_err());
+        assert!(
+            t.apply_charge(GasCharge::new("", Gas::new(1), Gas::zero()))
+                .is_err()
+        );
         Ok(())
     }