Merge pull request #8889 from filecoin-project/asr/exec-trace

fix: fvm: make exectraces match legacyVM some more
2022-06-22 13:45:39 -04:00
parent d6e00bcd4e 866693f3d5
commit a80da7f1f9
1 changed files with 8 additions and 7 deletions
@@ -339,13 +339,14 @@ func (vm *FVM) ApplyMessage(ctx context.Context, cmsg types.ChainMsg) (*ApplyRet
 			return nil, xerrors.Errorf("failed to unmarshal exectrace: %w", err)
 		}
 		et = fvmEt.ToExecutionTrace()
-	} else {
-		et.Msg = vmMsg
-		et.MsgRct = &receipt
-		et.Duration = duration
-		if aerr != nil {
-			et.Error = aerr.Error()
-		}
+	}
+
+	// Set the top-level exectrace info from the message and receipt for backwards compatibility
+	et.Msg = vmMsg
+	et.MsgRct = &receipt
+	et.Duration = duration
+	if aerr != nil {
+		et.Error = aerr.Error()
 	}

 	return &ApplyRet{