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

Jump to bottom

Backport v0.38.5: IAVL Bump (RC) & Pruning Refactor #6505

Merged
merged 16 commits into from
Jun 26, 2020
Merged

Backport v0.38.5: IAVL Bump (RC) & Pruning Refactor #6505

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4e2f207
Merge PR #6504: Bump IAVL
alexanderbez Jun 24, 2020
e20c2f5
Merge PR #6475: Pruning Refactor
alexanderbez Jun 22, 2020
1598747
fix
alexanderbez Jun 24, 2020
9fc56a0
fix
alexanderbez Jun 24, 2020
f495f8b
fix
alexanderbez Jun 24, 2020
5bbe643
fix
alexanderbez Jun 24, 2020
9575a2c
fix build
alexanderbez Jun 24, 2020
4c4adf7
fix build
alexanderbez Jun 24, 2020
c6c9b0d
store: fix lint
alexanderbez Jun 24, 2020
3a8af32
cl++
alexanderbez Jun 25, 2020
ad2522a
store/types: Fix pruning opts validation (#6511)
alexanderbez Jun 25, 2020
78c4310
deps: bump IAVL to 0.14.0-rc2
alexanderbez Jun 26, 2020
9b92425
CHANGELOG: add upgrade instructions
erikgrinaker Jun 26, 2020
f3b11ab
store: change PruningDefault to KeepEvery:100 (#6520)
erikgrinaker Jun 26, 2020
09e6437
CHANGELOG: update upgrade instructions after new pruning default
erikgrinaker Jun 26, 2020
88311d7
CHANGELOG: clarify --halt-height option
erikgrinaker Jun 26, 2020
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
8 changes: 4 additions & 4 deletions client/lcd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/tendermint/tendermint/libs/log"
rpcserver "github.com/tendermint/tendermint/rpc/lib/server"
tmrpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"

"github.com/cosmos/cosmos-sdk/client/context"
"github.com/cosmos/cosmos-sdk/client/flags"
Expand Down Expand Up @@ -52,12 +52,12 @@ func (rs *RestServer) Start(listenAddr string, maxOpen int, readTimeout, writeTi
rs.log.Error("error closing listener", "err", err)
})

cfg := rpcserver.DefaultConfig()
cfg := tmrpcserver.DefaultConfig()
cfg.MaxOpenConnections = maxOpen
cfg.ReadTimeout = time.Duration(readTimeout) * time.Second
cfg.WriteTimeout = time.Duration(writeTimeout) * time.Second

rs.listener, err = rpcserver.Listen(listenAddr, cfg)
rs.listener, err = tmrpcserver.Listen(listenAddr, cfg)
if err != nil {
return
}
Expand All @@ -68,7 +68,7 @@ func (rs *RestServer) Start(listenAddr string, maxOpen int, readTimeout, writeTi
),
)

return rpcserver.StartHTTPServer(rs.listener, rs.Mux, rs.log, cfg)
return tmrpcserver.Serve(rs.listener, rs.Mux, rs.log, cfg)
}

// ServeCommand will start the application REST service as a blocking process. It
Expand Down
17 changes: 9 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require (
github.com/99designs/keyring v1.1.3
github.com/bartekn/go-bip39 v0.0.0-20171116152956-a05967ea095d
github.com/bgentry/speakeasy v0.1.0
github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d
github.com/btcsuite/btcd v0.20.1-beta
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d
github.com/cosmos/ledger-cosmos-go v0.11.1
github.com/gogo/protobuf v1.3.1
Expand All @@ -16,18 +16,19 @@ require (
github.com/pkg/errors v0.9.1
github.com/rakyll/statik v0.1.6
github.com/spf13/afero v1.2.1 // indirect
github.com/spf13/cobra v0.0.6
github.com/spf13/cobra v1.0.0
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.6.2
github.com/stretchr/testify v1.5.1
github.com/spf13/viper v1.6.3
github.com/stretchr/testify v1.6.1
github.com/tendermint/btcd v0.1.1
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15
github.com/tendermint/go-amino v0.15.1
github.com/tendermint/iavl v0.13.2
github.com/tendermint/tendermint v0.33.3
github.com/tendermint/tm-db v0.5.0
gopkg.in/yaml.v2 v2.2.8
github.com/tendermint/iavl v0.14.0-rc1
github.com/tendermint/tendermint v0.33.5
github.com/tendermint/tm-db v0.5.1
google.golang.org/grpc v1.30.0 // indirect
gopkg.in/yaml.v2 v2.3.0
)

go 1.13
Expand Down
Loading