Skip to content

Commit

Permalink
V1.0.5-alpha-patch1 Ready (#1022)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@Yashk767 @Shrikant1212
Yashk767 and Shrikant1212 committed Nov 11, 2022
1 parent ba6f939 commit 2449c03
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 36 deletions.
9 changes: 5 additions & 4 deletions cmd/claimBounty.go
View file
Expand Up @@ -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"
Expand All @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion cmd/create.go
View file
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions cmd/createJob.go
View file
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/import.go
View file
Expand Up @@ -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")
Expand Down
11 changes: 6 additions & 5 deletions cmd/initiateWithdraw.go
View file
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion cmd/listAccounts.go
View file
Expand Up @@ -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)
Expand Down
11 changes: 6 additions & 5 deletions cmd/unlockWithdraw.go
View file
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion cmd/unstake.go
View file
Expand Up @@ -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"

Expand Down
9 changes: 5 additions & 4 deletions cmd/updateCollection.go
View file
Expand Up @@ -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{
Expand Down
9 changes: 5 additions & 4 deletions cmd/updateJob.go
View file
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions cmd/vote.go
View file
Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions core/version.go
View file
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion utils/common.go
View file
Expand Up @@ -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)
Expand Down

0 comments on commit 2449c03

Please sign in to comment.