Skip to content

Commit 2449c03

Browse files
Yashk767Shrikant1212
Yashk767
and
Shrikant1212
authored
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 <[email protected]>
1 parent ba6f939 commit 2449c03

13 files changed

+43
-36
lines changed

‎cmd/claimBounty.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ package cmd
33

44
import (
55
"errors"
6-
"github.com/ethereum/go-ethereum/common"
7-
"github.com/ethereum/go-ethereum/ethclient"
8-
"github.com/spf13/cobra"
9-
"github.com/spf13/pflag"
106
"math/big"
117
"os"
128
"razor/core"
@@ -15,6 +11,11 @@ import (
1511
"razor/path"
1612
"razor/pkg/bindings"
1713
"razor/utils"
14+
15+
"github.com/ethereum/go-ethereum/common"
16+
"github.com/ethereum/go-ethereum/ethclient"
17+
"github.com/spf13/cobra"
18+
"github.com/spf13/pflag"
1819
)
1920

2021
var claimBountyCmd = &cobra.Command{

‎cmd/create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (*UtilsStruct) Create(password string) (accounts.Account, error) {
4646
log.Error("Error in fetching .razor directory")
4747
return accounts.Account{Address: common.Address{0x00}}, err
4848
}
49-
log.Debug("Create: .razor path: ", razorPath)
49+
log.Debug("Create: .razor directory path: ", razorPath)
5050
keystorePath := path.Join(razorPath, "keystore_files")
5151
account := razorAccounts.AccountUtilsInterface.CreateAccount(keystorePath, password)
5252
return account, nil

‎cmd/createJob.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
package cmd
33

44
import (
5-
"github.com/ethereum/go-ethereum/common"
6-
"github.com/ethereum/go-ethereum/ethclient"
7-
"github.com/spf13/pflag"
85
"razor/core"
96
"razor/core/types"
107
"razor/logger"
118
"razor/pkg/bindings"
129
"razor/utils"
1310

11+
"github.com/ethereum/go-ethereum/common"
12+
"github.com/ethereum/go-ethereum/ethclient"
13+
"github.com/spf13/pflag"
14+
1415
"github.com/spf13/cobra"
1516
)
1617

‎cmd/import.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (*UtilsStruct) ImportAccount() (accounts.Account, error) {
5151
log.Error("Error in fetching .razor directory")
5252
return accounts.Account{Address: common.Address{0x00}}, err
5353
}
54-
log.Debug("ImportAccount: .razor path: ", razorPath)
54+
log.Debug("ImportAccount: .razor directory path: ", razorPath)
5555
priv, err := cryptoUtils.HexToECDSA(privateKey)
5656
if err != nil {
5757
log.Error("Error in parsing private key")

‎cmd/initiateWithdraw.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ package cmd
33

44
import (
55
"errors"
6-
"github.com/ethereum/go-ethereum/accounts/abi/bind"
7-
"github.com/ethereum/go-ethereum/common"
8-
"github.com/ethereum/go-ethereum/ethclient"
9-
"github.com/spf13/cobra"
10-
"github.com/spf13/pflag"
116
"math/big"
127
"razor/core"
138
"razor/core/types"
149
"razor/logger"
1510
"razor/pkg/bindings"
1611
"razor/utils"
12+
13+
"github.com/ethereum/go-ethereum/accounts/abi/bind"
14+
"github.com/ethereum/go-ethereum/common"
15+
"github.com/ethereum/go-ethereum/ethclient"
16+
"github.com/spf13/cobra"
17+
"github.com/spf13/pflag"
1718
)
1819

1920
var initiateWithdrawCmd = &cobra.Command{

‎cmd/listAccounts.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (*UtilsStruct) ListAccounts() ([]accounts.Account, error) {
4343
log.Error("Error in fetching .razor directory")
4444
return nil, err
4545
}
46-
log.Debug("ListAccounts: .razor path: ", path)
46+
log.Debug("ListAccounts: .razor directory path: ", path)
4747

4848
keystorePath := pathPkg.Join(path, "keystore_files")
4949
log.Debug("ListAccounts: Keystore path: ", keystorePath)

‎cmd/unlockWithdraw.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ package cmd
33

44
import (
55
"errors"
6-
"github.com/ethereum/go-ethereum/accounts/abi/bind"
7-
"github.com/ethereum/go-ethereum/common"
8-
"github.com/ethereum/go-ethereum/ethclient"
9-
"github.com/spf13/cobra"
10-
"github.com/spf13/pflag"
116
"math/big"
127
"razor/core"
138
"razor/core/types"
149
"razor/logger"
1510
"razor/pkg/bindings"
1611
"razor/utils"
12+
13+
"github.com/ethereum/go-ethereum/accounts/abi/bind"
14+
"github.com/ethereum/go-ethereum/common"
15+
"github.com/ethereum/go-ethereum/ethclient"
16+
"github.com/spf13/cobra"
17+
"github.com/spf13/pflag"
1718
)
1819

1920
// unlockWithdrawCmd represents the unlockWithdraw command

‎cmd/unstake.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ package cmd
33

44
import (
55
"errors"
6-
"github.com/ethereum/go-ethereum/common"
76
"math/big"
87
"razor/core"
98
"razor/core/types"
109
"razor/logger"
1110
"razor/pkg/bindings"
1211
"razor/utils"
1312

13+
"github.com/ethereum/go-ethereum/common"
14+
1415
"github.com/ethereum/go-ethereum/ethclient"
1516
"github.com/spf13/pflag"
1617

‎cmd/updateCollection.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
package cmd
33

44
import (
5-
"github.com/ethereum/go-ethereum/common"
6-
"github.com/ethereum/go-ethereum/ethclient"
7-
"github.com/spf13/cobra"
8-
"github.com/spf13/pflag"
95
"razor/core"
106
"razor/core/types"
117
"razor/logger"
128
"razor/pkg/bindings"
139
"razor/utils"
10+
11+
"github.com/ethereum/go-ethereum/common"
12+
"github.com/ethereum/go-ethereum/ethclient"
13+
"github.com/spf13/cobra"
14+
"github.com/spf13/pflag"
1415
)
1516

1617
var updateCollectionCmd = &cobra.Command{

‎cmd/updateJob.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
package cmd
33

44
import (
5-
"github.com/ethereum/go-ethereum/common"
6-
"github.com/ethereum/go-ethereum/ethclient"
7-
"github.com/spf13/cobra"
8-
"github.com/spf13/pflag"
95
"razor/core"
106
"razor/core/types"
117
"razor/logger"
128
"razor/pkg/bindings"
139
"razor/utils"
10+
11+
"github.com/ethereum/go-ethereum/common"
12+
"github.com/ethereum/go-ethereum/ethclient"
13+
"github.com/spf13/cobra"
14+
"github.com/spf13/pflag"
1415
)
1516

1617
var updateJobCmd = &cobra.Command{

‎cmd/vote.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ func (*UtilsStruct) InitiateCommit(client *ethclient.Client, config types.Config
336336
if err != nil {
337337
return err
338338
}
339-
log.Debugf("InitiateCommit: Default .razor file path: %s", razorPath)
339+
log.Debugf("InitiateCommit: .razor directory path: %s", razorPath)
340340
keystorePath := path.Join(razorPath, "keystore_files")
341341
log.Debugf("InitiateCommit: Keystore file path: %s", keystorePath)
342342
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
470470
if err != nil {
471471
return err
472472
}
473-
log.Debug("InitiateReveal: Default .razor file path: ", razorPath)
473+
log.Debug("InitiateReveal: .razor directory path: ", razorPath)
474474
keystorePath := path.Join(razorPath, "keystore_files")
475475
log.Debug("InitiateReveal: Keystore file path: ", keystorePath)
476476

‎core/version.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package core
33
import "fmt"
44

55
const (
6-
VersionMajor = 1 // Major version component of the current release
7-
VersionMinor = 0 // Minor version component of the current release
8-
VersionPatch = 5 // Patch version component of the current release
9-
VersionMeta = "alpha" // Version metadata to append to the version string
6+
VersionMajor = 1 // Major version component of the current release
7+
VersionMinor = 0 // Minor version component of the current release
8+
VersionPatch = 5 // Patch version component of the current release
9+
VersionMeta = "alpha-patch1" // Version metadata to append to the version string
1010
)
1111

1212
// Version holds the textual version string.

‎utils/common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func (*UtilsStruct) AssignLogFile(flagSet *pflag.FlagSet) {
259259
if UtilsInterface.IsFlagPassed("logFile") {
260260
fileName, err := FlagSetInterface.GetLogFileName(flagSet)
261261
if err != nil {
262-
log.Fatalf("Error in getting file name : ", err)
262+
log.Fatal("Error in getting file name: ", err)
263263
}
264264
log.Debug("Log file name: ", fileName)
265265
logger.InitializeLogger(fileName)

0 commit comments

Comments
 (0)