From 8dca7a258a34aa4a08200ddee5e08b1ac9a4581b Mon Sep 17 00:00:00 2001 From: hopeyen <60078528+hopeyen@users.noreply.github.com> Date: Wed, 8 Jan 2025 18:31:18 +0000 Subject: [PATCH] chore: edit env var generated --- disperser/cmd/apiserver/config.go | 8 ++++---- disperser/cmd/apiserver/flags/flags.go | 6 +++--- disperser/cmd/apiserver/main.go | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/disperser/cmd/apiserver/config.go b/disperser/cmd/apiserver/config.go index a27bd0b793..724e991657 100644 --- a/disperser/cmd/apiserver/config.go +++ b/disperser/cmd/apiserver/config.go @@ -35,8 +35,8 @@ type Config struct { EncodingConfig kzg.KzgConfig EnableRatelimiter bool EnablePaymentMeterer bool - UpdateInterval int - ChainReadTimeout int + UpdateInterval time.Duration + ChainReadTimeout time.Duration ReservationsTableName string OnDemandTableName string GlobalRateTableName string @@ -119,8 +119,8 @@ func NewConfig(ctx *cli.Context) (Config, error) { GlobalRateTableName: ctx.GlobalString(flags.GlobalRateTableName.Name), BucketTableName: ctx.GlobalString(flags.BucketTableName.Name), BucketStoreSize: ctx.GlobalInt(flags.BucketStoreSize.Name), - UpdateInterval: ctx.GlobalInt(flags.UpdateInterval.Name), - ChainReadTimeout: ctx.GlobalInt(flags.ChainReadTimeout.Name), + UpdateInterval: ctx.GlobalDuration(flags.UpdateInterval.Name), + ChainReadTimeout: ctx.GlobalDuration(flags.ChainReadTimeout.Name), EthClientConfig: geth.ReadEthClientConfigRPCOnly(ctx), MaxBlobSize: ctx.GlobalInt(flags.MaxBlobSize.Name), MaxNumSymbolsPerBlob: ctx.GlobalUint(flags.MaxNumSymbolsPerBlob.Name), diff --git a/disperser/cmd/apiserver/flags/flags.go b/disperser/cmd/apiserver/flags/flags.go index 1d0c5ed3cf..f37d43933f 100644 --- a/disperser/cmd/apiserver/flags/flags.go +++ b/disperser/cmd/apiserver/flags/flags.go @@ -110,11 +110,11 @@ var ( UpdateInterval = cli.DurationFlag{ Name: common.PrefixFlag(FlagPrefix, "update-interval"), Usage: "update interval for refreshing the on-chain state", - Value: 1 * time.Second, + Value: 1 * time.Minute, EnvVar: common.PrefixEnvVar(envVarPrefix, "UPDATE_INTERVAL"), Required: true, } - ChainReadTimeout = cli.UintFlag{ + ChainReadTimeout = cli.DurationFlag{ Name: common.PrefixFlag(FlagPrefix, "chain-read-timeout"), Usage: "timeout for reading from the chain", Value: 10, @@ -146,7 +146,7 @@ var ( Usage: "The interval at which to refresh the onchain state. This flag is only relevant in v2", Required: false, EnvVar: common.PrefixEnvVar(envVarPrefix, "ONCHAIN_STATE_REFRESH_INTERVAL"), - Value: 1 * time.Hour, + Value: 1 * time.Minute, } MaxNumSymbolsPerBlob = cli.UintFlag{ Name: common.PrefixFlag(FlagPrefix, "max-num-symbols-per-blob"), diff --git a/disperser/cmd/apiserver/main.go b/disperser/cmd/apiserver/main.go index d0f52b204c..31fb2d094e 100644 --- a/disperser/cmd/apiserver/main.go +++ b/disperser/cmd/apiserver/main.go @@ -99,8 +99,8 @@ func RunDisperserServer(ctx *cli.Context) error { var meterer *mt.Meterer if config.EnablePaymentMeterer { mtConfig := mt.Config{ - ChainReadTimeout: time.Duration(config.ChainReadTimeout) * time.Second, - UpdateInterval: time.Duration(config.UpdateInterval) * time.Second, + ChainReadTimeout: config.ChainReadTimeout, + UpdateInterval: config.OnchainStateRefreshInterval, } paymentChainState, err := mt.NewOnchainPaymentState(context.Background(), transactor)