Update to latest harmony-one/harmony + fix BLS naming

cmd/subcommands/staking.go

@@ -315,7 +315,7 @@ Create a new validator"
 				return err
 			}
 
-			blsPubKeys := make([]shard.BlsPublicKey, len(stakingBlsPubKeys))
+			blsPubKeys := make([]shard.BLSPublicKey, len(stakingBlsPubKeys))
 			for i := 0; i < len(stakingBlsPubKeys); i++ {
 				blsPubKey := new(bls.PublicKey)
 				err = blsPubKey.DeserializeHexStr(strings.TrimPrefix(stakingBlsPubKeys[i], "0x"))
@@ -469,19 +469,19 @@ Create a new validator"
 				commisionRate = &cRate
 			}
 
-			var shardPubKeyRemove *shard.BlsPublicKey
+			var shardPubKeyRemove *shard.BLSPublicKey
 			if slotKeyToRemove != "" {
 				blsKey := new(bls.PublicKey)
 				err = blsKey.DeserializeHexStr(strings.TrimPrefix(slotKeyToRemove, "0x"))
 				if err != nil {
 					return err
 				}
-				shardKey := shard.BlsPublicKey{}
+				shardKey := shard.BLSPublicKey{}
 				shardKey.FromLibBLSPublicKey(blsKey)
 				shardPubKeyRemove = &shardKey
 			}
 
-			var shardPubKeyAdd *shard.BlsPublicKey
+			var shardPubKeyAdd *shard.BLSPublicKey
 			var sigBls *shard.BLSSignature
 			if slotKeyToAdd != "" {
 				blsKey := new(bls.PublicKey)
@@ -490,7 +490,7 @@ Create a new validator"
 					return err
 				}
 
-				shardKey := shard.BlsPublicKey{}
+				shardKey := shard.BLSPublicKey{}
 				shardKey.FromLibBLSPublicKey(blsKey)
 				shardPubKeyAdd = &shardKey
 

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/ethereum/go-ethereum v1.8.27
 	github.com/fatih/color v1.7.0
 	github.com/harmony-one/bls v0.0.6
-	github.com/harmony-one/harmony v1.3.4
+	github.com/harmony-one/harmony v1.9.1-0.20200401023838-11d528ecf75f
 	github.com/karalabe/hid v1.0.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.8.1

go.sum

@@ -225,6 +225,8 @@ github.com/harmony-one/harmony v1.3.4 h1:oB75daEn78f8Bxdw6hpBBF2JklkbC3u+44ZRAeH
 github.com/harmony-one/harmony v1.3.4/go.mod h1:DtQ/D4hEowNTC6fROJWNIbQ6MK93Sl1/hAoajVSp3F4=
 github.com/harmony-one/harmony v1.9.0 h1:YmkOT7/bKO7uqW/G1df8uJzaZDfm0NqeHjWnv5EL8hE=
 github.com/harmony-one/harmony v1.9.0/go.mod h1:QSap+ZUyk1uetXfu0FVuaVcfbtr1LYqHG+u5eDeNM+A=
+github.com/harmony-one/harmony v1.9.1-0.20200401023838-11d528ecf75f h1:M/mEqGN5AJ5yZAbZSJDWfm06itl4kc0Nq5gSL6/xLMQ=
+github.com/harmony-one/harmony v1.9.1-0.20200401023838-11d528ecf75f/go.mod h1:vsLCYngIOvq4qhscoDmoE1Lxv9Ty2hjDnDKx4vc3iiQ=
 github.com/harmony-one/taggedrlp v0.1.2 h1:lAHV4UhBE45W+i7duAAWOgaQNUjDIG6rUydz/5Oqric=
 github.com/harmony-one/taggedrlp v0.1.2/go.mod h1:AK7o802368ESS3v4WZI5DzaHv9q0CsdgR9jPVJ6zleg=
 github.com/harmony-one/taggedrlp v0.1.4 h1:RZ+qy0VCzT+d/mTfq23gH3an5tSvxOhg6AddLDO6tKw=
@@ -767,6 +769,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

pkg/keys/bls.go

@@ -170,7 +170,7 @@ func VerifyBLS(blsPubKey string) (shard.BLSSignature, error) {
 		return sig, errors.New("bls key could not be verified")
 	}
 
-	messageBytes := []byte(types.BlsVerificationStr)
+	messageBytes := []byte(types.BLSVerificationStr)
 	msgHash := hash.Keccak256(messageBytes)
 	signature := privateKey.SignHash(msgHash[:])