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

feat: iavl v1 #528

Merged
merged 19 commits into from
Feb 22, 2024
Merged

feat: iavl v1 #528

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7c90537
final iavl v1 implementation
czarcas7ic Feb 20, 2024
025178a
bump go1.19 to 1.20
czarcas7ic Feb 20, 2024
a49268b
go mod tidy
czarcas7ic Feb 20, 2024
64b16bc
inc golang in CI
czarcas7ic Feb 20, 2024
1b1366b
codeQL
czarcas7ic Feb 20, 2024
bf9d673
Revert "codeQL"
czarcas7ic Feb 20, 2024
03f6cff
try to inc version for linter
czarcas7ic Feb 20, 2024
ae6cd9c
adds config
czarcas7ic Feb 20, 2024
6498b69
fix config path
czarcas7ic Feb 20, 2024
5a6714b
Revert "fix config path"
czarcas7ic Feb 20, 2024
450d92e
Revert "adds config"
czarcas7ic Feb 20, 2024
902cb07
golang ci fixes
czarcas7ic Feb 20, 2024
7887f71
fix gov simulation
czarcas7ic Feb 20, 2024
287f3cd
fix values
czarcas7ic Feb 20, 2024
2269f56
remove explicit config location call
czarcas7ic Feb 20, 2024
cbd5874
remove unnecessary CI check
czarcas7ic Feb 20, 2024
0cdfc6f
Merge branch 'osmo/v0.47.5' into adam/iavl-v1-final
czarcas7ic Feb 21, 2024
fc6226c
remove unnecessary go bumps
czarcas7ic Feb 21, 2024
9dcbb02
Merge branch 'osmo/v0.47.5' into adam/iavl-v1-final
czarcas7ic Feb 22, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
czarcas7ic marked this conversation as resolved.
Show resolved Hide resolved
check-latest: true
- uses: technote-space/[email protected]
id: git_diff
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-update-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
token: ${{ secrets.PRBOT_PAT }}
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- name: Extract updated dependency
id: deps
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.50.1
version: v1.51.2
2 changes: 1 addition & 1 deletion .github/workflows/release-cosmovisor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
# get 'v*.*.*' part from 'cosmovisor/v*.*.*' and save to $GITHUB_ENV
- name: Set env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-rosetta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
# get 'v*.*.*' part from 'rosetta/v*.*.*' and save to $GITHUB_ENV
- name: Set env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- name: Unshallow
run: git fetch --prune --unshallow
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sims-045.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
ref: "release/v0.45.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- run: make build

Expand All @@ -33,7 +33,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
Expand All @@ -51,7 +51,7 @@ jobs:
ref: "release/v0.45.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand All @@ -70,7 +70,7 @@ jobs:
ref: "release/v0.45.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand All @@ -90,7 +90,7 @@ jobs:
ref: "release/v0.45.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sims-046.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
ref: "release/v0.46.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- run: make build

Expand All @@ -33,7 +33,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
Expand All @@ -52,7 +52,7 @@ jobs:
ref: "release/v0.46.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand All @@ -71,7 +71,7 @@ jobs:
ref: "release/v0.46.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand All @@ -90,7 +90,7 @@ jobs:
ref: "release/v0.46.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sims-047.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
ref: "release/v0.47.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- run: make build

Expand All @@ -33,7 +33,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
Expand All @@ -52,7 +52,7 @@ jobs:
ref: "release/v0.47.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand All @@ -71,7 +71,7 @@ jobs:
ref: "release/v0.47.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand All @@ -90,7 +90,7 @@ jobs:
ref: "release/v0.47.x"
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sims-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
Expand All @@ -37,7 +37,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sims.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- run: make build
- name: Install runsim
Expand All @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand All @@ -56,7 +56,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand All @@ -74,7 +74,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- uses: actions/cache@v3
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
- name: Create a file with all core Cosmos SDK pkgs
run: go list ./... > pkgs.txt
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
cache: true
cache-dependency-path: go.sum
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
cache: true
cache-dependency-path: go.sum
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
cache: true
cache-dependency-path: go.sum
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
cache: true
cache-dependency-path: go.sum
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
cache: true
cache-dependency-path: go.sum
Expand All @@ -245,7 +245,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.19"
go-version: "1.20"
check-latest: true
cache: true
cache-dependency-path: simapp/go.sum
Expand Down
8 changes: 5 additions & 3 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ linters:
- ineffassign
- misspell
- nakedret
- nolintlint
- staticcheck
- stylecheck
- typecheck
Expand All @@ -40,10 +39,13 @@ issues:
- text: "ST1016:"
linters:
- stylecheck
- path: "migrations"
text: "SA1019:"
- text: "SA1019:"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was popping for a lot of the IAVL changes, I think b/c we are using a wrapper, so I silenced them here by removing the "migrations" path. Might be a little overkill but I was spending too much time fixing this linter

linters:
- staticcheck
- path: "crypto/keyring"
text: "G306:"
linters:
- gosec
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some file has 0500 privileges and the lint was expecting 0600 or higher, seems unhelpful.


max-issues-per-linter: 10000
max-same-issues: 10000
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# This image is pushed to the GHCR as https://ghcr.io/cosmos/simapp

FROM --platform=$BUILDPLATFORM golang:1.19-alpine AS build-env
FROM --platform=$BUILDPLATFORM golang:1.20-alpine AS build-env

# Install minimum necessary dependencies
ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,12 +347,12 @@ benchmark:
###############################################################################

golangci_lint_cmd=golangci-lint
golangci_version=v1.50.1
golangci_version=v1.51.2

lint:
@echo "--> Running linter"
@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
@$(golangci_lint_cmd) run --timeout=10m
@$(golangci_lint_cmd) run --timeout=10m -c .golangci.yml

lint-fix:
@echo "--> Running linter"
Expand Down
2 changes: 1 addition & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/api

go 1.19
go 1.20

require (
github.com/cosmos/cosmos-proto v1.0.0-beta.2
Expand Down
5 changes: 0 additions & 5 deletions baseapp/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ func SetIAVLDisableFastNode(disable bool) func(*BaseApp) {
return func(bapp *BaseApp) { bapp.cms.SetIAVLDisableFastNode(disable) }
}

// SetIAVLLazyLoading enables/disables lazy loading of the IAVL store.
func SetIAVLLazyLoading(lazyLoading bool) func(*BaseApp) {
return func(bapp *BaseApp) { bapp.cms.SetLazyLoading(lazyLoading) }
}

// SetInterBlockCache provides a BaseApp option function that sets the
// inter-block cache.
func SetInterBlockCache(cache sdk.MultiStorePersistentCache) func(*BaseApp) {
Expand Down
2 changes: 1 addition & 1 deletion client/v2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/client/v2

go 1.19
go 1.20

require (
cosmossdk.io/api v0.3.1
Expand Down
Loading
Loading