diff --git a/encoding/kzg/cli.go b/encoding/kzg/cli.go index a893fcfcc2..b67cac5601 100644 --- a/encoding/kzg/cli.go +++ b/encoding/kzg/cli.go @@ -8,16 +8,15 @@ import ( ) const ( - G1PathFlagName = "kzg.g1-path" - G2PathFlagName = "kzg.g2-path" - CachePathFlagName = "kzg.cache-path" - SRSOrderFlagName = "kzg.srs-order" - NumWorkerFlagName = "kzg.num-workers" - VerboseFlagName = "kzg.verbose" - PreloadEncoderFlagName = "kzg.preload-encoder" - CacheEncodedBlobsFlagName = "cache-encoded-blobs" - SRSLoadingNumberFlagName = "kzg.srs-load" - G2PowerOf2PathFlagName = "kzg.g2-power-of-2-path" + G1PathFlagName = "kzg.g1-path" + G2PathFlagName = "kzg.g2-path" + CachePathFlagName = "kzg.cache-path" + SRSOrderFlagName = "kzg.srs-order" + NumWorkerFlagName = "kzg.num-workers" + VerboseFlagName = "kzg.verbose" + PreloadEncoderFlagName = "kzg.preload-encoder" + SRSLoadingNumberFlagName = "kzg.srs-load" + G2PowerOf2PathFlagName = "kzg.g2-power-of-2-path" ) func CLIFlags(envPrefix string) []cli.Flag { @@ -65,12 +64,6 @@ func CLIFlags(envPrefix string) []cli.Flag { Required: false, EnvVar: common.PrefixEnvVar(envPrefix, "VERBOSE"), }, - cli.BoolFlag{ - Name: CacheEncodedBlobsFlagName, - Usage: "Enable to cache encoded results", - Required: false, - EnvVar: common.PrefixEnvVar(envPrefix, "CACHE_ENCODED_BLOBS"), - }, cli.BoolFlag{ Name: PreloadEncoderFlagName, Usage: "Set to enable Encoder PreLoading", diff --git a/inabox/deploy/config.go b/inabox/deploy/config.go index 5b1614f407..390d24eec5 100644 --- a/inabox/deploy/config.go +++ b/inabox/deploy/config.go @@ -175,7 +175,6 @@ func (env *Config) generateDisperserVars(ind int, key, address, logPath, dbPath, DISPERSER_SERVER_TOTAL_UNAUTH_BLOB_RATE: "10,10", DISPERSER_SERVER_PER_USER_UNAUTH_BLOB_RATE: "2,2", DISPERSER_SERVER_ENABLE_RATELIMITER: "true", - DISPERSER_SERVER_ALLOWLIST: "3.221.120.68/0/1000/10485760,18.214.113.214/0/1000/10485760", DISPERSER_SERVER_RETRIEVAL_BLOB_RATE: "4", DISPERSER_SERVER_RETRIEVAL_BYTE_RATE: "10000000", @@ -331,15 +330,14 @@ func (env *Config) generateRetrieverVars(ind int, key string, graphUrl, logPath, RETRIEVER_CHAIN_RPC: "", RETRIEVER_PRIVATE_KEY: key[2:], - RETRIEVER_G1_PATH: "", - RETRIEVER_G2_PATH: "", - RETRIEVER_G2_POWER_OF_2_PATH: "", - RETRIEVER_CACHE_PATH: "", - RETRIEVER_SRS_ORDER: "", - RETRIEVER_SRS_LOAD: "", - RETRIEVER_NUM_WORKERS: fmt.Sprint(runtime.GOMAXPROCS(0)), - RETRIEVER_VERBOSE: "true", - RETRIEVER_CACHE_ENCODED_BLOBS: "false", + RETRIEVER_G1_PATH: "", + RETRIEVER_G2_PATH: "", + RETRIEVER_G2_POWER_OF_2_PATH: "", + RETRIEVER_CACHE_PATH: "", + RETRIEVER_SRS_ORDER: "", + RETRIEVER_SRS_LOAD: "", + RETRIEVER_NUM_WORKERS: fmt.Sprint(runtime.GOMAXPROCS(0)), + RETRIEVER_VERBOSE: "true", RETRIEVER_INDEXER_PULL_INTERVAL: "1s", } diff --git a/inabox/deploy/env_vars.go b/inabox/deploy/env_vars.go index 6b73ebc6bd..6d61103e1e 100644 --- a/inabox/deploy/env_vars.go +++ b/inabox/deploy/env_vars.go @@ -69,10 +69,10 @@ type DisperserVars struct { DISPERSER_SERVER_CLIENT_IP_HEADER string - DISPERSER_SERVER_ALLOWLIST string - DISPERSER_SERVER_ALLOWLIST_FILE string + DISPERSER_SERVER_ALLOWLIST_REFRESH_INTERVAL string + DISPERSER_SERVER_RETRIEVAL_BLOB_RATE string DISPERSER_SERVER_RETRIEVAL_BYTE_RATE string @@ -211,8 +211,6 @@ type EncoderVars struct { DISPERSER_ENCODER_VERBOSE string - DISPERSER_ENCODER_CACHE_ENCODED_BLOBS string - DISPERSER_ENCODER_PRELOAD_ENCODER string DISPERSER_ENCODER_G2_POWER_OF_2_PATH string @@ -274,6 +272,8 @@ type OperatorVars struct { NODE_EXPIRATION_POLL_INTERVAL string + NODE_REACHABILITY_POLL_INTERVAL string + NODE_ENABLE_TEST_MODE string NODE_OVERRIDE_BLOCK_STALE_MEASURE string @@ -296,6 +296,8 @@ type OperatorVars struct { NODE_ECDSA_KEY_PASSWORD string + NODE_DATAAPI_URL string + NODE_G1_PATH string NODE_G2_PATH string @@ -310,8 +312,6 @@ type OperatorVars struct { NODE_VERBOSE string - NODE_CACHE_ENCODED_BLOBS string - NODE_PRELOAD_ENCODER string NODE_G2_POWER_OF_2_PATH string @@ -373,8 +373,6 @@ type RetrieverVars struct { RETRIEVER_VERBOSE string - RETRIEVER_CACHE_ENCODED_BLOBS string - RETRIEVER_PRELOAD_ENCODER string RETRIEVER_G2_POWER_OF_2_PATH string