From 49fce48c3e8de610472bb457b3cfa619c02fdfe3 Mon Sep 17 00:00:00 2001
From: Aayush Rajasekaran <arajasek94@gmail.com>
Date: Tue, 1 Jun 2021 12:43:16 -0400
Subject: [PATCH] Tweak CallVM to use current epoch, not future epoch

---
 chain/stmgr/call.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/chain/stmgr/call.go b/chain/stmgr/call.go
index 961bebd9c..cfbf60a95 100644
--- a/chain/stmgr/call.go
+++ b/chain/stmgr/call.go
@@ -155,11 +155,6 @@ func (sm *StateManager) CallWithGas(ctx context.Context, msg *types.Message, pri
 		return nil, xerrors.Errorf("computing tipset state: %w", err)
 	}
 
-	state, err = sm.handleStateForks(ctx, state, ts.Height(), nil, ts)
-	if err != nil {
-		return nil, fmt.Errorf("failed to handle fork: %w", err)
-	}
-
 	r := store.NewChainRand(sm.cs, ts.Cids())
 
 	if span.IsRecordingEvents() {
@@ -172,7 +167,7 @@ func (sm *StateManager) CallWithGas(ctx context.Context, msg *types.Message, pri
 
 	vmopt := &vm.VMOpts{
 		StateBase:      state,
-		Epoch:          ts.Height() + 1,
+		Epoch:          ts.Height(),
 		Rand:           r,
 		Bstore:         sm.cs.StateBlockstore(),
 		Syscalls:       sm.cs.VMSys(),