Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: inconsistent 'retriever' #468

Merged
merged 1 commit into from
Apr 10, 2024
Merged

fix: inconsistent 'retriever' #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/ratelimit/ratelimit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ func TestRatelimit(t *testing.T) {

ctx := context.Background()

retreiverID := "testRetriever"
retrieverID := "testRetriever"

params := []common.RequestParams{
{
RequesterID: retreiverID,
RequesterID: retrieverID,
BlobSize: 10,
Rate: 100,
},
Expand Down
4 changes: 2 additions & 2 deletions core/indexer/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func mustMakeOperatorTransactor(env *deploy.Config, op deploy.OperatorVars, logg
c, err := geth.NewClient(config, gethcommon.Address{}, 0, logger)
Expect(err).ToNot(HaveOccurred())

tx, err := eth.NewTransactor(logger, c, op.NODE_BLS_OPERATOR_STATE_RETRIVER, op.NODE_EIGENDA_SERVICE_MANAGER)
tx, err := eth.NewTransactor(logger, c, op.NODE_BLS_OPERATOR_STATE_RETRIEVER, op.NODE_EIGENDA_SERVICE_MANAGER)
Expect(err).To(BeNil())
return tx

Expand Down Expand Up @@ -118,7 +118,7 @@ func mustMakeTestClients(env *deploy.Config, privateKey string, logger logging.L
func mustMakeChainState(env *deploy.Config, store indexer.HeaderStore, logger logging.Logger) *indexedstate.IndexedChainState {
client, rpcClient := mustMakeTestClients(env, env.Batcher[0].BATCHER_PRIVATE_KEY, logger)

tx, err := eth.NewTransactor(logger, client, env.EigenDA.OperatorStateRetreiver, env.EigenDA.ServiceManager)
tx, err := eth.NewTransactor(logger, client, env.EigenDA.OperatorStateRetriever, env.EigenDA.ServiceManager)
Expect(err).ToNot(HaveOccurred())

var (
Expand Down
2 changes: 1 addition & 1 deletion core/thegraph/state_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestIndexerIntegration(t *testing.T) {

logger := logging.NewNoopLogger()
client := mustMakeTestClient(t, testConfig, testConfig.Batcher[0].BATCHER_PRIVATE_KEY, logger)
tx, err := eth.NewTransactor(logger, client, testConfig.EigenDA.OperatorStateRetreiver, testConfig.EigenDA.ServiceManager)
tx, err := eth.NewTransactor(logger, client, testConfig.EigenDA.OperatorStateRetriever, testConfig.EigenDA.ServiceManager)
assert.NoError(t, err)

cs := thegraph.NewIndexedChainState(eth.NewChainState(tx, client), graphql.NewClient(graphUrl, nil), logger)
Expand Down
2 changes: 1 addition & 1 deletion disperser/cmd/apiserver/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var (
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
Usage: "Address of the BLS Operator State Retriever",
Required: true,
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
}
EigenDAServiceManagerFlag = cli.StringFlag{
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),
Expand Down
2 changes: 1 addition & 1 deletion disperser/cmd/batcher/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var (
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
Usage: "Address of the BLS Operator State Retriever",
Required: true,
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
}
EigenDAServiceManagerFlag = cli.StringFlag{
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),
Expand Down
2 changes: 1 addition & 1 deletion disperser/cmd/dataapi/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ var (
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
Usage: "Address of the BLS Operator State Retriever",
Required: true,
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
EnvVar: common.PrefixEnvVar(envVarPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
}
EigenDAServiceManagerFlag = cli.StringFlag{
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),
Expand Down
10 changes: 5 additions & 5 deletions inabox/deploy/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (env *Config) generateChurnerVars(ind int, graphUrl, logPath, grpcPort stri
v := ChurnerVars{
CHURNER_HOSTNAME: "",
CHURNER_GRPC_PORT: grpcPort,
CHURNER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetreiver,
CHURNER_BLS_OPERATOR_STATE_RETRIEVER: env.EigenDA.OperatorStateRetriever,
CHURNER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,

CHURNER_CHAIN_RPC: "",
Expand Down Expand Up @@ -184,7 +184,7 @@ func (env *Config) generateDisperserVars(ind int, key, address, logPath, dbPath,
DISPERSER_SERVER_BUCKET_MULTIPLIERS: "1",
DISPERSER_SERVER_COUNT_FAILED: "true",

DISPERSER_SERVER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetreiver,
DISPERSER_SERVER_BLS_OPERATOR_STATE_RETRIEVER: env.EigenDA.OperatorStateRetriever,
DISPERSER_SERVER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,

DISPERSER_SERVER_ENABLE_DUAL_QUORUMS: "true",
Expand All @@ -204,7 +204,7 @@ func (env *Config) generateBatcherVars(ind int, key, graphUrl, logPath string) B
BATCHER_ENABLE_METRICS: "true",
BATCHER_METRICS_HTTP_PORT: "9094",
BATCHER_PULL_INTERVAL: "5s",
BATCHER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetreiver,
BATCHER_BLS_OPERATOR_STATE_RETRIEVER: env.EigenDA.OperatorStateRetriever,
BATCHER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,
BATCHER_SRS_ORDER: "300000",
BATCHER_CHAIN_RPC: "",
Expand Down Expand Up @@ -289,7 +289,7 @@ func (env *Config) generateOperatorVars(ind int, name, key, churnerUrl, logPath,
NODE_ECDSA_KEY_FILE: ecdsaKeyFile,
NODE_BLS_KEY_PASSWORD: blsPassword,
NODE_ECDSA_KEY_PASSWORD: ecdsaPassword,
NODE_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetreiver,
NODE_BLS_OPERATOR_STATE_RETRIEVER: env.EigenDA.OperatorStateRetriever,
NODE_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,
NODE_REGISTER_AT_NODE_START: "true",
NODE_CHURNER_URL: churnerUrl,
Expand Down Expand Up @@ -323,7 +323,7 @@ func (env *Config) generateRetrieverVars(ind int, key string, graphUrl, logPath,
RETRIEVER_HOSTNAME: "",
RETRIEVER_GRPC_PORT: grpcPort,
RETRIEVER_TIMEOUT: "10s",
RETRIEVER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetreiver,
RETRIEVER_BLS_OPERATOR_STATE_RETRIEVER: env.EigenDA.OperatorStateRetriever,
RETRIEVER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,
RETRIEVER_NUM_CONNECTIONS: "10",

Expand Down
2 changes: 1 addition & 1 deletion inabox/deploy/config_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func (cfg *EigenDADeployConfig) MarshalJSON() ([]byte, error) {
type EigenDAContract struct {
Deployer string `yaml:"deployer"`
ServiceManager string `json:"eigenDAServiceManager"`
OperatorStateRetreiver string `json:"operatorStateRetriever"`
OperatorStateRetriever string `json:"operatorStateRetriever"`
BlsApkRegistry string `json:"blsApkRegistry"`
RegistryCoordinator string `json:"registryCoordinator"`
}
Expand Down
2 changes: 1 addition & 1 deletion inabox/deploy/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func (env *Config) RunNodePluginBinary(operation string, operator OperatorVars)
"NODE_SOCKET=" + socket,
"NODE_QUORUM_ID_LIST=" + operator.NODE_QUORUM_ID_LIST,
"NODE_CHAIN_RPC=" + operator.NODE_CHAIN_RPC,
"NODE_BLS_OPERATOR_STATE_RETRIVER=" + operator.NODE_BLS_OPERATOR_STATE_RETRIVER,
"NODE_BLS_OPERATOR_STATE_RETRIEVER=" + operator.NODE_BLS_OPERATOR_STATE_RETRIEVER,
"NODE_EIGENDA_SERVICE_MANAGER=" + operator.NODE_EIGENDA_SERVICE_MANAGER,
"NODE_CHURNER_URL=" + operator.NODE_CHURNER_URL,
"NODE_NUM_CONFIRMATIONS=0",
Expand Down
10 changes: 5 additions & 5 deletions inabox/deploy/env_vars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type DisperserVars struct {

DISPERSER_SERVER_RATE_BUCKET_TABLE_NAME string

DISPERSER_SERVER_BLS_OPERATOR_STATE_RETRIVER string
DISPERSER_SERVER_BLS_OPERATOR_STATE_RETRIEVER string

DISPERSER_SERVER_EIGENDA_SERVICE_MANAGER string

Expand Down Expand Up @@ -92,7 +92,7 @@ type BatcherVars struct {

BATCHER_PULL_INTERVAL string

BATCHER_BLS_OPERATOR_STATE_RETRIVER string
BATCHER_BLS_OPERATOR_STATE_RETRIEVER string

BATCHER_EIGENDA_SERVICE_MANAGER string

Expand Down Expand Up @@ -260,7 +260,7 @@ type OperatorVars struct {

NODE_ECDSA_KEY_PASSWORD string

NODE_BLS_OPERATOR_STATE_RETRIVER string
NODE_BLS_OPERATOR_STATE_RETRIEVER string

NODE_EIGENDA_SERVICE_MANAGER string

Expand Down Expand Up @@ -343,7 +343,7 @@ type RetrieverVars struct {

RETRIEVER_TIMEOUT string

RETRIEVER_BLS_OPERATOR_STATE_RETRIVER string
RETRIEVER_BLS_OPERATOR_STATE_RETRIEVER string

RETRIEVER_EIGENDA_SERVICE_MANAGER string

Expand Down Expand Up @@ -410,7 +410,7 @@ type ChurnerVars struct {

CHURNER_GRAPH_URL string

CHURNER_BLS_OPERATOR_STATE_RETRIVER string
CHURNER_BLS_OPERATOR_STATE_RETRIEVER string

CHURNER_EIGENDA_SERVICE_MANAGER string

Expand Down
2 changes: 1 addition & 1 deletion inabox/tests/integration_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func setupRetrievalClient(testConfig *deploy.Config) error {
if err != nil {
log.Fatalln("could not start tcp listener", err)
}
tx, err := eth.NewTransactor(logger, client, testConfig.Retriever.RETRIEVER_BLS_OPERATOR_STATE_RETRIVER, testConfig.Retriever.RETRIEVER_EIGENDA_SERVICE_MANAGER)
tx, err := eth.NewTransactor(logger, client, testConfig.Retriever.RETRIEVER_BLS_OPERATOR_STATE_RETRIEVER, testConfig.Retriever.RETRIEVER_EIGENDA_SERVICE_MANAGER)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion node/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ var (
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
Usage: "Address of the BLS Operator State Retriever",
Required: true,
EnvVar: common.PrefixEnvVar(EnvVarPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
EnvVar: common.PrefixEnvVar(EnvVarPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
}
EigenDAServiceManagerFlag = cli.StringFlag{
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),
Expand Down
2 changes: 1 addition & 1 deletion node/plugin/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var (
Name: "bls-operator-state-retriever",
Usage: "Address of the BLS Operator State Retriever",
Required: true,
EnvVar: common.PrefixEnvVar(flags.EnvVarPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
EnvVar: common.PrefixEnvVar(flags.EnvVarPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
}
EigenDAServiceManagerFlag = cli.StringFlag{
Name: "eigenda-service-manager",
Expand Down
4 changes: 2 additions & 2 deletions node/plugin/tests/plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func getOperatorId(t *testing.T, operator deploy.OperatorVars) [32]byte {
assert.NoError(t, err)
assert.NotNil(t, client)

transactor, err := eth.NewTransactor(logger, client, operator.NODE_BLS_OPERATOR_STATE_RETRIVER, operator.NODE_EIGENDA_SERVICE_MANAGER)
transactor, err := eth.NewTransactor(logger, client, operator.NODE_BLS_OPERATOR_STATE_RETRIEVER, operator.NODE_EIGENDA_SERVICE_MANAGER)
assert.NoError(t, err)
assert.NotNil(t, transactor)

Expand Down Expand Up @@ -230,7 +230,7 @@ func getTransactor(t *testing.T, operator deploy.OperatorVars) *eth.Transactor {
assert.NoError(t, err)
assert.NotNil(t, client)

transactor, err := eth.NewTransactor(logger, client, operator.NODE_BLS_OPERATOR_STATE_RETRIVER, operator.NODE_EIGENDA_SERVICE_MANAGER)
transactor, err := eth.NewTransactor(logger, client, operator.NODE_BLS_OPERATOR_STATE_RETRIEVER, operator.NODE_EIGENDA_SERVICE_MANAGER)
assert.NoError(t, err)
assert.NotNil(t, transactor)

Expand Down
2 changes: 1 addition & 1 deletion operators/churner/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var (
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
Usage: "Address of the BLS Operator State Retriever",
Required: true,
EnvVar: common.PrefixEnvVar(envPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
EnvVar: common.PrefixEnvVar(envPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
}
EigenDAServiceManagerFlag = cli.StringFlag{
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),
Expand Down
6 changes: 3 additions & 3 deletions operators/churner/tests/churner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func TestChurner(t *testing.T) {
salt := [32]byte{}
copy(salt[:], crypto.Keccak256([]byte("churn"), []byte(time.Now().String())))
expiry := big.NewInt((time.Now().Add(10 * time.Minute)).Unix())
tx, err = createTransactorFromScratch(*privateKey, testConfig.EigenDA.OperatorStateRetreiver, testConfig.EigenDA.ServiceManager, logger)
tx, err = createTransactorFromScratch(*privateKey, testConfig.EigenDA.OperatorStateRetriever, testConfig.EigenDA.ServiceManager, logger)
assert.NoError(t, err)
if i >= testConfig.Services.Counts.NumMaxOperatorCount {
// This operator will churn others
Expand Down Expand Up @@ -212,13 +212,13 @@ func newTestServer(t *testing.T) *churner.Server {
NumRetries: numRetries,
},
LoggerConfig: common.DefaultLoggerConfig(),
BLSOperatorStateRetrieverAddr: testConfig.EigenDA.OperatorStateRetreiver,
BLSOperatorStateRetrieverAddr: testConfig.EigenDA.OperatorStateRetriever,
EigenDAServiceManagerAddr: testConfig.EigenDA.ServiceManager,
}

operatorTransactorChurner, err := createTransactorFromScratch(
churnerPrivateKeyHex,
testConfig.EigenDA.OperatorStateRetreiver,
testConfig.EigenDA.OperatorStateRetriever,
testConfig.EigenDA.ServiceManager,
logger,
)
Expand Down
4 changes: 2 additions & 2 deletions retriever/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/Layr-Labs/eigenda/core/thegraph"
"github.com/Layr-Labs/eigenda/encoding/kzg/verifier"
"github.com/Layr-Labs/eigenda/retriever"
retrivereth "github.com/Layr-Labs/eigenda/retriever/eth"
retrievereth "github.com/Layr-Labs/eigenda/retriever/eth"
"github.com/Layr-Labs/eigenda/retriever/flags"
gethcommon "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rpc"
Expand Down Expand Up @@ -135,7 +135,7 @@ func RetrieverMain(ctx *cli.Context) error {
log.Fatalln("could not start tcp listener", err)
}

chainClient := retrivereth.NewChainClient(gethClient, logger)
chainClient := retrievereth.NewChainClient(gethClient, logger)
retrieverServiceServer := retriever.NewServer(config, logger, retrievalClient, v, ics, chainClient)
if err = retrieverServiceServer.Start(context.Background()); err != nil {
log.Fatalln("failed to start retriever service server", err)
Expand Down
2 changes: 1 addition & 1 deletion retriever/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var (
Name: common.PrefixFlag(FlagPrefix, "bls-operator-state-retriever"),
Usage: "Address of the BLS Operator State Retriever",
Required: true,
EnvVar: common.PrefixEnvVar(envPrefix, "BLS_OPERATOR_STATE_RETRIVER"),
EnvVar: common.PrefixEnvVar(envPrefix, "BLS_OPERATOR_STATE_RETRIEVER"),
}
EigenDAServiceManagerFlag = cli.StringFlag{
Name: common.PrefixFlag(FlagPrefix, "eigenda-service-manager"),
Expand Down
Loading