Skip to content

Commit 186c515

Browse files
committed
fix: get account data
1 parent 7ad9834 commit 186c515

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

ds/dc_wrapper/wrapper.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ func (dcw *DataCompressorWrapper) Retry(blockNum int64, account common.Address,
301301
newaccountData = accountData
302302
log.Info(utils.ToJson(newaccountData))
303303
if !accountData.Success {
304-
log.Warn("after retry, getCreditAccoutn data is still not successful", blockNum, account)
305-
return dc.CreditAccountCallData{}, err
304+
log.Warn("Not success v3", blockNum, account)
305+
// return dc.CreditAccountCallData{}, err
306306
}
307307
}
308308
return dc.GetAccountDataFromDCCall(dcw.client, core.NULL_ADDR, blockNum, newaccountData)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23
55
// toolchain go1.23.2
66

77
require (
8-
github.com/Gearbox-protocol/sdk-go v0.0.0-20250412113852-53fe0875bc19
8+
github.com/Gearbox-protocol/sdk-go v0.0.0-20250412130121-6ec5f20440f2
99
github.com/ethereum/go-ethereum v1.13.14
1010
github.com/go-playground/validator/v10 v10.4.1
1111
github.com/google/go-cmp v0.6.0

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
66
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
77
github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
88
github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
9-
github.com/Gearbox-protocol/sdk-go v0.0.0-20250408052012-1a750509b0a0 h1:2xyatkhoaXBi/7/rXiZxUqR/1OJuGsVfH3xNzzuu6Fs=
10-
github.com/Gearbox-protocol/sdk-go v0.0.0-20250408052012-1a750509b0a0/go.mod h1:MZsiiSAwDdnHY6GEILYtHEqhb9wmbUUE34UBQgNlUyM=
11-
github.com/Gearbox-protocol/sdk-go v0.0.0-20250412113852-53fe0875bc19 h1:hGb50ChP/pcigoZvf8AXVRgpISyQAlTsxo++V1uYe7c=
12-
github.com/Gearbox-protocol/sdk-go v0.0.0-20250412113852-53fe0875bc19/go.mod h1:MZsiiSAwDdnHY6GEILYtHEqhb9wmbUUE34UBQgNlUyM=
9+
github.com/Gearbox-protocol/sdk-go v0.0.0-20250412130121-6ec5f20440f2 h1:QJTDMzDH+/4aDJw/F/4ECNYQRTNuZq1fgeFSmnQp4hY=
10+
github.com/Gearbox-protocol/sdk-go v0.0.0-20250412130121-6ec5f20440f2/go.mod h1:MZsiiSAwDdnHY6GEILYtHEqhb9wmbUUE34UBQgNlUyM=
1311
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
1412
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
1513
github.com/OffchainLabs/go-ethereum v1.13.4-0.20240313010929-e5d8587e7227 h1:+/3TrD+q+BP36jGj2Bycdmrc/joKLNbc5ImePQzKRLM=

models/credit_manager/cm_common/credit_session_state.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,10 @@ func (mdl *CommonCMAdapter) liqv3SessionCallAndResultFn(liquidatedAt int64, sess
105105
if err == nil && !dcAccountData.IsSuccessful && mdl.GetVersion() == core.NewVersion(300) {
106106
dcAccountData, err = mdl.retry(dcAccountData, liquidatedAt-1)
107107
}
108-
log.Info(utils.ToJson(dcAccountData))
108+
if err == nil && !dcAccountData.IsSuccessful && dcAccountData.HealthFactor.Convert().Cmp(new(big.Int)) == 0 {
109+
dcAccountData.HealthFactor = (*core.BigInt)(big.NewInt(65535))
110+
111+
}
109112
if err != nil {
110113
log.Fatalf("For blockNum %d Account:%s %v. txHash: %s", liquidatedAt, session.Account, err, liqv3Details.TxHash)
111114
}

models/credit_manager/cm_common/retry_redstone_get_account.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package cm_common
22

33
import (
4+
"math/big"
5+
46
"github.com/Gearbox-protocol/sdk-go/core"
57
"github.com/Gearbox-protocol/sdk-go/log"
68
"github.com/Gearbox-protocol/sdk-go/pkg/dc"
@@ -38,6 +40,7 @@ func (mdl *CommonCMAdapter) priceFeedNeeded(balances core.DBBalanceFormat) (ans
3840
func (mdl *CommonCMAdapter) retry(oldaccount dc.CreditAccountCallData, blockNum int64) (dc.CreditAccountCallData, error) {
3941
ts := mdl.Repo.SetAndGetBlock(blockNum).Timestamp
4042
bal := moreThan1Balance(oldaccount.Balances)
43+
bal[mdl.GetUnderlyingToken()] = core.DBTokenBalance{BI: (*core.BigInt)(big.NewInt(1))}
4144
redPFs := mdl.priceFeedNeeded(bal)
4245
v3Pods := mdl.Repo.GetRedStonemgr().GetPodSign(int64(ts), redPFs)
4346
v3PodsCalls := redstone.GetpodToCalls(300, common.HexToAddress(mdl.GetCreditFacadeAddr()), v3Pods, redPFs)

repository/handlers/blocks.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ func (repo *BlocksRepo) Save(tx *gorm.DB) {
6868
x[pf.Feed] = true
6969
}
7070
blocksToSync = append(blocksToSync, block)
71-
if len(block.PriceFeeds) != 0 {
72-
log.Info("Price feeds", utils.ToJson(block.PriceFeeds))
73-
}
7471
}
7572
// clauses not needed here
7673
err := tx.Clauses(clause.OnConflict{

0 commit comments

Comments
 (0)