Skip to content

Commit 56bd1a8

Browse files
committed
Revert Go module replacements
1 parent 456cf32 commit 56bd1a8

6 files changed

Lines changed: 18 additions & 13 deletions

File tree

aggregator/cmd/main.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import (
77
"os"
88

99
"github.com/urfave/cli/v2"
10-
// TODO(xqft): used lambdaclass below as a temporary solution, can't
11-
// import the internal package when in presence of a replace directive.
12-
"github.com/lambdaclass/aligned_layer/aggregator/internal/pkg"
10+
"github.com/yetanotherco/aligned_layer/aggregator/internal/pkg"
1311
"github.com/yetanotherco/aligned_layer/core/config"
1412
)
1513

aggregator/internal/pkg/aggregator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func NewAggregator(aggregatorConfig config.AggregatorConfig) (*Aggregator, error
140140
return taskResponseDigest, nil
141141
}
142142

143-
operatorPubkeysService := oppubkeysserv.NewOperatorsInfoServiceInMemory(context.Background(), clients.AvsRegistryChainSubscriber, clients.AvsRegistryChainReader, nil, logger)
143+
operatorPubkeysService := oppubkeysserv.NewOperatorsInfoServiceInMemory(context.Background(), clients.AvsRegistryChainSubscriber, clients.AvsRegistryChainReader, nil, oppubkeysserv.Opts{}, logger)
144144
avsRegistryService := avsregistry.NewAvsRegistryServiceChainCaller(avsReader.ChainReader, operatorPubkeysService, logger)
145145
blsAggregationService := blsagg.NewBlsAggregatorService(avsRegistryService, hashFunction, logger)
146146

batcher/Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
[workspace]
2-
members = ["aligned-batcher", "aligned-sdk", "aligned"]
2+
members = [
3+
"aligned-batcher",
4+
"aligned-sdk",
5+
"aligned"
6+
]
37
resolver = "2"
48

59
[patch.crates-io]

go.mod

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/lambdaclass/aligned_layer
1+
module github.com/yetanotherco/aligned_layer
22

33
go 1.22.2
44

@@ -14,12 +14,12 @@ require (
1414
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6
1515
github.com/consensys/gnark v0.10.0
1616
github.com/consensys/gnark-crypto v0.12.2-0.20240215234832-d72fcb379d3e
17-
github.com/yetanotherco/aligned_layer v0.0.0-00010101000000-000000000000
1817
github.com/fxamacker/cbor/v2 v2.7.0
1918
github.com/ugorji/go/codec v1.2.12
2019
)
2120

2221
require (
22+
github.com/DataDog/zstd v1.5.2 // indirect
2323
github.com/Microsoft/go-winio v0.6.1 // indirect
2424
github.com/StackExchange/wmi v1.2.1 // indirect
2525
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
@@ -57,36 +57,39 @@ require (
5757
github.com/holiman/uint256 v1.2.4 // indirect
5858
github.com/ingonyama-zk/icicle v0.0.0-20230928131117-97f0079e5c71 // indirect
5959
github.com/ingonyama-zk/iciclegnark v0.1.0 // indirect
60+
github.com/klauspost/compress v1.17.7 // indirect
6061
github.com/lmittmann/tint v1.0.4 // indirect
6162
github.com/mattn/go-colorable v0.1.13 // indirect
6263
github.com/mattn/go-isatty v0.0.20 // indirect
64+
github.com/mitchellh/mapstructure v1.5.0 // indirect
6365
github.com/mmcloughlin/addchain v0.4.0 // indirect
6466
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6567
github.com/prometheus/client_model v0.6.1 // indirect
6668
github.com/prometheus/common v0.52.2 // indirect
6769
github.com/prometheus/procfs v0.13.0 // indirect
70+
github.com/rivo/uniseg v0.4.4 // indirect
71+
github.com/rs/cors v1.8.3 // indirect
6872
github.com/rs/zerolog v1.32.0 // indirect
6973
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7074
github.com/shirou/gopsutil v3.21.6+incompatible // indirect
7175
github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466 // indirect
7276
github.com/stretchr/testify v1.9.0 // indirect
7377
github.com/supranational/blst v0.3.11 // indirect
78+
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
7479
github.com/tklauser/go-sysconf v0.3.12 // indirect
7580
github.com/tklauser/numcpus v0.6.1 // indirect
7681
github.com/x448/float16 v0.8.4 // indirect
7782
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
7883
go.uber.org/multierr v1.11.0 // indirect
7984
go.uber.org/zap v1.27.0 // indirect
85+
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
8086
golang.org/x/mod v0.17.0 // indirect
8187
golang.org/x/net v0.24.0 // indirect
8288
golang.org/x/sync v0.7.0 // indirect
8389
golang.org/x/sys v0.19.0 // indirect
8490
golang.org/x/tools v0.20.0 // indirect
91+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
8592
google.golang.org/protobuf v1.34.2 // indirect
8693
gopkg.in/yaml.v3 v3.0.1 // indirect
8794
rsc.io/tmplfunc v0.0.3 // indirect
8895
)
89-
90-
replace github.com/Layr-Labs/eigensdk-go => github.com/yetanotherco/eigensdk-go v0.1.10-0.20240805154752-29f4d3457921
91-
92-
replace github.com/yetanotherco/aligned_layer => .

operator/cmd/actions/deposit_into_strategy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func depositIntoStrategyMain(ctx *cli.Context) error {
8585
return err
8686
}
8787

88-
_, err = eigenLayerWriter.DepositERC20IntoStrategy(context.Background(), strategyAddr, amount)
88+
_, err = eigenLayerWriter.DepositERC20IntoStrategy(context.Background(), strategyAddr, amount, true)
8989
if err != nil {
9090
config.BaseConfig.Logger.Errorf("Error depositing into strategy")
9191
return err

operator/pkg/register.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func RegisterOperator(
2929

3030
_, err = writer.RegisterOperator(ctx, configuration.EcdsaConfig.PrivateKey,
3131
configuration.BlsConfig.KeyPair,
32-
quorumNumbers, socket)
32+
quorumNumbers, socket, true)
3333

3434
if err != nil {
3535
configuration.BaseConfig.Logger.Error("Failed to register operator", "err", err)

0 commit comments

Comments
 (0)