fix: get account data

harsh-98 · harsh-98 · commit 7ad9834468de · 2025-04-12T20:13:36.000+08:00
diff --git a/ds/dc_wrapper/wrapper.go b/ds/dc_wrapper/wrapper.go
@@ -13,6 +13,7 @@ import (
 	"github.com/Gearbox-protocol/sdk-go/artifacts/creditAccountCompressor"
 	dcv2 "github.com/Gearbox-protocol/sdk-go/artifacts/dataCompressor/dataCompressorv2"
 	"github.com/Gearbox-protocol/sdk-go/artifacts/dataCompressor/mainnet"
+	"github.com/Gearbox-protocol/sdk-go/artifacts/dataCompressorv3"
 	dcv3 "github.com/Gearbox-protocol/sdk-go/artifacts/dataCompressorv3"
 	"github.com/Gearbox-protocol/sdk-go/artifacts/multicall"
 	"github.com/Gearbox-protocol/sdk-go/artifacts/poolCompressor"
@@ -264,6 +265,49 @@ func (dcw *DataCompressorWrapper) GetLatestv3DC() (common.Address, bool) {
 	return dcs[len(dcs)-1].address, true
 }
 
+func (dcw *DataCompressorWrapper) Retry(blockNum int64, account common.Address, v3Pods []dataCompressorv3.PriceOnDemand, v3PodCalls []multicall.Multicall2Call) (dc.CreditAccountCallData, error) {
+	key, dcAddr := dcw.GetKeyAndAddress(core.NewVersion(300), blockNum, CREDIT_ACCOUNT_COMPRESSOR)
+	opts := &bind.CallOpts{BlockNumber: big.NewInt(blockNum)}
+	var newaccountData interface{}
+	switch key {
+	case NODC:
+		return dc.CreditAccountCallData{}, NO_DC_FOUND_ERR
+	case DCV3:
+		con, err := dataCompressorv3.NewDataCompressorv3(dcAddr, dcw.client)
+		log.CheckFatal(err)
+		data, err := con.GetCreditAccountData(opts, account, v3Pods)
+		if err != nil || !data.IsSuccessful {
+			log.Warn("after retry, getCreditAccoutn data is still not successful", blockNum, account)
+			return dc.CreditAccountCallData{}, err
+		}
+	case DCV310:
+		callData, err := core.GetAbi("CreditAccountCompressor").Pack("getCreditAccountData", account)
+		log.CheckFatal(err)
+		v3PodCalls = append(v3PodCalls, multicall.Multicall2Call{
+			Target:   dcAddr,
+			CallData: callData,
+		})
+		ans := core.MakeMultiCall(dcw.client, blockNum, false, v3PodCalls)
+		data := ans[len(ans)-1]
+		if !data.Success {
+			log.Warn("after retry, getCreditAccoutn data is still not successful", blockNum, account)
+			return dc.CreditAccountCallData{}, err
+		}
+		out, err := core.GetAbi("CreditAccountCompressor").Unpack("getCreditAccountData", data.ReturnData)
+		if err != nil {
+			return dc.CreditAccountCallData{}, err
+		}
+		accountData := *abi.ConvertType(out[0], new(creditAccountCompressor.CreditAccountData)).(*creditAccountCompressor.CreditAccountData)
+		newaccountData = accountData
+		log.Info(utils.ToJson(newaccountData))
+		if !accountData.Success {
+			log.Warn("after retry, getCreditAccoutn data is still not successful", blockNum, account)
+			return dc.CreditAccountCallData{}, err
+		}
+	}
+	return dc.GetAccountDataFromDCCall(dcw.client, core.NULL_ADDR, blockNum, newaccountData)
+}
+
 // blockNum can't be zero
 
 func (dcw *DataCompressorWrapper) GetCreditAccountData(version core.VersionType, blockNum int64, creditManager common.Address, borrower common.Address, account common.Address) (
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.23
 // toolchain go1.23.2
 
 require (
-	github.com/Gearbox-protocol/sdk-go v0.0.0-20250408052012-1a750509b0a0
+	github.com/Gearbox-protocol/sdk-go v0.0.0-20250412113852-53fe0875bc19
 	github.com/ethereum/go-ethereum v1.13.14
 	github.com/go-playground/validator/v10 v10.4.1
 	github.com/google/go-cmp v0.6.0
@@ -84,6 +84,6 @@ require (
 
 replace github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.1
 
-replace github.com/Gearbox-protocol/sdk-go v0.0.0-20250402073851-44589b7f10df => ../sdk-go
+replace github.com/Gearbox-protocol/sdk-go v0.0.0-20250408052012-1a750509b0a0 => ../sdk-go
 
 replace github.com/ethereum/go-ethereum v1.13.14 => github.com/OffchainLabs/go-ethereum v1.13.4-0.20240313010929-e5d8587e7227
diff --git a/go.sum b/go.sum
@@ -8,6 +8,8 @@ github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
 github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/Gearbox-protocol/sdk-go v0.0.0-20250408052012-1a750509b0a0 h1:2xyatkhoaXBi/7/rXiZxUqR/1OJuGsVfH3xNzzuu6Fs=
 github.com/Gearbox-protocol/sdk-go v0.0.0-20250408052012-1a750509b0a0/go.mod h1:MZsiiSAwDdnHY6GEILYtHEqhb9wmbUUE34UBQgNlUyM=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20250412113852-53fe0875bc19 h1:hGb50ChP/pcigoZvf8AXVRgpISyQAlTsxo++V1uYe7c=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20250412113852-53fe0875bc19/go.mod h1:MZsiiSAwDdnHY6GEILYtHEqhb9wmbUUE34UBQgNlUyM=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/OffchainLabs/go-ethereum v1.13.4-0.20240313010929-e5d8587e7227 h1:+/3TrD+q+BP36jGj2Bycdmrc/joKLNbc5ImePQzKRLM=
diff --git a/jsonnet/mocks/aqf_multiple_adapters.jsonnet b/jsonnet/mocks/aqf_multiple_adapters.jsonnet
@@ -40,6 +40,7 @@
             dataId: 'BTC',
             signersThreshold: 5,
             token: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
+            feed: '#Redstone_1',
           },
         },
       },
@@ -58,6 +59,7 @@
             dataId: 'weETH_FUNDAMENTAL',
             signersThreshold: 5,
             token: '0x8C23b9E4CB9884e807294c4b4C33820333cC613c',
+            feed: '#Redstone_1',
           },
         },
       },
diff --git a/models/aggregated_block_feed/base_price_feed/call_and_process.go b/models/aggregated_block_feed/base_price_feed/call_and_process.go
@@ -104,6 +104,7 @@ func (mdl *BasePriceFeed) GetUnderlyingCalls(blockNum int64) (calls []multicall.
 					DataId:           dataId,
 					SignersThreshold: signThreshold,
 					UnderlyingToken:  feedToken,
+					Feed:             common.HexToAddress(mdl.Address),
 				}
 				mdl.DetailsDS.Info[entry] = tokenDetails
 			}
diff --git a/models/aggregated_block_feed/base_price_feed/token_ds.go b/models/aggregated_block_feed/base_price_feed/token_ds.go
@@ -13,7 +13,7 @@ type DetailsDS struct {
 	PFType      string                      `json:"pfType"`
 	Underlyings []string                    `json:"underlyings"`
 	Info        map[string]*core.RedStonePF `json:"info"`
-	FetchedInfo bool                        `json:"fetchedInfo,omitempty"`
+	FetchedInfo bool                        `json:"FetchedInfo,omitempty"`
 }
 
 func (obj *DetailsDS) Load(in core.Json, version core.VersionType) {
diff --git a/models/aggregated_block_feed/composite_redstone_price_feed/model.go b/models/aggregated_block_feed/composite_redstone_price_feed/model.go
@@ -46,7 +46,7 @@ func NewRedstonePriceFeedFromAdapter(adapter *ds.SyncAdapter) *CompositeRedStone
 		priceFeed1:    common.BytesToAddress(pf1),
 		Decimals:      int8(new(big.Int).SetBytes(decimals).Int64()),
 	}
-	if obj.DetailsDS.Info[adapter.GetAddress()] == nil {
+	if obj.DetailsDS.Info[adapter.GetAddress()] == nil || obj.DetailsDS.Info[adapter.GetAddress()].Feed == core.NULL_ADDR {
 		_, signThreshold, dataId := priceFetcher.RedstoneDetails(obj.priceFeed0, adapter.Client)
 		//
 		if dataId == "beraETH_FUNDAMENTAL" {
@@ -62,6 +62,7 @@ func NewRedstonePriceFeedFromAdapter(adapter *ds.SyncAdapter) *CompositeRedStone
 			DataId:           dataId,
 			SignersThreshold: signThreshold,
 			UnderlyingToken:  obj.Repo.GetFeedToTicker(obj.priceFeed0.Hex(), obj.Address),
+			Feed:             obj.priceFeed0,
 		}
 		obj.DetailsDS.Info[adapter.GetAddress()] = tokenDetails
 	}
diff --git a/models/aggregated_block_feed/redstone_price_feed/model.go b/models/aggregated_block_feed/redstone_price_feed/model.go
@@ -35,15 +35,17 @@ func NewRedstonePriceFeedFromAdapter(adapter *ds.SyncAdapter) *RedstonePriceFeed
 	obj := &RedstonePriceFeed{
 		BasePriceFeed: base_price_feed.NewBasePriceFeedFromAdapter(adapter),
 	}
-	if obj.DetailsDS.Info[adapter.GetAddress()] == nil {
-		feedToken, signThreshold, dataId := priceFetcher.RedstoneDetails(common.HexToAddress(adapter.GetAddress()), adapter.Client)
+	if obj.DetailsDS.Info[adapter.GetAddress()] == nil || obj.DetailsDS.Info[adapter.GetAddress()].Feed == core.NULL_ADDR {
+		feed := common.HexToAddress(adapter.GetAddress())
+		feedToken, signThreshold, dataId := priceFetcher.RedstoneDetails(feed, adapter.Client)
 		//
 		tokenDetails := &core.RedStonePF{
 			Type:             15,
 			DataServiceId:    "redstone-primary-prod",
 			DataId:           dataId,
 			SignersThreshold: signThreshold,
 			UnderlyingToken:  feedToken,
+			Feed:             feed,
 		}
 		obj.DetailsDS.Info[adapter.GetAddress()] = tokenDetails
 	}
diff --git a/models/credit_manager/cm_common/credit_session_state.go b/models/credit_manager/cm_common/credit_session_state.go
@@ -105,8 +105,9 @@ func (mdl *CommonCMAdapter) liqv3SessionCallAndResultFn(liquidatedAt int64, sess
 		if err == nil && !dcAccountData.IsSuccessful && mdl.GetVersion() == core.NewVersion(300) {
 			dcAccountData, err = mdl.retry(dcAccountData, liquidatedAt-1)
 		}
+		log.Info(utils.ToJson(dcAccountData))
 		if err != nil {
-			log.Fatalf("For blockNum %d CM:%s Borrower:%s %v", liquidatedAt, mdl.GetAddress(), session.Borrower, err)
+			log.Fatalf("For blockNum %d Account:%s %v. txHash: %s", liquidatedAt, session.Account, err, liqv3Details.TxHash)
 		}
 		mdl.liqv3Session(liquidatedAt, session, dcAccountData, liqv3Details)
 	}
diff --git a/models/credit_manager/cm_common/retry_redstone_get_account.go b/models/credit_manager/cm_common/retry_redstone_get_account.go
@@ -1,17 +1,14 @@
 package cm_common
 
 import (
-	"math/big"
-
-	dcv3 "github.com/Gearbox-protocol/sdk-go/artifacts/dataCompressorv3"
 	"github.com/Gearbox-protocol/sdk-go/core"
 	"github.com/Gearbox-protocol/sdk-go/log"
 	"github.com/Gearbox-protocol/sdk-go/pkg/dc"
+	"github.com/Gearbox-protocol/sdk-go/pkg/redstone"
 
 	"github.com/Gearbox-protocol/third-eye/ds"
-	"github.com/Gearbox-protocol/third-eye/ds/dc_wrapper"
 	"github.com/Gearbox-protocol/third-eye/models/pool/pool_v3"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 func (mdl *CommonCMAdapter) priceFeedNeeded(balances core.DBBalanceFormat) (ans []core.RedStonePF) {
@@ -39,26 +36,16 @@ func (mdl *CommonCMAdapter) priceFeedNeeded(balances core.DBBalanceFormat) (ans
 	return
 }
 func (mdl *CommonCMAdapter) retry(oldaccount dc.CreditAccountCallData, blockNum int64) (dc.CreditAccountCallData, error) {
-	_, addr := mdl.Repo.GetDCWrapper().GetKeyAndAddress(core.NewVersion(300), blockNum, dc_wrapper.CREDIT_ACCOUNT_COMPRESSOR)
-	dcw, err := dcv3.NewDataCompressorv3(addr, mdl.Client)
-	log.CheckFatal(err)
 	ts := mdl.Repo.SetAndGetBlock(blockNum).Timestamp
 	bal := moreThan1Balance(oldaccount.Balances)
-	pod := mdl.Repo.GetRedStonemgr().GetPodSign(int64(ts), mdl.priceFeedNeeded(bal))
-	newaccountData, err := dcw.GetCreditAccountData(&bind.CallOpts{
-		BlockNumber: big.NewInt(blockNum),
-	},
-		oldaccount.Addr,
-		pod,
-	)
-	if err != nil {
-		return dc.CreditAccountCallData{}, err
-	}
-	if !newaccountData.IsSuccessful {
-		log.Warn("after retry, getCreditAccoutn data is still not successful", blockNum, oldaccount.Addr)
-	}
-	return dc.GetAccountDataFromDCCall(mdl.Client, core.NULL_ADDR, blockNum, newaccountData)
+	redPFs := mdl.priceFeedNeeded(bal)
+	v3Pods := mdl.Repo.GetRedStonemgr().GetPodSign(int64(ts), redPFs)
+	v3PodsCalls := redstone.GetpodToCalls(300, common.HexToAddress(mdl.GetCreditFacadeAddr()), v3Pods, redPFs)
+	log.Info("retrying to get credit account data", oldaccount.Addr, blockNum, "pods", len(v3Pods), "calls", len(v3PodsCalls))
+	//
+	return mdl.Repo.GetDCWrapper().Retry(blockNum, oldaccount.Addr, v3Pods, v3PodsCalls)
 }
+
 func moreThan1Balance(oldBal []core.TokenBalanceCallData) core.DBBalanceFormat {
 	dbFormat := core.DBBalanceFormat{}
 	for _, balance := range oldBal {
diff --git a/models/wrappers/index.go b/models/wrappers/index.go
@@ -86,6 +86,9 @@ func (w SyncWrapper) SetDisabled(disabled bool) {
 }
 
 func (w *SyncWrapper) AddSyncAdapter(adapter ds.SyncAdapterI) {
+	if w.Adapters.Get(adapter.GetAddress()) != nil { // can't add again like via adminWrapper for contractRegister.
+		return
+	}
 	if w.ViaDataProcess == -1 {
 		log.Fatal("SyncWrapper: ViaDataProcess not set")
 	}
diff --git a/repository/handlers/blocks.go b/repository/handlers/blocks.go
@@ -60,10 +60,17 @@ func (repo *BlocksRepo) Save(tx *gorm.DB) {
 	defer utils.Elapsed("blocks sql statements")()
 	blocksToSync := make([]*schemas.Block, 0, len(repo.GetBlocks()))
 	for _, block := range repo.GetBlocks() {
-		if len(block.Relations) != 0 {
-			log.Info(utils.ToJson(block.Relations))
+		x := map[string]bool{}
+		for _, pf := range block.PriceFeeds {
+			if x[pf.Feed] {
+				log.Fatal(utils.ToJson(block.PriceFeeds))
+			}
+			x[pf.Feed] = true
 		}
 		blocksToSync = append(blocksToSync, block)
+		if len(block.PriceFeeds) != 0 {
+			log.Info("Price feeds", utils.ToJson(block.PriceFeeds))
+		}
 	}
 	// clauses not needed here
 	err := tx.Clauses(clause.OnConflict{
diff --git a/scripts/17_merge_price_feed/main.go b/scripts/17_merge_price_feed/main.go
@@ -17,9 +17,10 @@ func main() {
 	err := db.Raw("select min (block_num) block_num from price_feeds").Find(b).Error
 	log.CheckFatal(err)
 	b.BlockNum = b.BlockNum - 1
+	var rang int64 = 1_000_000
 	for {
 		start := b.BlockNum + 1
-		end := b.BlockNum + 100_00_000
+		end := b.BlockNum + rang
 		// log.Info(start, end)
 		tx := db.Begin()
 		//
@@ -49,7 +50,7 @@ func main() {
 		tx.Commit()
 		//
 		log.Info("saved till", end)
-		b.BlockNum += 500_000
+		b.BlockNum += rang
 	}
 
 	err = db.Exec(`alter table price_feeds add PRIMARY KEY (block_num, feed)`).Error

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ func (mdl *BasePriceFeed) GetUnderlyingCalls(blockNum int64) (calls []multicall.`
`104`	`104`	`DataId: dataId,`
`105`	`105`	`SignersThreshold: signThreshold,`
`106`	`106`	`UnderlyingToken: feedToken,`
	`107`	`+ Feed: common.HexToAddress(mdl.Address),`
`107`	`108`	`}`
`108`	`109`	`mdl.DetailsDS.Info[entry] = tokenDetails`
`109`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ type DetailsDS struct {`
`13`	`13`	PFType string `json:"pfType"`
`14`	`14`	Underlyings []string `json:"underlyings"`
`15`	`15`	Info map[string]*core.RedStonePF `json:"info"`
`16`		- FetchedInfo bool `json:"fetchedInfo,omitempty"`
	`16`	+ FetchedInfo bool `json:"FetchedInfo,omitempty"`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`func (obj *DetailsDS) Load(in core.Json, version core.VersionType) {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func NewRedstonePriceFeedFromAdapter(adapter ds.SyncAdapter) CompositeRedStone`
`46`	`46`	`priceFeed1: common.BytesToAddress(pf1),`
`47`	`47`	`Decimals: int8(new(big.Int).SetBytes(decimals).Int64()),`
`48`	`48`	`}`
`49`		`- if obj.DetailsDS.Info[adapter.GetAddress()] == nil {`
	`49`	`+ if obj.DetailsDS.Info[adapter.GetAddress()] == nil \|\| obj.DetailsDS.Info[adapter.GetAddress()].Feed == core.NULL_ADDR {`
`50`	`50`	`_, signThreshold, dataId := priceFetcher.RedstoneDetails(obj.priceFeed0, adapter.Client)`
`51`	`51`	`//`
`52`	`52`	`if dataId == "beraETH_FUNDAMENTAL" {`
`@@ -62,6 +62,7 @@ func NewRedstonePriceFeedFromAdapter(adapter ds.SyncAdapter) CompositeRedStone`
`62`	`62`	`DataId: dataId,`
`63`	`63`	`SignersThreshold: signThreshold,`
`64`	`64`	`UnderlyingToken: obj.Repo.GetFeedToTicker(obj.priceFeed0.Hex(), obj.Address),`
	`65`	`+ Feed: obj.priceFeed0,`
`65`	`66`	`}`
`66`	`67`	`obj.DetailsDS.Info[adapter.GetAddress()] = tokenDetails`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,9 @@ func (mdl *CommonCMAdapter) liqv3SessionCallAndResultFn(liquidatedAt int64, sess`
`105`	`105`	`if err == nil && !dcAccountData.IsSuccessful && mdl.GetVersion() == core.NewVersion(300) {`
`106`	`106`	`dcAccountData, err = mdl.retry(dcAccountData, liquidatedAt-1)`
`107`	`107`	`}`
	`108`	`+ log.Info(utils.ToJson(dcAccountData))`
`108`	`109`	`if err != nil {`
`109`		`- log.Fatalf("For blockNum %d CM:%s Borrower:%s %v", liquidatedAt, mdl.GetAddress(), session.Borrower, err)`
	`110`	`+ log.Fatalf("For blockNum %d Account:%s %v. txHash: %s", liquidatedAt, session.Account, err, liqv3Details.TxHash)`
`110`	`111`	`}`
`111`	`112`	`mdl.liqv3Session(liquidatedAt, session, dcAccountData, liqv3Details)`
`112`	`113`	`}`