SDK v50, common module addition

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/[email protected]
         with:
-          go-version: 1.20.5
+          go-version: 1.21.6
         id: go
 
       - name: Check out code into the Go module directory˛˜ 

.github/workflows/codeql-analysis.yml

@@ -19,7 +19,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/[email protected]
       with:
-        go-version: 1.20.5
+        go-version: 1.21.6
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/golangci-lint.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
         with:
-          go-version: 1.20.5 # we run the linter with go 1.20 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)
+          go-version: 1.21.6 # we run the linter with go 1.20 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
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/[email protected]
         with:
-          go-version: 1.20.5
+          go-version: 1.21.6
         id: go
 
       - name: Check out code into the Go module directory

.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
         name: Setup Golang
         uses: actions/[email protected]
         with:
-          go-version: 1.20.5
+          go-version: 1.21.6
       -
         name: Display go version
         run: go version

Makefile

@@ -94,8 +94,8 @@ endif
 #$(info $$BUILD_FLAGS is [$(BUILD_FLAGS)])
 
 check_version:
-ifneq ($(GO_MINOR_VERSION),20)
-	@echo "ERROR: Please upgrade Go version to 1.20+"
+ifneq ($(GO_MINOR_VERSION),21)
+	@echo "ERROR: Please upgrade Go version to 1.21+"
 	exit 1
 endif
 
@@ -190,7 +190,7 @@ endif
 ###                                Protobuf                                 ###
 ###############################################################################
 
-protoVer=0.13.0
+protoVer=0.14.0
 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
 protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 

app/ante.go

@@ -1,6 +1,8 @@
 package app
 
 import (
+	corestoretypes "cosmossdk.io/core/store"
+	errorsmod "cosmossdk.io/errors"
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	"github.com/comdex-official/comdex/app/decorators"
@@ -9,31 +11,31 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
 // channel keeper.
 type HandlerOptions struct {
 	ante.HandlerOptions
-	wasmConfig        wasm.Config
-	txCounterStoreKey storetypes.StoreKey
-	IBCChannelKeeper  *ibckeeper.Keeper
-	GovKeeper         govkeeper.Keeper
-	Cdc               codec.BinaryCodec
+	wasmConfig            wasm.Config
+	WasmKeeper            *wasmkeeper.Keeper
+	TXCounterStoreService corestoretypes.KVStoreService
+	IBCChannelKeeper      *ibckeeper.Keeper
+	GovKeeper             govkeeper.Keeper
+	Cdc                   codec.BinaryCodec
 }
 
 func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	if options.AccountKeeper == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for AnteHandler")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for AnteHandler")
 	}
 	if options.BankKeeper == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for AnteHandler")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper is required for AnteHandler")
 	}
 	if options.SignModeHandler == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
 	}
 
 	sigGasConsumer := options.SigGasConsumer
@@ -44,7 +46,8 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	anteDecorators := []sdk.AnteDecorator{
 		ante.NewSetUpContextDecorator(),
 		wasmkeeper.NewLimitSimulationGasDecorator(options.wasmConfig.SimulationGasLimit),
-		wasmkeeper.NewCountTXDecorator(options.txCounterStoreKey),
+		wasmkeeper.NewCountTXDecorator(options.TXCounterStoreService),
+		wasmkeeper.NewGasRegisterDecorator(options.WasmKeeper.GetGasRegister()),
 		decorators.NewGovPreventSpamDecorator(options.Cdc, options.GovKeeper),
 		ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
 		ante.NewValidateBasicDecorator(),