Improve smart contract interaction commands to support encrypted secr…

…ets manager (#3)

* Improve smart contract interaction commands to support encrypted secrets manager

* fix static parameter

command/rootchain/validators/validator_info.go

@@ -80,7 +80,7 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	outputter := command.InitializeOutputter(cmd)
 	defer outputter.WriteOutput()
 
-	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig)
+	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig, false)
 	if err != nil {
 		return err
 	}

command/rootchain/withdraw/withdraw.go

@@ -81,7 +81,7 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	outputter := command.InitializeOutputter(cmd)
 	defer outputter.WriteOutput()
 
-	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig)
+	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig, false)
 	if err != nil {
 		return err
 	}

command/sidechain/helper.go

@@ -10,8 +10,9 @@ import (
 )
 
 const (
-	SelfFlag   = "self"
-	AmountFlag = "amount"
+	SelfFlag               = "self"
+	AmountFlag             = "amount"
+	InsecureLocalStoreFlag = "insecure"
 
 	DefaultGasPrice = 1879048192 // 0x70000000
 )
@@ -37,9 +38,9 @@ func ValidateSecretFlags(dataDir, config string) error {
 }
 
 // GetAccount resolves secrets manager and returns an account object
-func GetAccount(accountDir, accountConfig string) (*wallet.Account, error) {
+func GetAccount(accountDir, accountConfig string, insecureLocalStore bool) (*wallet.Account, error) {
 	// resolve secrets manager instance and allow usage of insecure local secrets manager
-	secretsManager, err := polybftsecrets.GetSecretsManager(accountDir, accountConfig, true)
+	secretsManager, err := polybftsecrets.GetSecretsManager(accountDir, accountConfig, insecureLocalStore)
 	if err != nil {
 		return nil, err
 	}
@@ -48,8 +49,8 @@ func GetAccount(accountDir, accountConfig string) (*wallet.Account, error) {
 }
 
 // GetAccountFromDir returns an account object from local secrets manager
-func GetAccountFromDir(accountDir string) (*wallet.Account, error) {
-	return GetAccount(accountDir, "")
+func GetAccountFromDir(accountDir string, insecureLocalStore bool) (*wallet.Account, error) {
+	return GetAccount(accountDir, "", insecureLocalStore)
 }
 
 // Hydra TODO: Fix it to get validator info from child chain

command/sidechain/registration/params.go

@@ -15,11 +15,12 @@ const (
 )
 
 type registerParams struct {
-	accountDir    string
-	accountConfig string
-	jsonRPC       string
-	stake         string
-	chainID       int64
+	accountDir         string
+	accountConfig      string
+	jsonRPC            string
+	stake              string
+	chainID            int64
+	insecureLocalStore bool
 }
 
 func (rp *registerParams) validateFlags() error {

command/sidechain/registration/register_validator.go

@@ -11,6 +11,7 @@ import (
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/command/polybftsecrets"
+	"github.com/0xPolygon/polygon-edge/command/sidechain"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	bls "github.com/0xPolygon/polygon-edge/consensus/polybft/signer"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/wallet"
@@ -74,6 +75,13 @@ func setFlags(cmd *cobra.Command) {
 		"the ID of the chain",
 	)
 
+	cmd.Flags().BoolVar(
+		&params.insecureLocalStore,
+		sidechain.InsecureLocalStoreFlag,
+		false,
+		"a flag to indicate if the secrets used are encrypted. If set to true, the secrets are stored in plain text.",
+	)
+
 	helper.RegisterJSONRPCFlag(cmd)
 	cmd.MarkFlagsMutuallyExclusive(polybftsecrets.AccountConfigFlag, polybftsecrets.AccountDirFlag)
 }
@@ -88,7 +96,7 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	outputter := command.InitializeOutputter(cmd)
 	defer outputter.WriteOutput()
 
-	secretsManager, err := polybftsecrets.GetSecretsManager(params.accountDir, params.accountConfig, true)
+	secretsManager, err := polybftsecrets.GetSecretsManager(params.accountDir, params.accountConfig, params.insecureLocalStore)
 	if err != nil {
 		return err
 	}

command/sidechain/rewards/params.go

@@ -9,9 +9,10 @@ import (
 )
 
 type withdrawRewardsParams struct {
-	accountDir    string
-	accountConfig string
-	jsonRPC       string
+	accountDir         string
+	accountConfig      string
+	jsonRPC            string
+	insecureLocalStore bool
 }
 
 type withdrawRewardResult struct {

command/sidechain/rewards/rewards.go

@@ -11,6 +11,7 @@ import (
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/command/polybftsecrets"
 	rootHelper "github.com/0xPolygon/polygon-edge/command/rootchain/helper"
+	"github.com/0xPolygon/polygon-edge/command/sidechain"
 	sidechainHelper "github.com/0xPolygon/polygon-edge/command/sidechain"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	"github.com/0xPolygon/polygon-edge/contracts"
@@ -50,6 +51,13 @@ func setFlags(cmd *cobra.Command) {
 		polybftsecrets.AccountConfigFlagDesc,
 	)
 
+	cmd.Flags().BoolVar(
+		&params.insecureLocalStore,
+		sidechain.InsecureLocalStoreFlag,
+		false,
+		"a flag to indicate if the secrets used are encrypted. If set to true, the secrets are stored in plain text.",
+	)
+
 	cmd.MarkFlagsMutuallyExclusive(polybftsecrets.AccountDirFlag, polybftsecrets.AccountConfigFlag)
 }
 
@@ -63,7 +71,7 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	outputter := command.InitializeOutputter(cmd)
 	defer outputter.WriteOutput()
 
-	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig)
+	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig, params.insecureLocalStore)
 	if err != nil {
 		return err
 	}

command/sidechain/staking/params.go

@@ -13,12 +13,13 @@ var (
 )
 
 type stakeParams struct {
-	accountDir      string
-	accountConfig   string
-	jsonRPC         string
-	amount          string
-	self            bool
-	delegateAddress string
+	accountDir         string
+	accountConfig      string
+	jsonRPC            string
+	amount             string
+	self               bool
+	delegateAddress    string
+	insecureLocalStore bool
 }
 
 func (v *stakeParams) validateFlags() error {

command/sidechain/staking/stake.go

@@ -8,6 +8,7 @@ import (
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/command/polybftsecrets"
+	"github.com/0xPolygon/polygon-edge/command/sidechain"
 	sidechainHelper "github.com/0xPolygon/polygon-edge/command/sidechain"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	"github.com/0xPolygon/polygon-edge/contracts"
@@ -74,6 +75,13 @@ func setFlags(cmd *cobra.Command) {
 		"account address to which stake should be delegated",
 	)
 
+	cmd.Flags().BoolVar(
+		&params.insecureLocalStore,
+		sidechain.InsecureLocalStoreFlag,
+		false,
+		"a flag to indicate if the secrets used are encrypted. If set to true, the secrets are stored in plain text.",
+	)
+
 	cmd.MarkFlagsMutuallyExclusive(sidechainHelper.SelfFlag, delegateAddressFlag)
 	cmd.MarkFlagsMutuallyExclusive(polybftsecrets.AccountDirFlag, polybftsecrets.AccountConfigFlag)
 }
@@ -88,7 +96,7 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	outputter := command.InitializeOutputter(cmd)
 	defer outputter.WriteOutput()
 
-	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig)
+	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig, params.insecureLocalStore)
 	if err != nil {
 		return err
 	}

command/sidechain/unstaking/params.go

@@ -14,10 +14,11 @@ var (
 )
 
 type unstakeParams struct {
-	accountDir    string
-	accountConfig string
-	jsonRPC       string
-	amount        string
+	accountDir         string
+	accountConfig      string
+	jsonRPC            string
+	amount             string
+	insecureLocalStore bool
 
 	amountValue *big.Int
 }

command/sidechain/unstaking/unstake.go

@@ -7,6 +7,7 @@ import (
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/command/polybftsecrets"
+	"github.com/0xPolygon/polygon-edge/command/sidechain"
 	sidechainHelper "github.com/0xPolygon/polygon-edge/command/sidechain"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	"github.com/0xPolygon/polygon-edge/contracts"
@@ -54,6 +55,13 @@ func setFlags(cmd *cobra.Command) {
 		"amount to unstake from validator",
 	)
 
+	cmd.Flags().BoolVar(
+		&params.insecureLocalStore,
+		sidechain.InsecureLocalStoreFlag,
+		false,
+		"a flag to indicate if the secrets used are encrypted. If set to true, the secrets are stored in plain text.",
+	)
+
 	cmd.MarkFlagsMutuallyExclusive(polybftsecrets.AccountDirFlag, polybftsecrets.AccountConfigFlag)
 }
 
@@ -67,7 +75,7 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	outputter := command.InitializeOutputter(cmd)
 	defer outputter.WriteOutput()
 
-	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig)
+	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig, params.insecureLocalStore)
 	if err != nil {
 		return err
 	}

command/sidechain/whitelist/params.go

@@ -17,6 +17,7 @@ type whitelistParams struct {
 	accountConfig       string
 	jsonRPC             string
 	newValidatorAddress string
+	insecureLocalStore  bool
 }
 
 func (ep *whitelistParams) validateFlags() error {

command/sidechain/whitelist/whitelist_validator.go

@@ -7,6 +7,7 @@ import (
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/command/polybftsecrets"
+	"github.com/0xPolygon/polygon-edge/command/sidechain"
 	sidechainHelper "github.com/0xPolygon/polygon-edge/command/sidechain"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	"github.com/0xPolygon/polygon-edge/contracts"
@@ -58,6 +59,13 @@ func setFlags(cmd *cobra.Command) {
 		"account address of a possible validator",
 	)
 
+	cmd.Flags().BoolVar(
+		&params.insecureLocalStore,
+		sidechain.InsecureLocalStoreFlag,
+		false,
+		"a flag to indicate if the secrets used are encrypted. If set to true, the secrets are stored in plain text.",
+	)
+
 	cmd.MarkFlagsMutuallyExclusive(polybftsecrets.AccountDirFlag, polybftsecrets.AccountConfigFlag)
 	helper.RegisterJSONRPCFlag(cmd)
 }
@@ -72,7 +80,7 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	outputter := command.InitializeOutputter(cmd)
 	defer outputter.WriteOutput()
 
-	governanceAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig)
+	governanceAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig, params.insecureLocalStore)
 	if err != nil {
 		return fmt.Errorf("enlist validator failed: %w", err)
 	}

command/sidechain/withdraw/params.go

@@ -10,9 +10,10 @@ import (
 )
 
 type withdrawParams struct {
-	accountDir    string
-	accountConfig string
-	jsonRPC       string
+	accountDir         string
+	accountConfig      string
+	jsonRPC            string
+	insecureLocalStore bool
 }
 
 func (w *withdrawParams) validateFlags() error {

command/sidechain/withdraw/withdraw.go

@@ -11,6 +11,7 @@ import (
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/command/polybftsecrets"
 	rootHelper "github.com/0xPolygon/polygon-edge/command/rootchain/helper"
+	"github.com/0xPolygon/polygon-edge/command/sidechain"
 	sidechainHelper "github.com/0xPolygon/polygon-edge/command/sidechain"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	"github.com/0xPolygon/polygon-edge/contracts"
@@ -49,6 +50,13 @@ func setFlags(cmd *cobra.Command) {
 		polybftsecrets.AccountConfigFlagDesc,
 	)
 
+	cmd.Flags().BoolVar(
+		&params.insecureLocalStore,
+		sidechain.InsecureLocalStoreFlag,
+		false,
+		"a flag to indicate if the secrets used are encrypted. If set to true, the secrets are stored in plain text.",
+	)
+
 	cmd.MarkFlagsMutuallyExclusive(polybftsecrets.AccountDirFlag, polybftsecrets.AccountConfigFlag)
 }
 
@@ -62,7 +70,7 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	outputter := command.InitializeOutputter(cmd)
 	defer outputter.WriteOutput()
 
-	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig)
+	validatorAccount, err := sidechainHelper.GetAccount(params.accountDir, params.accountConfig, params.insecureLocalStore)
 	if err != nil {
 		return err
 	}