Skip to content

Commit 53c94ae

Browse files
authored
Merge pull request #328 from InjectiveLabs/chore/upgrade_protos_v1_16_3
[CHORE] upgrade protos v1.16.3
2 parents 97aaaf4 + 9f908d1 commit 53c94ae

File tree

15 files changed

+2618
-2100
lines changed

15 files changed

+2618
-2100
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
all:
22

33
clone-injective-indexer:
4-
git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.16.54 --depth 1 --single-branch
4+
git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.16.69 --depth 1 --single-branch
55

66
clone-injective-core:
7-
git clone https://github.com/InjectiveLabs/injective-core.git -b v1.16.0 --depth 1 --single-branch
7+
git clone https://github.com/InjectiveLabs/injective-core.git -b v1.16.3 --depth 1 --single-branch
88

99
copy-exchange-client: clone-injective-indexer
1010
rm -rf exchange/*

chain/exchange/types/exchange.pb.go

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

chain/exchange/types/expected_keepers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ 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)
7071
}
7172

7273
type WasmViewKeeper interface {

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

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

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

Lines changed: 3 additions & 2 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: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ func (msg *MsgUpdateDerivativeMarket) ValidateBasic() error {
261261
}
262262
}
263263

264-
265264
if msg.HasInitialMarginRatioUpdate() && msg.HasMaintenanceMarginRatioUpdate() {
266265
if msg.NewInitialMarginRatio.LTE(msg.NewMaintenanceMarginRatio) {
267266
return types.ErrMarginsRelation
@@ -2607,3 +2606,35 @@ func hasDuplicatesOrder(slice []*OrderData) bool {
26072606
}
26082607
return false
26092608
}
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{}

0 commit comments

Comments
 (0)