x/ibc: proto migration pt 1

CHANGELOG.md

@@ -229,6 +229,7 @@ functionality that requires an online connection.
 * (simulation) [\#6002](https://github.com/cosmos/cosmos-sdk/pull/6002) Add randomized consensus params into simulation.
 * (x/staking) [\#6059](https://github.com/cosmos/cosmos-sdk/pull/6059) Updated `HistoricalEntries` parameter default to 100.
 * (x/ibc) [\#5948](https://github.com/cosmos/cosmos-sdk/issues/5948) Add `InitGenesis` and `ExportGenesis` functions for `ibc` module.
+* (x/ibc) [\#6097](https://github.com/cosmos/cosmos-sdk/pull/6097) Migrate `x/ibc` state to protobuf.
 
 ## [v0.38.3] - 2020-04-09
 

buf.yaml

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

simapp/app.go

@@ -230,12 +230,12 @@ func NewSimApp(
 
 	// Create IBC Keeper
 	app.IBCKeeper = ibc.NewKeeper(
-		app.cdc, keys[ibc.StoreKey], app.StakingKeeper, scopedIBCKeeper,
+		app.cdc, appCodec, keys[ibc.StoreKey], app.StakingKeeper, scopedIBCKeeper,
 	)
 
 	// Create Transfer Keepers
 	app.TransferKeeper = transfer.NewKeeper(
-		app.cdc, keys[transfer.StoreKey],
+		appCodec, keys[transfer.StoreKey],
 		app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper,
 		app.AccountKeeper, app.BankKeeper, scopedTransferKeeper,
 	)

std/codec.proto

@@ -15,6 +15,9 @@ 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/20-transfer/types/types.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/std";
 
@@ -75,8 +78,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 +93,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;
@@ -134,6 +138,19 @@ message Message {
     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.transfer.v1.MsgTransfer                    msg_transfer                      = 30;
   }
 }
 

x/evidence/types/expected_keepers.go

@@ -3,10 +3,10 @@ package types
 import (
 	"time"
 
+	"github.com/tendermint/tendermint/crypto"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingexported "github.com/cosmos/cosmos-sdk/x/staking/exported"
-
-	"github.com/tendermint/tendermint/crypto"
 )
 
 type (

x/ibc/03-connection/client/rest/rest.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/types/rest"
-	commitmentexported "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/exported"
+	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 )
 
 const (
@@ -21,42 +21,42 @@ func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, queryRoute string)
 
 // ConnectionOpenInitReq defines the properties of a connection open init request's body.
 type ConnectionOpenInitReq struct {
-	BaseReq                  rest.BaseReq              `json:"base_req" yaml:"base_req"`
-	ConnectionID             string                    `json:"connection_id" yaml:"connection_id"`
-	ClientID                 string                    `json:"client_id" yaml:"client_id"`
-	CounterpartyClientID     string                    `json:"counterparty_client_id" yaml:"counterparty_client_id"`
-	CounterpartyConnectionID string                    `json:"counterparty_connection_id" yaml:"counterparty_connection_id"`
-	CounterpartyPrefix       commitmentexported.Prefix `json:"counterparty_prefix" yaml:"counterparty_prefix"`
+	BaseReq                  rest.BaseReq                 `json:"base_req" yaml:"base_req"`
+	ConnectionID             string                       `json:"connection_id" yaml:"connection_id"`
+	ClientID                 string                       `json:"client_id" yaml:"client_id"`
+	CounterpartyClientID     string                       `json:"counterparty_client_id" yaml:"counterparty_client_id"`
+	CounterpartyConnectionID string                       `json:"counterparty_connection_id" yaml:"counterparty_connection_id"`
+	CounterpartyPrefix       commitmenttypes.MerklePrefix `json:"counterparty_prefix" yaml:"counterparty_prefix"`
 }
 
 // ConnectionOpenTryReq defines the properties of a connection open try request's body.
 type ConnectionOpenTryReq struct {
-	BaseReq                  rest.BaseReq              `json:"base_req" yaml:"base_req"`
-	ConnectionID             string                    `json:"connection_id" yaml:"connection_id"`
-	ClientID                 string                    `json:"client_id" yaml:"client_id"`
-	CounterpartyClientID     string                    `json:"counterparty_client_id" yaml:"counterparty_client_id"`
-	CounterpartyConnectionID string                    `json:"counterparty_connection_id" yaml:"counterparty_connection_id"`
-	CounterpartyPrefix       commitmentexported.Prefix `json:"counterparty_prefix" yaml:"counterparty_prefix"`
-	CounterpartyVersions     []string                  `json:"counterparty_versions" yaml:"counterparty_versions"`
-	ProofInit                commitmentexported.Proof  `json:"proof_init" yaml:"proof_init"`
-	ProofConsensus           commitmentexported.Proof  `json:"proof_consensus" yaml:"proof_consensus"`
-	ProofHeight              uint64                    `json:"proof_height" yaml:"proof_height"`
-	ConsensusHeight          uint64                    `json:"consensus_height" yaml:"consensus_height"`
+	BaseReq                  rest.BaseReq                 `json:"base_req" yaml:"base_req"`
+	ConnectionID             string                       `json:"connection_id" yaml:"connection_id"`
+	ClientID                 string                       `json:"client_id" yaml:"client_id"`
+	CounterpartyClientID     string                       `json:"counterparty_client_id" yaml:"counterparty_client_id"`
+	CounterpartyConnectionID string                       `json:"counterparty_connection_id" yaml:"counterparty_connection_id"`
+	CounterpartyPrefix       commitmenttypes.MerklePrefix `json:"counterparty_prefix" yaml:"counterparty_prefix"`
+	CounterpartyVersions     []string                     `json:"counterparty_versions" yaml:"counterparty_versions"`
+	ProofInit                commitmenttypes.MerkleProof  `json:"proof_init" yaml:"proof_init"`
+	ProofConsensus           commitmenttypes.MerkleProof  `json:"proof_consensus" yaml:"proof_consensus"`
+	ProofHeight              uint64                       `json:"proof_height" yaml:"proof_height"`
+	ConsensusHeight          uint64                       `json:"consensus_height" yaml:"consensus_height"`
 }
 
 // ConnectionOpenAckReq defines the properties of a connection open ack request's body.
 type ConnectionOpenAckReq struct {
-	BaseReq         rest.BaseReq             `json:"base_req" yaml:"base_req"`
-	ProofTry        commitmentexported.Proof `json:"proof_try" yaml:"proof_try"`
-	ProofConsensus  commitmentexported.Proof `json:"proof_consensus" yaml:"proof_consensus"`
-	ProofHeight     uint64                   `json:"proof_height" yaml:"proof_height"`
-	ConsensusHeight uint64                   `json:"consensus_height" yaml:"consensus_height"`
-	Version         string                   `json:"version" yaml:"version"`
+	BaseReq         rest.BaseReq                `json:"base_req" yaml:"base_req"`
+	ProofTry        commitmenttypes.MerkleProof `json:"proof_try" yaml:"proof_try"`
+	ProofConsensus  commitmenttypes.MerkleProof `json:"proof_consensus" yaml:"proof_consensus"`
+	ProofHeight     uint64                      `json:"proof_height" yaml:"proof_height"`
+	ConsensusHeight uint64                      `json:"consensus_height" yaml:"consensus_height"`
+	Version         string                      `json:"version" yaml:"version"`
 }
 
 // ConnectionOpenConfirmReq defines the properties of a connection open confirm request's body.
 type ConnectionOpenConfirmReq struct {
-	BaseReq     rest.BaseReq             `json:"base_req" yaml:"base_req"`
-	ProofAck    commitmentexported.Proof `json:"proof_ack" yaml:"proof_ack"`
-	ProofHeight uint64                   `json:"proof_height" yaml:"proof_height"`
+	BaseReq     rest.BaseReq                `json:"base_req" yaml:"base_req"`
+	ProofAck    commitmenttypes.MerkleProof `json:"proof_ack" yaml:"proof_ack"`
+	ProofHeight uint64                      `json:"proof_height" yaml:"proof_height"`
 }

x/ibc/03-connection/exported/exported.go

@@ -1,14 +1,13 @@
 package exported
 
 import (
-	"encoding/json"
-
 	commitmentexported "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/exported"
+	ibctypes "github.com/cosmos/cosmos-sdk/x/ibc/types"
 )
 
 // ConnectionI describes the required methods for a connection.
 type ConnectionI interface {
-	GetState() State
+	GetState() ibctypes.State
 	GetID() string
 	GetClientID() string
 	GetCounterparty() CounterpartyI
@@ -23,68 +22,3 @@ type CounterpartyI interface {
 	GetPrefix() commitmentexported.Prefix
 	ValidateBasic() error
 }
-
-// State defines the state of a connection between two disctinct
-// chains
-type State byte
-
-// available connection states
-const (
-	UNINITIALIZED State = iota // default State
-	INIT
-	TRYOPEN
-	OPEN
-)
-
-// string representation of the connection states
-const (
-	StateUninitialized string = "UNINITIALIZED"
-	StateInit          string = "INIT"
-	StateTryOpen       string = "TRYOPEN"
-	StateOpen          string = "OPEN"
-)
-
-// String implements the Stringer interface
-func (s State) String() string {
-	switch s {
-	case INIT:
-		return StateInit
-	case TRYOPEN:
-		return StateTryOpen
-	case OPEN:
-		return StateOpen
-	default:
-		return StateUninitialized
-	}
-}
-
-// StateFromString parses a string into a connection state
-func StateFromString(state string) State {
-	switch state {
-	case StateInit:
-		return INIT
-	case StateTryOpen:
-		return TRYOPEN
-	case StateOpen:
-		return OPEN
-	default:
-		return UNINITIALIZED
-	}
-}
-
-// MarshalJSON marshal to JSON using string.
-func (s State) MarshalJSON() ([]byte, error) {
-	return json.Marshal(s.String())
-}
-
-// UnmarshalJSON decodes from JSON assuming Bech32 encoding.
-func (s *State) UnmarshalJSON(data []byte) error {
-	var str string
-	err := json.Unmarshal(data, &str)
-	if err != nil {
-		return err
-	}
-
-	*s = StateFromString(str)
-	return nil
-}