V1.0.5-alpha-patch1 Ready (#1022)

* Merge `v1.0.4` release to main branch (#977) * v1.2.0 (#965) * Hotfix-logImprovements (#952) * Set up blocknumber and epoch in logs * updated blocknumber and epoch logger info in every command * Hotfix-getDataFromAPI (#951) * Changed numm of retry attempts * removed redundant retry attempts * corrected tests * changed http timeout and logged time elapsed to fetch data (#954) * Updated version (#960) * Updated version * updated version to v1.2.0 * version update (#972) * Updated user in dockerfile (#1012) * updating user in dockerfile * updating readme for non-root user * Log corrections * updated release * Revert "Updated user in dockerfile (#1012)" (#1021) This reverts commit 7f95edb. Co-authored-by: Shrikant upadhyay <shrikant1997upadhyay@gmail.com>
razor-network · Nov 11, 2022 · 2449c03 · 2449c03
1 parent ba6f939
commit 2449c03
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 36 deletions.
diff --git a/cmd/claimBounty.go b/cmd/claimBounty.go
@@ -3,10 +3,6 @@ package cmd
 
 import (
 	"errors"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 	"math/big"
 	"os"
 	"razor/core"
@@ -15,6 +11,11 @@ import (
 	"razor/path"
 	"razor/pkg/bindings"
 	"razor/utils"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var claimBountyCmd = &cobra.Command{

diff --git a/cmd/create.go b/cmd/create.go
@@ -46,7 +46,7 @@ func (*UtilsStruct) Create(password string) (accounts.Account, error) {
 		log.Error("Error in fetching .razor directory")
 		return accounts.Account{Address: common.Address{0x00}}, err
 	}
-	log.Debug("Create: .razor path: ", razorPath)
+	log.Debug("Create: .razor directory path: ", razorPath)
 	keystorePath := path.Join(razorPath, "keystore_files")
 	account := razorAccounts.AccountUtilsInterface.CreateAccount(keystorePath, password)
 	return account, nil

diff --git a/cmd/createJob.go b/cmd/createJob.go
@@ -2,15 +2,16 @@
 package cmd
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/spf13/pflag"
 	"razor/core"
 	"razor/core/types"
 	"razor/logger"
 	"razor/pkg/bindings"
 	"razor/utils"
 
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/spf13/pflag"
+
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/import.go b/cmd/import.go
@@ -51,7 +51,7 @@ func (*UtilsStruct) ImportAccount() (accounts.Account, error) {
 		log.Error("Error in fetching .razor directory")
 		return accounts.Account{Address: common.Address{0x00}}, err
 	}
-	log.Debug("ImportAccount: .razor path: ", razorPath)
+	log.Debug("ImportAccount: .razor directory path: ", razorPath)
 	priv, err := cryptoUtils.HexToECDSA(privateKey)
 	if err != nil {
 		log.Error("Error in parsing private key")

diff --git a/cmd/initiateWithdraw.go b/cmd/initiateWithdraw.go
@@ -3,17 +3,18 @@ package cmd
 
 import (
 	"errors"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 	"math/big"
 	"razor/core"
 	"razor/core/types"
 	"razor/logger"
 	"razor/pkg/bindings"
 	"razor/utils"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var initiateWithdrawCmd = &cobra.Command{

diff --git a/cmd/listAccounts.go b/cmd/listAccounts.go
@@ -43,7 +43,7 @@ func (*UtilsStruct) ListAccounts() ([]accounts.Account, error) {
 		log.Error("Error in fetching .razor directory")
 		return nil, err
 	}
-	log.Debug("ListAccounts: .razor path: ", path)
+	log.Debug("ListAccounts: .razor directory path: ", path)
 
 	keystorePath := pathPkg.Join(path, "keystore_files")
 	log.Debug("ListAccounts: Keystore path: ", keystorePath)

diff --git a/cmd/unlockWithdraw.go b/cmd/unlockWithdraw.go
@@ -3,17 +3,18 @@ package cmd
 
 import (
 	"errors"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 	"math/big"
 	"razor/core"
 	"razor/core/types"
 	"razor/logger"
 	"razor/pkg/bindings"
 	"razor/utils"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 // unlockWithdrawCmd represents the unlockWithdraw command

diff --git a/cmd/unstake.go b/cmd/unstake.go
@@ -3,14 +3,15 @@ package cmd
 
 import (
 	"errors"
-	"github.com/ethereum/go-ethereum/common"
 	"math/big"
 	"razor/core"
 	"razor/core/types"
 	"razor/logger"
 	"razor/pkg/bindings"
 	"razor/utils"
 
+	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/spf13/pflag"
 

diff --git a/cmd/updateCollection.go b/cmd/updateCollection.go
@@ -2,15 +2,16 @@
 package cmd
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 	"razor/core"
 	"razor/core/types"
 	"razor/logger"
 	"razor/pkg/bindings"
 	"razor/utils"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var updateCollectionCmd = &cobra.Command{

diff --git a/cmd/updateJob.go b/cmd/updateJob.go
@@ -2,15 +2,16 @@
 package cmd
 
 import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 	"razor/core"
 	"razor/core/types"
 	"razor/logger"
 	"razor/pkg/bindings"
 	"razor/utils"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var updateJobCmd = &cobra.Command{

diff --git a/cmd/vote.go b/cmd/vote.go
@@ -336,7 +336,7 @@ func (*UtilsStruct) InitiateCommit(client *ethclient.Client, config types.Config
 	if err != nil {
 		return err
 	}
-	log.Debugf("InitiateCommit: Default .razor file path: %s", razorPath)
+	log.Debugf("InitiateCommit: .razor directory path: %s", razorPath)
 	keystorePath := path.Join(razorPath, "keystore_files")
 	log.Debugf("InitiateCommit: Keystore file path: %s", keystorePath)
 	log.Debugf("InitiateCommit: Calling CalculateSecret() with arguments epoch = %d, keystorePath = %s, chainId = %s", epoch, keystorePath, core.ChainId)
@@ -470,7 +470,7 @@ func (*UtilsStruct) InitiateReveal(client *ethclient.Client, config types.Config
 		if err != nil {
 			return err
 		}
-		log.Debug("InitiateReveal: Default .razor file path: ", razorPath)
+		log.Debug("InitiateReveal: .razor directory path: ", razorPath)
 		keystorePath := path.Join(razorPath, "keystore_files")
 		log.Debug("InitiateReveal: Keystore file path: ", keystorePath)
 

diff --git a/core/version.go b/core/version.go
@@ -3,10 +3,10 @@ package core
 import "fmt"
 
 const (
-	VersionMajor = 1       // Major version component of the current release
-	VersionMinor = 0       // Minor version component of the current release
-	VersionPatch = 5       // Patch version component of the current release
-	VersionMeta  = "alpha" // Version metadata to append to the version string
+	VersionMajor = 1              // Major version component of the current release
+	VersionMinor = 0              // Minor version component of the current release
+	VersionPatch = 5              // Patch version component of the current release
+	VersionMeta  = "alpha-patch1" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.

diff --git a/utils/common.go b/utils/common.go
@@ -259,7 +259,7 @@ func (*UtilsStruct) AssignLogFile(flagSet *pflag.FlagSet) {
 	if UtilsInterface.IsFlagPassed("logFile") {
 		fileName, err := FlagSetInterface.GetLogFileName(flagSet)
 		if err != nil {
-			log.Fatalf("Error in getting file name : ", err)
+			log.Fatal("Error in getting file name: ", err)
 		}
 		log.Debug("Log file name: ", fileName)
 		logger.InitializeLogger(fileName)