Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem: go-ethereum is not updated #1247

Merged
merged 13 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
### State Machine Breaking

- [#1232](https://github.com/crypto-org-chain/cronos/pull/1232) Adjust require gas in relayer precompile to be closed with actual consumed.
- [#1247](https://github.com/crypto-org-chain/cronos/pull/1247) Update ethermint to develop, go-ethereum to `v1.11.2`.
- [#1235](https://github.com/crypto-org-chain/cronos/pull/1235) Add channel detail in ica packet callback.

### Improvements
Expand Down
15 changes: 10 additions & 5 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,14 @@ import (
cronosprecompiles "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper/precompiles"
"github.com/crypto-org-chain/cronos/v2/x/cronos/middleware"
cronostypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/ethereum/go-ethereum/core/vm"

"github.com/crypto-org-chain/cronos/v2/client/docs"

// Force-load the tracer engines to trigger registration
"github.com/ethereum/go-ethereum/core/vm"
_ "github.com/ethereum/go-ethereum/eth/tracers/js"
_ "github.com/ethereum/go-ethereum/eth/tracers/native"
ethparams "github.com/ethereum/go-ethereum/params"

// force register the extension json-rpc.
_ "github.com/crypto-org-chain/cronos/v2/x/cronos/rpc"
Expand Down Expand Up @@ -535,9 +536,13 @@ func New(
app.FeeMarketKeeper,
tracer,
evmS,
[]vm.PrecompiledContract{
cronosprecompiles.NewRelayerContract(app.IBCKeeper, appCodec, app.Logger()),
cronosprecompiles.NewIcaContract(&app.ICAAuthKeeper, &app.CronosKeeper, appCodec, gasConfig),
[]evmkeeper.CustomContractFn{
func(rules ethparams.Rules) vm.PrecompiledContract {
return cronosprecompiles.NewRelayerContract(app.IBCKeeper, appCodec, rules, app.Logger())
},
func(rules ethparams.Rules) vm.PrecompiledContract {
return cronosprecompiles.NewIcaContract(&app.ICAAuthKeeper, &app.CronosKeeper, appCodec, gasConfig)
},
},
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
allKeys,
)
Expand Down Expand Up @@ -1155,7 +1160,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(ibcexported.ModuleName)
paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
paramsKeeper.Subspace(icaauthtypes.ModuleName)
paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(evmtypes.ParamKeyTable()) //nolint: staticcheck
paramsKeeper.Subspace(evmtypes.ModuleName)
paramsKeeper.Subspace(feemarkettypes.ModuleName).WithKeyTable(feemarkettypes.ParamKeyTable())
if !skipGravity {
paramsKeeper.Subspace(gravitytypes.ModuleName)
Expand Down
3 changes: 2 additions & 1 deletion app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
ibctmmigrations "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint/migrations"
cronostypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
icaauthtypes "github.com/crypto-org-chain/cronos/v2/x/icaauth/types"
v0evmtypes "github.com/evmos/ethermint/x/evm/migrations/v0/types"
evmtypes "github.com/evmos/ethermint/x/evm/types"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
)
Expand Down Expand Up @@ -63,7 +64,7 @@ func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, clientKeeper clie
case icaauthtypes.ModuleName:
keyTable = icaauthtypes.ParamKeyTable()
case evmtypes.ModuleName:
keyTable = evmtypes.ParamKeyTable() //nolint:staticcheck
keyTable = v0evmtypes.ParamKeyTable() //nolint:staticcheck
case feemarkettypes.ModuleName:
keyTable = feemarkettypes.ParamKeyTable()
case cronostypes.ModuleName:
Expand Down
127 changes: 81 additions & 46 deletions client/docs/swagger-ui/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2187,6 +2187,12 @@ paths:
required: false
type: string
format: int64
- name: overrides
description: state overrides encoded as json.
in: query
required: false
type: string
format: byte
tags:
- Query
/ethermint/evm/v1/eth_call:
Expand Down Expand Up @@ -2517,6 +2523,12 @@ paths:
required: false
type: string
format: int64
- name: overrides
description: state overrides encoded as json.
in: query
required: false
type: string
format: byte
tags:
- Query
/ethermint/evm/v1/params:
Expand Down Expand Up @@ -2645,16 +2657,21 @@ paths:
title: >-
merge_netsplit_block: Virtual fork after The Merge to
use as a network splitter
shanghai_block:
shanghai_time:
type: string
title: >-
shanghai_block switch block (nil = no fork, 0 =
already on shanghai)
cancun_block:
shanghai switch time (nil = no fork, 0 = already on
shanghai)
cancun_time:
type: string
title: >-
cancun_block switch block (nil = no fork, 0 = already
on cancun)
cancun switch time (nil = no fork, 0 = already on
cancun)
prague_time:
type: string
title: >-
prague switch time (nil = no fork, 0 = already on
prague)
description: >-
ChainConfig defines the Ethereum ChainConfig parameters
using *sdk.Int values
Expand Down Expand Up @@ -3451,15 +3468,18 @@ paths:
in: query
required: false
type: string
- name: trace_config.overrides.shanghai_block
description: >-
shanghai_block switch block (nil = no fork, 0 = already on
shanghai).
- name: trace_config.overrides.shanghai_time
description: shanghai switch time (nil = no fork, 0 = already on shanghai).
in: query
required: false
type: string
- name: trace_config.overrides.cancun_time
description: cancun switch time (nil = no fork, 0 = already on cancun).
in: query
required: false
type: string
- name: trace_config.overrides.cancun_block
description: cancun_block switch block (nil = no fork, 0 = already on cancun).
- name: trace_config.overrides.prague_time
description: prague switch time (nil = no fork, 0 = already on prague).
in: query
required: false
type: string
Expand Down Expand Up @@ -3787,17 +3807,22 @@ paths:
in: query
required: false
type: string
- name: msg.deprecated_from
in: query
required: false
type: string
- name: msg.from
description: >-
from is the ethereum signer address in hex format. This address
value is checked
from is the bytes of ethereum signer address. This address value is
checked

against the address derived from the signature (V, R, S) using the

secp256k1 elliptic curve.
in: query
required: false
type: string
format: byte
- name: trace_config.tracer
description: tracer is a custom javascript tracer.
in: query
Expand Down Expand Up @@ -3958,15 +3983,18 @@ paths:
in: query
required: false
type: string
- name: trace_config.overrides.shanghai_block
description: >-
shanghai_block switch block (nil = no fork, 0 = already on
shanghai).
- name: trace_config.overrides.shanghai_time
description: shanghai switch time (nil = no fork, 0 = already on shanghai).
in: query
required: false
type: string
- name: trace_config.overrides.cancun_time
description: cancun switch time (nil = no fork, 0 = already on cancun).
in: query
required: false
type: string
- name: trace_config.overrides.cancun_block
description: cancun_block switch block (nil = no fork, 0 = already on cancun).
- name: trace_config.overrides.prague_time
description: prague switch time (nil = no fork, 0 = already on prague).
in: query
required: false
type: string
Expand Down Expand Up @@ -44219,11 +44247,14 @@ definitions:
hash:
type: string
title: hash of the transaction in hex format
deprecated_from:
type: string
from:
type: string
format: byte
title: >-
from is the ethereum signer address in hex format. This address value
is checked
from is the bytes of ethereum signer address. This address value is
checked

against the address derived from the signature (V, R, S) using the

Expand Down Expand Up @@ -44734,12 +44765,15 @@ definitions:
title: >-
merge_netsplit_block: Virtual fork after The Merge to use as a network
splitter
shanghai_block:
shanghai_time:
type: string
title: shanghai_block switch block (nil = no fork, 0 = already on shanghai)
cancun_block:
title: shanghai switch time (nil = no fork, 0 = already on shanghai)
cancun_time:
type: string
title: cancun_block switch block (nil = no fork, 0 = already on cancun)
title: cancun switch time (nil = no fork, 0 = already on cancun)
prague_time:
type: string
title: prague switch time (nil = no fork, 0 = already on prague)
description: >-
ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int
values
Expand Down Expand Up @@ -44871,14 +44905,15 @@ definitions:
title: >-
merge_netsplit_block: Virtual fork after The Merge to use as a
network splitter
shanghai_block:
shanghai_time:
type: string
title: >-
shanghai_block switch block (nil = no fork, 0 = already on
shanghai)
cancun_block:
title: shanghai switch time (nil = no fork, 0 = already on shanghai)
cancun_time:
type: string
title: cancun_block switch block (nil = no fork, 0 = already on cancun)
title: cancun switch time (nil = no fork, 0 = already on cancun)
prague_time:
type: string
title: prague switch time (nil = no fork, 0 = already on prague)
description: >-
ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int
values
Expand Down Expand Up @@ -45066,16 +45101,15 @@ definitions:
title: >-
merge_netsplit_block: Virtual fork after The Merge to use as a
network splitter
shanghai_block:
shanghai_time:
type: string
title: >-
shanghai_block switch block (nil = no fork, 0 = already on
shanghai)
cancun_block:
title: shanghai switch time (nil = no fork, 0 = already on shanghai)
cancun_time:
type: string
title: >-
cancun_block switch block (nil = no fork, 0 = already on
cancun)
title: cancun switch time (nil = no fork, 0 = already on cancun)
prague_time:
type: string
title: prague switch time (nil = no fork, 0 = already on prague)
description: >-
ChainConfig defines the Ethereum ChainConfig parameters using
*sdk.Int values
Expand Down Expand Up @@ -45249,14 +45283,15 @@ definitions:
title: >-
merge_netsplit_block: Virtual fork after The Merge to use as a
network splitter
shanghai_block:
shanghai_time:
type: string
title: >-
shanghai_block switch block (nil = no fork, 0 = already on
shanghai)
cancun_block:
title: shanghai switch time (nil = no fork, 0 = already on shanghai)
cancun_time:
type: string
title: cancun switch time (nil = no fork, 0 = already on cancun)
prague_time:
type: string
title: cancun_block switch block (nil = no fork, 0 = already on cancun)
title: prague switch time (nil = no fork, 0 = already on prague)
description: >-
ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int
values
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ require (
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.1 // indirect
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
github.com/DataDog/zstd v1.4.5 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/alitto/pond v1.8.3 // indirect
Expand Down Expand Up @@ -83,14 +83,14 @@ require (
github.com/crypto-org-chain/cronos/memiavl v0.0.4 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/dop251/goja v0.0.0-20230122112309-96b1610dd4f7 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
Expand Down Expand Up @@ -132,6 +132,7 @@ require (
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.1 // indirect
github.com/huandu/skiplist v1.2.0 // indirect
Expand Down Expand Up @@ -172,7 +173,6 @@ require (
github.com/rakyll/statik v0.1.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/regen-network/cosmos-proto v0.3.1 // indirect
github.com/rjeczalik/notify v0.9.1 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rs/cors v1.8.3 // indirect
github.com/rs/zerolog v1.30.0 // indirect
Expand All @@ -181,7 +181,7 @@ require (
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.16.0 // indirect
github.com/status-im/keycard-go v0.0.0-20200402102358-957c09536969 // indirect
github.com/status-im/keycard-go v0.2.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
Expand Down Expand Up @@ -233,8 +233,8 @@ replace (
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
github.com/ethereum/go-ethereum => github.com/evmos/go-ethereum v1.10.26-evmos-rc1
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20231114052006-8b1ec2327fac
github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231122021350-f905c2ec3570
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20231204041029-ccb83e2e0688
// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
Expand Down
Loading
Loading