Skip to content

Commit

Permalink
sdk v045 upgrade (#524)
Browse files Browse the repository at this point in the history 
* upgrade sdk version

* remove replace

* bump tendermint version

* fix linter

* update init,end,genesis blocker order

* run full test

* add local env to prepare genesis, fix testnet cmd generation

* undo ci change

* bump spm dep

* Update Changelog
  • Loading branch information
@jhernandezb
jhernandezb authored Jan 20, 2022
1 parent 9f45aa4 commit 0dda5be
Show file tree
Hide file tree
Showing 6 changed files with 268 additions and 66 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
# Changelog

## [Unreleased]

- [#524](https://github.com/public-awesome/stargaze/pull/524) Upgrade to Cosmos SDK `V0.45.0`
- [#523](https://github.com/public-awesome/stargaze/pull/523) Upgrade Module Version to v2
- [#522](https://github.com/public-awesome/stargaze/pull/522) Fix Amino for Claim Tx
- [#519](https://github.com/public-awesome/stargaze/pull/519) Fix missing GRPC Routes for claim and alloc modules
- [#495](https://github.com/public-awesome/stargaze/issues/495) Adds denom metadata as part of the migration
- [#502](https://github.com/public-awesome/stargaze/issues/502) Upgrades to ibc-go v2
Expand Down
22 changes: 14 additions & 8 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ import (
"github.com/tendermint/spm/cosmoscmd"
"github.com/tendermint/spm/openapiconsole"

vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
"github.com/public-awesome/stargaze/v2/docs"
allocmodule "github.com/public-awesome/stargaze/v2/x/alloc"
allocmodulekeeper "github.com/public-awesome/stargaze/v2/x/alloc/keeper"
allocmoduletypes "github.com/public-awesome/stargaze/v2/x/alloc/types"
claimmodule "github.com/public-awesome/stargaze/v2/x/claim"
claimmodulekeeper "github.com/public-awesome/stargaze/v2/x/claim/keeper"
claimmoduletypes "github.com/public-awesome/stargaze/v2/x/claim/types"
// this line is used by starport scaffolding # stargate/app/moduleImport
)

const (
Expand Down Expand Up @@ -469,17 +469,22 @@ func NewStargazeApp(
upgradetypes.ModuleName, capabilitytypes.ModuleName, minttypes.ModuleName,
allocmoduletypes.ModuleName, // must run before distribution begin blocker
distrtypes.ModuleName, slashingtypes.ModuleName,
evidencetypes.ModuleName, stakingtypes.ModuleName, ibchost.ModuleName,
feegrant.ModuleName,
evidencetypes.ModuleName, stakingtypes.ModuleName,
ibchost.ModuleName, ibctransfertypes.ModuleName,
authtypes.ModuleName, banktypes.ModuleName, govtypes.ModuleName, crisistypes.ModuleName, genutiltypes.ModuleName,
authz.ModuleName, feegrant.ModuleName, claimmoduletypes.ModuleName,
paramstypes.ModuleName, vestingtypes.ModuleName,
)

app.mm.SetOrderEndBlockers(
crisistypes.ModuleName,
govtypes.ModuleName,
stakingtypes.ModuleName,
crisistypes.ModuleName, govtypes.ModuleName, stakingtypes.ModuleName,
capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName,
slashingtypes.ModuleName, minttypes.ModuleName,
genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName,
feegrant.ModuleName,
authz.ModuleName,
claimmoduletypes.ModuleName,
paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName,
ibchost.ModuleName, ibctransfertypes.ModuleName,
allocmoduletypes.ModuleName, claimmoduletypes.ModuleName,
)

// NOTE: The genutils module must occur after staking so that pools are
Expand All @@ -503,6 +508,7 @@ func NewStargazeApp(
ibctransfertypes.ModuleName,
feegrant.ModuleName,
authz.ModuleName,
paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName,
claimmoduletypes.ModuleName,
allocmoduletypes.ModuleName,
// this line is used by starport scaffolding # stargate/app/initGenesis
Expand Down
24 changes: 24 additions & 0 deletions cmd/starsd/cmd/genesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ Example:
// get genesis params
genesisParams := MainnetGenesisParams()
switch args[0] {
case "localnet":
genesisParams = LocalnetGenesisParams()
case "testnet":
genesisParams = TestnetGenesisParams()
case "devnet":
Expand Down Expand Up @@ -495,3 +497,25 @@ func DevnetGenesisParams() GenesisParams {

return genParams
}

func LocalnetGenesisParams() GenesisParams {
genParams := MainnetGenesisParams()

genParams.AirdropSupply = sdk.NewInt(250_000_000_000_000) // 250M STARS
genParams.GenesisTime = time.Now()
genParams.ClaimParams.AirdropEnabled = true
genParams.ClaimParams.AirdropStartTime = genParams.GenesisTime
// mint
genParams.MintParams.StartTime = genParams.GenesisTime.Add(time.Hour * 10)

genParams.GovParams.DepositParams.MaxDepositPeriod = time.Hour * 1 // 1 hour
genParams.GovParams.DepositParams.MinDeposit = sdk.NewCoins(sdk.NewCoin(
genParams.NativeCoinMetadatas[0].Base,
sdk.NewInt(1),
))
genParams.GovParams.TallyParams.Quorum = sdk.MustNewDecFromStr("0.1") // 10%
genParams.GovParams.TallyParams.Threshold = sdk.MustNewDecFromStr("0.5") // 50%
genParams.GovParams.VotingParams.VotingPeriod = time.Minute * 1 // 5 min

return genParams
}
3 changes: 2 additions & 1 deletion cmd/starsd/cmd/testnet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"time"

"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/testutil"
crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
claimtypes "github.com/public-awesome/stargaze/v2/x/claim/types"
Expand Down Expand Up @@ -227,7 +228,7 @@ func InitTestnet(
return err
}

addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, true, algo)
addr, secret, err := testutil.GenerateSaveCoinKey(kb, nodeDirName, "", true, algo)
if err != nil {
_ = os.RemoveAll(outputDir)
return err
Expand Down
49 changes: 24 additions & 25 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,21 @@ go 1.17

require (
github.com/armon/go-metrics v0.3.10
github.com/cosmos/cosmos-sdk v0.44.5
github.com/cosmos/cosmos-sdk v0.45.0
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/ibc-go/v2 v2.0.2
github.com/gogo/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.6 // indirect
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/pkg/errors v0.9.1
github.com/spf13/cast v1.4.1
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
github.com/tendermint/spm v0.1.9
github.com/tendermint/tendermint v0.34.14
github.com/tendermint/tm-db v0.6.4
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
github.com/tendermint/tendermint v0.34.15
github.com/tendermint/tm-db v0.6.6
google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4
google.golang.org/grpc v1.43.0
google.golang.org/protobuf v1.27.1
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -30,13 +29,13 @@ require (
github.com/99designs/keyring v1.1.6 // indirect
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
github.com/DataDog/zstd v1.4.5 // indirect
github.com/Workiva/go-datastructures v1.0.52 // indirect
github.com/Workiva/go-datastructures v1.0.53 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/btcsuite/btcd v0.22.0-beta // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/coinbase/rosetta-sdk-go v0.6.10 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coinbase/rosetta-sdk-go v0.7.0 // indirect
github.com/confio/ics23/go v0.6.6 // indirect
github.com/cosmos/btcutil v1.0.4 // indirect
github.com/cosmos/iavl v0.17.3 // indirect
Expand All @@ -52,8 +51,9 @@ require (
github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-kit/kit v0.10.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/gateway v1.1.0 // indirect
github.com/golang/snappy v0.0.3 // indirect
Expand All @@ -65,64 +65,63 @@ require (
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/gtank/merlin v0.1.1 // indirect
github.com/gtank/ristretto255 v0.1.2 // indirect
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect
github.com/improbable-eng/grpc-web v0.14.1 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
github.com/klauspost/compress v1.11.7 // indirect
github.com/lib/pq v1.10.2 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/lib/pq v1.10.4 // indirect
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
github.com/minio/highwayhash v1.0.1 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/mitchellh/mapstructure v1.4.2 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.29.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/prometheus/common v0.30.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rakyll/statik v0.1.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
github.com/regen-network/cosmos-proto v0.3.1 // indirect
github.com/rs/cors v1.7.0 // indirect
github.com/rs/cors v1.8.0 // indirect
github.com/rs/zerolog v1.23.0 // indirect
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.8.1 // indirect
github.com/spf13/viper v1.9.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
github.com/tendermint/btcd v0.1.1 // indirect
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
github.com/zondax/hid v0.9.0 // indirect
go.etcd.io/bbolt v1.3.5 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect
golang.org/x/sys v0.0.0-20210903071746-97244b99971b // indirect
go.etcd.io/bbolt v1.3.6 // indirect
golang.org/x/crypto v0.0.0-20210915214749-c084706c2272 // indirect
golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b // indirect
golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/text v0.3.7 // indirect
gopkg.in/ini.v1 v1.63.2 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
nhooyr.io/websocket v1.8.6 // indirect
)

replace (
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.44.5
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/tendermint/spm => github.com/public-awesome/spm v0.1.9-stargaze.0.20220104183048-9259f3127531
github.com/tendermint/spm => github.com/public-awesome/spm v0.1.9-stargaze.0.20220120194320-92da222110ff
google.golang.org/grpc => google.golang.org/grpc v1.33.2
)
Loading

0 comments on commit 0dda5be

Please sign in to comment.