diff --git a/rpc/estimate_fee.go b/rpc/estimate_fee.go
index ae61e4f23d..a7e74e4b5d 100644
--- a/rpc/estimate_fee.go
+++ b/rpc/estimate_fee.go
@@ -110,7 +110,8 @@ type estimateFeeHandler func(broadcastedTxns []BroadcastedTransaction,
 	simulationFlags []SimulationFlag, id BlockID,
 ) ([]FeeEstimate, http.Header, *jsonrpc.Error)
 
-func (h *Handler) estimateMessageFee(msg MsgFromL1, id BlockID, f estimateFeeHandler) (*FeeEstimate, http.Header, *jsonrpc.Error) { //nolint:gocritic
+func (h *Handler) estimateMessageFee(msg MsgFromL1, id BlockID, f estimateFeeHandler) (*FeeEstimate,
+	http.Header, *jsonrpc.Error) { //nolint:gocritic
 	calldata := make([]*felt.Felt, 0, len(msg.Payload)+1)
 	// The order of the calldata parameters matters. msg.From must be prepended.
 	calldata = append(calldata, new(felt.Felt).SetBytes(msg.From.Bytes()))
diff --git a/rpc/trace.go b/rpc/trace.go
index 1c3bfb808c..f4f699c076 100644
--- a/rpc/trace.go
+++ b/rpc/trace.go
@@ -139,7 +139,8 @@ func (h *Handler) TraceTransactionV0_6(ctx context.Context, hash felt.Felt) (*vm
 	return h.traceTransaction(ctx, &hash, true)
 }
 
-func (h *Handler) traceTransaction(ctx context.Context, hash *felt.Felt, v0_6Response bool) (*vm.TransactionTrace, http.Header, *jsonrpc.Error) {
+func (h *Handler) traceTransaction(ctx context.Context, hash *felt.Felt, v0_6Response bool) (*vm.TransactionTrace,
+	http.Header, *jsonrpc.Error) {
 	_, blockHash, _, err := h.bcReader.Receipt(hash)
 	httpHeader := http.Header{}
 	httpHeader.Set(ExecutionStepsHeader, "0")
@@ -205,7 +206,6 @@ func (h *Handler) TraceBlockTransactionsV0_6(ctx context.Context, id BlockID) ([
 
 func (h *Handler) traceBlockTransactions(ctx context.Context, block *core.Block, v0_6Response bool, //nolint: gocyclo, funlen
 ) ([]TracedBlockTransaction, http.Header, *jsonrpc.Error) {
-
 	execStepsHeader := http.Header{}
 	execStepsHeader.Set(ExecutionStepsHeader, "0")
 
@@ -276,8 +276,8 @@ func (h *Handler) traceBlockTransactions(ctx context.Context, block *core.Block,
 	}
 
 	useBlobData := !v0_6Response
-	overallFees, dataGasConsumed, traces, numSteps, err := h.vm.Execute(block.Transactions, classes, paidFeesOnL1, &blockInfo, state, network, false,
-		false, false, useBlobData)
+	overallFees, dataGasConsumed, traces, numSteps, err := h.vm.Execute(block.Transactions, classes, paidFeesOnL1,
+		&blockInfo, state, network, false, false, false, useBlobData)
 
 	execStepsHeader.Set(ExecutionStepsHeader, strconv.FormatUint(numSteps, 10))