Merge branch 'master' into am-contributing

proto/ibc/core/channel/v1/tx.proto

@@ -148,7 +148,7 @@ message MsgRecvPacket {
   option (gogoproto.goproto_getters) = false;
 
   Packet                    packet       = 1 [(gogoproto.nullable) = false];
-  bytes                     proof        = 2;
+  bytes                     proof_commitment        = 2 [(gogoproto.moretags) = "yaml:\"proof_commitment\""];
   ibc.core.client.v1.Height proof_height = 3
       [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
   string signer = 4;
@@ -163,7 +163,7 @@ message MsgTimeout {
   option (gogoproto.goproto_getters) = false;
 
   Packet                    packet       = 1 [(gogoproto.nullable) = false];
-  bytes                     proof        = 2;
+  bytes                     proof_unreceived        = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""];
   ibc.core.client.v1.Height proof_height = 3
       [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
   uint64 next_sequence_recv = 4 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""];
@@ -179,7 +179,7 @@ message MsgTimeoutOnClose {
   option (gogoproto.goproto_getters) = false;
 
   Packet                    packet       = 1 [(gogoproto.nullable) = false];
-  bytes                     proof        = 2;
+  bytes                     proof_unreceived        = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""];
   bytes                     proof_close  = 3 [(gogoproto.moretags) = "yaml:\"proof_close\""];
   ibc.core.client.v1.Height proof_height = 4
       [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
@@ -197,7 +197,7 @@ message MsgAcknowledgement {
 
   Packet                    packet          = 1 [(gogoproto.nullable) = false];
   bytes                     acknowledgement = 2;
-  bytes                     proof           = 3;
+  bytes                     proof_acked           = 3 [(gogoproto.moretags) = "yaml:\"proof_acked\""];
   ibc.core.client.v1.Height proof_height    = 4
       [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
   string signer = 5;

proto/ibc/lightclients/solomachine/v1/solomachine.proto

@@ -49,7 +49,6 @@ message Header {
 // of a sequence and two signatures over different messages at that sequence.
 message Misbehaviour {
   option (gogoproto.goproto_getters)  = false;
-  option (gogoproto.goproto_stringer) = false;
   string           client_id          = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
   uint64           sequence           = 2;
   SignatureAndData signature_one      = 3 [(gogoproto.moretags) = "yaml:\"signature_one\""];

proto/ibc/lightclients/tendermint/v1/tendermint.proto

@@ -72,12 +72,10 @@ message ConsensusState {
 // that implements Misbehaviour interface expected by ICS-02
 message Misbehaviour {
   option (gogoproto.goproto_getters)  = false;
-  option (gogoproto.goproto_stringer) = false;
 
   string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
-  string chain_id  = 2 [(gogoproto.moretags) = "yaml:\"chain_id\""];
-  Header header_1  = 3 [(gogoproto.customname) = "Header1", (gogoproto.moretags) = "yaml:\"header_1\""];
-  Header header_2  = 4 [(gogoproto.customname) = "Header2", (gogoproto.moretags) = "yaml:\"header_2\""];
+  Header header_1  = 2 [(gogoproto.customname) = "Header1", (gogoproto.moretags) = "yaml:\"header_1\""];
+  Header header_2  = 3 [(gogoproto.customname) = "Header2", (gogoproto.moretags) = "yaml:\"header_2\""];
 }
 
 // Header defines the Tendermint client consensus Header.

server/export.go

@@ -113,7 +113,7 @@ func ExportCmd(appExporter types.AppExporter, defaultNodeHome string) *cobra.Com
 	cmd.Flags().String(flags.FlagHome, defaultNodeHome, "The application home directory")
 	cmd.Flags().Int64(FlagHeight, -1, "Export state from a particular height (-1 means latest height)")
 	cmd.Flags().Bool(FlagForZeroHeight, false, "Export state to start at height zero (perform preproccessing)")
-	cmd.Flags().StringSlice(FlagJailAllowedAddrs, []string{}, "List of validators to not jail state export")
+	cmd.Flags().StringSlice(FlagJailAllowedAddrs, []string{}, "Comma-separated list of operator addresses of jailed validators to unjail")
 
 	return cmd
 }

x/ibc/applications/transfer/keeper/relay.go

@@ -361,7 +361,9 @@ func (k Keeper) refundPacketToken(ctx sdk.Context, packet channeltypes.Packet, d
 // DenomPathFromHash returns the full denomination path prefix from an ibc denom with a hash
 // component.
 func (k Keeper) DenomPathFromHash(ctx sdk.Context, denom string) (string, error) {
-	hexHash := denom[4:]
+	// trim the denomination prefix, by default "ibc/"
+	hexHash := denom[len(types.DenomPrefix+"/"):]
+
 	hash, err := types.ParseHexHash(hexHash)
 	if err != nil {
 		return "", sdkerrors.Wrap(types.ErrInvalidDenomForTransfer, err.Error())

x/ibc/applications/transfer/spec/01_concepts.md

@@ -109,3 +109,9 @@ Cosmos Hub for the `uatom`). Sending a token back to the same chain across a dif
 **not** move the token back across its timeline. If a channel in the chain history closes before the
 token can be sent back across that channel, then the token will not be returnable to its original
 form.
+
+
+## Security Considerations
+
+For safety, no other module must be capable of minting tokens with the `ibc/` prefix. The IBC
+transfer module needs a subset of the denomination space that only it can create tokens in.

x/ibc/applications/transfer/types/keys.go

@@ -25,6 +25,9 @@ const (
 
 	// QuerierRoute is the querier route for IBC transfer
 	QuerierRoute = ModuleName
+
+	// DenomPrefix is the prefix used for internal SDK coin representation.
+	DenomPrefix = "ibc"
 )
 
 var (

x/ibc/applications/transfer/types/trace.go

@@ -54,7 +54,7 @@ func (dt DenomTrace) GetPrefix() string {
 // 'ibc/{hash(tracePath + baseDenom)}'. If the trace is empty, it will return the base denomination.
 func (dt DenomTrace) IBCDenom() string {
 	if dt.Path != "" {
-		return fmt.Sprintf("ibc/%s", dt.Hash())
+		return fmt.Sprintf("%s/%s", DenomPrefix, dt.Hash())
 	}
 	return dt.BaseDenom
 }
@@ -172,8 +172,8 @@ func ValidateIBCDenom(denom string) error {
 
 	switch {
 	case strings.TrimSpace(denom) == "",
-		len(denomSplit) == 1 && denomSplit[0] == "ibc",
-		len(denomSplit) == 2 && (denomSplit[0] != "ibc" || strings.TrimSpace(denomSplit[1]) == ""):
+		len(denomSplit) == 1 && denomSplit[0] == DenomPrefix,
+		len(denomSplit) == 2 && (denomSplit[0] != DenomPrefix || strings.TrimSpace(denomSplit[1]) == ""):
 		return sdkerrors.Wrapf(ErrInvalidDenomForTransfer, "denomination should be prefixed with the format 'ibc/{hash(trace + \"/\" + %s)}'", denom)
 
 	case denomSplit[0] == denom && strings.TrimSpace(denom) != "":