Fix operatorsinfo socket bugs (#212)

* fix bug in custom iterator logic - I'm dumb

* print socket info in registerOperator debug statement

* add comment above socket type.. unsure about this one

* refactor updateSocketMapping into a fct

* add return statement instead of relying on no-op

chainio/clients/avsregistry/reader.go

@@ -471,6 +471,7 @@ func (r *AvsRegistryChainReader) QueryExistingRegisteredOperatorSockets(
 		}
 
 		end := toBlock.Uint64()
+
 		filterOpts := &bind.FilterOpts{
 			Start: i.Uint64(),
 			End:   &end,
@@ -479,11 +480,13 @@ func (r *AvsRegistryChainReader) QueryExistingRegisteredOperatorSockets(
 		if err != nil {
 			return nil, types.WrapError(errors.New("Cannot filter operator socket updates"), err)
 		}
-		r.logger.Debug("avsRegistryChainReader.QueryExistingRegisteredOperatorSockets", "fromBlock", i, "toBlock", toBlock)
 
-		for update := socketUpdates; update.Event != nil; update.Next() {
-			operatorIdToSocketMap[update.Event.OperatorId] = types.Socket(update.Event.Socket)
+		numSocketUpdates := 0
+		for socketUpdates.Next() {
+			operatorIdToSocketMap[socketUpdates.Event.OperatorId] = types.Socket(socketUpdates.Event.Socket)
+			numSocketUpdates++
 		}
+		r.logger.Debug("avsRegistryChainReader.QueryExistingRegisteredOperatorSockets", "numTransactionLogs", numSocketUpdates, "fromBlock", i, "toBlock", toBlock)
 	}
 	return operatorIdToSocketMap, nil
 }

chainio/clients/avsregistry/writer.go

@@ -193,7 +193,7 @@ func (w *AvsRegistryChainWriter) RegisterOperatorInQuorumWithAVSRegistryCoordina
 	socket string,
 ) (*gethtypes.Receipt, error) {
 	operatorAddr := crypto.PubkeyToAddress(operatorEcdsaPrivateKey.PublicKey)
-	w.logger.Info("registering operator with the AVS's registry coordinator", "avs-service-manager", w.serviceManagerAddr, "operator", operatorAddr, "quorumNumbers", quorumNumbers)
+	w.logger.Info("registering operator with the AVS's registry coordinator", "avs-service-manager", w.serviceManagerAddr, "operator", operatorAddr, "quorumNumbers", quorumNumbers, "socket", socket)
 	// params to register bls pubkey with bls apk registry
 	g1HashedMsgToSign, err := w.registryCoordinator.PubkeyRegistrationMessageHash(&bind.CallOpts{}, operatorAddr)
 	if err != nil {

services/operatorsinfo/operatorsinfo_inmemory.go

@@ -134,9 +134,8 @@ func (ops *OperatorsInfoServiceInMemory) startServiceInGoroutine(ctx context.Con
 					"G1pubkey", ops.pubkeyDict[operatorAddr].G1Pubkey, "G2pubkey", ops.pubkeyDict[operatorAddr].G2Pubkey,
 				)
 			case newSocketRegistrationEvent := <-newSocketRegistrationC:
-				operatorId := newSocketRegistrationEvent.OperatorId
-				ops.socketDict[operatorId] = types.Socket(newSocketRegistrationEvent.Socket)
 				ops.logger.Debug("Received new socket registration event", "service", "OperatorPubkeysServiceInMemory", "operatorId", newSocketRegistrationEvent.OperatorId, "socket", newSocketRegistrationEvent.Socket)
+				ops.updateSocketMapping(newSocketRegistrationEvent.OperatorId, types.Socket(newSocketRegistrationEvent.Socket))
 			// Receive a query from GetOperatorPubkeys
 			case query := <-queryC:
 				pubkeys, ok := ops.pubkeyDict[query.operatorAddr]
@@ -167,14 +166,15 @@ func (ops *OperatorsInfoServiceInMemory) queryPastRegisteredOperatorEventsAndFil
 		ops.logger.Error("Fatal error querying existing registered operator sockets", "err", err, "service", "OperatorPubkeysServiceInMemory")
 		panic(err)
 	}
+	ops.logger.Debug("List of queried operator socket registration events", "socketsMap", socketsMap, "service", "OperatorPubkeysServiceInMemory")
 
 	// Fill the pubkeydict db with the operators and pubkeys found
 	for i, operatorAddr := range alreadyRegisteredOperatorAddrs {
 		operatorPubkeys := alreadyRegisteredOperatorPubkeys[i]
 		ops.pubkeyDict[operatorAddr] = operatorPubkeys
 		operatorId := types.OperatorIdFromG1Pubkey(operatorPubkeys.G1Pubkey)
 		ops.operatorAddrToId[operatorAddr] = operatorId
-		ops.socketDict[operatorId] = socketsMap[operatorId]
+		ops.updateSocketMapping(operatorId, socketsMap[operatorId])
 	}
 }
 
@@ -189,3 +189,11 @@ func (ops *OperatorsInfoServiceInMemory) GetOperatorInfo(ctx context.Context, op
 		return resp.operatorInfo, resp.operatorExists
 	}
 }
+
+func (ops *OperatorsInfoServiceInMemory) updateSocketMapping(operatorId types.OperatorId, socket types.Socket) {
+	if socket == "" {
+		ops.logger.Warn("Received empty socket for operator", "operatorId", operatorId)
+		return
+	}
+	ops.socketDict[operatorId] = types.Socket(socket)
+}

types/operator.go

@@ -64,6 +64,10 @@ func (o Operator) Validate() error {
 	return operatorMetadata.Validate()
 }
 
+// Socket represents the operator's socket address, which is registered onchain
+// TODO: this could have multiple formats... do we really want to use a custom type for this?
+// it could be ip:port, or just port, or ip:port:port if 2 ports are needed (like in eigenda's cast)
+// or whatever an avs decides to use
 type Socket string
 
 type OperatorInfo struct {