Merge pull request #554 from HaoyangLiu/feature/deps-0.26.0

Add prefix define for all binary
irisnet · Nov 9, 2018 · 13ceb5b · 13ceb5b
2 parents 2e01b67 + 94c6dc9
commit 13ceb5b
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -47,7 +47,7 @@ update_irislcd_swagger_docs:
 ### Compile and Install
 install: update_irislcd_swagger_docs
 	go install $(BUILD_FLAGS) ./cmd/iris
-#	go install $(BUILD_FLAGS) ./cmd/iriscli
+	go install $(BUILD_FLAGS) ./cmd/iriscli
 #	go install $(BUILD_FLAGS) ./cmd/irislcd
 #	go install $(BUILD_FLAGS) ./cmd/irismon
 

diff --git a/app/app.go b/app/app.go
@@ -4,22 +4,28 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"os"
+	"sort"
+	"strings"
+
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
-	"github.com/irisnet/irishub/modules/gov"
 	"github.com/cosmos/cosmos-sdk/x/ibc"
 	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/params"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	"github.com/cosmos/cosmos-sdk/x/stake"
 	bam "github.com/irisnet/irishub/baseapp"
 	"github.com/irisnet/irishub/iparam"
+	"github.com/irisnet/irishub/modules/gov"
 	"github.com/irisnet/irishub/modules/gov/params"
 	"github.com/irisnet/irishub/modules/iservice"
+	"github.com/irisnet/irishub/modules/iservice/params"
 	"github.com/irisnet/irishub/modules/record"
 	"github.com/irisnet/irishub/modules/upgrade"
 	"github.com/irisnet/irishub/modules/upgrade/params"
@@ -33,11 +39,6 @@ import (
 	"github.com/tendermint/tendermint/node"
 	sm "github.com/tendermint/tendermint/state"
 	tmtypes "github.com/tendermint/tendermint/types"
-	"io"
-	"os"
-	"sort"
-	"strings"
-	"github.com/irisnet/irishub/modules/iservice/params"
 )
 
 const (
@@ -388,7 +389,7 @@ func (app *IrisApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci
 		if len(req.Validators) != len(validators) {
 			panic(fmt.Errorf("len(RequestInitChain.Validators) != len(validators) (%d != %d)",
 				len(req.Validators), len(validators)))
-	}
+		}
 		sort.Sort(abci.ValidatorUpdates(req.Validators))
 		sort.Sort(abci.ValidatorUpdates(validators))
 		for i, val := range validators {

diff --git a/cmd/iris/main.go b/cmd/iris/main.go
@@ -6,46 +6,31 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/irisnet/irishub/client"
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/irisnet/irishub/app"
 	bam "github.com/irisnet/irishub/baseapp"
+	"github.com/irisnet/irishub/client"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	irisInit "github.com/irisnet/irishub/init"
 	"github.com/irisnet/irishub/version"
 	"github.com/spf13/viper"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/cli"
 	dbm "github.com/tendermint/tendermint/libs/db"
 	"github.com/tendermint/tendermint/libs/log"
 	tmtypes "github.com/tendermint/tendermint/types"
-	irisInit "github.com/irisnet/irishub/init"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-const (
-	// Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
-	bech32PrefixAccAddr = "faa"
-	// Bech32PrefixAccPub defines the Bech32 prefix of an account's public key
-	bech32PrefixAccPub = "fap"
-	// Bech32PrefixValAddr defines the Bech32 prefix of a validator's operator address
-	bech32PrefixValAddr = "fva"
-	// Bech32PrefixValPub defines the Bech32 prefix of a validator's operator public key
-	bech32PrefixValPub = "fvp"
-	// Bech32PrefixConsAddr defines the Bech32 prefix of a consensus node address
-	bech32PrefixConsAddr = "fca"
-	// Bech32PrefixConsPub defines the Bech32 prefix of a consensus node public key
-	bech32PrefixConsPub = "fcp"
 )
 
 func main() {
-	cdc := app.MakeCodec()
 
 	config := sdk.GetConfig()
-	config.SetBech32PrefixForAccount(bech32PrefixAccAddr, bech32PrefixAccPub)
-	config.SetBech32PrefixForValidator(bech32PrefixValAddr, bech32PrefixValPub)
-	config.SetBech32PrefixForConsensusNode(bech32PrefixConsAddr, bech32PrefixConsPub)
+	config.SetBech32PrefixForAccount(irisInit.Bech32PrefixAccAddr, irisInit.Bech32PrefixAccPub)
+	config.SetBech32PrefixForValidator(irisInit.Bech32PrefixValAddr, irisInit.Bech32PrefixValPub)
+	config.SetBech32PrefixForConsensusNode(irisInit.Bech32PrefixConsAddr, irisInit.Bech32PrefixConsPub)
 	config.Seal()
 
+	cdc := app.MakeCodec()
 	ctx := server.NewDefaultContext()
 	cobra.EnableCommandSorting = false
 	rootCmd := &cobra.Command{
@@ -71,8 +56,8 @@ func main() {
 	startCmd.Flags().Bool(app.FlagReplay, false, "Replay the last block")
 	rootCmd.AddCommand(
 		irisInit.InitCmd(ctx, cdc, app.IrisAppInit()),
-		irisInit.GenTxCmd(ctx,cdc),
-		irisInit.TestnetFilesCmd(ctx,cdc,app.IrisAppInit()),
+		irisInit.GenTxCmd(ctx, cdc),
+		irisInit.TestnetFilesCmd(ctx, cdc, app.IrisAppInit()),
 		irisInit.CollectGenTxsCmd(ctx, cdc),
 		startCmd,
 		//server.TestnetFilesCmd(ctx, cdc, app.IrisAppInit()),

diff --git a/cmd/iriscli/main.go b/cmd/iriscli/main.go
@@ -4,6 +4,7 @@ import (
 	"os"
 	"path"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	"github.com/irisnet/irishub/app"
 	"github.com/irisnet/irishub/client"
@@ -18,6 +19,7 @@ import (
 	tendermintrpccmd "github.com/irisnet/irishub/client/tendermint/rpc"
 	tenderminttxcmd "github.com/irisnet/irishub/client/tendermint/tx"
 	upgradecmd "github.com/irisnet/irishub/client/upgrade/cli"
+	irisInit "github.com/irisnet/irishub/init"
 	"github.com/irisnet/irishub/version"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -33,6 +35,13 @@ var (
 )
 
 func main() {
+
+	config := sdk.GetConfig()
+	config.SetBech32PrefixForAccount(irisInit.Bech32PrefixAccAddr, irisInit.Bech32PrefixAccPub)
+	config.SetBech32PrefixForValidator(irisInit.Bech32PrefixValAddr, irisInit.Bech32PrefixValPub)
+	config.SetBech32PrefixForConsensusNode(irisInit.Bech32PrefixConsAddr, irisInit.Bech32PrefixConsPub)
+	config.Seal()
+
 	cobra.EnableCommandSorting = false
 	cdc := app.MakeCodec()
 

diff --git a/cmd/irisdebug/main.go b/cmd/irisdebug/main.go
@@ -10,15 +10,22 @@ import (
 	"strconv"
 	"strings"
 
-	iris "github.com/irisnet/irishub/app"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
+	iris "github.com/irisnet/irishub/app"
+	irisInit "github.com/irisnet/irishub/init"
 	"github.com/spf13/cobra"
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 )
 
 func init() {
+	config := sdk.GetConfig()
+	config.SetBech32PrefixForAccount(irisInit.Bech32PrefixAccAddr, irisInit.Bech32PrefixAccPub)
+	config.SetBech32PrefixForValidator(irisInit.Bech32PrefixValAddr, irisInit.Bech32PrefixValPub)
+	config.SetBech32PrefixForConsensusNode(irisInit.Bech32PrefixConsAddr, irisInit.Bech32PrefixConsPub)
+	config.Seal()
+
 	rootCmd.AddCommand(txCmd)
 	rootCmd.AddCommand(pubkeyCmd)
 	rootCmd.AddCommand(addrCmd)
@@ -208,7 +215,7 @@ func runTxCmd(cmd *cobra.Command, args []string) error {
 	var tx = auth.StdTx{}
 	cdc := iris.MakeCodec()
 
-	err = cdc.UnMarshalBinaryLengthPrefixed(txBytes, &tx)
+	err = cdc.UnmarshalBinaryLengthPrefixed(txBytes, &tx)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/irislcd/main.go b/cmd/irislcd/main.go
@@ -1,9 +1,11 @@
 package main
 
 import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/irisnet/irishub/app"
 	"github.com/irisnet/irishub/client/lcd"
 	_ "github.com/irisnet/irishub/client/lcd/statik"
+	irisInit "github.com/irisnet/irishub/init"
 	"github.com/irisnet/irishub/version"
 	"github.com/spf13/cobra"
 	"github.com/tendermint/tendermint/libs/cli"
@@ -18,6 +20,13 @@ var (
 )
 
 func main() {
+
+	config := sdk.GetConfig()
+	config.SetBech32PrefixForAccount(irisInit.Bech32PrefixAccAddr, irisInit.Bech32PrefixAccPub)
+	config.SetBech32PrefixForValidator(irisInit.Bech32PrefixValAddr, irisInit.Bech32PrefixValPub)
+	config.SetBech32PrefixForConsensusNode(irisInit.Bech32PrefixConsAddr, irisInit.Bech32PrefixConsPub)
+	config.Seal()
+
 	cobra.EnableCommandSorting = false
 	cdc := app.MakeCodec()
 

diff --git a/init/prefix.go b/init/prefix.go
@@ -0,0 +1,16 @@
+package init
+
+const (
+	// Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
+	Bech32PrefixAccAddr = "faa"
+	// Bech32PrefixAccPub defines the Bech32 prefix of an account's public key
+	Bech32PrefixAccPub = "fap"
+	// Bech32PrefixValAddr defines the Bech32 prefix of a validator's operator address
+	Bech32PrefixValAddr = "fva"
+	// Bech32PrefixValPub defines the Bech32 prefix of a validator's operator public key
+	Bech32PrefixValPub = "fvp"
+	// Bech32PrefixConsAddr defines the Bech32 prefix of a consensus node address
+	Bech32PrefixConsAddr = "fca"
+	// Bech32PrefixConsPub defines the Bech32 prefix of a consensus node public key
+	Bech32PrefixConsPub = "fcp"
+)