Skip to content

Commit 2128958

Browse files
committed
[CP-535] synced proto definitions with latest changes for v1.17
1 parent 349f4f2 commit 2128958

File tree

9 files changed

+521
-999
lines changed

9 files changed

+521
-999
lines changed

chain/exchange/types/expected_keepers.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ type DistributionKeeper interface {
6767
type StakingKeeper interface {
6868
GetDelegatorDelegations(ctx context.Context, delegator sdk.AccAddress, maxRetrieve uint16) (delegations []stakingtypes.Delegation, err error)
6969
Validator(context.Context, sdk.ValAddress) (stakingtypes.ValidatorI, error) // get a particular validator by operator address
70-
SetDelegationTransferReceiver(ctx context.Context, receiver sdk.AccAddress)
7170
}
7271

7372
type WasmViewKeeper interface {

chain/exchange/types/v2/exchange.pb.go

Lines changed: 188 additions & 233 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

chain/exchange/types/v2/msgs.go

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ func (msg *MsgUpdateDerivativeMarket) ValidateBasic() error {
261261
}
262262
}
263263

264+
264265
if msg.HasInitialMarginRatioUpdate() && msg.HasMaintenanceMarginRatioUpdate() {
265266
if msg.NewInitialMarginRatio.LTE(msg.NewMaintenanceMarginRatio) {
266267
return types.ErrMarginsRelation
@@ -2606,35 +2607,3 @@ func hasDuplicatesOrder(slice []*OrderData) bool {
26062607
}
26072608
return false
26082609
}
2609-
2610-
func (msg *MsgSetDelegationTransferReceivers) Route() string { return RouterKey }
2611-
func (msg *MsgSetDelegationTransferReceivers) Type() string { return "setDelegationTransferReceivers" }
2612-
func (msg *MsgSetDelegationTransferReceivers) ValidateBasic() error {
2613-
if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil {
2614-
return errors.Wrap(sdkerrors.ErrInvalidAddress, msg.Sender)
2615-
}
2616-
2617-
if len(msg.Receivers) == 0 {
2618-
return errors.Wrap(sdkerrors.ErrInvalidRequest, "receivers list cannot be empty")
2619-
}
2620-
2621-
for _, receiver := range msg.Receivers {
2622-
if _, err := sdk.AccAddressFromBech32(receiver); err != nil {
2623-
return errors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address: %s", receiver)
2624-
}
2625-
}
2626-
2627-
return nil
2628-
}
2629-
2630-
func (msg *MsgSetDelegationTransferReceivers) GetSignBytes() []byte {
2631-
bz, _ := json.Marshal(msg)
2632-
return sdk.MustSortJSON(bz)
2633-
}
2634-
2635-
func (msg *MsgSetDelegationTransferReceivers) GetSigners() []sdk.AccAddress {
2636-
sender, _ := sdk.AccAddressFromBech32(msg.Sender)
2637-
return []sdk.AccAddress{sender}
2638-
}
2639-
2640-
var _ sdk.Msg = &MsgSetDelegationTransferReceivers{}

chain/exchange/types/v2/tx.pb.go

Lines changed: 319 additions & 697 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/chain/chain_test_support.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,12 +383,12 @@ func (c *MockChainClientV2) FetchAggregateMarketVolumes(ctx context.Context, mar
383383
return &exchangev2types.QueryAggregateMarketVolumesResponse{}, nil
384384
}
385385

386-
func (c *MockChainClientV2) FetchDenomDecimal(ctx context.Context, denom string) (*exchangev2types.QueryDenomDecimalResponse, error) {
387-
return &exchangev2types.QueryDenomDecimalResponse{}, nil
386+
func (c *MockChainClientV2) FetchDenomDecimal(ctx context.Context, denom string) (*exchangev2types.QueryAuctionExchangeTransferDenomDecimalResponse, error) {
387+
return &exchangev2types.QueryAuctionExchangeTransferDenomDecimalResponse{}, nil
388388
}
389389

390-
func (c *MockChainClientV2) FetchDenomDecimals(ctx context.Context, denoms []string) (*exchangev2types.QueryDenomDecimalsResponse, error) {
391-
return &exchangev2types.QueryDenomDecimalsResponse{}, nil
390+
func (c *MockChainClientV2) FetchDenomDecimals(ctx context.Context, denoms []string) (*exchangev2types.QueryAuctionExchangeTransferDenomDecimalsResponse, error) {
391+
return &exchangev2types.QueryAuctionExchangeTransferDenomDecimalsResponse{}, nil
392392
}
393393

394394
func (c *MockChainClientV2) FetchChainSpotMarkets(ctx context.Context, status string, marketIDs []string) (*exchangev2types.QuerySpotMarketsResponse, error) {

client/chain/chain_v2.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ type ChainClientV2 interface {
161161
FetchAggregateVolumes(ctx context.Context, accounts []string, marketIDs []string) (*exchangev2types.QueryAggregateVolumesResponse, error)
162162
FetchAggregateMarketVolume(ctx context.Context, marketId string) (*exchangev2types.QueryAggregateMarketVolumeResponse, error)
163163
FetchAggregateMarketVolumes(ctx context.Context, marketIDs []string) (*exchangev2types.QueryAggregateMarketVolumesResponse, error)
164-
FetchDenomDecimal(ctx context.Context, denom string) (*exchangev2types.QueryDenomDecimalResponse, error)
165-
FetchDenomDecimals(ctx context.Context, denoms []string) (*exchangev2types.QueryDenomDecimalsResponse, error)
164+
FetchDenomDecimal(ctx context.Context, denom string) (*exchangev2types.QueryAuctionExchangeTransferDenomDecimalResponse, error)
165+
FetchDenomDecimals(ctx context.Context, denoms []string) (*exchangev2types.QueryAuctionExchangeTransferDenomDecimalsResponse, error)
166166
FetchChainSpotMarkets(ctx context.Context, status string, marketIDs []string) (*exchangev2types.QuerySpotMarketsResponse, error)
167167
FetchChainSpotMarket(ctx context.Context, marketId string) (*exchangev2types.QuerySpotMarketResponse, error)
168168
FetchChainFullSpotMarkets(ctx context.Context, status string, marketIDs []string, withMidPriceAndTob bool) (*exchangev2types.QueryFullSpotMarketsResponse, error)
@@ -1463,20 +1463,20 @@ func (c *chainClientV2) FetchAggregateMarketVolumes(ctx context.Context, marketI
14631463
return res, err
14641464
}
14651465

1466-
func (c *chainClientV2) FetchDenomDecimal(ctx context.Context, denom string) (*exchangev2types.QueryDenomDecimalResponse, error) {
1467-
req := &exchangev2types.QueryDenomDecimalRequest{
1466+
func (c *chainClientV2) FetchDenomDecimal(ctx context.Context, denom string) (*exchangev2types.QueryAuctionExchangeTransferDenomDecimalResponse, error) {
1467+
req := &exchangev2types.QueryAuctionExchangeTransferDenomDecimalRequest{
14681468
Denom: denom,
14691469
}
1470-
res, err := common.ExecuteCall(ctx, c.network.ChainCookieAssistant, c.exchangeV2QueryClient.DenomDecimal, req)
1470+
res, err := common.ExecuteCall(ctx, c.network.ChainCookieAssistant, c.exchangeV2QueryClient.AuctionExchangeTransferDenomDecimal, req)
14711471

14721472
return res, err
14731473
}
14741474

1475-
func (c *chainClientV2) FetchDenomDecimals(ctx context.Context, denoms []string) (*exchangev2types.QueryDenomDecimalsResponse, error) {
1476-
req := &exchangev2types.QueryDenomDecimalsRequest{
1475+
func (c *chainClientV2) FetchDenomDecimals(ctx context.Context, denoms []string) (*exchangev2types.QueryAuctionExchangeTransferDenomDecimalsResponse, error) {
1476+
req := &exchangev2types.QueryAuctionExchangeTransferDenomDecimalsRequest{
14771477
Denoms: denoms,
14781478
}
1479-
res, err := common.ExecuteCall(ctx, c.network.ChainCookieAssistant, c.exchangeV2QueryClient.DenomDecimals, req)
1479+
res, err := common.ExecuteCall(ctx, c.network.ChainCookieAssistant, c.exchangeV2QueryClient.AuctionExchangeTransferDenomDecimals, req)
14801480

14811481
return res, err
14821482
}

injective_data/chain_messages_list.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
"injective.exchange.v2.MsgPrivilegedExecuteContract",
9494
"injective.exchange.v2.MsgReclaimLockedFunds",
9595
"injective.exchange.v2.MsgRewardsOptOut",
96-
"injective.exchange.v2.MsgSetDelegationTransferReceivers",
9796
"injective.exchange.v2.MsgSignData",
9897
"injective.exchange.v2.MsgSignDoc",
9998
"injective.exchange.v2.MsgSpotMarketLaunch",

proto/injective/exchange/v2/exchange.proto

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,6 @@ message Params {
194194
(gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
195195
(gogoproto.nullable) = false
196196
];
197-
// human_readable_upgrade_block_height defines the block height at which the
198-
// human readable upgrade took place
199-
int64 human_readable_upgrade_block_height = 32;
200197
}
201198

202199
message NextFundingTimestamp { int64 next_timestamp = 1; }

proto/injective/exchange/v2/tx.proto

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,6 @@ service Msg {
218218
rpc UpdateAtomicMarketOrderFeeMultiplierSchedule(
219219
MsgAtomicMarketOrderFeeMultiplierSchedule)
220220
returns (MsgAtomicMarketOrderFeeMultiplierScheduleResponse);
221-
222-
rpc SetDelegationTransferReceivers(MsgSetDelegationTransferReceivers)
223-
returns (MsgSetDelegationTransferReceiversResponse);
224221
}
225222

226223
message MsgUpdateSpotMarket {
@@ -1537,20 +1534,4 @@ message MsgAtomicMarketOrderFeeMultiplierSchedule {
15371534
AtomicMarketOrderFeeMultiplierScheduleProposal proposal = 2;
15381535
}
15391536

1540-
message MsgAtomicMarketOrderFeeMultiplierScheduleResponse {}
1541-
1542-
// MsgSetDelegationTransferReceivers defines a message for setting delegation
1543-
// transfer receivers
1544-
message MsgSetDelegationTransferReceivers {
1545-
option (amino.name) = "exchange/MsgSetDelegationTransferReceivers";
1546-
option (cosmos.msg.v1.signer) = "sender";
1547-
1548-
// the sender's Injective address (must be exchange admin)
1549-
string sender = 1;
1550-
// list of receiver addresses to set as delegation transfer receivers
1551-
repeated string receivers = 2;
1552-
}
1553-
1554-
// MsgSetDelegationTransferReceiversResponse defines the response for
1555-
// MsgSetDelegationTransferReceivers
1556-
message MsgSetDelegationTransferReceiversResponse {}
1537+
message MsgAtomicMarketOrderFeeMultiplierScheduleResponse {}

0 commit comments

Comments
 (0)