fix: allocation delay config and update tests (#257)

Author: shrimalmadhur

pkg/operator/config/create.go

@@ -119,36 +119,31 @@ func promptOperatorInfo(config *types.OperatorConfig, p utils.Prompter) (types.O
 	}
 	config.Operator.Address = operatorAddress
 
-	// TODO(madhur): Disabling this for now as the feature doesn't work but
-	// we need to keep the code around for future
 	// Prompt to gate stakers approval
-	//gateApproval, err := p.Confirm("Do you want to gate stakers approval?")
-	//if err != nil {
-	//	return types.OperatorConfig{}, err
-	//}
+	gateApproval, err := p.Confirm("Do you want to gate stakers approval?")
+	if err != nil {
+		return types.OperatorConfig{}, err
+	}
 	// Prompt for address if operator wants to gate approvals
-	//if gateApproval {
-	//	delegationApprover, err := p.InputString("Enter your staker approver address:", "", "",
-	//		func(s string) error {
-	//			isValidAddress := eigenSdkUtils.IsValidEthereumAddress(s)
-	//
-	//			if !isValidAddress {
-	//				return errors.New("address is invalid")
-	//			}
-	//
-	//			return nil
-	//		},
-	//	)
-	//	if err != nil {
-	//		return types.OperatorConfig{}, err
-	//	}
-	//	config.Operator.DelegationApproverAddress = delegationApprover
-	//} else {
-	//	config.Operator.DelegationApproverAddress = eigensdkTypes.ZeroAddress
-	//}
-
-	// TODO(madhur): Remove this once we have the feature working and want to prompt users for this address
-	config.Operator.DelegationApproverAddress = eigensdkTypes.ZeroAddress
+	if gateApproval {
+		delegationApprover, err := p.InputString("Enter your staker approver address:", "", "",
+			func(s string) error {
+				isValidAddress := eigenSdkUtils.IsValidEthereumAddress(s)
+
+				if !isValidAddress {
+					return errors.New("address is invalid")
+				}
+
+				return nil
+			},
+		)
+		if err != nil {
+			return types.OperatorConfig{}, err
+		}
+		config.Operator.DelegationApproverAddress = delegationApprover
+	} else {
+		config.Operator.DelegationApproverAddress = eigensdkTypes.ZeroAddress
+	}
 
 	// Prompt for eth node
 	rpcUrl, err := p.InputString("Enter your ETH rpc url:", "http://localhost:8545", "",
@@ -161,8 +156,8 @@ func promptOperatorInfo(config *types.OperatorConfig, p utils.Prompter) (types.O
 
 	// Prompt for allocation delay
 	allocationDelay, err := p.InputInteger(
-		"Enter your allocation delay (in seconds, default is 17.5 days):",
-		"1512000",
+		"Enter your allocation delay (in blocks, default is 1200):",
+		"1200",
 		"",
 		func(i int64) error {
 			if i < 0 {
@@ -180,7 +175,7 @@ func promptOperatorInfo(config *types.OperatorConfig, p utils.Prompter) (types.O
 		"Are you sure you want to set the allocation delay to " + strconv.FormatInt(
 			allocationDelay,
 			10,
-		) + " seconds? This cannot be changed once set.",
+		) + " blocks?",
 	)
 	if err != nil {
 		return types.OperatorConfig{}, err

pkg/user/admin/types.go

@@ -1,9 +1,10 @@
 package admin
 
 import (
+	"math/big"
+
 	"github.com/Layr-Labs/eigenlayer-cli/pkg/types"
 	gethcommon "github.com/ethereum/go-ethereum/common"
-	"math/big"
 )
 
 type listPendingAdminsConfig struct {

pkg/user/appointee/remove_test.go

@@ -3,9 +3,10 @@ package appointee
 import (
 	"context"
 	"errors"
-	gethtypes "github.com/ethereum/go-ethereum/core/types"
 	"testing"
 
+	gethtypes "github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/Layr-Labs/eigensdk-go/chainio/clients/elcontracts"
 	"github.com/Layr-Labs/eigensdk-go/logging"
 	"github.com/stretchr/testify/assert"

pkg/user/appointee/set_test.go

@@ -3,9 +3,10 @@ package appointee
 import (
 	"context"
 	"errors"
-	gethtypes "github.com/ethereum/go-ethereum/core/types"
 	"testing"
 
+	gethtypes "github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/Layr-Labs/eigensdk-go/chainio/clients/elcontracts"
 	"github.com/Layr-Labs/eigensdk-go/logging"
 	"github.com/stretchr/testify/assert"

tests/keystore/operator-ci.yaml

@@ -3,6 +3,7 @@ operator:
   delegation_approver_address: 0xcaB1b44dd1f1C265405878Ac1179cd94D0dBA634
   staker_opt_out_window_blocks: 0
   metadata_url: https://madhur-test-public.s3.us-east-2.amazonaws.com/metadata.json
+  allocation_delay: 1200
 el_delegation_manager_address: 0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9
 eth_rpc_url: http://localhost:8545
 private_key_store_path: /home/runner/.eigenlayer/operator_keys/opr0.ecdsa.key.json

tests/web3signer/operator-ci.yaml

@@ -3,6 +3,7 @@ operator:
   delegation_approver_address: 0xcaB1b44dd1f1C265405878Ac1179cd94D0dBA634
   staker_opt_out_window_blocks: 0
   metadata_url: https://madhur-test-public.s3.us-east-2.amazonaws.com/metadata.json
+  allocation_delay: 1200
 el_delegation_manager_address: 0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9
 eth_rpc_url: http://localhost:8545
 private_key_store_path: