Skip to content

Upstream evm v0.6.2 - #12

Closed
hieuvubk wants to merge 24 commits into
hieu/v0.6.1from
hieu/0.6.2
Closed

hieuvubk wants to merge 24 commits into
hieu/v0.6.1from
hieu/0.6.2

Conversation

@hieuvubk

Copy link
Copy Markdown
Collaborator

Description

Merge changes from cosmos/evm latest v0.6.2

vladjdk and others added 17 commits March 25, 2026 13:12
* align gas calculation

* changelog

* lint

* fix tests

* fix test

* Revert "fix test"

This reverts commit 11147e5.

* solhint

* lint

* make systemtest time 3s instead of 5s to hit blocktime
…smos#1187) (cosmos#1190)

* fix(statedb): snapshot locked balance on statedb account  (cosmos#1187)

* snapshot locked balance on statedb account creation to calculate spendable + locked bank balance after locked balance changes via precompile

* lint formatting

* modify x/erc20 registering code hash to not silently drop existing accounts locked balacne

* update comments

* Update x/vm/keeper/statedb.go

Co-authored-by: Vlad J <vladjdk@gmail.com>

---------

Co-authored-by: Vlad J <vladjdk@gmail.com>
(cherry picked from commit 008c171)

# Conflicts:
#	tests/integration/precompiles/staking/test_staking.go
#	x/vm/keeper/statedb.go
#	x/vm/statedb/state_object.go

* fix conflicts

* bump sol

---------

Co-authored-by: mattac21 <matt@cosmoslabs.io>
Co-authored-by: Vlad <vladjdk@gmail.com>
align v2 with main so failed native-ERC20 conversion surfaces as failure result
* chore(erc20/v2): align ack validation with ibc-go. (cosmos#1232)

* After code review

* Apply suggestion from @dianab-cl

* After code review
* fix

* tests

---------

Co-authored-by: Eric Warehime <eric.warehime@gmail.com>
fix(erc20): propagate conversion ack in v2 ibc OnRecvPacket
…mos#1243)

* fix: Move tests to use eoa instead of module account as deployer

* Lint

* Apply suggestion from @dianab-cl
fix: Move tests to use eoa instead of module account as deployer (cosmos#1243)
…mos#1243) (cosmos#1256)

* fix: Move tests to use eoa instead of module account as deployer

* Lint

* Apply suggestion from @dianab-cl

Co-authored-by: dianab-cl <diana@cosmoslabs.io>
* Merge of changes (cosmos#1259)

(cherry picked from commit 430eaed)

# Conflicts:
#	evmd/mempool.go
#	x/feemarket/keeper/abci.go

* fix conflicts

* align gte logic

* Fix merge conflict

* Fix mempool

---------

Co-authored-by: Eric Warehime <eric.warehime@gmail.com>
Co-authored-by: Matt Acciai <matt@cosmoslabs.io>
…s#1176) (cosmos#1253)

* fix: harden statedb balance and event amount handling (cosmos#1176)

* fix: harden statedb balance and event amount handling

Guard StateDB balance subtraction against underflow and make precompile balance-event parsing denom-aware for base vs extended denom paths. Also add regression tests and document that only 18-decimal EVM gas-token chains are supported.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(vm): enforce 18-decimal coin configuration

Reject non-18 decimal EVM coin configs in both runtime and test configurators, align affected tests, and temporarily exclude precisebank packages from root unit-test targets until precisebank removal lands.

Co-authored-by: Cursor <cursoragent@cursor.com>

* chore: remove obsolete precisebank test package filters

Now that contrib/x/precisebank is removed on main, package selection no longer needs explicit exclusions and can rely on the standard simulation/e2e filters.

Co-authored-by: Cursor <cursoragent@cursor.com>

* chore: fix formatter ordering in scaling tests

Apply golangci formatter output for scaling tests so gci/gofumpt checks pass in CI.

Co-authored-by: Cursor <cursoragent@cursor.com>

* test: align integration suites with 18-decimal-only config

Remove non-18-decimal integration cases and fee checks that now fail by design under enforced 18-decimal EVM coin configuration.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
(cherry picked from commit 264aa70)

# Conflicts:
#	README.md
#	x/vm/statedb/state_object.go
#	x/vm/types/denom_config.go
#	x/vm/wrappers/feemarket_test.go

* fix conflicts

* fix formatting

* remove the requirement that the EVM coin be configured with 18 decimals

* sum the base and extended denom amounts when parsing balance change events

---------

Co-authored-by: Alex | Cosmos Labs <alex@cosmoslabs.io>
Co-authored-by: Matt Acciai <matt@cosmoslabs.io>
* prep changelog for release

* fix
# Conflicts:
#	CHANGELOG.md
#	evmd/tests/ibc/helper.go
#	tests/integration/precompiles/staking/test_integration.go
#	tests/integration/x/vm/test_call_evm.go
#	tests/integration/x/vm/test_statedb.go
#	x/feemarket/keeper/abci.go
#	x/vm/statedb/state_object.go
dhfang and others added 7 commits August 21, 2026 10:25
chore: rebase v0.6.x with upstream changes
fix: Protect statedb from overflow on add balance
chore: Merge pull request #10 from cosmos/eric/overflow
Pulls in the statedb security hotfix: AddBalance now panics on
uint256 overflow instead of silently wrapping, and Commit() stages
writes through a cache context so a late failure no longer leaves
partial state applied.
@hieuvubk hieuvubk closed this Nov 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants