perf: eth: gas estimate set applyTsMessages false (#10546)

* have gas estimate call callInternal with applyTsMessages = false and other calls with applyTsMessages=true for gas caclulation optimization

* set applyTsMessages = true in CallWithGas call in shed

* update test with new callwithgas api optimization for eth call

* Update chain/stmgr/call.go

Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>

* env flag LOTUS_SKIP_APPLY_TS_MESSAGE_CALL_WITH_GAS must be 1 in order to have applyTsMessages change

* env flag LOTUS_SKIP_APPLY_TS_MESSAGE_CALL_WITH_GAS must be 1 in order to have applyTsMessages change

* make sure that even if we arent apply ts messages we grab ts messages from the particular user who is requesting gas estimation

---------

Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
Co-authored-by: Ubuntu <ubuntu@ip-10-0-4-29.us-east-2.compute.internal>

chain/stmgr/call.go

@@ -52,8 +52,8 @@ func (sm *StateManager) Call(ctx context.Context, msg *types.Message, ts *types.
 }
 
 // CallWithGas calculates the state for a given tipset, and then applies the given message on top of that state.
-func (sm *StateManager) CallWithGas(ctx context.Context, msg *types.Message, priorMsgs []types.ChainMsg, ts *types.TipSet) (*api.InvocResult, error) {
- return sm.callInternal(ctx, msg, priorMsgs, ts, cid.Undef, sm.GetNetworkVersion, true, true)
+func (sm *StateManager) CallWithGas(ctx context.Context, msg *types.Message, priorMsgs []types.ChainMsg, ts *types.TipSet, applyTsMessages bool) (*api.InvocResult, error) {
+ return sm.callInternal(ctx, msg, priorMsgs, ts, cid.Undef, sm.GetNetworkVersion, true, applyTsMessages)
 }
 
 // CallAtStateAndVersion allows you to specify a message to execute on the given stateCid and network version.
@@ -117,12 +117,22 @@ func (sm *StateManager) callInternal(ctx context.Context, msg *types.Message, pr
  if stateCid == cid.Undef {
  stateCid = ts.ParentState()
  }
+ tsMsgs, err := sm.cs.MessagesForTipset(ctx, ts)
+ if err != nil {
+ return nil, xerrors.Errorf("failed to lookup messages for parent tipset: %w", err)
+ }
+
  if applyTsMessages {
- tsMsgs, err := sm.cs.MessagesForTipset(ctx, ts)
- if err != nil {
- return nil, xerrors.Errorf("failed to lookup messages for parent tipset: %w", err)
- }
  priorMsgs = append(tsMsgs, priorMsgs...)
+ } else {
+ var filteredTsMsgs []types.ChainMsg
+ for _, tsMsg := range tsMsgs {
+ //TODO we should technically be normalizing the filecoin address of from when we compare here
+ if tsMsg.VMMessage().From == msg.VMMessage().From {
+ filteredTsMsgs = append(filteredTsMsgs, tsMsg)
+ }
+ }
+ priorMsgs = append(filteredTsMsgs, priorMsgs...)
  }
 
  // Technically, the tipset we're passing in here should be ts+1, but that may not exist.

chain/stmgr/forks_test.go

@@ -340,7 +340,7 @@ func testForkRefuseCall(t *testing.T, nullsBefore, nullsAfter int) {
  currentHeight := ts.TipSet.TipSet().Height()
 
  // CallWithGas calls on top of the given tipset.
- ret, err := sm.CallWithGas(ctx, m, nil, ts.TipSet.TipSet())
+ ret, err := sm.CallWithGas(ctx, m, nil, ts.TipSet.TipSet(), true)
  if parentHeight <= testForkHeight && currentHeight >= testForkHeight {
  // If I had a fork, or I _will_ have a fork, it should fail.
  require.Equal(t, ErrExpensiveFork, err)
@@ -361,7 +361,7 @@ func testForkRefuseCall(t *testing.T, nullsBefore, nullsAfter int) {
  // Calls without a tipset should walk back to the last non-fork tipset.
  // We _verify_ that the migration wasn't run multiple times at the end of the
  // test.
- ret, err = sm.CallWithGas(ctx, m, nil, nil)
+ ret, err = sm.CallWithGas(ctx, m, nil, nil, true)
  require.NoError(t, err)
  require.True(t, ret.MsgRct.ExitCode.IsSuccess())
 

cmd/lotus-shed/gas-estimation.go

@@ -240,7 +240,7 @@ var replayOfflineCmd = &cli.Command{
  }
 
  tw := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', tabwriter.AlignRight)
- res, err := sm.CallWithGas(ctx, msg, []types.ChainMsg{}, executionTs)
+ res, err := sm.CallWithGas(ctx, msg, []types.ChainMsg{}, executionTs, true)
  if err != nil {
  return err
  }

node/impl/full/eth.go

@@ -6,6 +6,7 @@ import (
  "encoding/json"
  "errors"
  "fmt"
+ "os"
  "sort"
  "strconv"
  "sync"
@@ -888,9 +889,14 @@ func (a *EthModule) applyMessage(ctx context.Context, msg *types.Message, tsk ty
  return nil, xerrors.Errorf("cannot get tipset: %w", err)
  }
 
+ applyTsMessages := true
+ if os.Getenv("LOTUS_SKIP_APPLY_TS_MESSAGE_CALL_WITH_GAS") == "1" {
+ applyTsMessages = false
+ }
+
  // Try calling until we find a height with no migration.
  for {
- res, err = a.StateManager.CallWithGas(ctx, msg, []types.ChainMsg{}, ts)
+ res, err = a.StateManager.CallWithGas(ctx, msg, []types.ChainMsg{}, ts, applyTsMessages)
  if err != stmgr.ErrExpensiveFork {
  break
  }
@@ -959,10 +965,15 @@ func gasSearch(
  high := msg.GasLimit
  low := msg.GasLimit
 
+ applyTsMessages := true
+ if os.Getenv("LOTUS_SKIP_APPLY_TS_MESSAGE_CALL_WITH_GAS") == "1" {
+ applyTsMessages = false
+ }
+
  canSucceed := func(limit int64) (bool, error) {
  msg.GasLimit = limit
 
- res, err := smgr.CallWithGas(ctx, &msg, priorMsgs, ts)
+ res, err := smgr.CallWithGas(ctx, &msg, priorMsgs, ts, applyTsMessages)
  if err != nil {
  return false, xerrors.Errorf("CallWithGas failed: %w", err)
  }

node/impl/full/gas.go

@@ -4,6 +4,7 @@ import (
  "context"
  "math"
  "math/rand"
+ "os"
  "sort"
 
  lru "github.com/hashicorp/golang-lru/v2"
@@ -276,10 +277,15 @@ func gasEstimateCallWithGas(
  priorMsgs = append(priorMsgs, m)
  }
 
+ applyTsMessages := true
+ if os.Getenv("LOTUS_SKIP_APPLY_TS_MESSAGE_CALL_WITH_GAS") == "1" {
+ applyTsMessages = false
+ }
+
  // Try calling until we find a height with no migration.
  var res *api.InvocResult
  for {
- res, err = smgr.CallWithGas(ctx, &msg, priorMsgs, ts)
+ res, err = smgr.CallWithGas(ctx, &msg, priorMsgs, ts, applyTsMessages)
  if err != stmgr.ErrExpensiveFork {
  break
  }