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 Cosmos SDK to v0.47 #2162

Draft
wants to merge 101 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
341b286
chore: bump Go to 1.21
robert-zaremba Jan 27, 2024
151ba80
update github setup-go action
robert-zaremba Jan 27, 2024
9a18c70
update go.sum
robert-zaremba Jan 27, 2024
4b80aa2
go deps: update dependencies for cosmos-sdk v0.47
robert-zaremba Jan 27, 2024
5b2c56b
go.mod files
robert-zaremba Jan 27, 2024
4e7fb69
update proto scripts
robert-zaremba Jan 27, 2024
39f41a3
update proto buf files
robert-zaremba Jan 27, 2024
ed790cb
fix proto version
robert-zaremba Jan 27, 2024
8be648b
add cosmos-proto to types module
robert-zaremba Jan 27, 2024
cd2df58
update go.mod
robert-zaremba Jan 29, 2024
07e3745
fix protoc orm version
robert-zaremba Feb 6, 2024
528347e
Merge branch 'main' into robert/cosmos-sdk-047
robert-zaremba Feb 6, 2024
3812663
go tidy types
robert-zaremba Feb 6, 2024
1dd6a4b
regenerate proto
robert-zaremba Feb 6, 2024
f095f5b
go mod tidy api
robert-zaremba Feb 6, 2024
e8ddccd
go tidy intertx
robert-zaremba Feb 6, 2024
c9e5af2
update ecocredit
robert-zaremba Feb 6, 2024
0b223bd
go deps ecocredit
robert-zaremba Feb 6, 2024
512dea0
go deps data
robert-zaremba Feb 6, 2024
621b826
update app.go
robert-zaremba Feb 6, 2024
84ebc0e
update app/export.go
robert-zaremba Feb 6, 2024
3c59649
update app/simulation
robert-zaremba Feb 6, 2024
4359d0c
fix pruning/types import
robert-zaremba Feb 6, 2024
a5d7868
main go mod tidy
robert-zaremba Feb 6, 2024
9b3db15
fix Makefile
robert-zaremba Feb 6, 2024
c987e43
small cleanup
robert-zaremba Feb 8, 2024
d8ace46
troubleshooting inferred type error in types/math
robert-zaremba Feb 8, 2024
d5dcccc
fix build type error with golang.org/x/exp
robert-zaremba Feb 9, 2024
30e134b
remove types/testutil/network - we will use SDK version
robert-zaremba Feb 9, 2024
6bec40e
update GetEvents
robert-zaremba Feb 9, 2024
047bbd9
fix import
robert-zaremba Feb 9, 2024
07e8d6c
fix golang.org/x/exp version
robert-zaremba Feb 9, 2024
d01111d
fix types/testutil/fixture
robert-zaremba Feb 9, 2024
f598839
use github.com/cosmos/cosmos-sdk/api v0.1.0
robert-zaremba Feb 9, 2024
8b28960
x/intertx module and msg interface
robert-zaremba Feb 9, 2024
5a48a02
update x/data api
robert-zaremba Feb 10, 2024
6037b8c
x/data: add viper dep
robert-zaremba Feb 10, 2024
a4e8848
rollback buf opt update and regenerate proto
robert-zaremba Feb 10, 2024
c3a1b5d
update cosmos-sdk and cosmos-proto
robert-zaremba Mar 6, 2024
6bf6a8b
update cosmos-sdk to 0.47.10
robert-zaremba Mar 6, 2024
97b45f9
update types
robert-zaremba Mar 8, 2024
8d06489
update proto gen swagger
robert-zaremba Mar 8, 2024
a78ddff
revert buf puslar config overwrite for cosmosapi
robert-zaremba Mar 8, 2024
de882da
use cosmos/gogoproto rather than gogo/protobuf
robert-zaremba Mar 11, 2024
a77edbe
go mod tidy
robert-zaremba Mar 11, 2024
b0dd5e9
testutil cli deps in x/data
robert-zaremba Mar 11, 2024
8fe56c3
fix flags
robert-zaremba Mar 12, 2024
828ac8b
fix banktestutil.MsgSendExec
robert-zaremba Mar 12, 2024
94c01da
Merge remote-tracking branch 'origin/main' into robert/cosmos-sdk-047
robert-zaremba Mar 24, 2024
b3571fd
orm.store.kv adapter for cometbft-db
robert-zaremba Mar 24, 2024
ae022c7
x/data: use orm kv.Store adapter
robert-zaremba Mar 24, 2024
56baff7
proto: use cosmos/gogoproto/types for Time and Duration
robert-zaremba Mar 25, 2024
ec4a4bb
Merge remote-tracking branch 'origin/main' into robert/cosmos-sdk-047…
robert-zaremba Apr 9, 2024
0b34951
solve PageRequest compatibility issues
robert-zaremba Apr 21, 2024
ea36a1e
ecocredits: resolve modules
robert-zaremba Apr 21, 2024
ea63022
ecocredits: fix imports
robert-zaremba Apr 21, 2024
f301d30
ecocredits: use orm kv.Store adapter
robert-zaremba Apr 21, 2024
6cf453e
ecocredits: fix flags
robert-zaremba Apr 21, 2024
6f5f61c
ecocredits: fix banktestutil.MsgSendExec
robert-zaremba Apr 21, 2024
efe839f
remove Close from storeAdapter
robert-zaremba Apr 21, 2024
833826e
ecocredit: solve PageRequest compatibility issues
robert-zaremba Apr 21, 2024
44ecea4
ecocredit: solve pulsar coin convertions
robert-zaremba Apr 21, 2024
33c81e8
ecocredit: solve PageRequest compatibility issues
robert-zaremba Apr 21, 2024
a02b77b
ecocredit: module compatibility
robert-zaremba Apr 21, 2024
bbb8a6b
ecocredit: fix server/tests/utils
robert-zaremba Apr 21, 2024
fc04856
fix deps in app
robert-zaremba Apr 21, 2024
561d3a2
update deps
robert-zaremba Apr 21, 2024
043053d
update deps
robert-zaremba Apr 21, 2024
ccd97b8
migrate: old upgrade handlers
robert-zaremba Apr 21, 2024
b147aa1
fix app.go code
robert-zaremba Apr 21, 2024
9c3c063
fix app.go
robert-zaremba Apr 21, 2024
efb53ec
use cosmos-sdk SimulationOperations
robert-zaremba Apr 21, 2024
6924b72
resolve gov keeper.GetDepositParams
robert-zaremba Apr 21, 2024
b3cb0ef
import errro
robert-zaremba Apr 21, 2024
9da20aa
app: migrate root cmd
robert-zaremba Apr 22, 2024
17f787b
app: rework NewRegenApp args
robert-zaremba Apr 22, 2024
7950aa2
update cli testutil setup
robert-zaremba Apr 22, 2024
9dee0eb
app: remove skipUpgradeHeights from NewRegenApp args
robert-zaremba Apr 22, 2024
1302af7
adding upgrade handler
robert-zaremba Apr 28, 2024
84051c8
update ORM and other deps
robert-zaremba May 14, 2024
159bb92
fix golang.org/x/exp version
robert-zaremba May 14, 2024
581ef21
use orm robert/orm-alpha.13-rapid1.1
robert-zaremba May 16, 2024
acda7e3
update buf override
aaronc May 30, 2024
2fd6685
proto-gen
aaronc May 30, 2024
274c69b
update github.com/golang/protobuf
aaronc May 30, 2024
724f8e8
use orm v1.5.4
robert-zaremba May 30, 2024
9d345c8
update google protobuf to 1.5.4
robert-zaremba Jun 22, 2024
00b090f
fix golang.org/x/exp version
robert-zaremba Jun 22, 2024
5d9e720
use cosmossdk.io/api
robert-zaremba Jun 22, 2024
f3645c7
bump cosmos-sdk to 0.47.12
robert-zaremba Jun 22, 2024
677bbc0
use cosmos-sdk@robert/fix-group-orm-err-codespace
robert-zaremba Jun 22, 2024
6b6e794
fix: ecocredit module initialization
robert-zaremba Jun 22, 2024
4ec453b
fix: app: add missing keys
robert-zaremba Jun 22, 2024
c4f5f41
fix: wrong scoped ibctransfer keeper initialization
robert-zaremba Jun 22, 2024
6a1653e
debug: remove sdk local overwrite
robert-zaremba Jun 22, 2024
64830cc
dev: add helper start script
robert-zaremba Jun 22, 2024
fc0cdc2
chore: upgrade tests (#2222)
JeancarloBarrios Jul 3, 2024
05e755e
fix: linter fixes
JeancarloBarrios Jul 30, 2024
3377156
fix: linter fixes
JeancarloBarrios Jul 30, 2024
721da2d
fix: add comit true for TestAppAfterImport
JeancarloBarrios Oct 2, 2024
32a02e9
feat: devnet for regen-ledger (#2224)
PJEstrada Oct 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,8 @@ dist/
.localnet

completions

## Devnet
# Ignore everything in the nodes/ directory
scripts/devnet/shared
/scripts/devnet/.env
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ifeq (,$(VERSION))
endif

SDK_VERSION := $(shell go list -m github.com/cosmos/cosmos-sdk | sed 's:.* ::')
TM_VERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::')
TM_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')

LEDGER_ENABLED ?= true
DB_BACKEND ?= goleveldb
Expand Down Expand Up @@ -110,7 +110,7 @@ ifeq ($(DB_BACKEND), badgerdb)
ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=badgerdb
endif

ldflags += -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TM_VERSION)
ldflags += -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(TM_VERSION)

ifeq ($(NO_STRIP),false)
ldflags += -w -s
Expand Down
46 changes: 25 additions & 21 deletions api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,45 @@ module github.com/regen-network/regen-ledger/api/v2
go 1.21

require (
github.com/cosmos/cosmos-proto v1.0.0-beta.3
github.com/cosmos/cosmos-sdk/api v0.1.0
github.com/cosmos/cosmos-sdk/orm v1.0.0-alpha.12
github.com/cosmos/gogoproto v1.4.11
cosmossdk.io/api v0.3.1
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk/orm v1.0.0-alpha.12.0.20240514101554-56648741cbd6
github.com/cosmos/gogoproto v1.4.10 // NOTE: v1.4.11+ is not compatible with sdk v0.47
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917
google.golang.org/grpc v1.61.0
google.golang.org/protobuf v1.32.0
google.golang.org/protobuf v1.33.0
)

require (
github.com/DataDog/zstd v1.4.5 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5 // indirect
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
github.com/dgraph-io/ristretto v0.0.3 // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.0 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
github.com/tendermint/tm-db v0.6.7 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
)

// https://github.com/regen-network/regen-ledger/security/dependabot/105
replace golang.org/x/net => golang.org/x/net v0.7.0
require (
cosmossdk.io/errors v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cometbft/cometbft-db v0.7.0 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
)

// stick with compatible version or x/exp in v0.47.x line for gogoproto v1.4.10
replace golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
160 changes: 72 additions & 88 deletions api/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/regen/data/v1/query.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/regen/data/v1/state.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/regen/data/v1/tx.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions api/regen/data/v1/tx_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/regen/data/v2/query.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/regen/data/v2/state.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/regen/data/v2/tx.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions api/regen/data/v2/tx_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/regen/ecocredit/basket/v1/query.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 14 additions & 13 deletions api/regen/ecocredit/basket/v1/state.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/regen/ecocredit/basket/v1/tx.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/regen/ecocredit/basket/v1/types.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/regen/ecocredit/marketplace/v1/events.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/regen/ecocredit/marketplace/v1/query.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/regen/ecocredit/marketplace/v1/state.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/regen/ecocredit/marketplace/v1/tx.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/regen/ecocredit/orderbook/v1alpha1/memory.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/regen/ecocredit/v1/query.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading