revert MaxNumRetries -> NumRetries, change default name to rpc

Author: PatStiles

aggregator/pkg/aggregator.go

@@ -419,7 +419,7 @@ func (agg *Aggregator) InitializeNewTask(batchIndex uint32, taskCreatedBlock uin
 		}
 		return err
 	}
-	return retry.Retry(initializeNewTask_func, retry.DefaultRetryConfig())
+	return retry.Retry(initializeNewTask_func, retry.RpcRetryConfig())
 }
 
 // Long-lived goroutine that periodically checks and removes old Tasks from stored Maps

aggregator/pkg/server.go

@@ -158,5 +158,5 @@ func (agg *Aggregator) GetTaskIndexRetryable(batchIdentifierHash [32]byte) (uint
 			return taskIndex, nil
 		}
 	}
-	return retry.RetryWithData(getTaskIndex_func, retry.DefaultRetryConfig())
+	return retry.RetryWithData(getTaskIndex_func, retry.RpcRetryConfig())
 }

core/chainio/avs_subscriber.go

@@ -68,13 +68,13 @@ func (s *AvsSubscriber) SubscribeToNewTasksV2(newTaskCreatedChan chan *servicema
 	// Subscribe to new tasks
 	sub, err := SubscribeToNewTasksV2Retryable(&bind.WatchOpts{}, s.AvsContractBindings.ServiceManager, internalChannel, nil)
 	if err != nil {
-		s.logger.Error("Primary failed to subscribe to new AlignedLayer V2 tasks after %d retries", retry.DefaultMaxNumRetries, "err", err)
+		s.logger.Error("Primary failed to subscribe to new AlignedLayer V2 tasks after %d retries", retry.DefaultNumRetries, "err", err)
 		return nil, err
 	}
 
 	subFallback, err := SubscribeToNewTasksV2Retryable(&bind.WatchOpts{}, s.AvsContractBindings.ServiceManagerFallback, internalChannel, nil)
 	if err != nil {
-		s.logger.Error("Fallback failed to subscribe to new AlignedLayer V2 tasks after %d retries", retry.DefaultMaxNumRetries, "err", err)
+		s.logger.Error("Fallback failed to subscribe to new AlignedLayer V2 tasks after %d retries", retry.DefaultNumRetries, "err", err)
 		return nil, err
 	}
 	s.logger.Info("Subscribed to new AlignedLayer V2 tasks")

core/chainio/avs_writer.go

@@ -94,13 +94,13 @@ func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMe
 	i := 0
 
 	// Set Retry config for RespondToTaskV2
-	respondToTaskV2Config := retry.DefaultRetryConfig()
+	respondToTaskV2Config := retry.RpcRetryConfig()
 	respondToTaskV2Config.MaxElapsedTime = 0
 
 	// Set Retry config for WaitForTxRetryable
-	waitForTxConfig := retry.DefaultRetryConfig()
+	waitForTxConfig := retry.RpcRetryConfig()
 	waitForTxConfig.MaxInterval = 2 * time.Second
-	waitForTxConfig.MaxNumRetries = 0
+	waitForTxConfig.NumRetries = 0
 	waitForTxConfig.MaxElapsedTime = timeToWaitBeforeBump
 
 	respondToTaskV2Func := func() (*types.Receipt, error) {

core/chainio/retryable.go

@@ -71,7 +71,7 @@ func (w *AvsWriter) BatchesStateRetryable(opts *bind.CallOpts, arg0 [32]byte) (s
 	Responded             bool
 	RespondToTaskFeeLimit *big.Int
 }, error) {
-	return retry.RetryWithData(BatchesState(w, opts, arg0), retry.DefaultRetryConfig())
+	return retry.RetryWithData(BatchesState(w, opts, arg0), retry.RpcRetryConfig())
 }
 
 func BatcherBalances(w *AvsWriter, opts *bind.CallOpts, senderAddress common.Address) func() (*big.Int, error) {
@@ -94,7 +94,7 @@ Get the balance of a batcher from the AVS contract.
 - Retry times (3 retries): 1 sec, 2 sec, 4 sec
 */
 func (w *AvsWriter) BatcherBalancesRetryable(opts *bind.CallOpts, senderAddress common.Address) (*big.Int, error) {
-	return retry.RetryWithData(BatcherBalances(w, opts, senderAddress), retry.DefaultRetryConfig())
+	return retry.RetryWithData(BatcherBalances(w, opts, senderAddress), retry.RpcRetryConfig())
 }
 
 func BalanceAt(w *AvsWriter, ctx context.Context, aggregatorAddress common.Address, blockNumber *big.Int) func() (*big.Int, error) {
@@ -119,7 +119,7 @@ TODO: it gets the balance from an Address, not necessarily an aggregator. The na
 - Retry times (3 retries): 1 sec, 2 sec, 4 sec.
 */
 func (w *AvsWriter) BalanceAtRetryable(ctx context.Context, aggregatorAddress common.Address, blockNumber *big.Int) (*big.Int, error) {
-	return retry.RetryWithData(BalanceAt(w, ctx, aggregatorAddress, blockNumber), retry.DefaultRetryConfig())
+	return retry.RetryWithData(BalanceAt(w, ctx, aggregatorAddress, blockNumber), retry.RpcRetryConfig())
 }
 
 // |---AVS_SUBSCRIBER---|
@@ -144,7 +144,7 @@ Get the latest block number from Ethereum
 - Retry times (3 retries): 1 sec, 2 sec, 4 sec.
 */
 func (s *AvsSubscriber) BlockNumberRetryable(ctx context.Context) (uint64, error) {
-	return retry.RetryWithData(BlockNumber(s, ctx), retry.DefaultRetryConfig())
+	return retry.RetryWithData(BlockNumber(s, ctx), retry.RpcRetryConfig())
 }
 
 func FilterBatchV2(s *AvsSubscriber, opts *bind.FilterOpts, batchMerkleRoot [][32]byte) func() (*servicemanager.ContractAlignedLayerServiceManagerNewBatchV2Iterator, error) {
@@ -165,7 +165,7 @@ Get NewBatchV2 logs from the AVS contract.
 - Retry times (3 retries): 1 sec, 2 sec, 4 sec.
 */
 func (s *AvsSubscriber) FilterBatchV2Retryable(opts *bind.FilterOpts, batchMerkleRoot [][32]byte) (*servicemanager.ContractAlignedLayerServiceManagerNewBatchV2Iterator, error) {
-	return retry.RetryWithData(FilterBatchV2(s, opts, batchMerkleRoot), retry.DefaultRetryConfig())
+	return retry.RetryWithData(FilterBatchV2(s, opts, batchMerkleRoot), retry.RpcRetryConfig())
 }
 
 func FilterBatchV3(s *AvsSubscriber, opts *bind.FilterOpts, batchMerkleRoot [][32]byte) func() (*servicemanager.ContractAlignedLayerServiceManagerNewBatchV3Iterator, error) {
@@ -186,7 +186,7 @@ Get NewBatchV3 logs from the AVS contract.
 - Retry times (3 retries): 1 sec, 2 sec, 4 sec.
 */
 func (s *AvsSubscriber) FilterBatchV3Retryable(opts *bind.FilterOpts, batchMerkleRoot [][32]byte) (*servicemanager.ContractAlignedLayerServiceManagerNewBatchV3Iterator, error) {
-	return retry.RetryWithData(FilterBatchV3(s, opts, batchMerkleRoot), retry.DefaultRetryConfig())
+	return retry.RetryWithData(FilterBatchV3(s, opts, batchMerkleRoot), retry.RpcRetryConfig())
 }
 
 func BatchState(s *AvsSubscriber, opts *bind.CallOpts, arg0 [32]byte) func() (struct {
@@ -220,7 +220,7 @@ func (s *AvsSubscriber) BatchesStateRetryable(opts *bind.CallOpts, arg0 [32]byte
 	RespondToTaskFeeLimit *big.Int
 }, error) {
 
-	return retry.RetryWithData(BatchState(s, opts, arg0), retry.DefaultRetryConfig())
+	return retry.RetryWithData(BatchState(s, opts, arg0), retry.RpcRetryConfig())
 }
 
 func SubscribeNewHead(s *AvsSubscriber, ctx context.Context, c chan<- *types.Header) func() (ethereum.Subscription, error) {
@@ -243,7 +243,7 @@ Subscribe to new heads from the Ethereum node.
 - Retry times (3 retries): 1 sec, 2 sec, 4 sec.
 */
 func (s *AvsSubscriber) SubscribeNewHeadRetryable(ctx context.Context, c chan<- *types.Header) (ethereum.Subscription, error) {
-	return retry.RetryWithData(SubscribeNewHead(s, ctx, c), retry.DefaultRetryConfig())
+	return retry.RetryWithData(SubscribeNewHead(s, ctx, c), retry.RpcRetryConfig())
 }
 
 func SubscribeToNewTasksV2(
@@ -270,7 +270,7 @@ func SubscribeToNewTasksV2Retryable(
 	newTaskCreatedChan chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV2,
 	batchMerkleRoot [][32]byte,
 ) (event.Subscription, error) {
-	return retry.RetryWithData(SubscribeToNewTasksV2(opts, serviceManager, newTaskCreatedChan, batchMerkleRoot), retry.DefaultRetryConfig())
+	return retry.RetryWithData(SubscribeToNewTasksV2(opts, serviceManager, newTaskCreatedChan, batchMerkleRoot), retry.RpcRetryConfig())
 }
 
 func SubscribeToNewTasksV3(
@@ -297,5 +297,5 @@ func SubscribeToNewTasksV3Retryable(
 	newTaskCreatedChan chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV3,
 	batchMerkleRoot [][32]byte,
 ) (event.Subscription, error) {
-	return retry.RetryWithData(SubscribeToNewTasksV3(opts, serviceManager, newTaskCreatedChan, batchMerkleRoot), retry.DefaultRetryConfig())
+	return retry.RetryWithData(SubscribeToNewTasksV3(opts, serviceManager, newTaskCreatedChan, batchMerkleRoot), retry.RpcRetryConfig())
 }

core/retry.go

@@ -30,7 +30,7 @@ const (
 	DefaultMaxElapsedTime              = 0 * time.Second  // Maximum time all retries may take. `0` corresponds to no limit on the time of the retries.
 	DefaultRandomizationFactor float64 = 0                // Randomization (Jitter) factor used to map retry interval to a range of values around the computed interval. In precise terms (random value in range [1 - randomizationfactor, 1 + randomizationfactor]). NOTE: This is set to 0 as we do not use jitter in Aligned.
 	DefaultMultiplier          float64 = 2                // Multiplier factor computed exponential retry interval is scaled by.
-	DefaultMaxNumRetries       uint64  = 3                // Total number of retries attempted.
+	DefaultNumRetries          uint64  = 3                // Total number of retries attempted.
 	ChainInitialInterval               = 12 * time.Second // Initial delay for retry interval for contract calls. Corresponds to 1 ethereum block.
 	ChainMaxInterval                   = 2 * time.Minute  // Maximum interval for an individual retry.
 )
@@ -41,17 +41,17 @@ type RetryConfig struct {
 	MaxElapsedTime      time.Duration // Maximum time all retries may take. `0` corresponds to no limit on the time of the retries.
 	RandomizationFactor float64
 	Multiplier          float64
-	MaxNumRetries       uint64
+	NumRetries          uint64
 }
 
-func DefaultRetryConfig() *RetryConfig {
+func RpcRetryConfig() *RetryConfig {
 	return &RetryConfig{
 		InitialInterval:     DefaultInitialInterval,
 		MaxInterval:         DefaultMaxInterval,
 		MaxElapsedTime:      DefaultMaxElapsedTime,
 		RandomizationFactor: DefaultRandomizationFactor,
 		Multiplier:          DefaultMultiplier,
-		MaxNumRetries:       DefaultMaxNumRetries,
+		NumRetries:          DefaultNumRetries,
 	}
 }
 
@@ -62,7 +62,7 @@ func ChainRetryConfig() *RetryConfig {
 		MaxElapsedTime:      DefaultMaxElapsedTime,
 		RandomizationFactor: DefaultRandomizationFactor,
 		Multiplier:          DefaultMultiplier,
-		MaxNumRetries:       DefaultMaxNumRetries,
+		NumRetries:          DefaultNumRetries,
 	}
 }
 
@@ -160,8 +160,8 @@ func RetryWithData[T any](functionToRetry func() (T, error), config *RetryConfig
 	expBackoff := backoff.NewExponentialBackOff(randomOption, multiplierOption, initialRetryOption, maxIntervalOption, maxElapsedTimeOption)
 	var maxRetriesBackoff backoff.BackOff
 
-	if config.MaxNumRetries > 0 {
-		maxRetriesBackoff = backoff.WithMaxRetries(expBackoff, config.MaxNumRetries)
+	if config.NumRetries > 0 {
+		maxRetriesBackoff = backoff.WithMaxRetries(expBackoff, config.NumRetries)
 	} else {
 		maxRetriesBackoff = expBackoff
 	}
@@ -207,8 +207,8 @@ func Retry(functionToRetry func() error, config *RetryConfig) error {
 	expBackoff := backoff.NewExponentialBackOff(randomOption, multiplierOption, initialRetryOption, maxIntervalOption, maxElapsedTimeOption)
 	var maxRetriesBackoff backoff.BackOff
 
-	if config.MaxNumRetries > 0 {
-		maxRetriesBackoff = backoff.WithMaxRetries(expBackoff, config.MaxNumRetries)
+	if config.NumRetries > 0 {
+		maxRetriesBackoff = backoff.WithMaxRetries(expBackoff, config.NumRetries)
 	} else {
 		maxRetriesBackoff = expBackoff
 	}

core/retry_test.go

@@ -49,7 +49,7 @@ func TestRetryWithData(t *testing.T) {
 		MaxElapsedTime:      3,
 		RandomizationFactor: 0,
 		Multiplier:          retry.DefaultMultiplier,
-		MaxNumRetries:       retry.DefaultMaxNumRetries,
+		NumRetries:          retry.DefaultNumRetries,
 	}
 	_, err := retry.RetryWithData(function, config)
 	if err != nil {
@@ -68,7 +68,7 @@ func TestRetry(t *testing.T) {
 		MaxElapsedTime:      3,
 		RandomizationFactor: 0,
 		Multiplier:          retry.DefaultMultiplier,
-		MaxNumRetries:       retry.DefaultMaxNumRetries,
+		NumRetries:          retry.DefaultNumRetries,
 	}
 	err := retry.Retry(function, config)
 	if err != nil {
@@ -170,7 +170,7 @@ func TestWaitForTransactionReceipt(t *testing.T) {
 	}
 
 	// Assert Call succeeds when Anvil running
-	receipt_function := utils.WaitForTransactionReceipt(*client, *client, hash, retry.DefaultRetryConfig())
+	receipt_function := utils.WaitForTransactionReceipt(*client, *client, hash, retry.RpcRetryConfig())
 	_, err = receipt_function()
 	assert.NotNil(t, err, "Error Waiting for Transaction with Anvil Running: %s\n", err)
 	if !strings.Contains(err.Error(), "not found") {
@@ -183,7 +183,7 @@ func TestWaitForTransactionReceipt(t *testing.T) {
 		return
 	}
 
-	receipt_function = utils.WaitForTransactionReceipt(*client, *client, hash, retry.DefaultRetryConfig())
+	receipt_function = utils.WaitForTransactionReceipt(*client, *client, hash, retry.RpcRetryConfig())
 	_, err = receipt_function()
 	assert.NotNil(t, err)
 	if _, ok := err.(retry.PermanentError); ok {
@@ -200,7 +200,7 @@ func TestWaitForTransactionReceipt(t *testing.T) {
 		t.Errorf("Error setting up Anvil: %s\n", err)
 	}
 
-	receipt_function = utils.WaitForTransactionReceipt(*client, *client, hash, retry.DefaultRetryConfig())
+	receipt_function = utils.WaitForTransactionReceipt(*client, *client, hash, retry.RpcRetryConfig())
 	_, err = receipt_function()
 	assert.NotNil(t, err)
 	if !strings.Contains(err.Error(), "not found") {

core/utils/eth_client_utils.go

@@ -103,5 +103,5 @@ func GetGasPriceRetryable(client eth.InstrumentedClient, fallbackClient eth.Inst
 
 		return gasPrice, nil
 	}
-	return retry.RetryWithData(respondToTaskV2_func, retry.DefaultRetryConfig())
+	return retry.RetryWithData(respondToTaskV2_func, retry.RpcRetryConfig())
 }