Merge pull request #231 from meshplus/fix-release-1.11

fix(cmd):update appchain register and rule

Author: jzhe886

cmd/pier/did.go

@@ -45,6 +45,8 @@ var methodCommand = cli.Command{
 				appchainVersionFlag,
 				appchainValidatorFlag,
 				appchainConsensusFlag,
+				appchainRuleFlag,
+				appchainRuleUrlFlag,
 				governanceReasonFlag,
 			},
 			Action: registerMethod,
@@ -89,6 +91,8 @@ func registerMethod(ctx *cli.Context) error {
 	version := ctx.String("version")
 	validatorsPath := ctx.String("validators")
 	consensus := ctx.String("consensus")
+	rule := ctx.String("rule")
+	rule_url := ctx.String("rule-url")
 	reason := ctx.String("reason")
 	validatorData, err := ioutil.ReadFile(validatorsPath)
 	if err != nil {
@@ -107,13 +111,13 @@ func registerMethod(ctx *cli.Context) error {
 	// init method registry with this admin key
 	receipt, err := client.InvokeBVMContract(
 		constant.AppchainMgrContractAddr.Address(),
-		"Register", nil,
+		"RegisterV2", nil,
 		rpcx.String(method),
 		rpcx.String(didDocAddr), rpcx.String(didDocHash),
 		rpcx.String(string(validatorData)), rpcx.String(consensus), rpcx.String(typ),
 		rpcx.String(name), rpcx.String(desc), rpcx.String(version),
 		rpcx.String(pubKey),
-		rpcx.String(reason),
+		rpcx.String(reason), rpcx.String(rule), rpcx.String(rule_url),
 	)
 	if err != nil {
 		return fmt.Errorf("invoke bvm contract: %w", err)

cmd/pier/flags.go

@@ -72,6 +72,16 @@ var (
 		Usage:    "Specific appchain consensus type",
 		Required: true,
 	}
+	appchainRuleFlag = cli.StringFlag{
+		Name:     "rule",
+		Usage:    "Specific appchain rule",
+		Required: true,
+	}
+	appchainRuleUrlFlag = cli.StringFlag{
+		Name:     "rule-url",
+		Usage:    "Specific appchain rule url",
+		Required: true,
+	}
 	governanceReasonFlag = cli.StringFlag{
 		Name:     "reason",
 		Usage:    "Specify governance reason",

cmd/pier/rule.go

@@ -26,7 +26,7 @@ var ruleCMD = cli.Command{
 				},
 				methodFlag,
 				adminKeyPathFlag,
-				governanceReasonFlag,
+				appchainRuleUrlFlag,
 			},
 			Action: deployRule,
 		},
@@ -66,7 +66,7 @@ func deployRule(ctx *cli.Context) error {
 	rulePath := ctx.String("path")
 	method := ctx.String("method")
 	chainAdminKeyPath := ctx.String("admin-key")
-	reason := ctx.String("reason")
+	rule_url := ctx.String("rule-url")
 
 	client, _, err := initClientWithKeyPath(ctx, chainAdminKeyPath)
 	if err != nil {
@@ -91,22 +91,16 @@ func deployRule(ctx *cli.Context) error {
 	appchainMethod := fmt.Sprintf("%s:%s:.", bitxhubRootPrefix, method)
 	receipt, err := client.InvokeBVMContract(
 		constant.RuleManagerContractAddr.Address(),
-		"RegisterRule", nil,
-		rpcx.String(appchainMethod), rpcx.String(contractAddr.String()), rpcx.String(reason))
+		"RegisterRuleV2", nil,
+		rpcx.String(appchainMethod), rpcx.String(contractAddr.String()), rpcx.String(rule_url))
 	if err != nil {
 		return fmt.Errorf("Register rule: %w", err)
 	}
 
 	if !receipt.IsSuccess() {
 		color.Red(fmt.Sprintf("Register rule to bitxhub for appchain %s error: %s", appchainMethod, string(receipt.Ret)))
 	} else {
-		proposalId := gjson.Get(string(receipt.Ret), "proposal_id").String()
-		if proposalId != "" {
-			color.Green(fmt.Sprintf("Register rule to bitxhub for appchain %s successfully, the bind request was submitted successfully, wait for proposal %s to finish.", appchainMethod, proposalId))
-		} else {
-			color.Green(fmt.Sprintf("Register rule to bitxhub for appchain %s successfully.", appchainMethod))
-		}
-
+		color.Green(fmt.Sprintf("Register rule to bitxhub for appchain %s successfully.", appchainMethod))
 	}
 
 	return nil

go.mod

@@ -6,16 +6,19 @@ require (
 	github.com/Rican7/retry v0.1.0
 	github.com/btcsuite/btcd v0.21.0-beta
 	github.com/cbergoon/merkletree v0.2.0
-	github.com/ethereum/go-ethereum v1.10.7 // indirect
 	github.com/fatih/color v1.9.0
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gobuffalo/packd v1.0.0
 	github.com/gobuffalo/packr v1.30.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/mock v1.5.0
+	github.com/golang/snappy v0.0.3 // indirect
+	github.com/google/uuid v1.1.5 // indirect
 	github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd
 	github.com/hashicorp/go-plugin v1.3.0
+	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
+	github.com/huin/goupnp v1.0.2 // indirect
 	github.com/ipfs/go-cid v0.0.7
 	github.com/lestrrat-go/strftime v1.0.3 // indirect
 	github.com/libp2p/go-libp2p-core v0.6.1
@@ -34,7 +37,14 @@ require (
 	github.com/urfave/cli v1.22.1
 	github.com/wonderivan/logger v1.0.0
 	go.uber.org/atomic v1.6.0
+	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
+	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
+	golang.org/x/mod v0.4.2 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988 // indirect
+	golang.org/x/text v0.3.6 // indirect
 	google.golang.org/grpc v1.33.1
+	honnef.co/go/tools v0.1.3 // indirect
 )
 
 replace github.com/libp2p/go-libp2p-core => github.com/libp2p/go-libp2p-core v0.5.6