diff --git a/pkg/operator/config/create.go b/pkg/operator/config/create.go index 6368522..2f3b3d3 100644 --- a/pkg/operator/config/create.go +++ b/pkg/operator/config/create.go @@ -36,7 +36,7 @@ func CreateCmd(p utils.Prompter) *cli.Command { Action: func(ctx *cli.Context) error { skipPrompt := ctx.Bool(YesFlag.Name) - op := types.OperatorConfigNew{} + op := types.OperatorConfig{} if !skipPrompt { // Prompt user to generate empty or non-empty files @@ -104,7 +104,7 @@ func CreateCmd(p utils.Prompter) *cli.Command { return createCmd } -func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (types.OperatorConfigNew, error) { +func promptOperatorInfo(config *types.OperatorConfig, p utils.Prompter) (types.OperatorConfig, error) { // Prompt and set operator address operatorAddress, err := p.InputString("Enter your operator address:", "", "", func(s string) error { @@ -112,7 +112,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.Operator.Address = operatorAddress @@ -157,7 +157,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.Operator.EarningsReceiverAddress = earningsAddress @@ -166,14 +166,14 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type func(s string) error { return nil }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.EthRPCUrl = rpcUrl // Prompt for network & set chainId chainId, err := p.Select("Select your network:", []string{"mainnet", "holesky", "local"}) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } switch chainId { @@ -191,7 +191,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type // Prompt for signer type signerType, err := p.Select("Select your signer type:", []string{"local_keystore", "fireblocks", "web3"}) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } switch signerType { @@ -209,7 +209,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.PrivateKeyStorePath = ecdsaKeyPath case "fireblocks": @@ -224,7 +224,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.FireblocksConfig.APIKey = apiKey @@ -238,7 +238,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.FireblocksConfig.BaseUrl = baseUrl @@ -252,7 +252,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.FireblocksConfig.VaultAccountName = vaultAccountName @@ -266,7 +266,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.FireblocksConfig.Timeout = timeout @@ -293,7 +293,7 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.FireblocksConfig.SecretKey = keyName awsRegion, err := p.InputString("Enter the AWS region where the secret is stored:", "us-east-1", "", @@ -305,13 +305,13 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.FireblocksConfig.AWSRegion = awsRegion } if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } case "web3": config.SignerType = types.Web3Signer @@ -325,11 +325,11 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type }, ) if err != nil { - return types.OperatorConfigNew{}, err + return types.OperatorConfig{}, err } config.Web3SignerConfig.Url = web3SignerUrl default: - return types.OperatorConfigNew{}, fmt.Errorf("unknown signer type %s", signerType) + return types.OperatorConfig{}, fmt.Errorf("unknown signer type %s", signerType) } return *config, nil diff --git a/pkg/operator/register.go b/pkg/operator/register.go index 9817090..da70d53 100644 --- a/pkg/operator/register.go +++ b/pkg/operator/register.go @@ -147,7 +147,7 @@ func printRegistrationInfo(txHash string, operatorAddress common.Address, chainI } func getWallet( - cfg *types.OperatorConfigNew, + cfg *types.OperatorConfig, ethClient eth.Client, p utils.Prompter, logger eigensdkLogger.Logger, @@ -273,7 +273,7 @@ func expandTilde(path string) (string, error) { return path, nil } -func validateAndReturnConfig(configurationFilePath string) (*types.OperatorConfigNew, error) { +func validateAndReturnConfig(configurationFilePath string) (*types.OperatorConfig, error) { operatorCfg, err := readConfigFile(configurationFilePath) if err != nil { return nil, err @@ -322,8 +322,8 @@ func validateAndReturnConfig(configurationFilePath string) (*types.OperatorConfi return operatorCfg, nil } -func readConfigFile(path string) (*types.OperatorConfigNew, error) { - var operatorCfg types.OperatorConfigNew +func readConfigFile(path string) (*types.OperatorConfig, error) { + var operatorCfg types.OperatorConfig err := utils.ReadYamlConfig(path, &operatorCfg) if err != nil { return nil, err @@ -367,7 +367,7 @@ func getWebAppLink(operatorAddress common.Address, chainId *big.Int) string { } } -func validateMetadata(operatorCfg *types.OperatorConfigNew) error { +func validateMetadata(operatorCfg *types.OperatorConfig) error { // Raw GitHub URL validation is only for mainnet if operatorCfg.ChainId.Cmp(big.NewInt(utils.MainnetChainId)) == 0 { err := eigenSdkUtils.ValidateRawGithubUrl(operatorCfg.Operator.MetadataUrl) diff --git a/pkg/operator/register_test.go b/pkg/operator/register_test.go index 8262474..815f4d4 100644 --- a/pkg/operator/register_test.go +++ b/pkg/operator/register_test.go @@ -50,12 +50,12 @@ func TestGetTransactionLink(t *testing.T) { func TestValidateMainnetMetadata(t *testing.T) { var tests = []struct { name string - operatorCfg *types.OperatorConfigNew + operatorCfg *types.OperatorConfig expectErr bool }{ { name: "Valid metadata", - operatorCfg: &types.OperatorConfigNew{ + operatorCfg: &types.OperatorConfig{ Operator: eigensdkTypes.Operator{ MetadataUrl: "https://raw.githubusercontent.com/Layr-Labs/eigendata/master/operators/eigenlabs/metadata.json", }, @@ -64,7 +64,7 @@ func TestValidateMainnetMetadata(t *testing.T) { }, { name: "Invalid metadata - invalid logo url", - operatorCfg: &types.OperatorConfigNew{ + operatorCfg: &types.OperatorConfig{ Operator: eigensdkTypes.Operator{ MetadataUrl: "https://raw.githubusercontent.com/shrimalmadhur/metadata/main/metadata1.json", }, @@ -74,7 +74,7 @@ func TestValidateMainnetMetadata(t *testing.T) { }, { name: "Invalid metadata - Invalid metadata url", - operatorCfg: &types.OperatorConfigNew{ + operatorCfg: &types.OperatorConfig{ Operator: eigensdkTypes.Operator{ MetadataUrl: "https://goerli-operator-metadata.s3.amazonaws.com/metadata.json", }, @@ -84,7 +84,7 @@ func TestValidateMainnetMetadata(t *testing.T) { }, { name: "Valid metadata for holesky", - operatorCfg: &types.OperatorConfigNew{ + operatorCfg: &types.OperatorConfig{ Operator: eigensdkTypes.Operator{ MetadataUrl: "https://goerli-operator-metadata.s3.amazonaws.com/metadata.json", }, diff --git a/pkg/types/operator_config.go b/pkg/types/operator_config.go index d7c5ab4..3a9f7a5 100644 --- a/pkg/types/operator_config.go +++ b/pkg/types/operator_config.go @@ -39,7 +39,7 @@ type Web3SignerConfig struct { Url string `yaml:"url"` } -type OperatorConfigNew struct { +type OperatorConfig struct { Operator eigensdkTypes.Operator `yaml:"operator"` ELDelegationManagerAddress string `yaml:"el_delegation_manager_address"` ELAVSDirectoryAddress string @@ -51,7 +51,7 @@ type OperatorConfigNew struct { Web3SignerConfig Web3SignerConfig `yaml:"web3"` } -func (config OperatorConfigNew) MarshalYAML() (interface{}, error) { +func (config OperatorConfig) MarshalYAML() (interface{}, error) { return struct { Operator eigensdkTypes.Operator `yaml:"operator"` ELDelegationManagerAddress string `yaml:"el_delegation_manager_address"`