v047 upgrade

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: cimg/go:1.20.2
+      - image: cimg/go:1.21.5
     steps:
       - checkout
       - run:
@@ -16,13 +16,13 @@ jobs:
           name: Check libwasmvm version
           command: |
             LIBWASMVM_VERSION=$(./build/noisd query wasm libwasmvm-version)
-            if [[ "$LIBWASMVM_VERSION" != "1.2.6" ]] ; then
+            if [[ "$LIBWASMVM_VERSION" != "1.5.2" ]] ; then
               echo "Got unexpected libwasmvm version: $LIBWASMVM_VERSION"
               exit 1
             fi
   tidy:
     docker:
-      - image: cimg/go:1.20.2
+      - image: cimg/go:1.21.5
     steps:
       - checkout
       - run:
@@ -39,7 +39,7 @@ jobs:
             fi
   format-go:
     docker:
-      - image: cimg/go:1.20.2
+      - image: cimg/go:1.21.5
     steps:
       - run:
           name: Install gofumpt
@@ -55,7 +55,7 @@ jobs:
             [ "$(gofumpt -l .)" = "" ] || (gofumpt -d . && exit 1)
   docker-image:
     docker:
-      - image: cimg/go:1.20.2
+      - image: cimg/go:1.21.5
     steps:
       - checkout
       - setup_remote_docker:

.github/dependabot.yml

@@ -7,10 +7,7 @@ updates:
     time: "10:00"
   open-pull-requests-limit: 10
   ignore:
-    - dependency-name: "github.com/informalsystems/tendermint"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-  ignore:
-    - dependency-name: "github.com/tendermint/tendermint"
+    - dependency-name: "github.com/cometbft/cometbft"
       update-types: ["version-update:semver-major", "version-update:semver-minor"]
   ignore:
     - dependency-name: "github.com/cosmos/cosmos-sdk"

.gitignore

@@ -1,2 +1,5 @@
 bin/
 build/
+
+# MacOS
+.DS_Store

Dockerfile

@@ -6,7 +6,7 @@
 #   show version:       docker run --rm noislabs/noisd:manual
 #   libwasmvm version:  docker run --rm noislabs/noisd:manual noisd query wasm libwasmvm-version
 #   shell:              docker run --rm -it noislabs/noisd:manual sh
-FROM golang:1.20.2-alpine3.17 AS go-builder
+FROM golang:1.21.5-alpine3.17 AS go-builder
 
 # this comes from standard alpine nightly file
 #  https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
@@ -23,11 +23,11 @@ RUN APK_ARCH="$(apk --print-arch)"; \
   echo "Detected architecture: $APK_ARCH"; \
   case "$APK_ARCH" in \
     aarch64) \
-      wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.6/libwasmvm_muslc.aarch64.a \
-        && sha256sum /lib/libwasmvm_muslc.a | grep 1014ebcce48bd7b019f66798ec8dbb42b383f324038296c64de35bdbf5f28243 ;; \
+      wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.5.2/libwasmvm_muslc.aarch64.a \
+        && sha256sum /lib/libwasmvm_muslc.a | grep e78b224c15964817a3b75a40e59882b4d0e06fd055b39514d61646689cef8c6e ;; \
     x86_64) \
-      wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.6/libwasmvm_muslc.x86_64.a \
-        && sha256sum /lib/libwasmvm_muslc.a | grep d93b02f34d2da0aa7f20786add8abdca8224334db541f954d28fad64641b9136 ;; \
+      wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.5.2/libwasmvm_muslc.x86_64.a \
+        && sha256sum /lib/libwasmvm_muslc.a | grep e660a38efb2930b34ee6f6b0bb12730adccb040b6ab701b8f82f34453a426ae7 ;; \
   esac;
 
 WORKDIR /code

Makefile

@@ -1,12 +1,12 @@
-.PHONY: build proto check_go_version install
+.PHONY: build proto install
 #!/usr/bin/make -f
 
 PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
 VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
 COMMIT := $(shell git log -1 --format='%H')
 LEDGER_ENABLED ?= true
 SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed  's/ /\@/g')
-TM_VERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::')
+TM_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
 BUILDDIR ?= $(CURDIR)/build
 DOCKER := $(shell which docker)
 
@@ -60,7 +60,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=nois \
 		  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 		  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
 		  -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
-		  -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TM_VERSION)
+		  -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(TM_VERSION)
 
 ifeq (cleveldb,$(findstring cleveldb,$(NOIS_BUILD_OPTIONS)))
   ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=cleveldb
@@ -82,24 +82,17 @@ ifeq (,$(findstring nostrip,$(NOIS_BUILD_OPTIONS)))
   BUILD_FLAGS += -trimpath
 endif
 
-check_go_version:
-ifeq ($(GO_MINOR_VERSION),19)
-	@echo "Go version: $(GO_MAJOR_VERSION).$(GO_MINOR_VERSION). Ok."
-else ifeq ($(GO_MINOR_VERSION),20)
-	@echo "Go version: $(GO_MAJOR_VERSION).$(GO_MINOR_VERSION). Ok."
-else ifeq ($(GO_MINOR_VERSION),21)
-	@echo "Go version: $(GO_MAJOR_VERSION).$(GO_MINOR_VERSION). Ok."
-else
-	@echo "ERROR: Go version 1.19, 1.20 or 1.21 is required for this version of Nois"
-	exit 1
-endif
+# Show the version that `make build` is using
+.PHONY: version
+version:
+	@echo "$(VERSION)"
 
 all: install
 
-install: check_go_version
+install:
 	go install -mod=readonly $(BUILD_FLAGS) ./cmd/noisd
 
-build: check_go_version
+build:
 	go build $(BUILD_FLAGS) -o build/noisd ./cmd/noisd
 
 go.sum: go.mod
@@ -135,28 +128,26 @@ BUF_IMAGE=bufbuild/buf@sha256:3cb1f8a4b48bd5ad8f09168f10f607ddc318af202f5c057d52
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(BUF_IMAGE)
 
 
+
 ###############################################################################
 ###                                Protobuf                                 ###
 ###############################################################################
-PROTO_BUILDER_IMAGE=tendermintdev/sdk-proto-gen:v0.2
-PROTO_FORMATTER_IMAGE=tendermintdev/docker-build-proto@sha256:aabcfe2fc19c31c0f198d4cd26393f5e5ca9502d7ea3feafbfe972448fee7cae
+protoVer=0.14.0
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 
-proto-all: proto-format proto-lint proto-gen format
+proto-all: proto-format proto-lint proto-gen
 
 proto-gen:
 	@echo "Generating Protobuf files"
-	$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(PROTO_BUILDER_IMAGE) sh ./scripts/protocgen.sh
-
-proto-format:
-	@echo "Formatting Protobuf files"
-	$(DOCKER) run --rm -v $(CURDIR):/workspace \
-	--workdir /workspace $(PROTO_FORMATTER_IMAGE) \
-	find ./ -name *.proto -exec clang-format -i {} \;
+	@$(protoImage) sh ./scripts/protocgen.sh
 
 proto-swagger-gen:
-	@./scripts/protoc-swagger-gen.sh
+	@echo "Generating Protobuf Swagger"
+	@$(protoImage) sh ./scripts/protoc-swagger-gen.sh
 
-# Show the version that `make build` is using
-.PHONY: version
-version:
-	@echo "$(VERSION)"
+proto-format:
+	@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;
+
+proto-lint:
+	@$(protoImage) buf lint --error-format=json

app/ante.go

@@ -1,16 +1,17 @@
 package app
 
 import (
+	errorsmod "cosmossdk.io/errors"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/codec"
+	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"
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
-	ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
-	appante "github.com/noislabs/noisd/app/ante"
+	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
@@ -19,7 +20,7 @@ type HandlerOptions struct {
 	ante.HandlerOptions
 	keeper            *ibckeeper.Keeper
 	WasmConfig        *wasmTypes.WasmConfig
-	TXCounterStoreKey sdk.StoreKey
+	TXCounterStoreKey storetypes.StoreKey
 	Codec             codec.BinaryCodec
 	govKeeper         govkeeper.Keeper
 }
@@ -29,23 +30,23 @@ type HandlerOptions struct {
 // signer.
 func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	if options.AccountKeeper == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder")
 	}
 
 	if options.BankKeeper == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder")
 	}
 
 	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")
 	}
 
 	if options.WasmConfig == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
 	}
 
 	if options.TXCounterStoreKey == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "tx counter key is required for ante builder")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "tx counter key is required for ante builder")
 	}
 
 	sigGasConsumer := options.SigGasConsumer
@@ -58,23 +59,20 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		// limit simulation gas
 		wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit),
 		wasmkeeper.NewCountTXDecorator(options.TXCounterStoreKey),
-		appante.NewMinCommissionDecorator(options.Codec),
-		appante.NewMinDepositDecorator(options.Codec, options.govKeeper),
-		ante.NewRejectExtensionOptionsDecorator(),
-		ante.NewMempoolFeeDecorator(),
+		ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker),
 		ante.NewValidateBasicDecorator(),
+		ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
 		ante.NewTxTimeoutHeightDecorator(),
 		ante.NewValidateMemoDecorator(options.AccountKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
-		ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper),
 		// SetPubKeyDecorator must be called before all signature verification decorators
 		ante.NewSetPubKeyDecorator(options.AccountKeeper),
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),
 		ante.NewSigGasConsumeDecorator(options.AccountKeeper, sigGasConsumer),
 		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
 		// prevents submitting duplicated packets or transactions without update client message
-		ibcante.NewAnteDecorator(options.keeper),
+		ibcante.NewRedundantRelayDecorator(options.keeper),
 	}
 
 	return sdk.ChainAnteDecorators(anteDecorators...), nil