core: add hardcoded transaction hash to gas used map

core/hardcoded_tx_gas.go

@@ -0,0 +1,11 @@
+package core
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+)
+
+// HardcodedTxGasUsed maps specific transaction hashes to the amount of GAS used by that
+// specific transaction alone.
+var HardcodedTxGasUsed = map[common.Hash]uint64{
+	common.HexToHash("0x58df300a7f04fe31d41d24672786cbe1c58b4f3d8329d0d74392d814dd9f7e40"): 45606,
+}

core/state_transition.go

@@ -681,7 +681,23 @@ func (st *stateTransition) execute() (*ExecutionResult, error) {
 		ret   []byte
 		vmerr error // vm errors do not effect consensus and are therefore not assigned to err
 	)
-	if contractCreation {
+
+	// Check against hardcoded transaction hashes that has previously failed, so instead
+	// of executing the transaction we just update state nonce and remaining gas to avoid
+	// state divergence.
+	if l2GasUsed, ok := HardcodedTxGasUsed[msg.Tx.Hash()]; ok {
+		st.state.SetNonce(msg.From, st.state.GetNonce(msg.From)+1, tracing.NonceChangeEoACall)
+		// l2GasUsed contains params.TxGas which is why we need to first subtract params.TxGas
+		// from l2GasUsed. The new l2GasUsed is the same amount of gas consumed as if we were
+		// to execute this transaction via st.evm.Call()
+		l2GasUsed -= params.TxGas
+		st.gasRemaining -= l2GasUsed
+
+		// Update multigas and set vmerr to ErrExecutionReverted
+		multiGas = multigas.ComputationGas(l2GasUsed)
+		usedMultiGas = usedMultiGas.SaturatingAdd(multiGas)
+		vmerr = vm.ErrExecutionReverted
+	} else if contractCreation {
 		deployedContract = &common.Address{}
 		ret, *deployedContract, st.gasRemaining, multiGas, vmerr = st.evm.Create(msg.From, msg.Data, st.gasRemaining, value)
 		usedMultiGas = usedMultiGas.SaturatingAdd(multiGas)