Problem: missing IAVL configuration options (#890)

Solution: upgraded SDK to SDK 0.46.4 + added the IAVL configuration options
crypto-org-chain · Nov 2, 2022 · d738880 · d738880
1 parent d5351eb
commit d738880
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 26 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.19.2
+        go-version: 1.19.3
     - uses: actions/checkout@v2
       with:
           submodules: true

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       - name: Checkout Comment PR Branch
         uses: actions/checkout@v2
         if: github.event_name == 'issue_comment'
@@ -126,7 +126,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       - name: install runsim
         run: |
           export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
@@ -165,7 +165,7 @@ jobs:
           echo "::set-output name=repo_name::${{ fromJson(steps.request.outputs.data).head.repo.full_name }}"
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       - name: Checkout Comment PR Branch
         uses: actions/checkout@v2
         if: github.event_name == 'issue_comment'
@@ -228,7 +228,7 @@ jobs:
           echo "::set-output name=repo_name::${{ fromJson(steps.request.outputs.data).head.repo.full_name }}"
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       - name: Checkout Comment PR Branch
         uses: actions/checkout@v2
         if: github.event_name == 'issue_comment'
@@ -290,7 +290,7 @@ jobs:
           echo "::set-output name=repo_name::${{ fromJson(steps.request.outputs.data).head.repo.full_name }}"
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       - name: Checkout Comment PR Branch
         uses: actions/checkout@v2
         if: github.event_name == 'issue_comment'

diff --git a/.github/workflows/buildwin.yml b/.github/workflows/buildwin.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       - name: Normal check out code
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       - uses: actions/checkout@v2
         with:
           submodules: true

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       - name: release dry run
         run: make release-dry-run
       - name: setup release environment

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.2
+          go-version: 1.19.3
       - uses: actions/checkout@v3
         with:
           submodules: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+*November 2, 2022*
+
+## v4.0.1
+
+A small fix on top of `v4.0.0` and upgrade to Cosmos SDK v0.46.4.
+
+### Improvements
+- [890](https://github.com/crypto-org-chain/chain-main/pull/890) added IAVL configuration flags
+
 *October 31, 2022*
 
 ## v4.0.0

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 PACKAGES=$(shell go list ./... | grep -v '/simulation')
 PACKAGE_NAME:=github.com/crypto-org-chain/chain-main
-GOLANG_CROSS_VERSION  = v1.19.2
+GOLANG_CROSS_VERSION  = v1.19.3
 
 
 VERSION := $(shell echo $(shell git describe --tags 2>/dev/null ) | sed 's/^v//')

diff --git a/cmd/chain-maind/app/app.go b/cmd/chain-maind/app/app.go
@@ -346,6 +346,8 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty
 		baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))),
 		baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))),
 		baseapp.SetSnapshot(snapshotStore, snapshotOptions),
+		baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
+		baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagDisableIAVLFastNode))),
 	)
 }
 

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/armon/go-metrics v0.4.0
 	github.com/confluentinc/bincover v0.1.0
 	github.com/cosmos/cosmos-proto v1.0.0-alpha7
-	github.com/cosmos/cosmos-sdk v0.46.3
+	github.com/cosmos/cosmos-sdk v0.46.4
 	github.com/cosmos/ibc-go/v5 v5.0.1
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.5.2
@@ -54,7 +54,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.3 // indirect
+	github.com/cosmos/iavl v0.19.4 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
 	github.com/creachadair/taskgroup v0.3.2 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
@@ -166,7 +166,7 @@ replace (
 
 	// Ref: https://forum.cosmos.network/t/ibc-security-advisory-dragonberry/7702
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
-	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.4-0.20221025141727-ec09eae77376
+	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.4
 	github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.11.2-0.20220719170349-e736b9afa7d1
 
 	// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.

diff --git a/go.sum b/go.sum
@@ -229,17 +229,17 @@ 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.4-0.20221025141727-ec09eae77376 h1:/hNPGzMTCbwbD5ZXxigIsu8gh3MIIED00sb3/lamWeQ=
-github.com/cosmos/cosmos-sdk v0.46.4-0.20221025141727-ec09eae77376/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=
 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.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg=
-github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
+github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok=
+github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
 github.com/cosmos/ibc-go/v5 v5.0.1 h1:ZI5xCi6RDOL+hyu6Wx/w6JoAYFlOoK5hijsRTVWo+RA=
 github.com/cosmos/ibc-go/v5 v5.0.1/go.mod h1:LX0DHLW3dfi/1e4BJzi8MGLWmQ4DSraPEgVjyo3VzAo=
 github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU=

diff --git a/gomod2nix.toml b/gomod2nix.toml
@@ -82,8 +82,8 @@ schema = 3
     version = "v1.0.0-alpha7"
     hash = "sha256-2wCH+toTF2A6MfFjOa13muEH5oBCcxAhZEqirNOrBA0="
   [mod."github.com/cosmos/cosmos-sdk"]
-    version = "v0.46.4-0.20221025141727-ec09eae77376"
-    hash = "sha256-WQ9mD1RbeiitJG7+Oa9e0kmayJui21gu4L7bpMYLKDs="
+    version = "v0.46.4"
+    hash = "sha256-YjrhZsGKMH7kxCS9Lhbvt7YjJs/B+9aSS+l042oBhAw="
     replaced = "github.com/cosmos/cosmos-sdk"
   [mod."github.com/cosmos/go-bip39"]
     version = "v1.0.0"
@@ -92,8 +92,8 @@ schema = 3
     version = "v1.2.0"
     hash = "sha256-209TcVuXc5s/TcOvNlaQ1HEJAUDTEK3nxPhs+d8TEcY="
   [mod."github.com/cosmos/iavl"]
-    version = "v0.19.3"
-    hash = "sha256-rmW2KoKmm4YXmYIYE1vXMOCaDyP1ym0qsW224PYc9rg="
+    version = "v0.19.4"
+    hash = "sha256-EmpRZ48pjPFq/fIHneut9Vyo5QJATfb3ZO7KzWnqs9g="
   [mod."github.com/cosmos/ibc-go/v5"]
     version = "v5.0.1"
     hash = "sha256-44Vyj9i4gh6U0BGNsEFqRsHAYdxfuJmLGdtPWxcBfWQ="

diff --git a/integration_tests/test_group.py b/integration_tests/test_group.py
@@ -210,7 +210,7 @@ def test_group(cluster, tmp_path):
             list(
                 filter(
                     lambda attribute: attribute["key"] == "result",
-                    json.loads(rsp["raw_log"])[0]["events"][2]["attributes"],
+                    json.loads(rsp["raw_log"])[0]["events"][0]["attributes"],
                 )
             )[0]["value"],
         )

diff --git a/third_party/cosmos-sdk b/third_party/cosmos-sdk
diff --git a/third_party/ibc-go b/third_party/ibc-go
+10 −0		CHANGELOG.md
+11 −19		RELEASE_NOTES.md
+1 −1		go.mod
+2 −2		go.sum
+9 −2		types/context.go
+5 −0		types/context_test.go
+0 −6		x/gov/abci.go
+1 −7		x/group/keeper/msg_server.go
+1 −1		.github/PULL_REQUEST_TEMPLATE.md
+6 −0		CHANGELOG.md
+5 −0		docs/.vuepress/config.js
+1 −1		docs/DOCS_README.md
+1 −1		docs/apps/transfer/metrics.md
+1 −1		docs/ibc/apps.md
+1 −1		docs/ibc/apps/apps.md
+1 −1		docs/ibc/integration.md
+1 −1		docs/ibc/overview.md
+1 −1		docs/ibc/relayer.md
+3 −3		docs/middleware/ics29-fee/fee-distribution.md
+1 −1		docs/migrations/v2-to-v3.md
+39 −26		go.mod
+83 −46		go.sum
+2 −1		modules/apps/27-interchain-accounts/controller/keeper/account.go
+4 −2		modules/core/23-commitment/types/merkle.go
+11 −0		testing/simapp/app.go
+23 −0		testing/simapp/upgrades/upgrades.go