feat: put blocks with codecs in the trace (#1654)

Otherwise, users can't decode them.
filecoin-project · Feb 9, 2023 · 4c7a6ba · 4c7a6ba
1 parent 7c9de90
commit 4c7a6ba
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/fvm/src/call_manager/default.rs b/fvm/src/call_manager/default.rs
@@ -6,7 +6,7 @@ use anyhow::{anyhow, Context};
 use cid::Cid;
 use derive_more::{Deref, DerefMut};
 use fvm_ipld_amt::Amt;
-use fvm_ipld_encoding::{to_vec, RawBytes, CBOR};
+use fvm_ipld_encoding::{to_vec, CBOR};
 use fvm_shared::address::{Address, Payload};
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::{ErrorNumber, ExitCode};
@@ -184,10 +184,7 @@ where
                 from,
                 to,
                 method,
-                params: params
-                    .as_ref()
-                    .map(|blk| blk.data().to_owned().into())
-                    .unwrap_or_default(),
+                params: params.as_ref().map(Into::into),
                 value: value.clone(),
             });
         }
@@ -218,15 +215,11 @@ where
 
         if self.machine.context().tracing {
             self.trace(match &result {
-                Ok(InvocationResult { exit_code, value }) => ExecutionEvent::CallReturn(
-                    *exit_code,
-                    value
-                        .as_ref()
-                        .map(|blk| RawBytes::from(blk.data().to_vec()))
-                        .unwrap_or_default(),
-                ),
+                Ok(InvocationResult { exit_code, value }) => {
+                    ExecutionEvent::CallReturn(*exit_code, value.as_ref().map(Into::into))
+                }
                 Err(ExecutionError::OutOfGas) => {
-                    ExecutionEvent::CallReturn(ExitCode::SYS_OUT_OF_GAS, RawBytes::default())
+                    ExecutionEvent::CallReturn(ExitCode::SYS_OUT_OF_GAS, None)
                 }
                 Err(ExecutionError::Fatal(_)) => {
                     ExecutionEvent::CallError(SyscallError::new(ErrorNumber::Forbidden, "fatal"))

diff --git a/fvm/src/kernel/blocks.rs b/fvm/src/kernel/blocks.rs
@@ -3,6 +3,7 @@
 use std::convert::TryInto;
 use std::rc::Rc;
 
+use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_ipld_encoding::{CBOR, DAG_CBOR};
 use fvm_shared::IPLD_RAW;
 use thiserror::Error;
@@ -75,6 +76,27 @@ impl Block {
     }
 }
 
+impl From<IpldBlock> for Block {
+    fn from(b: IpldBlock) -> Self {
+        Block::new(b.codec, b.data)
+    }
+}
+
+impl From<&IpldBlock> for Block {
+    fn from(b: &IpldBlock) -> Self {
+        Block::new(b.codec, &*b.data)
+    }
+}
+
+impl From<&Block> for IpldBlock {
+    fn from(b: &Block) -> Self {
+        IpldBlock {
+            codec: b.codec,
+            data: Vec::from(&**b.data),
+        }
+    }
+}
+
 #[derive(Error, Debug)]
 pub enum BlockPutError {
     #[error("too many blocks have been written")]

diff --git a/fvm/src/trace/mod.rs b/fvm/src/trace/mod.rs
@@ -1,6 +1,6 @@
 // Copyright 2021-2023 Protocol Labs
 // SPDX-License-Identifier: Apache-2.0, MIT
-use fvm_ipld_encoding::RawBytes;
+use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_shared::address::Address;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::ExitCode;
@@ -23,9 +23,9 @@ pub enum ExecutionEvent {
         from: ActorID,
         to: Address,
         method: MethodNum,
-        params: RawBytes,
+        params: Option<IpldBlock>,
         value: TokenAmount,
     },
-    CallReturn(ExitCode, RawBytes),
+    CallReturn(ExitCode, Option<IpldBlock>),
     CallError(SyscallError),
 }