Merge branch 'develop' into unstable

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.6.2 (July 27, 2017)
+
+IMPROVEMENTS:
+
+* auto-test all tutorials to detect breaking changes
+* move deployment scripts from `/scripts` to `/publish` for clarity
+
+BUG FIXES:
+
+* `basecoin init` ensures the address in genesis.json is valid
+* fix bug that certain addresses couldn't receive ibc packets
+
 ## 0.6.1 (June 28, 2017)
 
 Make lots of small cli fixes that arose when people were using the tools for

cmd/basecoin/commands/init.go

@@ -1,15 +1,18 @@
 package commands
 
 import (
+	"encoding/hex"
 	"fmt"
 	"io/ioutil"
 	"os"
 
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
 	tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
 	"github.com/tendermint/tendermint/config"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 // InitCmd - node initialization command
@@ -52,8 +55,16 @@ func initCmd(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("`init` takes one argument, a basecoin account address. Generate one using `basecli keys new mykey`")
 	}
 	userAddr := args[0]
-	genesis := GetGenesisJSON(viper.GetString(FlagChainID), userAddr)
+	// verify this account is correct
+	data, err := hex.DecodeString(cmn.StripHex(userAddr))
+	if err != nil {
+		return errors.Wrap(err, "Invalid address")
+	}
+	if len(data) != 20 {
+		return errors.New("Address must be 20-bytes in hex")
+	}
 
+	genesis := GetGenesisJSON(viper.GetString(FlagChainID), userAddr)
 	return CreateGenesisValidatorFiles(cfg, genesis, cmd.Root().Name())
 }
 

version/version.go

@@ -3,6 +3,6 @@ package version
 
 const Maj = "0"
 const Min = "6"
-const Fix = "1"
+const Fix = "2"
 
-const Version = "0.6.1"
+const Version = "0.6.2"