Skip to content

Commit bd6702f

Browse files
pinosuchipshortBigtoCwebmaster128autofix-ci[bot]
authored
Merge releases/v0.6x to main (#2305)
* Make validateAddress cheaper if canonicalization fails (#2193) (cherry picked from commit cdb72b1) * feat(data): Make sure Aliases in DenomUnit is not nil (cherry picked from commit 69c38a5) * chore(comment): Add code comments (cherry picked from commit 1eaf666) * chore(test): Add test (cherry picked from commit 8473fea) * chore(comment): Improve comment clarity in query_plugins.go (cherry picked from commit e3df21e) * Restore file permission (cherry picked from commit 9eb5dd8) * Rename message args 💅 (#2207) * Rename args to `msg` consistently in WasmEngine interface * Rename file to wasm_engine.go "Wasmer" is an implementation detail that can change at any time (cherry picked from commit 1756d2d) * Use gas overflow error for ToWasmVMGas (cherry picked from commit dda8ea3) * Streamline Stargate/gRPC querier interfaces (#2093) * Change RejectStargateQuerier from factory function to free function * Clarify error message to help contract developers * Streamline and improve documentation for RejectGrpcQuerier * Pull out function signatures * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> (cherry picked from commit 146cdea) * Lower `DefaultMaxCallDepth` (#2244) * Lower DefaultMaxCallDepth * Add changelog entry * Fix test * Bump cosmos-sdk v0.53.0 (#2250) * Bump cosmos-sdk v0.53.0 * remove crisis module * fix simulations * Suppress lint errors * Fix golangci-lint warnings * Remove unnecessary loop copy * Updates * [autofix.ci] apply automated fixes * fix: Disable IAVL prunning to prevent dangling goroutines in tests * fix: Try to use newer golangci * Increase resources for lint * Update golangci-lint (#2269) * Remove deprecated golangci-lint configs * Update golangci-lint * Apply linter fixes --------- Co-authored-by: Christoph Otter <[email protected]> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Tomasz Kulik <[email protected]> * Prepare changelog for release (#2274) * Prepare changelog for release * Update * Update wasmvm (cherry picked from commit d5d9860) * Fix tests (cherry picked from commit 8404057) * Update dockerfile (cherry picked from commit c51b4e4) * Fix * Improve readability * Fix * Restructure error handling * Add comments * Add setup cost for IBC operations * Fix tests * Use ExpectedJSONSize function --------- Co-authored-by: Christoph Otter <[email protected]> Co-authored-by: BigtoC <[email protected]> Co-authored-by: Simon Warta <[email protected]> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Tomasz Kulik <[email protected]>
1 parent 8c47820 commit bd6702f

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,18 @@
22

33
## [Unreleased](https://github.com/CosmWasm/wasmd/tree/HEAD)
44

5-
[Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.55.0...HEAD)
5+
[Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.60.0...HEAD)
6+
7+
## [v0.60.0](https://github.com/CosmWasm/wasmd/tree/v0.60.0) (2025-05-26)
8+
9+
[Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.55.0...v0.60.0)
10+
11+
- Bump cosmos-sdk [v0.53.0](https://github.com/CosmWasm/wasmd/pull/2250)
12+
- Streamline Stargate/gRPC querier interfaces [\#2249](https://github.com/CosmWasm/wasmd/pull/2249)
13+
- Use gas overflow error for `ToWasmVMGas` [\#2248](https://github.com/CosmWasm/wasmd/pull/2248)
14+
- Make sure Aliases in DenomUnit is not nil [\#2246](https://github.com/CosmWasm/wasmd/pull/2246)
15+
- Make validateAddress cheaper if canonicalization fails [\#2245](https://github.com/CosmWasm/wasmd/pull/2245)
16+
- Lower `DefaultMaxCallDepth` [\#2244](https://github.com/CosmWasm/wasmd/pull/2244)
617

718
- chore: Change port prefix for IBCv2 messages to "wasm2" [\#2229](https://github.com/CosmWasm/wasmd/pull/2229)
819
- feat: IBCv2 timeout handler [\#2226](https://github.com/CosmWasm/wasmd/pull/2226)

tests/system/cli.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,11 @@ var (
519519
const oogMsg = "out of gas"
520520
return expErrWithMsg(t, err, args, oogMsg)
521521
}
522+
// ErrMaxCallDepthMatcher requires error with "max call depth exceeded" message
523+
ErrMaxCallDepthMatcher RunErrorAssert = func(t assert.TestingT, err error, args ...interface{}) bool {
524+
const expMsg = "max call depth exceeded"
525+
return expErrWithMsg(t, err, args, expMsg)
526+
}
522527
// ErrTimeoutMatcher requires time out message
523528
ErrTimeoutMatcher RunErrorAssert = func(t assert.TestingT, err error, args ...interface{}) bool {
524529
const expMsg = "timed out waiting for tx to be included in a block"

tests/system/fraud_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestRecursiveMsgsExternalTrigger(t *testing.T) {
2929
}{
3030
"simulation": {
3131
gas: "auto",
32-
expErrMatcher: ErrOutOfGasMatcher,
32+
expErrMatcher: ErrMaxCallDepthMatcher,
3333
},
3434
}
3535
for name, spec := range specs {

tests/system/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ require (
2626
require (
2727
cosmossdk.io/math v1.5.3
2828
github.com/cometbft/cometbft v0.38.17
29+
github.com/gogo/protobuf v1.3.2
2930
github.com/tidwall/gjson v1.14.2
3031
github.com/tidwall/sjson v1.2.5
32+
google.golang.org/protobuf v1.36.6
3133
)
3234

3335
require (
@@ -82,7 +84,6 @@ require (
8284
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
8385
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
8486
github.com/gogo/googleapis v1.4.1 // indirect
85-
github.com/gogo/protobuf v1.3.2 // indirect
8687
github.com/golang/glog v1.2.4 // indirect
8788
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8889
github.com/golang/snappy v0.0.4 // indirect
@@ -156,7 +157,6 @@ require (
156157
golang.org/x/text v0.24.0 // indirect
157158
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
158159
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
159-
google.golang.org/protobuf v1.36.6 // indirect
160160
gopkg.in/yaml.v3 v3.0.1 // indirect
161161
gotest.tools/v3 v3.5.2 // indirect
162162
nhooyr.io/websocket v1.8.6 // indirect

x/wasm/types/wasm_engine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
// DefaultMaxQueryStackSize maximum size of the stack of recursive queries a contract can make
1111
const DefaultMaxQueryStackSize uint32 = 10
1212

13-
const DefaultMaxCallDepth uint32 = 500
13+
const DefaultMaxCallDepth uint32 = 100
1414

1515
// WasmEngine defines the WASM contract runtime engine.
1616
type WasmEngine interface {

0 commit comments

Comments
 (0)