Skip to content

Commit

Permalink
rebase and convert the gRPC input to lowercase for assets,delegation,…
Browse files Browse the repository at this point in the history
…opeartor modules
  • Loading branch information
TimmyExogenous committed Feb 14, 2025
1 parent a1091c1 commit 0026a73
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
9 changes: 5 additions & 4 deletions x/assets/keeper/grpc_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package keeper

import (
"context"
"strings"

"github.com/cosmos/cosmos-sdk/store/prefix"
"github.com/cosmos/cosmos-sdk/types/query"
Expand Down Expand Up @@ -57,7 +58,7 @@ func (k Keeper) QueAllClientChainInfo(goCtx context.Context, req *assetstype.Que
// QueStakingAssetInfo query the specified client chain asset info by inputting assetID
func (k Keeper) QueStakingAssetInfo(ctx context.Context, info *assetstype.QueryStakingAssetInfo) (*assetstype.StakingAssetInfo, error) {
c := sdk.UnwrapSDKContext(ctx)
return k.GetStakingAssetInfo(c, info.AssetId)
return k.GetStakingAssetInfo(c, strings.ToLower(info.AssetId))
}

// QueAllStakingAssetsInfo query the info about all client chain assets that have been registered
Expand All @@ -73,7 +74,7 @@ func (k Keeper) QueAllStakingAssetsInfo(ctx context.Context, _ *assetstype.Query
// QueStakerAssetInfos query th state of all assets for a staker specified by stakerID
func (k Keeper) QueStakerAssetInfos(ctx context.Context, info *assetstype.QueryStakerAssetInfo) (*assetstype.QueryAssetInfoResponse, error) {
c := sdk.UnwrapSDKContext(ctx)
assetInfos, err := k.GetStakerAssetInfos(c, info.StakerId)
assetInfos, err := k.GetStakerAssetInfos(c, strings.ToLower(info.StakerId))
if err != nil {
return nil, err
}
Expand All @@ -83,7 +84,7 @@ func (k Keeper) QueStakerAssetInfos(ctx context.Context, info *assetstype.QueryS
// QueStakerSpecifiedAssetAmount query the specified asset state of a staker, using stakerID and assetID as query parameters
func (k Keeper) QueStakerSpecifiedAssetAmount(ctx context.Context, req *assetstype.QuerySpecifiedAssetAmountReq) (*assetstype.StakerAssetInfo, error) {
c := sdk.UnwrapSDKContext(ctx)
return k.GetStakerSpecifiedAssetInfo(c, req.StakerId, req.AssetId)
return k.GetStakerSpecifiedAssetInfo(c, strings.ToLower(req.StakerId), strings.ToLower(req.AssetId))
}

// QueOperatorAssetInfos query th state of all assets for an operator specified by operator address
Expand All @@ -107,5 +108,5 @@ func (k Keeper) QueOperatorSpecifiedAssetAmount(ctx context.Context, req *assets
if err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
return k.GetOperatorSpecifiedAssetInfo(c, addr, req.AssetId)
return k.GetOperatorSpecifiedAssetInfo(c, addr, strings.ToLower(req.AssetId))
}
1 change: 0 additions & 1 deletion x/delegation/keeper/delegation_op_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ func (suite *DelegationTestSuite) TestAutoAssociate() {
TotalShare: sdkmath.LegacyNewDecFromBigInt(delegationParams.OpAmount.BigInt()),
OperatorShare: sdkmath.LegacyNewDecFromBigInt(delegationParams.OpAmount.BigInt()),
}, *operatorState)

}

func (suite *DelegationTestSuite) TestUndelegateFrom() {
Expand Down
15 changes: 8 additions & 7 deletions x/delegation/keeper/grpc_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package keeper

import (
"context"
"strings"

delegationtype "github.com/ExocoreNetwork/exocore/x/delegation/types"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand All @@ -11,12 +12,12 @@ var _ delegationtype.QueryServer = &Keeper{}

func (k *Keeper) QuerySingleDelegationInfo(ctx context.Context, req *delegationtype.SingleDelegationInfoReq) (*delegationtype.SingleDelegationInfoResponse, error) {
c := sdk.UnwrapSDKContext(ctx)
delegationAmounts, err := k.GetSingleDelegationInfo(c, req.StakerId, req.AssetId, req.OperatorAddr)
delegationAmounts, err := k.GetSingleDelegationInfo(c, strings.ToLower(req.StakerId), strings.ToLower(req.AssetId), req.OperatorAddr)
if err != nil {
return nil, err
}
// calculate the maximum undelegatable amount
singleAmount, err := k.UndelegatableAmount(c, req.AssetId, req.OperatorAddr, delegationAmounts)
singleAmount, err := k.UndelegatableAmount(c, strings.ToLower(req.AssetId), req.OperatorAddr, delegationAmounts)
if err != nil {
return nil, err
}
Expand All @@ -28,12 +29,12 @@ func (k *Keeper) QuerySingleDelegationInfo(ctx context.Context, req *delegationt

func (k *Keeper) QueryDelegationInfo(ctx context.Context, info *delegationtype.DelegationInfoReq) (*delegationtype.QueryDelegationInfoResponse, error) {
c := sdk.UnwrapSDKContext(ctx)
return k.GetDelegationInfo(c, info.StakerId, info.AssetId)
return k.GetDelegationInfo(c, strings.ToLower(info.StakerId), strings.ToLower(info.AssetId))
}

func (k *Keeper) QueryUndelegations(ctx context.Context, req *delegationtype.UndelegationsReq) (*delegationtype.UndelegationRecordList, error) {
c := sdk.UnwrapSDKContext(ctx)
undelegations, err := k.GetStakerUndelegationRecords(c, req.StakerId, req.AssetId)
undelegations, err := k.GetStakerUndelegationRecords(c, strings.ToLower(req.StakerId), strings.ToLower(req.AssetId))
if err != nil {
return nil, err
}
Expand All @@ -55,7 +56,7 @@ func (k *Keeper) QueryUndelegationsByEpochInfo(ctx context.Context, req *delegat

func (k Keeper) QueryUndelegationHoldCount(ctx context.Context, req *delegationtype.UndelegationHoldCountReq) (*delegationtype.UndelegationHoldCountResponse, error) {
c := sdk.UnwrapSDKContext(ctx)
recordKey, err := k.GetUndelegationRecKey(c, req.StakerId, req.AssetId, req.UndelegationId)
recordKey, err := k.GetUndelegationRecKey(c, strings.ToLower(req.StakerId), strings.ToLower(req.AssetId), req.UndelegationId)
if err != nil {
return nil, err
}
Expand All @@ -65,7 +66,7 @@ func (k Keeper) QueryUndelegationHoldCount(ctx context.Context, req *delegationt

func (k Keeper) QueryAssociatedOperatorByStaker(ctx context.Context, req *delegationtype.QueryAssociatedOperatorByStakerReq) (*delegationtype.QueryAssociatedOperatorByStakerResponse, error) {
c := sdk.UnwrapSDKContext(ctx)
operator, err := k.GetAssociatedOperator(c, req.StakerId)
operator, err := k.GetAssociatedOperator(c, strings.ToLower(req.StakerId))
if err != nil {
return nil, err
}
Expand All @@ -87,7 +88,7 @@ func (k Keeper) QueryAssociatedStakersByOperator(ctx context.Context, req *deleg

func (k Keeper) QueryDelegatedStakersByOperator(ctx context.Context, req *delegationtype.QueryDelegatedStakersByOperatorReq) (*delegationtype.QueryDelegatedStakersByOperatorResponse, error) {
c := sdk.UnwrapSDKContext(ctx)
stakers, err := k.GetStakersByOperator(c, req.Operator, req.AssetId)
stakers, err := k.GetStakersByOperator(c, req.Operator, strings.ToLower(req.AssetId))
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions x/operator/keeper/grpc_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ func (k *Keeper) Validator(c context.Context, req *types.QueryValidatorRequest)

func (k *Keeper) QuerySnapshotHelper(goCtx context.Context, req *types.QuerySnapshotHelperRequest) (*types.SnapshotHelper, error) {
ctx := sdk.UnwrapSDKContext(goCtx)
snapshotHelper, err := k.GetSnapshotHelper(ctx, strings.ToLower(req.Avs))
snapshotHelper, err := k.GetSnapshotHelper(ctx, req.Avs)
if err != nil {
return nil, err
}
Expand All @@ -358,7 +358,7 @@ func (k *Keeper) QuerySnapshotHelper(goCtx context.Context, req *types.QuerySnap

func (k *Keeper) QuerySpecifiedSnapshot(goCtx context.Context, req *types.QuerySpecifiedSnapshotRequest) (*types.VotingPowerSnapshotKeyHeight, error) {
ctx := sdk.UnwrapSDKContext(goCtx)
findHeight, snapshot, err := k.LoadVotingPowerSnapshot(ctx, strings.ToLower(req.Avs), req.Height)
findHeight, snapshot, err := k.LoadVotingPowerSnapshot(ctx, req.Avs, req.Height)
if err != nil {
return nil, err
}
Expand Down
4 changes: 3 additions & 1 deletion x/operator/keeper/voting_power_snapshot.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package keeper

import (
"strings"

epochtypes "github.com/ExocoreNetwork/exocore/x/epochs/types"
"github.com/ExocoreNetwork/exocore/x/operator/types"
"github.com/cosmos/cosmos-sdk/store/prefix"
Expand Down Expand Up @@ -230,7 +232,7 @@ func (k *Keeper) GetSnapshotHelper(ctx sdk.Context, avsAddr string) (types.Snaps
return ret, types.ErrParameterInvalid.Wrapf("invalid AVS address format: %s", avsAddr)
}
store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixSnapshotHelper)
value := store.Get([]byte(avsAddr))
value := store.Get([]byte(strings.ToLower(avsAddr)))
if value == nil {
return ret, types.ErrNoKeyInTheStore.Wrapf("GetSnapshotHelper: the key is %s", avsAddr)
}
Expand Down

0 comments on commit 0026a73

Please sign in to comment.