Merge pull request #12 from Layr-Labs/incorporate-more-lightblocks-fe…

…edback

Incorporate second round of feedback from lightblocks

avssync.go

@@ -57,7 +57,7 @@ func NewAvsSync(
 
 func (a *AvsSync) Start() {
 	a.logger.Infof("Starting avs sync with sleepBeforeFirstSyncDuration=%s, syncInterval=%s, operators=%v, quorums=%v, fetchQuorumsDynamically=%v, readerTimeoutDuration=%s, writerTimeoutDuration=%s",
-		a.sleepBeforeFirstSyncDuration, a.syncInterval, a.operators, a.quorums, a.fetchQuorumsDynamically, a.readerTimeoutDuration, a.writerTimeoutDuration)
+		a.sleepBeforeFirstSyncDuration, a.syncInterval, a.operators, convertQuorumsBytesToInts(a.quorums), a.fetchQuorumsDynamically, a.readerTimeoutDuration, a.writerTimeoutDuration)
 
 	// ticker doesn't tick immediately, so we send a first updateStakes here
 	// see https://github.com/golang/go/issues/17601
@@ -91,7 +91,7 @@ func (a *AvsSync) updateStakes() error {
 	if len(a.operators) == 0 {
 		a.logger.Info("Updating stakes of entire operator set")
 		a.maybeUpdateQuorumSet()
-		a.logger.Infof("Current quorum set: %v", a.quorums)
+		a.logger.Infof("Current quorum set: %v", convertQuorumsBytesToInts(a.quorums))
 
 		// we update one quorum at a time, just to make sure we don't run into any gas limit issues
 		// in case there are a lot of operators in a given quorum
@@ -135,7 +135,7 @@ func (a *AvsSync) maybeUpdateQuorumSet() {
 
 func (a *AvsSync) tryNTimesUpdateStakesOfEntireOperatorSetForQuorum(quorum byte, retryNTimes int) {
 	for i := 0; i < retryNTimes; i++ {
-		a.logger.Debug("tryNTimesUpdateStakesOfEntireOperatorSetForQuorum", "quorum", quorum, "retryNTimes", retryNTimes, "try", i+1)
+		a.logger.Debug("tryNTimesUpdateStakesOfEntireOperatorSetForQuorum", "quorum", int(quorum), "retryNTimes", retryNTimes, "try", i+1)
 
 		timeoutCtx, cancel := context.WithTimeout(context.Background(), a.readerTimeoutDuration)
 		defer cancel()
@@ -149,15 +149,23 @@ func (a *AvsSync) tryNTimesUpdateStakesOfEntireOperatorSetForQuorum(quorum byte,
 		sort.Slice(operators, func(i, j int) bool {
 			return operators[i].Big().Cmp(operators[j].Big()) < 0
 		})
-		a.logger.Infof("Updating stakes of operators in quorum %d: %v", quorum, operators)
+		a.logger.Infof("Updating stakes of operators in quorum %d: %v", int(quorum), operators)
 		timeoutCtx, cancel = context.WithTimeout(context.Background(), a.writerTimeoutDuration)
 		defer cancel()
 		_, err = a.avsWriter.UpdateStakesOfEntireOperatorSetForQuorums(timeoutCtx, [][]common.Address{operators}, []byte{quorum})
 		if err != nil {
-			a.logger.Error("Error updating stakes of entire operator set for quorum", "err", err, "quorum", quorum)
+			a.logger.Error("Error updating stakes of entire operator set for quorum", "err", err, "quorum", int(quorum))
 			continue
 		}
 		return
 	}
 	a.logger.Error("Giving up after retrying", "retryNTimes", retryNTimes)
 }
+
+func convertQuorumsBytesToInts(quorums []byte) []int {
+	var quorumsInts []int
+	for _, quorum := range quorums {
+		quorumsInts = append(quorumsInts, int(quorum))
+	}
+	return quorumsInts
+}

go.mod

@@ -3,7 +3,7 @@ module github.com/Layr-Labs/avs-sync
 go 1.21.2
 
 require (
-	github.com/Layr-Labs/eigensdk-go v0.1.1-0.20240207213853-8a666597e0f1
+	github.com/Layr-Labs/eigensdk-go v0.1.1
 	github.com/ethereum/go-ethereum v1.13.12
 	github.com/testcontainers/testcontainers-go v0.26.0
 	github.com/urfave/cli v1.22.14

go.sum

@@ -8,8 +8,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
 github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
-github.com/Layr-Labs/eigensdk-go v0.1.1-0.20240207213853-8a666597e0f1 h1:OKkL+wllNIELDSgYr6mJQZKZ/H7lH40Szk6ZpdQmjLE=
-github.com/Layr-Labs/eigensdk-go v0.1.1-0.20240207213853-8a666597e0f1/go.mod h1:H+IrmttU+eytGEblC7J9gmvBV425UcPPvEVO4JkHALE=
+github.com/Layr-Labs/eigensdk-go v0.1.1 h1:AjUoieoAtaGxuxOHj6nB2xxuBTrghlYJl3AguICI9kc=
+github.com/Layr-Labs/eigensdk-go v0.1.1/go.mod h1:c/yA0hmP2pJILySQLerQnDPcJ5Z3mtyH0hhjQGw3Xrc=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8=

integration_test.go

@@ -481,6 +481,7 @@ func depositErc20IntoStrategyForOperator(
 	txMgr := txmgr.NewSimpleTxManager(ethHttpClient, logger, signerFn, ecdsaAddr)
 	elWriter, err := elcontracts.BuildELChainWriter(
 		delegationManagerAddr,
+		common.Address{}, // avsDirectory not needed so we just pass an empty address
 		ethHttpClient,
 		logger,
 		noopMetrics,