Feat/v0.50.x cosmos sdk upgrade

.editorconfig

@@ -23,5 +23,8 @@ indent_size = 2
 [*.proto]
 indent_size = 2
 
+[*.sh]
+indent_size = 2
+
 [*.go]
 indent_style = tab

.github/workflows/build.yml

@@ -52,10 +52,6 @@ jobs:
           files: |
             proto/**/*.proto
 
-      - name: Setup buf
-        if: steps.changed-proto-files.outputs.any_changed == 'true'
-        uses: bufbuild/[email protected]
-
       - name: Build and generate proto
         if: steps.changed-proto-files.outputs.any_changed == 'true'
         run: |

.github/workflows/test-e2e.yml

@@ -1,12 +1,12 @@
 name: Test E2E
 
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+on: {}
+#  push:
+#    branches:
+#      - main
+#  pull_request:
+#    branches:
+#      - main
 
 concurrency:
   group: e2e-test-${{ github.ref }}

.golangci.yml

@@ -14,7 +14,6 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
-    - contextcheck
     - cyclop
     - dupl
     - durationcheck

Dockerfile

@@ -4,14 +4,14 @@ FROM golang:1.21-alpine3.17 AS go-builder
 WORKDIR /src
 
 # CosmWasm: see https://github.com/CosmWasm/wasmvm/releases
-ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.4/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
-ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.4/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
+ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.5.0/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
+ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.5.0/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
 
 # hadolint ignore=DL4006
 RUN set -eux \
     && apk add --no-cache ca-certificates=20230506-r0 build-base=0.5-r3 git=2.38.5-r0 linux-headers=5.19.5-r0 \
-    && sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 682a54082e131eaff9beec80ba3e5908113916fcb8ddf7c668cb2d97cb94c13c \
-    && sha256sum /lib/libwasmvm_muslc.x86_64.a | grep ce3d892377d2523cf563e01120cb1436f9343f80be952c93f66aa94f5737b661 \
+    && sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 2687afbdae1bc6c7c8b05ae20dfb8ffc7ddc5b4e056697d0f37853dfe294e913 \
+    && sha256sum /lib/libwasmvm_muslc.x86_64.a | grep 465e3a088e96fd009a11bfd234c69fb8a0556967677e54511c084f815cf9ce63 \
     && cp "/lib/libwasmvm_muslc.$(uname -m).a" /lib/libwasmvm_muslc.a
 
 COPY . /src/

Makefile

@@ -11,7 +11,10 @@ LEDGER_ENABLED         ?= true
 # Docker images
 DOCKER_IMAGE_GOLANG		  = golang:1.21-alpine3.17
 DOCKER_IMAGE_GOLANG_CI    = golangci/golangci-lint:v1.54
-DOCKER_IMAGE_BUF  		  = okp4/buf-cosmos:1.4.7
+DOCKER_IMAGE_PROTO        = ghcr.io/cosmos/proto-builder:0.14.0
+DOCKER_IMAGE_BUF          = bufbuild/buf:1.4.0
+DOCKER_PROTO_RUN          := docker run --rm --user $(id -u):$(id -g) -v $(HOME)/.cache:/root/.cache -v $(PWD):/workspace --workdir /workspace $(DOCKER_IMAGE_PROTO)
+DOCKER_BUF_RUN            := docker run --rm -v $(HOME)/.cache:/root/.cache -v $(PWD):/workspace --workdir /workspace $(DOCKER_IMAGE_BUF)
 DOCKER_BUILDX_BUILDER     = okp4-builder
 DOCKER_IMAGE_MARKDOWNLINT = thegeeklab/markdownlint-cli:0.32.2
 DOCKER_IMAGE_GOTEMPLATE   = hairyhenderson/gomplate:v3.11.3-alpine
@@ -124,18 +127,7 @@ lint-go: ## Lint go source code
 .PHONY: lint-proto
 lint-proto: ## Lint proto files
 	@echo "${COLOR_CYAN}🔍️ lint proto${COLOR_RESET}"
-	@docker run --rm \
-		-v ${HOME}/.cache:/root/.cache \
-  		-v `pwd`:/proto \
-  		-w /proto \
-  		${DOCKER_IMAGE_BUF} \
-  		lint proto -v
-	@docker run --rm \
- 		-v ${HOME}/.cache:/root/.cache \
-   		-v `pwd`:/proto \
-   		-w /proto \
-   		${DOCKER_IMAGE_BUF} \
-   		format -d --exit-code
+	@$(DOCKER_BUF_RUN) lint proto -v
 
 ## Format:
 .PHONY: format
@@ -154,12 +146,7 @@ format-go: ## Format go files
 .PHONY: format-proto
 format-proto: ## Format proto files
 	@echo "${COLOR_CYAN}📐 Formatting proto files${COLOR_RESET}"
-	@docker run --rm \
-		-v ${HOME}/.cache:/root/.cache \
-  		-v `pwd`:/proto \
-  		-w /proto \
-  		${DOCKER_IMAGE_BUF} \
-  		format -w
+	@$(DOCKER_BUF_RUN) format -w
 
 ## Build:
 .PHONY: build
@@ -226,18 +213,18 @@ chain-init: build ## Initialize the blockchain with default settings.
 	      --keyring-backend test \
 	      --home "${CHAIN_HOME}"; \
 	\
-	${CHAIN_BINARY} add-genesis-account validator 1000000000uknow \
+	${CHAIN_BINARY} genesis add-genesis-account validator 1000000000uknow \
 	  --keyring-backend test \
 	  --home "${CHAIN_HOME}"; \
 	\
 	NODE_ID=`${CHAIN_BINARY} tendermint show-node-id --home ${CHAIN_HOME}`; \
-	${CHAIN_BINARY} gentx validator 1000000uknow \
+	${CHAIN_BINARY} genesis gentx validator 1000000uknow \
 	  --node-id $$NODE_ID \
 	  --chain-id=okp4-${CHAIN} \
 	  --keyring-backend test \
       --home "${CHAIN_HOME}"; \
 	\
-	${CHAIN_BINARY} collect-gentxs \
+	${CHAIN_BINARY} genesis collect-gentxs \
 	  --home "${CHAIN_HOME}"
 
 chain-start: build ## Start the blockchain with existing configuration (see chain-init)
@@ -316,54 +303,24 @@ clean: ## Remove all the files from the target folder
 
 ## Proto:
 .PHONY: proto
-proto: proto-format lint-proto proto-build proto-gen doc-proto ## Generate all resources for proto files (go, doc, etc.)
-
-.PHONY: proto-format
-proto-format: ## Format Protobuf files
-	@echo "${COLOR_CYAN} 📐 Formatting Protobuf files${COLOR_RESET}"
-	@docker run --rm \
-    		-v ${HOME}/.cache:/root/.cache \
-    		-v `pwd`:/proto \
-    		-w /proto \
-    		${DOCKER_IMAGE_BUF} \
-    		format -w -v
-
-.PHONY: proto-build
-proto-build: ## Build all Protobuf files
-	@echo "${COLOR_CYAN} 🔨️Build Protobuf files${COLOR_RESET}"
-	@docker run --rm \
-		-v ${HOME}/.cache:/root/.cache \
-		-v `pwd`:/proto \
-		-w /proto \
-		${DOCKER_IMAGE_BUF} \
-		build proto -v
+proto: format-proto lint-proto proto-gen doc-proto ## Generate all resources for proto files (go, doc, etc.)
 
 .PHONY: proto-gen
-proto-gen: proto-build ## Generate all the code from the Protobuf files
+proto-gen: ## Generate all the code from the Protobuf files
 	@echo "${COLOR_CYAN} 📝 Generating code from Protobuf files${COLOR_RESET}"
-	@docker run --rm \
-		-v ${HOME}/.cache:/root/.cache \
-		-v `pwd`:/proto \
-		-w /proto \
-		${DOCKER_IMAGE_BUF} \
-		generate proto --template buf.gen.proto.yaml -v
-	@cp -r github.com/okp4/okp4d/x/* x/
-	@sudo rm -rf github.com
+	@$(DOCKER_PROTO_RUN) sh ./scripts/protocgen-code.sh
+
 
 ## Documentation:
 .PHONY: doc
 doc: doc-proto doc-command doc-predicate ## Generate all the documentation
 
 .PHONY: doc-proto
 doc-proto: proto-gen ## Generate the documentation from the Protobuf files
+	@echo "${COLOR_CYAN} 📝 Generating doc from Protobuf files${COLOR_RESET}"
+	@$(DOCKER_PROTO_RUN) sh ./scripts/protocgen-doc.sh
 	@for MODULE in $(shell find proto -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq | xargs dirname) ; do \
 		echo "${COLOR_CYAN} 📖 Generate documentation for $${MODULE} module${COLOR_RESET}" ; \
-  		docker run --rm \
-        		-v ${HOME}/.cache:/root/.cache \
-        		-v `pwd`:/proto \
-        		-w /proto \
-        		${DOCKER_IMAGE_BUF} \
-        		generate --path $${MODULE} --template buf.gen.doc.yaml -v ; \
         DEFAULT_DATASOURCE="./docs/proto/templates/default.yaml" ; \
         MODULE_DATASOURCE="merge:./$${MODULE}/docs.yaml|$${DEFAULT_DATASOURCE}" ; \
         DATASOURCE="docs=`[ -f $${MODULE}/docs.yaml ] && echo $$MODULE_DATASOURCE || echo $${DEFAULT_DATASOURCE}`" ; \
@@ -372,8 +329,7 @@ doc-proto: proto-gen ## Generate the documentation from the Protobuf files
 				-v `pwd`:/usr/src/okp4d \
 				-w /usr/src/okp4d \
 				${DOCKER_IMAGE_GOTEMPLATE} \
-				-d $$DATASOURCE -f docs/proto/docs.md -o docs/$${MODULE}.md ; \
-		rm -f docs/proto/docs.md ; \
+				-d $$DATASOURCE -f docs/$${MODULE}.md -o docs/$${MODULE}.md ; \
 	done
 	@docker run --rm \
 	  -v `pwd`:/usr/src/okp4d \
@@ -420,7 +376,7 @@ mock: ## Generate all the mocks (for tests)
 	@mockgen -source=x/mint/types/expected_keepers.go -package testutil -destination x/mint/testutil/expected_keepers_mocks.go
 	@mockgen -source=x/vesting/types/expected_keepers.go -package testutil -destination x/vesting/testutil/expected_keepers_mocks.go
 	@mockgen -source=x/logic/types/expected_keepers.go -package testutil -destination x/logic/testutil/expected_keepers_mocks.go
-	@mockgen -destination x/logic/testutil/gas_mocks.go -package testutil github.com/cosmos/cosmos-sdk/store/types GasMeter
+	@mockgen -destination x/logic/testutil/gas_mocks.go -package testutil cosmossdk.io/store/types GasMeter
 
 ## Release:
 .PHONY: release-assets

app/ante.go

@@ -1,45 +1,49 @@
 package app
 
 import (
+	"errors"
+
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	errorsmod "cosmossdk.io/errors"
+	corestoretypes "cosmossdk.io/core/store"
+	circuitante "cosmossdk.io/x/circuit/ante"
+	circuitkeeper "cosmossdk.io/x/circuit/keeper"
 
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
-	"github.com/cosmos/ibc-go/v7/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
+	"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
 
-	IBCKeeper         *keeper.Keeper
-	WasmConfig        *wasmTypes.WasmConfig
-	TXCounterStoreKey storetypes.StoreKey
+	IBCKeeper             *keeper.Keeper
+	WasmConfig            *wasmTypes.WasmConfig
+	WasmKeeper            *wasmkeeper.Keeper
+	TXCounterStoreService corestoretypes.KVStoreService
+	CircuitKeeper         *circuitkeeper.Keeper
 }
 
 func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	if options.AccountKeeper == nil {
-		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for AnteHandler")
+		return nil, errors.New("account keeper is required for AnteHandler")
 	}
 	if options.BankKeeper == nil {
-		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper is required for AnteHandler")
+		return nil, errors.New("bank keeper is required for AnteHandler")
 	}
 	if options.SignModeHandler == nil {
-		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
+		return nil, errors.New("sign mode handler is required for ante builder")
 	}
 	if options.WasmConfig == nil {
-		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
+		return nil, errors.New("wasm config is required for ante builder")
 	}
-	if options.TXCounterStoreKey == nil {
-		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "tx counter key is required for ante builder")
+	if options.TXCounterStoreService == nil {
+		return nil, errors.New("wasm store service is required for ante builder")
 	}
 
 	sigGasConsumer := options.SigGasConsumer
@@ -50,7 +54,9 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	anteDecorators := []sdk.AnteDecorator{
 		ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
 		wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit), // after setup context to enforce limits early
-		wasmkeeper.NewCountTXDecorator(options.TXCounterStoreKey),
+		wasmkeeper.NewCountTXDecorator(options.TXCounterStoreService),
+		wasmkeeper.NewGasRegisterDecorator(options.WasmKeeper.GetGasRegister()),
+		circuitante.NewCircuitBreakerDecorator(options.CircuitKeeper),
 		ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
 		ante.NewValidateBasicDecorator(),
 		ante.NewTxTimeoutHeightDecorator(),