Merge pull request #212 from meshplus/fix/adapt-to-bitxhub-1-10

fix(*): fix bugs that do not fit the BitXHub version

Author: Sandy Zhou

cmd/pier/did.go

@@ -98,17 +98,16 @@ func registerMethod(ctx *cli.Context) error {
 	if err != nil {
 		return fmt.Errorf("get public key: %w", err)
 	}
-	client, address, err := initClientWithKeyPath(ctx, chainAdminKeyPath)
+	client, _, err := initClientWithKeyPath(ctx, chainAdminKeyPath)
 	if err != nil {
 		return err
 	}
-	appchainAdminDID := fmt.Sprintf("%s:%s:%s", bitxhubRootPrefix, method, address.String())
 	appchainMethod := fmt.Sprintf("%s:%s:.", bitxhubRootPrefix, method)
 	// init method registry with this admin key
 	receipt, err := client.InvokeBVMContract(
 		constant.AppchainMgrContractAddr.Address(),
 		"Register", nil,
-		rpcx.String(appchainAdminDID), rpcx.String(appchainMethod),
+		rpcx.String(appchainMethod),
 		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),

go.mod

@@ -19,10 +19,10 @@ require (
 	github.com/lestrrat-go/strftime v1.0.3 // indirect
 	github.com/libp2p/go-libp2p-core v0.6.1
 	github.com/meshplus/bitxhub-core v1.3.1-0.20210524071255-789fd9ab501c
-	github.com/meshplus/bitxhub-kit v1.2.1-0.20210524063043-9afae78ac098
-	github.com/meshplus/bitxhub-model v1.2.1-0.20210524063354-5d48e2fee178
+	github.com/meshplus/bitxhub-kit v1.2.1-0.20210616114532-4849447f09e1
+	github.com/meshplus/bitxhub-model v1.2.1-0.20210629020432-d98febd566c1
 	github.com/meshplus/bitxid v0.0.0-20210412025850-e0eaf0f9063a
-	github.com/meshplus/go-bitxhub-client v1.3.0
+	github.com/meshplus/go-bitxhub-client v1.3.1-0.20210701063659-a0836fbc1c78
 	github.com/meshplus/go-lightp2p v0.0.0-20200817105923-6b3aee40fa54
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/multiformats/go-multiaddr v0.3.0