updating protos and codegen

cosmos · Feb 23, 2022 · aedd359 · aedd359
1 parent 0555a08
commit aedd359
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 54 deletions.
diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md
@@ -1041,7 +1041,8 @@ This Msg can be used to pay for a packet at a specified sequence (instead of the
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `identified_packet_fee` | [IdentifiedPacketFee](#ibc.applications.fee.v1.IdentifiedPacketFee) |  | identified packet to pay fee for identified fee must contain the refund address which is also signer of this message |
+| `packet_id` | [ibc.core.channel.v1.PacketId](#ibc.core.channel.v1.PacketId) |  | unique packet identifier |
+| `packet_fee` | [PacketFee](#ibc.applications.fee.v1.PacketFee) |  | packet fee for incentivization |
 
 
 

diff --git a/modules/apps/29-fee/types/tx.pb.go b/modules/apps/29-fee/types/tx.pb.go
diff --git a/proto/ibc/applications/fee/v1/ack.proto b/proto/ibc/applications/fee/v1/ack.proto
@@ -11,5 +11,5 @@ import "gogoproto/gogo.proto";
 message IncentivizedAcknowledgement {
   bytes  result                  = 1;
   string forward_relayer_address = 2 [(gogoproto.moretags) = "yaml:\"forward_relayer_address\""];
-  bool underlying_app_success = 3 [(gogoproto.moretags) = "yaml:\"underlying_app_successl\""];
+  bool   underlying_app_success  = 3 [(gogoproto.moretags) = "yaml:\"underlying_app_successl\""];
 }
diff --git a/proto/ibc/applications/fee/v1/genesis.proto b/proto/ibc/applications/fee/v1/genesis.proto
@@ -30,7 +30,7 @@ message FeeEnabledChannel {
 message RegisteredRelayerAddress {
   string address              = 1;
   string counterparty_address = 2 [(gogoproto.moretags) = "yaml:\"counterparty_address\""];
-  string channel_id = 3 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id           = 3 [(gogoproto.moretags) = "yaml:\"channel_id\""];
 }
 
 // ForwardRelayerAddress contains the forward relayer address and packetId used for async acknowledgements

diff --git a/proto/ibc/applications/fee/v1/tx.proto b/proto/ibc/applications/fee/v1/tx.proto
@@ -6,6 +6,7 @@ option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types";
 
 import "gogoproto/gogo.proto";
 import "ibc/applications/fee/v1/fee.proto";
+import "ibc/core/channel/v1/channel.proto";
 
 // Msg defines the ibc/fee Msg service.
 service Msg {
@@ -32,7 +33,7 @@ message MsgRegisterCounterpartyAddress {
 
   string address              = 1;
   string counterparty_address = 2 [(gogoproto.moretags) = "yaml:\"counterparty_address\""];
-  string channel_id = 3 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id           = 3 [(gogoproto.moretags) = "yaml:\"channel_id\""];
 }
 
 // MsgRegisterCounterpartyAddressResponse defines the Msg/RegisterCounterypartyAddress response type
@@ -64,10 +65,11 @@ message MsgPayPacketFeeAsync {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  // identified packet to pay fee for
-  // identified fee must contain the refund address which is also signer of this message
-  ibc.applications.fee.v1.IdentifiedPacketFee identified_packet_fee = 1
-      [(gogoproto.moretags) = "yaml:\"identified_packet_fee\"", (gogoproto.nullable) = false];
+  // unique packet identifier
+  ibc.core.channel.v1.PacketId packet_id = 1
+      [(gogoproto.moretags) = "yaml:\"packet_id\"", (gogoproto.nullable) = false];
+  // packet fee for incentivization
+  PacketFee packet_fee = 2 [(gogoproto.moretags) = "yaml:\"packet_fee\"", (gogoproto.nullable) = false];
 }
 
 // MsgPayPacketFeeAsyncResponse defines the response type for Msg/PayPacketFeeAsync