Merge pull request #109 from 0chain/fix/init_storage_sdk

Fix/init storage sdk

Author: cnlangzi

cmd/root.go

@@ -91,6 +91,14 @@ func initConfig() {
 	zcncore.SetLogFile("cmdlog.log", !bSilent)
 	sdk.SetLogFile("cmdlog.log", !bSilent)
 
+	if network.IsValid() {
+		zcncore.SetNetwork(network.Miners, network.Sharders)
+		conf.InitChainNetwork(&conf.Network{
+			Miners:   network.Miners,
+			Sharders: network.Sharders,
+		})
+	}
+
 	err = zcncore.InitZCNSDK(cfg.BlockWorker, cfg.SignatureScheme,
 		zcncore.WithChainID(cfg.ChainID),
 		zcncore.WithMinSubmit(cfg.MinSubmit),
@@ -101,10 +109,6 @@ func initConfig() {
 		os.Exit(1)
 	}
 
-	if network.IsValid() {
-		zcncore.SetNetwork(network.Miners, network.Sharders)
-	}
-
 	// is freshly created wallet?
 	var fresh bool
 
@@ -184,7 +188,7 @@ func initConfig() {
 	}
 
 	//init the storage sdk with the known miners, sharders and client wallet info
-	err = sdk.InitStorageSDK(walletJSON, cfg)
+	err = sdk.InitStorageSDK(walletJSON, cfg.BlockWorker, cfg.ChainID, cfg.SignatureScheme, cfg.PreferredBlobbers)
 	if err != nil {
 		fmt.Println("Error in sdk init", err)
 		os.Exit(1)
@@ -194,6 +198,8 @@ func initConfig() {
 	blockchain.SetMaxTxnQuery(cfg.MaxTxnQuery)
 	blockchain.SetQuerySleepTime(cfg.QuerySleepTime)
 
+	conf.InitClientConfig(&cfg)
+
 	if network.IsValid() {
 		sdk.SetNetwork(network.Miners, network.Sharders)
 	}

go.mod

@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/0chain/errors v1.0.2
-	github.com/0chain/gosdk v1.2.88
+	github.com/0chain/gosdk v1.2.89
 	github.com/mattn/go-runewidth v0.0.10 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/olekukonko/tablewriter v0.0.5

go.sum

@@ -21,10 +21,8 @@ collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/0chain/errors v1.0.2 h1:IIUMeh/qFlqDcyHesjU92CpRMVz9dIQWAtZooqrYinA=
 github.com/0chain/errors v1.0.2/go.mod h1:5t76jLb56TKfg/K2VD+eUMmNZJ42QsIRI8KzWuztwU4=
-github.com/0chain/gosdk v1.2.88-beta.1 h1:oSixwNl13KsFVw8UV562COjMZ8kykgegzB6TlQZ7774=
-github.com/0chain/gosdk v1.2.88-beta.1/go.mod h1:6lWu3oFjyzTQjSsaAqZGJINsEapQxhudhRbrou/m7VI=
-github.com/0chain/gosdk v1.2.88 h1:rllzNvDvLP9iDXI6jYT9v3aBgeucGvb1uOpA9Af2AjQ=
-github.com/0chain/gosdk v1.2.88/go.mod h1:JtvcqYYWRdOVFm0pvjdKO5pCiItc/Is2f5wTuuA8F4M=
+github.com/0chain/gosdk v1.2.89 h1:ig5a4UXrHkThUwiMTJ9w05uCsqNt9mnmmhesG73O6XY=
+github.com/0chain/gosdk v1.2.89/go.mod h1:JtvcqYYWRdOVFm0pvjdKO5pCiItc/Is2f5wTuuA8F4M=
 github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
 github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc=
 github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4=