Skip to content

feat: geth v1.15 integration #1807

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Aug 12, 2025
Merged

feat: geth v1.15 integration #1807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de58d6c
feat: geth v1.15
XinyuCRO Jul 31, 2025
2133fda
fix: lint
XinyuCRO Jul 31, 2025
652fbcd
feat: update version
XinyuCRO Jul 31, 2025
9a01568
deps: update ethermint
XinyuCRO Aug 12, 2025
ee8335c
Merge branch 'main' into feat/geth-1.15
XinyuCRO Aug 12, 2025
890131d
ci: update install-nix-action
XinyuCRO Aug 12, 2025
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
timeout-minutes: 40
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
files: |
go.mod
go.sum
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
with:
files: |
contracts
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-24.05
extra_nix_config: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
go-version: '1.22.7'
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
**/poetry.lock
**/pyproject.toml
**/*.py
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand All @@ -104,7 +104,7 @@ jobs:
files: |
*.nix
**/*.nix
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
environment: release
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
environment: release
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
docs
*.md
**/*.md
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
docs
*.md
**/*.md
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand All @@ -116,7 +116,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: cachix/install-nix-action@6a9a9e84a173d90b3ffb42c5ddaf9ea033fad011 # v23
- uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
with:
nix_path: nixpkgs=channel:nixos-22.11
extra_nix_config: |
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* [#1779](https://github.com/crypto-org-chain/cronos/pull/1779) Upgrade rocksdb to `v9.11.2`.
* [#1824](https://github.com/crypto-org-chain/cronos/pull/1824) Rework on github actions.
* [#1826](https://github.com/crypto-org-chain/cronos/pull/1826) Update linter and tidy up code.
* [#1807](https://github.com/crypto-org-chain/cronos/pull/1807) Update go-ethereum version to [v1.15.11](https://github.com/ethereum/go-ethereum/releases/tag/v1.15.11).

*Jun 20, 2025*

Expand Down
5 changes: 3 additions & 2 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ import (
_ "github.com/ethereum/go-ethereum/eth/tracers/js"
_ "github.com/ethereum/go-ethereum/eth/tracers/native"
ethparams "github.com/ethereum/go-ethereum/params"
evmapp "github.com/evmos/ethermint/app"
evmante "github.com/evmos/ethermint/app/ante"
evmenc "github.com/evmos/ethermint/encoding"
"github.com/evmos/ethermint/ethereum/eip712"
evmapp "github.com/evmos/ethermint/evmd"
evmante "github.com/evmos/ethermint/evmd/ante"
srvflags "github.com/evmos/ethermint/server/flags"
ethermint "github.com/evmos/ethermint/types"
"github.com/evmos/ethermint/x/evm"
Expand Down Expand Up @@ -637,6 +637,7 @@ func New(
return cronosprecompiles.NewIcaContract(ctx, app.ICAControllerKeeper, &app.CronosKeeper, appCodec, gasConfig)
},
},
cast.ToUint64(appOpts.Get(server.FlagQueryGasLimit)),
)

// this line is used by starport scaffolding # stargate/app/keeperDefinition
Expand Down
2 changes: 1 addition & 1 deletion app/sim_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
cronosmoduletypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
evmante "github.com/evmos/ethermint/app/ante"
evmante "github.com/evmos/ethermint/evmd/ante"
evmtypes "github.com/evmos/ethermint/x/evm/types"
"github.com/stretchr/testify/require"

Expand Down
2 changes: 1 addition & 1 deletion app/test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
tmtypes "github.com/cometbft/cometbft/types"
dbm "github.com/cosmos/cosmos-db"
cronostypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
"github.com/evmos/ethermint/app"
app "github.com/evmos/ethermint/evmd"
"github.com/stretchr/testify/require"

"cosmossdk.io/errors"
Expand Down
Loading
Loading