Skip to content

Commit 8644746

Browse files
PatStilesMauroToscanoOppen
authored
Fix: Bump eigensdk-go version (#1470)
Co-authored-by: MauroFab <[email protected]> Co-authored-by: Mauro Toscano <[email protected]> Co-authored-by: Mario Rugiero <[email protected]>
1 parent bb152df commit 8644746

File tree

11 files changed

+73
-30
lines changed

11 files changed

+73
-30
lines changed

‎core/config/aggregator.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"os"
77
"time"
88

9-
sdkutils "github.com/Layr-Labs/eigensdk-go/utils"
109
"github.com/ethereum/go-ethereum/common"
10+
"github.com/yetanotherco/aligned_layer/core/utils"
1111
)
1212

1313
type AggregatorConfig struct {
@@ -73,7 +73,7 @@ func NewAggregatorConfig(configFilePath string) *AggregatorConfig {
7373
}
7474

7575
var aggregatorConfigFromYaml AggregatorConfigFromYaml
76-
err := sdkutils.ReadYamlConfig(configFilePath, &aggregatorConfigFromYaml)
76+
err := utils.ReadYamlConfig(configFilePath, &aggregatorConfigFromYaml)
7777
if err != nil {
7878
log.Fatal("Error reading aggregator config: ", err)
7979
}

‎core/config/aligned_layer_deployment.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package config
22

33
import (
44
"errors"
5-
sdkutils "github.com/Layr-Labs/eigensdk-go/utils"
6-
"github.com/ethereum/go-ethereum/common"
75
"log"
86
"os"
7+
8+
"github.com/ethereum/go-ethereum/common"
9+
"github.com/yetanotherco/aligned_layer/core/utils"
910
)
1011

1112
type AlignedLayerDeploymentConfig struct {
@@ -29,7 +30,7 @@ func NewAlignedLayerDeploymentConfig(alignedLayerDeploymentFilePath string) *Ali
2930
}
3031

3132
var alignedLayerDeploymentConfigFromJson AlignedLayerDeploymentConfigFromJson
32-
err := sdkutils.ReadJsonConfig(alignedLayerDeploymentFilePath, &alignedLayerDeploymentConfigFromJson)
33+
err := utils.ReadJsonConfig(alignedLayerDeploymentFilePath, &alignedLayerDeploymentConfigFromJson)
3334

3435
if err != nil {
3536
log.Fatal("Error reading aligned layer deployment config: ", err)

‎core/config/base.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/Layr-Labs/eigensdk-go/chainio/clients/eth"
1111
sdklogging "github.com/Layr-Labs/eigensdk-go/logging"
1212
rpccalls "github.com/Layr-Labs/eigensdk-go/metrics/collectors/rpc_calls"
13-
sdkutils "github.com/Layr-Labs/eigensdk-go/utils"
1413
"github.com/prometheus/client_golang/prometheus"
1514
"github.com/urfave/cli/v2"
15+
"github.com/yetanotherco/aligned_layer/core/utils"
1616
)
1717

1818
var (
@@ -58,7 +58,7 @@ func NewBaseConfig(configFilePath string) *BaseConfig {
5858

5959
var baseConfigFromYaml BaseConfigFromYaml
6060

61-
err := sdkutils.ReadYamlConfig(configFilePath, &baseConfigFromYaml)
61+
err := utils.ReadYamlConfig(configFilePath, &baseConfigFromYaml)
6262
if err != nil {
6363
log.Fatal("Error reading setup config: ", err)
6464
}

‎core/config/bls.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package config
22

33
import (
44
"errors"
5-
"github.com/Layr-Labs/eigensdk-go/crypto/bls"
6-
sdkutils "github.com/Layr-Labs/eigensdk-go/utils"
75
"log"
86
"os"
7+
8+
"github.com/Layr-Labs/eigensdk-go/crypto/bls"
9+
"github.com/yetanotherco/aligned_layer/core/utils"
910
)
1011

1112
type BlsConfig struct {
@@ -25,7 +26,7 @@ func NewBlsConfig(blsConfigFilePath string) *BlsConfig {
2526
}
2627

2728
var blsConfigFromYaml BlsConfigFromYaml
28-
err := sdkutils.ReadYamlConfig(blsConfigFilePath, &blsConfigFromYaml)
29+
err := utils.ReadYamlConfig(blsConfigFilePath, &blsConfigFromYaml)
2930
if err != nil {
3031
log.Fatal("Error reading bls config: ", err)
3132
}

‎core/config/ecdsa.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package config
33
import (
44
"crypto/ecdsa"
55
"errors"
6-
ecdsa2 "github.com/Layr-Labs/eigensdk-go/crypto/ecdsa"
7-
"github.com/Layr-Labs/eigensdk-go/signer"
8-
sdkutils "github.com/Layr-Labs/eigensdk-go/utils"
96
"log"
107
"math/big"
118
"os"
9+
10+
ecdsa2 "github.com/Layr-Labs/eigensdk-go/crypto/ecdsa"
11+
"github.com/Layr-Labs/eigensdk-go/signer"
12+
"github.com/yetanotherco/aligned_layer/core/utils"
1213
)
1314

1415
type EcdsaConfig struct {
@@ -29,7 +30,7 @@ func NewEcdsaConfig(ecdsaConfigFilePath string, chainId *big.Int) *EcdsaConfig {
2930
}
3031

3132
var ecdsaConfigFromYaml EcdsaConfigFromYaml
32-
err := sdkutils.ReadYamlConfig(ecdsaConfigFilePath, &ecdsaConfigFromYaml)
33+
err := utils.ReadYamlConfig(ecdsaConfigFilePath, &ecdsaConfigFromYaml)
3334
if err != nil {
3435
log.Fatal("Error reading ecdsa config: ", err)
3536
}

‎core/config/eigen_layer_deployment.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package config
22

33
import (
44
"errors"
5-
sdkutils "github.com/Layr-Labs/eigensdk-go/utils"
6-
"github.com/ethereum/go-ethereum/common"
75
"log"
86
"os"
7+
8+
"github.com/ethereum/go-ethereum/common"
9+
"github.com/yetanotherco/aligned_layer/core/utils"
910
)
1011

1112
type EigenLayerDeploymentConfig struct {
@@ -29,7 +30,7 @@ func NewEigenLayerDeploymentConfig(eigenLayerDeploymentFilePath string) *EigenLa
2930
}
3031

3132
var eigenLayerDeploymentConfigFromJson EigenLayerDeploymentConfigFromJson
32-
err := sdkutils.ReadJsonConfig(eigenLayerDeploymentFilePath, &eigenLayerDeploymentConfigFromJson)
33+
err := utils.ReadJsonConfig(eigenLayerDeploymentFilePath, &eigenLayerDeploymentConfigFromJson)
3334

3435
if err != nil {
3536
log.Fatal("Error reading eigen layer deployment config: ", err)

‎core/config/operator.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"log"
66
"os"
77

8-
sdkutils "github.com/Layr-Labs/eigensdk-go/utils"
98
"github.com/ethereum/go-ethereum/common"
9+
"github.com/yetanotherco/aligned_layer/core/utils"
1010
)
1111

1212
type OperatorConfig struct {
@@ -71,7 +71,7 @@ func NewOperatorConfig(configFilePath string) *OperatorConfig {
7171
}
7272

7373
var operatorConfigFromYaml OperatorConfigFromYaml
74-
err := sdkutils.ReadYamlConfig(configFilePath, &operatorConfigFromYaml)
74+
err := utils.ReadYamlConfig(configFilePath, &operatorConfigFromYaml)
7575

7676
if err != nil {
7777
log.Fatal("Error reading operator config: ", err)

‎core/utils/config_utils.go‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package utils
2+
3+
import (
4+
"encoding/json"
5+
"log"
6+
"os"
7+
"path/filepath"
8+
9+
"gopkg.in/yaml.v3"
10+
)
11+
12+
func ReadFile(path string) ([]byte, error) {
13+
return os.ReadFile(filepath.Clean(path))
14+
}
15+
16+
func ReadYamlConfig(path string, o interface{}) error {
17+
b, err := ReadFile(path)
18+
if err != nil {
19+
return err
20+
}
21+
22+
err = yaml.Unmarshal(b, o)
23+
if err != nil {
24+
log.Fatalf("unable to parse file with error %#v", err)
25+
}
26+
27+
return nil
28+
}
29+
30+
func ReadJsonConfig(path string, o interface{}) error {
31+
b, err := ReadFile(path)
32+
if err != nil {
33+
return err
34+
}
35+
36+
err = json.Unmarshal(b, o)
37+
if err != nil {
38+
log.Fatalf("unable to parse file with error %#v", err)
39+
}
40+
41+
return nil
42+
}

‎go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/yetanotherco/aligned_layer
33
go 1.22.2
44

55
require (
6-
github.com/Layr-Labs/eigensdk-go v0.1.12
6+
github.com/Layr-Labs/eigensdk-go v0.1.13
77
github.com/ethereum/go-ethereum v1.14.0
88
github.com/prometheus/client_golang v1.19.1
99
github.com/urfave/cli/v2 v2.27.1
@@ -17,6 +17,7 @@ require (
1717
github.com/consensys/gnark-crypto v0.12.2-0.20240215234832-d72fcb379d3e
1818
github.com/fxamacker/cbor/v2 v2.7.0
1919
github.com/ugorji/go/codec v1.2.12
20+
gopkg.in/yaml.v3 v3.0.1
2021
)
2122

2223
require (
@@ -41,7 +42,6 @@ require (
4142
github.com/bits-and-blooms/bitset v1.10.0 // indirect
4243
github.com/blang/semver/v4 v4.0.0 // indirect
4344
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
44-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4545
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4646
github.com/consensys/bavard v0.1.13 // indirect
4747
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
@@ -90,6 +90,5 @@ require (
9090
golang.org/x/sys v0.19.0 // indirect
9191
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
9292
google.golang.org/protobuf v1.34.2 // indirect
93-
gopkg.in/yaml.v3 v3.0.1 // indirect
9493
rsc.io/tmplfunc v0.0.3 // indirect
9594
)

‎go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl
66
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
77
github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
88
github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
9-
github.com/Layr-Labs/eigensdk-go v0.1.12 h1:Drf59iJLvnTm2Om9AwAyUMiZeJaTI8ZameIrnhjopSY=
10-
github.com/Layr-Labs/eigensdk-go v0.1.12/go.mod h1:XcLVDtlB1vOPj63D236b451+SC75B8gwgkpNhYHSxNs=
9+
github.com/Layr-Labs/eigensdk-go v0.1.13 h1:llaDZW52AgrezJUpfqCzzgYuf47DK1HUOQLnI3jcVrA=
10+
github.com/Layr-Labs/eigensdk-go v0.1.13/go.mod h1:aYdNURUhaqeYOS+Cq12TfSdPbjFfiLaHkxPdR4Exq/s=
1111
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
1212
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
1313
github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8=
@@ -54,8 +54,6 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurT
5454
github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
5555
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
5656
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
57-
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
58-
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
5957
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
6058
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
6159
github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
@@ -106,8 +104,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etly
106104
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
107105
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
108106
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
109-
github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE=
110-
github.com/docker/docker v25.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
107+
github.com/docker/docker v25.0.6+incompatible h1:5cPwbwriIcsua2REJe8HqQV+6WlWc1byg2QSXzBxBGg=
108+
github.com/docker/docker v25.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
111109
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
112110
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
113111
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=

0 commit comments

Comments
 (0)