feat: custom pubkeys inmemory service

aggregator/aggregator.go

@@ -14,7 +14,6 @@ import (
  "github.com/Layr-Labs/eigensdk-go/metrics"
  "github.com/Layr-Labs/eigensdk-go/services/avsregistry"
  blsagg "github.com/Layr-Labs/eigensdk-go/services/bls_aggregation"
- oppubkeysserv "github.com/Layr-Labs/eigensdk-go/services/operatorpubkeys"
  "github.com/Layr-Labs/eigensdk-go/signerv2"
  eigentypes "github.com/Layr-Labs/eigensdk-go/types"
  "github.com/prometheus/client_golang/prometheus"
@@ -91,6 +90,7 @@ type Aggregator struct {
  restListener RestEventListener
  aggregatorListener AggregatorEventListener
 
+ operatorRegistrationsService OperatorRegistrationsService
  taskBlsAggregationService blsagg.BlsAggregationService
  stateRootUpdateBlsAggregationService MessageBlsAggregationService
  operatorSetUpdateBlsAggregationService MessageBlsAggregationService
@@ -200,8 +200,12 @@ func NewAggregator(ctx context.Context, config *config.Config, logger logging.Lo
  return nil, err
  }
 
- operatorPubkeysService := oppubkeysserv.NewOperatorPubkeysServiceInMemory(ctx, clients.AvsRegistryChainSubscriber, clients.AvsRegistryChainReader, logger)
- avsRegistryService := avsregistry.NewAvsRegistryServiceChainCaller(avsReader, operatorPubkeysService, logger)
+ operatorRegistrationsService, err := NewOperatorRegistrationsServiceInMemory(ctx, avsSubscriber, avsReader, logger)
+ if err != nil {
+ return nil, err
+ }
+
+ avsRegistryService := avsregistry.NewAvsRegistryServiceChainCaller(avsReader, operatorRegistrationsService, logger)
  taskBlsAggregationService := blsagg.NewBlsAggregatorService(avsRegistryService, logger)
  stateRootUpdateBlsAggregationService := NewMessageBlsAggregatorService(avsRegistryService, clients.EthHttpClient, logger)
  operatorSetUpdateBlsAggregationService := NewMessageBlsAggregatorService(avsRegistryService, clients.EthHttpClient, logger)
@@ -217,6 +221,7 @@ func NewAggregator(ctx context.Context, config *config.Config, logger logging.Lo
  rollupBroadcaster: rollupBroadcaster,
  httpClient: ethHttpClient,
  wsClient: ethWsClient,
+ operatorRegistrationsService: operatorRegistrationsService,
  taskBlsAggregationService: taskBlsAggregationService,
  stateRootUpdateBlsAggregationService: stateRootUpdateBlsAggregationService,
  operatorSetUpdateBlsAggregationService: operatorSetUpdateBlsAggregationService,

aggregator/aggregator_test.go

@@ -33,13 +33,14 @@ var MOCK_OPERATOR_BLS_PRIVATE_KEY, _ = bls.NewPrivateKey(MOCK_OPERATOR_BLS_PRIVA
 var MOCK_OPERATOR_KEYPAIR = bls.NewKeyPair(MOCK_OPERATOR_BLS_PRIVATE_KEY)
 var MOCK_OPERATOR_G1PUBKEY = MOCK_OPERATOR_KEYPAIR.GetPubKeyG1()
 var MOCK_OPERATOR_G2PUBKEY = MOCK_OPERATOR_KEYPAIR.GetPubKeyG2()
+var MOCK_OPERATOR_PUBKEYS = eigentypes.OperatorPubkeys{
+ G1Pubkey: MOCK_OPERATOR_G1PUBKEY,
+ G2Pubkey: MOCK_OPERATOR_G2PUBKEY,
+}
 var MOCK_OPERATOR_PUBKEY_DICT = map[eigentypes.OperatorId]types.OperatorInfo{
  MOCK_OPERATOR_ID: {
- OperatorPubkeys: eigentypes.OperatorPubkeys{
- G1Pubkey: MOCK_OPERATOR_G1PUBKEY,
- G2Pubkey: MOCK_OPERATOR_G2PUBKEY,
- },
- OperatorAddr: common.Address{},
+ OperatorPubkeys: MOCK_OPERATOR_PUBKEYS,
+ OperatorAddr: common.Address{},
  },
 }
 
@@ -54,7 +55,7 @@ func TestSendNewTask(t *testing.T) {
  mockCtrl := gomock.NewController(t)
  defer mockCtrl.Finish()
 
- aggregator, mockAvsReaderer, mockAvsWriterer, mockTaskBlsAggService, _, _, _, _, mockClient, err := createMockAggregator(mockCtrl, MOCK_OPERATOR_PUBKEY_DICT)
+ aggregator, mockAvsReaderer, mockAvsWriterer, mockTaskBlsAggService, _, _, _, _, _, mockClient, err := createMockAggregator(mockCtrl, MOCK_OPERATOR_PUBKEY_DICT)
  assert.Nil(t, err)
 
  var TASK_INDEX = uint32(0)
@@ -87,7 +88,7 @@ func TestHandleStateRootUpdateAggregationReachedQuorum(t *testing.T) {
  mockCtrl := gomock.NewController(t)
  defer mockCtrl.Finish()
 
- aggregator, _, _, _, _, _, mockMsgDb, _, _, err := createMockAggregator(mockCtrl, MOCK_OPERATOR_PUBKEY_DICT)
+ aggregator, _, _, _, _, _, _, mockMsgDb, _, _, err := createMockAggregator(mockCtrl, MOCK_OPERATOR_PUBKEY_DICT)
  assert.Nil(t, err)
 
  msg := messages.StateRootUpdateMessage{}
@@ -117,7 +118,7 @@ func TestHandleOperatorSetUpdateAggregationReachedQuorum(t *testing.T) {
  mockCtrl := gomock.NewController(t)
  defer mockCtrl.Finish()
 
- aggregator, _, _, _, _, _, mockMsgDb, mockRollupBroadcaster, _, err := createMockAggregator(mockCtrl, MOCK_OPERATOR_PUBKEY_DICT)
+ aggregator, _, _, _, _, _, _, mockMsgDb, mockRollupBroadcaster, _, err := createMockAggregator(mockCtrl, MOCK_OPERATOR_PUBKEY_DICT)
  assert.Nil(t, err)
 
  msg := messages.OperatorSetUpdateMessage{}
@@ -151,7 +152,7 @@ func TestHandleOperatorSetUpdateAggregationReachedQuorum(t *testing.T) {
 
 func createMockAggregator(
  mockCtrl *gomock.Controller, operatorPubkeyDict map[eigentypes.OperatorId]types.OperatorInfo,
-) (*Aggregator, *chainiomocks.MockAvsReaderer, *chainiomocks.MockAvsWriterer, *blsaggservmock.MockBlsAggregationService, *aggmocks.MockMessageBlsAggregationService, *aggmocks.MockMessageBlsAggregationService, *dbmocks.MockDatabaser, *aggmocks.MockRollupBroadcasterer, *safeclientmocks.MockSafeClient, error) {
+) (*Aggregator, *chainiomocks.MockAvsReaderer, *chainiomocks.MockAvsWriterer, *blsaggservmock.MockBlsAggregationService, *aggmocks.MockMessageBlsAggregationService, *aggmocks.MockMessageBlsAggregationService, *aggmocks.MockOperatorRegistrationsService, *dbmocks.MockDatabaser, *aggmocks.MockRollupBroadcasterer, *safeclientmocks.MockSafeClient, error) {
  logger := sdklogging.NewNoopLogger()
  mockAvsWriter := chainiomocks.NewMockAvsWriterer(mockCtrl)
  mockAvsReader := chainiomocks.NewMockAvsReaderer(mockCtrl)
@@ -161,6 +162,7 @@ func createMockAggregator(
  mockMsgDb := dbmocks.NewMockDatabaser(mockCtrl)
  mockRollupBroadcaster := aggmocks.NewMockRollupBroadcasterer(mockCtrl)
  mockClient := safeclientmocks.NewMockSafeClient(mockCtrl)
+ mockOperatorRegistrationsService := aggmocks.NewMockOperatorRegistrationsService(mockCtrl)
 
  aggregator := &Aggregator{
  logger: logger,
@@ -169,6 +171,7 @@ func createMockAggregator(
  taskBlsAggregationService: mockTaskBlsAggregationService,
  stateRootUpdateBlsAggregationService: mockStateRootUpdateBlsAggregationService,
  operatorSetUpdateBlsAggregationService: mockOperatorSetUpdateBlsAggregationService,
+ operatorRegistrationsService: mockOperatorRegistrationsService,
  msgDb: mockMsgDb,
  tasks: make(map[coretypes.TaskIndex]taskmanager.CheckpointTask),
  taskResponses: make(map[coretypes.TaskIndex]map[eigentypes.TaskResponseDigest]messages.CheckpointTaskResponse),
@@ -181,5 +184,5 @@ func createMockAggregator(
  restListener: &SelectiveRestListener{},
  aggregatorListener: &SelectiveAggregatorListener{},
  }
- return aggregator, mockAvsReader, mockAvsWriter, mockTaskBlsAggregationService, mockStateRootUpdateBlsAggregationService, mockOperatorSetUpdateBlsAggregationService, mockMsgDb, mockRollupBroadcaster, mockClient, nil
+ return aggregator, mockAvsReader, mockAvsWriter, mockTaskBlsAggregationService, mockStateRootUpdateBlsAggregationService, mockOperatorSetUpdateBlsAggregationService, mockOperatorRegistrationsService, mockMsgDb, mockRollupBroadcaster, mockClient, nil
 }

aggregator/gen.go

@@ -2,4 +2,5 @@ package aggregator
 
 //go:generate mockgen -destination=./mocks/message_blsagg.go -package=mocks github.com/NethermindEth/near-sffl/aggregator MessageBlsAggregationService
 //go:generate mockgen -destination=./mocks/rollup_broadcaster.go -package=mocks github.com/NethermindEth/near-sffl/aggregator RollupBroadcasterer
+//go:generate mockgen -destination=./mocks/operator_registrations_inmemory.go -package=mocks github.com/NethermindEth/near-sffl/aggregator OperatorRegistrationsService
 //go:generate mockgen -destination=./mocks/eth_client.go -package=mocks github.com/Layr-Labs/eigensdk-go/chainio/clients/eth Client