From 7ee5a5b29b83f063e048a7b104b34bd41524bda4 Mon Sep 17 00:00:00 2001 From: yihuang Date: Thu, 22 Sep 2022 16:47:39 +0800 Subject: [PATCH] Problem: new iavl indexes migration is slow and not optional (backport #714) (#715) * Problem: new iavl indexes migration is slow and not optional (backport #714) Closes: #712 Solution: - Integrate the option introduced in cosmos-sdk * Update CHANGELOG.md Signed-off-by: yihuang Signed-off-by: yihuang --- CHANGELOG.md | 1 + cmd/cronosd/cmd/root.go | 2 ++ go.mod | 4 ++-- go.sum | 8 ++++---- gomod2nix.toml | 8 ++++---- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b35422669d..ebf66e4ded 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Bug Fixes - [#693](https://github.com/crypto-org-chain/cronos/pull/693) Clear `From` field when building cosmos tx in `eth_sendTransaction`. +- [cronos#715](https://github.com/crypto-org-chain/cronos/pull/715) Add option `iavl-disable-fastnode` to disable iavl fastnode indexing migration, and enable `iavl-cache-size` to have effect on app (backport #714). *Aug 31, 2022* diff --git a/cmd/cronosd/cmd/root.go b/cmd/cronosd/cmd/root.go index 278d670183..06aaee251e 100644 --- a/cmd/cronosd/cmd/root.go +++ b/cmd/cronosd/cmd/root.go @@ -263,6 +263,8 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a baseapp.SetSnapshotStore(snapshotStore), baseapp.SetSnapshotInterval(cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval))), baseapp.SetSnapshotKeepRecent(cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent))), + baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))), + baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagIAVLFastNode))), ) } diff --git a/go.mod b/go.mod index 15dedc00e7..1ef6c4fc41 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/cosmos/btcutil v1.0.4 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.1 // indirect + github.com/cosmos/iavl v0.19.2-0.20220916140702-9b6be3095313 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect github.com/danieljoos/wincred v1.1.0 // indirect @@ -156,7 +156,7 @@ require ( replace ( // TODO: fix keyring upstream github.com/99designs/keyring => github.com/crypto-org-chain/keyring v1.1.6-fixes - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.8 + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.9-0.20220920132636-63a7c45caa76 // TODO: remove when middleware will be implemented github.com/cosmos/ibc-go/v2 => github.com/crypto-org-chain/ibc-go/v2 v2.2.0-hooks2 diff --git a/go.sum b/go.sum index d0048d2a05..f040352d70 100644 --- a/go.sum +++ b/go.sum @@ -285,15 +285,15 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= 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-sdk v0.45.8 h1:UHO5LTkOYLK1pvu9WELCxnp8zw/YcjoNGqqcYiLQ4pE= -github.com/cosmos/cosmos-sdk v0.45.8/go.mod h1:+OKZMhLj+Y6LCzCDsyIvpul/xk7n9lVUn8sikLWD0Jo= +github.com/cosmos/cosmos-sdk v0.45.9-0.20220920132636-63a7c45caa76 h1:Na0Y+e16LJrin9oeaKWmq8e/xxamxETFBi2++HKLfYQ= +github.com/cosmos/cosmos-sdk v0.45.9-0.20220920132636-63a7c45caa76/go.mod h1:FLWxTRw/jfDOzfnXgwtVnRB2YFJRmqWox7QMeYvi1bA= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.19.1 h1:3gaq9b6SjiB0KBTygRnAvEGml2pQlu1TH8uma5g63Ys= -github.com/cosmos/iavl v0.19.1/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/iavl v0.19.2-0.20220916140702-9b6be3095313 h1:R7CnaI/0OLwOusy7n9750n8fqQ3yCQ8OJQI2L3ws9RA= +github.com/cosmos/iavl v0.19.2-0.20220916140702-9b6be3095313/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= diff --git a/gomod2nix.toml b/gomod2nix.toml index 10e4a6a072..ecb152ff41 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -63,8 +63,8 @@ schema = 3 version = "v1.0.4" hash = "sha256-JvcBXBdjdmnaW/nyf/tw/uaOAGn1b78yxrtl2/Rs3kA=" [mod."github.com/cosmos/cosmos-sdk"] - version = "v0.45.8" - hash = "sha256-JpfLiDeML37pQwdce48xphb5cnC7iVP+IRhWtURKf/s=" + version = "v0.45.9-0.20220920132636-63a7c45caa76" + hash = "sha256-PpVH4fN7ZwILpUwSi/luPsSMPF3IWRh9r9nZN/tUOrs=" replaced = "github.com/cosmos/cosmos-sdk" [mod."github.com/cosmos/go-bip39"] version = "v1.0.0" @@ -73,8 +73,8 @@ schema = 3 version = "v1.2.0" hash = "sha256-209TcVuXc5s/TcOvNlaQ1HEJAUDTEK3nxPhs+d8TEcY=" [mod."github.com/cosmos/iavl"] - version = "v0.19.1" - hash = "sha256-XrJeCNK0W8j3Qwxya4sr6R05zpI6+oYXFucWguiMiqM=" + version = "v0.19.2-0.20220916140702-9b6be3095313" + hash = "sha256-49xr/7/4L1wZ45eW5lE7C4SlcbGf4gBY+662SfJiWPQ=" [mod."github.com/cosmos/ibc-go/v2"] version = "v2.2.0-hooks2" hash = "sha256-bbSoJ5ZQwevdSU+UYaVqk0MFJZqeOlfwKjSwggj7BSs="