Merge pull request #4 from NetSepio/rushikesh-solona-wallet-address

build fix
NetSepio · Jun 3, 2024 · 5fba048 · 5fba048
2 parents 89964a0 + 19a5cf8
commit 5fba048
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/main.go b/main.go
@@ -127,8 +127,9 @@ func main() {
 	err := core.UpdateServerConfigWg()
 	util.CheckError("Error while creating WireGuard config file: ", err)
 	// Call the function to generate the wallet address and store it in the global variable
-	core.GenerateWalletAddress(),
-	core.GenerateWalletAddresssol(),
+	core.GenerateWalletAddress()
+
+	core.GenerateWalletAddresssolana()
 
 	go p2p.Init()
 	//running updater

diff --git a/util/pkg/node/node.go b/util/pkg/node/node.go
@@ -9,17 +9,17 @@ import (
 )
 
 type NodeStatus struct {
-	Id             string  `json:"id"`
-	HttpPort       string  `json:"httpPort"`
-	Domain         string  `json:"domain"`
-	Address        string  `json:"address"`
-	Region         string  `json:"region"`
-	DownloadSpeed  float64 `json:"downloadSpeed"`
-	UploadSpeed    float64 `json:"uploadSpeed"`
-	StartTimeStamp int64   `json:"startTimeStamp"`
-	Name           string  `json:"name"`
-	WalletAddress  string  `json:"walletAddress"`
-	WalletAddresssol string `json:"walletAddressSol"`
+	Id               string  `json:"id"`
+	HttpPort         string  `json:"httpPort"`
+	Domain           string  `json:"domain"`
+	Address          string  `json:"address"`
+	Region           string  `json:"region"`
+	DownloadSpeed    float64 `json:"downloadSpeed"`
+	UploadSpeed      float64 `json:"uploadSpeed"`
+	StartTimeStamp   int64   `json:"startTimeStamp"`
+	Name             string  `json:"name"`
+	WalletAddress    string  `json:"walletAddress"`
+	WalletAddresssol string  `json:"walletsol"`
 }
 
 func CreateNodeStatus(address string, id string, startTimeStamp int64, name string) *NodeStatus {
@@ -28,16 +28,16 @@ func CreateNodeStatus(address string, id string, startTimeStamp int64, name stri
 		logrus.Error("failed to fetch network speed: ", err.Error())
 	}
 	nodeStatus := &NodeStatus{
-		HttpPort:         os.Getenv("HTTP_PORT"),
-		Domain:           os.Getenv("DOMAIN"),
-		Address:          address,
-		Region:           os.Getenv("REGION"),
-		Id:               id,
-		DownloadSpeed:    speedtestResult.DownloadSpeed,
-		UploadSpeed:      speedtestResult.UploadSpeed,
-		StartTimeStamp:   startTimeStamp,
-		Name:             name,
-		WalletAddress:    core.WalletAddressSui,
+		HttpPort:       os.Getenv("HTTP_PORT"),
+		Domain:         os.Getenv("DOMAIN"),
+		Address:        address,
+		Region:         os.Getenv("REGION"),
+		Id:             id,
+		DownloadSpeed:  speedtestResult.DownloadSpeed,
+		UploadSpeed:    speedtestResult.UploadSpeed,
+		StartTimeStamp: startTimeStamp,
+		Name:           name,
+		WalletAddress:  core.WalletAddressSui,
 		WalletAddresssol: core.WalletAddressSolana,
 	}
 	return nodeStatus