Merge pull request #172 from 0chain/feat/env-allocid

Use wallet, allocaion from env flags

Author: dabasov

cmd/gateway/zcn/gateway-zcn.go

@@ -35,13 +35,14 @@ const (
 )
 
 var (
-	configDir    string
-	allocationID string
-	nonce        int64
-	encrypt      bool
-	compress     bool
-	workDir      string
-	serverConfig serverOptions
+	configDir     string
+	allocationID  string
+	nonce         int64
+	encrypt       bool
+	compress      bool
+	workDir       string
+	serverConfig  serverOptions
+	walletDetails string
 )
 
 var zFlags = []cli.Flag{
@@ -54,12 +55,19 @@ var zFlags = []cli.Flag{
 		Name:        "allocationId",
 		Usage:       "Allocation id of an allocation",
 		Destination: &allocationID,
+		EnvVar:      "ALLOCATION_ID",
 	},
 	cli.Int64Flag{
 		Name:        "nonce",
 		Usage:       "nonce to use in transaction",
 		Destination: &nonce,
 	},
+	cli.StringFlag{
+		Name:        "wallet",
+		Usage:       "wallet details",
+		Destination: &walletDetails,
+		EnvVar:      "WALLET_DETAILS",
+	},
 }
 
 func init() {
@@ -128,7 +136,7 @@ var (
 
 // NewGatewayLayer initializes 0chain gosdk and return zcnObjects
 func (z *ZCN) NewGatewayLayer(creds madmin.Credentials) (minio.ObjectLayer, error) {
-	err := initializeSDK(configDir, allocationID, nonce)
+	err := initializeSDK(configDir, allocationID, nonce, walletDetails)
 	if err != nil {
 		return nil, err
 	}

cmd/gateway/zcn/initSDK.go

@@ -28,7 +28,7 @@ type serverOptions struct {
 	MaxConcurrentRequests int  `json:"max_concurrent_requests"`
 }
 
-func initializeSDK(configDir, allocid string, nonce int64) error {
+func initializeSDK(configDir, allocid string, nonce int64, walletDetails string) error {
 	if configDir == "" {
 		var err error
 		configDir, err = getDefaultConfigDir()
@@ -97,6 +97,10 @@ func initializeSDK(configDir, allocid string, nonce int64) error {
 	zcncore.SetLogLevel(3)
 	sdk.SetLogLevel(3)
 
+	walletInfo := string(walletBytes)
+	if walletDetails != "" {
+		walletInfo = walletDetails
+	}
 	err = client.InitSDK("{}", cfg.BlockWorker, cfg.ChainID, cfg.SignatureScheme, nonce, false, cfg.MinSubmit, cfg.MinConfirmation, cfg.ConfirmationChainLength, cfg.SharderConsensous)
 	if err != nil {
 		return err