From e860a052e7c304955a6aed7673d916d9b0e68e7a Mon Sep 17 00:00:00 2001
From: Aayush <arajasek94@gmail.com>
Date: Wed, 22 Jun 2022 11:26:23 -0400
Subject: [PATCH] fix: fvm: make exectraces match legacyVM some more

---
 chain/vm/fvm.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/chain/vm/fvm.go b/chain/vm/fvm.go
index 02402bf6e..158d61c82 100644
--- a/chain/vm/fvm.go
+++ b/chain/vm/fvm.go
@@ -344,13 +344,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{