From ee7fdd7839133db8cd640aedd816dd3cd343fc13 Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Wed, 2 Nov 2022 12:17:25 +0100 Subject: [PATCH 1/4] deps(sdk): bump to v0.46.4 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d2eb9c45bd..065100d83a 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/armon/go-metrics v0.4.1 github.com/btcsuite/btcd v0.22.1 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce - github.com/cosmos/cosmos-sdk v0.46.3 + github.com/cosmos/cosmos-sdk v0.46.4 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/ibc-go/v5 v5.0.1 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index 5f28c5fc61..786eac010c 100644 --- a/go.sum +++ b/go.sum @@ -250,8 +250,8 @@ github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hkrwIV6vkUbO0= github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw= -github.com/cosmos/cosmos-sdk v0.46.3 h1:2jdJYcSwh4AtFJKGoNGvmEy2mKDWtGaVZphGpvedljQ= -github.com/cosmos/cosmos-sdk v0.46.3/go.mod h1:AynIAjXwtS3T/ApdhNCz/7/KGMbZSUBbKRTcbukb2ic= +github.com/cosmos/cosmos-sdk v0.46.4 h1:I4CPfnz7lAPM7cEvvyTxL1h3M/ugbhTNr5ZRcnW8WsU= +github.com/cosmos/cosmos-sdk v0.46.4/go.mod h1:b5usG7aBEEvhaatYCdV6orFbDUsj4BG1V6UtKwNcJeQ= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 h1:iKclrn3YEOwk4jQHT2ulgzuXyxmzmPczUalMwW4XH9k= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0/go.mod h1:2a4dBq88TUoqoWAU5eu0lGvpFP3wWDPgdHPargtyw30= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= From 7319e944508f531b76affe40cbdc3f1d4f04917f Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Wed, 2 Nov 2022 12:43:07 +0100 Subject: [PATCH 2/4] deps(sdk): add IAVLDisableFastNode flag with false default --- cmd/ethermintd/root.go | 2 ++ server/config/config.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmd/ethermintd/root.go b/cmd/ethermintd/root.go index 5e17d8de06..d833fb3476 100644 --- a/cmd/ethermintd/root.go +++ b/cmd/ethermintd/root.go @@ -243,6 +243,8 @@ func (a appCreator) newApp(logger tmlog.Logger, db dbm.DB, traceStore io.Writer, baseapp.SetTrace(cast.ToBool(appOpts.Get(sdkserver.FlagTrace))), baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(sdkserver.FlagIndexEvents))), baseapp.SetSnapshot(snapshotStore, snapshotOptions), + baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(sdkserver.FlagIAVLCacheSize))), + baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(sdkserver.FlagDisableIAVLFastNode))), ) return ethermintApp diff --git a/server/config/config.go b/server/config/config.go index 00f17c2f65..8886f45261 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -148,6 +148,8 @@ func AppConfig(denom string) (string, interface{}) { srvCfg.MinGasPrices = "0" + denom } + srvCfg.IAVLDisableFastNode = false + customAppConfig := Config{ Config: *srvCfg, EVM: *DefaultEVMConfig(), From 18c5f076333bbd6c8e45bb00e4fb2f77744cf95f Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Wed, 2 Nov 2022 14:33:24 +0100 Subject: [PATCH 3/4] deps(sdk): remove defualt for IAVLDisableFastNode as it is set in the sdk --- server/config/config.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/config/config.go b/server/config/config.go index 8886f45261..00f17c2f65 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -148,8 +148,6 @@ func AppConfig(denom string) (string, interface{}) { srvCfg.MinGasPrices = "0" + denom } - srvCfg.IAVLDisableFastNode = false - customAppConfig := Config{ Config: *srvCfg, EVM: *DefaultEVMConfig(), From 3d08296ca4e102dcf14522cacf8bf609cf247094 Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Wed, 2 Nov 2022 14:48:13 +0100 Subject: [PATCH 4/4] deps(sdk): update gomod2nix with "nix run -f ./nix gomod2nix --extra-experimental-features nix-command" --- gomod2nix.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gomod2nix.toml b/gomod2nix.toml index 72da5d025f..671eed0316 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -94,8 +94,8 @@ schema = 3 version = "v1.0.0-alpha7" hash = "sha256-2wCH+toTF2A6MfFjOa13muEH5oBCcxAhZEqirNOrBA0=" [mod."github.com/cosmos/cosmos-sdk"] - version = "v0.46.3" - hash = "sha256-OdM5Kr6g73d5+xNkBBPzO1Y/Qao2u80VjSTJukO0VBM=" + version = "v0.46.4" + hash = "sha256-YjrhZsGKMH7kxCS9Lhbvt7YjJs/B+9aSS+l042oBhAw=" [mod."github.com/cosmos/go-bip39"] version = "v1.0.0" hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA="