feature: added client key arg option

Author: YarikRevich

code/go/0chain.net/blobber/flags.go

@@ -10,6 +10,7 @@ var (
 	keysFile           string
 	keysFilePublicKey  string
 	keysFilePrivateKey string
+	keysFileClientKey  string
 	keysFileIsSplit    bool
 	mountPoint         string
 	metadataDB         string
@@ -29,6 +30,7 @@ func init() {
 	flag.StringVar(&keysFile, "keys_file", "", "keys_file")
 	flag.StringVar(&keysFilePublicKey, "keys_file_public_key", "", "keys_file_public_key")
 	flag.StringVar(&keysFilePrivateKey, "keys_file_private_key", "", "keys_file_private_key")
+	flag.StringVar(&keysFileClientKey, "keys_file_client_key", "", "keys_file_client_key")
 	flag.BoolVar(&keysFileIsSplit, "keys_file_is_split", false, "keys_file_is_split")
 	flag.StringVar(&mountPoint, "files_dir", "", "Mounted partition where all files will be stored")
 	flag.StringVar(&metadataDB, "db_dir", "", "db_dir")

code/go/0chain.net/blobber/node.go

@@ -14,7 +14,7 @@ import (
 	"go.uber.org/zap"
 )
 
-var publicKey, privateKey string
+var clientKey, publicKey, privateKey string
 
 func setupNode() error {
 	fmt.Println("> setup blobber")
@@ -25,6 +25,10 @@ func setupNode() error {
 		privateKey = keysFilePrivateKey
 		publicKey = keysFilePublicKey
 
+		if keysFileIsSplit {
+			clientKey = keysFileClientKey
+		}
+
 		fmt.Println("using blobber keys from local string")
 	} else {
 		err = readKeysFromAws()
@@ -39,7 +43,7 @@ func setupNode() error {
 		}
 	}
 
-	node.Self.SetKeys(publicKey, privateKey, keysFileIsSplit)
+	node.Self.SetKeys(clientKey, publicKey, privateKey, keysFileIsSplit)
 
 	if node.Self.ID == "" {
 		return errors.New("node definition for self node doesn't exist")

code/go/0chain.net/core/node/self_node.go

@@ -20,11 +20,22 @@ type SelfNode struct {
 }
 
 /*SetKeys - setter */
-func (sn *SelfNode) SetKeys(publicKey, privateKey string, isSplit bool) {
-	publicKeyBytes, err := hex.DecodeString(publicKey)
+func (sn *SelfNode) SetKeys(clientKey, publicKey, privateKey string, isSplit bool) {
+	var (
+		publicKeyBytes []byte
+		err            error
+	)
+
+	if isSplit {
+		publicKeyBytes, err = hex.DecodeString(clientKey)
+	} else {
+		publicKeyBytes, err = hex.DecodeString(publicKey)
+	}
+
 	if err != nil {
 		panic(err)
 	}
+
 	sn.wallet = &zcncrypto.Wallet{}
 	sn.wallet.ClientID = Hash(publicKeyBytes)
 	sn.wallet.ClientKey = publicKey

code/go/0chain.net/validator/main.go

@@ -107,7 +107,7 @@ func main() {
 		fmt.Println("using validator keys from aws")
 	}
 
-	node.Self.SetKeys(publicKey, privateKey, false)
+	node.Self.SetKeys("", publicKey, privateKey, false)
 
 	if len(*hostUrl) > 0 {
 		node.Self.URL = *hostUrl

code/go/0chain.net/validatorcore/storage/models_test.go

@@ -659,6 +659,6 @@ func setupModelsTest(t *testing.T) error {
 		return err
 	}
 
-	node.Self.SetKeys(wallet.Keys[0].PublicKey, wallet.Keys[0].PrivateKey, false)
+	node.Self.SetKeys("", wallet.Keys[0].PublicKey, wallet.Keys[0].PrivateKey, false)
 	return nil
 }