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.

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: upgrade to SDK v0.47 #2144

Closed
wants to merge 178 commits into from
Closed
Show file tree
Hide file tree
Changes from 69 commits
Commits
Show all changes
178 commits
Select commit Hold shift + click to select a range
67a1ffe
progress
facundomedica Jul 11, 2023
3f48f4c
protogen
facundomedica Jul 12, 2023
ee1f941
progress
facundomedica Jul 12, 2023
0fc2374
progress
facundomedica Jul 13, 2023
a72acfe
fix unit test
facundomedica Jul 13, 2023
ca584c8
upgrade to v0.47.4 and add upgrade handler for v6
facundomedica Jul 18, 2023
f5e3f00
merge main
facundomedica Jul 18, 2023
94092a4
fix determinism test
facundomedica Jul 18, 2023
eb82bbd
fix test
facundomedica Jul 19, 2023
fb21ace
fix test
facundomedica Jul 19, 2023
b56950d
remove dep on gogoproto
facundomedica Jul 19, 2023
c87a057
gomod
facundomedica Jul 19, 2023
8d96234
merge main
facundomedica Jul 19, 2023
a15e8a4
e2e working
facundomedica Jul 19, 2023
92600a6
cleanup
facundomedica Jul 21, 2023
b4b864e
merge
facundomedica Jul 21, 2023
e9174eb
conflicts
facundomedica Jul 21, 2023
fb88804
fix protogen issues in metoken
facundomedica Jul 21, 2023
cab4366
fix unit tests
facundomedica Jul 21, 2023
2f1844e
merge
facundomedica Aug 6, 2023
f24407e
merge
facundomedica Aug 6, 2023
dff40d8
remove tm
facundomedica Aug 6, 2023
f67b1f7
fix build
facundomedica Aug 6, 2023
7baa755
lint fix
facundomedica Aug 6, 2023
1f113b5
make mocks
facundomedica Aug 6, 2023
97feb83
fix upgrade
facundomedica Aug 11, 2023
3b225db
fix some conflicts
Sep 12, 2023
6ffd7f1
fix
facundomedica Sep 12, 2023
b5b6c02
fix
facundomedica Sep 12, 2023
5ddaab3
tests: inflation rate change (#2236)
robert-zaremba Sep 12, 2023
b151362
test: leverage e2e (#2233)
toteki Sep 12, 2023
07c22a2
build(deps): Bump docker/login-action from 2 to 3 (#2238)
dependabot[bot] Sep 13, 2023
b427a00
build(deps): Bump docker/setup-buildx-action from 2 to 3 (#2241)
dependabot[bot] Sep 13, 2023
6f41a60
build(deps): Bump docker/build-push-action from 4 to 5 (#2240)
dependabot[bot] Sep 14, 2023
d847733
build(deps): Bump docker/metadata-action from 4 to 5 (#2239)
dependabot[bot] Sep 14, 2023
e8bb546
feat: max repay on MsgLeveragedLiquidate (#2242)
toteki Sep 14, 2023
3565e3c
fix build
facundomedica Sep 14, 2023
8682c88
fix build
facundomedica Sep 14, 2023
281eeda
chore: set mainnet EG address (#2244)
robert-zaremba Sep 14, 2023
721807e
docs: v6 release notes (#2237)
robert-zaremba Sep 14, 2023
3c4f695
add emergency group ugov cli query (#2245)
gsk967 Sep 14, 2023
7c0b55b
fix: gov special assets fix for 6.0 (#2247)
toteki Sep 15, 2023
7c85aeb
docs: v6.0.1 changelog (#2248)
robert-zaremba Sep 15, 2023
b6263c9
build(deps): Bump gotest.tools/v3 from 3.5.0 to 3.5.1 (#2251)
dependabot[bot] Sep 18, 2023
3fc633a
build(deps): Bump google.golang.org/grpc from 1.57.0 to 1.58.1 (#2250)
dependabot[bot] Sep 18, 2023
8383523
build(deps): Bump github.com/mgechev/revive from 1.3.3 to 1.3.4 (#2252)
dependabot[bot] Sep 18, 2023
9dc01c3
feat(oracle): include timestamp into save exchange rates (#2249)
robert-zaremba Sep 18, 2023
ff83c93
chore: enforce experimental in e2e tests (#2253)
robert-zaremba Sep 19, 2023
0aa5a57
merge
facundomedica Sep 20, 2023
a1bd662
merge
facundomedica Sep 20, 2023
9daa8c1
fix build
facundomedica Sep 20, 2023
d64363f
fix build
facundomedica Sep 20, 2023
9044058
fix some tests
facundomedica Sep 20, 2023
224cdda
fix some tests
facundomedica Sep 20, 2023
7fa57bf
fix(oracle): avg params (#2257)
robert-zaremba Sep 20, 2023
ceffdd0
v6.0.2 changelog (#2258)
robert-zaremba Sep 20, 2023
fc39603
small
facundomedica Sep 20, 2023
b82dd55
small
facundomedica Sep 20, 2023
9c63049
test: fixing meToken e2e (#2255)
kosegor Sep 21, 2023
32d862f
build(deps): Bump DavidAnson/markdownlint-cli2-action from 12 to 13 (…
dependabot[bot] Sep 21, 2023
855f07e
Merge branch 'release/v6.0.x'
robert-zaremba Sep 21, 2023
d9b260a
progress
facundomedica Sep 21, 2023
a63cdef
progress
facundomedica Sep 21, 2023
4865046
reordering of imports
facundomedica Sep 21, 2023
d5a0187
reordering of imports
facundomedica Sep 21, 2023
da24d25
feat(client): unify and refactore client package (#2256)
robert-zaremba Sep 21, 2023
8f4ac46
fix(oracle): avg params storage. (#2260)
robert-zaremba Sep 22, 2023
39f61c4
fix
facundomedica Sep 22, 2023
058a506
fix
facundomedica Sep 22, 2023
d0f2a3f
chore: use go-1.21 (#2261)
robert-zaremba Sep 22, 2023
b271748
fix conflict
facundomedica Sep 25, 2023
dba2ac8
fix conflict
facundomedica Sep 25, 2023
15a5e5f
go mod tidy
facundomedica Sep 25, 2023
3979408
go mod tidy
facundomedica Sep 25, 2023
cbe799f
build(deps): Bump google.golang.org/grpc from 1.58.1 to 1.58.2 (#2262)
dependabot[bot] Sep 25, 2023
84e18ed
feat(uibc): quota reset event (#2264)
robert-zaremba Sep 26, 2023
723f1ae
build(deps): Bump github.com/rs/zerolog from 1.30.0 to 1.31.0 (#2265)
dependabot[bot] Sep 26, 2023
51dd747
chore: adding govulncheck to github actions (#2266)
gsk967 Sep 27, 2023
44b986e
feat(oracle): add timestamp to exchange rates (#2254)
gsk967 Sep 27, 2023
be01797
feat: account summary to display both spot and leverage prices (#2263)
toteki Sep 27, 2023
6bbdceb
feat: emergency group index update (#2246)
kosegor Sep 27, 2023
b620963
chore: increase oracle gas limit from 140k to 200k (#2270)
robert-zaremba Sep 29, 2023
9d5cb6d
doc: CHANGELOG.md and RELEASE_NOTES updated (#2271)
kosegor Sep 29, 2023
091520e
feat: move meToken out of experimental (#2269)
kosegor Oct 2, 2023
ed6e80b
feat: recent price mode support (#2267)
toteki Oct 3, 2023
7237531
chore: migrating oracle old exg rates to new exg rates format (includ…
gsk967 Oct 3, 2023
cd57a20
fix: trivial e2e improvements (#2274)
toteki Oct 10, 2023
e5adbc0
conflicts
facundomedica Oct 10, 2023
0782ead
conflicts
facundomedica Oct 10, 2023
94b5ff8
pf
facundomedica Oct 10, 2023
1b74fda
pf
facundomedica Oct 10, 2023
1af82a6
fix
facundomedica Oct 10, 2023
3395b08
fix
facundomedica Oct 10, 2023
632bdbc
fix: fix the store upgrade for metoken on v6.1.0 (#2278)
gsk967 Oct 10, 2023
0cafe51
fix
facundomedica Oct 11, 2023
9684a4c
fix
facundomedica Oct 11, 2023
79a16e9
build(deps): Bump github.com/spf13/viper from 1.16.0 to 1.17.0 (#2275)
dependabot[bot] Oct 12, 2023
9d3c1ac
build(deps): Bump golang.org/x/net from 0.15.0 to 0.17.0 (#2280)
dependabot[bot] Oct 12, 2023
171abe8
fix: e2e test reliability (#2276)
toteki Oct 15, 2023
31847c5
build(deps): Bump google.golang.org/grpc from 1.58.2 to 1.58.3 (#2279)
dependabot[bot] Oct 15, 2023
0cb93e4
chore: Bump Cosmos SDK to v0.46.15 (#2287)
robert-zaremba Oct 16, 2023
95b2b83
chore: prepare v6.1 release (#2286)
robert-zaremba Oct 17, 2023
ceaf4c7
fix leveraged liquidate not working during low liquidity (#2285)
toteki Oct 17, 2023
51b9e6d
chore: change consensus.block.max_size to 4 MB (#2288)
robert-zaremba Oct 17, 2023
2855af3
build(deps): Bump google.golang.org/grpc from 1.58.3 to 1.59.0 (#2289)
dependabot[bot] Oct 19, 2023
57f462e
tests: testing ibc transactions on e2e tests (#2284)
gsk967 Oct 19, 2023
11f2d8e
pull from main
facundomedica Oct 19, 2023
195ebde
pull from main
facundomedica Oct 19, 2023
9a2dc04
fix conflicts
facundomedica Oct 19, 2023
9db9c40
fix conflicts
facundomedica Oct 19, 2023
24fc4db
fixing
facundomedica Oct 19, 2023
3923ee2
fixing
facundomedica Oct 19, 2023
7850ee3
fix more e2e tests
facundomedica Oct 20, 2023
65df806
fix more e2e tests
facundomedica Oct 20, 2023
0a0bc4f
fixed almost all e2e tests
facundomedica Oct 22, 2023
5069c6a
fixed almost all e2e tests
facundomedica Oct 22, 2023
b33abc9
fix
facundomedica Oct 22, 2023
f813bd9
fix
facundomedica Oct 22, 2023
911fa36
fix
facundomedica Oct 23, 2023
0a20ed7
fix
facundomedica Oct 23, 2023
c231c4d
another try
facundomedica Oct 23, 2023
fd71c43
another try
facundomedica Oct 23, 2023
3099d54
another try
facundomedica Oct 23, 2023
7a5d9da
another try
facundomedica Oct 23, 2023
150eb5e
another try
facundomedica Oct 23, 2023
409bef6
another try
facundomedica Oct 23, 2023
5adff76
another try
facundomedica Oct 23, 2023
5d7ef2b
another try
facundomedica Oct 23, 2023
73818dd
start adjusting timeouts
facundomedica Oct 23, 2023
c816e19
start adjusting timeouts
facundomedica Oct 23, 2023
1b1a49d
start adjusting timeouts
facundomedica Oct 23, 2023
8be59ad
start adjusting timeouts
facundomedica Oct 23, 2023
683c791
try with the new image
facundomedica Oct 23, 2023
6049346
try with the new image
facundomedica Oct 23, 2023
9b43968
build(deps): Bump github.com/golangci/golangci-lint (#2292)
dependabot[bot] Oct 24, 2023
4ab91d4
chore: update ibc-go (#2290)
robert-zaremba Oct 24, 2023
e5313b5
build(deps): Bump github.com/prometheus/client_golang (#2268)
dependabot[bot] Oct 24, 2023
0729dcb
update upgrade name
robert-zaremba Oct 25, 2023
f0a8ac6
update upgrade name
robert-zaremba Oct 25, 2023
3fc35ba
Update tests/e2e/e2e_ibc_test.go
facundomedica Oct 26, 2023
3a7631d
Update tests/e2e/e2e_ibc_test.go
facundomedica Oct 26, 2023
f06b84e
added ibc upgrade, removed metoken from added list
facundomedica Oct 26, 2023
475eea0
added ibc upgrade, removed metoken from added list
facundomedica Oct 26, 2023
a6e45e0
Merge branch 'facu/upgrade-047' of https://github.com/umee-network/um…
facundomedica Oct 26, 2023
f2d1d74
Merge branch 'facu/upgrade-047' of https://github.com/umee-network/um…
facundomedica Oct 26, 2023
582d8a8
small fixes
facundomedica Oct 26, 2023
5014f3f
small fixes
facundomedica Oct 26, 2023
b70d177
lint and re-add test
facundomedica Oct 26, 2023
2a1f0a2
lint and re-add test
facundomedica Oct 26, 2023
1d783ff
lint
facundomedica Oct 26, 2023
5962cc3
lint
facundomedica Oct 26, 2023
656100e
lint
facundomedica Oct 26, 2023
90242ee
lint
facundomedica Oct 26, 2023
9a07cc3
lint
facundomedica Oct 26, 2023
a123690
lint
facundomedica Oct 26, 2023
1cdf595
build(deps): Bump github.com/golangci/golangci-lint (#2295)
dependabot[bot] Oct 27, 2023
0a6b9b4
build(deps): Bump tj-actions/changed-files from 39 to 40 (#2297)
dependabot[bot] Oct 27, 2023
7064f10
go mod tidy
facundomedica Oct 27, 2023
9cc9318
go mod tidy
facundomedica Oct 27, 2023
113dfc5
remove failing test
facundomedica Oct 30, 2023
03ad708
remove failing test
facundomedica Oct 30, 2023
44fb579
helper function to check logs
facundomedica Oct 30, 2023
9534179
helper function to check logs
facundomedica Oct 30, 2023
7694f31
gogoproto
facundomedica Oct 30, 2023
833c214
gogoproto
facundomedica Oct 30, 2023
fbe2047
run make lint-fix
facundomedica Oct 30, 2023
eb6b6af
run make lint-fix
facundomedica Oct 30, 2023
4aa2262
try cleaning cache
facundomedica Oct 30, 2023
8158154
try cleaning cache
facundomedica Oct 30, 2023
8aec939
lint fixed
facundomedica Oct 30, 2023
b803594
lint fixed
facundomedica Oct 30, 2023
84625a3
fix cosmwasm test
facundomedica Oct 30, 2023
8a50209
fix cosmwasm test
facundomedica Oct 30, 2023
f78e4f1
fix cosmwasm test
facundomedica Oct 30, 2023
05df5af
fix cosmwasm test
facundomedica Oct 30, 2023
caea246
Merge branch 'facu/upgrade-047' of https://github.com/umee-network/um…
facundomedica Oct 30, 2023
a9be544
Merge branch 'facu/upgrade-047' of https://github.com/umee-network/um…
facundomedica Oct 30, 2023
2af7a57
Merge branch 'facu/upgrade-047' of https://github.com/umee-network/um…
facundomedica Oct 30, 2023
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/release-umee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
cache: true

- name: Set Env
run: echo "TM_VERSION=$(go list -m github.com/tendermint/tendermint | sed 's:.* ::')" >> $GITHUB_ENV
run: echo "TM_VERSION=$(go list -m github.com/cometbft/cometbft | sed 's:.* ::')" >> $GITHUB_ENV

# useful to test builds. However will require to add "push" rule to the "on" section
- name: generate and update swagger docs
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ builds:
- -tags=badgerdb ledger netgo
- -trimpath
ldflags:
- -s -w -X main.commit={{.Commit}} -X main.date={{ .CommitDate }} -X github.com/cosmos/cosmos-sdk/version.Name=umee -X github.com/cosmos/cosmos-sdk/version.AppName=umeed -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }} -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }} -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger -X github.com/tendermint/tendermint/version.TMCoreSemVer={{ .Env.TM_VERSION }}
- -s -w -X main.commit={{.Commit}} -X main.date={{ .CommitDate }} -X github.com/cosmos/cosmos-sdk/version.Name=umee -X github.com/cosmos/cosmos-sdk/version.AppName=umeed -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }} -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }} -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger -X github.com/cometbft/cometbft/version.TMCoreSemVer={{ .Env.TM_VERSION }}
goos:
- linux
goarch:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
PACKAGES_NOSIMULATION=$(shell go list ./... | grep -v '/simulation')
PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
export VERSION := $(shell echo $(shell git describe --tags --always --match "v*") | sed 's/^v//')
export TMVERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::')
export TMVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
export COMMIT := $(shell git log -1 --format='%H')
LEDGER_ENABLED ?= true
BINDIR ?= $(GOPATH)/bin
Expand Down Expand Up @@ -68,7 +68,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=umee \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
-X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TMVERSION)
-X github.com/cometbft/cometbft/version.TMCoreSemVer=$(TMVERSION)

ifeq ($(ENABLE_ROCKSDB),true)
BUILD_TAGS += rocksdb
Expand Down Expand Up @@ -320,8 +320,8 @@ lint-fix:

DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.8.0

protoVer=v0.7
protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
protoVer=0.13.0
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer)
containerProtoGenSwagger=$(PROJECT_NAME)-proto-gen-swagger-$(protoVer)
containerProtoFmt=$(PROJECT_NAME)-proto-fmt-$(protoVer)
Expand Down
4 changes: 2 additions & 2 deletions ante/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
cosmosante "github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
"github.com/cosmos/cosmos-sdk/x/auth/types"
ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
)

type HandlerOptions struct {
Expand Down
8 changes: 4 additions & 4 deletions ante/ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module/testutil"
"github.com/cosmos/cosmos-sdk/types/tx/signing"
xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
"github.com/stretchr/testify/suite"
tmrand "github.com/tendermint/tendermint/libs/rand"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
tmrand "github.com/cometbft/cometbft/libs/rand"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"

umeeapp "github.com/umee-network/umee/v6/app"
)
Expand All @@ -37,7 +37,7 @@ func (s *IntegrationTestSuite) SetupTest() {
s.app = app
s.ctx = ctx

encodingConfig := simapp.MakeTestEncodingConfig()
encodingConfig := testutil.MakeTestEncodingConfig()
encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil)
testdata.RegisterInterfaces(encodingConfig.InterfaceRegistry)
s.clientCtx = client.Context{}.
Expand Down
Loading
Loading