Skip to content

Commit 44b673f

Browse files
afkbyteafkbyte
authored
Merge pull request #45 from Layr-Labs/testnet
Bump EigenSDK to v0.2.0-beta.1 for compatibility with new Holesky Deploy
2 parents 76cf373 + 080e4cb commit 44b673f

File tree

5 files changed

+434
-276
lines changed

5 files changed

+434
-276
lines changed

‎avssync/avssync.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
)
1717

1818
type AvsSync struct {
19-
AvsReader avsregistry.AvsRegistryReader
20-
AvsWriter avsregistry.AvsRegistryWriter
19+
AvsReader *avsregistry.ChainReader
20+
AvsWriter *avsregistry.ChainWriter
2121
RetrySyncNTimes int
2222

2323
logger sdklogging.Logger
@@ -40,7 +40,7 @@ type AvsSync struct {
4040
// fetchQuorumsDynamically - if true, fetch the list of quorums registered in the contract and update all of them (only needed if operators is not empty)
4141
func NewAvsSync(
4242
logger sdklogging.Logger,
43-
avsReader avsregistry.AvsRegistryReader, avsWriter avsregistry.AvsRegistryWriter,
43+
avsReader *avsregistry.ChainReader, avsWriter *avsregistry.ChainWriter,
4444
sleepBeforeFirstSyncDuration time.Duration, syncInterval time.Duration, operators []common.Address,
4545
quorums []byte, fetchQuorumsDynamically bool, retrySyncNTimes int,
4646
readerTimeoutDuration time.Duration, writerTimeoutDuration time.Duration,
@@ -131,7 +131,7 @@ func (a *AvsSync) updateStakes() {
131131
timeoutCtx, cancel := context.WithTimeout(context.Background(), a.writerTimeoutDuration)
132132
defer cancel()
133133
// this one we update all quorums at once, since we're only updating a subset of operators (which should be a small number)
134-
receipt, err := a.AvsWriter.UpdateStakesOfOperatorSubsetForAllQuorums(timeoutCtx, a.operators)
134+
receipt, err := a.AvsWriter.UpdateStakesOfOperatorSubsetForAllQuorums(timeoutCtx, a.operators, true)
135135
if err != nil {
136136
// no quorum label means we are updating all quorums
137137
for _, quorum := range a.quorums {
@@ -191,7 +191,7 @@ func (a *AvsSync) tryNTimesUpdateStakesOfEntireOperatorSetForQuorum(quorum byte,
191191
a.logger.Infof("Updating stakes of operators in quorum %d: %v", int(quorum), operators)
192192
timeoutCtx, cancel = context.WithTimeout(context.Background(), a.writerTimeoutDuration)
193193
defer cancel()
194-
receipt, err := a.AvsWriter.UpdateStakesOfEntireOperatorSetForQuorums(timeoutCtx, [][]common.Address{operators}, types.QuorumNums{types.QuorumNum(quorum)})
194+
receipt, err := a.AvsWriter.UpdateStakesOfEntireOperatorSetForQuorums(timeoutCtx, [][]common.Address{operators}, types.QuorumNums{types.QuorumNum(quorum)}, true)
195195
if err != nil {
196196
a.logger.Warn("Error updating stakes of entire operator set for quorum", "err", err, "quorum", int(quorum), "retryNTimes", retryNTimes, "try", i+1)
197197
continue

‎go.mod

+40-34
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
module github.com/Layr-Labs/avs-sync
22

3-
go 1.21.2
3+
go 1.21.13
4+
5+
toolchain go1.23.2
46

57
require (
6-
github.com/Layr-Labs/eigensdk-go v0.1.4-0.20240330002735-c0efcad71d31
7-
github.com/ethereum/go-ethereum v1.13.14
8+
github.com/Layr-Labs/eigensdk-go v0.2.0-beta.1
9+
github.com/ethereum/go-ethereum v1.14.0
810
github.com/prometheus/client_golang v1.19.0
9-
github.com/testcontainers/testcontainers-go v0.29.1
11+
github.com/stretchr/testify v1.9.0
12+
github.com/testcontainers/testcontainers-go v0.30.0
1013
github.com/urfave/cli v1.22.14
11-
go.uber.org/mock v0.4.0
1214
)
1315

1416
require (
@@ -17,20 +19,21 @@ require (
1719
github.com/Microsoft/go-winio v0.6.1 // indirect
1820
github.com/Microsoft/hcsshim v0.11.4 // indirect
1921
github.com/StackExchange/wmi v1.2.1 // indirect
20-
github.com/aws/aws-sdk-go-v2 v1.26.0 // indirect
21-
github.com/aws/aws-sdk-go-v2/config v1.27.9 // indirect
22-
github.com/aws/aws-sdk-go-v2/credentials v1.17.9 // indirect
23-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.0 // indirect
24-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.4 // indirect
25-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.4 // indirect
22+
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
23+
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
24+
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect
25+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
26+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
27+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
2628
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
27-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect
28-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.6 // indirect
29-
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.5 // indirect
30-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.3 // indirect
31-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.3 // indirect
32-
github.com/aws/aws-sdk-go-v2/service/sts v1.28.5 // indirect
33-
github.com/aws/smithy-go v1.20.1 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
30+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/kms v1.31.0 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 // indirect
33+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
35+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
36+
github.com/aws/smithy-go v1.20.2 // indirect
3437
github.com/beorn7/perks v1.0.1 // indirect
3538
github.com/bits-and-blooms/bitset v1.10.0 // indirect
3639
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
@@ -42,26 +45,28 @@ require (
4245
github.com/containerd/log v0.1.0 // indirect
4346
github.com/cpuguy83/dockercfg v0.3.1 // indirect
4447
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
45-
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
48+
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
49+
github.com/davecgh/go-spew v1.1.1 // indirect
4650
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
4751
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
4852
github.com/distribution/reference v0.5.0 // indirect
49-
github.com/docker/docker v25.0.3+incompatible // indirect
53+
github.com/docker/docker v25.0.6+incompatible // indirect
5054
github.com/docker/go-connections v0.5.0 // indirect
5155
github.com/docker/go-units v0.5.0 // indirect
52-
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
53-
github.com/felixge/httpsnoop v1.0.3 // indirect
56+
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
57+
github.com/felixge/httpsnoop v1.0.4 // indirect
5458
github.com/fsnotify/fsnotify v1.6.0 // indirect
55-
github.com/go-logr/logr v1.2.4 // indirect
59+
github.com/go-logr/logr v1.4.1 // indirect
5660
github.com/go-logr/stdr v1.2.2 // indirect
5761
github.com/go-ole/go-ole v1.3.0 // indirect
5862
github.com/gogo/protobuf v1.3.2 // indirect
5963
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
60-
github.com/golang/protobuf v1.5.3 // indirect
64+
github.com/golang/protobuf v1.5.4 // indirect
6165
github.com/google/uuid v1.6.0 // indirect
6266
github.com/gorilla/websocket v1.4.2 // indirect
6367
github.com/holiman/uint256 v1.2.4 // indirect
6468
github.com/klauspost/compress v1.16.0 // indirect
69+
github.com/lmittmann/tint v1.0.4 // indirect
6570
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
6671
github.com/magiconair/properties v1.8.7 // indirect
6772
github.com/mmcloughlin/addchain v0.4.0 // indirect
@@ -73,6 +78,7 @@ require (
7378
github.com/opencontainers/go-digest v1.0.0 // indirect
7479
github.com/opencontainers/image-spec v1.1.0 // indirect
7580
github.com/pkg/errors v0.9.1 // indirect
81+
github.com/pmezard/go-difflib v1.0.0 // indirect
7682
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
7783
github.com/prometheus/client_model v0.5.0 // indirect
7884
github.com/prometheus/common v0.48.0 // indirect
@@ -86,21 +92,21 @@ require (
8692
github.com/tklauser/go-sysconf v0.3.12 // indirect
8793
github.com/tklauser/numcpus v0.6.1 // indirect
8894
github.com/yusufpapurcu/wmi v1.2.3 // indirect
89-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
90-
go.opentelemetry.io/otel v1.19.0 // indirect
91-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
92-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
95+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
96+
go.opentelemetry.io/otel v1.24.0 // indirect
97+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
98+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
9399
go.uber.org/multierr v1.11.0 // indirect
94100
go.uber.org/zap v1.27.0 // indirect
95-
golang.org/x/crypto v0.18.0 // indirect
101+
golang.org/x/crypto v0.22.0 // indirect
96102
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
97-
golang.org/x/mod v0.16.0 // indirect
98-
golang.org/x/sync v0.5.0 // indirect
99-
golang.org/x/sys v0.16.0 // indirect
100-
golang.org/x/tools v0.15.0 // indirect
103+
golang.org/x/mod v0.17.0 // indirect
104+
golang.org/x/sync v0.7.0 // indirect
105+
golang.org/x/sys v0.19.0 // indirect
106+
golang.org/x/tools v0.20.0 // indirect
101107
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
102108
google.golang.org/grpc v1.58.3 // indirect
103-
google.golang.org/protobuf v1.32.0 // indirect
109+
google.golang.org/protobuf v1.33.0 // indirect
104110
gopkg.in/yaml.v3 v3.0.1 // indirect
105111
rsc.io/tmplfunc v0.0.3 // indirect
106112
)

0 commit comments

Comments
 (0)