Skip to content

Commit

Permalink
build!: semantic versioning from v3 to v4
Browse files Browse the repository at this point in the history
  • Loading branch information
queencre committed Dec 22, 2022
1 parent 388bf88 commit 6818a77
Show file tree
Hide file tree
Showing 422 changed files with 4,147 additions and 2,034 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

NAME=crescent
APPNAME=crescentd
REPO=github.com/crescent-network/crescent/v3
REPO=github.com/crescent-network/crescent/v4

VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
COMMIT := $(shell git log -1 --format='%H')
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Use `git` to retrieve Crescent Core from [the official repository](https://githu

```bash
git clone https://github.com/crescent-network/crescent.git
cd crescent && git checkout release/v3.0.x
cd crescent && git checkout release/v4.0.x
make install
```

Expand Down
66 changes: 33 additions & 33 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,41 +106,41 @@ import (
budgettypes "github.com/tendermint/budget/x/budget/types"

// core modules
farmingparams "github.com/crescent-network/crescent/v3/app/params"
v2_0_0 "github.com/crescent-network/crescent/v3/app/upgrades/mainnet/v2.0.0"
v3 "github.com/crescent-network/crescent/v3/app/upgrades/mainnet/v3"
v4 "github.com/crescent-network/crescent/v3/app/upgrades/mainnet/v4"
"github.com/crescent-network/crescent/v3/app/upgrades/testnet/rc4"
"github.com/crescent-network/crescent/v3/x/claim"
claimkeeper "github.com/crescent-network/crescent/v3/x/claim/keeper"
claimtypes "github.com/crescent-network/crescent/v3/x/claim/types"
"github.com/crescent-network/crescent/v3/x/farming"
farmingclient "github.com/crescent-network/crescent/v3/x/farming/client"
farmingkeeper "github.com/crescent-network/crescent/v3/x/farming/keeper"
farmingtypes "github.com/crescent-network/crescent/v3/x/farming/types"
"github.com/crescent-network/crescent/v3/x/liquidfarming"
liquidfarmingkeeper "github.com/crescent-network/crescent/v3/x/liquidfarming/keeper"
liquidfarmingtypes "github.com/crescent-network/crescent/v3/x/liquidfarming/types"
"github.com/crescent-network/crescent/v3/x/liquidity"
liquiditykeeper "github.com/crescent-network/crescent/v3/x/liquidity/keeper"
liquiditytypes "github.com/crescent-network/crescent/v3/x/liquidity/types"
"github.com/crescent-network/crescent/v3/x/liquidstaking"
liquidstakingkeeper "github.com/crescent-network/crescent/v3/x/liquidstaking/keeper"
liquidstakingtypes "github.com/crescent-network/crescent/v3/x/liquidstaking/types"
"github.com/crescent-network/crescent/v3/x/lpfarm"
lpfarmclient "github.com/crescent-network/crescent/v3/x/lpfarm/client"
lpfarmkeeper "github.com/crescent-network/crescent/v3/x/lpfarm/keeper"
lpfarmtypes "github.com/crescent-network/crescent/v3/x/lpfarm/types"
"github.com/crescent-network/crescent/v3/x/marketmaker"
marketmakerclient "github.com/crescent-network/crescent/v3/x/marketmaker/client"
marketmakerkeeper "github.com/crescent-network/crescent/v3/x/marketmaker/keeper"
marketmakertypes "github.com/crescent-network/crescent/v3/x/marketmaker/types"
"github.com/crescent-network/crescent/v3/x/mint"
mintkeeper "github.com/crescent-network/crescent/v3/x/mint/keeper"
minttypes "github.com/crescent-network/crescent/v3/x/mint/types"
farmingparams "github.com/crescent-network/crescent/v4/app/params"
v2_0_0 "github.com/crescent-network/crescent/v4/app/upgrades/mainnet/v2.0.0"
v3 "github.com/crescent-network/crescent/v4/app/upgrades/mainnet/v3"
v4 "github.com/crescent-network/crescent/v4/app/upgrades/mainnet/v4"
"github.com/crescent-network/crescent/v4/app/upgrades/testnet/rc4"
"github.com/crescent-network/crescent/v4/x/claim"
claimkeeper "github.com/crescent-network/crescent/v4/x/claim/keeper"
claimtypes "github.com/crescent-network/crescent/v4/x/claim/types"
"github.com/crescent-network/crescent/v4/x/farming"
farmingclient "github.com/crescent-network/crescent/v4/x/farming/client"
farmingkeeper "github.com/crescent-network/crescent/v4/x/farming/keeper"
farmingtypes "github.com/crescent-network/crescent/v4/x/farming/types"
"github.com/crescent-network/crescent/v4/x/liquidfarming"
liquidfarmingkeeper "github.com/crescent-network/crescent/v4/x/liquidfarming/keeper"
liquidfarmingtypes "github.com/crescent-network/crescent/v4/x/liquidfarming/types"
"github.com/crescent-network/crescent/v4/x/liquidity"
liquiditykeeper "github.com/crescent-network/crescent/v4/x/liquidity/keeper"
liquiditytypes "github.com/crescent-network/crescent/v4/x/liquidity/types"
"github.com/crescent-network/crescent/v4/x/liquidstaking"
liquidstakingkeeper "github.com/crescent-network/crescent/v4/x/liquidstaking/keeper"
liquidstakingtypes "github.com/crescent-network/crescent/v4/x/liquidstaking/types"
"github.com/crescent-network/crescent/v4/x/lpfarm"
lpfarmclient "github.com/crescent-network/crescent/v4/x/lpfarm/client"
lpfarmkeeper "github.com/crescent-network/crescent/v4/x/lpfarm/keeper"
lpfarmtypes "github.com/crescent-network/crescent/v4/x/lpfarm/types"
"github.com/crescent-network/crescent/v4/x/marketmaker"
marketmakerclient "github.com/crescent-network/crescent/v4/x/marketmaker/client"
marketmakerkeeper "github.com/crescent-network/crescent/v4/x/marketmaker/keeper"
marketmakertypes "github.com/crescent-network/crescent/v4/x/marketmaker/types"
"github.com/crescent-network/crescent/v4/x/mint"
mintkeeper "github.com/crescent-network/crescent/v4/x/mint/keeper"
minttypes "github.com/crescent-network/crescent/v4/x/mint/types"

// unnamed import of statik for swagger UI support
_ "github.com/crescent-network/crescent/v3/client/docs/statik"
_ "github.com/crescent-network/crescent/v4/client/docs/statik"
)

var (
Expand Down
16 changes: 8 additions & 8 deletions app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ import (
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
dbm "github.com/tendermint/tm-db"

"github.com/crescent-network/crescent/v3/x/claim"
"github.com/crescent-network/crescent/v3/x/farming"
"github.com/crescent-network/crescent/v3/x/liquidfarming"
"github.com/crescent-network/crescent/v3/x/liquidity"
"github.com/crescent-network/crescent/v3/x/liquidstaking"
"github.com/crescent-network/crescent/v3/x/lpfarm"
"github.com/crescent-network/crescent/v3/x/marketmaker"
"github.com/crescent-network/crescent/v3/x/mint"
"github.com/crescent-network/crescent/v4/x/claim"
"github.com/crescent-network/crescent/v4/x/farming"
"github.com/crescent-network/crescent/v4/x/liquidfarming"
"github.com/crescent-network/crescent/v4/x/liquidity"
"github.com/crescent-network/crescent/v4/x/liquidstaking"
"github.com/crescent-network/crescent/v4/x/lpfarm"
"github.com/crescent-network/crescent/v4/x/marketmaker"
"github.com/crescent-network/crescent/v4/x/mint"
)

func TestSimAppExportAndBlockedAddrs(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package app
import (
"github.com/cosmos/cosmos-sdk/std"

"github.com/crescent-network/crescent/v3/app/params"
"github.com/crescent-network/crescent/v4/app/params"
)

// MakeEncodingConfig creates an EncodingConfig for testing
Expand Down
14 changes: 7 additions & 7 deletions app/sim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ import (
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
dbm "github.com/tendermint/tm-db"

claimtypes "github.com/crescent-network/crescent/v3/x/claim/types"
farmingtypes "github.com/crescent-network/crescent/v3/x/farming/types"
liquiditytypes "github.com/crescent-network/crescent/v3/x/liquidity/types"
liquidstakingtypes "github.com/crescent-network/crescent/v3/x/liquidstaking/types"
lpfarmtypes "github.com/crescent-network/crescent/v3/x/lpfarm/types"
marketmakertypes "github.com/crescent-network/crescent/v3/x/marketmaker/types"
minttypes "github.com/crescent-network/crescent/v3/x/mint/types"
claimtypes "github.com/crescent-network/crescent/v4/x/claim/types"
farmingtypes "github.com/crescent-network/crescent/v4/x/farming/types"
liquiditytypes "github.com/crescent-network/crescent/v4/x/liquidity/types"
liquidstakingtypes "github.com/crescent-network/crescent/v4/x/liquidstaking/types"
lpfarmtypes "github.com/crescent-network/crescent/v4/x/lpfarm/types"
marketmakertypes "github.com/crescent-network/crescent/v4/x/marketmaker/types"
minttypes "github.com/crescent-network/crescent/v4/x/mint/types"
)

// Get flags every time the simulator is run
Expand Down
4 changes: 2 additions & 2 deletions app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

simappparams "github.com/crescent-network/crescent/v3/app/params"
minttypes "github.com/crescent-network/crescent/v3/x/mint/types"
simappparams "github.com/crescent-network/crescent/v4/app/params"
minttypes "github.com/crescent-network/crescent/v4/x/mint/types"
)

// DefaultConsensusParams defines the default Tendermint consensus params used in
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/mainnet/v2.0.0/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
budgetkeeper "github.com/tendermint/budget/x/budget/keeper"
budgettypes "github.com/tendermint/budget/x/budget/types"

utils "github.com/crescent-network/crescent/v3/types"
liquiditykeeper "github.com/crescent-network/crescent/v3/x/liquidity/keeper"
mintkeeper "github.com/crescent-network/crescent/v3/x/mint/keeper"
minttypes "github.com/crescent-network/crescent/v3/x/mint/types"
utils "github.com/crescent-network/crescent/v4/types"
liquiditykeeper "github.com/crescent-network/crescent/v4/x/liquidity/keeper"
mintkeeper "github.com/crescent-network/crescent/v4/x/mint/keeper"
minttypes "github.com/crescent-network/crescent/v4/x/mint/types"
)

const UpgradeName = "v2.0.0"
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/mainnet/v2.0.0/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

"github.com/crescent-network/crescent/v3/app"
v2_0_0 "github.com/crescent-network/crescent/v3/app/upgrades/mainnet/v2.0.0"
"github.com/crescent-network/crescent/v3/cmd/crescentd/cmd"
utils "github.com/crescent-network/crescent/v3/types"
"github.com/crescent-network/crescent/v4/app"
v2_0_0 "github.com/crescent-network/crescent/v4/app/upgrades/mainnet/v2.0.0"
"github.com/crescent-network/crescent/v4/cmd/crescentd/cmd"
utils "github.com/crescent-network/crescent/v4/types"
)

type UpgradeTestSuite struct {
Expand Down
18 changes: 9 additions & 9 deletions app/upgrades/mainnet/v3/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import (
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

farmingkeeper "github.com/crescent-network/crescent/v3/x/farming/keeper"
farmingtypes "github.com/crescent-network/crescent/v3/x/farming/types"
liquidfarmingtypes "github.com/crescent-network/crescent/v3/x/liquidfarming/types"
liquiditykeeper "github.com/crescent-network/crescent/v3/x/liquidity/keeper"
liquiditytypes "github.com/crescent-network/crescent/v3/x/liquidity/types"
lpfarmkeeper "github.com/crescent-network/crescent/v3/x/lpfarm/keeper"
lpfarmtypes "github.com/crescent-network/crescent/v3/x/lpfarm/types"
marketmakerkeeper "github.com/crescent-network/crescent/v3/x/marketmaker/keeper"
marketmakertypes "github.com/crescent-network/crescent/v3/x/marketmaker/types"
farmingkeeper "github.com/crescent-network/crescent/v4/x/farming/keeper"
farmingtypes "github.com/crescent-network/crescent/v4/x/farming/types"
liquidfarmingtypes "github.com/crescent-network/crescent/v4/x/liquidfarming/types"
liquiditykeeper "github.com/crescent-network/crescent/v4/x/liquidity/keeper"
liquiditytypes "github.com/crescent-network/crescent/v4/x/liquidity/types"
lpfarmkeeper "github.com/crescent-network/crescent/v4/x/lpfarm/keeper"
lpfarmtypes "github.com/crescent-network/crescent/v4/x/lpfarm/types"
marketmakerkeeper "github.com/crescent-network/crescent/v4/x/marketmaker/keeper"
marketmakertypes "github.com/crescent-network/crescent/v4/x/marketmaker/types"
)

const UpgradeName = "v3"
Expand Down
22 changes: 11 additions & 11 deletions app/upgrades/mainnet/v3/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

chain "github.com/crescent-network/crescent/v3/app"
v3 "github.com/crescent-network/crescent/v3/app/upgrades/mainnet/v3"
"github.com/crescent-network/crescent/v3/cmd/crescentd/cmd"
utils "github.com/crescent-network/crescent/v3/types"
"github.com/crescent-network/crescent/v3/x/farming"
farmingkeeper "github.com/crescent-network/crescent/v3/x/farming/keeper"
farmingtypes "github.com/crescent-network/crescent/v3/x/farming/types"
liquiditytypes "github.com/crescent-network/crescent/v3/x/liquidity/types"
"github.com/crescent-network/crescent/v3/x/lpfarm"
lpfarmtypes "github.com/crescent-network/crescent/v3/x/lpfarm/types"
marketmakertypes "github.com/crescent-network/crescent/v3/x/marketmaker/types"
chain "github.com/crescent-network/crescent/v4/app"
v3 "github.com/crescent-network/crescent/v4/app/upgrades/mainnet/v3"
"github.com/crescent-network/crescent/v4/cmd/crescentd/cmd"
utils "github.com/crescent-network/crescent/v4/types"
"github.com/crescent-network/crescent/v4/x/farming"
farmingkeeper "github.com/crescent-network/crescent/v4/x/farming/keeper"
farmingtypes "github.com/crescent-network/crescent/v4/x/farming/types"
liquiditytypes "github.com/crescent-network/crescent/v4/x/liquidity/types"
"github.com/crescent-network/crescent/v4/x/lpfarm"
lpfarmtypes "github.com/crescent-network/crescent/v4/x/lpfarm/types"
marketmakertypes "github.com/crescent-network/crescent/v4/x/marketmaker/types"
)

type UpgradeTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/mainnet/v4/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types"
icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"

liquiditytypes "github.com/crescent-network/crescent/v3/x/liquidity/types"
liquiditytypes "github.com/crescent-network/crescent/v4/x/liquidity/types"
)

const UpgradeName = "v4"
Expand Down
4 changes: 2 additions & 2 deletions cmd/crescentd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/crisis"
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"

chain "github.com/crescent-network/crescent/v3/app"
farmingparams "github.com/crescent-network/crescent/v3/app/params"
chain "github.com/crescent-network/crescent/v4/app"
farmingparams "github.com/crescent-network/crescent/v4/app/params"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/crescentd/cmd/testnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

chain "github.com/crescent-network/crescent/v3/app"
chain "github.com/crescent-network/crescent/v4/app"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/crescentd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

chain "github.com/crescent-network/crescent/v3/app"
"github.com/crescent-network/crescent/v3/cmd/crescentd/cmd"
chain "github.com/crescent-network/crescent/v4/app"
"github.com/crescent-network/crescent/v4/cmd/crescentd/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions config-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ init:
home: "$HOME/.crescent"
build:
ldflags:
- -X github.com/crescent-network/crescent/v3/x/farming/keeper.enableAdvanceEpoch=true
- -X github.com/crescent-network/crescent/v3/x/liquidfarming/keeper.enableAdvanceAuction=true
- -X github.com/crescent-network/crescent/v4/x/farming/keeper.enableAdvanceEpoch=true
- -X github.com/crescent-network/crescent/v4/x/liquidfarming/keeper.enableAdvanceAuction=true
proto:
path: proto
third_party_paths:
Expand Down
5 changes: 1 addition & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/crescent-network/crescent/v3
module github.com/crescent-network/crescent/v4

go 1.18

Expand Down Expand Up @@ -37,7 +37,6 @@ require (
github.com/Antonboom/nilnil v0.1.1 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
Expand Down Expand Up @@ -84,7 +83,6 @@ require (
github.com/ettle/strcase v0.1.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/structtag v1.2.0 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/firefart/nonamedreturns v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/fzipp/gocyclo v0.6.0 // indirect
Expand Down Expand Up @@ -244,7 +242,6 @@ require (
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
Expand Down
Loading

0 comments on commit 6818a77

Please sign in to comment.