Merge pull request #109 from wukongcheng/silei/software-upgrade

Silei/software upgrade:  fix bug that each node has different appHash

Makefile

@@ -20,6 +20,8 @@ build_cur:
 build_example:
 	go build  -o build/basecoind ./examples/basecoin/cmd/basecoind
 	go build  -o build/basecli ./examples/basecoin/cmd/basecli
+	go build  -o build/basecoind1 ./examples/basecoin1/cmd/basecoind1
+	go build  -o build/basecli1 ./examples/basecoin1/cmd/basecli1
 
 install_examples:
 	go install ./examples/basecoin/cmd/basecoind

modules/upgrade/keep_test.go

@@ -114,6 +114,20 @@ func TestSwitchKeeper(t *testing.T) {
 	require.Equal(t, len(ModuleListBucket[3]), 2)
 }
 
+func TestSetKVStoreKeylist(t *testing.T) {
+	ctx, keeper := createTestInput(t)
+
+	router := baseapp.NewRouter()
+	router.AddRoute("main-0", []*sdk.KVStoreKey{sdk.NewKVStoreKey("main")}, nil)
+	router.AddRoute("acc-0", []*sdk.KVStoreKey{sdk.NewKVStoreKey("acc")}, nil)
+	router.AddRoute("gov-0", []*sdk.KVStoreKey{sdk.NewKVStoreKey("gov")}, nil)
+	router.AddRoute("stake-0", []*sdk.KVStoreKey{sdk.NewKVStoreKey("stake")}, nil)
+	router.AddRoute("upgrade-0", []*sdk.KVStoreKey{sdk.NewKVStoreKey("upgrade")}, nil)
+
+	InitGenesis(ctx, keeper, router)
+	keeper.SetKVStoreKeylist(ctx)
+}
+
 func getModuleList(router baseapp.Router) ModuleLifeTimeList {
 
 	modulelist := NewModuleLifeTimeList()

modules/upgrade/keeper_commitID.go

@@ -3,6 +3,7 @@ package upgrade
 import (
 	"fmt"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"sort"
 )
 
 var (
@@ -35,8 +36,15 @@ func (keeper Keeper) SetKVStoreKeylist(ctx sdk.Context) {
 		}
 	}
 
-	var KVStoreKeyList string
+	var list []string
 	for key, _ := range storeSet {
+		list = append(list, key)
+	}
+
+	sort.Sort(sort.StringSlice(list))
+
+	var KVStoreKeyList string
+	for _, key := range list {
 		if KVStoreKeyList == "" {
 			KVStoreKeyList += key
 		} else {