Skip to content

Commit

Permalink
chore: bump app version to v19 (#3204)
Browse files Browse the repository at this point in the history
* chore: bump app version to v19

* chore: add v19 folder

* chore: use v18 as previous in upgrade test

* chore: update previous in upgrade test

* chore: update previous in upgrade test

* chore: update previous in upgrade test

* chore: update previous in upgrade test

* chore: update previous in upgrade test

* chore: update previous in upgrade test

* chore: update previous in upgrade test

* chore: update previous in upgrade test
  • Loading branch information
MSalopek authored Jul 15, 2024
1 parent f7ae190 commit 8a9bbf7
Show file tree
Hide file tree
Showing 68 changed files with 147 additions and 100 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true

# Initializes the CodeQL tools for scanning.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- uses: technote-space/[email protected]
id: git_diff
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected]
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sim-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected]
Expand All @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- uses: actions/[email protected]
with:
path: ~/go/bin
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected]
Expand All @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand All @@ -60,7 +60,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
Expand All @@ -82,7 +82,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected]
Expand All @@ -107,7 +107,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- uses: actions/checkout@v4
- uses: actions/[email protected]
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
cache: true
cache-dependency-path: go.sum
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- uses: actions/checkout@v4
- uses: technote-space/[email protected]
id: git_diff
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- uses: technote-space/[email protected]
id: git_diff
with:
Expand Down Expand Up @@ -159,11 +159,11 @@ jobs:
Makefile
- uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
# the old gaiad binary version is hardcoded, need to be updated each major release.
- name: Install Old Gaiad
run: |
git checkout v17.0.0
git checkout v18.1.0
make build
cp ./build/gaiad ./build/gaiadold
go clean -modcache
Expand Down
2 changes: 1 addition & 1 deletion ante/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

gaiaerrors "github.com/cosmos/gaia/v18/types/errors"
gaiaerrors "github.com/cosmos/gaia/v19/types/errors"
)

// UseFeeMarketDecorator to make the integration testing easier: we can switch off its ante and post decorators with this flag
Expand Down
2 changes: 1 addition & 1 deletion ante/gov_expedited_ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"

gaiaerrors "github.com/cosmos/gaia/v18/types/errors"
gaiaerrors "github.com/cosmos/gaia/v19/types/errors"
)

var expeditedPropDecoratorEnabled = true
Expand Down
4 changes: 2 additions & 2 deletions ante/gov_expedited_ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/cosmos/gaia/v18/ante"
"github.com/cosmos/gaia/v18/app/helpers"
"github.com/cosmos/gaia/v19/ante"
"github.com/cosmos/gaia/v19/app/helpers"
)

func TestGovExpeditedProposalsDecorator(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ante/gov_vote_ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

gaiaerrors "github.com/cosmos/gaia/v18/types/errors"
gaiaerrors "github.com/cosmos/gaia/v19/types/errors"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions ante/gov_vote_ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/cosmos/gaia/v18/ante"
"github.com/cosmos/gaia/v18/app/helpers"
"github.com/cosmos/gaia/v19/ante"
"github.com/cosmos/gaia/v19/app/helpers"
)

// Test that the GovVoteDecorator rejects v1beta1 vote messages from accounts with less than 1 atom staked
Expand Down
12 changes: 6 additions & 6 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@ import (
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

gaiaante "github.com/cosmos/gaia/v18/ante"
"github.com/cosmos/gaia/v18/app/keepers"
"github.com/cosmos/gaia/v18/app/params"
"github.com/cosmos/gaia/v18/app/upgrades"
v18 "github.com/cosmos/gaia/v18/app/upgrades/v18"
gaiaante "github.com/cosmos/gaia/v19/ante"
"github.com/cosmos/gaia/v19/app/keepers"
"github.com/cosmos/gaia/v19/app/params"
"github.com/cosmos/gaia/v19/app/upgrades"
v19 "github.com/cosmos/gaia/v19/app/upgrades/v19"
)

var (
// DefaultNodeHome default home directories for the application daemon
DefaultNodeHome string

Upgrades = []upgrades.Upgrade{v18.Upgrade}
Upgrades = []upgrades.Upgrade{v19.Upgrade}
)

var (
Expand Down
4 changes: 2 additions & 2 deletions app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"

gaia "github.com/cosmos/gaia/v18/app"
gaiahelpers "github.com/cosmos/gaia/v18/app/helpers"
gaia "github.com/cosmos/gaia/v19/app"
gaiahelpers "github.com/cosmos/gaia/v19/app/helpers"
)

type EmptyAppOptions struct{}
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gaia
import (
"github.com/cosmos/cosmos-sdk/std"

"github.com/cosmos/gaia/v18/app/params"
"github.com/cosmos/gaia/v19/app/params"
)

func RegisterEncodingConfig() params.EncodingConfig {
Expand Down
2 changes: 1 addition & 1 deletion app/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gaia
import (
"encoding/json"

"github.com/cosmos/gaia/v18/app/params"
"github.com/cosmos/gaia/v19/app/params"
)

// The genesis state of the blockchain is represented here as a map of raw json
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"

gaiaapp "github.com/cosmos/gaia/v18/app"
gaiaapp "github.com/cosmos/gaia/v19/app"
)

// SimAppChainID hardcoded chainID for simulation
Expand Down
6 changes: 3 additions & 3 deletions app/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ import (
wasm "github.com/CosmWasm/wasmd/x/wasm"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

gaiaappparams "github.com/cosmos/gaia/v18/app/params"
"github.com/cosmos/gaia/v18/x/metaprotocols"
metaprotocolstypes "github.com/cosmos/gaia/v18/x/metaprotocols/types"
gaiaappparams "github.com/cosmos/gaia/v19/app/params"
"github.com/cosmos/gaia/v19/x/metaprotocols"
metaprotocolstypes "github.com/cosmos/gaia/v19/x/metaprotocols/types"
)

var maccPerms = map[string][]string{
Expand Down
2 changes: 1 addition & 1 deletion app/post.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/cosmos/gaia/v18/ante"
"github.com/cosmos/gaia/v19/ante"
)

// PostHandlerOptions are the options required for constructing a FeeMarket PostHandler.
Expand Down
4 changes: 2 additions & 2 deletions app/sim/sim_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

gaia "github.com/cosmos/gaia/v18/app"
"github.com/cosmos/gaia/v18/app/params"
gaia "github.com/cosmos/gaia/v19/app"
"github.com/cosmos/gaia/v19/app/params"
)

// Simulation parameter constants
Expand Down
2 changes: 1 addition & 1 deletion app/sim/sim_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"

gaia "github.com/cosmos/gaia/v18/app"
gaia "github.com/cosmos/gaia/v19/app"
)

// SimulationOperations retrieves the simulation params from the provided file path
Expand Down
4 changes: 2 additions & 2 deletions app/sim_bench_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/simulation"
simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"

gaia "github.com/cosmos/gaia/v18/app"
"github.com/cosmos/gaia/v18/app/sim"
gaia "github.com/cosmos/gaia/v19/app"
"github.com/cosmos/gaia/v19/app/sim"
)

// Profile with:
Expand Down
6 changes: 3 additions & 3 deletions app/sim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"github.com/cosmos/cosmos-sdk/x/simulation"
simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"

"github.com/cosmos/gaia/v18/ante"
gaia "github.com/cosmos/gaia/v18/app"
"github.com/cosmos/gaia/v19/ante"
gaia "github.com/cosmos/gaia/v19/app"
// "github.com/cosmos/gaia/v11/app/helpers"
// "github.com/cosmos/gaia/v11/app/params"
"github.com/cosmos/gaia/v18/app/sim"
"github.com/cosmos/gaia/v19/app/sim"
)

// AppChainID hardcoded chainID for simulation
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/cosmos/gaia/v18/app/keepers"
"github.com/cosmos/gaia/v19/app/keepers"
)

// Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v10/constants.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v10

import (
"github.com/cosmos/gaia/v18/app/upgrades"
"github.com/cosmos/gaia/v19/app/upgrades"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v10/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/cosmos/gaia/v18/app/keepers"
"github.com/cosmos/gaia/v19/app/keepers"
)

func CreateUpgradeHandler(
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v11/constants.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v11

import (
"github.com/cosmos/gaia/v18/app/upgrades"
"github.com/cosmos/gaia/v19/app/upgrades"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v11/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/cosmos/gaia/v18/app/keepers"
"github.com/cosmos/gaia/v19/app/keepers"
)

func CreateUpgradeHandler(
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v12/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v12
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/cosmos/gaia/v18/app/upgrades"
"github.com/cosmos/gaia/v19/app/upgrades"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v12/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/cosmos/gaia/v18/app/keepers"
"github.com/cosmos/gaia/v19/app/keepers"
)

func CreateUpgradeHandler(
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v13/constants.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v13

import (
"github.com/cosmos/gaia/v18/app/upgrades"
"github.com/cosmos/gaia/v19/app/upgrades"
)

const (
Expand Down
Loading

0 comments on commit 8a9bbf7

Please sign in to comment.