x/ibc proto migration

Makefile

@@ -250,7 +250,7 @@ COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/
 TM_KV_TYPES         = third_party/proto/tendermint/libs/kv
 TM_MERKLE_TYPES     = third_party/proto/tendermint/crypto/merkle
 TM_ABCI_TYPES       = third_party/proto/tendermint/abci/types
-TM_PROTO      = third_party/proto/tendermint/proto
+TM_PROTO     				= third_party/proto/tendermint/proto
 GOGO_PROTO_TYPES    = third_party/proto/gogoproto
 COSMOS_PROTO_TYPES  = third_party/proto/cosmos-proto
 SDK_PROTO_TYPES     = third_party/proto/cosmos-sdk/types

buf.yaml

@@ -10,6 +10,8 @@ lint:
     - UNARY_RPC
     - COMMENT_FIELD
     - PACKAGE_DIRECTORY_MATCH
+    - ENUM_VALUE_PREFIX
+    - ENUM_ZERO_VALUE_SUFFIX
   ignore:
     - third_party
     - codec/testdata

codec/std/codec.go

@@ -19,6 +19,7 @@ var (
 	_ supply.Codec   = (*Codec)(nil)
 	_ evidence.Codec = (*Codec)(nil)
 	_ gov.Codec      = (*Codec)(nil)
+	// _ clienttypes.Codec = (*Codec)(nil)
 )
 
 // Codec defines the application-level codec. This codec contains all the

codec/std/codec.proto

@@ -15,6 +15,10 @@ import "x/slashing/types/types.proto";
 import "x/staking/types/types.proto";
 import "x/params/types/proposal/types.proto";
 import "x/upgrade/types/types.proto";
+import "x/ibc/03-connection/types/types.proto";
+import "x/ibc/04-channel/types/types.proto";
+import "x/ibc/07-tendermint/types/types.proto";
+import "x/ibc/20-transfer/types/types.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/codec/std";
 
@@ -51,7 +55,8 @@ message Evidence {
 
   // sum defines a set of all acceptable concrete Evidence implementations.
   oneof sum {
-    cosmos_sdk.x.evidence.v1.Equivocation equivocation = 1;
+    cosmos_sdk.x.evidence.v1.Equivocation   equivocation        = 1;
+    cosmos_sdk.x.ibc.tendermint.v1.Evidence client_misbehaviour = 2;
   }
 }
 
@@ -75,8 +80,8 @@ message MsgSubmitProposal {
   Content                                   content = 2;
 }
 
-// Proposal defines the application-level concrete proposal type used in governance
-// proposals.
+// Proposal defines the application-level concrete proposal type used in
+// governance proposals.
 message Proposal {
   option (gogoproto.equal) = true;
 
@@ -90,7 +95,8 @@ message Content {
   option (gogoproto.equal)             = true;
   option (cosmos_proto.interface_type) = "*github.com/cosmos/cosmos-sdk/x/gov/types.Content";
 
-  // sum defines a set of all acceptable concrete governance proposal Content types.
+  // sum defines a set of all acceptable concrete governance proposal Content
+  // types.
   oneof sum {
     cosmos_sdk.x.gov.v1.TextProposal                        text                    = 1;
     cosmos_sdk.x.params.v1.ParameterChangeProposal          parameter_change        = 2;
@@ -100,14 +106,68 @@ message Content {
   }
 }
 
+message ClientState {
+  option (cosmos_proto.interface_type) = "*github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported.ClientState";
+  // sum defines a set of all acceptable concrete ClientState implementations.
+  oneof sum {
+    cosmos_sdk.x.ibc.tendermint.v1.ClientState tendermint = 1;
+  }
+}
+
+message ConsensusState {
+  option (cosmos_proto.interface_type) = "*github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported.ConsensusState";
+  // sum defines a set of all acceptable concrete ConsensusState
+  // implementations.
+  oneof sum {
+    cosmos_sdk.x.ibc.tendermint.v1.ConsensusState tendermint = 1;
+  }
+}
+
+message Misbehaviour {
+  option (cosmos_proto.interface_type) = "*github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported.Misbehaviour";
+  // sum defines a set of all acceptable concrete Misbehaviour implementations.
+  oneof sum {
+    cosmos_sdk.x.ibc.tendermint.v1.Evidence tendermint = 1;
+  }
+}
+
+message Header {
+  option (cosmos_proto.interface_type) = "*github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported.Header";
+  // sum defines a set of all acceptable concrete Header implementations.
+  oneof sum {
+    cosmos_sdk.x.ibc.tendermint.v1.Header tendermint = 1;
+  }
+}
+
+message MsgCreateClient {
+  option (cosmos_proto.interface_type) = "*github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported.MsgCreateClient";
+  oneof sum {
+    // sum defines a set of all acceptable concrete MsgCreateClient
+    // implementations.
+    cosmos_sdk.x.ibc.tendermint.v1.MsgCreateClient tendermint = 1;
+  }
+}
+
+message MsgUpdateClient {
+  option (cosmos_proto.interface_type) = "*github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported.MsgUpdateClient";
+  // sum defines a set of all acceptable concrete MsgUpdateClient
+  // implementations.
+  oneof sum {
+    cosmos_sdk.x.ibc.tendermint.v1.MsgUpdateClient tendermint = 1;
+  }
+}
+
 // Transaction defines the application-level transaction that can be signed and
 // processed by the state-machine. It contains a base of common fields and
 // repeated set of Message types.
 message Transaction {
   option (gogoproto.goproto_getters) = false;
 
-  cosmos_sdk.x.auth.v1.StdTxBase base = 1
-      [(gogoproto.jsontag) = "", (gogoproto.embed) = true, (gogoproto.nullable) = false];
+  cosmos_sdk.x.auth.v1.StdTxBase base = 1 [
+    (gogoproto.jsontag)  = "",
+    (gogoproto.embed)    = true,
+    (gogoproto.nullable) = false
+  ];
   repeated Message msgs = 2 [(gogoproto.nullable) = false];
 }
 
@@ -118,30 +178,49 @@ message Message {
 
   // sum defines the set of all allowed valid messages defined in modules.
   oneof sum {
-    cosmos_sdk.x.bank.v1.MsgSend                                msg_send                          = 1;
-    cosmos_sdk.x.bank.v1.MsgMultiSend                           msg_multi_send                    = 2;
-    cosmos_sdk.x.crisis.v1.MsgVerifyInvariant                   msg_verify_invariant              = 3;
-    cosmos_sdk.x.distribution.v1.MsgSetWithdrawAddress          msg_set_withdraw_address          = 4;
-    cosmos_sdk.x.distribution.v1.MsgWithdrawDelegatorReward     msg_withdraw_delegator_reward     = 5;
-    cosmos_sdk.x.distribution.v1.MsgWithdrawValidatorCommission msg_withdraw_validator_commission = 6;
-    cosmos_sdk.x.distribution.v1.MsgFundCommunityPool           msg_fund_community_pool           = 7;
-    MsgSubmitEvidence                                           msg_submit_evidence               = 8;
-    MsgSubmitProposal                                           msg_submit_proposal               = 9;
-    cosmos_sdk.x.gov.v1.MsgVote                                 msg_vote                          = 10;
-    cosmos_sdk.x.gov.v1.MsgDeposit                              msg_deposit                       = 11;
-    cosmos_sdk.x.slashing.v1.MsgUnjail                          msg_unjail                        = 12;
-    cosmos_sdk.x.staking.v1.MsgCreateValidator                  msg_create_validator              = 13;
-    cosmos_sdk.x.staking.v1.MsgEditValidator                    msg_edit_validator                = 14;
-    cosmos_sdk.x.staking.v1.MsgDelegate                         msg_delegate                      = 15;
-    cosmos_sdk.x.staking.v1.MsgBeginRedelegate                  msg_begin_redelegate              = 16;
-    cosmos_sdk.x.staking.v1.MsgUndelegate                       msg_undelegate                    = 17;
+    cosmos_sdk.x.bank.v1.MsgSend                                msg_send                                  = 1;
+    cosmos_sdk.x.bank.v1.MsgMultiSend                           msg_multi_send                            = 2;
+    cosmos_sdk.x.crisis.v1.MsgVerifyInvariant                   msg_verify_invariant                      = 3;
+    cosmos_sdk.x.distribution.v1.MsgSetWithdrawAddress          msg_set_withdraw_address                  = 4;
+    cosmos_sdk.x.distribution.v1.MsgWithdrawDelegatorReward     msg_withdraw_delegator_reward             = 5;
+    cosmos_sdk.x.distribution.v1.MsgWithdrawValidatorCommission msg_withdraw_validator_commission         = 6;
+    cosmos_sdk.x.distribution.v1.MsgFundCommunityPool           msg_fund_community_pool                   = 7;
+    MsgSubmitEvidence                                           msg_submit_evidence                       = 8;
+    MsgSubmitProposal                                           msg_submit_proposal                       = 9;
+    cosmos_sdk.x.gov.v1.MsgVote                                 msg_vote                                  = 10;
+    cosmos_sdk.x.gov.v1.MsgDeposit                              msg_deposit                               = 11;
+    cosmos_sdk.x.slashing.v1.MsgUnjail                          msg_unjail                                = 12;
+    cosmos_sdk.x.staking.v1.MsgCreateValidator                  msg_create_validator                      = 13;
+    cosmos_sdk.x.staking.v1.MsgEditValidator                    msg_edit_validator                        = 14;
+    cosmos_sdk.x.staking.v1.MsgDelegate                         msg_delegate                              = 15;
+    cosmos_sdk.x.staking.v1.MsgBeginRedelegate                  msg_begin_redelegate                      = 16;
+    cosmos_sdk.x.staking.v1.MsgUndelegate                       msg_undelegate                            = 17;
+    cosmos_sdk.x.ibc.connection.v1.MsgConnectionOpenInit        msg_connection_open_init                  = 18;
+    cosmos_sdk.x.ibc.connection.v1.MsgConnectionOpenTry         msg_connection_open_try                   = 19;
+    cosmos_sdk.x.ibc.connection.v1.MsgConnectionOpenAck         msg_connection_open_ack                   = 20;
+    cosmos_sdk.x.ibc.connection.v1.MsgConnectionOpenConfirm     msg_connection_open_confirm               = 21;
+    cosmos_sdk.x.ibc.channel.v1.MsgChannelOpenInit              msg_channel_open_init                     = 22;
+    cosmos_sdk.x.ibc.channel.v1.MsgChannelOpenTry               msg_channel_open_try                      = 23;
+    cosmos_sdk.x.ibc.channel.v1.MsgChannelOpenAck               msg_channel_open_ack                      = 24;
+    cosmos_sdk.x.ibc.channel.v1.MsgChannelOpenConfirm           msg_channel_open_confirm                  = 25;
+    cosmos_sdk.x.ibc.channel.v1.MsgChannelCloseInit             msg_channel_close_init                    = 26;
+    cosmos_sdk.x.ibc.channel.v1.MsgChannelCloseConfirm          msg_channel_close_confirm                 = 27;
+    cosmos_sdk.x.ibc.channel.v1.MsgPacket                       msg_packet                                = 28;
+    cosmos_sdk.x.ibc.channel.v1.MsgAcknowledgement              msg_acknowledgement                       = 29;
+    cosmos_sdk.x.ibc.tendermint.v1.MsgCreateClient              msg_create_client_tendermint              = 30;  // TODO: should I use the interface defined above instead?
+    cosmos_sdk.x.ibc.tendermint.v1.MsgUpdateClient              msg_update_client_tendermint              = 31;  // TODO: ditto
+    cosmos_sdk.x.ibc.tendermint.v1.MsgSubmitClientMisbehaviour  msg_submit_client_misbehaviour_tendermint = 32;  // FIXME: use submit evidence msg?
+    cosmos_sdk.x.ibc.transfer.v1.MsgTransfer                    msg_transfer                              = 33;
   }
 }
 
 // SignDoc defines a standard application-level signing document to compose
 // signatures for a Transaction.
 message SignDoc {
-  cosmos_sdk.x.auth.v1.StdSignDocBase base = 1
-      [(gogoproto.jsontag) = "", (gogoproto.embed) = true, (gogoproto.nullable) = false];
+  cosmos_sdk.x.auth.v1.StdSignDocBase base = 1 [
+    (gogoproto.jsontag)  = "",
+    (gogoproto.embed)    = true,
+    (gogoproto.nullable) = false
+  ];
   repeated Message msgs = 2 [(gogoproto.nullable) = false];
 }

crypto/hd/fundraiser_test.go

@@ -65,7 +65,7 @@ func TestFundraiserCompatibility(t *testing.T) {
 		master, ch := hd.ComputeMastersFromSeed(seed)
 		priv, err := hd.DerivePrivateKeyForPath(master, ch, "44'/118'/0'/0/0")
 		require.NoError(t, err)
-		pub := secp256k1.PrivKey(priv).PubKey()
+		pub := secp256k1.PrivKey(priv[:]).PubKey()
 
 		t.Log("\tNODEJS GOLANG\n")
 		t.Logf("SEED \t%X %X\n", seedB, seed)
@@ -78,7 +78,7 @@ func TestFundraiserCompatibility(t *testing.T) {
 		require.Equal(t, priv[:], privB, "Expected priv keys to match")
 		var pubBFixed [33]byte
 		copy(pubBFixed[:], pubB)
-		require.Equal(t, pub, secp256k1.PubKey(pubBFixed), fmt.Sprintf("Expected pub keys to match for %d", i))
+		require.Equal(t, pub, secp256k1.PubKey(pubBFixed[:]), fmt.Sprintf("Expected pub keys to match for %d", i))
 
 		addr := pub.Address()
 		t.Logf("ADDR  \t%X %X\n", addrB, addr)

docs/architecture/adr-015-ibc-packet-receiver.md

@@ -248,7 +248,7 @@ func handleMsgTransfer(ctx Context, k Keeper, msg MsgTransfer) Result {
 }
 
 func handlePacketDataTransfer(ctx Context, k Keeper, packet Packet, data PacketDataTransfer) Result {
-  err := k.ReceiveTransfer(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetDestinationPort(), packet.GetDestinationChannel(), data)
+  err := k.ReceiveTransfer(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetDestPort(), packet.GetDestChannel(), data)
   if err != nil {
     // TODO: Source chain sent invalid packet, shutdown channel
   }
@@ -257,7 +257,7 @@ func handlePacketDataTransfer(ctx Context, k Keeper, packet Packet, data PacketD
 }
 
 func handleCustomTimeoutPacket(ctx Context, k Keeper, packet CustomPacket) Result {
-  err := k.RecoverTransfer(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetDestinationPort(), packet.GetDestinationChannel(), data)
+  err := k.RecoverTransfer(ctx, packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetDestPort(), packet.GetDestChannel(), data)
   if err != nil {
     // This chain sent invalid packet or cannot recover the funds
     panic(err)

third_party/proto/tendermint/types/types.proto

@@ -0,0 +1,55 @@
+syntax = "proto3";
+
+package tendermint.types.proto3;
+option  go_package = "github.com/tendermint/tendermint/types/proto3";
+
+message PartSetHeader {
+  int32 Total = 1;
+  bytes Hash  = 2;
+}
+
+message BlockID {
+  bytes         Hash        = 1;
+  PartSetHeader PartsHeader = 2;
+}
+
+message Header {
+  // basic block info
+  Version   Version = 1;
+  string    ChainID = 2;
+  int64     Height  = 3;
+  Timestamp Time    = 4;
+
+  // prev block info
+  BlockID LastBlockID = 5;
+
+  // hashes of block data
+  bytes LastCommitHash = 6;  // commit from validators from the last block
+  bytes DataHash       = 7;  // transactions
+
+  // hashes from the app output from the prev block
+  bytes ValidatorsHash     = 8;   // validators for the current block
+  bytes NextValidatorsHash = 9;   // validators for the next block
+  bytes ConsensusHash      = 10;  // consensus params for current block
+  bytes AppHash            = 11;  // state after txs from the previous block
+  bytes LastResultsHash    = 12;  // root hash of all results from the txs from the previous block
+
+  // consensus info
+  bytes EvidenceHash    = 13;  // evidence included in the block
+  bytes ProposerAddress = 14;  // original proposer of the block
+}
+
+message Version {
+  uint64 Block = 1;
+  uint64 App   = 2;
+}
+
+// Timestamp wraps how amino encodes time.
+// This is the protobuf well-known type protobuf/timestamp.proto
+// See:
+// https://github.com/google/protobuf/blob/d2980062c859649523d5fd51d6b55ab310e47482/src/google/protobuf/timestamp.proto#L123-L135
+// NOTE/XXX: nanos do not get skipped if they are zero in amino.
+message Timestamp {
+  int64 seconds = 1;
+  int32 nanos   = 2;
+}

x/ibc/02-client/client/utils/utils.go

@@ -114,9 +114,19 @@ func QueryTendermintHeader(cliCtx context.CLIContext) (ibctmtypes.Header, int64,
 		return ibctmtypes.Header{}, 0, err
 	}
 
+	tmValset := tmtypes.NewValidatorSet(validators.Validators)
+	tmValset.TotalVotingPower() // update voting power
+
+	// migrate to protobuf
+	protoSignedHeader := commit.SignedHeader.ToProto()
+	protoValSet, err := tmValset.ToProto()
+	if err != nil {
+		return ibctmtypes.Header{}, 0, err
+	}
+
 	header := ibctmtypes.Header{
-		SignedHeader: commit.SignedHeader,
-		ValidatorSet: tmtypes.NewValidatorSet(validators.Validators),
+		SignedHeader: protoSignedHeader,
+		ValidatorSet: protoValSet,
 	}
 
 	return header, height, nil
@@ -147,10 +157,19 @@ func QueryNodeConsensusState(cliCtx context.CLIContext) (ibctmtypes.ConsensusSta
 		return ibctmtypes.ConsensusState{}, 0, err
 	}
 
+	tmValset := tmtypes.NewValidatorSet(validators.Validators)
+	tmValset.TotalVotingPower() // update voting power
+
+	protoValSet, err := tmValset.ToProto()
+	if err != nil {
+		return ibctmtypes.ConsensusState{}, 0, err
+	}
+
 	state := ibctmtypes.ConsensusState{
 		Timestamp:    commit.Time,
 		Root:         commitmenttypes.NewMerkleRoot(commit.AppHash),
-		ValidatorSet: tmtypes.NewValidatorSet(validators.Validators),
+		Height:       uint64(height),
+		ValidatorSet: protoValSet,
 	}
 
 	return state, height, nil