Skip to content

Commit 1c31276

Browse files
authored
Problem: max-tx-gas-wanted is checked in consensus logic (#1697)
* Problem: max-tx-gas-wanted is checked in consensus logic Solution: - revert the change to check-tx mode only * Update CHANGELOG.md Signed-off-by: yihuang <[email protected]> * Update CHANGELOG.md Signed-off-by: yihuang <[email protected]> --------- Signed-off-by: yihuang <[email protected]>
1 parent ce797fa commit 1c31276

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
*Nov 18, 2024*
4+
5+
## v1.4.0-rc5
6+
7+
### State Machine Breaking
8+
9+
* [#1697](https://github.com/crypto-org-chain/cronos/pull/1697) Check max-tx-gas-wanted only in CheckTx mode.
10+
311
*Nov 14, 2024*
412

513
## v1.4.0-rc4

app/upgrades.go

+6
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec) {
4242
return m, nil
4343
})
4444

45+
// a hotfix upgrade plan just for testnet
46+
hotfixPlanName := "v1.4.0-rc5-testnet"
47+
app.UpgradeKeeper.SetUpgradeHandler(hotfixPlanName, func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
48+
return app.ModuleManager.RunMigrations(ctx, app.configurator, fromVM)
49+
})
50+
4551
upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
4652
if err != nil {
4753
panic(fmt.Sprintf("failed to read upgrade info from disk %s", err))

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ replace (
273273
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
274274
github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a
275275
// release/v1.4.x
276-
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20241114081300-fd71fe22c654
276+
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20241118003049-cd93407bcf05
277277
// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
278278
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
279279
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241114020021-3300cc8f3836
428428
github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241114020021-3300cc8f3836/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
429429
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241114020021-3300cc8f3836 h1:i4ubInu2ixIWOxjADpdLcaO08iIAQjIQucwsNutNZmM=
430430
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241114020021-3300cc8f3836/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
431-
github.com/crypto-org-chain/ethermint v0.6.1-0.20241114081300-fd71fe22c654 h1:qm4a5rAf6gq6LgXCIhvHE99WJth+dQ6R8x+/PH4WBtM=
432-
github.com/crypto-org-chain/ethermint v0.6.1-0.20241114081300-fd71fe22c654/go.mod h1:bDouX0WGx+JWkT61l8uSUFqaj+WLOfZv0nxlirm3gsM=
431+
github.com/crypto-org-chain/ethermint v0.6.1-0.20241118003049-cd93407bcf05 h1:4mewSJnWOTwRbBntlAtOj5ZevujX4PGwn57QcO99+Bo=
432+
github.com/crypto-org-chain/ethermint v0.6.1-0.20241118003049-cd93407bcf05/go.mod h1:9FNO9k70szJ7CEge4tnJraWu3baTbwNxjpZhZBqlMok=
433433
github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI=
434434
github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE=
435435
github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a h1:IUPD+dg1YQl8cLocxQ/Mbx/ObTgAgcrZlcBhFjsLO40=

gomod2nix.toml

+3-3
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)