feat(monitor/xfeemngr): slow sync on ethereum

omni-network · Oct 31, 2024 · d547bef · d547bef
1 parent ac1f411
commit d547bef
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/monitor/xfeemngr/oracle.go b/monitor/xfeemngr/oracle.go
@@ -20,6 +20,7 @@ import (
 
 type feeOracle struct {
 	chain  evmchain.Metadata   // source chain
+	tick   ticker.Ticker       // ticker to sync fee oracle
 	toSync []evmchain.Metadata // chains to sync on fee oracle
 	gprice *gasprice.Buffer    // gas price buffer
 	tprice *tokenprice.Buffer  // token price buffer
@@ -34,6 +35,12 @@ func makeOracle(chain netconf.Chain, toSync []evmchain.Metadata, ethCl ethclient
 		return feeOracle{}, errors.New("chain metadata not found", "chain", chain.ID)
 	}
 
+	syncInterval := feeOracleSyncInterval
+	override, ok := chainSyncOverrides[chain.ID]
+	if ok {
+		syncInterval = override
+	}
+
 	getContract := func() func(context.Context) (contract.FeeOracleV1, error) {
 		var c *contract.BoundFeeOracleV1
 
@@ -55,6 +62,7 @@ func makeOracle(chain netconf.Chain, toSync []evmchain.Metadata, ethCl ethclient
 
 	return feeOracle{
 		chain:       chainmeta,
+		tick:        ticker.New(ticker.WithInterval(syncInterval)),
 		toSync:      toSync,
 		gprice:      gprice,
 		tprice:      tprice,
@@ -63,10 +71,10 @@ func makeOracle(chain netconf.Chain, toSync []evmchain.Metadata, ethCl ethclient
 }
 
 // syncForever syncs the on-chain gas price and token conversion rates with their respective buffers, forever.
-func (o feeOracle) syncForever(ctx context.Context, tick ticker.Ticker) {
+func (o feeOracle) syncForever(ctx context.Context) {
 	ctx = log.WithCtx(ctx, "component", "feeOracle", "chain", o.chain.Name)
 	log.Info(ctx, "Starting fee oracle sync")
-	tick.Go(ctx, o.syncOnce)
+	o.tick.Go(ctx, o.syncOnce)
 }
 
 // syncOnce syncs the on-chain gas price and token conversion rates with their respective buffers, once.

diff --git a/monitor/xfeemngr/xfeemngr.go b/monitor/xfeemngr/xfeemngr.go
@@ -14,7 +14,6 @@ import (
 	"github.com/omni-network/omni/lib/tokens/coingecko"
 	"github.com/omni-network/omni/lib/xchain"
 	"github.com/omni-network/omni/monitor/xfeemngr/gasprice"
-	"github.com/omni-network/omni/monitor/xfeemngr/ticker"
 	"github.com/omni-network/omni/monitor/xfeemngr/tokenprice"
 
 	"github.com/ethereum/go-ethereum"
@@ -25,7 +24,6 @@ type Manager struct {
 	gprice  *gasprice.Buffer
 	tprice  *tokenprice.Buffer
 	oracles map[uint64]feeOracle
-	ticker  ticker.Ticker
 }
 
 type Config struct {
@@ -57,6 +55,14 @@ const (
 	maxSaneEthPerOmni = float64(1)
 )
 
+var chainSyncOverrides = map[uint64]time.Duration{
+	// override for ethereum mainnet, to reduce spend
+	evmchain.IDEthereum: 90 * time.Minute,
+
+	// overide on holesky too, to test overide on omega
+	evmchain.IDHolesky: 90 * time.Minute,
+}
+
 func Start(ctx context.Context, network netconf.Network, cfg Config, privKeyPath string) error {
 	log.Info(ctx, "Starting fee manager", "endpoint", cfg.RPCEndpoints)
 
@@ -89,7 +95,7 @@ func Start(ctx context.Context, network netconf.Network, cfg Config, privKeyPath
 		gprice:  gprice,
 		tprice:  tprice,
 		oracles: oracles,
-		ticker:  ticker.New(ticker.WithInterval(feeOracleSyncInterval)),
+		// ticker:  ticker.New(ticker.WithInterval(feeOracleSyncInterval)),
 	}
 
 	startMonitoring(ctx, network, ethClients)
@@ -108,7 +114,7 @@ func (m *Manager) start(ctx context.Context) {
 
 	// start oracle sync
 	for _, oracle := range m.oracles {
-		oracle.syncForever(ctx, m.ticker)
+		oracle.syncForever(ctx)
 	}
 }
 

diff --git a/monitor/xfeemngr/xfeemngr_internal_test.go b/monitor/xfeemngr/xfeemngr_internal_test.go
@@ -73,7 +73,7 @@ func TestStart(t *testing.T) {
 	tpriceBuf := tokenprice.NewBuffer(tokenPricer, tokens.OMNI, tokens.ETH, tokenprice.WithThresholdPct(tpriceThreshold), tokenprice.WithTicker(tick))
 
 	chains := makeChains(chainIDs)
-	oracles := makeMockOracles(chains, gpriceBuf, tpriceBuf)
+	oracles := makeMockOracles(chains, tick, gpriceBuf, tpriceBuf)
 
 	// make sure all postsTo are zero, at start
 	// this way when we check them later, we know they have been updated
@@ -90,7 +90,6 @@ func TestStart(t *testing.T) {
 	mngr := Manager{
 		gprice:  gpriceBuf,
 		tprice:  tpriceBuf,
-		ticker:  tick,
 		oracles: oracles,
 	}
 
@@ -216,7 +215,7 @@ func TestStart(t *testing.T) {
 	expectInitials()
 }
 
-func makeMockOracles(chains []evmchain.Metadata, gprice *gasprice.Buffer, tprice *tokenprice.Buffer) map[uint64]feeOracle {
+func makeMockOracles(chains []evmchain.Metadata, tick ticker.Ticker, gprice *gasprice.Buffer, tprice *tokenprice.Buffer) map[uint64]feeOracle {
 	oracles := make(map[uint64]feeOracle)
 
 	for _, chain := range chains {
@@ -225,6 +224,7 @@ func makeMockOracles(chains []evmchain.Metadata, gprice *gasprice.Buffer, tprice
 
 		oracles[chain.ChainID] = feeOracle{
 			chain:       chain,
+			tick:        tick,
 			toSync:      chains,
 			gprice:      gprice,
 			tprice:      tprice,