fix mocks and subscribers

chainio/clients/avsregistry/builder.go

@@ -10,6 +10,7 @@ import (
 func BuildClients(
 	config Config,
 	client eth.Client,
+	wsClient eth.Client,
 	txMgr txmgr.TxManager,
 	logger logging.Logger,
 ) (*ChainReader, *ChainSubscriber, *ChainWriter, *ContractBindings, error) {
@@ -33,13 +34,16 @@ func BuildClients(
 		client,
 	)
 
-	chainSubscriber := NewChainSubscriber(
-		avsBindings.RegistryCoordinator,
-		avsBindings.BlsApkRegistry,
+	chainSubscriber, err := NewSubscriberFromConfig(
+		config,
+		wsClient,
 		logger,
 	)
+	if err != nil {
+		return nil, nil, nil, nil, err
+	}
 
-	// This is ugly but we need elReader to be able to create the AVS writer
+	// This is ugly, but we need elReader to be able to create the AVS writer
 	elChainReader, err := elcontracts.NewReaderFromConfig(
 		elcontracts.Config{
 			DelegationManagerAddress: avsBindings.DelegationManagerAddr,

chainio/clients/avsregistry/subscriber.go

@@ -26,6 +26,8 @@ type ChainSubscriber struct {
 // forces EthSubscriber to implement the chainio.Subscriber interface
 var _ Subscriber = (*ChainSubscriber)(nil)
 
+// NewChainSubscriber creates a new instance of ChainSubscriber
+// The bindings must be created using websocket ETH Client
 func NewChainSubscriber(
 	regCoord regcoord.ContractRegistryCoordinatorFilters,
 	blsApkRegistry blsapkreg.ContractBLSApkRegistryFilters,
@@ -40,6 +42,8 @@ func NewChainSubscriber(
 	}
 }
 
+// BuildAvsRegistryChainSubscriber creates a new instance of ChainSubscriber
+// Deprecated: Use NewSubscriberFromConfig instead
 func BuildAvsRegistryChainSubscriber(
 	regCoordAddr common.Address,
 	ethWsClient eth.Client,
@@ -60,12 +64,13 @@ func BuildAvsRegistryChainSubscriber(
 	return NewChainSubscriber(regCoord, blsApkReg, logger), nil
 }
 
+// NewSubscriberFromConfig creates a new instance of ChainSubscriber
 func NewSubscriberFromConfig(
 	cfg Config,
-	ethClient eth.Client,
+	wsClient eth.Client,
 	logger logging.Logger,
 ) (*ChainSubscriber, error) {
-	bindings, err := NewBindingsFromConfig(cfg, ethClient, logger)
+	bindings, err := NewBindingsFromConfig(cfg, wsClient, logger)
 	if err != nil {
 		return nil, err
 	}

chainio/clients/builder.go

@@ -95,6 +95,7 @@ func BuildAll(
 			OperatorStateRetrieverAddress: gethcommon.HexToAddress(config.OperatorStateRetrieverAddr),
 		},
 		ethHttpClient,
+		ethWsClient,
 		txMgr,
 		logger,
 	)

chainio/gen.go

@@ -3,8 +3,8 @@ package chainio
 //go:generate mockgen -destination=./mocks/avsRegistryContractsReader.go -package=mocks -mock_names=Reader=MockAVSReader github.com/Layr-Labs/eigensdk-go/chainio/clients/avsregistry Reader
 //go:generate mockgen -destination=./mocks/avsRegistryContractsSubscriber.go -package=mocks -mock_names=Subscriber=MockAVSSubscriber github.com/Layr-Labs/eigensdk-go/chainio/clients/avsregistry Subscriber
 //go:generate mockgen -destination=./mocks/avsRegistryContractsWriter.go -package=mocks -mock_names=Writer=MockAVSWriter github.com/Layr-Labs/eigensdk-go/chainio/clients/avsregistry Writer
-//go:generate mockgen -destination=./mocks/elContractsReader.go -package=mocks github.com/Layr-Labs/eigensdk-go/chainio/clients/elcontracts ELReader
-//go:generate mockgen -destination=./mocks/elContractsWriter.go -package=mocks github.com/Layr-Labs/eigensdk-go/chainio/clients/elcontracts ELWriter
+//go:generate mockgen -destination=./mocks/elContractsReader.go -package=mocks -mock_names=Reader=MockELReader github.com/Layr-Labs/eigensdk-go/chainio/clients/elcontracts Reader
+//go:generate mockgen -destination=./mocks/elContractsWriter.go -package=mocks -mock_names=Writer=MockELWriter github.com/Layr-Labs/eigensdk-go/chainio/clients/elcontracts Writer
 //go:generate mockgen -destination=./mocks/ethclient.go -package=mocks -mock_names=Client=MockEthClient github.com/Layr-Labs/eigensdk-go/chainio/clients/eth Client
 //go:generate mockgen -destination=./mocks/eventSubscription.go -package=mocks github.com/ethereum/go-ethereum/event Subscription
 //go:generate mockgen -destination=./clients/mocks/fireblocks.go -package=mocks -mock_names=Client=MockFireblocksClient github.com/Layr-Labs/eigensdk-go/chainio/clients/fireblocks Client