deps!: bring cosmos-sdk v47 deps to gaia (ibc-go, ics, pfm)

.github/workflows/codeql-analysis.yml

@@ -26,7 +26,7 @@ jobs:
  uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: "1.20"
+ go-version: "1.21"
  check-latest: true
 
  # Initializes the CodeQL tools for scanning.

.github/workflows/lint.yml

@@ -16,7 +16,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: "1.20"
+ go-version: "1.21"
  check-latest: true
  - uses: technote-space/get-diff-action@v6.1.2
  id: git_diff

.github/workflows/nightly-tests.yml

@@ -21,7 +21,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: "1.20"
+ go-version: "1.21"
  check-latest: true
  - name: run-vulncheck
  id: vulncheck

.github/workflows/release-sims.yml

@@ -26,7 +26,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - name: Install runsim
  run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0
  - uses: actions/cache@v3.3.2
@@ -65,7 +65,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - uses: technote-space/get-diff-action@v6.0.1
  with:
  PATTERNS: |

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
 
  - uses: actions/setup-go@v5
  with:
- go-version: "1.20"
+ go-version: "1.21"
 
  - name: Set Env
  run: echo "TM_VERSION=$(go list -m github.com/tendermint/tendermint | sed 's:.* ::')" >> $GITHUB_ENV

.github/workflows/sim-label.yml

@@ -17,7 +17,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - name: Install runsim
  run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0
  - uses: actions/cache@v3.3.2
@@ -33,7 +33,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - uses: actions/cache@v3.3.2
  with:
  path: ~/go/bin

.github/workflows/sims.yml

@@ -21,7 +21,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - name: Install runsim
  run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0
  - uses: actions/cache@v3.3.2
@@ -36,7 +36,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - uses: technote-space/get-diff-action@v6.0.1
  with:
  PATTERNS: |
@@ -60,7 +60,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - uses: technote-space/get-diff-action@v6
  with:
  PATTERNS: |
@@ -82,7 +82,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - name: Install runsim
  run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0
  - uses: actions/cache@v3.3.2
@@ -107,7 +107,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - uses: actions/checkout@v4
  - uses: actions/cache@v3.3.2
  with:

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: "1.20"
+ go-version: "1.21"
  check-latest: true
  cache: true
  cache-dependency-path: go.sum
@@ -65,16 +65,18 @@ jobs:
  steps:
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - uses: actions/checkout@v4
  - uses: technote-space/get-diff-action@v6.0.1
  with:
  PATTERNS: |
  **/**.go
  go.mod
  go.sum
- - name: Build Docker Image
+ - name: Build Gaia Docker Image
  run: make docker-build-debug
+ - name: Build Hermes Docker Image
+ run: make docker-build-hermes
  - name: Test E2E
  run: make test-e2e
 
@@ -110,7 +112,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: 1.20.x
+ go-version: 1.21.x
  - uses: technote-space/get-diff-action@v6.0.1
  with:
  PATTERNS: |

Dockerfile

@@ -1,7 +1,7 @@
 ARG IMG_TAG=latest
 
 # Compile the gaiad binary
-FROM golang:1.20-alpine AS gaiad-builder
+FROM golang:1.21-alpine AS gaiad-builder
 WORKDIR /src/app/
 COPY go.mod go.sum* ./
 RUN go mod download
@@ -17,4 +17,4 @@ COPY --from=gaiad-builder /go/bin/gaiad /usr/local/bin/
 EXPOSE 26656 26657 1317 9090
 USER 0
 
-ENTRYPOINT ["gaiad", "start"]
+ENTRYPOINT ["gaiad", "start"]

Makefile

@@ -21,7 +21,7 @@ BUILDDIR ?= $(CURDIR)/build
 TEST_DOCKER_REPO=cosmos/contrib-gaiatest
 
 GO_SYSTEM_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1-2)
-REQUIRE_GO_VERSION = 1.20
+REQUIRE_MINIMUM_GO_VERSION = 1.20
 
 export GO111MODULE = on
 
@@ -95,9 +95,10 @@ include contrib/devtools/Makefile
 ### Build ###
 ###############################################################################
 
+IS_VERSION_SUPPORTED = $(shell echo "$(GO_SYSTEM_VERSION) >= $(REQUIRE_MINIMUM_GO_VERSION)" | bc -l)
 check_version:
-ifneq ($(GO_SYSTEM_VERSION), $(REQUIRE_GO_VERSION))
- @echo "ERROR: Go version 1.20 is required for $(VERSION) of Gaia."
+ifneq ($(IS_VERSION_SUPPORTED), 1)
+ @echo "ERROR: Minimal go version required for Gaia: $(VERSION) is $(REQUIRE_MINIMUM_GO_VERSION). You are using $(GO_SYSTEM_VERSION)."
  exit 1
 endif
 
@@ -234,7 +235,7 @@ docker-build-debug:
 # TODO: Push this to the Cosmos Dockerhub so we don't have to keep building it
 # in CI.
 docker-build-hermes:
- @cd tests/e2e/docker; docker build -t cosmos/hermes-e2e:latest -f hermes.Dockerfile .
+ @cd tests/e2e/docker; docker build -t ghcr.io/cosmos/hermes-e2e:1.0.0 -f hermes.Dockerfile .
 
 docker-build-all: docker-build-debug docker-build-hermes
 
@@ -271,9 +272,9 @@ start-localnet-ci: build
  ./build/gaiad config chain-id liveness --home ~/.gaiad-liveness
  ./build/gaiad config keyring-backend test --home ~/.gaiad-liveness
  ./build/gaiad keys add val --home ~/.gaiad-liveness
- ./build/gaiad add-genesis-account val 10000000000000000000000000stake --home ~/.gaiad-liveness --keyring-backend test
- ./build/gaiad gentx val 1000000000stake --home ~/.gaiad-liveness --chain-id liveness
- ./build/gaiad collect-gentxs --home ~/.gaiad-liveness
+ ./build/gaiad genesis add-genesis-account val 10000000000000000000000000stake --home ~/.gaiad-liveness --keyring-backend test
+ ./build/gaiad genesis gentx val 1000000000stake --home ~/.gaiad-liveness --chain-id liveness
+ ./build/gaiad genesis collect-gentxs --home ~/.gaiad-liveness
  sed -i.bak'' 's/minimum-gas-prices = ""/minimum-gas-prices = "0uatom"/' ~/.gaiad-liveness/config/app.toml
  ./build/gaiad start --home ~/.gaiad-liveness --x-crisis-skip-assert-invariants
 
@@ -300,12 +301,31 @@ test-docker-push: test-docker
 ###############################################################################
 ### Protobuf ###
 ###############################################################################
+protoVer=0.13.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
+
 proto-gen:
  @echo "Generating Protobuf files"
- @sh ./proto/scripts/protocgen.sh
+ @$(protoImage) sh ./proto/scripts/protocgen.sh
 
 proto-swagger-gen:
  @echo "Generating Protobuf Swagger"
- @sh ./proto/scripts/protoc-swagger-gen.sh
+ @$(protoImage) sh ./proto/scripts/protoc-swagger-gen.sh
+
+proto-format:
+ @$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;
+
+proto-lint:
+ @$(protoImage) buf lint --error-format=json
+
+proto-check-breaking:
+ @$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main
+
+proto-update-deps:
+ @echo "Updating Protobuf dependencies"
+ $(DOCKER) run --rm -v $(CURDIR)/proto:/workspace --workdir /workspace $(protoImageName) buf mod update
 
-.PHONY: proto-gen proto-doc proto-swagger-gen
+.PHONY: proto-all proto-gen proto-gen-any proto-swagger-gen proto-format proto-lint proto-check-breaking proto-update-deps

ante/ante.go

@@ -1,8 +1,8 @@
 package ante
 
 import (
- ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
- ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
+ ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
+ ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 
  errorsmod "cosmossdk.io/errors"
 
@@ -11,6 +11,7 @@ import (
  "github.com/cosmos/cosmos-sdk/x/auth/ante"
  govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
  paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
+ stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
  gaiaerrors "github.com/cosmos/gaia/v15/types/errors"
  gaiafeeante "github.com/cosmos/gaia/v15/x/globalfee/ante"
@@ -24,7 +25,8 @@ type HandlerOptions struct {
  GovKeeper *govkeeper.Keeper
  IBCkeeper *ibckeeper.Keeper
  GlobalFeeSubspace paramtypes.Subspace
- StakingSubspace paramtypes.Subspace
+ StakingKeeper *stakingkeeper.Keeper
+ TxFeeChecker ante.TxFeeChecker
 }
 
 func NewAnteHandler(opts HandlerOptions) (sdk.AnteHandler, error) {
@@ -40,10 +42,12 @@ func NewAnteHandler(opts HandlerOptions) (sdk.AnteHandler, error) {
  if opts.IBCkeeper == nil {
  return nil, errorsmod.Wrap(gaiaerrors.ErrLogic, "IBC keeper is required for AnteHandler")
  }
+ // TODO: Enable with Globalfee
  if opts.GlobalFeeSubspace.Name() == "" {
  return nil, errorsmod.Wrap(gaiaerrors.ErrNotFound, "globalfee param store is required for AnteHandler")
  }
- if opts.StakingSubspace.Name() == "" {
+
+ if opts.StakingKeeper == nil {
  return nil, errorsmod.Wrap(gaiaerrors.ErrNotFound, "staking param store is required for AnteHandler")
  }
  if opts.GovKeeper == nil {
@@ -57,20 +61,20 @@ func NewAnteHandler(opts HandlerOptions) (sdk.AnteHandler, error) {
 
  anteDecorators := []sdk.AnteDecorator{
  ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
- ante.NewRejectExtensionOptionsDecorator(),
+ ante.NewExtensionOptionsDecorator(opts.ExtensionOptionChecker),
  ante.NewValidateBasicDecorator(),
  ante.NewTxTimeoutHeightDecorator(),
  ante.NewValidateMemoDecorator(opts.AccountKeeper),
  ante.NewConsumeGasForTxSizeDecorator(opts.AccountKeeper),
  NewGovPreventSpamDecorator(opts.Codec, opts.GovKeeper),
- gaiafeeante.NewFeeDecorator(opts.GlobalFeeSubspace, opts.StakingSubspace),
- ante.NewDeductFeeDecorator(opts.AccountKeeper, opts.BankKeeper, opts.FeegrantKeeper),
+ gaiafeeante.NewFeeDecorator(opts.GlobalFeeSubspace, opts.StakingKeeper),
+ ante.NewDeductFeeDecorator(opts.AccountKeeper, opts.BankKeeper, opts.FeegrantKeeper, opts.TxFeeChecker),
  ante.NewSetPubKeyDecorator(opts.AccountKeeper), // SetPubKeyDecorator must be called before all signature verification decorators
  ante.NewValidateSigCountDecorator(opts.AccountKeeper),
  ante.NewSigGasConsumeDecorator(opts.AccountKeeper, sigGasConsumer),
  ante.NewSigVerificationDecorator(opts.AccountKeeper, opts.SignModeHandler),
  ante.NewIncrementSequenceDecorator(opts.AccountKeeper),
- ibcante.NewAnteDecorator(opts.IBCkeeper),
+ ibcante.NewRedundantRelayDecorator(opts.IBCkeeper),
  }
 
  return sdk.ChainAnteDecorators(anteDecorators...), nil

ante/gov_ante.go

@@ -7,7 +7,7 @@ import (
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/x/authz"
  govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
- govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+ govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
  gaiaerrors "github.com/cosmos/gaia/v15/types/errors"
 )
@@ -47,10 +47,10 @@ func (g GovPreventSpamDecorator) AnteHandle(
 // validateGovMsgs checks if the InitialDeposit amounts are greater than the minimum initial deposit amount
 func (g GovPreventSpamDecorator) ValidateGovMsgs(ctx sdk.Context, msgs []sdk.Msg) error {
  validMsg := func(m sdk.Msg) error {
- if msg, ok := m.(*govtypes.MsgSubmitProposal); ok {
+ if msg, ok := m.(*govv1beta1.MsgSubmitProposal); ok {
  // prevent messages with insufficient initial deposit amount
- depositParams := g.govKeeper.GetDepositParams(ctx)
- minInitialDeposit := g.calcMinInitialDeposit(depositParams.MinDeposit)
+ params := g.govKeeper.GetParams(ctx)
+ minInitialDeposit := g.calcMinInitialDeposit(params.MinDeposit)
  if !msg.InitialDeposit.IsAllGTE(minInitialDeposit) {
  return errorsmod.Wrapf(gaiaerrors.ErrInsufficientFunds, "insufficient initial deposit amount - required: %v", minInitialDeposit)
  }