Skip to content

Commit cbfe33c

Browse files
authored
Merge branch 'staging' into feat/env-allocid
2 parents f66df6b + a5718ab commit cbfe33c

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

cmd/gateway/zcn/initSDK.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,22 @@ func initializeSDK(configDir, allocid string, nonce int64, walletDetails string)
101101
if walletDetails != "" {
102102
walletInfo = walletDetails
103103
}
104-
err = client.InitSDK(walletInfo, cfg.BlockWorker, cfg.ChainID, cfg.SignatureScheme, nonce, false, true, cfg.MinSubmit, cfg.MinConfirmation, cfg.ConfirmationChainLength, cfg.SharderConsensous)
104+
err = client.InitSDK("{}", cfg.BlockWorker, cfg.ChainID, cfg.SignatureScheme, nonce, false, cfg.MinSubmit, cfg.MinConfirmation, cfg.ConfirmationChainLength, cfg.SharderConsensous)
105105
if err != nil {
106106
return err
107107
}
108108

109109
conf.InitClientConfig(&cfg)
110110

111+
err = zcncore.SetGeneralWalletInfo(string(walletBytes), cfg.SignatureScheme)
112+
if err != nil {
113+
return err
114+
}
115+
116+
if client.GetClient().IsSplit {
117+
zcncore.RegisterZauthServer(cfg.ZauthServer)
118+
}
119+
111120
sdk.SetNumBlockDownloads(100)
112121
return nil
113122
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.22.5
77
require (
88
cloud.google.com/go/storage v1.28.1
99
github.com/0chain/errors v1.0.3
10-
github.com/0chain/gosdk v1.18.12-0.20241206043832-7ac705a239cf
10+
github.com/0chain/gosdk v1.18.14-0.20241213165735-8d4976846d6a
1111
github.com/Azure/azure-pipeline-go v0.2.2
1212
github.com/Azure/azure-storage-blob-go v0.10.0
1313
github.com/Shopify/sarama v1.28.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI=
6363
github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw=
6464
github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
6565
github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
66-
github.com/0chain/gosdk v1.18.12-0.20241206043832-7ac705a239cf h1:NoPcWHg7S7F4SsryiUOHWsmqGh/rGXOcEEN+lDznF/U=
67-
github.com/0chain/gosdk v1.18.12-0.20241206043832-7ac705a239cf/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw=
66+
github.com/0chain/gosdk v1.18.14-0.20241213165735-8d4976846d6a h1:oKWd3QJ5Q5F6ZgxG1nDCmu+U+0ANS0X/+bSy23FYZJk=
67+
github.com/0chain/gosdk v1.18.14-0.20241213165735-8d4976846d6a/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw=
6868
github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU=
6969
github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
7070
github.com/Azure/azure-pipeline-go v0.2.2 h1:6oiIS9yaG6XCCzhgAgKFfIWyo4LLCiDhZot6ltoThhY=

0 commit comments

Comments
 (0)