Update OperatorBalance metric to only require the balance as an argument

Author: m-Peter

metrics/collector.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/onflow/flow-go-sdk"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rs/zerolog"
 )
@@ -113,7 +112,7 @@ type Collector interface {
 	EVMTransactionIndexed(count int)
 	EVMAccountInteraction(address string)
 	MeasureRequestDuration(start time.Time, method string)
-	OperatorBalance(account *flow.Account)
+	OperatorBalance(balance uint64)
 	AvailableSigningKeys(count int)
 	GasEstimationIterations(count int)
 	BlockIngestionTime(blockCreation time.Time)
@@ -208,8 +207,8 @@ func (c *DefaultCollector) EVMAccountInteraction(address string) {
 	c.evmAccountCallCounters.With(prometheus.Labels{"address": address}).Inc()
 }
 
-func (c *DefaultCollector) OperatorBalance(account *flow.Account) {
-	c.operatorBalance.Set(float64(account.Balance))
+func (c *DefaultCollector) OperatorBalance(balance uint64) {
+	c.operatorBalance.Set(float64(balance))
 }
 
 func (c *DefaultCollector) MeasureRequestDuration(start time.Time, method string) {

metrics/nop.go

@@ -2,8 +2,6 @@ package metrics
 
 import (
 	"time"
-
-	"github.com/onflow/flow-go-sdk"
 )
 
 type nopCollector struct{}
@@ -19,7 +17,7 @@ func (c *nopCollector) EVMHeightIndexed(uint64)                    {}
 func (c *nopCollector) EVMTransactionIndexed(int)                  {}
 func (c *nopCollector) EVMAccountInteraction(string)               {}
 func (c *nopCollector) MeasureRequestDuration(time.Time, string)   {}
-func (c *nopCollector) OperatorBalance(*flow.Account)              {}
+func (c *nopCollector) OperatorBalance(balance uint64)             {}
 func (c *nopCollector) AvailableSigningKeys(count int)             {}
 func (c *nopCollector) GasEstimationIterations(count int)          {}
 func (c *nopCollector) BlockIngestionTime(blockCreation time.Time) {}

services/requester/requester.go

@@ -118,7 +118,7 @@ func NewEVM(
 
 	if !config.IndexOnly {
 		address := config.COAAddress
-		acc, err := client.GetAccount(context.Background(), address)
+		accBalance, err := client.GetAccountBalanceAtLatestBlock(context.Background(), address)
 		if err != nil {
 			return nil, fmt.Errorf(
 				"could not fetch the configured COA account: %s make sure it exists: %w",
@@ -127,13 +127,13 @@ func NewEVM(
 			)
 		}
 		// initialize the operator balance metric since it is only updated when sending a tx
-		collector.OperatorBalance(acc)
+		collector.OperatorBalance(accBalance)
 
-		if acc.Balance < minFlowBalance {
+		if accBalance < minFlowBalance {
 			return nil, fmt.Errorf(
 				"COA account must be funded with at least %d Flow, but has balance of: %d",
 				minFlowBalance,
-				acc.Balance,
+				accBalance,
 			)
 		}
 	}