From 9db6c37b049abc19a93b7a927fde623882597627 Mon Sep 17 00:00:00 2001 From: emidev98 Date: Fri, 23 Feb 2024 16:00:57 +0200 Subject: [PATCH 1/6] feat: implement simplified unbonding and rewards queries --- proto/alliance/alliance/query.proto | 82 +++++++++++++++++++---------- x/alliance/keeper/grpc_query.go | 64 +++++++++++++++++++--- x/alliance/keeper/unbonding.go | 20 +++++++ 3 files changed, 132 insertions(+), 34 deletions(-) diff --git a/proto/alliance/alliance/query.proto b/proto/alliance/alliance/query.proto index 8ea9c9e5..be817def 100644 --- a/proto/alliance/alliance/query.proto +++ b/proto/alliance/alliance/query.proto @@ -14,26 +14,19 @@ import "alliance/alliance/redelegations.proto"; option go_package = "github.com/terra-money/alliance/x/alliance/types"; service Query { + + // Query Alliance module parameters more info about the params + // https://docs.alliance.money/tech/parameters rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { option (google.api.http).get = "/terra/alliances/params"; } - // Query paginated alliances + // Query all alliances with pagination rpc Alliances(QueryAlliancesRequest) returns (QueryAlliancesResponse) { option (google.api.http).get = "/terra/alliances"; } - // Query a specific alliance by ibc hash - // @deprecated: this endpoint will be replaced for by the encoded version - // of the denom e.g.: GET:/terra/alliances/ibc%2Falliance - rpc IBCAlliance(QueryIBCAllianceRequest) returns (QueryAllianceResponse) { - // Deprecated. Please use the default endpoint - // with the encoded denom e.g from ibc/alliance to ibc%2Falliance - option deprecated = true; - option (google.api.http).get = "/terra/alliances/ibc/{hash}"; - } - - // Query all paginated alliance delegations + // Query all alliances delegations with pagination rpc AllAlliancesDelegations(QueryAllAlliancesDelegationsRequest) returns (QueryAlliancesDelegationsResponse) { option (google.api.http).get = "/terra/alliances/delegations"; } @@ -58,22 +51,12 @@ service Query { option (google.api.http).get = "/terra/alliances/delegations/{delegator_addr}/{validator_addr}"; } - // Query a delegation to an alliance by delegator addr, validator_addr and denom + // Query a specific delegation by delegator addr, validator addr and denom rpc AllianceDelegation(QueryAllianceDelegationRequest) returns (QueryAllianceDelegationResponse) { option (google.api.http).get = "/terra/alliances/delegations/{delegator_addr}/{validator_addr}/{denom}"; } - // Query a delegation to an alliance by delegator addr, validator_addr and denom - // @deprecated: this endpoint will be replaced for by the encoded version - // of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance - rpc IBCAllianceDelegation(QueryIBCAllianceDelegationRequest) returns (QueryAllianceDelegationResponse) { - // Deprecated. Please use the default endpoint - // with the encoded denom e.g from ibc/alliance to ibc%2Falliance - option deprecated = true; - option (google.api.http).get = "/terra/alliances/delegations/{delegator_addr}/{validator_addr}/ibc/{hash}"; - } - - // Query for rewards by delegator addr, validator_addr and denom + // Query a specific delegation rewards by delegator addr, validator addr and denom rpc AllianceDelegationRewards(QueryAllianceDelegationRewardsRequest) returns (QueryAllianceDelegationRewardsResponse) { option (google.api.http).get = "/terra/alliances/rewards/{delegator_addr}/{validator_addr}/{denom}"; } @@ -87,17 +70,27 @@ service Query { option (google.api.http).get = "/terra/alliances/rewards/{delegator_addr}/{validator_addr}/ibc/{hash}"; } - // Query for rewards by delegator addr, validator_addr and denom + // Query unbondings by delegator address + rpc AllianceUnbondingsByDelegator(QueryAllianceUnbondingsByDelegatorRequest) returns (QueryAllianceUnbondingsByDelegatorResponse) { + option (google.api.http).get = "/terra/alliances/unbondings/{delegator_addr}"; + } + + // Query unbondings by denom, delegator addr rpc AllianceUnbondingsByDenomAndDelegator(QueryAllianceUnbondingsByDenomAndDelegatorRequest) returns (QueryAllianceUnbondingsByDenomAndDelegatorResponse) { option (google.api.http).get = "/terra/alliances/unbondings/{denom}/{delegator_addr}"; } - // Query for rewards by delegator addr, validator_addr and denom + // Query unbondings by denom, delegator addr, validator addr rpc AllianceUnbondings(QueryAllianceUnbondingsRequest) returns (QueryAllianceUnbondingsResponse) { option (google.api.http).get = "/terra/alliances/unbondings/{denom}/{delegator_addr}/{validator_addr}"; } - // Query redelegations by denom and delegator address + // Query paginated redelegations delegator addr + rpc AllianceRedelegationsByDelegator(QueryAllianceRedelegationsByDelegatorRequest) returns (QueryAllianceRedelegationsByDelegatorResponse) { + option (google.api.http).get = "/terra/alliances/redelegations/{delegator_addr}"; + } + + // Query paginated redelegations by denom and delegator addr rpc AllianceRedelegations(QueryAllianceRedelegationsRequest) returns (QueryAllianceRedelegationsResponse) { option (google.api.http).get = "/terra/alliances/redelegations/{denom}/{delegator_addr}"; } @@ -284,6 +277,24 @@ message QueryAllianceValidatorsResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } +// AllianceDelegation +message QueryAllianceUnbondingsByDelegatorRequest { + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; + + string delegator_addr = 1; + cosmos.base.query.v1beta1.PageRequest pagination = 3; +} + +message QueryAllianceUnbondingsByDelegatorResponse { + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; + + repeated UnbondingDelegation unbondings = 1 [(gogoproto.nullable) = false]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + + // AllianceDelegation message QueryAllianceUnbondingsByDenomAndDelegatorRequest { option (gogoproto.equal) = false; @@ -334,6 +345,23 @@ message QueryAllianceRedelegationsResponse { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; + repeated RedelegationEntry redelegations = 1 [(gogoproto.nullable) = false]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + + +message QueryAllianceRedelegationsByDelegatorRequest { + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; + + string delegator_addr = 1; + cosmos.base.query.v1beta1.PageRequest pagination = 2; +} + +message QueryAllianceRedelegationsByDelegatorResponse { + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; + repeated RedelegationEntry redelegations = 1 [(gogoproto.nullable) = false]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } \ No newline at end of file diff --git a/x/alliance/keeper/grpc_query.go b/x/alliance/keeper/grpc_query.go index 7d37b6ff..e2a99167 100644 --- a/x/alliance/keeper/grpc_query.go +++ b/x/alliance/keeper/grpc_query.go @@ -444,6 +444,21 @@ func (k QueryServer) AllianceDelegation(c context.Context, req *types.QueryAllia }, nil } +func (k QueryServer) AllianceUnbondingsByDelegator(c context.Context, req *types.QueryAllianceUnbondingsByDelegatorRequest) (*types.QueryAllianceUnbondingsByDelegatorResponse, error) { + ctx := sdk.UnwrapSDKContext(c) + + delAddr, err := sdk.AccAddressFromBech32(req.DelegatorAddr) + if err != nil { + return nil, err + } + + res, err := k.GetUnbondingsByDelegator(ctx, delAddr) + + return &types.QueryAllianceUnbondingsByDelegatorResponse{ + Unbondings: res, + }, err +} + func (k QueryServer) AllianceUnbondingsByDenomAndDelegator(c context.Context, req *types.QueryAllianceUnbondingsByDenomAndDelegatorRequest) (*types.QueryAllianceUnbondingsByDenomAndDelegatorResponse, error) { ctx := sdk.UnwrapSDKContext(c) @@ -538,14 +553,49 @@ func (k QueryServer) AllianceRedelegations(c context.Context, req *types.QueryAl }, err } -func (k QueryServer) IBCAllianceDelegation(c context.Context, request *types.QueryIBCAllianceDelegationRequest) (*types.QueryAllianceDelegationResponse, error) { //nolint:staticcheck // SA1019: types.QueryIBCAllianceDelegationRequest is deprecated - req := types.QueryAllianceDelegationRequest{ - DelegatorAddr: request.DelegatorAddr, - ValidatorAddr: request.ValidatorAddr, - Denom: "ibc/" + request.Hash, - Pagination: request.Pagination, +func (k QueryServer) AllianceRedelegationsByDelegator(c context.Context, req *types.QueryAllianceRedelegationsByDelegatorRequest) (*types.QueryAllianceRedelegationsByDelegatorResponse, error) { + ctx := sdk.UnwrapSDKContext(c) + + delAddr, err := sdk.AccAddressFromBech32(req.DelegatorAddr) + if err != nil { + return nil, err } - return k.AllianceDelegation(c, &req) + + // Get the key-value module store using the store key + store := ctx.KVStore(k.storeKey) + + // Get the part of the store that keeps assets + redelegationsStore := prefix.NewStore(store, types.GetRedelegationsKeyByDelegator(delAddr)) + + var redelegationEntries []types.RedelegationEntry + + // Paginate the assets store based on PageRequest + pageRes, err := query.Paginate(redelegationsStore, req.Pagination, func(key []byte, value []byte) error { + var redelegation types.Redelegation + k.cdc.MustUnmarshal(value, &redelegation) + // get the completion time from the latest bytes of the key + completionTime := types.ParseRedelegationPaginationKeyTime(key) + + redelegationEntry := types.RedelegationEntry{ + DelegatorAddress: redelegation.DelegatorAddress, + SrcValidatorAddress: redelegation.SrcValidatorAddress, + DstValidatorAddress: redelegation.DstValidatorAddress, + Balance: redelegation.Balance, + CompletionTime: completionTime, + } + + redelegationEntries = append(redelegationEntries, redelegationEntry) + return nil + }) + // Throw an error if pagination failed + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) + } + + return &types.QueryAllianceRedelegationsByDelegatorResponse{ + Redelegations: redelegationEntries, + Pagination: pageRes, + }, err } func NewQueryServerImpl(keeper Keeper) types.QueryServer { diff --git a/x/alliance/keeper/unbonding.go b/x/alliance/keeper/unbonding.go index aebc5eb1..ac4e7b92 100644 --- a/x/alliance/keeper/unbonding.go +++ b/x/alliance/keeper/unbonding.go @@ -97,6 +97,26 @@ func (k Keeper) GetUnbondings( return unbondingDelegations, err } +// This method retun all in-progress unbondings for a given delegator address +// it is less optimal than GetUnbondingsByDenomAndDelegator because it +// has to iterate over all alliances to get the list of all assets +func (k Keeper) GetUnbondingsByDelegator( + ctx context.Context, + delAddr sdk.AccAddress, +) (unbondingDelegations []types.UnbondingDelegation, err error) { + // Retrieve all Aliances to get the list of all assets + alliances := k.GetAllAssets(ctx) + + for _, alliance := range alliances { + // Get the unbonding delegations for the current alliance + unbondingDelegations, err = k.GetUnbondingsByDenomAndDelegator(ctx, alliance.Denom, delAddr) + if err != nil { + return nil, err + } + } + return unbondingDelegations, err +} + // This method retun all unbonding delegations for a given denom and delegator address, // it is less optimal than GetUnbondings because it has do some data parsing and additional // checks, plus it returns a larger data set. From b2f8e1ea5b2d7705907e5e7f3b54d2ce23671353 Mon Sep 17 00:00:00 2001 From: emidev98 Date: Mon, 26 Feb 2024 17:19:18 +0200 Subject: [PATCH 2/6] fix: parse redelegation pagination key time --- x/alliance/keeper/tests/delegation_test.go | 40 +++++++++++++++++++++- x/alliance/types/keys.go | 7 ++-- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/x/alliance/keeper/tests/delegation_test.go b/x/alliance/keeper/tests/delegation_test.go index 472f7f01..6b48df30 100644 --- a/x/alliance/keeper/tests/delegation_test.go +++ b/x/alliance/keeper/tests/delegation_test.go @@ -4,12 +4,14 @@ import ( "testing" "time" + "cosmossdk.io/math" test_helpers "github.com/terra-money/alliance/app" "github.com/terra-money/alliance/x/alliance" "github.com/terra-money/alliance/x/alliance/keeper" "github.com/terra-money/alliance/x/alliance/types" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" teststaking "github.com/cosmos/cosmos-sdk/x/staking/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -318,6 +320,26 @@ func TestSuccessfulRedelegation(t *testing.T) { // Check total bonded amount require.Equal(t, sdk.NewInt(3_000_000), app.StakingKeeper.TotalBondedTokens(ctx)) + // Query redelegations by the delegator address + redelegationsByDelegator, err := queryServer.AllianceRedelegationsByDelegator(ctx, &types.QueryAllianceRedelegationsByDelegatorRequest{ + DelegatorAddr: delAddr1.String(), + }) + require.NoError(t, err) + require.Equal(t, &types.QueryAllianceRedelegationsByDelegatorResponse{ + Redelegations: []types.RedelegationEntry{ + { + DelegatorAddress: delAddr1.String(), + SrcValidatorAddress: valAddr1.String(), + DstValidatorAddress: valAddr2.String(), + Balance: sdk.NewCoin(AllianceDenom, math.NewInt(500_000)), + CompletionTime: time.Date(1, time.January, 22, 0, 0, 0, 0, time.UTC), + }, + }, + Pagination: &query.PageResponse{ + Total: 1, + }, + }, redelegationsByDelegator) + // Check if there is a re-delegation event stored iter := app.AllianceKeeper.IterateRedelegationsByDelegator(ctx, delAddr1) defer iter.Close() @@ -375,7 +397,23 @@ func TestSuccessfulRedelegation(t *testing.T) { Pagination: nil, }) require.NoError(t, err) - require.Len(t, redelegationsRes.Redelegations, 1) + require.Equal(t, &types.QueryAllianceRedelegationsResponse{ + Redelegations: []types.RedelegationEntry{ + { + DelegatorAddress: delAddr1.String(), + SrcValidatorAddress: valAddr1.String(), + DstValidatorAddress: valAddr2.String(), + Balance: sdk.NewCoin(AllianceDenom, math.NewInt(500_000)), + CompletionTime: time.Date(1, time.January, 22, 0, 0, 0, 0, time.UTC), + }, + }, + Pagination: &query.PageResponse{ + Total: 1, + }, + }, redelegationsRes) + + unbondingPeriod, err := app.StakingKeeper.UnbondingTime(ctx) + require.NoError(t, err) require.Equal(t, types.RedelegationEntry{ DelegatorAddress: delAddr1.String(), SrcValidatorAddress: valAddr1.String(), diff --git a/x/alliance/types/keys.go b/x/alliance/types/keys.go index 8e764d42..001d49ce 100644 --- a/x/alliance/types/keys.go +++ b/x/alliance/types/keys.go @@ -247,10 +247,9 @@ func ParseRedelegationKeyForCompletionTime(key []byte) time.Time { } func ParseRedelegationPaginationKeyTime(key []byte) time.Time { - offset := 0 - offset += int(key[offset]) + 1 - b := key[offset:] - t, err := sdk.ParseTimeBytes(b) + timestampLength := len(sdk.SortableTimeFormat) + timestampStart := len(key) - timestampLength + t, err := sdk.ParseTimeBytes(key[timestampStart:]) if err != nil { panic(err) } From 7a31031466dceb6bcafcbb54f3c117bfa1523e3e Mon Sep 17 00:00:00 2001 From: emidev98 Date: Mon, 26 Feb 2024 19:57:41 +0200 Subject: [PATCH 3/6] fix: unbonding queries --- proto/alliance/alliance/query.proto | 1 - proto/alliance/alliance/unbonding.proto | 2 + x/alliance/keeper/tests/delegation_test.go | 23 +++ x/alliance/keeper/unbonding.go | 184 +++++++++--------- .../tests/e2e/delegate_undelegate_test.go | 13 +- x/alliance/types/keys.go | 27 +-- 6 files changed, 122 insertions(+), 128 deletions(-) diff --git a/proto/alliance/alliance/query.proto b/proto/alliance/alliance/query.proto index be817def..5e3d2071 100644 --- a/proto/alliance/alliance/query.proto +++ b/proto/alliance/alliance/query.proto @@ -291,7 +291,6 @@ message QueryAllianceUnbondingsByDelegatorResponse { option (gogoproto.goproto_getters) = false; repeated UnbondingDelegation unbondings = 1 [(gogoproto.nullable) = false]; - cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/proto/alliance/alliance/unbonding.proto b/proto/alliance/alliance/unbonding.proto index 790279d8..cab462f3 100644 --- a/proto/alliance/alliance/unbonding.proto +++ b/proto/alliance/alliance/unbonding.proto @@ -22,4 +22,6 @@ message UnbondingDelegation { (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + // alliance denom of the unbonding delegation + string denom = 4; } \ No newline at end of file diff --git a/x/alliance/keeper/tests/delegation_test.go b/x/alliance/keeper/tests/delegation_test.go index 6b48df30..8dc60341 100644 --- a/x/alliance/keeper/tests/delegation_test.go +++ b/x/alliance/keeper/tests/delegation_test.go @@ -648,6 +648,29 @@ func TestSuccessfulUndelegation(t *testing.T) { _, err = app.AllianceKeeper.Undelegate(ctx, delAddr, val, sdk.NewCoin(AllianceDenom, sdk.NewInt(250_000))) require.NoError(t, err) + // Query unbondings directly from the entry point + queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) + res, err := queryServer.AllianceUnbondingsByDelegator(ctx, &types.QueryAllianceUnbondingsByDelegatorRequest{ + DelegatorAddr: delAddr.String(), + }) + require.NoError(t, err) + require.Equal(t, &types.QueryAllianceUnbondingsByDelegatorResponse{ + Unbondings: []types.UnbondingDelegation{ + { + CompletionTime: ctx.BlockTime().Add(unbondingTime), + ValidatorAddress: valAddr.String(), + Amount: math.NewInt(250_000), + Denom: AllianceDenom, + }, + { + CompletionTime: ctx.BlockTime().Add(unbondingTime), + ValidatorAddress: valAddr.String(), + Amount: math.NewInt(250_000), + Denom: AllianceDenom, + }, + }, + }, res) + // Check if undelegations were stored correctly iter := app.AllianceKeeper.IterateUndelegationsByCompletionTime(ctx, ctx.BlockTime().Add(unbondingTime).Add(time.Second)) require.True(t, iter.Valid()) diff --git a/x/alliance/keeper/unbonding.go b/x/alliance/keeper/unbonding.go index ac4e7b92..b3ef8b71 100644 --- a/x/alliance/keeper/unbonding.go +++ b/x/alliance/keeper/unbonding.go @@ -2,12 +2,71 @@ package keeper import ( "bytes" + "context" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/terra-money/alliance/x/alliance/types" ) +// This method retun all unbonding delegations for a given denom, validator address and delegator address. +// It is the most optimal way to query that data because it uses the indexes that are already in place +// for the unbonding queue and ommits unnecessary checks or data parsings. +func (k Keeper) GetUnbondings( + ctx sdk.Context, + denom string, + delAddr sdk.AccAddress, + valAddr sdk.ValAddress, +) (unbondingDelegations []types.UnbondingDelegation, err error) { + // Get the store + store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)) + // create the iterator with the correct prefix + iter := storetypes.KVStorePrefixIterator(store, types.UndelegationByValidatorIndexKey) + defer iter.Close() + suffix := types.GetPartialUnbondingKeySuffix(denom, delAddr) + + for ; iter.Valid(); iter.Next() { + key := iter.Key() + // Skip keys that are shorter than the suffix + if len(key) < len(suffix) { + continue + } + + prefix := types.GetUndelegationsIndexOrderedByValidatorKey(valAddr) + // Skip keys that don't have the desired suffix + if !bytes.HasPrefix(key, prefix) { + continue + } + + completionTime, err := types.GetTimeFromUndelegationKey(key) + if err != nil { + return nil, err + } + // Recover the queued undelegation from the store + b := store.Get(types.GetUndelegationQueueKey(completionTime, delAddr)) + + // Parse the model from the bytes + var queue types.QueuedUndelegation + err = k.cdc.Unmarshal(b, &queue) + if err != nil { + return nil, err + } + + // Iterate over the entries and append them to the result + for _, entry := range queue.Entries { + unbondDelegation := types.UnbondingDelegation{ + ValidatorAddress: entry.ValidatorAddress, + CompletionTime: completionTime, + Amount: entry.Balance.Amount, + Denom: entry.Balance.Denom, + } + unbondingDelegations = append(unbondingDelegations, unbondDelegation) + } + } + + return unbondingDelegations, err +} + // CompleteUnbondings Go through all queued undelegations and send the tokens to the delAddrs func (k Keeper) CompleteUnbondings(ctx sdk.Context) error { store := ctx.KVStore(k.storeKey) @@ -51,68 +110,19 @@ func (k Keeper) CompleteUnbondings(ctx sdk.Context) error { return nil } -// This method retun all unbonding delegations for a given denom, validator address and delegator address. -// It is the most optimal way to query that data because it uses the indexes that are already in place -// for the unbonding queue and ommits unnecessary checks or data parsings. -func (k Keeper) GetUnbondings( - ctx sdk.Context, - denom string, - delAddr sdk.AccAddress, - valAddr sdk.ValAddress, -) (unbondingDelegations []types.UnbondingDelegation, err error) { - store := ctx.KVStore(k.storeKey) - iter := sdk.KVStorePrefixIterator(store, types.UndelegationByValidatorIndexKey) - defer iter.Close() - suffix := types.GetPartialUnbondingKeySuffix(denom, delAddr) - - for ; iter.Valid(); iter.Next() { - key := iter.Key() - if len(key) < len(suffix) { - continue // Skip keys that are shorter than the suffix - } - - prefix := types.GetUndelegationsIndexOrderedByValidatorKey(valAddr) - if !bytes.HasPrefix(key, prefix) { - continue // Skip keys that don't have the desired suffix - } - - if !bytes.HasSuffix(key, suffix) { - continue // Skip keys that don't have the desired suffix - } - - _, unbondingCompletionTime, err := types.PartiallyParseUndelegationKeyBytes(key) - if err != nil { - return nil, err - } - // Process and append item to the results - unbondDelegation := types.UnbondingDelegation{ - ValidatorAddress: valAddr.String(), - CompletionTime: unbondingCompletionTime, - } - unbondingDelegations = append(unbondingDelegations, unbondDelegation) - } - - unbondingDelegations = k.addUnbondingAmounts(ctx, unbondingDelegations, delAddr) - - return unbondingDelegations, err -} - // This method retun all in-progress unbondings for a given delegator address -// it is less optimal than GetUnbondingsByDenomAndDelegator because it -// has to iterate over all alliances to get the list of all assets func (k Keeper) GetUnbondingsByDelegator( ctx context.Context, delAddr sdk.AccAddress, ) (unbondingDelegations []types.UnbondingDelegation, err error) { - // Retrieve all Aliances to get the list of all assets - alliances := k.GetAllAssets(ctx) - - for _, alliance := range alliances { + // Get and iterate over all alliances + for _, alliance := range k.GetAllAssets(ctx) { // Get the unbonding delegations for the current alliance - unbondingDelegations, err = k.GetUnbondingsByDenomAndDelegator(ctx, alliance.Denom, delAddr) + unbondings, err := k.GetUnbondingsByDenomAndDelegator(ctx, alliance.Denom, delAddr) if err != nil { return nil, err } + unbondingDelegations = append(unbondingDelegations, unbondings...) } return unbondingDelegations, err } @@ -130,62 +140,42 @@ func (k Keeper) GetUnbondingsByDenomAndDelegator( defer iter.Close() suffix := types.GetPartialUnbondingKeySuffix(denom, delAddr) + // Iterate over the keys for ; iter.Valid(); iter.Next() { key := iter.Key() + // Continue to the next iteration if the key is shorter than the suffix if len(key) < len(suffix) { - continue // Skip keys that are shorter than the suffix + continue } - + // continue to the next iteration if the key doesn't have the desired suffix if !bytes.HasSuffix(key, suffix) { - continue // Skip keys that don't have the desired suffix + continue } - - valAddr, unbondingCompletionTime, err := types.PartiallyParseUndelegationKeyBytes(key) + // parse the key and get the unbonding completion time + completionTime, err := types.GetTimeFromUndelegationKey(key) if err != nil { return nil, err } - // Process and append item to the results - unbondDelegation := types.UnbondingDelegation{ - ValidatorAddress: valAddr.String(), - CompletionTime: unbondingCompletionTime, - } - unbondingDelegations = append(unbondingDelegations, unbondDelegation) - } - - unbondingDelegations = k.addUnbondingAmounts(ctx, unbondingDelegations, delAddr) - - return unbondingDelegations, err -} + // Recover the queued undelegation from the store + b := store.Get(types.GetUndelegationQueueKey(completionTime, delAddr)) -func (k Keeper) addUnbondingAmounts(ctx sdk.Context, unbondingDelegations []types.UnbondingDelegation, delAddr sdk.AccAddress) (unbonding []types.UnbondingDelegation) { - for i := 0; i < len(unbondingDelegations); i++ { - iter := k.IterateUndelegationsByCompletionTime(ctx, unbondingDelegations[i].CompletionTime) - defer iter.Close() - for ; iter.Valid(); iter.Next() { - var queued types.QueuedUndelegation - k.cdc.MustUnmarshal(iter.Value(), &queued) - - for _, undel := range queued.Entries { - if undel.DelegatorAddress != delAddr.String() { - continue - } - - if undel.ValidatorAddress != unbondingDelegations[i].ValidatorAddress { - continue - } - - unbondingDelegations[i].Amount = undel.Balance.Amount - } + // Parse the model from the bytes + var queue types.QueuedUndelegation + err = k.cdc.Unmarshal(b, &queue) + if err != nil { + return nil, err } - } - for _, unbondingDelegation := range unbondingDelegations { - if unbondingDelegation.Amount.IsNil() { - continue + // Iterate over the entries and append them to the result + for _, entry := range queue.Entries { + unbondDelegation := types.UnbondingDelegation{ + ValidatorAddress: entry.ValidatorAddress, + CompletionTime: completionTime, + Amount: entry.Balance.Amount, + Denom: entry.Balance.Denom, + } + unbondingDelegations = append(unbondingDelegations, unbondDelegation) } - - unbonding = append(unbonding, unbondingDelegation) } - - return unbonding + return unbondingDelegations, err } diff --git a/x/alliance/tests/e2e/delegate_undelegate_test.go b/x/alliance/tests/e2e/delegate_undelegate_test.go index 93000519..27378693 100644 --- a/x/alliance/tests/e2e/delegate_undelegate_test.go +++ b/x/alliance/tests/e2e/delegate_undelegate_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + "cosmossdk.io/math" "github.com/terra-money/alliance/x/alliance" "github.com/terra-money/alliance/x/alliance/keeper" @@ -245,16 +246,16 @@ func TestDelegatingASmallAmount(t *testing.T) { // Query the unbondings in progress unbondings, err := app.AllianceKeeper.GetUnbondingsByDenomAndDelegator(ctx, allianceAsset2, user1) require.NoError(t, err) - require.True(t, len(unbondings) == 1) - require.Equal(t, val1.GetOperator().String(), unbondings[0].ValidatorAddress) - require.Equal(t, sdk.NewInt(100), unbondings[0].Amount) + require.Len(t, unbondings, 2) + require.Equal(t, val1.GetOperator(), unbondings[0].ValidatorAddress) + require.Equal(t, math.NewInt(100), unbondings[0].Amount) // Query the unbondings in progress unbondings, err = app.AllianceKeeper.GetUnbondings(ctx, allianceAsset2, user1, val1.GetOperator()) require.NoError(t, err) - require.True(t, len(unbondings) == 1) - require.Equal(t, val1.GetOperator().String(), unbondings[0].ValidatorAddress) - require.Equal(t, sdk.NewInt(100), unbondings[0].Amount) + require.Len(t, unbondings, 2) + require.Equal(t, val1.GetOperator(), unbondings[0].ValidatorAddress) + require.Equal(t, math.NewInt(100), unbondings[0].Amount) } // This test replicates this issue where there are large amounts of tokens delegated, diff --git a/x/alliance/types/keys.go b/x/alliance/types/keys.go index 001d49ce..e57293b0 100644 --- a/x/alliance/types/keys.go +++ b/x/alliance/types/keys.go @@ -44,7 +44,7 @@ var ( // Indexes for querying RedelegationByValidatorIndexKey = []byte{0x31} - UndelegationByValidatorIndexKey = []byte{0x32} + UndelegationByValidatorIndexKey = []byte{0x32} // TOODO: Simplify this index ) func GetAssetKey(denom string) []byte { @@ -149,39 +149,18 @@ func GetPartialUnbondingKeySuffix(denom string, delAddress sdk.AccAddress) (key return key } -func PartiallyParseUndelegationKeyBytes(key []byte) ( - valAddr sdk.ValAddress, - unbondingCompletionTime time.Time, - err error, -) { +func GetTimeFromUndelegationKey(key []byte) (time.Time, error) { offset := len(UndelegationByValidatorIndexKey) valAddrLen := int(key[offset]) offset++ - valAddr = sdk.ValAddress(key[offset : offset+valAddrLen]) offset += valAddrLen timeLen := int(key[offset]) offset++ timeBytes := key[offset : offset+timeLen] - // In case it's needed in the future to parse - // all thee properties from the key here is the code: - - // offset += timeLen - // denomLen := int(key[offset]) - // offset++ - // denom = string(key[offset : offset+denomLen]) - // offset += denomLen - // - // delAddrLen := int(key[offset]) - // offset++ - // delAddrBytes := key[offset : offset+delAddrLen] - // delAddr = sdk.AccAddress(delAddrBytes) - - unbondingCompletionTime, err = sdk.ParseTimeBytes(timeBytes) - - return valAddr, unbondingCompletionTime, err + return sdk.ParseTimeBytes(timeBytes) } func GetUndelegationsIndexOrderedByValidatorKey(valAddr sdk.ValAddress) []byte { From 8806c9f0625c1d5df2db7879d9a8a65477186372 Mon Sep 17 00:00:00 2001 From: emidev98 Date: Tue, 27 Feb 2024 15:31:26 +0200 Subject: [PATCH 4/6] feat: icrease tests coverage and performance contextualizing more the index --- x/alliance/keeper/tests/unbonding_test.go | 107 ++++++++++++++++++++++ x/alliance/keeper/unbonding.go | 8 +- x/alliance/types/keys.go | 5 +- 3 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 x/alliance/keeper/tests/unbonding_test.go diff --git a/x/alliance/keeper/tests/unbonding_test.go b/x/alliance/keeper/tests/unbonding_test.go new file mode 100644 index 00000000..1514bb71 --- /dev/null +++ b/x/alliance/keeper/tests/unbonding_test.go @@ -0,0 +1,107 @@ +package tests_test + +import ( + "testing" + "time" + + "cosmossdk.io/math" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + test_helpers "github.com/terra-money/alliance/app" + "github.com/terra-money/alliance/x/alliance/types" +) + +func TestUnbondingMethods(t *testing.T) { + // Setup the context with an alliance asset + app, ctx := createTestContext(t) + startTime := time.Now() + ctx = ctx.WithBlockTime(startTime).WithBlockHeight(1) + allianceAsset := types.AllianceAsset{ + Denom: AllianceDenom, + RewardWeight: math.LegacyNewDec(1), + TakeRate: math.LegacyNewDec(0), + TotalTokens: math.ZeroInt(), + TotalValidatorShares: math.LegacyZeroDec(), + RewardStartTime: startTime, + RewardChangeRate: math.LegacyNewDec(0), + RewardChangeInterval: time.Duration(0), + LastRewardChangeTime: startTime, + RewardWeightRange: types.RewardWeightRange{Min: math.LegacyNewDec(0), Max: math.LegacyNewDec(1)}, + IsInitialized: true, + } + app.AllianceKeeper.SetAsset(ctx, allianceAsset) + + // Query staking module unbonding time to assert later on + unbondingTime, err := app.StakingKeeper.UnbondingTime(ctx) + require.NoError(t, err) + + // Get the native delegations to have a validator address where to delegate + delegations, err := app.StakingKeeper.GetAllDelegations(ctx) + require.NoError(t, err) + valAddr, err := sdk.ValAddressFromBech32(delegations[0].ValidatorAddress) + require.NoError(t, err) + + // Get a delegator address with funds + delAddrs := test_helpers.AddTestAddrsIncremental(app, ctx, 2, sdk.NewCoins(sdk.NewCoin(AllianceDenom, math.NewInt(1000_000_000)))) + delAddr := delAddrs[0] + delAddr1 := delAddrs[1] + + // Get an alliance validator + val, err := app.AllianceKeeper.GetAllianceValidator(ctx, valAddr) + require.NoError(t, err) + + // Delegate the alliance asset with both accounts + res, err := app.AllianceKeeper.Delegate(ctx, delAddr, val, sdk.NewCoin(AllianceDenom, math.NewInt(1000_000_000))) + require.Nil(t, err) + require.Equal(t, math.LegacyNewDec(1000_000_000), *res) + res2, err := app.AllianceKeeper.Delegate(ctx, delAddr1, val, sdk.NewCoin(AllianceDenom, math.NewInt(1000_000_000))) + require.Nil(t, err) + require.Equal(t, math.LegacyNewDec(1000_000_000), *res2) + + // Undelegate the alliance assets with both accounts + undelRes, err := app.AllianceKeeper.Undelegate(ctx, delAddr, val, sdk.NewCoin(AllianceDenom, math.NewInt(1000_000_000))) + require.Nil(t, err) + require.Equal(t, ctx.BlockHeader().Time.Add(unbondingTime), *undelRes) + undelRes2, err := app.AllianceKeeper.Undelegate(ctx, delAddr1, val, sdk.NewCoin(AllianceDenom, math.NewInt(1000_000_000))) + require.Nil(t, err) + require.Equal(t, ctx.BlockHeader().Time.Add(unbondingTime), *undelRes2) + + // Validate that both user delegations executed the unbonding process + unbondings, err := app.AllianceKeeper.GetUnbondingsByDelegator(ctx, delAddr) + require.NoError(t, err) + require.Equal(t, + []types.UnbondingDelegation{{ + ValidatorAddress: valAddr.String(), + Amount: math.NewInt(1000_000_000), + CompletionTime: ctx.BlockHeader().Time.Add(unbondingTime), + Denom: AllianceDenom, + }}, + unbondings, + ) + + // Validate that both user delegations executed the unbonding process + unbondings, err = app.AllianceKeeper.GetUnbondingsByDenomAndDelegator(ctx, AllianceDenom, delAddr1) + require.NoError(t, err) + require.Equal(t, + []types.UnbondingDelegation{{ + ValidatorAddress: valAddr.String(), + Amount: math.NewInt(1000_000_000), + CompletionTime: ctx.BlockHeader().Time.Add(unbondingTime), + Denom: AllianceDenom, + }}, + unbondings, + ) + + unbondings, err = app.AllianceKeeper.GetUnbondings(ctx, AllianceDenom, delAddr1, valAddr) + require.NoError(t, err) + require.Equal(t, + []types.UnbondingDelegation{{ + ValidatorAddress: valAddr.String(), + Amount: math.NewInt(1000_000_000), + CompletionTime: ctx.BlockHeader().Time.Add(unbondingTime), + Denom: AllianceDenom, + }}, + unbondings, + ) +} diff --git a/x/alliance/keeper/unbonding.go b/x/alliance/keeper/unbonding.go index b3ef8b71..678eacee 100644 --- a/x/alliance/keeper/unbonding.go +++ b/x/alliance/keeper/unbonding.go @@ -21,14 +21,16 @@ func (k Keeper) GetUnbondings( // Get the store store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)) // create the iterator with the correct prefix - iter := storetypes.KVStorePrefixIterator(store, types.UndelegationByValidatorIndexKey) + prefix := types.GetUndelegationsIndexOrderedByValidatorKey(valAddr) + // Get the iterator + iter := storetypes.KVStorePrefixIterator(store, prefix) defer iter.Close() suffix := types.GetPartialUnbondingKeySuffix(denom, delAddr) for ; iter.Valid(); iter.Next() { key := iter.Key() - // Skip keys that are shorter than the suffix - if len(key) < len(suffix) { + // Skip keys that don't have the desired suffix + if bytes.HasSuffix(key, suffix) { continue } diff --git a/x/alliance/types/keys.go b/x/alliance/types/keys.go index e57293b0..dbb29663 100644 --- a/x/alliance/types/keys.go +++ b/x/alliance/types/keys.go @@ -44,7 +44,10 @@ var ( // Indexes for querying RedelegationByValidatorIndexKey = []byte{0x31} - UndelegationByValidatorIndexKey = []byte{0x32} // TOODO: Simplify this index + // The full index looks like: + // 0x32 + valAddr + completionTime + denom + delAddr + // TODO: Simplify this index + UndelegationByValidatorIndexKey = []byte{0x32} ) func GetAssetKey(denom string) []byte { From 3389e03ebf0751ec6c5562cf45fcba8537205b40 Mon Sep 17 00:00:00 2001 From: emidev98 Date: Tue, 27 Feb 2024 16:46:08 +0200 Subject: [PATCH 5/6] fix: typo and lint --- x/alliance/keeper/tests/unbonding_test.go | 3 ++- x/alliance/keeper/unbonding.go | 2 +- x/alliance/tests/e2e/delegate_undelegate_test.go | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/x/alliance/keeper/tests/unbonding_test.go b/x/alliance/keeper/tests/unbonding_test.go index 1514bb71..40031bed 100644 --- a/x/alliance/keeper/tests/unbonding_test.go +++ b/x/alliance/keeper/tests/unbonding_test.go @@ -30,7 +30,8 @@ func TestUnbondingMethods(t *testing.T) { RewardWeightRange: types.RewardWeightRange{Min: math.LegacyNewDec(0), Max: math.LegacyNewDec(1)}, IsInitialized: true, } - app.AllianceKeeper.SetAsset(ctx, allianceAsset) + err := app.AllianceKeeper.SetAsset(ctx, allianceAsset) + require.NoError(t, err) // Query staking module unbonding time to assert later on unbondingTime, err := app.StakingKeeper.UnbondingTime(ctx) diff --git a/x/alliance/keeper/unbonding.go b/x/alliance/keeper/unbonding.go index 678eacee..0fcb9c87 100644 --- a/x/alliance/keeper/unbonding.go +++ b/x/alliance/keeper/unbonding.go @@ -30,7 +30,7 @@ func (k Keeper) GetUnbondings( for ; iter.Valid(); iter.Next() { key := iter.Key() // Skip keys that don't have the desired suffix - if bytes.HasSuffix(key, suffix) { + if !bytes.HasSuffix(key, suffix) { continue } diff --git a/x/alliance/tests/e2e/delegate_undelegate_test.go b/x/alliance/tests/e2e/delegate_undelegate_test.go index 27378693..f3cd1e3c 100644 --- a/x/alliance/tests/e2e/delegate_undelegate_test.go +++ b/x/alliance/tests/e2e/delegate_undelegate_test.go @@ -251,11 +251,11 @@ func TestDelegatingASmallAmount(t *testing.T) { require.Equal(t, math.NewInt(100), unbondings[0].Amount) // Query the unbondings in progress - unbondings, err = app.AllianceKeeper.GetUnbondings(ctx, allianceAsset2, user1, val1.GetOperator()) + unbondings2, err := app.AllianceKeeper.GetUnbondings(ctx, allianceAsset2, user1, vals[0]) require.NoError(t, err) - require.Len(t, unbondings, 2) - require.Equal(t, val1.GetOperator(), unbondings[0].ValidatorAddress) - require.Equal(t, math.NewInt(100), unbondings[0].Amount) + require.Len(t, unbondings2, 2) + require.Equal(t, val1.GetOperator(), unbondings2[0].ValidatorAddress) + require.Equal(t, math.NewInt(100), unbondings2[0].Amount) } // This test replicates this issue where there are large amounts of tokens delegated, From 1ec7992d16a81ec056dd99d07f2d93d88c445872 Mon Sep 17 00:00:00 2001 From: emidev98 Date: Wed, 6 Mar 2024 09:18:13 +0200 Subject: [PATCH 6/6] fix: remaining APIs, tests and proto generation --- docs/proto/proto-docs.md | 89 +- x/alliance/keeper/tests/delegation_test.go | 2 - x/alliance/keeper/tests/grpc_query_test.go | 17 - x/alliance/keeper/tests/unbonding_test.go | 9 +- x/alliance/keeper/unbonding.go | 7 +- .../tests/e2e/delegate_undelegate_test.go | 4 +- x/alliance/types/query.pb.go | 1327 ++++++++++++++--- x/alliance/types/query.pb.gw.go | 394 +++-- x/alliance/types/unbonding.pb.go | 104 +- 9 files changed, 1438 insertions(+), 515 deletions(-) diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index 8640ca0f..e0f21b8b 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -54,10 +54,14 @@ - [QueryAllianceDelegationResponse](#alliance.alliance.QueryAllianceDelegationResponse) - [QueryAllianceDelegationRewardsRequest](#alliance.alliance.QueryAllianceDelegationRewardsRequest) - [QueryAllianceDelegationRewardsResponse](#alliance.alliance.QueryAllianceDelegationRewardsResponse) + - [QueryAllianceRedelegationsByDelegatorRequest](#alliance.alliance.QueryAllianceRedelegationsByDelegatorRequest) + - [QueryAllianceRedelegationsByDelegatorResponse](#alliance.alliance.QueryAllianceRedelegationsByDelegatorResponse) - [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest) - [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse) - [QueryAllianceRequest](#alliance.alliance.QueryAllianceRequest) - [QueryAllianceResponse](#alliance.alliance.QueryAllianceResponse) + - [QueryAllianceUnbondingsByDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDelegatorRequest) + - [QueryAllianceUnbondingsByDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDelegatorResponse) - [QueryAllianceUnbondingsByDenomAndDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest) - [QueryAllianceUnbondingsByDenomAndDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorResponse) - [QueryAllianceUnbondingsRequest](#alliance.alliance.QueryAllianceUnbondingsRequest) @@ -136,6 +140,7 @@ | ----- | ---- | ----- | ----------- | | `denom` | [string](#string) | | | | `index` | [string](#string) | | | +| `alliance` | [string](#string) | | | @@ -678,6 +683,7 @@ UnbondingDelegation defines an unbonding object with relevant metadata. | `completion_time` | [google.protobuf.Timestamp](#google.protobuf.Timestamp) | | completion_time is the unix time for unbonding completion. | | `validator_address` | [string](#string) | | validator_address is the bech32-encoded address of the validator. | | `amount` | [string](#string) | | amount defines the tokens to receive at completion. | +| `denom` | [string](#string) | | alliance denom of the unbonding delegation | @@ -813,6 +819,38 @@ AllianceDelegation + + +### QueryAllianceRedelegationsByDelegatorRequest + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `delegator_addr` | [string](#string) | | | +| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | | + + + + + + + + +### QueryAllianceRedelegationsByDelegatorResponse + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `redelegations` | [RedelegationEntry](#alliance.alliance.RedelegationEntry) | repeated | | +| `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) | | | + + + + + + ### QueryAllianceRedelegationsRequest @@ -876,6 +914,37 @@ Alliance + + +### QueryAllianceUnbondingsByDelegatorRequest +AllianceDelegation + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `delegator_addr` | [string](#string) | | | +| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | | + + + + + + + + +### QueryAllianceUnbondingsByDelegatorResponse + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `unbondings` | [UnbondingDelegation](#alliance.alliance.UnbondingDelegation) | repeated | | + + + + + + ### QueryAllianceUnbondingsByDenomAndDelegatorRequest @@ -1161,21 +1230,21 @@ Params | Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | | ----------- | ------------ | ------------- | ------------| ------- | -------- | -| `Params` | [QueryParamsRequest](#alliance.alliance.QueryParamsRequest) | [QueryParamsResponse](#alliance.alliance.QueryParamsResponse) | | GET|/terra/alliances/params| -| `Alliances` | [QueryAlliancesRequest](#alliance.alliance.QueryAlliancesRequest) | [QueryAlliancesResponse](#alliance.alliance.QueryAlliancesResponse) | Query paginated alliances | GET|/terra/alliances| -| `IBCAlliance` | [QueryIBCAllianceRequest](#alliance.alliance.QueryIBCAllianceRequest) | [QueryAllianceResponse](#alliance.alliance.QueryAllianceResponse) | Query a specific alliance by ibc hash @deprecated: this endpoint will be replaced for by the encoded version of the denom e.g.: GET:/terra/alliances/ibc%2Falliance | GET|/terra/alliances/ibc/{hash}| -| `AllAlliancesDelegations` | [QueryAllAlliancesDelegationsRequest](#alliance.alliance.QueryAllAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations | GET|/terra/alliances/delegations| +| `Params` | [QueryParamsRequest](#alliance.alliance.QueryParamsRequest) | [QueryParamsResponse](#alliance.alliance.QueryParamsResponse) | Query Alliance module parameters more info about the params https://docs.alliance.money/tech/parameters | GET|/terra/alliances/params| +| `Alliances` | [QueryAlliancesRequest](#alliance.alliance.QueryAlliancesRequest) | [QueryAlliancesResponse](#alliance.alliance.QueryAlliancesResponse) | Query all alliances with pagination | GET|/terra/alliances| +| `AllAlliancesDelegations` | [QueryAllAlliancesDelegationsRequest](#alliance.alliance.QueryAllAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all alliances delegations with pagination | GET|/terra/alliances/delegations| | `AllianceValidator` | [QueryAllianceValidatorRequest](#alliance.alliance.QueryAllianceValidatorRequest) | [QueryAllianceValidatorResponse](#alliance.alliance.QueryAllianceValidatorResponse) | Query alliance validator | GET|/terra/alliances/validators/{validator_addr}| | `AllAllianceValidators` | [QueryAllAllianceValidatorsRequest](#alliance.alliance.QueryAllAllianceValidatorsRequest) | [QueryAllianceValidatorsResponse](#alliance.alliance.QueryAllianceValidatorsResponse) | Query all paginated alliance validators | GET|/terra/alliances/validators| | `AlliancesDelegation` | [QueryAlliancesDelegationsRequest](#alliance.alliance.QueryAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations for a delegator addr | GET|/terra/alliances/delegations/{delegator_addr}| | `AlliancesDelegationByValidator` | [QueryAlliancesDelegationByValidatorRequest](#alliance.alliance.QueryAlliancesDelegationByValidatorRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations for a delegator addr and validator_addr | GET|/terra/alliances/delegations/{delegator_addr}/{validator_addr}| -| `AllianceDelegation` | [QueryAllianceDelegationRequest](#alliance.alliance.QueryAllianceDelegationRequest) | [QueryAllianceDelegationResponse](#alliance.alliance.QueryAllianceDelegationResponse) | Query a delegation to an alliance by delegator addr, validator_addr and denom | GET|/terra/alliances/delegations/{delegator_addr}/{validator_addr}/{denom}| -| `IBCAllianceDelegation` | [QueryIBCAllianceDelegationRequest](#alliance.alliance.QueryIBCAllianceDelegationRequest) | [QueryAllianceDelegationResponse](#alliance.alliance.QueryAllianceDelegationResponse) | Query a delegation to an alliance by delegator addr, validator_addr and denom @deprecated: this endpoint will be replaced for by the encoded version of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance | GET|/terra/alliances/delegations/{delegator_addr}/{validator_addr}/ibc/{hash}| -| `AllianceDelegationRewards` | [QueryAllianceDelegationRewardsRequest](#alliance.alliance.QueryAllianceDelegationRewardsRequest) | [QueryAllianceDelegationRewardsResponse](#alliance.alliance.QueryAllianceDelegationRewardsResponse) | Query for rewards by delegator addr, validator_addr and denom | GET|/terra/alliances/rewards/{delegator_addr}/{validator_addr}/{denom}| +| `AllianceDelegation` | [QueryAllianceDelegationRequest](#alliance.alliance.QueryAllianceDelegationRequest) | [QueryAllianceDelegationResponse](#alliance.alliance.QueryAllianceDelegationResponse) | Query a specific delegation by delegator addr, validator addr and denom | GET|/terra/alliances/delegations/{delegator_addr}/{validator_addr}/{denom}| +| `AllianceDelegationRewards` | [QueryAllianceDelegationRewardsRequest](#alliance.alliance.QueryAllianceDelegationRewardsRequest) | [QueryAllianceDelegationRewardsResponse](#alliance.alliance.QueryAllianceDelegationRewardsResponse) | Query a specific delegation rewards by delegator addr, validator addr and denom | GET|/terra/alliances/rewards/{delegator_addr}/{validator_addr}/{denom}| | `IBCAllianceDelegationRewards` | [QueryIBCAllianceDelegationRewardsRequest](#alliance.alliance.QueryIBCAllianceDelegationRewardsRequest) | [QueryAllianceDelegationRewardsResponse](#alliance.alliance.QueryAllianceDelegationRewardsResponse) | Query for rewards by delegator addr, validator_addr and denom @deprecated: this endpoint will be replaced for by the encoded version of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance | GET|/terra/alliances/rewards/{delegator_addr}/{validator_addr}/ibc/{hash}| -| `AllianceUnbondingsByDenomAndDelegator` | [QueryAllianceUnbondingsByDenomAndDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest) | [QueryAllianceUnbondingsByDenomAndDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorResponse) | Query for rewards by delegator addr, validator_addr and denom | GET|/terra/alliances/unbondings/{denom}/{delegator_addr}| -| `AllianceUnbondings` | [QueryAllianceUnbondingsRequest](#alliance.alliance.QueryAllianceUnbondingsRequest) | [QueryAllianceUnbondingsResponse](#alliance.alliance.QueryAllianceUnbondingsResponse) | Query for rewards by delegator addr, validator_addr and denom | GET|/terra/alliances/unbondings/{denom}/{delegator_addr}/{validator_addr}| -| `AllianceRedelegations` | [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest) | [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse) | Query redelegations by denom and delegator address | GET|/terra/alliances/redelegations/{denom}/{delegator_addr}| +| `AllianceUnbondingsByDelegator` | [QueryAllianceUnbondingsByDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDelegatorRequest) | [QueryAllianceUnbondingsByDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDelegatorResponse) | Query unbondings by delegator address | GET|/terra/alliances/unbondings/{delegator_addr}| +| `AllianceUnbondingsByDenomAndDelegator` | [QueryAllianceUnbondingsByDenomAndDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest) | [QueryAllianceUnbondingsByDenomAndDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorResponse) | Query unbondings by denom, delegator addr | GET|/terra/alliances/unbondings/{denom}/{delegator_addr}| +| `AllianceUnbondings` | [QueryAllianceUnbondingsRequest](#alliance.alliance.QueryAllianceUnbondingsRequest) | [QueryAllianceUnbondingsResponse](#alliance.alliance.QueryAllianceUnbondingsResponse) | Query unbondings by denom, delegator addr, validator addr | GET|/terra/alliances/unbondings/{denom}/{delegator_addr}/{validator_addr}| +| `AllianceRedelegationsByDelegator` | [QueryAllianceRedelegationsByDelegatorRequest](#alliance.alliance.QueryAllianceRedelegationsByDelegatorRequest) | [QueryAllianceRedelegationsByDelegatorResponse](#alliance.alliance.QueryAllianceRedelegationsByDelegatorResponse) | Query paginated redelegations delegator addr | GET|/terra/alliances/redelegations/{delegator_addr}| +| `AllianceRedelegations` | [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest) | [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse) | Query paginated redelegations by denom and delegator addr | GET|/terra/alliances/redelegations/{denom}/{delegator_addr}| | `Alliance` | [QueryAllianceRequest](#alliance.alliance.QueryAllianceRequest) | [QueryAllianceResponse](#alliance.alliance.QueryAllianceResponse) | Query a specific alliance by denom | GET|/terra/alliances/{denom}| diff --git a/x/alliance/keeper/tests/delegation_test.go b/x/alliance/keeper/tests/delegation_test.go index 8dc60341..6bfa38e6 100644 --- a/x/alliance/keeper/tests/delegation_test.go +++ b/x/alliance/keeper/tests/delegation_test.go @@ -412,8 +412,6 @@ func TestSuccessfulRedelegation(t *testing.T) { }, }, redelegationsRes) - unbondingPeriod, err := app.StakingKeeper.UnbondingTime(ctx) - require.NoError(t, err) require.Equal(t, types.RedelegationEntry{ DelegatorAddress: delAddr1.String(), SrcValidatorAddress: valAddr1.String(), diff --git a/x/alliance/keeper/tests/grpc_query_test.go b/x/alliance/keeper/tests/grpc_query_test.go index f68c1a87..4f8bd107 100644 --- a/x/alliance/keeper/tests/grpc_query_test.go +++ b/x/alliance/keeper/tests/grpc_query_test.go @@ -160,9 +160,6 @@ func TestQueryAnUniqueIBCAlliance(t *testing.T) { alliances, err := queryServer.Alliance(ctx, &types.QueryAllianceRequest{ Denom: "ibc%2Falliance2", }) - alliancesIbcEndpoint, err2 := queryServer.IBCAlliance(ctx, &types.QueryIBCAllianceRequest{ //nolint:staticcheck // SA1019: types.types.QueryIBCAllianceRequest is deprecated - Hash: "alliance2", - }) // THEN: VALIDATE THAT BOTH ALLIANCES HAVE THE CORRECT MODEL WHEN QUERYING require.Nil(t, err) @@ -178,20 +175,6 @@ func TestQueryAnUniqueIBCAlliance(t *testing.T) { RewardChangeInterval: 0, }, }, alliances) - - require.Nil(t, err2) - require.Equal(t, &types.QueryAllianceResponse{ - Alliance: &types.AllianceAsset{ - Denom: "ibc/alliance2", - RewardWeight: sdk.NewDec(10), - RewardWeightRange: types.RewardWeightRange{Min: sdk.NewDec(2), Max: sdk.NewDec(12)}, - TakeRate: sdk.MustNewDecFromStr("0.14159265359"), - TotalTokens: sdk.ZeroInt(), - TotalValidatorShares: sdk.NewDec(0), - RewardChangeRate: sdk.NewDec(0), - RewardChangeInterval: 0, - }, - }, alliancesIbcEndpoint) } func TestQueryAllianceNotFound(t *testing.T) { diff --git a/x/alliance/keeper/tests/unbonding_test.go b/x/alliance/keeper/tests/unbonding_test.go index 40031bed..32904c41 100644 --- a/x/alliance/keeper/tests/unbonding_test.go +++ b/x/alliance/keeper/tests/unbonding_test.go @@ -30,16 +30,13 @@ func TestUnbondingMethods(t *testing.T) { RewardWeightRange: types.RewardWeightRange{Min: math.LegacyNewDec(0), Max: math.LegacyNewDec(1)}, IsInitialized: true, } - err := app.AllianceKeeper.SetAsset(ctx, allianceAsset) - require.NoError(t, err) + app.AllianceKeeper.SetAsset(ctx, allianceAsset) // Query staking module unbonding time to assert later on - unbondingTime, err := app.StakingKeeper.UnbondingTime(ctx) - require.NoError(t, err) + unbondingTime := app.StakingKeeper.UnbondingTime(ctx) // Get the native delegations to have a validator address where to delegate - delegations, err := app.StakingKeeper.GetAllDelegations(ctx) - require.NoError(t, err) + delegations := app.StakingKeeper.GetAllDelegations(ctx) valAddr, err := sdk.ValAddressFromBech32(delegations[0].ValidatorAddress) require.NoError(t, err) diff --git a/x/alliance/keeper/unbonding.go b/x/alliance/keeper/unbonding.go index 0fcb9c87..97abd49a 100644 --- a/x/alliance/keeper/unbonding.go +++ b/x/alliance/keeper/unbonding.go @@ -2,7 +2,6 @@ package keeper import ( "bytes" - "context" sdk "github.com/cosmos/cosmos-sdk/types" @@ -19,11 +18,11 @@ func (k Keeper) GetUnbondings( valAddr sdk.ValAddress, ) (unbondingDelegations []types.UnbondingDelegation, err error) { // Get the store - store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)) + store := ctx.KVStore(k.storeKey) // create the iterator with the correct prefix prefix := types.GetUndelegationsIndexOrderedByValidatorKey(valAddr) // Get the iterator - iter := storetypes.KVStorePrefixIterator(store, prefix) + iter := sdk.KVStorePrefixIterator(store, prefix) defer iter.Close() suffix := types.GetPartialUnbondingKeySuffix(denom, delAddr) @@ -114,7 +113,7 @@ func (k Keeper) CompleteUnbondings(ctx sdk.Context) error { // This method retun all in-progress unbondings for a given delegator address func (k Keeper) GetUnbondingsByDelegator( - ctx context.Context, + ctx sdk.Context, delAddr sdk.AccAddress, ) (unbondingDelegations []types.UnbondingDelegation, err error) { // Get and iterate over all alliances diff --git a/x/alliance/tests/e2e/delegate_undelegate_test.go b/x/alliance/tests/e2e/delegate_undelegate_test.go index f3cd1e3c..6eca657a 100644 --- a/x/alliance/tests/e2e/delegate_undelegate_test.go +++ b/x/alliance/tests/e2e/delegate_undelegate_test.go @@ -247,14 +247,14 @@ func TestDelegatingASmallAmount(t *testing.T) { unbondings, err := app.AllianceKeeper.GetUnbondingsByDenomAndDelegator(ctx, allianceAsset2, user1) require.NoError(t, err) require.Len(t, unbondings, 2) - require.Equal(t, val1.GetOperator(), unbondings[0].ValidatorAddress) + require.Equal(t, val1.GetOperator().String(), unbondings[0].ValidatorAddress) require.Equal(t, math.NewInt(100), unbondings[0].Amount) // Query the unbondings in progress unbondings2, err := app.AllianceKeeper.GetUnbondings(ctx, allianceAsset2, user1, vals[0]) require.NoError(t, err) require.Len(t, unbondings2, 2) - require.Equal(t, val1.GetOperator(), unbondings2[0].ValidatorAddress) + require.Equal(t, val1.GetOperator().String(), unbondings2[0].ValidatorAddress) require.Equal(t, math.NewInt(100), unbondings2[0].Amount) } diff --git a/x/alliance/types/query.pb.go b/x/alliance/types/query.pb.go index 062f37fc..e90cc8ad 100644 --- a/x/alliance/types/query.pb.go +++ b/x/alliance/types/query.pb.go @@ -971,6 +971,90 @@ func (m *QueryAllianceValidatorsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllianceValidatorsResponse proto.InternalMessageInfo +// AllianceDelegation +type QueryAllianceUnbondingsByDelegatorRequest struct { + DelegatorAddr string `protobuf:"bytes,1,opt,name=delegator_addr,json=delegatorAddr,proto3" json:"delegator_addr,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllianceUnbondingsByDelegatorRequest) Reset() { + *m = QueryAllianceUnbondingsByDelegatorRequest{} +} +func (m *QueryAllianceUnbondingsByDelegatorRequest) String() string { + return proto.CompactTextString(m) +} +func (*QueryAllianceUnbondingsByDelegatorRequest) ProtoMessage() {} +func (*QueryAllianceUnbondingsByDelegatorRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_dec650c88028d5e2, []int{22} +} +func (m *QueryAllianceUnbondingsByDelegatorRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllianceUnbondingsByDelegatorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllianceUnbondingsByDelegatorRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryAllianceUnbondingsByDelegatorRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllianceUnbondingsByDelegatorRequest.Merge(m, src) +} +func (m *QueryAllianceUnbondingsByDelegatorRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllianceUnbondingsByDelegatorRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllianceUnbondingsByDelegatorRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllianceUnbondingsByDelegatorRequest proto.InternalMessageInfo + +type QueryAllianceUnbondingsByDelegatorResponse struct { + Unbondings []UnbondingDelegation `protobuf:"bytes,1,rep,name=unbondings,proto3" json:"unbondings"` +} + +func (m *QueryAllianceUnbondingsByDelegatorResponse) Reset() { + *m = QueryAllianceUnbondingsByDelegatorResponse{} +} +func (m *QueryAllianceUnbondingsByDelegatorResponse) String() string { + return proto.CompactTextString(m) +} +func (*QueryAllianceUnbondingsByDelegatorResponse) ProtoMessage() {} +func (*QueryAllianceUnbondingsByDelegatorResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_dec650c88028d5e2, []int{23} +} +func (m *QueryAllianceUnbondingsByDelegatorResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllianceUnbondingsByDelegatorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllianceUnbondingsByDelegatorResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryAllianceUnbondingsByDelegatorResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllianceUnbondingsByDelegatorResponse.Merge(m, src) +} +func (m *QueryAllianceUnbondingsByDelegatorResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllianceUnbondingsByDelegatorResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllianceUnbondingsByDelegatorResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllianceUnbondingsByDelegatorResponse proto.InternalMessageInfo + // AllianceDelegation type QueryAllianceUnbondingsByDenomAndDelegatorRequest struct { Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"` @@ -986,7 +1070,7 @@ func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) String() string { } func (*QueryAllianceUnbondingsByDenomAndDelegatorRequest) ProtoMessage() {} func (*QueryAllianceUnbondingsByDenomAndDelegatorRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dec650c88028d5e2, []int{22} + return fileDescriptor_dec650c88028d5e2, []int{24} } func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1028,7 +1112,7 @@ func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) String() string { } func (*QueryAllianceUnbondingsByDenomAndDelegatorResponse) ProtoMessage() {} func (*QueryAllianceUnbondingsByDenomAndDelegatorResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dec650c88028d5e2, []int{23} + return fileDescriptor_dec650c88028d5e2, []int{25} } func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1068,7 +1152,7 @@ func (m *QueryAllianceUnbondingsRequest) Reset() { *m = QueryAllianceUnb func (m *QueryAllianceUnbondingsRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllianceUnbondingsRequest) ProtoMessage() {} func (*QueryAllianceUnbondingsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dec650c88028d5e2, []int{24} + return fileDescriptor_dec650c88028d5e2, []int{26} } func (m *QueryAllianceUnbondingsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1106,7 +1190,7 @@ func (m *QueryAllianceUnbondingsResponse) Reset() { *m = QueryAllianceUn func (m *QueryAllianceUnbondingsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllianceUnbondingsResponse) ProtoMessage() {} func (*QueryAllianceUnbondingsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dec650c88028d5e2, []int{25} + return fileDescriptor_dec650c88028d5e2, []int{27} } func (m *QueryAllianceUnbondingsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1146,7 +1230,7 @@ func (m *QueryAllianceRedelegationsRequest) Reset() { *m = QueryAlliance func (m *QueryAllianceRedelegationsRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllianceRedelegationsRequest) ProtoMessage() {} func (*QueryAllianceRedelegationsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dec650c88028d5e2, []int{26} + return fileDescriptor_dec650c88028d5e2, []int{28} } func (m *QueryAllianceRedelegationsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1184,7 +1268,7 @@ func (m *QueryAllianceRedelegationsResponse) Reset() { *m = QueryAllianc func (m *QueryAllianceRedelegationsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllianceRedelegationsResponse) ProtoMessage() {} func (*QueryAllianceRedelegationsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dec650c88028d5e2, []int{27} + return fileDescriptor_dec650c88028d5e2, []int{29} } func (m *QueryAllianceRedelegationsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1213,6 +1297,90 @@ func (m *QueryAllianceRedelegationsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllianceRedelegationsResponse proto.InternalMessageInfo +type QueryAllianceRedelegationsByDelegatorRequest struct { + DelegatorAddr string `protobuf:"bytes,1,opt,name=delegator_addr,json=delegatorAddr,proto3" json:"delegator_addr,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllianceRedelegationsByDelegatorRequest) Reset() { + *m = QueryAllianceRedelegationsByDelegatorRequest{} +} +func (m *QueryAllianceRedelegationsByDelegatorRequest) String() string { + return proto.CompactTextString(m) +} +func (*QueryAllianceRedelegationsByDelegatorRequest) ProtoMessage() {} +func (*QueryAllianceRedelegationsByDelegatorRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_dec650c88028d5e2, []int{30} +} +func (m *QueryAllianceRedelegationsByDelegatorRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllianceRedelegationsByDelegatorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllianceRedelegationsByDelegatorRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryAllianceRedelegationsByDelegatorRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllianceRedelegationsByDelegatorRequest.Merge(m, src) +} +func (m *QueryAllianceRedelegationsByDelegatorRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllianceRedelegationsByDelegatorRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllianceRedelegationsByDelegatorRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllianceRedelegationsByDelegatorRequest proto.InternalMessageInfo + +type QueryAllianceRedelegationsByDelegatorResponse struct { + Redelegations []RedelegationEntry `protobuf:"bytes,1,rep,name=redelegations,proto3" json:"redelegations"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllianceRedelegationsByDelegatorResponse) Reset() { + *m = QueryAllianceRedelegationsByDelegatorResponse{} +} +func (m *QueryAllianceRedelegationsByDelegatorResponse) String() string { + return proto.CompactTextString(m) +} +func (*QueryAllianceRedelegationsByDelegatorResponse) ProtoMessage() {} +func (*QueryAllianceRedelegationsByDelegatorResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_dec650c88028d5e2, []int{31} +} +func (m *QueryAllianceRedelegationsByDelegatorResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllianceRedelegationsByDelegatorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllianceRedelegationsByDelegatorResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryAllianceRedelegationsByDelegatorResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllianceRedelegationsByDelegatorResponse.Merge(m, src) +} +func (m *QueryAllianceRedelegationsByDelegatorResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllianceRedelegationsByDelegatorResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllianceRedelegationsByDelegatorResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllianceRedelegationsByDelegatorResponse proto.InternalMessageInfo + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "alliance.alliance.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "alliance.alliance.QueryParamsResponse") @@ -1236,115 +1404,122 @@ func init() { proto.RegisterType((*QueryAllianceDelegationRewardsResponse)(nil), "alliance.alliance.QueryAllianceDelegationRewardsResponse") proto.RegisterType((*QueryAllianceValidatorResponse)(nil), "alliance.alliance.QueryAllianceValidatorResponse") proto.RegisterType((*QueryAllianceValidatorsResponse)(nil), "alliance.alliance.QueryAllianceValidatorsResponse") + proto.RegisterType((*QueryAllianceUnbondingsByDelegatorRequest)(nil), "alliance.alliance.QueryAllianceUnbondingsByDelegatorRequest") + proto.RegisterType((*QueryAllianceUnbondingsByDelegatorResponse)(nil), "alliance.alliance.QueryAllianceUnbondingsByDelegatorResponse") proto.RegisterType((*QueryAllianceUnbondingsByDenomAndDelegatorRequest)(nil), "alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest") proto.RegisterType((*QueryAllianceUnbondingsByDenomAndDelegatorResponse)(nil), "alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorResponse") proto.RegisterType((*QueryAllianceUnbondingsRequest)(nil), "alliance.alliance.QueryAllianceUnbondingsRequest") proto.RegisterType((*QueryAllianceUnbondingsResponse)(nil), "alliance.alliance.QueryAllianceUnbondingsResponse") proto.RegisterType((*QueryAllianceRedelegationsRequest)(nil), "alliance.alliance.QueryAllianceRedelegationsRequest") proto.RegisterType((*QueryAllianceRedelegationsResponse)(nil), "alliance.alliance.QueryAllianceRedelegationsResponse") + proto.RegisterType((*QueryAllianceRedelegationsByDelegatorRequest)(nil), "alliance.alliance.QueryAllianceRedelegationsByDelegatorRequest") + proto.RegisterType((*QueryAllianceRedelegationsByDelegatorResponse)(nil), "alliance.alliance.QueryAllianceRedelegationsByDelegatorResponse") } func init() { proto.RegisterFile("alliance/alliance/query.proto", fileDescriptor_dec650c88028d5e2) } var fileDescriptor_dec650c88028d5e2 = []byte{ - // 1548 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0xd4, 0x56, - 0x10, 0xcf, 0xdb, 0x84, 0xaf, 0x49, 0xa1, 0xf0, 0x48, 0x9a, 0x65, 0x9b, 0x6c, 0x82, 0x61, 0x43, - 0x8a, 0x60, 0x4d, 0x42, 0x80, 0x42, 0xe9, 0x47, 0xc2, 0x06, 0x0a, 0x14, 0x94, 0x2e, 0xa5, 0x95, - 0xb8, 0x44, 0xde, 0xd8, 0xda, 0xac, 0xd8, 0xb5, 0x17, 0xdb, 0x01, 0xb6, 0x28, 0xaa, 0xd4, 0x13, - 0x52, 0x2f, 0x95, 0x7a, 0xa9, 0xda, 0x0b, 0xa7, 0xf6, 0xd2, 0xf6, 0xd0, 0x4b, 0x0f, 0xbd, 0x51, - 0x55, 0xa2, 0x5f, 0x12, 0x52, 0xd5, 0x4f, 0x15, 0x84, 0xa0, 0x07, 0xce, 0xfd, 0x0b, 0xaa, 0x7d, - 0x7e, 0xcf, 0x7e, 0xf6, 0xf3, 0xda, 0xeb, 0x64, 0xb7, 0x2a, 0x27, 0x8c, 0xf7, 0xcd, 0xcc, 0xef, - 0x37, 0x33, 0x6f, 0x3c, 0x33, 0x81, 0x11, 0xa5, 0x5a, 0xad, 0x28, 0xfa, 0xa2, 0x26, 0xbb, 0x0f, - 0x57, 0x96, 0x35, 0xb3, 0x91, 0xaf, 0x9b, 0x86, 0x6d, 0xe0, 0x6d, 0xec, 0x6d, 0x9e, 0x3d, 0x64, - 0x06, 0xca, 0x46, 0xd9, 0x20, 0xbf, 0xca, 0xcd, 0x27, 0xe7, 0x60, 0x66, 0xb8, 0x6c, 0x18, 0xe5, - 0xaa, 0x26, 0x2b, 0xf5, 0x8a, 0xac, 0xe8, 0xba, 0x61, 0x2b, 0x76, 0xc5, 0xd0, 0x2d, 0xfa, 0xeb, - 0xde, 0x45, 0xc3, 0xaa, 0x19, 0x96, 0x5c, 0x52, 0x2c, 0xaa, 0x5f, 0xbe, 0x3a, 0x59, 0xd2, 0x6c, - 0x65, 0x52, 0xae, 0x2b, 0xe5, 0x8a, 0x4e, 0x0e, 0xd3, 0xb3, 0x59, 0x11, 0x51, 0x5d, 0x31, 0x95, - 0x1a, 0xd3, 0x35, 0x26, 0xfe, 0xee, 0x82, 0xa4, 0x1a, 0x78, 0x6b, 0xcc, 0xce, 0xa2, 0x51, 0x61, - 0x16, 0x76, 0x89, 0x1a, 0x54, 0xad, 0xaa, 0x95, 0x7d, 0x90, 0x77, 0x8a, 0x87, 0x96, 0xf5, 0x92, - 0xa1, 0xab, 0x15, 0xbd, 0x4c, 0x8f, 0xe4, 0xc4, 0x23, 0xa6, 0x26, 0x68, 0x92, 0x06, 0x00, 0xbf, - 0xde, 0xa4, 0x3c, 0x4f, 0x58, 0x14, 0xb5, 0x2b, 0xcb, 0x9a, 0x65, 0x4b, 0xe7, 0x61, 0xbb, 0xef, - 0xad, 0x55, 0x37, 0x74, 0x4b, 0xc3, 0x47, 0x60, 0xbd, 0xc3, 0x36, 0x8d, 0xc6, 0xd0, 0x44, 0xff, - 0xd4, 0x8e, 0xbc, 0x10, 0x81, 0xbc, 0x23, 0x32, 0xdb, 0x77, 0xe7, 0xfe, 0x68, 0x4f, 0x91, 0x1e, - 0x97, 0x16, 0x60, 0x90, 0xe8, 0x9b, 0xa1, 0xa7, 0x98, 0x21, 0x7c, 0x12, 0xc0, 0xf3, 0x31, 0xd5, - 0x3a, 0x9e, 0x77, 0x5c, 0x94, 0x6f, 0xba, 0x28, 0xef, 0x04, 0x9c, 0x3a, 0x2a, 0x3f, 0xaf, 0x94, - 0x35, 0x2a, 0x5b, 0xe4, 0x24, 0xa5, 0x4f, 0x11, 0x3c, 0x13, 0xb4, 0x40, 0x41, 0x17, 0x60, 0x13, - 0x03, 0xd7, 0xc4, 0xdd, 0x3b, 0xd1, 0x3f, 0x35, 0x16, 0x82, 0x9b, 0x09, 0xce, 0x58, 0x96, 0x66, - 0x53, 0xf8, 0x9e, 0x20, 0x3e, 0xe5, 0x03, 0x9a, 0x22, 0x40, 0xf7, 0xc4, 0x02, 0x75, 0x20, 0xf8, - 0x90, 0xee, 0x83, 0x01, 0x1f, 0x50, 0xe6, 0x89, 0x01, 0x58, 0xa7, 0x6a, 0xba, 0x51, 0x23, 0x4e, - 0xd8, 0x54, 0x74, 0xfe, 0x23, 0x5d, 0x0c, 0x38, 0xce, 0x65, 0x75, 0x1c, 0x36, 0x32, 0x70, 0xd4, - 0x6d, 0xb1, 0xa4, 0x8a, 0xae, 0x84, 0x34, 0x09, 0x43, 0x44, 0xed, 0xe9, 0xd9, 0x13, 0x41, 0x1c, - 0x18, 0xfa, 0x96, 0x14, 0x6b, 0x89, 0xc2, 0x20, 0xcf, 0xc7, 0x52, 0x69, 0x24, 0xcd, 0xc3, 0x88, - 0x0f, 0xc9, 0x9b, 0x4a, 0xb5, 0xa2, 0x2a, 0xb6, 0x61, 0x32, 0xc1, 0x1c, 0x6c, 0xb9, 0xca, 0xde, - 0x2d, 0x28, 0xaa, 0x6a, 0x52, 0x15, 0x9b, 0xdd, 0xb7, 0x33, 0xaa, 0x6a, 0x1e, 0xdb, 0x78, 0xf3, - 0xd6, 0x68, 0xcf, 0xe3, 0x5b, 0xa3, 0x3d, 0xd2, 0x32, 0xec, 0x64, 0x1a, 0x05, 0xa5, 0x9d, 0x4e, - 0x10, 0xce, 0xec, 0x35, 0xd8, 0x15, 0x34, 0x6b, 0x15, 0xbc, 0x7b, 0xd1, 0x3d, 0xc3, 0x1f, 0x23, - 0x18, 0xf3, 0xe7, 0x68, 0x88, 0xd9, 0x1c, 0x6c, 0xa1, 0x97, 0x34, 0xe0, 0x45, 0xf7, 0x6d, 0xd3, - 0x8b, 0x01, 0x74, 0xa9, 0x0e, 0xa0, 0xfb, 0x11, 0xc1, 0xde, 0x56, 0xe8, 0x66, 0x1b, 0x61, 0xd1, - 0x6e, 0x07, 0xa7, 0x98, 0x14, 0xa9, 0x90, 0xa4, 0x08, 0xd0, 0xe9, 0xed, 0x00, 0x9d, 0x8f, 0x10, - 0x60, 0x8f, 0x80, 0x7b, 0x6d, 0x4e, 0x00, 0x78, 0x35, 0x90, 0x46, 0x75, 0x24, 0xe4, 0xe2, 0x70, - 0xdc, 0x9d, 0x52, 0xc0, 0x89, 0xe1, 0xa3, 0xb0, 0xa1, 0xa4, 0x54, 0xc9, 0xd5, 0x4b, 0xd1, 0x3a, - 0xc8, 0x43, 0x65, 0x20, 0x4f, 0x18, 0x15, 0x26, 0xcd, 0xce, 0x1f, 0xeb, 0x23, 0xe0, 0xbe, 0x46, - 0x5e, 0xea, 0x87, 0x64, 0x02, 0xc5, 0x7a, 0x0e, 0xfa, 0xb9, 0x7a, 0x4d, 0x4b, 0x57, 0x2e, 0x12, - 0x2c, 0x93, 0xa5, 0x66, 0x79, 0xf9, 0xce, 0x55, 0xb0, 0x5f, 0x11, 0x64, 0x7d, 0xe8, 0x79, 0xfb, - 0xdd, 0xc8, 0x0e, 0xb7, 0x34, 0xf6, 0x72, 0xa5, 0x31, 0x90, 0x33, 0x7d, 0x1d, 0xc8, 0x99, 0x3f, - 0x58, 0x58, 0xb8, 0xb2, 0xd8, 0x6d, 0x6e, 0xac, 0xdc, 0xf6, 0x7a, 0xe5, 0xb6, 0x63, 0xcc, 0x80, - 0x31, 0x4b, 0x23, 0x49, 0x87, 0xd1, 0x96, 0x31, 0xa3, 0xf9, 0x76, 0x36, 0xe4, 0x6e, 0x24, 0x4a, - 0x37, 0x4e, 0x5c, 0xba, 0x87, 0x20, 0xd7, 0xd2, 0xe0, 0x35, 0xc5, 0x54, 0xad, 0x27, 0x3b, 0x57, - 0x1e, 0x20, 0x98, 0x88, 0xca, 0x95, 0x2e, 0x52, 0xfc, 0xaf, 0x52, 0xe6, 0x43, 0x04, 0xe3, 0x71, - 0x21, 0xa4, 0xa9, 0xa3, 0xc2, 0x06, 0xd3, 0x79, 0x45, 0xcb, 0x54, 0x44, 0x45, 0x94, 0x9b, 0xb9, - 0xf2, 0xe7, 0xfd, 0xd1, 0x3d, 0xe5, 0x8a, 0xbd, 0xb4, 0x5c, 0xca, 0x2f, 0x1a, 0x35, 0x99, 0xf6, - 0xc4, 0xce, 0x3f, 0xfb, 0x2d, 0xf5, 0xb2, 0x6c, 0x37, 0xea, 0x9a, 0x45, 0x04, 0x8a, 0x4c, 0x35, - 0xe7, 0xfd, 0x6f, 0x52, 0x81, 0x12, 0xc4, 0x7d, 0x9f, 0x28, 0xa4, 0xf6, 0xda, 0x11, 0x7c, 0x09, - 0x86, 0x6c, 0xc3, 0x56, 0xaa, 0x0b, 0x5e, 0xee, 0x2e, 0x58, 0x4b, 0x8a, 0xa9, 0x59, 0xe9, 0x14, - 0x61, 0x32, 0x1c, 0xca, 0xa4, 0xa0, 0x2d, 0x72, 0xe5, 0x7d, 0x90, 0xa8, 0xf0, 0xdc, 0x73, 0x81, - 0x28, 0xc0, 0xe7, 0x60, 0xab, 0x07, 0x81, 0x2a, 0xed, 0x6d, 0x5b, 0xe9, 0xd3, 0xae, 0x2c, 0x55, - 0x37, 0x07, 0x4f, 0x39, 0x50, 0x2d, 0x5b, 0xb9, 0xac, 0xa9, 0xe9, 0xbe, 0xb6, 0x55, 0xf5, 0x13, - 0xb9, 0x0b, 0x44, 0x8c, 0xf3, 0xe2, 0x4f, 0x28, 0x50, 0x14, 0xf8, 0xf6, 0x8b, 0xba, 0xf1, 0x2d, - 0x00, 0x17, 0x07, 0x0b, 0xee, 0x64, 0x48, 0x51, 0x88, 0x8e, 0x06, 0x2b, 0x10, 0x9e, 0xaa, 0x8e, - 0x7d, 0x8e, 0x38, 0x3e, 0xb7, 0x11, 0x4c, 0xfa, 0x70, 0x5c, 0x64, 0x33, 0x91, 0x35, 0xdb, 0x28, - 0x34, 0x0b, 0xc1, 0x8c, 0xae, 0x16, 0xd8, 0x95, 0x8b, 0x6c, 0xbc, 0x43, 0xae, 0x6c, 0x2a, 0xbe, - 0x0f, 0xeb, 0x44, 0xe3, 0xf2, 0x0b, 0x82, 0xa9, 0x24, 0x24, 0x68, 0x9c, 0x5e, 0x03, 0x70, 0x27, - 0x40, 0x16, 0xa7, 0xf1, 0x90, 0x38, 0xb9, 0xda, 0xc4, 0x0e, 0xc7, 0x93, 0xef, 0x46, 0x70, 0x84, - 0xae, 0xc1, 0xe3, 0xd5, 0x91, 0x48, 0x88, 0xf7, 0xbd, 0x37, 0xbe, 0xd3, 0xec, 0xc4, 0x97, 0xe0, - 0x76, 0xf0, 0x16, 0xf1, 0xc4, 0x9e, 0x94, 0xe8, 0x7c, 0x19, 0xec, 0x48, 0x8b, 0xfc, 0xae, 0xe0, - 0x7f, 0x7a, 0x55, 0xbe, 0x43, 0x20, 0x45, 0x81, 0xa6, 0xce, 0x9f, 0x87, 0xcd, 0xbe, 0xcd, 0x07, - 0xf5, 0xff, 0xee, 0x10, 0xff, 0xf3, 0x0a, 0xe6, 0x74, 0xdb, 0x6c, 0x50, 0xef, 0xfb, 0x15, 0x74, - 0x21, 0x00, 0x53, 0x9f, 0x0d, 0xc1, 0x3a, 0xc2, 0x05, 0x5f, 0x87, 0xf5, 0xce, 0x0e, 0x05, 0xe7, - 0x5a, 0xd5, 0x59, 0xdf, 0xb2, 0x26, 0x33, 0x1e, 0x77, 0xcc, 0x31, 0x2c, 0x8d, 0xbe, 0xfb, 0xf3, - 0xdf, 0x1f, 0xa4, 0x76, 0xe0, 0x21, 0xd9, 0xd6, 0x4c, 0x53, 0x71, 0xf7, 0x42, 0x16, 0x5d, 0x61, - 0xe1, 0xb7, 0x61, 0x93, 0x3b, 0x90, 0xe0, 0x89, 0xb8, 0x22, 0xef, 0xda, 0x7f, 0xae, 0x8d, 0x93, - 0x14, 0x42, 0x9a, 0x40, 0xc0, 0x78, 0x6b, 0x10, 0x02, 0x7e, 0x0f, 0x41, 0x3f, 0xd7, 0x4a, 0xe1, - 0xbd, 0xad, 0x94, 0x8a, 0x2b, 0x8b, 0x4c, 0x2c, 0x54, 0xd7, 0xfe, 0x38, 0xb1, 0x3f, 0x82, 0x9f, - 0x15, 0x5c, 0x50, 0x29, 0x2d, 0xca, 0x37, 0x9a, 0xad, 0xd4, 0xca, 0xcd, 0x14, 0xc2, 0x9f, 0x23, - 0x18, 0x6a, 0xb1, 0x1f, 0xc0, 0x87, 0x23, 0xac, 0x45, 0x4c, 0xf6, 0x99, 0xe9, 0x58, 0x37, 0x85, - 0x0c, 0x81, 0xd2, 0x6e, 0x82, 0x38, 0x8b, 0x87, 0x05, 0xc4, 0x7c, 0x42, 0x7e, 0x81, 0x60, 0x9b, - 0xf0, 0xf1, 0xc5, 0x07, 0x12, 0x7c, 0xa7, 0x1d, 0x8c, 0xc9, 0xbf, 0xec, 0xd2, 0x34, 0x01, 0x98, - 0xc7, 0xfb, 0x04, 0x80, 0xde, 0xc7, 0x5e, 0xbe, 0xe1, 0x2f, 0xcd, 0x2b, 0xf8, 0x13, 0x04, 0x83, - 0xa1, 0x7b, 0x1f, 0x3c, 0xdd, 0x86, 0x7b, 0x85, 0x35, 0x51, 0x66, 0xaa, 0x6d, 0xe0, 0x9e, 0x6b, - 0x77, 0xb5, 0x4c, 0x06, 0xae, 0x4d, 0xf9, 0x0a, 0xc1, 0xf6, 0x90, 0x00, 0xe1, 0x83, 0xc9, 0xa2, - 0xb9, 0x96, 0x14, 0x38, 0x44, 0x70, 0xca, 0x78, 0x7f, 0x54, 0x0a, 0xc8, 0x37, 0xfc, 0x35, 0x78, - 0x05, 0xdf, 0x43, 0x90, 0x8d, 0xde, 0xe5, 0xe0, 0x17, 0x13, 0xe0, 0x11, 0x77, 0x40, 0xab, 0xa4, - 0x73, 0x92, 0xd0, 0x79, 0x05, 0xbf, 0x94, 0x88, 0x8e, 0x98, 0x42, 0x3f, 0x20, 0xc0, 0xe2, 0x64, - 0x82, 0x63, 0x53, 0x58, 0x98, 0xe8, 0xe3, 0x93, 0x47, 0x9c, 0x78, 0xa5, 0xf3, 0x84, 0xc5, 0xab, - 0xf8, 0xe4, 0xda, 0x58, 0x34, 0x4f, 0xe8, 0x46, 0x6d, 0x05, 0xff, 0x86, 0x60, 0x30, 0x74, 0x94, - 0x6c, 0x7d, 0x21, 0xa2, 0xb6, 0x14, 0xab, 0xe2, 0xf4, 0x06, 0xe1, 0x74, 0x16, 0x9f, 0x5e, 0x23, - 0x27, 0x7f, 0x2d, 0xfd, 0x0b, 0xc1, 0x8e, 0x96, 0x13, 0x24, 0x7e, 0x3e, 0x09, 0x4e, 0x7e, 0xa8, - 0xce, 0x1c, 0x5d, 0x85, 0x24, 0x25, 0x7a, 0x86, 0x10, 0x2d, 0xe0, 0x59, 0x81, 0x28, 0x1d, 0x35, - 0x13, 0x04, 0xee, 0x31, 0x82, 0xe1, 0xa8, 0x1d, 0x00, 0x7e, 0x21, 0x61, 0xfc, 0x3a, 0x45, 0x72, - 0x9e, 0x90, 0x3c, 0x85, 0xe7, 0xd6, 0x40, 0xd2, 0x1f, 0xc9, 0x7f, 0x10, 0xe4, 0xda, 0x9a, 0x4a, - 0x70, 0x21, 0x0e, 0x76, 0x3b, 0x93, 0x59, 0x66, 0x6e, 0x8d, 0x5a, 0xa8, 0x23, 0x8e, 0x13, 0x47, - 0x1c, 0xc6, 0xd3, 0x82, 0x23, 0xbc, 0x9e, 0x9a, 0x85, 0x53, 0x2c, 0xa3, 0xdf, 0x73, 0x65, 0xc6, - 0xb3, 0x17, 0x5f, 0x66, 0x84, 0xf1, 0x26, 0xfe, 0x4a, 0x8a, 0x83, 0x83, 0x74, 0xae, 0x65, 0x10, - 0xdb, 0xc0, 0x2e, 0xd6, 0xcc, 0x6f, 0x9d, 0xcf, 0xae, 0xd8, 0x2c, 0xe3, 0xe9, 0xf8, 0x1e, 0x4a, - 0x1c, 0x08, 0x32, 0x87, 0x12, 0x4a, 0x51, 0x56, 0x2f, 0x13, 0x56, 0x47, 0xf1, 0x91, 0x90, 0xd4, - 0x0c, 0x94, 0x9a, 0xf0, 0xa0, 0xbc, 0x03, 0x1b, 0xdd, 0x4e, 0x71, 0x4f, 0x3c, 0x86, 0xa4, 0x6d, - 0xe2, 0x18, 0xc1, 0x97, 0xc1, 0x69, 0x01, 0x1f, 0x45, 0x34, 0x7b, 0xe6, 0xce, 0xc3, 0x2c, 0xba, - 0xfb, 0x30, 0x8b, 0x1e, 0x3c, 0xcc, 0xa2, 0xf7, 0x1f, 0x65, 0x7b, 0xee, 0x3e, 0xca, 0xf6, 0xfc, - 0xfe, 0x28, 0xdb, 0x73, 0xe9, 0x00, 0xb7, 0xd6, 0x22, 0xd2, 0xfb, 0x6b, 0x86, 0xae, 0x35, 0xbc, - 0xbf, 0xc2, 0x5e, 0xf7, 0x1e, 0xc9, 0x92, 0xab, 0xb4, 0x9e, 0xfc, 0x25, 0xf6, 0xe0, 0xbf, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x85, 0x79, 0x06, 0xaa, 0xee, 0x1e, 0x00, 0x00, + // 1594 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x6c, 0xd4, 0xd6, + 0x13, 0xcf, 0xdb, 0x84, 0xaf, 0xc9, 0x1f, 0xfe, 0xf0, 0x08, 0xcd, 0xb2, 0x4d, 0x36, 0xc1, 0xb0, + 0x21, 0x20, 0xb2, 0x26, 0x21, 0x40, 0xa1, 0x50, 0x48, 0x48, 0xa0, 0xa5, 0x05, 0xa5, 0x8b, 0x68, + 0x25, 0x2e, 0x91, 0x37, 0xb6, 0x36, 0x2b, 0x76, 0xed, 0x60, 0x3b, 0x40, 0x8a, 0xa2, 0x4a, 0x55, + 0x0f, 0x1c, 0x2b, 0xf5, 0x52, 0xb5, 0x17, 0x0e, 0x55, 0x39, 0xb5, 0x87, 0x5e, 0x7a, 0xe8, 0x8d, + 0xaa, 0x12, 0xfd, 0x92, 0x50, 0xbf, 0xd4, 0x56, 0x05, 0x21, 0xe8, 0x81, 0x73, 0x8f, 0x3d, 0x55, + 0xfb, 0xfc, 0x9e, 0xfd, 0xec, 0xe7, 0xb5, 0xd7, 0x89, 0x17, 0x95, 0x13, 0xc6, 0xfb, 0x66, 0xe6, + 0xf7, 0x9b, 0x99, 0x37, 0x9e, 0x19, 0x05, 0xfa, 0x95, 0x5a, 0xad, 0xaa, 0xe8, 0x73, 0x9a, 0xec, + 0x3e, 0x5c, 0x59, 0xd4, 0xcc, 0xa5, 0xe2, 0x82, 0x69, 0xd8, 0x06, 0xde, 0xc2, 0xde, 0x16, 0xd9, + 0x43, 0xae, 0xa7, 0x62, 0x54, 0x0c, 0xf2, 0xab, 0xdc, 0x78, 0x72, 0x0e, 0xe6, 0xfa, 0x2a, 0x86, + 0x51, 0xa9, 0x69, 0xb2, 0xb2, 0x50, 0x95, 0x15, 0x5d, 0x37, 0x6c, 0xc5, 0xae, 0x1a, 0xba, 0x45, + 0x7f, 0xdd, 0x3b, 0x67, 0x58, 0x75, 0xc3, 0x92, 0xcb, 0x8a, 0x45, 0xf5, 0xcb, 0x57, 0x47, 0xcb, + 0x9a, 0xad, 0x8c, 0xca, 0x0b, 0x4a, 0xa5, 0xaa, 0x93, 0xc3, 0xf4, 0x6c, 0x5e, 0x44, 0xb4, 0xa0, + 0x98, 0x4a, 0x9d, 0xe9, 0x1a, 0x14, 0x7f, 0x77, 0x41, 0x52, 0x0d, 0xbc, 0x35, 0x66, 0x67, 0xce, + 0xa8, 0x32, 0x0b, 0x3b, 0x45, 0x0d, 0xaa, 0x56, 0xd3, 0x2a, 0x3e, 0xc8, 0x3b, 0xc4, 0x43, 0x8b, + 0x7a, 0xd9, 0xd0, 0xd5, 0xaa, 0x5e, 0xa1, 0x47, 0x0a, 0xe2, 0x11, 0x53, 0x13, 0x34, 0x49, 0x3d, + 0x80, 0x5f, 0x6f, 0x50, 0x9e, 0x21, 0x2c, 0x4a, 0xda, 0x95, 0x45, 0xcd, 0xb2, 0xa5, 0xf3, 0xb0, + 0xd5, 0xf7, 0xd6, 0x5a, 0x30, 0x74, 0x4b, 0xc3, 0x87, 0x61, 0xad, 0xc3, 0x36, 0x8b, 0x06, 0xd1, + 0x70, 0xf7, 0xd8, 0xf6, 0xa2, 0x10, 0x81, 0xa2, 0x23, 0x32, 0xd9, 0x75, 0xf7, 0xc1, 0x40, 0x47, + 0x89, 0x1e, 0x97, 0x66, 0x61, 0x1b, 0xd1, 0x37, 0x41, 0x4f, 0x31, 0x43, 0xf8, 0x34, 0x80, 0xe7, + 0x63, 0xaa, 0x75, 0xa8, 0xe8, 0xb8, 0xa8, 0xd8, 0x70, 0x51, 0xd1, 0x09, 0x38, 0x75, 0x54, 0x71, + 0x46, 0xa9, 0x68, 0x54, 0xb6, 0xc4, 0x49, 0x4a, 0xb7, 0x11, 0x3c, 0x17, 0xb4, 0x40, 0x41, 0x4f, + 0xc1, 0x06, 0x06, 0xae, 0x81, 0xbb, 0x73, 0xb8, 0x7b, 0x6c, 0x30, 0x04, 0x37, 0x13, 0x9c, 0xb0, + 0x2c, 0xcd, 0xa6, 0xf0, 0x3d, 0x41, 0x7c, 0xc6, 0x07, 0x34, 0x43, 0x80, 0xee, 0x8e, 0x05, 0xea, + 0x40, 0xf0, 0x21, 0xdd, 0x07, 0x3d, 0x3e, 0xa0, 0xcc, 0x13, 0x3d, 0xb0, 0x46, 0xd5, 0x74, 0xa3, + 0x4e, 0x9c, 0xb0, 0xa1, 0xe4, 0xfc, 0x47, 0xba, 0x18, 0x70, 0x9c, 0xcb, 0xea, 0x18, 0xac, 0x67, + 0xe0, 0xa8, 0xdb, 0x62, 0x49, 0x95, 0x5c, 0x09, 0x69, 0x14, 0x7a, 0x89, 0xda, 0x57, 0x26, 0x4f, + 0x05, 0x71, 0x60, 0xe8, 0x9a, 0x57, 0xac, 0x79, 0x0a, 0x83, 0x3c, 0x1f, 0xcd, 0x64, 0x91, 0x34, + 0x03, 0xfd, 0x3e, 0x24, 0x6f, 0x28, 0xb5, 0xaa, 0xaa, 0xd8, 0x86, 0xc9, 0x04, 0x0b, 0xb0, 0xe9, + 0x2a, 0x7b, 0x37, 0xab, 0xa8, 0xaa, 0x49, 0x55, 0x6c, 0x74, 0xdf, 0x4e, 0xa8, 0xaa, 0x79, 0x74, + 0xfd, 0xcd, 0x5b, 0x03, 0x1d, 0x4f, 0x6e, 0x0d, 0x74, 0x48, 0x8b, 0xb0, 0x83, 0x69, 0x14, 0x94, + 0xa6, 0x9d, 0x20, 0x9c, 0xd9, 0x6b, 0xb0, 0x33, 0x68, 0xd6, 0x9a, 0xf2, 0xee, 0x45, 0xfb, 0x0c, + 0x7f, 0x84, 0x60, 0xd0, 0x9f, 0xa3, 0x21, 0x66, 0x0b, 0xb0, 0x89, 0x5e, 0xd2, 0x80, 0x17, 0xdd, + 0xb7, 0x0d, 0x2f, 0x06, 0xd0, 0x65, 0x52, 0x40, 0xf7, 0x3d, 0x82, 0xbd, 0xcd, 0xd0, 0x4d, 0x2e, + 0x85, 0x45, 0xbb, 0x15, 0x9c, 0x62, 0x52, 0x64, 0x42, 0x92, 0x22, 0x40, 0xa7, 0x33, 0x05, 0x3a, + 0x1f, 0x22, 0xc0, 0x1e, 0x01, 0xf7, 0xda, 0x9c, 0x02, 0xf0, 0x6a, 0x20, 0x8d, 0x6a, 0x7f, 0xc8, + 0xc5, 0xe1, 0xb8, 0x3b, 0xa5, 0x80, 0x13, 0xc3, 0x47, 0x60, 0x5d, 0x59, 0xa9, 0x91, 0xab, 0x97, + 0xa1, 0x75, 0x90, 0x87, 0xca, 0x40, 0x9e, 0x32, 0xaa, 0x4c, 0x9a, 0x9d, 0x3f, 0xda, 0x45, 0xc0, + 0x7d, 0x89, 0xbc, 0xd4, 0x0f, 0xc9, 0x04, 0x8a, 0xf5, 0x1c, 0x74, 0x73, 0xf5, 0x9a, 0x96, 0xae, + 0x42, 0x24, 0x58, 0x26, 0x4b, 0xcd, 0xf2, 0xf2, 0xe9, 0x55, 0xb0, 0x5f, 0x11, 0xe4, 0x7d, 0xe8, + 0x79, 0xfb, 0xed, 0xc8, 0x0e, 0xb7, 0x34, 0x76, 0x72, 0xa5, 0x31, 0x90, 0x33, 0x5d, 0x29, 0xe4, + 0xcc, 0xef, 0x2c, 0x2c, 0x5c, 0x59, 0x6c, 0x37, 0x37, 0x56, 0x6e, 0x3b, 0xbd, 0x72, 0x9b, 0x1a, + 0x33, 0x60, 0xcc, 0xb2, 0x48, 0xd2, 0x61, 0xa0, 0x69, 0xcc, 0x68, 0xbe, 0xbd, 0x1a, 0x72, 0x37, + 0x12, 0xa5, 0x1b, 0x27, 0x2e, 0xdd, 0x47, 0x50, 0x68, 0x6a, 0xf0, 0x9a, 0x62, 0xaa, 0xd6, 0xb3, + 0x9d, 0x2b, 0x0f, 0x11, 0x0c, 0x47, 0xe5, 0x4a, 0x1b, 0x29, 0x3e, 0xad, 0x94, 0xf9, 0x00, 0xc1, + 0x50, 0x5c, 0x08, 0x69, 0xea, 0xa8, 0xb0, 0xce, 0x74, 0x5e, 0xd1, 0x32, 0x15, 0x51, 0x11, 0xe5, + 0x46, 0xae, 0xfc, 0xf1, 0x60, 0x60, 0x77, 0xa5, 0x6a, 0xcf, 0x2f, 0x96, 0x8b, 0x73, 0x46, 0x5d, + 0xa6, 0x3d, 0xb1, 0xf3, 0xcf, 0x88, 0xa5, 0x5e, 0x96, 0xed, 0xa5, 0x05, 0xcd, 0x22, 0x02, 0x25, + 0xa6, 0x9a, 0xf3, 0xfe, 0x57, 0x99, 0x40, 0x09, 0xe2, 0xbe, 0x4f, 0x14, 0x52, 0x6b, 0xed, 0x08, + 0xbe, 0x04, 0xbd, 0xb6, 0x61, 0x2b, 0xb5, 0x59, 0x2f, 0x77, 0x67, 0xad, 0x79, 0xc5, 0xd4, 0xac, + 0x6c, 0x86, 0x30, 0xe9, 0x0b, 0x65, 0x32, 0xa5, 0xcd, 0x71, 0xe5, 0x7d, 0x1b, 0x51, 0xe1, 0xb9, + 0xe7, 0x02, 0x51, 0x80, 0xcf, 0xc1, 0x66, 0x0f, 0x02, 0x55, 0xda, 0xd9, 0xb2, 0xd2, 0xff, 0xbb, + 0xb2, 0x54, 0xdd, 0x34, 0xfc, 0xcf, 0x81, 0x6a, 0xd9, 0xca, 0x65, 0x4d, 0xcd, 0x76, 0xb5, 0xac, + 0xaa, 0x9b, 0xc8, 0x5d, 0x20, 0x62, 0x9c, 0x17, 0x7f, 0x40, 0x81, 0xa2, 0xc0, 0xb7, 0x5f, 0xd4, + 0x8d, 0x6f, 0x02, 0xb8, 0x38, 0x58, 0x70, 0x47, 0x43, 0x8a, 0x42, 0x74, 0x34, 0x58, 0x81, 0xf0, + 0x54, 0xa5, 0xf6, 0x39, 0xe2, 0xf8, 0x7c, 0x8c, 0x60, 0x8f, 0x0f, 0xc7, 0x45, 0x36, 0x13, 0x59, + 0x93, 0x4b, 0x53, 0xec, 0xaa, 0xad, 0xaa, 0xd3, 0x4a, 0xa3, 0x35, 0x79, 0x37, 0xd8, 0x69, 0x35, + 0x81, 0x49, 0x23, 0xf0, 0x1a, 0x80, 0x3b, 0xdb, 0xb1, 0x08, 0x0c, 0x85, 0x44, 0xc0, 0xd5, 0x22, + 0xf6, 0x2e, 0x9e, 0x3c, 0x07, 0xe3, 0x0e, 0x82, 0xd1, 0x08, 0x18, 0xba, 0x51, 0x9f, 0xd0, 0x55, + 0xc1, 0x6b, 0xa1, 0x63, 0x4a, 0x88, 0x2f, 0x33, 0x4f, 0xc7, 0x97, 0xbf, 0x20, 0x18, 0x4b, 0x42, + 0xa2, 0x1d, 0x3e, 0x6d, 0x47, 0x2a, 0x0b, 0x3d, 0x96, 0xc7, 0x2b, 0x95, 0x48, 0x88, 0xd5, 0xb1, + 0x33, 0xbe, 0x2f, 0x4f, 0xe3, 0xbb, 0x79, 0x27, 0x58, 0x73, 0x78, 0x62, 0xcf, 0x4a, 0x74, 0x3e, + 0x0f, 0xf6, 0xef, 0x25, 0x7e, 0xb3, 0xf2, 0x1f, 0xbd, 0x2a, 0xdf, 0x20, 0x90, 0xa2, 0x40, 0x53, + 0xe7, 0xcf, 0xc0, 0x46, 0xdf, 0x9e, 0x88, 0xfa, 0x7f, 0x57, 0x88, 0xff, 0x79, 0x05, 0xd3, 0xba, + 0x6d, 0x2e, 0x51, 0xef, 0xfb, 0x15, 0xb4, 0x23, 0x00, 0xb7, 0x11, 0xec, 0x6b, 0xce, 0x25, 0xad, + 0x62, 0x9f, 0xc6, 0x58, 0xfd, 0x33, 0x82, 0x91, 0x16, 0x91, 0x3e, 0x43, 0x01, 0x18, 0xfb, 0xa7, + 0x17, 0xd6, 0x10, 0x5a, 0xf8, 0x3a, 0xac, 0x75, 0x56, 0x7e, 0xb8, 0xd0, 0xac, 0x2d, 0xf0, 0xed, + 0x16, 0x73, 0x43, 0x71, 0xc7, 0x1c, 0xc3, 0xd2, 0xc0, 0x3b, 0x3f, 0xfd, 0xf5, 0x7e, 0x66, 0x3b, + 0xee, 0x95, 0x6d, 0xcd, 0x34, 0x15, 0x77, 0x8d, 0x69, 0xd1, 0x8d, 0x2b, 0x7e, 0x0b, 0x36, 0xb8, + 0xf3, 0x33, 0x1e, 0x8e, 0xeb, 0x49, 0x5c, 0xfb, 0x7b, 0x5a, 0x38, 0x49, 0x21, 0x64, 0x09, 0x04, + 0x8c, 0x37, 0x07, 0x21, 0xe0, 0x4f, 0x11, 0xf4, 0x36, 0x59, 0x20, 0xe1, 0x43, 0x11, 0x06, 0x22, + 0x56, 0x3f, 0xb9, 0xf1, 0x58, 0x60, 0x21, 0x5b, 0x02, 0x69, 0x17, 0xc1, 0x98, 0xc7, 0x7d, 0x82, + 0x9b, 0xf8, 0x14, 0xf8, 0x0c, 0xc1, 0x16, 0xa1, 0x3b, 0xc3, 0xfb, 0x13, 0x34, 0x72, 0x0e, 0xc6, + 0xe4, 0xad, 0x9f, 0x34, 0x4e, 0x00, 0x16, 0xf1, 0x3e, 0x01, 0xa0, 0xd7, 0x0d, 0xca, 0x37, 0xfc, + 0x5f, 0xa3, 0x65, 0xfc, 0x09, 0x82, 0x6d, 0xa1, 0x8b, 0x41, 0x3c, 0xde, 0x82, 0x7b, 0x85, 0x3d, + 0x62, 0x6e, 0xac, 0x65, 0xe0, 0x9e, 0x6b, 0x77, 0x12, 0xe4, 0xfd, 0xf8, 0xf9, 0x08, 0xe4, 0xf8, + 0x0b, 0x04, 0x5b, 0x43, 0x02, 0x84, 0x0f, 0x24, 0x8b, 0xe6, 0x6a, 0x52, 0xe0, 0x20, 0xc1, 0x29, + 0xe3, 0x91, 0xa8, 0x14, 0x90, 0x6f, 0xf8, 0x0b, 0xe0, 0x32, 0xbe, 0x8f, 0x20, 0x1f, 0xbd, 0xec, + 0xc3, 0xc7, 0x13, 0xe0, 0x11, 0x97, 0x84, 0x2b, 0xa4, 0x73, 0x9a, 0xd0, 0x39, 0x89, 0x5f, 0x4a, + 0x44, 0x47, 0x4c, 0xa1, 0xef, 0x10, 0x60, 0x71, 0x74, 0xc5, 0xb1, 0x29, 0x2c, 0xac, 0x7c, 0xe2, + 0x93, 0x47, 0x5c, 0x89, 0x48, 0xe7, 0x09, 0x8b, 0x97, 0xf1, 0xe9, 0xd5, 0xb1, 0x68, 0x9c, 0xd0, + 0x8d, 0xfa, 0x32, 0xfe, 0x13, 0xc1, 0xf6, 0xa6, 0x83, 0x38, 0x7e, 0x21, 0x09, 0x42, 0x7e, 0x37, + 0x91, 0x3b, 0xb2, 0x02, 0x49, 0x4a, 0xf1, 0x2c, 0xa1, 0x38, 0x85, 0x27, 0x05, 0x8a, 0x74, 0x62, + 0x4f, 0x40, 0xef, 0x09, 0x82, 0xbe, 0xa8, 0x55, 0x0a, 0x7e, 0xb1, 0x19, 0xce, 0x16, 0x16, 0x30, + 0xab, 0x21, 0x39, 0x43, 0x48, 0x9e, 0xc1, 0xd3, 0xab, 0x20, 0x59, 0x2d, 0xcf, 0xc9, 0x37, 0xe6, + 0x15, 0x6b, 0x7e, 0xf9, 0x66, 0x06, 0xe1, 0x1f, 0x11, 0xf4, 0x47, 0x8e, 0x7e, 0xf8, 0x58, 0x1c, + 0xdc, 0xa8, 0xc1, 0x36, 0x77, 0x7c, 0x85, 0xd2, 0xb1, 0xf5, 0xda, 0x6b, 0xaa, 0xc5, 0x62, 0xf2, + 0x37, 0x82, 0x42, 0x4b, 0x33, 0x18, 0x9e, 0x4a, 0x06, 0x2f, 0x7c, 0x0e, 0xcd, 0x4d, 0xaf, 0x52, + 0x0b, 0x25, 0x7b, 0x8c, 0x90, 0x3d, 0x84, 0xc7, 0x63, 0xc8, 0x36, 0x72, 0x54, 0x24, 0xfd, 0x2d, + 0x57, 0x61, 0x3c, 0x7b, 0xf1, 0x15, 0x46, 0x18, 0xe6, 0xe2, 0x2b, 0x8c, 0x38, 0x26, 0x49, 0xe7, + 0x9a, 0x66, 0x66, 0x0b, 0xd8, 0xc5, 0x72, 0xf9, 0x00, 0xc1, 0x60, 0x5c, 0x93, 0x8a, 0x4f, 0xc4, + 0xe1, 0x8c, 0x69, 0xc4, 0x73, 0x27, 0x57, 0xae, 0x80, 0xd2, 0x3e, 0x4c, 0x68, 0x8f, 0x62, 0x39, + 0xe4, 0x42, 0x46, 0x7e, 0xef, 0xbe, 0x76, 0x5a, 0x0a, 0xd1, 0x0a, 0x1e, 0x4f, 0x04, 0x8a, 0x51, + 0x39, 0x98, 0x50, 0x8a, 0xe2, 0x3f, 0x41, 0xf0, 0x1f, 0xc1, 0x87, 0xe3, 0xf1, 0x87, 0x67, 0xdd, + 0xdb, 0xb0, 0x9e, 0x59, 0xc0, 0xbb, 0xe3, 0x31, 0x38, 0x60, 0x87, 0xe3, 0x0f, 0x52, 0x7c, 0x83, + 0x04, 0x5f, 0x0e, 0x67, 0x05, 0x7c, 0x14, 0xd1, 0xe4, 0xd9, 0xbb, 0x8f, 0xf2, 0xe8, 0xde, 0xa3, + 0x3c, 0x7a, 0xf8, 0x28, 0x8f, 0xde, 0x7b, 0x9c, 0xef, 0xb8, 0xf7, 0x38, 0xdf, 0xf1, 0xdb, 0xe3, + 0x7c, 0xc7, 0xa5, 0xfd, 0xdc, 0x4e, 0x97, 0x48, 0x8f, 0xd4, 0x0d, 0x5d, 0x5b, 0xf2, 0xfe, 0x04, + 0xe1, 0xba, 0xf7, 0x48, 0x36, 0xbc, 0xe5, 0xb5, 0xe4, 0xcf, 0x10, 0x0e, 0xfc, 0x1b, 0x00, 0x00, + 0xff, 0xff, 0x64, 0x1a, 0xc2, 0xa1, 0xeb, 0x21, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1359,14 +1534,12 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { + // Query Alliance module parameters more info about the params + // https://docs.alliance.money/tech/parameters Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) - // Query paginated alliances + // Query all alliances with pagination Alliances(ctx context.Context, in *QueryAlliancesRequest, opts ...grpc.CallOption) (*QueryAlliancesResponse, error) - // Query a specific alliance by ibc hash - // @deprecated: this endpoint will be replaced for by the encoded version - // of the denom e.g.: GET:/terra/alliances/ibc%2Falliance - IBCAlliance(ctx context.Context, in *QueryIBCAllianceRequest, opts ...grpc.CallOption) (*QueryAllianceResponse, error) - // Query all paginated alliance delegations + // Query all alliances delegations with pagination AllAlliancesDelegations(ctx context.Context, in *QueryAllAlliancesDelegationsRequest, opts ...grpc.CallOption) (*QueryAlliancesDelegationsResponse, error) // Query alliance validator AllianceValidator(ctx context.Context, in *QueryAllianceValidatorRequest, opts ...grpc.CallOption) (*QueryAllianceValidatorResponse, error) @@ -1376,23 +1549,23 @@ type QueryClient interface { AlliancesDelegation(ctx context.Context, in *QueryAlliancesDelegationsRequest, opts ...grpc.CallOption) (*QueryAlliancesDelegationsResponse, error) // Query all paginated alliance delegations for a delegator addr and validator_addr AlliancesDelegationByValidator(ctx context.Context, in *QueryAlliancesDelegationByValidatorRequest, opts ...grpc.CallOption) (*QueryAlliancesDelegationsResponse, error) - // Query a delegation to an alliance by delegator addr, validator_addr and denom + // Query a specific delegation by delegator addr, validator addr and denom AllianceDelegation(ctx context.Context, in *QueryAllianceDelegationRequest, opts ...grpc.CallOption) (*QueryAllianceDelegationResponse, error) - // Query a delegation to an alliance by delegator addr, validator_addr and denom - // @deprecated: this endpoint will be replaced for by the encoded version - // of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance - IBCAllianceDelegation(ctx context.Context, in *QueryIBCAllianceDelegationRequest, opts ...grpc.CallOption) (*QueryAllianceDelegationResponse, error) - // Query for rewards by delegator addr, validator_addr and denom + // Query a specific delegation rewards by delegator addr, validator addr and denom AllianceDelegationRewards(ctx context.Context, in *QueryAllianceDelegationRewardsRequest, opts ...grpc.CallOption) (*QueryAllianceDelegationRewardsResponse, error) // Query for rewards by delegator addr, validator_addr and denom // @deprecated: this endpoint will be replaced for by the encoded version // of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance IBCAllianceDelegationRewards(ctx context.Context, in *QueryIBCAllianceDelegationRewardsRequest, opts ...grpc.CallOption) (*QueryAllianceDelegationRewardsResponse, error) - // Query for rewards by delegator addr, validator_addr and denom + // Query unbondings by delegator address + AllianceUnbondingsByDelegator(ctx context.Context, in *QueryAllianceUnbondingsByDelegatorRequest, opts ...grpc.CallOption) (*QueryAllianceUnbondingsByDelegatorResponse, error) + // Query unbondings by denom, delegator addr AllianceUnbondingsByDenomAndDelegator(ctx context.Context, in *QueryAllianceUnbondingsByDenomAndDelegatorRequest, opts ...grpc.CallOption) (*QueryAllianceUnbondingsByDenomAndDelegatorResponse, error) - // Query for rewards by delegator addr, validator_addr and denom + // Query unbondings by denom, delegator addr, validator addr AllianceUnbondings(ctx context.Context, in *QueryAllianceUnbondingsRequest, opts ...grpc.CallOption) (*QueryAllianceUnbondingsResponse, error) - // Query redelegations by denom and delegator address + // Query paginated redelegations delegator addr + AllianceRedelegationsByDelegator(ctx context.Context, in *QueryAllianceRedelegationsByDelegatorRequest, opts ...grpc.CallOption) (*QueryAllianceRedelegationsByDelegatorResponse, error) + // Query paginated redelegations by denom and delegator addr AllianceRedelegations(ctx context.Context, in *QueryAllianceRedelegationsRequest, opts ...grpc.CallOption) (*QueryAllianceRedelegationsResponse, error) // Query a specific alliance by denom Alliance(ctx context.Context, in *QueryAllianceRequest, opts ...grpc.CallOption) (*QueryAllianceResponse, error) @@ -1424,16 +1597,6 @@ func (c *queryClient) Alliances(ctx context.Context, in *QueryAlliancesRequest, return out, nil } -// Deprecated: Do not use. -func (c *queryClient) IBCAlliance(ctx context.Context, in *QueryIBCAllianceRequest, opts ...grpc.CallOption) (*QueryAllianceResponse, error) { - out := new(QueryAllianceResponse) - err := c.cc.Invoke(ctx, "/alliance.alliance.Query/IBCAlliance", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *queryClient) AllAlliancesDelegations(ctx context.Context, in *QueryAllAlliancesDelegationsRequest, opts ...grpc.CallOption) (*QueryAlliancesDelegationsResponse, error) { out := new(QueryAlliancesDelegationsResponse) err := c.cc.Invoke(ctx, "/alliance.alliance.Query/AllAlliancesDelegations", in, out, opts...) @@ -1488,16 +1651,6 @@ func (c *queryClient) AllianceDelegation(ctx context.Context, in *QueryAllianceD return out, nil } -// Deprecated: Do not use. -func (c *queryClient) IBCAllianceDelegation(ctx context.Context, in *QueryIBCAllianceDelegationRequest, opts ...grpc.CallOption) (*QueryAllianceDelegationResponse, error) { - out := new(QueryAllianceDelegationResponse) - err := c.cc.Invoke(ctx, "/alliance.alliance.Query/IBCAllianceDelegation", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *queryClient) AllianceDelegationRewards(ctx context.Context, in *QueryAllianceDelegationRewardsRequest, opts ...grpc.CallOption) (*QueryAllianceDelegationRewardsResponse, error) { out := new(QueryAllianceDelegationRewardsResponse) err := c.cc.Invoke(ctx, "/alliance.alliance.Query/AllianceDelegationRewards", in, out, opts...) @@ -1517,6 +1670,15 @@ func (c *queryClient) IBCAllianceDelegationRewards(ctx context.Context, in *Quer return out, nil } +func (c *queryClient) AllianceUnbondingsByDelegator(ctx context.Context, in *QueryAllianceUnbondingsByDelegatorRequest, opts ...grpc.CallOption) (*QueryAllianceUnbondingsByDelegatorResponse, error) { + out := new(QueryAllianceUnbondingsByDelegatorResponse) + err := c.cc.Invoke(ctx, "/alliance.alliance.Query/AllianceUnbondingsByDelegator", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *queryClient) AllianceUnbondingsByDenomAndDelegator(ctx context.Context, in *QueryAllianceUnbondingsByDenomAndDelegatorRequest, opts ...grpc.CallOption) (*QueryAllianceUnbondingsByDenomAndDelegatorResponse, error) { out := new(QueryAllianceUnbondingsByDenomAndDelegatorResponse) err := c.cc.Invoke(ctx, "/alliance.alliance.Query/AllianceUnbondingsByDenomAndDelegator", in, out, opts...) @@ -1535,6 +1697,15 @@ func (c *queryClient) AllianceUnbondings(ctx context.Context, in *QueryAllianceU return out, nil } +func (c *queryClient) AllianceRedelegationsByDelegator(ctx context.Context, in *QueryAllianceRedelegationsByDelegatorRequest, opts ...grpc.CallOption) (*QueryAllianceRedelegationsByDelegatorResponse, error) { + out := new(QueryAllianceRedelegationsByDelegatorResponse) + err := c.cc.Invoke(ctx, "/alliance.alliance.Query/AllianceRedelegationsByDelegator", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *queryClient) AllianceRedelegations(ctx context.Context, in *QueryAllianceRedelegationsRequest, opts ...grpc.CallOption) (*QueryAllianceRedelegationsResponse, error) { out := new(QueryAllianceRedelegationsResponse) err := c.cc.Invoke(ctx, "/alliance.alliance.Query/AllianceRedelegations", in, out, opts...) @@ -1555,14 +1726,12 @@ func (c *queryClient) Alliance(ctx context.Context, in *QueryAllianceRequest, op // QueryServer is the server API for Query service. type QueryServer interface { + // Query Alliance module parameters more info about the params + // https://docs.alliance.money/tech/parameters Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) - // Query paginated alliances + // Query all alliances with pagination Alliances(context.Context, *QueryAlliancesRequest) (*QueryAlliancesResponse, error) - // Query a specific alliance by ibc hash - // @deprecated: this endpoint will be replaced for by the encoded version - // of the denom e.g.: GET:/terra/alliances/ibc%2Falliance - IBCAlliance(context.Context, *QueryIBCAllianceRequest) (*QueryAllianceResponse, error) - // Query all paginated alliance delegations + // Query all alliances delegations with pagination AllAlliancesDelegations(context.Context, *QueryAllAlliancesDelegationsRequest) (*QueryAlliancesDelegationsResponse, error) // Query alliance validator AllianceValidator(context.Context, *QueryAllianceValidatorRequest) (*QueryAllianceValidatorResponse, error) @@ -1572,23 +1741,23 @@ type QueryServer interface { AlliancesDelegation(context.Context, *QueryAlliancesDelegationsRequest) (*QueryAlliancesDelegationsResponse, error) // Query all paginated alliance delegations for a delegator addr and validator_addr AlliancesDelegationByValidator(context.Context, *QueryAlliancesDelegationByValidatorRequest) (*QueryAlliancesDelegationsResponse, error) - // Query a delegation to an alliance by delegator addr, validator_addr and denom + // Query a specific delegation by delegator addr, validator addr and denom AllianceDelegation(context.Context, *QueryAllianceDelegationRequest) (*QueryAllianceDelegationResponse, error) - // Query a delegation to an alliance by delegator addr, validator_addr and denom - // @deprecated: this endpoint will be replaced for by the encoded version - // of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance - IBCAllianceDelegation(context.Context, *QueryIBCAllianceDelegationRequest) (*QueryAllianceDelegationResponse, error) - // Query for rewards by delegator addr, validator_addr and denom + // Query a specific delegation rewards by delegator addr, validator addr and denom AllianceDelegationRewards(context.Context, *QueryAllianceDelegationRewardsRequest) (*QueryAllianceDelegationRewardsResponse, error) // Query for rewards by delegator addr, validator_addr and denom // @deprecated: this endpoint will be replaced for by the encoded version // of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance IBCAllianceDelegationRewards(context.Context, *QueryIBCAllianceDelegationRewardsRequest) (*QueryAllianceDelegationRewardsResponse, error) - // Query for rewards by delegator addr, validator_addr and denom + // Query unbondings by delegator address + AllianceUnbondingsByDelegator(context.Context, *QueryAllianceUnbondingsByDelegatorRequest) (*QueryAllianceUnbondingsByDelegatorResponse, error) + // Query unbondings by denom, delegator addr AllianceUnbondingsByDenomAndDelegator(context.Context, *QueryAllianceUnbondingsByDenomAndDelegatorRequest) (*QueryAllianceUnbondingsByDenomAndDelegatorResponse, error) - // Query for rewards by delegator addr, validator_addr and denom + // Query unbondings by denom, delegator addr, validator addr AllianceUnbondings(context.Context, *QueryAllianceUnbondingsRequest) (*QueryAllianceUnbondingsResponse, error) - // Query redelegations by denom and delegator address + // Query paginated redelegations delegator addr + AllianceRedelegationsByDelegator(context.Context, *QueryAllianceRedelegationsByDelegatorRequest) (*QueryAllianceRedelegationsByDelegatorResponse, error) + // Query paginated redelegations by denom and delegator addr AllianceRedelegations(context.Context, *QueryAllianceRedelegationsRequest) (*QueryAllianceRedelegationsResponse, error) // Query a specific alliance by denom Alliance(context.Context, *QueryAllianceRequest) (*QueryAllianceResponse, error) @@ -1604,9 +1773,6 @@ func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsReq func (*UnimplementedQueryServer) Alliances(ctx context.Context, req *QueryAlliancesRequest) (*QueryAlliancesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Alliances not implemented") } -func (*UnimplementedQueryServer) IBCAlliance(ctx context.Context, req *QueryIBCAllianceRequest) (*QueryAllianceResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method IBCAlliance not implemented") -} func (*UnimplementedQueryServer) AllAlliancesDelegations(ctx context.Context, req *QueryAllAlliancesDelegationsRequest) (*QueryAlliancesDelegationsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllAlliancesDelegations not implemented") } @@ -1625,21 +1791,24 @@ func (*UnimplementedQueryServer) AlliancesDelegationByValidator(ctx context.Cont func (*UnimplementedQueryServer) AllianceDelegation(ctx context.Context, req *QueryAllianceDelegationRequest) (*QueryAllianceDelegationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllianceDelegation not implemented") } -func (*UnimplementedQueryServer) IBCAllianceDelegation(ctx context.Context, req *QueryIBCAllianceDelegationRequest) (*QueryAllianceDelegationResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method IBCAllianceDelegation not implemented") -} func (*UnimplementedQueryServer) AllianceDelegationRewards(ctx context.Context, req *QueryAllianceDelegationRewardsRequest) (*QueryAllianceDelegationRewardsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllianceDelegationRewards not implemented") } func (*UnimplementedQueryServer) IBCAllianceDelegationRewards(ctx context.Context, req *QueryIBCAllianceDelegationRewardsRequest) (*QueryAllianceDelegationRewardsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method IBCAllianceDelegationRewards not implemented") } +func (*UnimplementedQueryServer) AllianceUnbondingsByDelegator(ctx context.Context, req *QueryAllianceUnbondingsByDelegatorRequest) (*QueryAllianceUnbondingsByDelegatorResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllianceUnbondingsByDelegator not implemented") +} func (*UnimplementedQueryServer) AllianceUnbondingsByDenomAndDelegator(ctx context.Context, req *QueryAllianceUnbondingsByDenomAndDelegatorRequest) (*QueryAllianceUnbondingsByDenomAndDelegatorResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllianceUnbondingsByDenomAndDelegator not implemented") } func (*UnimplementedQueryServer) AllianceUnbondings(ctx context.Context, req *QueryAllianceUnbondingsRequest) (*QueryAllianceUnbondingsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllianceUnbondings not implemented") } +func (*UnimplementedQueryServer) AllianceRedelegationsByDelegator(ctx context.Context, req *QueryAllianceRedelegationsByDelegatorRequest) (*QueryAllianceRedelegationsByDelegatorResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AllianceRedelegationsByDelegator not implemented") +} func (*UnimplementedQueryServer) AllianceRedelegations(ctx context.Context, req *QueryAllianceRedelegationsRequest) (*QueryAllianceRedelegationsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllianceRedelegations not implemented") } @@ -1687,24 +1856,6 @@ func _Query_Alliances_Handler(srv interface{}, ctx context.Context, dec func(int return interceptor(ctx, in, info, handler) } -func _Query_IBCAlliance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryIBCAllianceRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).IBCAlliance(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/alliance.alliance.Query/IBCAlliance", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).IBCAlliance(ctx, req.(*QueryIBCAllianceRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Query_AllAlliancesDelegations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllAlliancesDelegationsRequest) if err := dec(in); err != nil { @@ -1813,56 +1964,56 @@ func _Query_AllianceDelegation_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _Query_IBCAllianceDelegation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryIBCAllianceDelegationRequest) +func _Query_AllianceDelegationRewards_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllianceDelegationRewardsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).IBCAllianceDelegation(ctx, in) + return srv.(QueryServer).AllianceDelegationRewards(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/alliance.alliance.Query/IBCAllianceDelegation", + FullMethod: "/alliance.alliance.Query/AllianceDelegationRewards", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).IBCAllianceDelegation(ctx, req.(*QueryIBCAllianceDelegationRequest)) + return srv.(QueryServer).AllianceDelegationRewards(ctx, req.(*QueryAllianceDelegationRewardsRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_AllianceDelegationRewards_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllianceDelegationRewardsRequest) +func _Query_IBCAllianceDelegationRewards_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryIBCAllianceDelegationRewardsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).AllianceDelegationRewards(ctx, in) + return srv.(QueryServer).IBCAllianceDelegationRewards(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/alliance.alliance.Query/AllianceDelegationRewards", + FullMethod: "/alliance.alliance.Query/IBCAllianceDelegationRewards", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).AllianceDelegationRewards(ctx, req.(*QueryAllianceDelegationRewardsRequest)) + return srv.(QueryServer).IBCAllianceDelegationRewards(ctx, req.(*QueryIBCAllianceDelegationRewardsRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_IBCAllianceDelegationRewards_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryIBCAllianceDelegationRewardsRequest) +func _Query_AllianceUnbondingsByDelegator_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllianceUnbondingsByDelegatorRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).IBCAllianceDelegationRewards(ctx, in) + return srv.(QueryServer).AllianceUnbondingsByDelegator(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/alliance.alliance.Query/IBCAllianceDelegationRewards", + FullMethod: "/alliance.alliance.Query/AllianceUnbondingsByDelegator", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).IBCAllianceDelegationRewards(ctx, req.(*QueryIBCAllianceDelegationRewardsRequest)) + return srv.(QueryServer).AllianceUnbondingsByDelegator(ctx, req.(*QueryAllianceUnbondingsByDelegatorRequest)) } return interceptor(ctx, in, info, handler) } @@ -1903,6 +2054,24 @@ func _Query_AllianceUnbondings_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } +func _Query_AllianceRedelegationsByDelegator_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllianceRedelegationsByDelegatorRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).AllianceRedelegationsByDelegator(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/alliance.alliance.Query/AllianceRedelegationsByDelegator", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).AllianceRedelegationsByDelegator(ctx, req.(*QueryAllianceRedelegationsByDelegatorRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Query_AllianceRedelegations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryAllianceRedelegationsRequest) if err := dec(in); err != nil { @@ -1951,10 +2120,6 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "Alliances", Handler: _Query_Alliances_Handler, }, - { - MethodName: "IBCAlliance", - Handler: _Query_IBCAlliance_Handler, - }, { MethodName: "AllAlliancesDelegations", Handler: _Query_AllAlliancesDelegations_Handler, @@ -1979,10 +2144,6 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "AllianceDelegation", Handler: _Query_AllianceDelegation_Handler, }, - { - MethodName: "IBCAllianceDelegation", - Handler: _Query_IBCAllianceDelegation_Handler, - }, { MethodName: "AllianceDelegationRewards", Handler: _Query_AllianceDelegationRewards_Handler, @@ -1991,6 +2152,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "IBCAllianceDelegationRewards", Handler: _Query_IBCAllianceDelegationRewards_Handler, }, + { + MethodName: "AllianceUnbondingsByDelegator", + Handler: _Query_AllianceUnbondingsByDelegator_Handler, + }, { MethodName: "AllianceUnbondingsByDenomAndDelegator", Handler: _Query_AllianceUnbondingsByDenomAndDelegator_Handler, @@ -1999,6 +2164,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "AllianceUnbondings", Handler: _Query_AllianceUnbondings_Handler, }, + { + MethodName: "AllianceRedelegationsByDelegator", + Handler: _Query_AllianceRedelegationsByDelegator_Handler, + }, { MethodName: "AllianceRedelegations", Handler: _Query_AllianceRedelegations_Handler, @@ -2945,7 +3114,7 @@ func (m *QueryAllianceValidatorsResponse) MarshalToSizedBuffer(dAtA []byte) (int return len(dAtA) - i, nil } -func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllianceUnbondingsByDelegatorRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2955,12 +3124,12 @@ func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) Marshal() (dAtA []by return dAtA[:n], nil } -func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllianceUnbondingsByDelegatorRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllianceUnbondingsByDelegatorRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2982,19 +3151,12 @@ func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) MarshalToSizedBuffer copy(dAtA[i:], m.DelegatorAddr) i = encodeVarintQuery(dAtA, i, uint64(len(m.DelegatorAddr))) i-- - dAtA[i] = 0x12 - } - if len(m.Denom) > 0 { - i -= len(m.Denom) - copy(dAtA[i:], m.Denom) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) - i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllianceUnbondingsByDelegatorResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3004,28 +3166,16 @@ func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) Marshal() (dAtA []b return dAtA[:n], nil } -func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllianceUnbondingsByDelegatorResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllianceUnbondingsByDelegatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } if len(m.Unbondings) > 0 { for iNdEx := len(m.Unbondings) - 1; iNdEx >= 0; iNdEx-- { { @@ -3043,7 +3193,7 @@ func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) MarshalToSizedBuffe return len(dAtA) - i, nil } -func (m *QueryAllianceUnbondingsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3053,12 +3203,12 @@ func (m *QueryAllianceUnbondingsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllianceUnbondingsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllianceUnbondingsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3073,13 +3223,6 @@ func (m *QueryAllianceUnbondingsRequest) MarshalToSizedBuffer(dAtA []byte) (int, i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 - } - if len(m.ValidatorAddr) > 0 { - i -= len(m.ValidatorAddr) - copy(dAtA[i:], m.ValidatorAddr) - i = encodeVarintQuery(dAtA, i, uint64(len(m.ValidatorAddr))) - i-- dAtA[i] = 0x1a } if len(m.DelegatorAddr) > 0 { @@ -3099,7 +3242,7 @@ func (m *QueryAllianceUnbondingsRequest) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } -func (m *QueryAllianceUnbondingsResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3109,7 +3252,112 @@ func (m *QueryAllianceUnbondingsResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllianceUnbondingsResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllianceUnbondingsByDenomAndDelegatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.Unbondings) > 0 { + for iNdEx := len(m.Unbondings) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Unbondings[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *QueryAllianceUnbondingsRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryAllianceUnbondingsRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllianceUnbondingsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if len(m.ValidatorAddr) > 0 { + i -= len(m.ValidatorAddr) + copy(dAtA[i:], m.ValidatorAddr) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ValidatorAddr))) + i-- + dAtA[i] = 0x1a + } + if len(m.DelegatorAddr) > 0 { + i -= len(m.DelegatorAddr) + copy(dAtA[i:], m.DelegatorAddr) + i = encodeVarintQuery(dAtA, i, uint64(len(m.DelegatorAddr))) + i-- + dAtA[i] = 0x12 + } + if len(m.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryAllianceUnbondingsResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryAllianceUnbondingsResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } @@ -3246,6 +3494,97 @@ func (m *QueryAllianceRedelegationsResponse) MarshalToSizedBuffer(dAtA []byte) ( return len(dAtA) - i, nil } +func (m *QueryAllianceRedelegationsByDelegatorRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryAllianceRedelegationsByDelegatorRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllianceRedelegationsByDelegatorRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.DelegatorAddr) > 0 { + i -= len(m.DelegatorAddr) + copy(dAtA[i:], m.DelegatorAddr) + i = encodeVarintQuery(dAtA, i, uint64(len(m.DelegatorAddr))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryAllianceRedelegationsByDelegatorResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryAllianceRedelegationsByDelegatorResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllianceRedelegationsByDelegatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.Redelegations) > 0 { + for iNdEx := len(m.Redelegations) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Redelegations[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -3633,6 +3972,38 @@ func (m *QueryAllianceValidatorsResponse) Size() (n int) { return n } +func (m *QueryAllianceUnbondingsByDelegatorRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.DelegatorAddr) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllianceUnbondingsByDelegatorResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Unbondings) > 0 { + for _, e := range m.Unbondings { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) Size() (n int) { if m == nil { return 0 @@ -3757,6 +4128,42 @@ func (m *QueryAllianceRedelegationsResponse) Size() (n int) { return n } +func (m *QueryAllianceRedelegationsByDelegatorRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.DelegatorAddr) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllianceRedelegationsByDelegatorResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Redelegations) > 0 { + for _, e := range m.Redelegations { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -6309,7 +6716,7 @@ func (m *QueryAllianceValidatorsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllianceUnbondingsByDelegatorRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6332,7 +6739,209 @@ func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) Unmarshal(dAtA []byt fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllianceUnbondingsByDenomAndDelegatorRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllianceUnbondingsByDelegatorRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllianceUnbondingsByDelegatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DelegatorAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DelegatorAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllianceUnbondingsByDelegatorResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllianceUnbondingsByDelegatorResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllianceUnbondingsByDelegatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Unbondings", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Unbondings = append(m.Unbondings, UnbondingDelegation{}) + if err := m.Unbondings[len(m.Unbondings)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllianceUnbondingsByDenomAndDelegatorRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllianceUnbondingsByDenomAndDelegatorRequest: wiretype end group for non-group") } if fieldNum <= 0 { return fmt.Errorf("proto: QueryAllianceUnbondingsByDenomAndDelegatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) @@ -7151,6 +7760,244 @@ func (m *QueryAllianceRedelegationsResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryAllianceRedelegationsByDelegatorRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllianceRedelegationsByDelegatorRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllianceRedelegationsByDelegatorRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DelegatorAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DelegatorAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllianceRedelegationsByDelegatorResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllianceRedelegationsByDelegatorResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllianceRedelegationsByDelegatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Redelegations", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Redelegations = append(m.Redelegations, RedelegationEntry{}) + if err := m.Redelegations[len(m.Redelegations)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/alliance/types/query.pb.gw.go b/x/alliance/types/query.pb.gw.go index 88100a89..907330b8 100644 --- a/x/alliance/types/query.pb.gw.go +++ b/x/alliance/types/query.pb.gw.go @@ -87,60 +87,6 @@ func local_request_Query_Alliances_0(ctx context.Context, marshaler runtime.Mars } -func request_Query_IBCAlliance_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryIBCAllianceRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["hash"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") - } - - protoReq.Hash, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) - } - - msg, err := client.IBCAlliance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_IBCAlliance_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryIBCAllianceRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["hash"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") - } - - protoReq.Hash, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) - } - - msg, err := server.IBCAlliance(ctx, &protoReq) - return msg, metadata, err - -} - var ( filter_Query_AllAlliancesDelegations_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) @@ -550,11 +496,11 @@ func local_request_Query_AllianceDelegation_0(ctx context.Context, marshaler run } var ( - filter_Query_IBCAllianceDelegation_0 = &utilities.DoubleArray{Encoding: map[string]int{"delegator_addr": 0, "validator_addr": 1, "hash": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}} + filter_Query_AllianceDelegationRewards_0 = &utilities.DoubleArray{Encoding: map[string]int{"delegator_addr": 0, "validator_addr": 1, "denom": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}} ) -func request_Query_IBCAllianceDelegation_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryIBCAllianceDelegationRequest +func request_Query_AllianceDelegationRewards_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllianceDelegationRewardsRequest var metadata runtime.ServerMetadata var ( @@ -586,31 +532,31 @@ func request_Query_IBCAllianceDelegation_0(ctx context.Context, marshaler runtim return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_addr", err) } - val, ok = pathParams["hash"] + val, ok = pathParams["denom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") } - protoReq.Hash, err = runtime.String(val) + protoReq.Denom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_IBCAllianceDelegation_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllianceDelegationRewards_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.IBCAllianceDelegation(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllianceDelegationRewards(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_IBCAllianceDelegation_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryIBCAllianceDelegationRequest +func local_request_Query_AllianceDelegationRewards_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllianceDelegationRewardsRequest var metadata runtime.ServerMetadata var ( @@ -642,35 +588,35 @@ func local_request_Query_IBCAllianceDelegation_0(ctx context.Context, marshaler return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_addr", err) } - val, ok = pathParams["hash"] + val, ok = pathParams["denom"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") } - protoReq.Hash, err = runtime.String(val) + protoReq.Denom, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_IBCAllianceDelegation_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllianceDelegationRewards_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.IBCAllianceDelegation(ctx, &protoReq) + msg, err := server.AllianceDelegationRewards(ctx, &protoReq) return msg, metadata, err } var ( - filter_Query_AllianceDelegationRewards_0 = &utilities.DoubleArray{Encoding: map[string]int{"delegator_addr": 0, "validator_addr": 1, "denom": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}} + filter_Query_IBCAllianceDelegationRewards_0 = &utilities.DoubleArray{Encoding: map[string]int{"delegator_addr": 0, "validator_addr": 1, "hash": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}} ) -func request_Query_AllianceDelegationRewards_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllianceDelegationRewardsRequest +func request_Query_IBCAllianceDelegationRewards_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryIBCAllianceDelegationRewardsRequest var metadata runtime.ServerMetadata var ( @@ -702,31 +648,31 @@ func request_Query_AllianceDelegationRewards_0(ctx context.Context, marshaler ru return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_addr", err) } - val, ok = pathParams["denom"] + val, ok = pathParams["hash"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") } - protoReq.Denom, err = runtime.String(val) + protoReq.Hash, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllianceDelegationRewards_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_IBCAllianceDelegationRewards_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.AllianceDelegationRewards(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.IBCAllianceDelegationRewards(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_AllianceDelegationRewards_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllianceDelegationRewardsRequest +func local_request_Query_IBCAllianceDelegationRewards_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryIBCAllianceDelegationRewardsRequest var metadata runtime.ServerMetadata var ( @@ -758,35 +704,35 @@ func local_request_Query_AllianceDelegationRewards_0(ctx context.Context, marsha return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_addr", err) } - val, ok = pathParams["denom"] + val, ok = pathParams["hash"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "denom") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") } - protoReq.Denom, err = runtime.String(val) + protoReq.Hash, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "denom", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllianceDelegationRewards_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_IBCAllianceDelegationRewards_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.AllianceDelegationRewards(ctx, &protoReq) + msg, err := server.IBCAllianceDelegationRewards(ctx, &protoReq) return msg, metadata, err } var ( - filter_Query_IBCAllianceDelegationRewards_0 = &utilities.DoubleArray{Encoding: map[string]int{"delegator_addr": 0, "validator_addr": 1, "hash": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}} + filter_Query_AllianceUnbondingsByDelegator_0 = &utilities.DoubleArray{Encoding: map[string]int{"delegator_addr": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) -func request_Query_IBCAllianceDelegationRewards_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryIBCAllianceDelegationRewardsRequest +func request_Query_AllianceUnbondingsByDelegator_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllianceUnbondingsByDelegatorRequest var metadata runtime.ServerMetadata var ( @@ -807,42 +753,20 @@ func request_Query_IBCAllianceDelegationRewards_0(ctx context.Context, marshaler return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "delegator_addr", err) } - val, ok = pathParams["validator_addr"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "validator_addr") - } - - protoReq.ValidatorAddr, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_addr", err) - } - - val, ok = pathParams["hash"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") - } - - protoReq.Hash, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) - } - if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_IBCAllianceDelegationRewards_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllianceUnbondingsByDelegator_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.IBCAllianceDelegationRewards(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.AllianceUnbondingsByDelegator(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_IBCAllianceDelegationRewards_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryIBCAllianceDelegationRewardsRequest +func local_request_Query_AllianceUnbondingsByDelegator_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllianceUnbondingsByDelegatorRequest var metadata runtime.ServerMetadata var ( @@ -863,36 +787,14 @@ func local_request_Query_IBCAllianceDelegationRewards_0(ctx context.Context, mar return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "delegator_addr", err) } - val, ok = pathParams["validator_addr"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "validator_addr") - } - - protoReq.ValidatorAddr, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "validator_addr", err) - } - - val, ok = pathParams["hash"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") - } - - protoReq.Hash, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) - } - if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_IBCAllianceDelegationRewards_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllianceUnbondingsByDelegator_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.IBCAllianceDelegationRewards(ctx, &protoReq) + msg, err := server.AllianceUnbondingsByDelegator(ctx, &protoReq) return msg, metadata, err } @@ -1107,6 +1009,78 @@ func local_request_Query_AllianceUnbondings_0(ctx context.Context, marshaler run } +var ( + filter_Query_AllianceRedelegationsByDelegator_0 = &utilities.DoubleArray{Encoding: map[string]int{"delegator_addr": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_Query_AllianceRedelegationsByDelegator_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllianceRedelegationsByDelegatorRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["delegator_addr"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "delegator_addr") + } + + protoReq.DelegatorAddr, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "delegator_addr", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllianceRedelegationsByDelegator_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.AllianceRedelegationsByDelegator(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_AllianceRedelegationsByDelegator_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllianceRedelegationsByDelegatorRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["delegator_addr"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "delegator_addr") + } + + protoReq.DelegatorAddr, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "delegator_addr", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_AllianceRedelegationsByDelegator_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.AllianceRedelegationsByDelegator(ctx, &protoReq) + return msg, metadata, err + +} + var ( filter_Query_AllianceRedelegations_0 = &utilities.DoubleArray{Encoding: map[string]int{"denom": 0, "delegator_addr": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} ) @@ -1307,29 +1281,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_IBCAlliance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Query_IBCAlliance_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_IBCAlliance_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle("GET", pattern_Query_AllAlliancesDelegations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1468,7 +1419,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_IBCAllianceDelegation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllianceDelegationRewards_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1479,7 +1430,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_IBCAllianceDelegation_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllianceDelegationRewards_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1487,11 +1438,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_IBCAllianceDelegation_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllianceDelegationRewards_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_AllianceDelegationRewards_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_IBCAllianceDelegationRewards_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1502,7 +1453,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_AllianceDelegationRewards_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_IBCAllianceDelegationRewards_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1510,11 +1461,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_AllianceDelegationRewards_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_IBCAllianceDelegationRewards_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_IBCAllianceDelegationRewards_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllianceUnbondingsByDelegator_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -1525,7 +1476,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_IBCAllianceDelegationRewards_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_AllianceUnbondingsByDelegator_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -1533,7 +1484,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_IBCAllianceDelegationRewards_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllianceUnbondingsByDelegator_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1583,6 +1534,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_AllianceRedelegationsByDelegator_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_AllianceRedelegationsByDelegator_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_AllianceRedelegationsByDelegator_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_AllianceRedelegations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1710,26 +1684,6 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_IBCAlliance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Query_IBCAlliance_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_IBCAlliance_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle("GET", pattern_Query_AllAlliancesDelegations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1850,7 +1804,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_IBCAllianceDelegation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllianceDelegationRewards_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1859,18 +1813,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_IBCAllianceDelegation_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllianceDelegationRewards_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_IBCAllianceDelegation_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllianceDelegationRewards_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_AllianceDelegationRewards_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_IBCAllianceDelegationRewards_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1879,18 +1833,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_AllianceDelegationRewards_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_IBCAllianceDelegationRewards_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_AllianceDelegationRewards_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_IBCAllianceDelegationRewards_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_IBCAllianceDelegationRewards_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_AllianceUnbondingsByDelegator_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -1899,14 +1853,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_IBCAllianceDelegationRewards_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_AllianceUnbondingsByDelegator_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_IBCAllianceDelegationRewards_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_AllianceUnbondingsByDelegator_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -1950,6 +1904,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_AllianceRedelegationsByDelegator_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_AllianceRedelegationsByDelegator_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_AllianceRedelegationsByDelegator_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_AllianceRedelegations_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1998,8 +1972,6 @@ var ( pattern_Query_Alliances_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"terra", "alliances"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_IBCAlliance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"terra", "alliances", "ibc", "hash"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_AllAlliancesDelegations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"terra", "alliances", "delegations"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_AllianceValidator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"terra", "alliances", "validators", "validator_addr"}, "", runtime.AssumeColonVerbOpt(false))) @@ -2012,16 +1984,18 @@ var ( pattern_Query_AllianceDelegation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"terra", "alliances", "delegations", "delegator_addr", "validator_addr", "denom"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_IBCAllianceDelegation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"terra", "alliances", "delegations", "delegator_addr", "validator_addr", "ibc", "hash"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_AllianceDelegationRewards_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"terra", "alliances", "rewards", "delegator_addr", "validator_addr", "denom"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_IBCAllianceDelegationRewards_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"terra", "alliances", "rewards", "delegator_addr", "validator_addr", "ibc", "hash"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllianceUnbondingsByDelegator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"terra", "alliances", "unbondings", "delegator_addr"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllianceUnbondingsByDenomAndDelegator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"terra", "alliances", "unbondings", "denom", "delegator_addr"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_AllianceUnbondings_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"terra", "alliances", "unbondings", "denom", "delegator_addr", "validator_addr"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllianceRedelegationsByDelegator_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"terra", "alliances", "redelegations", "delegator_addr"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_AllianceRedelegations_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"terra", "alliances", "redelegations", "denom", "delegator_addr"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_Alliance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"terra", "alliances", "denom"}, "", runtime.AssumeColonVerbOpt(false))) @@ -2032,8 +2006,6 @@ var ( forward_Query_Alliances_0 = runtime.ForwardResponseMessage - forward_Query_IBCAlliance_0 = runtime.ForwardResponseMessage - forward_Query_AllAlliancesDelegations_0 = runtime.ForwardResponseMessage forward_Query_AllianceValidator_0 = runtime.ForwardResponseMessage @@ -2046,16 +2018,18 @@ var ( forward_Query_AllianceDelegation_0 = runtime.ForwardResponseMessage - forward_Query_IBCAllianceDelegation_0 = runtime.ForwardResponseMessage - forward_Query_AllianceDelegationRewards_0 = runtime.ForwardResponseMessage forward_Query_IBCAllianceDelegationRewards_0 = runtime.ForwardResponseMessage + forward_Query_AllianceUnbondingsByDelegator_0 = runtime.ForwardResponseMessage + forward_Query_AllianceUnbondingsByDenomAndDelegator_0 = runtime.ForwardResponseMessage forward_Query_AllianceUnbondings_0 = runtime.ForwardResponseMessage + forward_Query_AllianceRedelegationsByDelegator_0 = runtime.ForwardResponseMessage + forward_Query_AllianceRedelegations_0 = runtime.ForwardResponseMessage forward_Query_Alliance_0 = runtime.ForwardResponseMessage diff --git a/x/alliance/types/unbonding.pb.go b/x/alliance/types/unbonding.pb.go index c4e7808a..fb0f3654 100644 --- a/x/alliance/types/unbonding.pb.go +++ b/x/alliance/types/unbonding.pb.go @@ -38,6 +38,8 @@ type UnbondingDelegation struct { ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // amount defines the tokens to receive at completion. Amount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount"` + // alliance denom of the unbonding delegation + Denom string `protobuf:"bytes,4,opt,name=denom,proto3" json:"denom,omitempty"` } func (m *UnbondingDelegation) Reset() { *m = UnbondingDelegation{} } @@ -87,6 +89,13 @@ func (m *UnbondingDelegation) GetValidatorAddress() string { return "" } +func (m *UnbondingDelegation) GetDenom() string { + if m != nil { + return m.Denom + } + return "" +} + func init() { proto.RegisterType((*UnbondingDelegation)(nil), "alliance.alliance.UnbondingDelegation") } @@ -94,30 +103,31 @@ func init() { func init() { proto.RegisterFile("alliance/alliance/unbonding.proto", fileDescriptor_09730fb8395606a9) } var fileDescriptor_09730fb8395606a9 = []byte{ - // 360 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xb1, 0x4e, 0xeb, 0x30, - 0x14, 0x86, 0xe3, 0xde, 0xab, 0xea, 0xde, 0x5c, 0xe9, 0x42, 0x43, 0x87, 0xd0, 0x21, 0x29, 0x0c, - 0xa8, 0x4b, 0x12, 0x04, 0x1b, 0x62, 0xa1, 0x82, 0xa1, 0x48, 0x2c, 0xa5, 0x2c, 0x2c, 0x95, 0x93, - 0x18, 0x13, 0x91, 0xf8, 0x44, 0xb6, 0x83, 0xe8, 0x13, 0xb0, 0xf6, 0x11, 0x78, 0x88, 0x3e, 0x44, - 0xc7, 0xaa, 0x13, 0x62, 0x28, 0xa8, 0x5d, 0x78, 0x0c, 0x94, 0xc4, 0x69, 0x11, 0x53, 0xfe, 0x93, - 0xef, 0xfc, 0xff, 0xb1, 0x8f, 0xf5, 0x3d, 0x1c, 0xc7, 0x11, 0x66, 0x01, 0xf1, 0xd6, 0x22, 0x63, - 0x3e, 0xb0, 0x30, 0x62, 0xd4, 0x4d, 0x39, 0x48, 0x30, 0x1a, 0x15, 0x71, 0x2b, 0xd1, 0x6a, 0x52, - 0xa0, 0x50, 0x50, 0x2f, 0x57, 0x65, 0x63, 0x6b, 0x37, 0x00, 0x91, 0x80, 0x18, 0x96, 0xa0, 0x2c, - 0x14, 0xb2, 0x28, 0x00, 0x8d, 0x89, 0x57, 0x54, 0x7e, 0x76, 0xe7, 0x85, 0x19, 0xc7, 0x32, 0x02, - 0xa6, 0xb8, 0xfd, 0x93, 0xcb, 0x28, 0x21, 0x42, 0xe2, 0x24, 0x2d, 0x1b, 0xf6, 0x9f, 0x6b, 0xfa, - 0xce, 0x4d, 0x75, 0xb0, 0x73, 0x12, 0x13, 0x5a, 0xd8, 0x8d, 0x2b, 0x7d, 0x2b, 0x80, 0x24, 0x8d, - 0x49, 0x5e, 0x0d, 0x73, 0x97, 0x89, 0xda, 0xa8, 0xf3, 0xef, 0xa8, 0xe5, 0x96, 0x91, 0x6e, 0x15, - 0xe9, 0x0e, 0xaa, 0xc8, 0xee, 0x9f, 0xe9, 0xc2, 0xd6, 0xc6, 0xef, 0x36, 0xea, 0xff, 0xdf, 0x98, - 0x73, 0x6c, 0x5c, 0xe8, 0x8d, 0x47, 0x1c, 0x47, 0x21, 0x96, 0xc0, 0x87, 0x38, 0x0c, 0x39, 0x11, - 0xc2, 0xac, 0xb5, 0x51, 0xe7, 0x6f, 0xd7, 0x9c, 0x4f, 0x9c, 0xa6, 0xba, 0xd4, 0x59, 0x49, 0xae, - 0x25, 0x8f, 0x18, 0xed, 0x6f, 0xaf, 0x2d, 0xea, 0xbf, 0x31, 0xd0, 0xeb, 0x38, 0x81, 0x8c, 0x49, - 0xf3, 0x57, 0xe1, 0x3d, 0xcd, 0x07, 0xbe, 0x2d, 0xec, 0x03, 0x1a, 0xc9, 0xfb, 0xcc, 0x77, 0x03, - 0x48, 0xd4, 0x7e, 0xd4, 0xc7, 0x11, 0xe1, 0x83, 0x27, 0x47, 0x29, 0x11, 0x6e, 0x8f, 0xc9, 0xf9, - 0xc4, 0xd1, 0xd5, 0xa4, 0x1e, 0x93, 0x7d, 0x95, 0x75, 0xf2, 0xfb, 0xf3, 0xc5, 0x46, 0xdd, 0xcb, - 0xe9, 0xd2, 0x42, 0xb3, 0xa5, 0x85, 0x3e, 0x96, 0x16, 0x1a, 0xaf, 0x2c, 0x6d, 0xb6, 0xb2, 0xb4, - 0xd7, 0x95, 0xa5, 0xdd, 0x1e, 0x7e, 0x4b, 0x97, 0x84, 0x73, 0xec, 0x24, 0xc0, 0xc8, 0x68, 0xf3, - 0xb2, 0x4f, 0x1b, 0x59, 0xcc, 0xf2, 0xeb, 0xc5, 0x72, 0x8e, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, - 0x1c, 0xd5, 0x9e, 0x40, 0x06, 0x02, 0x00, 0x00, + // 372 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xc1, 0x4e, 0xab, 0x40, + 0x18, 0x85, 0x99, 0xde, 0xde, 0xe6, 0x5e, 0x6e, 0x72, 0xb5, 0xd8, 0x05, 0x76, 0x01, 0xd5, 0x85, + 0xe9, 0x06, 0x30, 0xba, 0x33, 0x6e, 0x6c, 0x74, 0x51, 0x13, 0x37, 0x58, 0x37, 0x6e, 0x9a, 0x01, + 0xc6, 0x91, 0xc8, 0xcc, 0x4f, 0x60, 0x30, 0xf6, 0x2d, 0xfa, 0x02, 0x26, 0x3e, 0x44, 0x1f, 0xa2, + 0xcb, 0xa6, 0x2b, 0xe3, 0xa2, 0x9a, 0x76, 0xe3, 0x63, 0x18, 0x60, 0x68, 0x8d, 0x2b, 0xce, 0xe1, + 0x9b, 0x73, 0xfe, 0xe1, 0x47, 0xdd, 0xc3, 0x51, 0x14, 0x62, 0xee, 0x13, 0x67, 0x2d, 0x32, 0xee, + 0x01, 0x0f, 0x42, 0x4e, 0xed, 0x38, 0x01, 0x01, 0x5a, 0xb3, 0x22, 0x76, 0x25, 0xda, 0x2d, 0x0a, + 0x14, 0x0a, 0xea, 0xe4, 0xaa, 0x3c, 0xd8, 0xde, 0xf5, 0x21, 0x65, 0x90, 0x0e, 0x4b, 0x50, 0x1a, + 0x89, 0x0c, 0x0a, 0x40, 0x23, 0xe2, 0x14, 0xce, 0xcb, 0xee, 0x9c, 0x20, 0x4b, 0xb0, 0x08, 0x81, + 0x4b, 0x6e, 0xfe, 0xe4, 0x22, 0x64, 0x24, 0x15, 0x98, 0xc5, 0xe5, 0x81, 0xfd, 0xe7, 0x9a, 0xba, + 0x73, 0x53, 0x5d, 0xec, 0x9c, 0x44, 0x84, 0x16, 0x71, 0xed, 0x4a, 0xdd, 0xf2, 0x81, 0xc5, 0x11, + 0xc9, 0xdd, 0x30, 0x4f, 0xe9, 0xa8, 0x83, 0xba, 0xff, 0x8e, 0xda, 0x76, 0x59, 0x69, 0x57, 0x95, + 0xf6, 0xa0, 0xaa, 0xec, 0xfd, 0x99, 0x2e, 0x4c, 0x65, 0xfc, 0x6e, 0x22, 0xf7, 0xff, 0x26, 0x9c, + 0x63, 0xed, 0x42, 0x6d, 0x3e, 0xe2, 0x28, 0x0c, 0xb0, 0x80, 0x64, 0x88, 0x83, 0x20, 0x21, 0x69, + 0xaa, 0xd7, 0x3a, 0xa8, 0xfb, 0xb7, 0xa7, 0xcf, 0x27, 0x56, 0x4b, 0x7e, 0xd4, 0x59, 0x49, 0xae, + 0x45, 0x12, 0x72, 0xea, 0x6e, 0xaf, 0x23, 0xf2, 0xbd, 0x36, 0x50, 0x1b, 0x98, 0x41, 0xc6, 0x85, + 0xfe, 0xab, 0xc8, 0x9e, 0xe6, 0x03, 0xdf, 0x16, 0xe6, 0x01, 0x0d, 0xc5, 0x7d, 0xe6, 0xd9, 0x3e, + 0x30, 0xb9, 0x1f, 0xf9, 0xb0, 0xd2, 0xe0, 0xc1, 0x11, 0xa3, 0x98, 0xa4, 0x76, 0x9f, 0x8b, 0xf9, + 0xc4, 0x52, 0xe5, 0xa4, 0x3e, 0x17, 0xae, 0xec, 0xd2, 0x5a, 0xea, 0xef, 0x80, 0x70, 0x60, 0x7a, + 0x3d, 0x2f, 0x75, 0x4b, 0x73, 0x52, 0xff, 0x7c, 0x31, 0x51, 0xef, 0x72, 0xba, 0x34, 0xd0, 0x6c, + 0x69, 0xa0, 0x8f, 0xa5, 0x81, 0xc6, 0x2b, 0x43, 0x99, 0xad, 0x0c, 0xe5, 0x75, 0x65, 0x28, 0xb7, + 0x87, 0xdf, 0x66, 0x0a, 0x92, 0x24, 0xd8, 0x62, 0xc0, 0xc9, 0x68, 0xf3, 0xbf, 0x9f, 0x36, 0xb2, + 0xb8, 0x81, 0xd7, 0x28, 0x56, 0x76, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0x0a, 0xf8, 0x98, 0x3b, + 0x1c, 0x02, 0x00, 0x00, } func (this *UnbondingDelegation) Equal(that interface{}) bool { @@ -148,6 +158,9 @@ func (this *UnbondingDelegation) Equal(that interface{}) bool { if !this.Amount.Equal(that1.Amount) { return false } + if this.Denom != that1.Denom { + return false + } return true } func (m *UnbondingDelegation) Marshal() (dAtA []byte, err error) { @@ -170,6 +183,13 @@ func (m *UnbondingDelegation) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintUnbonding(dAtA, i, uint64(len(m.Denom))) + i-- + dAtA[i] = 0x22 + } { size := m.Amount.Size() i -= size @@ -223,6 +243,10 @@ func (m *UnbondingDelegation) Size() (n int) { } l = m.Amount.Size() n += 1 + l + sovUnbonding(uint64(l)) + l = len(m.Denom) + if l > 0 { + n += 1 + l + sovUnbonding(uint64(l)) + } return n } @@ -360,6 +384,38 @@ func (m *UnbondingDelegation) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowUnbonding + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthUnbonding + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthUnbonding + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Denom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipUnbonding(dAtA[iNdEx:])