Sync from fork #74

Merged
0xmuralik merged 232 commits from murali/update-fork into main 2023-01-10 04:50:57 +00:00
5 changed files with 26 additions and 7 deletions
Showing only changes of commit 73c9ea218e - Show all commits

View File

@ -23,6 +23,14 @@ pull_request_rules:
backport: backport:
branches: branches:
- main - main
- name: backport patches to v0.17.x branch
conditions:
- base=main
- label=backport/0.17.x
actions:
backport:
branches:
- release/v0.17.x
- name: backport patches to v0.16.x branch - name: backport patches to v0.16.x branch
conditions: conditions:
- base=main - base=main

View File

@ -51,6 +51,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Bug Fixes ### Bug Fixes
* (rpc) [\#1190](https://github.com/evmos/ethermint/issues/1190) Fix `UnmarshalJSON` panig of breaking EVM and fee market `Params`.
* (rpc) [#1179](https://github.com/evmos/ethermint/pull/1179) Fix gas used in traceTransaction response. * (rpc) [#1179](https://github.com/evmos/ethermint/pull/1179) Fix gas used in traceTransaction response.
## [v0.17.0] - 2022-06-27 ## [v0.17.0] - 2022-06-27

View File

@ -61,11 +61,12 @@ func StartJSONRPC(ctx *server.Context, clientCtx client.Context, tmRPCAddr, tmEn
} }
httpSrv := &http.Server{ httpSrv := &http.Server{
Addr: config.JSONRPC.Address, Addr: config.JSONRPC.Address,
Handler: handlerWithCors.Handler(r), Handler: handlerWithCors.Handler(r),
ReadTimeout: config.JSONRPC.HTTPTimeout, ReadHeaderTimeout: config.JSONRPC.HTTPTimeout,
WriteTimeout: config.JSONRPC.HTTPTimeout, ReadTimeout: config.JSONRPC.HTTPTimeout,
IdleTimeout: config.JSONRPC.HTTPIdleTimeout, WriteTimeout: config.JSONRPC.HTTPTimeout,
IdleTimeout: config.JSONRPC.HTTPIdleTimeout,
} }
httpSrvDone := make(chan struct{}, 1) httpSrvDone := make(chan struct{}, 1)

View File

@ -8,7 +8,12 @@ import (
// GetParams returns the total set of evm parameters. // GetParams returns the total set of evm parameters.
func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
k.paramSpace.GetParamSet(ctx, &params) // TODO: update once https://github.com/cosmos/cosmos-sdk/pull/12615 is merged
// and released
for _, pair := range params.ParamSetPairs() {
k.paramSpace.GetIfExists(ctx, pair.Key, pair.Value)
}
return params return params
} }

View File

@ -9,7 +9,11 @@ import (
// GetParams returns the total set of fee market parameters. // GetParams returns the total set of fee market parameters.
func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
k.paramSpace.GetParamSet(ctx, &params) // TODO: update once https://github.com/cosmos/cosmos-sdk/pull/12615 is merged
// and released
for _, pair := range params.ParamSetPairs() {
k.paramSpace.GetIfExists(ctx, pair.Key, pair.Value)
}
return params return params
} }