Skip to content

Use wallet, allocaion from env flags #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 26, 2024
Merged

Use wallet, allocaion from env flags #172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f66df6b
feat: use wallet, allocaion from env
harsh4723 Dec 12, 2024
cbfe33c
Merge branch 'staging' into feat/env-allocid
dabasov Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions cmd/gateway/zcn/gateway-zcn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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() {
Expand Down Expand Up @@ -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
}
Expand Down
8 changes: 6 additions & 2 deletions cmd/gateway/zcn/initSDK.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -97,7 +97,11 @@ func initializeSDK(configDir, allocid string, nonce int64) error {
zcncore.SetLogLevel(3)
sdk.SetLogLevel(3)

err = client.InitSDK(string(walletBytes), cfg.BlockWorker, cfg.ChainID, cfg.SignatureScheme, nonce, false, true, cfg.MinSubmit, cfg.MinConfirmation, cfg.ConfirmationChainLength, cfg.SharderConsensous)
walletInfo := string(walletBytes)
if walletDetails != "" {
walletInfo = walletDetails
}
err = client.InitSDK(walletInfo, cfg.BlockWorker, cfg.ChainID, cfg.SignatureScheme, nonce, false, true, cfg.MinSubmit, cfg.MinConfirmation, cfg.ConfirmationChainLength, cfg.SharderConsensous)
if err != nil {
return err
}
Expand Down