fix: don't fail tenderly on anvil

Gearbox-protocol · Mar 6, 2024 · 22694d1 · 22694d1
1 parent 30a582b
commit 22694d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/services/execute_parser.go b/services/execute_parser.go
@@ -34,6 +34,7 @@ type ExecuteParams struct {
 type ExecuteParser struct {
 	IgnoreCMEventIds map[common.Hash]bool
 	trace_service.InternalFetcher
+	client core.ClientI
 }
 
 func getCMEventIds() map[common.Hash]bool {
@@ -53,6 +54,7 @@ func NewExecuteParser(cfg *config.Config, client core.ClientI) ds.ExecuteParserI
 	return &ExecuteParser{
 		IgnoreCMEventIds: getCMEventIds(),
 		InternalFetcher:  trace_service.NewInternalFetcher(cfg, client),
+		client:           client,
 	}
 }
 
@@ -61,6 +63,9 @@ func (ep *ExecuteParser) GetExecuteCalls(version core.VersionType, txHash, credi
 		return nil
 	}
 	trace := ep.GetTxTrace(txHash, true)
+	if trace_service.ExecCallsEmptyOnMainnet(trace, core.GetChainId(ep.client)) {
+		return nil
+	}
 	filter := ExecuteFilter{paramsList: paramsList,
 		creditManager: common.HexToAddress(creditManagerAddr),
 	}
@@ -97,6 +102,9 @@ func (ep *ExecuteParser) GetExecuteCalls(version core.VersionType, txHash, credi
 // currently only valid for closeCreditAccount v2
 func (ep *ExecuteParser) GetTransfersAtClosev2(txHash, account, underlyingToken string, users ds.BorrowerAndTo) core.Transfers {
 	trace := ep.GetTxTrace(txHash, true)
+	if trace_service.IgnoreExecCallsIfTestnetIsntMain(trace, core.GetChainId(ep.client)) {
+		return nil
+	}
 	return getCloseAccountv2Transfers(trace, account, underlyingToken, users)
 }
 

diff --git a/services/trace_service/tenderly_fetcher.go b/services/trace_service/tenderly_fetcher.go
@@ -80,6 +80,10 @@ func (ep *TenderlyFetcher) getUrl(link string) (*TenderlyTrace, error) {
 	return trace, nil
 }
 
+func ExecCallsEmptyOnMainnet(trace *TenderlyTrace, chainId int64) bool {
+	return trace.CallTrace == nil && log.GetBaseNet(chainId) == "MAINNET"
+}
+
 func (ep *TenderlyFetcher) getTxTrace(txHash string) (*TenderlyTrace, error) {
 	trace, err := ep.getTenderly(txHash)
 	if err != nil {
@@ -95,7 +99,7 @@ func (ep *TenderlyFetcher) getTxTrace(txHash string) (*TenderlyTrace, error) {
 		if err != nil {
 			return nil, log.WrapErrWithLine(err)
 		}
-		if trace.CallTrace == nil {
+		if ExecCallsEmptyOnMainnet(trace, ep.ChainId) { // if not anvil then fail
 			log.Fatal("Retry failed for tenderly: ", txHash)
 		}
 		return trace, nil
@@ -176,6 +180,7 @@ func (ep InternalFetcher) GetTxTrace(txHash string, canLoadLogsFromRPC bool) *Te
 		if err != nil {
 			log.Info("fallback on tenderly due to", err, " for ", txHash)
 			trace, err = ep.tenderlyFetcher.getTxTrace(txHash)
+			log.CheckFatal(err)
 		}
 	}
 	//