chore: update FVM to 3.0.0-alpha.23

This updates the FVM and switches gas to u64.

Author: Stebalien

rust/Cargo.lock

@@ -34,9 +34,9 @@ serde_json = "1.0.46"
 memmap = "0.7"
 rust-gpu-tools = { version = "0.5", optional = true, default-features = false }
 fr32 = { version = "~5.0", default-features = false }
-fvm3 = { package = "fvm", version = "3.0.0-alpha.22", default-features = false }
-fvm3_shared = { package = "fvm_shared", version = "3.0.0-alpha.18" }
-fvm3_ipld_encoding = { package = "fvm_ipld_encoding", version = "0.3.2" }
+fvm3 = { package = "fvm", version = "3.0.0-alpha.23", default-features = false }
+fvm3_shared = { package = "fvm_shared", version = "3.0.0-alpha.20" }
+fvm3_ipld_encoding = { package = "fvm_ipld_encoding", version = "0.3.3" }
 fvm2 = { package = "fvm", version = "2.2.0", default-features = false }
 fvm2_shared = { package = "fvm_shared", version = "2.0.0" }
 fvm2_ipld_encoding = { package = "fvm_ipld_encoding", version = "0.2.3" }

rust/Cargo.toml

@@ -182,7 +182,7 @@ mod v3 {
 
 // fvm v2 implementation
 mod v2 {
-    use anyhow::anyhow;
+    use anyhow::{anyhow, Context};
     use cid::Cid;
     use num_traits::FromPrimitive;
     use std::sync::Mutex;
@@ -241,14 +241,14 @@ mod v2 {
             let res = fvm2::executor::Executor::execute_message(
                 self,
                 Message2 {
-                    version: msg.version,
+                    version: msg.version.try_into().context("invalid message version")?,
                     from: Address2::from_bytes(&msg.from.to_bytes()).unwrap(),
                     to: Address2::from_bytes(&msg.to.to_bytes()).unwrap(),
                     sequence: msg.sequence,
                     value: TokenAmount2::from_atto(msg.value.atto().clone()),
                     method_num: msg.method_num,
                     params: RawBytes2::new(msg.params.into()),
-                    gas_limit: msg.gas_limit,
+                    gas_limit: msg.gas_limit.try_into().context("invalid gas limit")?,
                     gas_fee_cap: TokenAmount2::from_atto(msg.gas_fee_cap.atto().clone()),
                     gas_premium: TokenAmount2::from_atto(msg.gas_premium.atto().clone()),
                 },
@@ -263,7 +263,11 @@ mod v2 {
                     msg_receipt: Receipt {
                         exit_code: ExitCode::new(ret.msg_receipt.exit_code.value()),
                         return_data: RawBytes::new(ret.msg_receipt.return_data.into()),
-                        gas_used: ret.msg_receipt.gas_used,
+                        gas_used: ret
+                            .msg_receipt
+                            .gas_used
+                            .try_into()
+                            .context("negative gas used")?,
                         events_root: None,
                     },
                     penalty: TokenAmount::from_atto(ret.penalty.atto().clone()),
@@ -273,8 +277,8 @@ mod v2 {
                         ret.over_estimation_burn.atto().clone(),
                     ),
                     refund: TokenAmount::from_atto(ret.refund.atto().clone()),
-                    gas_refund: ret.gas_refund,
-                    gas_burned: ret.gas_burned,
+                    gas_refund: ret.gas_refund.try_into().context("negative gas refund")?,
+                    gas_burned: ret.gas_burned.try_into().context("negative gas burned")?,
                     failure_info: ret.failure_info.map(|failure| match failure {
                         ApplyFailure2::MessageBacktrace(bt) => {
                             ApplyFailure::MessageBacktrace(Backtrace {
@@ -318,12 +322,26 @@ mod v2 {
                         .into_iter()
                         .filter_map(|tr| match tr {
                             ExecutionEvent2::GasCharge(charge) => {
+                                // We set the gas for "negative" charges to 0. This isn't correct,
+                                // but it won't matter in practice (the sum of the gas charges in
+                                // the trace aren't guaranteed to equal the total gas charge
+                                // anyways).
                                 Some(ExecutionEvent::GasCharge(GasCharge {
                                     name: charge.name,
                                     compute_gas: Gas::from_milligas(
-                                        charge.compute_gas.as_milligas(),
+                                        charge
+                                            .compute_gas
+                                            .as_milligas()
+                                            .try_into()
+                                            .unwrap_or_default(),
+                                    ),
+                                    other_gas: Gas::from_milligas(
+                                        charge
+                                            .storage_gas
+                                            .as_milligas()
+                                            .try_into()
+                                            .unwrap_or_default(),
                                     ),
-                                    other_gas: Gas::from_milligas(charge.storage_gas.as_milligas()),
                                     elapsed: Default::default(), // no timing information for v2.
                                 }))
                             }

rust/src/fvm/engine.rs

@@ -315,9 +315,9 @@ destructor!(destroy_fvm_machine_flush_response, Result<c_slice::Box<u8>>);
 #[derive(Clone, Debug, Serialize_tuple, Deserialize_tuple)]
 struct LotusGasCharge {
     pub name: Cow<'static, str>,
-    pub total_gas: i64,
-    pub compute_gas: i64,
-    pub storage_gas: i64,
+    pub total_gas: u64,
+    pub compute_gas: u64,
+    pub storage_gas: u64,
 }
 
 #[derive(Clone, Debug, Serialize_tuple, Deserialize_tuple)]

rust/src/fvm/machine.rs

@@ -37,8 +37,8 @@ pub struct FvmMachineExecuteResponse {
     pub over_estimation_burn_lo: u64,
     pub refund_hi: u64,
     pub refund_lo: u64,
-    pub gas_refund: i64,
-    pub gas_burned: i64,
+    pub gas_refund: u64,
+    pub gas_burned: u64,
     pub exec_trace: Option<c_slice::Box<u8>>,
     pub failure_info: Option<str::Box>,
     pub events: Option<c_slice::Box<u8>>,