Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: remove GetSignBytes from 29-fee and transfer msgs #4570

Merged
merged 9 commits into from
Sep 7, 2023
Merged

chore: remove GetSignBytes from 29-fee and transfer msgs #4570

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e638e3
chore: remove GetSignBytes from 29-fee and transfer msgs
damiannolan Sep 5, 2023
be2e7ba
chore: rm Type() and Route() legacy methods
damiannolan Sep 5, 2023
3834c24
Merge branch 'main' into damian/3911-rm-sign-bytes
damiannolan Sep 5, 2023
d0dd623
chore: adding amino name annotations to proto msgs
damiannolan Sep 5, 2023
9632aa7
Merge branch 'main' into damian/3911-rm-sign-bytes
colin-axner Sep 5, 2023
54e4dc6
fix: rename amino.name annotations for fee and transfer msgs
damiannolan Sep 5, 2023
ecc0eaa
Merge remote-tracking branch 'refs/remotes/origin/damian/3911-rm-sign…
damiannolan Sep 5, 2023
a74aca2
chore: adding amino encoding annoations to sdk coins
damiannolan Sep 6, 2023
2f41e9c
Merge branch 'main' into damian/3911-rm-sign-bytes
crodriguezvega Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: adding amino encoding annoations to sdk coins
  • Loading branch information
@damiannolan
damiannolan committed Sep 6, 2023
commit a74aca2cc1d2d43a9971b0403ca5c703351ee3d2
67 changes: 35 additions & 32 deletions modules/apps/29-fee/types/fee.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

79 changes: 40 additions & 39 deletions modules/apps/transfer/types/tx.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 18 additions & 6 deletions proto/ibc/applications/fee/v1/fee.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package ibc.applications.fee.v1;

option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types";

import "amino/amino.proto";
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";
import "ibc/core/channel/v1/channel.proto";
Expand All @@ -12,14 +13,25 @@ import "cosmos/msg/v1/msg.proto";
// Fee defines the ICS29 receive, acknowledgement and timeout fees
message Fee {
// the packet receive fee
repeated cosmos.base.v1beta1.Coin recv_fee = 1
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
repeated cosmos.base.v1beta1.Coin recv_fee = 1 [
(gogoproto.nullable) = false,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins",
(amino.encoding) = "legacy_coins"
];

// the packet acknowledgement fee
repeated cosmos.base.v1beta1.Coin ack_fee = 2
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
repeated cosmos.base.v1beta1.Coin ack_fee = 2 [
(gogoproto.nullable) = false,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins",
(amino.encoding) = "legacy_coins"
];

// the packet timeout fee
repeated cosmos.base.v1beta1.Coin timeout_fee = 3
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
repeated cosmos.base.v1beta1.Coin timeout_fee = 3 [
(gogoproto.nullable) = false,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins",
(amino.encoding) = "legacy_coins"
];
}

// PacketFee contains ICS29 relayer fees, refund address and optional list of permitted relayers
Expand Down
2 changes: 1 addition & 1 deletion proto/ibc/applications/transfer/v1/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ message MsgTransfer {
// the channel by which the packet will be sent
string source_channel = 2;
// the tokens to be transferred
cosmos.base.v1beta1.Coin token = 3 [(gogoproto.nullable) = false];
cosmos.base.v1beta1.Coin token = 3 [(gogoproto.nullable) = false, (amino.encoding) = "legacy_coin"];
// the sender address
string sender = 4;
// the recipient address on the destination chain
Expand Down
Loading