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

set of bumps #230

Merged
merged 5 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v4
with:
go-version: 1.20.0
go-version: '1.21'
- run: go build ./...

tidy:
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v4
with:
go-version: 1.20.0
go-version: '1.21'
- run: |
go mod tidy
CHANGES_IN_REPO=$(git status --porcelain)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-cosmos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: 1.20.0
go-version: '1.21'
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: 1.20.0
go-version: '1.21'
- uses: actions/checkout@v4


- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.20.0
go-version: '1.21'
- name: Checkout code
uses: actions/checkout@v4
- name: Test
Expand Down
7 changes: 4 additions & 3 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ import (
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/router"
routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/router/keeper"
routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/router/types"
ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts"
icacontroller "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller"
icacontrollerkeeper "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/keeper"
Expand All @@ -95,9 +98,6 @@ import (
ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
ibcmock "github.com/cosmos/ibc-go/v6/testing/mock"
"github.com/strangelove-ventures/packet-forward-middleware/v6/router"
routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v6/router/keeper"
routertypes "github.com/strangelove-ventures/packet-forward-middleware/v6/router/types"
bank "github.com/terra-money/alliance/custom/bank"
custombankkeeper "github.com/terra-money/alliance/custom/bank/keeper"
alliancemodule "github.com/terra-money/alliance/x/alliance"
Expand Down Expand Up @@ -1055,6 +1055,7 @@ func (app *MigalooApp) setupUpgradeHandlers(cfg module.Configurator) {
currentHeight := app.CommitMultiStore().LastCommitID().Version

for _, upgrade := range Upgrades {
upgrade := upgrade
if upgradeInfo.Name == upgrade.UpgradeName {
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgrade.StoreUpgrades))
}
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v2_2_5/constants.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v2_2_5
package v2_2_5 //nolint:revive // skip linter for this package name

import (
"github.com/White-Whale-Defi-Platform/migaloo-chain/v2/app/upgrades"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v2_2_5/upgrades.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v2_2_5
package v2_2_5 //nolint:revive // skip linter for this package name

import (
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
module github.com/White-Whale-Defi-Platform/migaloo-chain/v2

go 1.20
go 1.21

require (
cosmossdk.io/math v1.0.1
cosmossdk.io/math v1.1.2
github.com/CosmWasm/wasmd v0.30.0
github.com/cosmos/cosmos-sdk v0.46.13
github.com/cosmos/cosmos-sdk v0.46.15
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.0
github.com/cosmos/ibc-go/v6 v6.2.0
github.com/cosmos/interchain-accounts v0.4.3
github.com/gorilla/mux v1.8.0
Expand All @@ -14,8 +15,7 @@ require (
github.com/spf13/cast v1.5.0
github.com/spf13/cobra v1.6.1
github.com/spf13/viper v1.15.0
github.com/strangelove-ventures/packet-forward-middleware/v6 v6.0.3
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.4
github.com/tendermint/tendermint v0.34.29
github.com/tendermint/tm-db v0.6.8-0.20221109095132-774cdfe7e6b0
github.com/terra-money/alliance v0.1.2
Expand Down Expand Up @@ -95,7 +95,7 @@ require (
github.com/gtank/merlin v0.1.1 // indirect
github.com/gtank/ristretto255 v0.1.2 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter v1.7.0 // indirect
github.com/hashicorp/go-getter v1.7.1 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
Expand Down
Loading
Loading