Skip to content

Commit

Permalink
Problem: recent fixes not released (#1278)
Browse files Browse the repository at this point in the history
* Problem: recent fixes not released

Solution:
- merge into the un-released rc2 veresion

* Update CHANGELOG.md

Signed-off-by: yihuang <huang@crypto.com>

* bring testnet feemarket parameters same as mainnet

* update sdk

* remove authz from swagger

* fix sim test

* fix gas price

---------

Signed-off-by: yihuang <huang@crypto.com>
  • Loading branch information
yihuang authored Jan 3, 2024
1 parent 4cf57d8 commit 86ad7b3
Show file tree
Hide file tree
Showing 9 changed files with 4,937 additions and 7,402 deletions.
8 changes: 3 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
# Changelog

## UNRELEASED
*January 2, 2023*

## v1.1.0-rc2

- [#1258](https://github.com/crypto-org-chain/cronos/pull/1258) Support hard-fork style upgrades.
- [#1272](https://github.com/crypto-org-chain/cronos/pull/1272) Update ethermint to develop, cosmos-sdk to `v0.47.7`.
- [#1273](https://github.com/crypto-org-chain/cronos/pull/1273) Enable push0 opcode in integration test.
- [#1274](https://github.com/crypto-org-chain/cronos/pull/1274) Remove authz module.

*December 11, 2023*

## v1.1.0-rc2

### Bug Fixes

- [#1215](https://github.com/crypto-org-chain/cronos/pull/1215) Update ethermint to fix of concurrent write in fee history.
Expand Down
2 changes: 1 addition & 1 deletion app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (

const (
SimAppChainID = "simulation_777-1"
SimBlockMaxGas = 81500000
SimBlockMaxGas = 815000000
TestAppChainID = "cronos_777-1"
)

Expand Down
8 changes: 8 additions & 0 deletions app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@ func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, clientKeeper clie
if err := app.CronosKeeper.SetParams(ctx, params); err != nil {
return m, err
}

feeparams := app.FeeMarketKeeper.GetParams(ctx)
feeparams.BaseFeeChangeDenominator = 300
feeparams.ElasticityMultiplier = 4
feeparams.BaseFee = sdk.NewInt(10000000000000)
feeparams.MinGasPrice = sdk.NewDec(10000000000000)
app.FeeMarketKeeper.SetParams(ctx, feeparams)

return m, nil
})

Expand Down
8 changes: 0 additions & 8 deletions client/docs/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,6 @@
}
}
},
{
"url": "./tmp-swagger-gen/cosmos/authz/v1beta1/query.swagger.json",
"operationIds": {
"rename": {
"Params": "AuthzParams"
}
}
},
{
"url": "./tmp-swagger-gen/cosmos/feegrant/v1beta1/query.swagger.json",
"operationIds": {
Expand Down
Loading

0 comments on commit 86ad7b3

Please sign in to comment.