Merge pull request #1531 from 0chain/feature/split-key-option

Feature: add separate split key option

Author: dabasov

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

@@ -6,26 +6,32 @@ import (
 )
 
 var (
-	deploymentMode int
-	keysFile       string
-	keysFileRaw    string
-	mountPoint     string
-	metadataDB     string
-	logDir         string
-	httpPort       int
-	hostname       string
-	configDir      string
-	grpcPort       int
-	httpsPort      int
-	httpsKeyFile   string
-	httpsCertFile  string
-	hostUrl        string
+	deploymentMode     int
+	keysFile           string
+	keysFilePublicKey  string
+	keysFilePrivateKey string
+	keysFileClientKey  string
+	keysFileIsSplit    bool
+	mountPoint         string
+	metadataDB         string
+	logDir             string
+	httpPort           int
+	hostname           string
+	configDir          string
+	grpcPort           int
+	httpsPort          int
+	httpsKeyFile       string
+	httpsCertFile      string
+	hostUrl            string
 )
 
 func init() {
 	flag.IntVar(&deploymentMode, "deployment_mode", 2, "deployment mode: 0=dev,1=test, 2=mainnet")
 	flag.StringVar(&keysFile, "keys_file", "", "keys_file")
-	flag.StringVar(&keysFileRaw, "keys_file_raw", "", "keys_file_raw")
+	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")
 	flag.StringVar(&logDir, "log_dir", "", "log_dir")

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

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

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

@@ -103,6 +103,10 @@ func setupServerChain() error {
 		return err
 	}
 
+	if node.Self.GetWallet().IsSplit {
+		zcncore.RegisterZauthServer(serverChain.ZauthServer)
+	}
+
 	fmt.Print("	[OK]\n")
 	return nil
 }

code/go/0chain.net/blobbercore/handler/protocol.go

@@ -3,9 +3,10 @@ package handler
 import (
 	"context"
 	"errors"
+	"sync"
+
 	"github.com/0chain/gosdk/core/client"
 	coreTxn "github.com/0chain/gosdk/core/transaction"
-	"sync"
 
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/allocation"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/config"

code/go/0chain.net/core/chain/entity.go

@@ -51,6 +51,7 @@ func NewChainFromConfig() *Chain {
 	chain.ID = common.ToKey(config.Configuration.ChainID)
 	chain.OwnerID = viper.GetString("server_chain.owner")
 	chain.BlockWorker = viper.GetString("block_worker")
+	chain.ZauthServer = viper.GetString("zauth_server")
 	return chain
 }
 

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

@@ -4,6 +4,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+
 	"github.com/0chain/blobber/code/go/0chain.net/core/common"
 	"github.com/0chain/blobber/code/go/0chain.net/core/config"
 	"github.com/0chain/gosdk/core/zcncrypto"
@@ -19,20 +20,43 @@ type SelfNode struct {
 }
 
 /*SetKeys - setter */
-func (sn *SelfNode) SetKeys(publicKey, privateKey string) {
-	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
+
+	if isSplit {
+		sn.wallet.ClientKey = clientKey
+	} else {
+		sn.wallet.ClientKey = publicKey
+	}
+
 	sn.wallet.Keys = make([]zcncrypto.KeyPair, 1)
 	sn.wallet.Keys[0].PublicKey = publicKey
 	sn.wallet.Keys[0].PrivateKey = privateKey
 	sn.wallet.Version = zcncrypto.CryptoVersion
+	sn.wallet.IsSplit = isSplit
+
+	if isSplit {
+		sn.PublicKey = clientKey
+	} else {
+		sn.PublicKey = publicKey
+	}
 
-	sn.PublicKey = publicKey
 	sn.ID = sn.wallet.ClientID
 }
 

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)
+	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)
+	node.Self.SetKeys("", wallet.Keys[0].PublicKey, wallet.Keys[0].PrivateKey, false)
 	return nil
 }

config/0chain_blobber.yaml

@@ -45,6 +45,8 @@ min_confirmation: 10
 
 block_worker: https://dev.0chain.net/dns
 
+zauth_server: https://zauth.dev.0chain.net/
+
 rate_limiters:
   # Rate limiters will use this duration to clean unused token buckets.
   # If it is 0 then token will expire in 10 years.