From 9b203e4f8410c7bb33b03a09b3ab26f32b307f08 Mon Sep 17 00:00:00 2001
From: Matthieu Vachon <matt@streamingfast.io>
Date: Tue, 10 Dec 2024 13:59:16 -0500
Subject: [PATCH] Added more testing hook

---
 x/evm/keeper/msg_server.go | 11 +----------
 x/evm/tracers/firehose.go  |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/x/evm/keeper/msg_server.go b/x/evm/keeper/msg_server.go
index 6578d4ec5..3601e3a30 100644
--- a/x/evm/keeper/msg_server.go
+++ b/x/evm/keeper/msg_server.go
@@ -19,7 +19,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	cmath "github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/tracing"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -294,15 +293,7 @@ func (k *Keeper) applyEVMMessageWithTracing(
 	txCtx := core.NewEVMTxContext(msg)
 	evmHooks := evmtracers.GetCtxEthTracingHooks(ctx)
 	evmInstance := vm.NewEVM(*blockCtx, txCtx, stateDB, cfg, vm.Config{
-		Tracer: &tracing.Hooks{
-			OnTxStart: func(vm *tracing.VMContext, tx *ethtypes.Transaction, from common.Address) {
-				evmHooks.OnTxStart(vm, tx, from)
-
-				evmHooks.OnEnter(0, 0xf1, msg.From, msg.From, msg.Data, msg.GasLimit, msg.Value)
-				evmHooks.OnExit(0, nil, 0, nil, false)
-			},
-			OnTxEnd: evmHooks.OnTxEnd,
-		},
+		Tracer: evmHooks,
 	})
 	stateDB.SetEVM(evmInstance)
 	// stateDB.SetLogger(evmHooks)
diff --git a/x/evm/tracers/firehose.go b/x/evm/tracers/firehose.go
index ed160f29e..8c8cd4443 100644
--- a/x/evm/tracers/firehose.go
+++ b/x/evm/tracers/firehose.go
@@ -693,7 +693,7 @@ func (f *Firehose) completeTransaction(receipt *types.Receipt) *pbeth.Transactio
 	// Order is important, we must populate the state reverted before we remove the log block index and re-assign ordinals
 	f.populateStateReverted()
 	f.removeLogBlockIndexOnStateRevertedCalls()
-	f.assignOrdinalAndIndexToReceiptLogs()
+	// f.assignOrdinalAndIndexToReceiptLogs()
 
 	if *f.applyBackwardCompatibility {
 		// Known Firehose issue: This field has never been populated in the old Firehose instrumentation