fix: update diesel_sync

Author: harsh-98

engine/index.go

@@ -207,6 +207,7 @@ func (e *Engine) Sync(syncTill int64) {
 func (e *Engine) SyncModel(mdl ds.SyncAdapterI, syncTill int64, wg *sync.WaitGroup) {
 	defer wg.Done()
 	syncFrom := mdl.GetLastSync() + 1
+	// log.Info(syncFrom, mdl)
 	syncTill = utils.Min(mdl.GetBlockToDisableOn(), syncTill)
 	if syncFrom > syncTill {
 		return

migrations/000058_diesel_sync.up.sql

@@ -0,0 +1,6 @@
+create table diesel_sync (
+    pool varchar(42) PRIMARY KEY,
+    pool_synced_till integer
+);
+
+insert into diesel_sync (select distinct on (pool) pool,   pool_synced_till from farm_V3 order by pool);

models/pool_lmrewards/v3/farm.go

@@ -26,23 +26,21 @@ type Farmv3 struct {
 	//
 	TotalSupply    *core.BigInt `gorm:"column:total_supply"`
 	FarmSyncedTill int64        `gorm:"column:synced_till"`
-	PoolSyncedTill int64        `gorm:"column:pool_synced_till"`
 }
 
-func (farm Farmv3) GetMinSyncedTill() int64 {
-	if farm.FarmSyncedTill < farm.PoolSyncedTill {
-		return farm.FarmSyncedTill
-	}
-	return farm.PoolSyncedTill
+type DieselSync struct {
+	PoolSyncedTill int64  `gorm:"column:pool_synced_till"`
+	Pool           string `gorm:"column:pool;primaryKey"`
+}
+
+func (DieselSync) TableName() string {
+	return "diesel_sync"
 }
 
 func (farm *Farmv3) SetSyncedTill(synedTill int64) {
 	if farm.FarmSyncedTill < synedTill {
 		farm.FarmSyncedTill = synedTill
 	}
-	if farm.PoolSyncedTill < synedTill {
-		farm.PoolSyncedTill = synedTill
-	}
 }
 
 func (farm *Farmv3) setRewardToken(client core.ClientI) {

models/pool_lmrewards/v3/log.go

@@ -23,7 +23,7 @@ func GetLogs() func() ss {
 	cfg := config.NewConfig()
 	client := ethclient.NewEthClient(cfg)
 	node := pkg.Node{Client: client}
-	addr := "0x3E965117A51186e41c2BB58b729A1e518A715e5F"
+	addr := "0x3E965117A51186e41c2BB58b729A1e518A715e5F" // nikitakle address on mainnet
 	log.Info(core.GetChainId(client))
 	txlogs, err := node.GetLogsForTransfer(0, node.GetLatestBlockNumber(), []common.Address{common.HexToAddress("0xda0002859B2d05F66a753d8241fCDE8623f26F4f")}, []common.Hash{common.HexToHash(addr)})
 	log.CheckFatal(err)

models/pool_lmrewards/v3/model.go

@@ -113,5 +113,11 @@ func (mdl *LMRewardsv3) AfterSyncHook(syncedTill int64) {
 	for _, farm := range mdl.farms {
 		farm.SetSyncedTill(syncedTill)
 	}
+	for pool, till := range mdl.poolsToSyncedTill {
+		if till < syncedTill {
+			till = syncedTill
+		}
+		mdl.poolsToSyncedTill[pool] = till
+	}
 	mdl.SyncAdapter.AfterSyncHook(syncedTill)
 }

models/pool_lmrewards/v3/state.go

@@ -18,14 +18,10 @@ import (
 func (mdl *LMRewardsv3) getFarmsAndPoolsv3(blockNum int64) {
 	pools := mdl.Repo.GetDCWrapper().GetZapperInfo(blockNum)
 	mdl.SetFarm(pools)
-}
-
-func (mdl *LMRewardsv3) setMinPoolSyncedTill(pool common.Address, syncedTill int64, farm string) {
-	if mdl.poolsToSyncedTill[pool] == 0 {
-		mdl.poolsToSyncedTill[pool] = syncedTill
-	}
-	if mdl.poolsToSyncedTill[pool] != syncedTill {
-		log.Fatal("in farm_v3 the pool_synced_till is different from different farms of that pool", syncedTill, mdl.poolsToSyncedTill[pool], farm)
+	log.Info("here", mdl.Repo.GetAdapterAddressByName(ds.Pool))
+	for _, pool := range mdl.Repo.GetAdapterAddressByName(ds.Pool) {
+		mdl.setPoolSyncedTill(common.HexToAddress(pool))
+		mdl.LastSync = utils.Min(mdl.LastSync, mdl.poolsToSyncedTill[common.HexToAddress(pool)])
 	}
 }
 
@@ -56,14 +52,13 @@ func (mdl *LMRewardsv3) SetFarm(pools []dc_wrapper.PoolZapperInfo) {
 					TotalSupply:    (*core.BigInt)(new(big.Int)),
 					Reward:         (*core.BigInt)(new(big.Int)),
 					FarmSyncedTill: mdl.Repo.GetAdapter(pool.Addr.Hex()).GetDiscoveredAt(),
-					PoolSyncedTill: mdl.Repo.GetAdapter(pool.Addr.Hex()).GetDiscoveredAt(),
 				}
 				if mdl.farms[farm.Farm] == nil {
 					farm.setRewardToken(mdl.Client)
 					mdl.farms[farm.Farm] = farm
 					// poolAndFarms = append(poolAndFarms, farm)
 					newfarmsForPool = append(newfarmsForPool, common.HexToAddress(farm.Farm))
-					mdl.LastSync = utils.Min(mdl.LastSync, farm.GetMinSyncedTill())
+					mdl.LastSync = utils.Min(mdl.LastSync, farm.FarmSyncedTill)
 				} else {
 					farm = mdl.farms[farm.Farm]
 					oldfarmsForPool = append(oldfarmsForPool, common.HexToAddress(farm.Farm))
@@ -82,12 +77,17 @@ func (mdl *LMRewardsv3) SetFarm(pools []dc_wrapper.PoolZapperInfo) {
 	// mdl.SetUnderlyingState(poolAndFarms)
 }
 
+// from contractRegister, Is that opposed to saying "Tell will be sad to discover that"?
 func (mdl *LMRewardsv3) AddPoolv3(blockNum int64, pool string) {
 	data := mdl.Repo.GetDCWrapper().GetZapperInfo(blockNum, common.HexToAddress(pool))
 	mdl.SetFarm(data)
-	// if len(data) == 0 {
-	// 	log.Warnf("Pool Zapperinfo not found in DCWrapper for block:%d, pool:%s ", blockNum, pool)
-	// }
+	mdl.setPoolSyncedTill(common.HexToAddress(pool))
+}
+func (mdl *LMRewardsv3) setPoolSyncedTill(pool common.Address) {
+	discoveredAt := mdl.Repo.GetAdapter(pool.Hex()).GetDiscoveredAt()
+	if mdl.poolsToSyncedTill[pool] < discoveredAt {
+		mdl.poolsToSyncedTill[pool] = discoveredAt
+	}
 }
 
 func (mdl *LMRewardsv3) SetUnderlyingState(obj interface{}) {
@@ -100,9 +100,12 @@ func (mdl *LMRewardsv3) SetUnderlyingState(obj interface{}) {
 			if mdl.farms[farm.Farm] == nil {
 				farm.setRewardToken(mdl.Client)
 				mdl.farms[farm.Farm] = farm
-				mdl.setMinPoolSyncedTill(common.HexToAddress(farm.Pool), farm.PoolSyncedTill, farm.Farm)
 			}
 		}
+	case []*DieselSync:
+		for _, sync := range ans {
+			mdl.poolsToSyncedTill[common.HexToAddress(sync.Pool)] = sync.PoolSyncedTill
+		}
 	case []*UserLMDetails:
 		users := map[common.Address]map[string]*UserLMDetails{}
 		for _, user := range ans {
@@ -185,4 +188,14 @@ func (mdl *LMRewardsv3) Save(tx *gorm.DB, currentTs uint64) {
 	}
 	err = tx.Clauses(clause.OnConflict{UpdateAll: true}).CreateInBatches(dataToSave, 500).Error
 	log.CheckFatal(err)
+
+	dieselSYncBLock := []DieselSync{}
+	for pool, syncedTill := range mdl.poolsToSyncedTill {
+		dieselSYncBLock = append(dieselSYncBLock, DieselSync{
+			Pool:           pool.Hex(),
+			PoolSyncedTill: syncedTill,
+		})
+	}
+	err = tx.Clauses(clause.OnConflict{UpdateAll: true}).CreateInBatches(dieselSYncBLock, 500).Error
+	log.CheckFatal(err)
 }

repository/reward_v3.go

@@ -5,6 +5,7 @@ import (
 	"github.com/Gearbox-protocol/sdk-go/utils"
 	"github.com/Gearbox-protocol/third-eye/ds"
 	lmrewardsv3 "github.com/Gearbox-protocol/third-eye/models/pool_lmrewards/v3"
+	v3 "github.com/Gearbox-protocol/third-eye/models/pool_lmrewards/v3"
 	"gorm.io/gorm"
 )
 
@@ -22,6 +23,12 @@ func (repo *Repository) loadLMRewardDetailsv3() {
 	err := repo.db.Raw(`SELECT * FROM farm_v3`).Find(&farms).Error
 	log.CheckFatal(err)
 	adapter.SetUnderlyingState(farms)
+
+	//
+	dieselsync := []*v3.DieselSync{}
+	err = repo.db.Raw(`SELECT * FROM diesel_sync`).Find(&farms).Error
+	log.CheckFatal(err)
+	adapter.SetUnderlyingState(dieselsync)
 	//
 	details := []*lmrewardsv3.UserLMDetails{}
 	err = repo.db.Raw(`SELECT * FROM user_lmdetails_v3`).Find(&details).Error