Merge pull request #731 from comdex-official/feature/dev

Feature/dev

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v3.5.0
+        uses: actions/setup-go@v4.0.0
         with:
           go-version: ^1.18
         id: go

.github/workflows/codeql-analysis.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
-    - uses: actions/setup-go@v3.5.0
+    - uses: actions/setup-go@v4.0.0
       with:
         go-version: 1.18
     # Initializes the CodeQL tools for scanning.

.github/workflows/golangci-lint.yml

@@ -17,7 +17,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3.5.0
+      - uses: actions/setup-go@v4.0.0
         with:
           go-version: 1.19 # we run the linter with go 1.19 to match dev laptops even though we use 1.18 for the chain (don't update the chain to 1.19 please-- there is an issue in golang causing 1.19 to output some hashes differently from 1.18)
       - uses: actions/checkout@v3

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
           - os: macos-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v3.5.0
+        uses: actions/setup-go@v4.0.0
         with:
           go-version: ^1.18
         id: go

.github/workflows/test.yml

@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Setup Golang
-        uses: actions/setup-go@v3.5.0
+        uses: actions/setup-go@v4.0.0
         with:
           go-version: 1.18
       -

Makefile

@@ -23,6 +23,7 @@ BUILDDIR ?= $(CURDIR)/build
 GOBIN = $(shell go env GOPATH)/bin
 GOARCH = $(shell go env GOARCH)
 GOOS = $(shell go env GOOS)
+GO_MINOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
 
 export GO111MODULE = on
 
@@ -92,6 +93,11 @@ endif
 
 #$(info $$BUILD_FLAGS is [$(BUILD_FLAGS)])
 
+check_version:
+ifneq ($(GO_MINOR_VERSION),19)
+	@echo "ERROR: Please upgrade Go version to 1.19+"
+	exit 1
+endif
 
 all: install
 	@echo "--> project root: go mod tidy"
@@ -111,7 +117,7 @@ clean:
 distclean: clean
 	rm -rf vendor/
 
-install: go.sum
+install: check_version go.sum
 	@echo "--> installing"
 	go install -mod=readonly $(BUILD_FLAGS) ./cmd/comdex
 

app/app.go

@@ -1219,7 +1219,7 @@ func (a *App) ModuleAccountsPermissions() map[string][]string {
 func (a *App) registerUpgradeHandlers() {
 	a.UpgradeKeeper.SetUpgradeHandler(
 		mv10.UpgradeName,
-		mv10.CreateUpgradeHandlerV10(a.mm, a.configurator, a.LiquidityKeeper, a.AssetKeeper, a.BankKeeper, a.ICAHostKeeper),
+		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