diff --git a/disperser/cmd/controller/config.go b/disperser/cmd/controller/config.go index 6c9cbe3bc..b07b6d60e 100644 --- a/disperser/cmd/controller/config.go +++ b/disperser/cmd/controller/config.go @@ -25,13 +25,14 @@ type Config struct { DynamoDBTableName string - EthClientConfig geth.EthClientConfig - AwsClientConfig aws.ClientConfig - DisperserKMSKeyID string - LoggerConfig common.LoggerConfig - IndexerConfig indexer.Config - ChainStateConfig thegraph.Config - UseGraph bool + EthClientConfig geth.EthClientConfig + AwsClientConfig aws.ClientConfig + DisperserStoreChunksSigningDisabled bool + DisperserKMSKeyID string + LoggerConfig common.LoggerConfig + IndexerConfig indexer.Config + ChainStateConfig thegraph.Config + UseGraph bool BLSOperatorStateRetrieverAddr string EigenDAServiceManagerAddr string @@ -61,11 +62,12 @@ func NewConfig(ctx *cli.Context) (Config, error) { relays[i] = corev2.RelayKey(relay) } config := Config{ - DynamoDBTableName: ctx.GlobalString(flags.DynamoDBTableNameFlag.Name), - EthClientConfig: ethClientConfig, - AwsClientConfig: aws.ReadClientConfig(ctx, flags.FlagPrefix), - DisperserKMSKeyID: ctx.GlobalString(flags.DisperserKMSKeyIDFlag.Name), - LoggerConfig: *loggerConfig, + DynamoDBTableName: ctx.GlobalString(flags.DynamoDBTableNameFlag.Name), + EthClientConfig: ethClientConfig, + AwsClientConfig: aws.ReadClientConfig(ctx, flags.FlagPrefix), + DisperserStoreChunksSigningDisabled: ctx.GlobalBool(flags.DisperserStoreChunksSigningDisabledFlag.Name), + DisperserKMSKeyID: ctx.GlobalString(flags.DisperserKMSKeyIDFlag.Name), + LoggerConfig: *loggerConfig, EncodingManagerConfig: controller.EncodingManagerConfig{ PullInterval: ctx.GlobalDuration(flags.EncodingPullIntervalFlag.Name), EncodingRequestTimeout: ctx.GlobalDuration(flags.EncodingRequestTimeoutFlag.Name), diff --git a/disperser/cmd/controller/flags/flags.go b/disperser/cmd/controller/flags/flags.go index 45d5ffac3..96c7edc8b 100644 --- a/disperser/cmd/controller/flags/flags.go +++ b/disperser/cmd/controller/flags/flags.go @@ -178,10 +178,16 @@ var ( EnvVar: common.PrefixEnvVar(envVarPrefix, "METRICS_PORT"), Value: 9101, } + DisperserStoreChunksSigningDisabledFlag = cli.BoolFlag{ + Name: common.PrefixFlag(FlagPrefix, "disperser-store-chunks-signing-disabled"), + Usage: "Whether to disable signing of store chunks requests", + Required: false, + EnvVar: common.PrefixEnvVar(envVarPrefix, "DISPERSER_STORE_CHUNKS_SIGNING_DISABLED"), + } DisperserKMSKeyIDFlag = cli.StringFlag{ Name: common.PrefixFlag(FlagPrefix, "disperser-kms-key-id"), Usage: "Name of the key used to sign disperser requests (key must be stored in AWS KMS under this name)", - Required: true, + Required: false, EnvVar: common.PrefixEnvVar(envVarPrefix, "DISPERSER_KMS_KEY_ID"), } ) @@ -198,7 +204,6 @@ var requiredFlags = []cli.Flag{ DispatcherPullIntervalFlag, NodeRequestTimeoutFlag, NumConnectionsToNodesFlag, - DisperserKMSKeyIDFlag, } var optionalFlags = []cli.Flag{ @@ -217,6 +222,8 @@ var optionalFlags = []cli.Flag{ NodeClientCacheNumEntriesFlag, MaxBatchSizeFlag, MetricsPortFlag, + DisperserStoreChunksSigningDisabledFlag, + DisperserKMSKeyIDFlag, } var Flags []cli.Flag diff --git a/disperser/cmd/controller/main.go b/disperser/cmd/controller/main.go index 1d792091a..9ba3aed83 100644 --- a/disperser/cmd/controller/main.go +++ b/disperser/cmd/controller/main.go @@ -151,7 +151,7 @@ func RunController(ctx *cli.Context) error { } var requestSigner clients.RequestSigner - if config.DisperserKMSKeyID != "" { + if !config.DisperserStoreChunksSigningDisabled { requestSigner, err = clients.NewRequestSigner( context.Background(), config.AwsClientConfig.Region, diff --git a/inabox/deploy/config.go b/inabox/deploy/config.go index 2e5654a1c..1943ca5ab 100644 --- a/inabox/deploy/config.go +++ b/inabox/deploy/config.go @@ -323,27 +323,27 @@ func (env *Config) generateEncoderV2Vars(ind int, grpcPort string) EncoderVars { func (env *Config) generateControllerVars(ind int, graphUrl string) ControllerVars { v := ControllerVars{ - CONTROLLER_DYNAMODB_TABLE_NAME: "test-BlobMetadata-v2", - CONTROLLER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetreiver, - CONTROLLER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager, - CONTROLLER_USE_GRAPH: "true", - CONTROLLER_GRAPH_URL: graphUrl, - CONTROLLER_ENCODING_PULL_INTERVAL: "1s", - CONTROLLER_AVAILABLE_RELAYS: "0,1,2,3", - CONTROLLER_DISPATCHER_PULL_INTERVAL: "3s", - CONTROLLER_NODE_REQUEST_TIMEOUT: "5s", - CONTROLLER_NUM_CONNECTIONS_TO_NODES: "10", - CONTROLLER_CHAIN_RPC: "", - CONTROLLER_PRIVATE_KEY: "123", - CONTROLLER_NUM_CONFIRMATIONS: "0", - CONTROLLER_INDEXER_PULL_INTERVAL: "1s", - CONTROLLER_AWS_REGION: "", - CONTROLLER_AWS_ACCESS_KEY_ID: "", - CONTROLLER_AWS_SECRET_ACCESS_KEY: "", - CONTROLLER_AWS_ENDPOINT_URL: "", - CONTROLLER_ENCODER_ADDRESS: "0.0.0.0:34001", - CONTROLLER_FINALIZATION_BLOCK_DELAY: "0", - CONTROLLER_DISPERSER_KMS_KEY_ID: "", + CONTROLLER_DYNAMODB_TABLE_NAME: "test-BlobMetadata-v2", + CONTROLLER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetreiver, + CONTROLLER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager, + CONTROLLER_USE_GRAPH: "true", + CONTROLLER_GRAPH_URL: graphUrl, + CONTROLLER_ENCODING_PULL_INTERVAL: "1s", + CONTROLLER_AVAILABLE_RELAYS: "0,1,2,3", + CONTROLLER_DISPATCHER_PULL_INTERVAL: "3s", + CONTROLLER_NODE_REQUEST_TIMEOUT: "5s", + CONTROLLER_NUM_CONNECTIONS_TO_NODES: "10", + CONTROLLER_CHAIN_RPC: "", + CONTROLLER_PRIVATE_KEY: "123", + CONTROLLER_NUM_CONFIRMATIONS: "0", + CONTROLLER_INDEXER_PULL_INTERVAL: "1s", + CONTROLLER_AWS_REGION: "", + CONTROLLER_AWS_ACCESS_KEY_ID: "", + CONTROLLER_AWS_SECRET_ACCESS_KEY: "", + CONTROLLER_AWS_ENDPOINT_URL: "", + CONTROLLER_ENCODER_ADDRESS: "0.0.0.0:34001", + CONTROLLER_FINALIZATION_BLOCK_DELAY: "0", + CONTROLLER_DISPERSER_STORE_CHUNKS_SIGNING_DISABLED: "true", } env.applyDefaults(&v, "CONTROLLER", "controller", ind) diff --git a/inabox/deploy/env_vars.go b/inabox/deploy/env_vars.go index 9e6de5171..19ee4b9df 100644 --- a/inabox/deploy/env_vars.go +++ b/inabox/deploy/env_vars.go @@ -625,8 +625,6 @@ type ControllerVars struct { CONTROLLER_NUM_CONNECTIONS_TO_NODES string - CONTROLLER_DISPERSER_KMS_KEY_ID string - CONTROLLER_INDEXER_DATA_DIR string CONTROLLER_ENCODING_REQUEST_TIMEOUT string @@ -655,6 +653,10 @@ type ControllerVars struct { CONTROLLER_METRICS_PORT string + CONTROLLER_DISPERSER_STORE_CHUNKS_SIGNING_DISABLED string + + CONTROLLER_DISPERSER_KMS_KEY_ID string + CONTROLLER_CHAIN_RPC string CONTROLLER_CHAIN_RPC_FALLBACK string