From 5a81639a940ff4fb05a1c93d2a83279ad6480528 Mon Sep 17 00:00:00 2001 From: Madhur Shrimal Date: Wed, 11 Oct 2023 18:34:26 -0700 Subject: [PATCH 1/2] add check for already registered operator --- cli/operator/register.go | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/cli/operator/register.go b/cli/operator/register.go index c1b60a63..7a639825 100644 --- a/cli/operator/register.go +++ b/cli/operator/register.go @@ -77,7 +77,7 @@ func RegisterCmd(p prompter.Prompter) *cobra.Command { return fmt.Errorf("%w: with error %s", ErrInvalidYamlFile, err) } - fmt.Printf("Operator file validated successfully") + fmt.Println("Operator file validated successfully") signerType, err = validateSignerType(signerTypeFlag, operatorCfg) if err != nil { @@ -136,21 +136,38 @@ func RegisterCmd(p prompter.Prompter) *cobra.Command { llog, noopMetrics, ) + if err != nil { + return err + } + reader, err := elContracts.NewELChainReader( + elContractsClient, + llog, + ethClient, + ) if err != nil { return err } - _, err = elWriter.RegisterAsOperator(ctx, operatorCfg.Operator) + status, err := reader.IsOperatorRegistered(context.Background(), operatorCfg.Operator) if err != nil { return err } + if !status { + _, err = elWriter.RegisterAsOperator(ctx, operatorCfg.Operator) + if err != nil { + return err + } + } else { + llog.Info("Operator is already registered") + } + _, err = elWriter.RegisterBLSPublicKey(ctx, keyPair, operatorCfg.Operator) if err != nil { return err } - fmt.Println("Operator registered successfully") + llog.Info("Operator is registered and bls key added successfully") return nil }, } From b00e2f79d0487b442a9686256038a06cabc2eb46 Mon Sep 17 00:00:00 2001 From: Madhur Shrimal Date: Thu, 12 Oct 2023 13:27:09 -0700 Subject: [PATCH 2/2] update logger and rebase --- cli/operator/register.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/operator/register.go b/cli/operator/register.go index 7a639825..b19d85af 100644 --- a/cli/operator/register.go +++ b/cli/operator/register.go @@ -88,7 +88,7 @@ func RegisterCmd(p prompter.Prompter) *cobra.Command { }, RunE: func(cmd *cobra.Command, args []string) error { ctx := context.Background() - llog, err := eigensdkLogger.NewZapLogger(eigensdkLogger.Development) + logger, err := eigensdkLogger.NewZapLogger(eigensdkLogger.Development) if err != nil { return err } @@ -123,7 +123,7 @@ func RegisterCmd(p prompter.Prompter) *cobra.Command { common.HexToAddress(operatorCfg.BlsPublicKeyCompendiumAddress), ethClient, ethClient, - llog) + logger) if err != nil { return err } @@ -133,7 +133,7 @@ func RegisterCmd(p prompter.Prompter) *cobra.Command { elContractsClient, ethClient, localSigner, - llog, + logger, noopMetrics, ) if err != nil { @@ -142,7 +142,7 @@ func RegisterCmd(p prompter.Prompter) *cobra.Command { reader, err := elContracts.NewELChainReader( elContractsClient, - llog, + logger, ethClient, ) if err != nil { @@ -160,14 +160,14 @@ func RegisterCmd(p prompter.Prompter) *cobra.Command { return err } } else { - llog.Info("Operator is already registered") + logger.Info("Operator is already registered") } _, err = elWriter.RegisterBLSPublicKey(ctx, keyPair, operatorCfg.Operator) if err != nil { return err } - llog.Info("Operator is registered and bls key added successfully") + logger.Info("Operator is registered and bls key added successfully") return nil }, }