Use GroupRunner in stader-balance (#3793)

Co-authored-by: app-token-issuer-data-feeds[bot] <134377064+app-token-issuer-data-feeds[bot]@users.noreply.github.com>

Author: dskloetc

.changeset/eight-ligers-share.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/stader-balance-adapter': patch
+---
+
+Refactor how RPCs are grouped

packages/sources/stader-balance/src/transport/balance.ts

@@ -1,3 +1,4 @@
+import { GroupRunner } from '@chainlink/external-adapter-framework/util/group-runner'
 import BigNumber from 'bignumber.js'
 import { ethers } from 'ethers'
 import {
@@ -20,7 +21,7 @@ import { StaderConfig } from './utils/stader-config'
 import { PermissionedPool } from './utils/permissioned-pool'
 import { StakeManager } from './utils/stake-manager'
 import { Pool } from './utils/pool'
-import { ValidatorFactory } from './utils/validator'
+import { ValidatorFactory, type ActiveValidator, type WithdrawnValidator } from './utils/validator'
 import { DepositEvent_ABI, StaderPenaltyContract_ABI } from '../config/StaderContractAbis'
 import { SubscriptionTransport } from '@chainlink/external-adapter-framework/transports/abstract/subscription'
 import { TransportDependencies } from '@chainlink/external-adapter-framework/transports'
@@ -170,30 +171,27 @@ export class BalanceTransport extends SubscriptionTransport<BaseEndpointTypes> {
 
     const validatorBalances = []
 
+    const calculateWithdrawnBalanceInGroups = new GroupRunner(
+      context.adapterSettings.GROUP_SIZE,
+    ).wrapFunction((v: WithdrawnValidator) => v.calculateBalance(validatorDeposit))
+
     // Perform active validator calculations
     // These will need a call to get the penalty rate for each of them, so we have to batch these
-    const withdrawnBatches = splitArrayIntoChunks(
-      withdrawnValidators,
+    validatorBalances.push(
+      ...(await Promise.all(withdrawnValidators.map((v) => calculateWithdrawnBalanceInGroups(v)))),
+    )
+
+    const calculateActiveBalanceInGroups = new GroupRunner(
       context.adapterSettings.GROUP_SIZE,
+    ).wrapFunction((v: ActiveValidator) =>
+      v.calculateBalance(validatorDeposit, depositedBalanceMap[v.addressData.address]),
     )
-    for (const batch of withdrawnBatches) {
-      validatorBalances.push(
-        ...(await Promise.all(batch.map((v) => v.calculateBalance(validatorDeposit)))),
-      )
-    }
 
     // Perform active validator calculations
     // These will need a call to get the penalty rate for each of them, so we have to batch these
-    const activeBatches = splitArrayIntoChunks(activeValidators, context.adapterSettings.GROUP_SIZE)
-    for (const batch of activeBatches) {
-      validatorBalances.push(
-        ...(await Promise.all(
-          batch.map((v) =>
-            v.calculateBalance(validatorDeposit, depositedBalanceMap[v.addressData.address]),
-          ),
-        )),
-      )
-    }
+    validatorBalances.push(
+      ...(await Promise.all(activeValidators.map((v) => calculateActiveBalanceInGroups(v)))),
+    )
 
     // Flatten all the balances out, they'll be aggregated in the proof-of-reserves EA
     const balances = [

packages/sources/stader-balance/src/transport/utils/validator.ts

@@ -255,7 +255,7 @@ abstract class Validator {
   }
 }
 
-class ActiveValidator extends Validator {
+export class ActiveValidator extends Validator {
   async calculateBalance(
     validatorDeposit: BigNumber,
     depositedEth: BigNumber = BigNumber(0),
@@ -314,7 +314,7 @@ class ActiveValidator extends Validator {
   }
 }
 
-class WithdrawnValidator extends Validator {
+export class WithdrawnValidator extends Validator {
   async calculateBalance(validatorDeposit: BigNumber): Promise<BalanceResponse> {
     const { userDeposit, poolCommission, withdrawalAddressBalance } =
       await this.fetchDataForBalanceCalculation(validatorDeposit)