Skip to content

Commit f9ccd5b

Browse files
aljo242vladcosmoslabsvladjdk
authored
chore: prepare for new Cosmos Stack Release Family (#2446)
* tidy-works * fix * migrate * fix * update * update * chore: format and ibc integration updates - make format (gofumpt, misspell, gci) - ibc tests and wasm handler updates Made-with: Cursor * deps: pin cosmos-sdk to commit e5b941276b (lint fixes) Replace local path with commit hash for cross-repo dependency. Made-with: Cursor * deps: drop local cosmos-sdk replace, pin ibc-go to ab565c1cb Made-with: Cursor * deps: pin cosmos-sdk to 72ea9fe779 (G120 fix, changelog) Made-with: Cursor * deps: pin cosmos-sdk to 2b030f59 (nolintlint + defer cancel fix) Made-with: Cursor * update * chore: ignore wasmd build artifact at repo root Made-with: Cursor * update-lint * use context to validate authority * remove staticmajor workflow * bump cosmos sdk and fix tests * temp workaround * revert workaround * update to latest sdk and fix tests * mod tidy * update to rcs * everything on tags except for ibc-go * Revert back to using uncachedcontext * actually there's a way * bump to rc ibc * fix todo * fix error assertions * protos * table-driven tests for authority * fix lints --------- Co-authored-by: Vlad <vlad@cosmoslabs.io> Co-authored-by: Vlad J <vladjdk@gmail.com>
1 parent bad696b commit f9ccd5b

98 files changed

Lines changed: 2146 additions & 2851 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
steps:
5454
- uses: actions/checkout@v6
5555
- name: Run golangci-lint
56-
uses: golangci/golangci-lint-action@v8
56+
uses: golangci/golangci-lint-action@v9
5757
with:
58-
version: v2.1.6
58+
version: v2.11.3
5959
args: --tests=false --timeout=5m0s
6060

6161
test-cover:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Build
1212
vendor
1313
build
14+
/wasmd
1415
tools/bin/*
1516
examples/build/*
1617
docs/_build

.sonarcloud.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# docker build . -t cosmwasm/wasmd:latest
22
# docker run --rm -it cosmwasm/wasmd:latest /bin/sh
33

4-
FROM golang:1.24-alpine AS go-builder
4+
FROM golang:1.25-alpine AS go-builder
55

66
# this comes from standard alpine nightly file
77
# https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
@@ -42,4 +42,4 @@ EXPOSE 26656
4242
# tendermint rpc
4343
EXPOSE 26657
4444

45-
CMD ["/usr/bin/wasmd", "version"]
45+
CMD ["/usr/bin/wasmd", "version"]

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ format: format-tools
167167
###############################################################################
168168
### Protobuf ###
169169
###############################################################################
170-
protoVer=0.14.0
170+
protoVer=0.18.1
171171
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
172172
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
173173

app/ante.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ package app
33
import (
44
"errors"
55

6-
ibcante "github.com/cosmos/ibc-go/v10/modules/core/ante"
7-
"github.com/cosmos/ibc-go/v10/modules/core/keeper"
6+
ibcante "github.com/cosmos/ibc-go/v11/modules/core/ante"
7+
"github.com/cosmos/ibc-go/v11/modules/core/keeper"
88

99
corestoretypes "cosmossdk.io/core/store"
10-
circuitante "cosmossdk.io/x/circuit/ante"
11-
circuitkeeper "cosmossdk.io/x/circuit/keeper"
1210

1311
sdk "github.com/cosmos/cosmos-sdk/types"
1412
"github.com/cosmos/cosmos-sdk/x/auth/ante"
@@ -26,7 +24,6 @@ type HandlerOptions struct {
2624
NodeConfig *wasmTypes.NodeConfig
2725
WasmKeeper *wasmkeeper.Keeper
2826
TXCounterStoreService corestoretypes.KVStoreService
29-
CircuitKeeper *circuitkeeper.Keeper
3027
}
3128

3229
// NewAnteHandler constructor
@@ -46,17 +43,13 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
4643
if options.TXCounterStoreService == nil {
4744
return nil, errors.New("wasm store service is required for ante builder")
4845
}
49-
if options.CircuitKeeper == nil {
50-
return nil, errors.New("circuit keeper is required for ante builder")
51-
}
5246

5347
anteDecorators := []sdk.AnteDecorator{
5448
ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
5549
wasmkeeper.NewLimitSimulationGasDecorator(options.NodeConfig.SimulationGasLimit), // after setup context to enforce limits early
5650
wasmkeeper.NewCountTXDecorator(options.TXCounterStoreService),
5751
wasmkeeper.NewGasRegisterDecorator(options.WasmKeeper.GetGasRegister()),
5852
wasmkeeper.NewTxContractsDecorator(),
59-
circuitante.NewCircuitBreakerDecorator(options.CircuitKeeper),
6053
ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
6154
ante.NewValidateBasicDecorator(),
6255
ante.NewTxTimeoutHeightDecorator(),

0 commit comments

Comments
 (0)