smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-11-10 10:05:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only return bkava tokens when value_in_staked_tokens is true (#1348)

Browse Source
This commit is contained in:
Derrick Lee 2022-10-11 14:38:49 -07:00 committed by GitHub
parent 7847f3ee7b
commit aa2fedaf78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
x/earn/keeper/grpc_query.go
View File

@ -298,15 +298,21 @@ func (s queryServer) getOneAccountOneVaultDeposit(
if req.ValueInStakedTokens {
// Get underlying ukava amount if denom is a derivative
if s.keeper.liquidKeeper.IsDerivativeDenom(ctx, req.Denom) {
ukavaValue, err := s.keeper.liquidKeeper.GetStakedTokensForDerivatives(ctx, sdk.NewCoins(value))
if err != nil {
// This should "never" happen if IsDerivativeDenom is true
panic("Error getting ukava value for " + req.Denom)
}
value = ukavaValue
if !s.keeper.liquidKeeper.IsDerivativeDenom(ctx, req.Denom) {
return nil, status.Errorf(
codes.InvalidArgument,
"denom %s is not a derivative, ValueInStakedTokens can only be used with liquid derivatives",
req.Denom,
)
}
ukavaValue, err := s.keeper.liquidKeeper.GetStakedTokensForDerivatives(ctx, sdk.NewCoins(value))
if err != nil {
// This should "never" happen if IsDerivativeDenom is true
panic("Error getting ukava value for " + req.Denom)
}
value = ukavaValue
}
return &types.QueryDepositsResponse{
@ -417,9 +423,8 @@ func (s queryServer) getOneAccountAllDeposits(
var valueInStakedTokens []sdk.Coin
for _, coin := range value {
// Non-bkava coins are kept as is
// Skip non-bkava coins
if !s.keeper.liquidKeeper.IsDerivativeDenom(ctx, coin.Denom) {
valueInStakedTokens = append(valueInStakedTokens, coin)
continue
}
@ -432,7 +437,20 @@ func (s queryServer) getOneAccountAllDeposits(
valueInStakedTokens = append(valueInStakedTokens, ukavaValue)
}
var filteredShares types.VaultShares
for _, share := range accountShare.Shares {
// Remove non-bkava coins from shares as they are used to
// determine which value is mapped to which denom
// These should be in the same order as valueInStakedTokens
if !s.keeper.liquidKeeper.IsDerivativeDenom(ctx, share.Denom) {
continue
}
filteredShares = append(filteredShares, share)
}
value = valueInStakedTokens
accountShare.Shares = filteredShares
}
deposits = append(deposits, types.DepositResponse{

5
x/earn/keeper/grpc_query_test.go
View File

@ -404,15 +404,14 @@ func (suite *grpcQueryTestSuite) TestDeposits() {
types.DepositResponse{
Depositor: acc2.String(),
Shares: types.VaultShares{
// Does not include non-bkava vaults
types.NewVaultShare(deposit4Amount.Denom, deposit4Amount.Amount.ToDec()),
types.NewVaultShare(deposit3Amount.Denom, deposit3Amount.Amount.ToDec()),
types.NewVaultShare(deposit1Amount.Denom, deposit1Amount.Amount.ToDec()),
},
Value: sdk.Coins{
// Does not include non-bkava vaults
sdk.NewCoin("ukava", deposit4Amount.Amount),
sdk.NewCoin("ukava", deposit3Amount.Amount),
// Deposit 1 is last as it's the same order as vault shares
deposit1Amount,
},
},
res.Deposits[0],