diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6188f4796..85d0d44ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4.0.0 with: - go-version: ^1.18 + go-version: ^1.19 id: go - name: Check out code into the Go module directory˛˜ diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 46e2a902c..eb9e2a2dc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v3 - uses: actions/setup-go@v4.0.0 with: - go-version: 1.18 + go-version: 1.19 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9692c846..d573f565f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4.0.0 with: - go-version: ^1.18 + go-version: ^1.19 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d5f40c196..0a498cb4b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: name: Setup Golang uses: actions/setup-go@v4.0.0 with: - go-version: 1.18 + go-version: 1.19 - name: Display go version run: go version diff --git a/app/app.go b/app/app.go index 3b1561c82..1cc3c6d2a 100644 --- a/app/app.go +++ b/app/app.go @@ -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 ( @@ -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 @@ -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{} } diff --git a/app/upgrades/mainnet/v10/constants.go b/app/upgrades/mainnet/v10/constants.go index 638b42bdf..b0bd337d4 100644 --- a/app/upgrades/mainnet/v10/constants.go +++ b/app/upgrades/mainnet/v10/constants.go @@ -1,7 +1,7 @@ package v10 const ( - UpgradeName = "v10.0.0" + UpgradeName = "v10.2.0" UpgradeHeight = "" UpgradeInfo = `'{ "binaries": {