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

Commit timeout #2057

Merged
merged 4 commits into from
Aug 4, 2022
Merged

Commit timeout #2057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b75bde4
precommit timeout
faddat Jul 14, 2022
602f49f
Merge branch 'main' of https://github.com/osmosis-labs/osmosis into f…
faddat Jul 15, 2022
20756cb
this ought to do it
faddat Jul 15, 2022
e92da62
Update CHANGELOG.md
faddat Jul 15, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Features

* [#2057](https://github.com/osmosis-labs/osmosis/pull/2057) Reduce block times to about three seconds
* [#1312] Stableswap: Createpool logic
* [#1230] Stableswap CFMM equations
* [#1429] solver for multi-asset CFMM
Expand Down
1 change: 1 addition & 0 deletions cmd/osmosisd/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
config.P2P.Seeds = strings.Join(seeds, ",")
config.P2P.MaxNumInboundPeers = 320
config.P2P.MaxNumOutboundPeers = 40
config.Consensus.TimeoutCommit = 2 * time.Second
config.Mempool.Size = 10000
config.StateSync.TrustPeriod = 112 * time.Hour
config.FastSync.Version = "v0"
Expand Down
5 changes: 5 additions & 0 deletions cmd/osmosisd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"io"
"os"
"path/filepath"
"time"

"github.com/prometheus/client_golang/prometheus"

Expand Down Expand Up @@ -74,7 +75,11 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
if err := client.SetCmdClientContextHandler(initClientCtx, cmd); err != nil {
return err
}

customAppTemplate, customAppConfig := initAppConfig()
serverCtx := server.GetServerContextFromCmd(cmd)
serverCtx.Config.Consensus.TimeoutCommit = 2 * time.Second

return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig)
},
SilenceUsage: true,
Expand Down