add retry logic for IsOperatorRegistered

Author: PatStiles

core/chainio/avs_reader.go

@@ -67,9 +67,11 @@ func (r *AvsReader) GetErc20Mock(tokenAddr ethcommon.Address) (*contractERC20Moc
 	return erc20Mock, nil
 }
 
+/*
 func (r *AvsReader) IsOperatorRegistered(address ethcommon.Address) (bool, error) {
 	return r.ChainReader.IsOperatorRegistered(&bind.CallOpts{}, address)
 }
+*/
 
 func (r *AvsReader) DisabledVerifiers() (*big.Int, error) {
 	return r.AvsContractBindings.ServiceManager.ContractAlignedLayerServiceManagerCaller.DisabledVerifiers(&bind.CallOpts{})

core/chainio/retryable.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
+	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/event"
 	servicemanager "github.com/yetanotherco/aligned_layer/contracts/bindings/AlignedLayerServiceManager"
@@ -299,3 +300,21 @@ func SubscribeToNewTasksV3Retryable(
 ) (event.Subscription, error) {
 	return retry.RetryWithData(SubscribeToNewTasksV3(opts, serviceManager, newTaskCreatedChan, batchMerkleRoot), retry.DefaultRetryConfig())
 }
+
+func IsOperatorRegistered(r *AvsReader, address ethcommon.Address, opts *bind.CallOpts) func() (bool, error) {
+	op_registered_func := func() (bool, error) {
+		return r.ChainReader.IsOperatorRegistered(opts, address)
+	}
+	return op_registered_func
+}
+
+/*
+IsOperatorRegistered
+Queries the Eigenlayer Contracts and verifies the Operator is registered on Aligned.
+- All errors are considered Transient Errors
+- Retry times (3 retries): 12 sec (1 Blocks), 24 sec (2 Blocks), 48 sec (4 Blocks)
+- NOTE: Contract call reverts are not considered `PermanentError`'s as block reorg's may lead to contract call revert in which case the aggregator should retry.
+*/
+func (r *AvsReader) IsOperatorRegisteredRetryable(address ethcommon.Address, opts *bind.CallOpts) (bool, error) {
+	return retry.RetryWithData(IsOperatorRegistered(r, address, opts), retry.DefaultRetryConfig())
+}

core/retry_test.go

@@ -928,3 +928,51 @@ func TestBatchersBalances(t *testing.T) {
 		return
 	}
 }
+func TestIsOperatorRegistered(t *testing.T) {
+	cmd, _, err := SetupAnvil(8545)
+	if err != nil {
+		t.Errorf("Error setting up Anvil: %s\n", err)
+	}
+
+	aggregatorConfig := config.NewAggregatorConfig("../config-files/config-aggregator-test.yaml")
+	avsReader, err := chainio.NewAvsReaderFromConfig(aggregatorConfig.BaseConfig, aggregatorConfig.EcdsaConfig)
+	if err != nil {
+		return
+	}
+	senderAddress := common.HexToAddress("0x0")
+
+	is_registered_func := chainio.IsOperatorRegistered(avsReader, senderAddress, &bind.CallOpts{})
+	_, err = is_registered_func()
+	assert.Nil(t, err)
+
+	if err := cmd.Process.Kill(); err != nil {
+		t.Errorf("Error killing process: %v\n", err)
+		return
+	}
+
+	is_registered_func = chainio.IsOperatorRegistered(avsReader, senderAddress, &bind.CallOpts{})
+	_, err = is_registered_func()
+	assert.NotNil(t, err)
+	if _, ok := err.(retry.PermanentError); ok {
+		t.Errorf("BatchersBalances Emitted non-Transient error: %s\n", err)
+		return
+	}
+	if !strings.Contains(err.Error(), "connection reset") {
+		t.Errorf("BatchersBalances did not return expected error: %s\n", err)
+		return
+	}
+
+	cmd, _, err = SetupAnvil(8545)
+	if err != nil {
+		t.Errorf("Error setting up Anvil: %s\n", err)
+	}
+
+	is_registered_func = chainio.IsOperatorRegistered(avsReader, senderAddress, &bind.CallOpts{})
+	_, err = is_registered_func()
+	assert.Nil(t, err)
+
+	if err := cmd.Process.Kill(); err != nil {
+		t.Errorf("Error killing process: %v\n", err)
+		return
+	}
+}

operator/pkg/operator.go

@@ -15,6 +15,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/urfave/cli/v2"
 	"github.com/yetanotherco/aligned_layer/operator/risc_zero"
@@ -80,7 +81,7 @@ func NewOperatorFromConfig(configuration config.OperatorConfig) (*Operator, erro
 		log.Fatalf("Could not create AVS reader")
 	}
 
-	registered, err := avsReader.IsOperatorRegistered(configuration.Operator.Address)
+	registered, err := avsReader.IsOperatorRegisteredRetryable(configuration.Operator.Address, &bind.CallOpts{})
 	if err != nil {
 		log.Fatalf("Could not check if operator is registered")
 	}