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

Add fireblocks API timeout #489

Merged
merged 1 commit into from
Apr 18, 2024
Merged

Add fireblocks API timeout #489

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
11 changes: 6 additions & 5 deletions disperser/batcher/batcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ type QuorumInfo struct {
}

type TimeoutConfig struct {
EncodingTimeout time.Duration
AttestationTimeout time.Duration
ChainReadTimeout time.Duration
ChainWriteTimeout time.Duration
ChainStateTimeout time.Duration
EncodingTimeout time.Duration
AttestationTimeout time.Duration
ChainReadTimeout time.Duration
ChainWriteTimeout time.Duration
ChainStateTimeout time.Duration
FireblocksAPITimeout time.Duration
}

type Config struct {
Expand Down
11 changes: 6 additions & 5 deletions disperser/cmd/batcher/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@ func NewConfig(ctx *cli.Context) (Config, error) {
FinalizationBlockDelay: ctx.GlobalUint(flags.FinalizationBlockDelayFlag.Name),
},
TimeoutConfig: batcher.TimeoutConfig{
EncodingTimeout: ctx.GlobalDuration(flags.EncodingTimeoutFlag.Name),
AttestationTimeout: ctx.GlobalDuration(flags.AttestationTimeoutFlag.Name),
ChainReadTimeout: ctx.GlobalDuration(flags.ChainReadTimeoutFlag.Name),
ChainWriteTimeout: ctx.GlobalDuration(flags.ChainWriteTimeoutFlag.Name),
ChainStateTimeout: ctx.GlobalDuration(flags.ChainStateTimeoutFlag.Name),
EncodingTimeout: ctx.GlobalDuration(flags.EncodingTimeoutFlag.Name),
AttestationTimeout: ctx.GlobalDuration(flags.AttestationTimeoutFlag.Name),
ChainReadTimeout: ctx.GlobalDuration(flags.ChainReadTimeoutFlag.Name),
ChainWriteTimeout: ctx.GlobalDuration(flags.ChainWriteTimeoutFlag.Name),
ChainStateTimeout: ctx.GlobalDuration(flags.ChainStateTimeoutFlag.Name),
FireblocksAPITimeout: ctx.GlobalDuration(flags.FireblocksAPITimeoutFlag.Name),
},
MetricsConfig: batcher.MetricsConfig{
HTTPPort: ctx.GlobalString(flags.MetricsHTTPPort.Name),
Expand Down
8 changes: 8 additions & 0 deletions disperser/cmd/batcher/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ var (
Value: 15 * time.Second,
EnvVar: common.PrefixEnvVar(envVarPrefix, "CHAIN_STATE_TIMEOUT"),
}
FireblocksAPITimeoutFlag = cli.DurationFlag{
Name: "fireblocks-write-timeout",
Usage: "connection timeout to get API response from Fireblocks",
Required: false,
Value: 10 * time.Second,
EnvVar: common.PrefixEnvVar(envVarPrefix, "FIREBLOCKS_API_TIMEOUT"),
}
NumConnectionsFlag = cli.IntFlag{
Name: "num-connections",
Usage: "maximum number of connections to encoders (defaults to 256)",
Expand Down Expand Up @@ -209,6 +216,7 @@ var optionalFlags = []cli.Flag{
ChainReadTimeoutFlag,
ChainWriteTimeoutFlag,
ChainStateTimeoutFlag,
FireblocksAPITimeoutFlag,
NumConnectionsFlag,
FinalizerIntervalFlag,
FinalizerPoolSizeFlag,
Expand Down
2 changes: 1 addition & 1 deletion disperser/cmd/batcher/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func RunBatcher(ctx *cli.Context) error {
apiKey,
[]byte(secretKey),
config.FireblocksConfig.BaseURL,
config.TimeoutConfig.ChainReadTimeout,
config.TimeoutConfig.FireblocksAPITimeout,
logger.With("component", "FireblocksClient"),
)
if err != nil {
Expand Down
Loading