Skip to content

Commit af2f194

Browse files
hopeyenhopeyen
committed
feat: fix BLS_OPERATOR_STATE_RETRIEVER typo
1 parent cf716c1 commit af2f194

File tree

12 files changed

+22
-39
lines changed

12 files changed

+22
-39
lines changed

‎disperser/cmd/apiserver/flags/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ var (
5656
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
5757
Usage: "Address of the BLS Operator State Retriever",
5858
Required: false,
59-
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
59+
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
6060
}
6161
EigenDAServiceManagerFlag = cli.StringFlag{
6262
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),

‎disperser/cmd/apiserver/lib/config.go

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"github.com/Layr-Labs/eigenda/common/aws"
99
"github.com/Layr-Labs/eigenda/common/geth"
1010
"github.com/Layr-Labs/eigenda/common/ratelimit"
11+
"github.com/Layr-Labs/eigenda/core/eth"
1112
"github.com/Layr-Labs/eigenda/disperser"
1213
"github.com/Layr-Labs/eigenda/disperser/apiserver"
1314
"github.com/Layr-Labs/eigenda/disperser/cmd/apiserver/flags"
1415
"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
1516
"github.com/Layr-Labs/eigenda/encoding/kzg"
16-
gethcommon "github.com/ethereum/go-ethereum/common"
1717
"github.com/urfave/cli"
1818
)
1919

@@ -102,20 +102,9 @@ func NewConfig(ctx *cli.Context) (Config, error) {
102102
addressDirectoryAddr := ctx.GlobalString(flags.AddressDirectoryFlag.Name)
103103
blsOperatorStateRetrieverAddr := ctx.GlobalString(flags.BlsOperatorStateRetrieverFlag.Name)
104104
eigenDAServiceManagerAddr := ctx.GlobalString(flags.EigenDAServiceManagerFlag.Name)
105-
106-
if addressDirectoryAddr == "" && (blsOperatorStateRetrieverAddr == "" || eigenDAServiceManagerAddr == "") {
107-
return Config{}, fmt.Errorf("either address-directory must be provided, or both bls-operator-state-retriever and eigenda-service-manager addresses must be provided")
108-
}
109-
110-
// Validate address formats
111-
if addressDirectoryAddr != "" && !gethcommon.IsHexAddress(addressDirectoryAddr) {
112-
return Config{}, fmt.Errorf("address-directory must be a valid hex address")
113-
}
114-
if blsOperatorStateRetrieverAddr != "" && !gethcommon.IsHexAddress(blsOperatorStateRetrieverAddr) {
115-
return Config{}, fmt.Errorf("bls-operator-state-retriever must be a valid hex address")
116-
}
117-
if eigenDAServiceManagerAddr != "" && !gethcommon.IsHexAddress(eigenDAServiceManagerAddr) {
118-
return Config{}, fmt.Errorf("eigenda-service-manager must be a valid hex address")
105+
err = eth.ValidateAddressConfig(addressDirectoryAddr, blsOperatorStateRetrieverAddr, eigenDAServiceManagerAddr)
106+
if err != nil {
107+
return Config{}, err
119108
}
120109

121110
config := Config{

‎disperser/cmd/controller/flags/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var (
2727
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
2828
Usage: "Address of the BLS Operator State Retriever",
2929
Required: false,
30-
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
30+
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
3131
}
3232
EigenDAServiceManagerFlag = cli.StringFlag{
3333
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),

‎inabox/deploy/config.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ func (env *Config) generateDisperserVars(ind int, logPath, dbPath, grpcPort stri
189189

190190
DISPERSER_SERVER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetriever,
191191
DISPERSER_SERVER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,
192-
DISPERSER_SERVER_ADDRESS_DIRECTORY: env.EigenDA.Directory,
193192
}
194193

195194
env.applyDefaults(&v, "DISPERSER_SERVER", "dis", ind)
@@ -228,7 +227,6 @@ func (env *Config) generateDisperserV2Vars(ind int, logPath, dbPath, grpcPort st
228227

229228
DISPERSER_SERVER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetriever,
230229
DISPERSER_SERVER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,
231-
DISPERSER_SERVER_ADDRESS_DIRECTORY: env.EigenDA.Directory,
232230
DISPERSER_SERVER_DISPERSER_VERSION: "2",
233231

234232
DISPERSER_SERVER_ENABLE_PAYMENT_METERER: "true",
@@ -254,7 +252,6 @@ func (env *Config) generateBatcherVars(ind int, key, graphUrl, logPath string) B
254252
BATCHER_PULL_INTERVAL: "5s",
255253
BATCHER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetriever,
256254
BATCHER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,
257-
BATCHER_ADDRESS_DIRECTORY: env.EigenDA.Directory,
258255
BATCHER_SRS_ORDER: "300000",
259256
BATCHER_CHAIN_RPC: "",
260257
BATCHER_PRIVATE_KEY: key[2:],
@@ -342,7 +339,6 @@ func (env *Config) generateControllerVars(
342339
CONTROLLER_DYNAMODB_TABLE_NAME: "test-BlobMetadata-v2",
343340
CONTROLLER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetriever,
344341
CONTROLLER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,
345-
CONTROLLER_ADDRESS_DIRECTORY: env.EigenDA.Directory,
346342
CONTROLLER_USE_GRAPH: "true",
347343
CONTROLLER_GRAPH_URL: graphUrl,
348344
CONTROLLER_ENCODING_PULL_INTERVAL: "1s",
@@ -378,7 +374,6 @@ func (env *Config) generateRelayVars(ind int, graphUrl, grpcPort string) RelayVa
378374
RELAY_RELAY_KEYS: fmt.Sprint(ind),
379375
RELAY_BLS_OPERATOR_STATE_RETRIEVER_ADDR: env.EigenDA.OperatorStateRetriever,
380376
RELAY_EIGEN_DA_SERVICE_MANAGER_ADDR: env.EigenDA.ServiceManager,
381-
RELAY_ADDRESS_DIRECTORY_ADDR: env.EigenDA.Directory,
382377
RELAY_PRIVATE_KEY: "123",
383378
RELAY_GRAPH_URL: graphUrl,
384379
RELAY_ONCHAIN_STATE_REFRESH_INTERVAL: "1s",

‎inabox/deploy/deploy.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,12 @@ func (env *Config) RegisterDisperserKeypair(ethClient common.EthClient) error {
270270
if err != nil {
271271
return fmt.Errorf("could not create logger: %v", err)
272272
}
273-
274273
// Use address directory for deployment scripts
275274
writer, err := eth.NewWriterWithAddressDirectory(
276275
logger,
277276
ethClient,
278-
env.EigenDA.Directory)
277+
env.EigenDA.Directory,
278+
)
279279
if err != nil {
280280
return fmt.Errorf("could not create writer: %v", err)
281281
}

‎inabox/deploy/env_vars.go

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎node/plugin/config.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
"github.com/Layr-Labs/eigenda/common"
99
"github.com/Layr-Labs/eigenda/core"
10+
"github.com/Layr-Labs/eigenda/core/eth"
1011
"github.com/Layr-Labs/eigenda/node/flags"
1112
"github.com/urfave/cli"
1213
)
@@ -116,7 +117,7 @@ var (
116117
Name: "bls-operator-state-retriever",
117118
Usage: "Address of the BLS Operator State Retriever",
118119
Required: false,
119-
EnvVar: common.PrefixEnvVar(flags.EnvVarPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
120+
EnvVar: common.PrefixEnvVar(flags.EnvVarPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
120121
}
121122
EigenDAServiceManagerFlag = cli.StringFlag{
122123
Name: "eigenda-service-manager",
@@ -193,8 +194,9 @@ func NewConfig(ctx *cli.Context) (*Config, error) {
193194
blsOperatorStateRetrieverAddr := ctx.GlobalString(BlsOperatorStateRetrieverFlag.Name)
194195
eigenDAServiceManagerAddr := ctx.GlobalString(EigenDAServiceManagerFlag.Name)
195196

196-
if addressDirectoryAddr == "" && (blsOperatorStateRetrieverAddr == "" || eigenDAServiceManagerAddr == "") {
197-
return nil, errors.New("either address-directory must be provided, or both bls-operator-state-retriever and eigenda-service-manager must be provided")
197+
err := eth.ValidateAddressConfig(addressDirectoryAddr, blsOperatorStateRetrieverAddr, eigenDAServiceManagerAddr)
198+
if err != nil {
199+
return nil, err
198200
}
199201

200202
return &Config{

‎retriever/flags/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var (
4242
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
4343
Usage: "Address of the BLS Operator State Retriever",
4444
Required: false,
45-
EnvVar: common.PrefixEnvVar(envPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
45+
EnvVar: common.PrefixEnvVar(envPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
4646
}
4747
EigenDAServiceManagerFlag = cli.StringFlag{
4848
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),

‎test/v2/client/test_client_config.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ type TestClientConfig struct {
3232
EthRPCUrlsVar string
3333
// The contract address for the EigenDA address directory (optional)
3434
//
35-
// If provided, this will be used to look up contract addresses instead of individual contract addresses.
36-
// Either this OR both BLSOperatorStateRetrieverAddr and EigenDAServiceManagerAddr must be provided.
35+
// In the future, this will be used to look up contract addresses instead of individual contract addresses.
36+
// Currently the EigenDA address directory is just used to look up BLSOperatorStateRetrieverAddr and EigenDAServiceManagerAddr.
37+
// All the new future contract addresses will be added to the address directory.
38+
// Either this is provided, OR both BLSOperatorStateRetrieverAddr and EigenDAServiceManagerAddr must be provided until we migrate
39+
// all contract addresses to the address directory.
3740
AddressDirectoryAddr string
3841
// The contract address for the EigenDA BLS operator state retriever
3942
BLSOperatorStateRetrieverAddr string

‎tools/ejections/flags/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var (
5757
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
5858
Usage: "Address of the BLS Operator State Retriever",
5959
Required: false,
60-
EnvVar: common.PrefixEnvVar(envPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
60+
EnvVar: common.PrefixEnvVar(envPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
6161
}
6262
EigenDAServiceManagerFlag = cli.StringFlag{
6363
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),

0 commit comments

Comments
 (0)