Skip to content

Commit e996f6d

Browse files
committed
Merge branch 'main' of github.com:crypto-org-chain/cronos into feat/geth-1.15
# Conflicts: # go.mod # go.sum # gomod2nix.toml # x/cronos/keeper/precompiles/relayer.go
2 parents 3ebccf5 + de23491 commit e996f6d

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ replace (
304304
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
305305
// github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a
306306
github.com/ethereum/go-ethereum => github.com/XinyuCRO/go-ethereum v1.10.24-0.20250521023618-159d931d189a
307-
// release/v1.4.x-2
307+
// develop
308308
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20250718093123-270db5ecb178
309309
// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
310310
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409

gomod2nix.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ schema = 3
314314
version = "v0.2.2"
315315
hash = "sha256-0MLfSJKdeK3Z7tWAXTdzwB4091dmyxIX38S5SKH5QAw="
316316
[mod."github.com/evmos/ethermint"]
317-
version = "v0.6.1-0.20250717081702-82aea6c8e097"
318-
hash = "sha256-ORpjR9yv8GTwdA1QYz5VgoIKGt0j3EWBs3vp9N1ghIc="
317+
version = "v0.6.1-0.20250718093123-270db5ecb178"
318+
hash = "sha256-kpeHNO5QOMGNdcCiuVZWHqlw1WSnIYm+/k997glAwH0="
319319
replaced = "github.com/crypto-org-chain/ethermint"
320320
[mod."github.com/fatih/color"]
321321
version = "v1.17.0"

0 commit comments

Comments
 (0)