Skip to content

Commit c0e35d6

Browse files
emidev98emidev98
authored
Merge pull request #323 from terra-money/feat/v0.3.x/backports
feat(v0.3.x): backport features from v0.4.x
2 parents a227ea2 + 1ec7992 commit c0e35d6

File tree

13 files changed

+1814
-649
lines changed

13 files changed

+1814
-649
lines changed

‎docs/proto/proto-docs.md‎

Lines changed: 79 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,14 @@
5454
- [QueryAllianceDelegationResponse](#alliance.alliance.QueryAllianceDelegationResponse)
5555
- [QueryAllianceDelegationRewardsRequest](#alliance.alliance.QueryAllianceDelegationRewardsRequest)
5656
- [QueryAllianceDelegationRewardsResponse](#alliance.alliance.QueryAllianceDelegationRewardsResponse)
57+
- [QueryAllianceRedelegationsByDelegatorRequest](#alliance.alliance.QueryAllianceRedelegationsByDelegatorRequest)
58+
- [QueryAllianceRedelegationsByDelegatorResponse](#alliance.alliance.QueryAllianceRedelegationsByDelegatorResponse)
5759
- [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest)
5860
- [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse)
5961
- [QueryAllianceRequest](#alliance.alliance.QueryAllianceRequest)
6062
- [QueryAllianceResponse](#alliance.alliance.QueryAllianceResponse)
63+
- [QueryAllianceUnbondingsByDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDelegatorRequest)
64+
- [QueryAllianceUnbondingsByDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDelegatorResponse)
6165
- [QueryAllianceUnbondingsByDenomAndDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest)
6266
- [QueryAllianceUnbondingsByDenomAndDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorResponse)
6367
- [QueryAllianceUnbondingsRequest](#alliance.alliance.QueryAllianceUnbondingsRequest)
@@ -136,6 +140,7 @@
136140
| ----- | ---- | ----- | ----------- |
137141
| `denom` | [string](#string) | | |
138142
| `index` | [string](#string) | | |
143+
| `alliance` | [string](#string) | | |
139144

140145

141146

@@ -678,6 +683,7 @@ UnbondingDelegation defines an unbonding object with relevant metadata.
678683
| `completion_time` | [google.protobuf.Timestamp](#google.protobuf.Timestamp) | | completion_time is the unix time for unbonding completion. |
679684
| `validator_address` | [string](#string) | | validator_address is the bech32-encoded address of the validator. |
680685
| `amount` | [string](#string) | | amount defines the tokens to receive at completion. |
686+
| `denom` | [string](#string) | | alliance denom of the unbonding delegation |
681687

682688

683689

@@ -813,6 +819,38 @@ AllianceDelegation
813819

814820

815821

822+
<a name="alliance.alliance.QueryAllianceRedelegationsByDelegatorRequest"></a>
823+
824+
### QueryAllianceRedelegationsByDelegatorRequest
825+
826+
827+
828+
| Field | Type | Label | Description |
829+
| ----- | ---- | ----- | ----------- |
830+
| `delegator_addr` | [string](#string) | | |
831+
| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | |
832+
833+
834+
835+
836+
837+
838+
<a name="alliance.alliance.QueryAllianceRedelegationsByDelegatorResponse"></a>
839+
840+
### QueryAllianceRedelegationsByDelegatorResponse
841+
842+
843+
844+
| Field | Type | Label | Description |
845+
| ----- | ---- | ----- | ----------- |
846+
| `redelegations` | [RedelegationEntry](#alliance.alliance.RedelegationEntry) | repeated | |
847+
| `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) | | |
848+
849+
850+
851+
852+
853+
816854
<a name="alliance.alliance.QueryAllianceRedelegationsRequest"></a>
817855

818856
### QueryAllianceRedelegationsRequest
@@ -876,6 +914,37 @@ Alliance
876914

877915

878916

917+
<a name="alliance.alliance.QueryAllianceUnbondingsByDelegatorRequest"></a>
918+
919+
### QueryAllianceUnbondingsByDelegatorRequest
920+
AllianceDelegation
921+
922+
923+
| Field | Type | Label | Description |
924+
| ----- | ---- | ----- | ----------- |
925+
| `delegator_addr` | [string](#string) | | |
926+
| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | |
927+
928+
929+
930+
931+
932+
933+
<a name="alliance.alliance.QueryAllianceUnbondingsByDelegatorResponse"></a>
934+
935+
### QueryAllianceUnbondingsByDelegatorResponse
936+
937+
938+
939+
| Field | Type | Label | Description |
940+
| ----- | ---- | ----- | ----------- |
941+
| `unbondings` | [UnbondingDelegation](#alliance.alliance.UnbondingDelegation) | repeated | |
942+
943+
944+
945+
946+
947+
879948
<a name="alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest"></a>
880949

881950
### QueryAllianceUnbondingsByDenomAndDelegatorRequest
@@ -1161,21 +1230,21 @@ Params
11611230

11621231
| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
11631232
| ----------- | ------------ | ------------- | ------------| ------- | -------- |
1164-
| `Params` | [QueryParamsRequest](#alliance.alliance.QueryParamsRequest) | [QueryParamsResponse](#alliance.alliance.QueryParamsResponse) | | GET|/terra/alliances/params|
1165-
| `Alliances` | [QueryAlliancesRequest](#alliance.alliance.QueryAlliancesRequest) | [QueryAlliancesResponse](#alliance.alliance.QueryAlliancesResponse) | Query paginated alliances | GET|/terra/alliances|
1166-
| `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}|
1167-
| `AllAlliancesDelegations` | [QueryAllAlliancesDelegationsRequest](#alliance.alliance.QueryAllAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations | GET|/terra/alliances/delegations|
1233+
| `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|
1234+
| `Alliances` | [QueryAlliancesRequest](#alliance.alliance.QueryAlliancesRequest) | [QueryAlliancesResponse](#alliance.alliance.QueryAlliancesResponse) | Query all alliances with pagination | GET|/terra/alliances|
1235+
| `AllAlliancesDelegations` | [QueryAllAlliancesDelegationsRequest](#alliance.alliance.QueryAllAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all alliances delegations with pagination | GET|/terra/alliances/delegations|
11681236
| `AllianceValidator` | [QueryAllianceValidatorRequest](#alliance.alliance.QueryAllianceValidatorRequest) | [QueryAllianceValidatorResponse](#alliance.alliance.QueryAllianceValidatorResponse) | Query alliance validator | GET|/terra/alliances/validators/{validator_addr}|
11691237
| `AllAllianceValidators` | [QueryAllAllianceValidatorsRequest](#alliance.alliance.QueryAllAllianceValidatorsRequest) | [QueryAllianceValidatorsResponse](#alliance.alliance.QueryAllianceValidatorsResponse) | Query all paginated alliance validators | GET|/terra/alliances/validators|
11701238
| `AlliancesDelegation` | [QueryAlliancesDelegationsRequest](#alliance.alliance.QueryAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations for a delegator addr | GET|/terra/alliances/delegations/{delegator_addr}|
11711239
| `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}|
1172-
| `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}|
1173-
| `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}|
1174-
| `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}|
1240+
| `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}|
1241+
| `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}|
11751242
| `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}|
1176-
| `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}|
1177-
| `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}|
1178-
| `AllianceRedelegations` | [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest) | [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse) | Query redelegations by denom and delegator address | GET|/terra/alliances/redelegations/{denom}/{delegator_addr}|
1243+
| `AllianceUnbondingsByDelegator` | [QueryAllianceUnbondingsByDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDelegatorRequest) | [QueryAllianceUnbondingsByDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDelegatorResponse) | Query unbondings by delegator address | GET|/terra/alliances/unbondings/{delegator_addr}|
1244+
| `AllianceUnbondingsByDenomAndDelegator` | [QueryAllianceUnbondingsByDenomAndDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest) | [QueryAllianceUnbondingsByDenomAndDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorResponse) | Query unbondings by denom, delegator addr | GET|/terra/alliances/unbondings/{denom}/{delegator_addr}|
1245+
| `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}|
1246+
| `AllianceRedelegationsByDelegator` | [QueryAllianceRedelegationsByDelegatorRequest](#alliance.alliance.QueryAllianceRedelegationsByDelegatorRequest) | [QueryAllianceRedelegationsByDelegatorResponse](#alliance.alliance.QueryAllianceRedelegationsByDelegatorResponse) | Query paginated redelegations delegator addr | GET|/terra/alliances/redelegations/{delegator_addr}|
1247+
| `AllianceRedelegations` | [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest) | [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse) | Query paginated redelegations by denom and delegator addr | GET|/terra/alliances/redelegations/{denom}/{delegator_addr}|
11791248
| `Alliance` | [QueryAllianceRequest](#alliance.alliance.QueryAllianceRequest) | [QueryAllianceResponse](#alliance.alliance.QueryAllianceResponse) | Query a specific alliance by denom | GET|/terra/alliances/{denom}|
11801249

11811250
<!-- end services -->

‎proto/alliance/alliance/query.proto‎

Lines changed: 54 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,19 @@ import "alliance/alliance/redelegations.proto";
1414
option go_package = "github.com/terra-money/alliance/x/alliance/types";
1515

1616
service Query {
17+
18+
// Query Alliance module parameters more info about the params
19+
// https://docs.alliance.money/tech/parameters
1720
rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
1821
option (google.api.http).get = "/terra/alliances/params";
1922
}
2023

21-
// Query paginated alliances
24+
// Query all alliances with pagination
2225
rpc Alliances(QueryAlliancesRequest) returns (QueryAlliancesResponse) {
2326
option (google.api.http).get = "/terra/alliances";
2427
}
2528

26-
// Query a specific alliance by ibc hash
27-
// @deprecated: this endpoint will be replaced for by the encoded version
28-
// of the denom e.g.: GET:/terra/alliances/ibc%2Falliance
29-
rpc IBCAlliance(QueryIBCAllianceRequest) returns (QueryAllianceResponse) {
30-
// Deprecated. Please use the default endpoint
31-
// with the encoded denom e.g from ibc/alliance to ibc%2Falliance
32-
option deprecated = true;
33-
option (google.api.http).get = "/terra/alliances/ibc/{hash}";
34-
}
35-
36-
// Query all paginated alliance delegations
29+
// Query all alliances delegations with pagination
3730
rpc AllAlliancesDelegations(QueryAllAlliancesDelegationsRequest) returns (QueryAlliancesDelegationsResponse) {
3831
option (google.api.http).get = "/terra/alliances/delegations";
3932
}
@@ -58,22 +51,12 @@ service Query {
5851
option (google.api.http).get = "/terra/alliances/delegations/{delegator_addr}/{validator_addr}";
5952
}
6053

61-
// Query a delegation to an alliance by delegator addr, validator_addr and denom
54+
// Query a specific delegation by delegator addr, validator addr and denom
6255
rpc AllianceDelegation(QueryAllianceDelegationRequest) returns (QueryAllianceDelegationResponse) {
6356
option (google.api.http).get = "/terra/alliances/delegations/{delegator_addr}/{validator_addr}/{denom}";
6457
}
6558

66-
// Query a delegation to an alliance by delegator addr, validator_addr and denom
67-
// @deprecated: this endpoint will be replaced for by the encoded version
68-
// of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance
69-
rpc IBCAllianceDelegation(QueryIBCAllianceDelegationRequest) returns (QueryAllianceDelegationResponse) {
70-
// Deprecated. Please use the default endpoint
71-
// with the encoded denom e.g from ibc/alliance to ibc%2Falliance
72-
option deprecated = true;
73-
option (google.api.http).get = "/terra/alliances/delegations/{delegator_addr}/{validator_addr}/ibc/{hash}";
74-
}
75-
76-
// Query for rewards by delegator addr, validator_addr and denom
59+
// Query a specific delegation rewards by delegator addr, validator addr and denom
7760
rpc AllianceDelegationRewards(QueryAllianceDelegationRewardsRequest) returns (QueryAllianceDelegationRewardsResponse) {
7861
option (google.api.http).get = "/terra/alliances/rewards/{delegator_addr}/{validator_addr}/{denom}";
7962
}
@@ -87,17 +70,27 @@ service Query {
8770
option (google.api.http).get = "/terra/alliances/rewards/{delegator_addr}/{validator_addr}/ibc/{hash}";
8871
}
8972

90-
// Query for rewards by delegator addr, validator_addr and denom
73+
// Query unbondings by delegator address
74+
rpc AllianceUnbondingsByDelegator(QueryAllianceUnbondingsByDelegatorRequest) returns (QueryAllianceUnbondingsByDelegatorResponse) {
75+
option (google.api.http).get = "/terra/alliances/unbondings/{delegator_addr}";
76+
}
77+
78+
// Query unbondings by denom, delegator addr
9179
rpc AllianceUnbondingsByDenomAndDelegator(QueryAllianceUnbondingsByDenomAndDelegatorRequest) returns (QueryAllianceUnbondingsByDenomAndDelegatorResponse) {
9280
option (google.api.http).get = "/terra/alliances/unbondings/{denom}/{delegator_addr}";
9381
}
9482

95-
// Query for rewards by delegator addr, validator_addr and denom
83+
// Query unbondings by denom, delegator addr, validator addr
9684
rpc AllianceUnbondings(QueryAllianceUnbondingsRequest) returns (QueryAllianceUnbondingsResponse) {
9785
option (google.api.http).get = "/terra/alliances/unbondings/{denom}/{delegator_addr}/{validator_addr}";
9886
}
9987

100-
// Query redelegations by denom and delegator address
88+
// Query paginated redelegations delegator addr
89+
rpc AllianceRedelegationsByDelegator(QueryAllianceRedelegationsByDelegatorRequest) returns (QueryAllianceRedelegationsByDelegatorResponse) {
90+
option (google.api.http).get = "/terra/alliances/redelegations/{delegator_addr}";
91+
}
92+
93+
// Query paginated redelegations by denom and delegator addr
10194
rpc AllianceRedelegations(QueryAllianceRedelegationsRequest) returns (QueryAllianceRedelegationsResponse) {
10295
option (google.api.http).get = "/terra/alliances/redelegations/{denom}/{delegator_addr}";
10396
}
@@ -284,6 +277,23 @@ message QueryAllianceValidatorsResponse {
284277
cosmos.base.query.v1beta1.PageResponse pagination = 2;
285278
}
286279

280+
// AllianceDelegation
281+
message QueryAllianceUnbondingsByDelegatorRequest {
282+
option (gogoproto.equal) = false;
283+
option (gogoproto.goproto_getters) = false;
284+
285+
string delegator_addr = 1;
286+
cosmos.base.query.v1beta1.PageRequest pagination = 3;
287+
}
288+
289+
message QueryAllianceUnbondingsByDelegatorResponse {
290+
option (gogoproto.equal) = false;
291+
option (gogoproto.goproto_getters) = false;
292+
293+
repeated UnbondingDelegation unbondings = 1 [(gogoproto.nullable) = false];
294+
}
295+
296+
287297
// AllianceDelegation
288298
message QueryAllianceUnbondingsByDenomAndDelegatorRequest {
289299
option (gogoproto.equal) = false;
@@ -334,6 +344,23 @@ message QueryAllianceRedelegationsResponse {
334344
option (gogoproto.equal) = false;
335345
option (gogoproto.goproto_getters) = false;
336346

347+
repeated RedelegationEntry redelegations = 1 [(gogoproto.nullable) = false];
348+
cosmos.base.query.v1beta1.PageResponse pagination = 2;
349+
}
350+
351+
352+
message QueryAllianceRedelegationsByDelegatorRequest {
353+
option (gogoproto.equal) = false;
354+
option (gogoproto.goproto_getters) = false;
355+
356+
string delegator_addr = 1;
357+
cosmos.base.query.v1beta1.PageRequest pagination = 2;
358+
}
359+
360+
message QueryAllianceRedelegationsByDelegatorResponse {
361+
option (gogoproto.equal) = false;
362+
option (gogoproto.goproto_getters) = false;
363+
337364
repeated RedelegationEntry redelegations = 1 [(gogoproto.nullable) = false];
338365
cosmos.base.query.v1beta1.PageResponse pagination = 2;
339366
}

‎proto/alliance/alliance/unbonding.proto‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ message UnbondingDelegation {
2222
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
2323
(gogoproto.nullable) = false
2424
];
25+
// alliance denom of the unbonding delegation
26+
string denom = 4;
2527
}

0 commit comments

Comments
 (0)