Merge pull request #205 from meshplus/feat/support_bitxhub2.8

Feat/support bitxhub2.8

Author: roxie-23

Makefile

@@ -42,12 +42,12 @@ test-coverage:
 
 ## make install: Go install the project
 install:
-	cd cmd/goduck && packr
+	cd cmd/goduck && packr2
 	$(GO) install -ldflags '${GO_LDFLAGS}' ./cmd/${APP_NAME}
 	@printf "${GREEN}Build ${APP_NAME} successfully!${NC}\n"
 
 build:
-	cd cmd/goduck && packr
+	cd cmd/goduck && packr2
 	@mkdir -p bin
 	$(GO) build -ldflags '${GO_LDFLAGS}' ./cmd/${APP_NAME}
 	@mv ./${APP_NAME} bin

cmd/goduck/bitxhub.go

@@ -32,6 +32,7 @@ var bxhConfigMap = map[string]string{
 	"v1.11.1": "v1.11.0",
 	"v1.11.3": "v1.11.3",
 	"v1.23.0": "v1.23.0",
+	"v2.8.0":  "v2.8.0",
 }
 
 func bitxhubCMD() *cli.Command {
@@ -58,7 +59,7 @@ func bitxhubCMD() *cli.Command {
 					},
 					&cli.StringFlag{
 						Aliases: []string{"version", "v"},
-						Value:   "v1.23.0",
+						Value:   "v2.8.0",
 						Usage:   "BitXHub version",
 					},
 				},
@@ -88,7 +89,7 @@ func bitxhubCMD() *cli.Command {
 					},
 					&cli.StringFlag{
 						Aliases: []string{"version", "v"},
-						Value:   "v1.23.0",
+						Value:   "v2.8.0",
 						Usage:   "BitXHub version",
 					},
 				},

cmd/goduck/config.go

@@ -24,7 +24,7 @@ import (
 	"github.com/codeskyblue/go-sh"
 	"github.com/fatih/color"
 	"github.com/gobuffalo/packd"
-	"github.com/gobuffalo/packr"
+	"github.com/gobuffalo/packr/v2"
 	"github.com/meshplus/bitxhub-kit/crypto"
 	"github.com/meshplus/bitxhub-kit/crypto/asym"
 	"github.com/meshplus/bitxhub-kit/fileutil"
@@ -1237,7 +1237,7 @@ func renderConfigFiles(dstDir, srcDir string, filesToRender []string, data inter
 		filesM[file] = struct{}{}
 	}
 
-	box := packr.NewBox(filepath.Join(PackPath, srcDir))
+	box := packr.New("box", filepath.Join(PackPath, srcDir))
 	if err := box.Walk(func(s string, file packd.File) error {
 		p := filepath.Join(dstDir, s)
 		dir := filepath.Dir(p)
@@ -1273,7 +1273,7 @@ func renderConfigFiles(dstDir, srcDir string, filesToRender []string, data inter
 }
 
 func renderConfigFile(dstDir string, srcFiles []string, data interface{}) error {
-	box := packr.NewBox(PackPath)
+	box := packr.New("box", PackPath)
 
 	for _, srcFile := range srcFiles {
 		fileStr, err := box.FindString(srcFile)

cmd/goduck/ether.go

@@ -23,6 +23,7 @@ var EthConfigMap = map[string]string{
 	"v1.11.1": "1.3.0",
 	"v1.11.3": "1.3.0",
 	"v1.23.0": "1.2.0",
+	"v2.8.0":  "1.2.0",
 }
 
 func etherCMD() *cli.Command {
@@ -62,7 +63,7 @@ func etherCMD() *cli.Command {
 						Name:     "bxh-version",
 						Usage:    "specify bitxhub version (Only for docker. The launched ethereum private chain in docker mod has already deployed the cross-chain contract required for the corresponding version of BitXHub)",
 						Required: false,
-						Value:    "v1.23.0",
+						Value:    "v2.8.0",
 					},
 				},
 				Action: startEther,

cmd/goduck/ethereum/contract.go

@@ -135,7 +135,7 @@ var ContractCMD = &cli.Command{
 				&cli.StringFlag{
 					Name:     "version",
 					Usage:    "specify bitxhub version",
-					Value:    "v1.6.5",
+					Value:    "v2.8.0",
 					Required: false,
 				},
 			},
@@ -154,6 +154,9 @@ func downloadContract(ctx *cli.Context) error {
 	if !fileutil.Exist(repoPath) {
 		return fmt.Errorf("please `goduck init` first")
 	}
+	if version == "v2.8.0" {
+		ethContract = append(ethContract, "broker_data")
+	}
 
 	for _, contract := range ethContract {
 		path := filepath.Join(repoPath, types.ChainTypeEther, "contract", version, fmt.Sprintf("%s.sol", contract))

cmd/goduck/fabric/contract.go

@@ -33,7 +33,7 @@ var ContractCMD = &cli.Command{
 				&cli.StringFlag{
 					Name:     "bxh-version",
 					Usage:    "specify bitxhub version. If not set code-path, the code will be downloaded based on this version",
-					Value:    "v1.6.5",
+					Value:    "v2.8.0",
 					Required: false,
 				},
 				&cli.StringFlag{

cmd/goduck/init.go

@@ -13,7 +13,7 @@ import (
 	"github.com/coreos/etcd/pkg/fileutil"
 	"github.com/fatih/color"
 	"github.com/gobuffalo/packd"
-	"github.com/gobuffalo/packr"
+	"github.com/gobuffalo/packr/v2"
 	"github.com/meshplus/goduck/internal/repo"
 	"github.com/meshplus/goduck/internal/types"
 	"github.com/urfave/cli/v2"
@@ -50,8 +50,8 @@ func Initialize(ctx *cli.Context) error {
 			return nil
 		}
 	}
-	scriptBox := packr.NewBox(ScriptsPath)
-	configBox := packr.NewBox(ConfigPath)
+	scriptBox := packr.New("scriptBox", ScriptsPath)
+	configBox := packr.New("configBox", ConfigPath)
 
 	var walkFn = func(s string, file packd.File) error {
 		p := filepath.Join(repoRoot, s)

cmd/goduck/pier.go

@@ -27,6 +27,7 @@ var pierConfigMap = map[string]string{
 	"v1.11.1": "v1.11.0",
 	"v1.11.3": "v1.11.3",
 	"v1.23.0": "v1.23.0",
+	"v2.8.0":  "v2.8.0",
 }
 
 var pierCMD = &cli.Command{
@@ -57,7 +58,7 @@ var pierCMD = &cli.Command{
 				},
 				&cli.StringFlag{
 					Aliases: []string{"version", "v"},
-					Value:   "v1.23.0",
+					Value:   "v2.8.0",
 					Usage:   "Pier version",
 				},
 			},
@@ -92,7 +93,7 @@ var pierCMD = &cli.Command{
 				},
 				&cli.StringFlag{
 					Aliases: []string{"version", "v"},
-					Value:   "v1.23.0",
+					Value:   "v2.8.0",
 					Usage:   "Pier version",
 				},
 			},
@@ -131,7 +132,7 @@ var pierCMD = &cli.Command{
 				},
 				&cli.StringFlag{
 					Aliases: []string{"version", "v"},
-					Value:   "v1.23.0",
+					Value:   "v2.8.0",
 					Usage:   "Pier version",
 				},
 			},

cmd/goduck/playground.go

@@ -33,7 +33,7 @@ func playgroundCMD() *cli.Command {
 					&cli.StringFlag{
 						Aliases:  []string{"version", "v"},
 						Usage:    "version of the demo interchain system",
-						Value:    "v1.23.0",
+						Value:    "v2.8.0",
 						Required: false,
 					},
 				},
@@ -56,7 +56,7 @@ func playgroundCMD() *cli.Command {
 					&cli.StringFlag{
 						Aliases:  []string{"version", "v"},
 						Usage:    "version of the demo interchain system",
-						Value:    "v1.23.0",
+						Value:    "v2.8.0",
 						Required: false,
 					},
 				},

go.mod

@@ -18,8 +18,8 @@ require (
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/ethereum/go-ethereum v1.10.6
 	github.com/fatih/color v1.7.0
-	github.com/gobuffalo/packd v1.0.0
-	github.com/gobuffalo/packr v1.30.1
+	github.com/gobuffalo/packd v1.0.1
+	github.com/gobuffalo/packr/v2 v2.8.3
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/hyperledger/fabric v2.0.1+incompatible
 	github.com/hyperledger/fabric-sdk-go v1.0.0-beta1
@@ -31,11 +31,11 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.1 // indirect
-	github.com/pelletier/go-toml v1.8.0
+	github.com/pelletier/go-toml v1.9.3
 	github.com/pkg/errors v0.9.1
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible
-	github.com/sirupsen/logrus v1.6.0
-	github.com/spf13/viper v1.6.1
+	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/viper v1.8.1
 	github.com/stretchr/testify v1.7.0
 	github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31
 	github.com/urfave/cli/v2 v2.3.0