Skip to content

Commit

Permalink
upgrade v10 for main net, update go version on ymls
Browse files Browse the repository at this point in the history
  • Loading branch information
dheerajkd30 committed Apr 19, 2023
1 parent e1885d3 commit 2d58e73
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/[email protected]
with:
go-version: ^1.18
go-version: ^1.19
id: go

- name: Check out code into the Go module directory˛˜
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/[email protected]
with:
go-version: 1.18
go-version: 1.19
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/[email protected]
with:
go-version: ^1.18
go-version: ^1.19
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
name: Setup Golang
uses: actions/[email protected]
with:
go-version: 1.18
go-version: 1.19
-
name: Display go version
run: go version
Expand Down
8 changes: 4 additions & 4 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ import (

cwasm "github.com/comdex-official/comdex/app/wasm"

tv10 "github.com/comdex-official/comdex/app/upgrades/testnet/v10"
mv10 "github.com/comdex-official/comdex/app/upgrades/mainnet/v10"
)

const (
Expand Down Expand Up @@ -1212,8 +1212,8 @@ func (a *App) ModuleAccountsPermissions() map[string][]string {

func (a *App) registerUpgradeHandlers() {
a.UpgradeKeeper.SetUpgradeHandler(
tv10.UpgradeName,
tv10.CreateUpgradeHandlerV10(a.mm, a.configurator),
mv10.UpgradeName,
mv10.CreateUpgradeHandlerV10(a.mm, a.configurator, a.LiquidityKeeper, a.AssetKeeper, a.BankKeeper, a.AccountKeeper, a.Rewardskeeper, a.ICAHostKeeper),
)
// When a planned update height is reached, the old binary will panic
// writing on disk the height and name of the update that triggered it
Expand All @@ -1236,7 +1236,7 @@ func (a *App) registerUpgradeHandlers() {
func upgradeHandlers(upgradeInfo storetypes.UpgradeInfo, a *App, storeUpgrades *storetypes.StoreUpgrades) *storetypes.StoreUpgrades {
switch {

case upgradeInfo.Name == tv10.UpgradeName && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
case upgradeInfo.Name == mv10.UpgradeName && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
storeUpgrades = &storetypes.StoreUpgrades{}
}

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

const (
UpgradeName = "v10.0.0"
UpgradeName = "v10.2.0"
UpgradeHeight = ""
UpgradeInfo = `'{
"binaries": {
Expand Down

0 comments on commit 2d58e73

Please sign in to comment.