feat: force price if 1 hr difference for redstone

Author: harsh-98

ds/repo.go

@@ -150,6 +150,8 @@ type RepositoryI interface {
 	TokensValidAtBlock(string, int64) []*schemas.TokenOracle
 	TokenAddrsValidAtBlock(string, int64) map[string]bool
 	GetActivePriceOracleByBlockNum(blockNum int64) (schemas.PriceOracleT, core.VersionType, error)
+	//
+	GetPrevPriceFeed(feed string) *schemas.PriceFeed
 }
 
 func IsTestnet(client core.ClientI) bool {

ds/repo_dummy.go

@@ -279,6 +279,10 @@ func (DummyRepo) TokenAddrsValidAtBlock(string, int64) map[string]bool {
 	return nil
 }
 
+func (DummyRepo) GetPrevPriceFeed(feed string) *schemas.PriceFeed {
+	return nil
+}
+
 type QueryPriceFeedI interface {
 	// TokensValidAtBlock(blockNum int64) []schemas.TokenAndMergedPFVersion
 	GetPFType() string

models/aggregated_block_feed/composite_redstone_price_feed/model.go

@@ -83,6 +83,9 @@ func (mdl *CompositeRedStonePriceFeed) GetCalls(blockNum int64) (calls []multica
 	}}, true
 }
 func GetSpotPriceFeed(blockNum int64, token string, feedAddr string, repo ds.RepositoryI, client core.ClientI) *schemas.PriceFeed {
+	if token == "" {
+		return nil
+	}
 	chainId := core.GetBaseChainId(client)
 	if chainId == 1 {
 		pricespot, err := priceFetcher.GetPriceSpot(repo.GetToken(token), core.GetToken(chainId, "USDC"), client, blockNum)
@@ -117,7 +120,7 @@ func (mdl *CompositeRedStonePriceFeed) ProcessResult(blockNum int64, results []m
 		}
 	}
 	validTokens := mdl.Repo.TokensValidAtBlock(mdl.Address, blockNum)
-	if time.Since(time.Unix(int64(mdl.Repo.SetAndGetBlock(blockNum).Timestamp), 0)) > time.Hour*24*30 {
+	if time.Since(time.Unix(int64(mdl.Repo.SetAndGetBlock(blockNum).Timestamp), 0)) > time.Hour*24*30 && token != "" {
 		return GetSpotPriceFeed(blockNum, token, mdl.Address, mdl.Repo, mdl.Client)
 	}
 	// log.Info(mdl.Repo.SetAndGetBlock(blockNum).Timestamp, validTokens, utils.ToJson(mdl.DetailsDS))

models/aggregated_block_feed/dependency.go

@@ -11,12 +11,12 @@ import (
 	"github.com/Gearbox-protocol/third-eye/ds"
 )
 
-type repoI interface {
-	GetAdapter(addr string) ds.SyncAdapterI
-	// if returned value is nil, it means that token oracle hasn't been added yet.
-	GetTokens() []string
-	GetToken(string) *schemas.Token
-}
+// type repoI interface {
+// 	GetAdapter(addr string) ds.SyncAdapterI
+// 	// if returned value is nil, it means that token oracle hasn't been added yet.
+// 	GetTokens() []string
+// 	GetToken(string) *schemas.Token
+// }
 
 // ignoring dependencies for v1
 type QueryPFDependencies struct {
@@ -30,7 +30,7 @@ type QueryPFDependencies struct {
 	//
 	aqf *AQFWrapper
 	//
-	repo   repoI
+	repo   ds.RepositoryI
 	mu     *sync.Mutex
 	client core.ClientI
 }
@@ -179,7 +179,7 @@ func (q *QueryPFDependencies) fetchRoundData(blockNum int64, tokens map[string]b
 		for i := 0; i < entry.nocalls; i++ {
 			results = append(results, iterator.Next())
 		}
-		prices := processRoundDataWithAdapterTokens(blockNum, entry.adapter, results)
+		prices := processRoundDataWithAdapterTokens(blockNum, entry.adapter, results, getForceForAdapter(q.repo, entry.adapter))
 		q.updateQueryPrices(prices)
 	}
 	// sync control

models/aggregated_block_feed/query.go

@@ -113,7 +113,7 @@ func (mdl *AQFWrapper) QueryData(blockNum int64) []*schemas.PriceFeed {
 		for i := 0; i < entry.nocalls; i++ {
 			results = append(results, iterator.Next())
 		}
-		pf := processRoundDataWithAdapterTokens(blockNum, entry.adapter, results)
+		pf := processRoundDataWithAdapterTokens(blockNum, entry.adapter, results, getForceForAdapter(mdl.Repo, entry.adapter))
 		queryFeedPrices = append(queryFeedPrices, pf...)
 	}
 	//
@@ -145,15 +145,27 @@ func (mdl *AQFWrapper) getRoundDataCalls(blockNum int64) (calls []multicall.Mult
 	return
 }
 
-func processRoundDataWithAdapterTokens(blockNum int64, adapter ds.QueryPriceFeedI, entries []multicall.Multicall2Result) []*schemas.PriceFeed {
+func processRoundDataWithAdapterTokens(blockNum int64, adapter ds.QueryPriceFeedI, entries []multicall.Multicall2Result, force bool) []*schemas.PriceFeed {
 
 	// } else if utils.Contains([]string{"0xCbeCfA4017965939805Da5a2150E3DB1BeDD0364", "0x814E6564e8cda436c1ab25041C10bfdb21dEC519"},
 
-	priceData := adapter.ProcessResult(blockNum, entries, "")
+	priceData := adapter.ProcessResult(blockNum, entries, "", force)
 	if priceData == nil {
 		return nil
 	}
 	priceData.Feed = adapter.GetAddress()
 	priceData.BlockNumber = blockNum
 	return []*schemas.PriceFeed{priceData}
 }
+
+func getForceForAdapter(repo ds.RepositoryI, adapter ds.QueryPriceFeedI) bool {
+	var force bool
+	if price := repo.GetPrevPriceFeed(adapter.GetAddress()); price != nil {
+
+		force = time.Since(time.Unix(int64(repo.SetAndGetBlock(price.BlockNumber).Timestamp), 0)) > time.Hour
+		if force {
+			log.Info(adapter.GetAddress(), "last price at ", price.BlockNumber)
+		}
+	}
+	return force
+}

models/aggregated_block_feed/redstone_price_feed/model.go

@@ -84,7 +84,7 @@ func (mdl *RedstonePriceFeed) ProcessResult(blockNum int64, results []multicall.
 			}
 		}
 	}
-	if time.Since(time.Unix(int64(mdl.Repo.SetAndGetBlock(blockNum).Timestamp), 0)) > time.Hour*24*30 {
+	if time.Since(time.Unix(int64(mdl.Repo.SetAndGetBlock(blockNum).Timestamp), 0)) > time.Hour*24*30 && token != "" {
 		return composite_redstone_price_feed.GetSpotPriceFeed(blockNum, token, mdl.Address, mdl.Repo, mdl.Client)
 	}
 	{

repository/handlers/blocks.go

@@ -38,6 +38,9 @@ func NewBlocksRepo(db *gorm.DB, client core.ClientI, cfg *config.Config, tokensR
 	return blocksRepo
 }
 
+func (repo *BlocksRepo) GetPrevPriceFeed(feed string) *schemas.PriceFeed {
+	return repo.prevStore.GetPrevPriceFeed(feed)
+}
 func (repo *BlocksRepo) LoadBlocks(from, to int64) {
 	log.Infof("Loaded %d to %d blocks for debt", from, to)
 	data := []*schemas.Block{}

repository/handlers/prev_price.go

@@ -65,6 +65,9 @@ func (repo *PrevPriceStore) isPFAdded(pf *schemas.PriceFeed) bool {
 	repo.prevPriceFeeds[pf.Feed] = pf
 	return true
 }
+func (repo *PrevPriceStore) GetPrevPriceFeed(feed string) *schemas.PriceFeed {
+	return repo.prevPriceFeeds[feed]
+}
 
 func (repo *PrevPriceStore) getCurrentPrice(tokenOracleToFeed map[schemas.PriceOracleT]map[string]*schemas.TokenOracle) (ans []*schemas.TokenCurrentPrice) {
 	for priceOracle, tokenToFeed := range tokenOracleToFeed {