From 1c9341a8cb9cf864a4f04c9f1c6d9a3c713e89df Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 13 Nov 2023 17:32:23 +0800 Subject: [PATCH 1/6] Problem: websocket refactoring not used Solution: - use the recent websocket/filter system refactoring in ethermint. --- go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 6 +++--- integration_tests/test_subscribe.py | 2 -- x/cronos/rpc/api.go | 4 ++-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 561b82d3f2..b226b1438b 100644 --- a/go.mod +++ b/go.mod @@ -234,7 +234,7 @@ replace ( // 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.20231101080732-b9078abfe0fd + github.com/evmos/ethermint => github.com/yihuang/ethermint v0.6.1-0.20231113092823-55f5531711a4 // 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 diff --git a/go.sum b/go.sum index 147cee1f5e..afcd546fef 100644 --- a/go.sum +++ b/go.sum @@ -484,8 +484,6 @@ github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 h1:R1 github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63/go.mod h1:rocwIfnS+kA060x64gkSIRvWB9StSppIkJuo5MWzL24= github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20231013072415-eec017435467 h1:m0/aHPIJAzi2MSP3TXzzbLTFf+koRFQiaYmerRZUtK4= github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20231013072415-eec017435467/go.mod h1:G384omH7cXgm90xXR7xpHvsKG7vdBaDuz4To6GpTHUU= -github.com/crypto-org-chain/ethermint v0.6.1-0.20231101080732-b9078abfe0fd h1:8AWwJrxYtQxoZ1rrM9+w6MLScVe6LzskRo8UF9ep7Qs= -github.com/crypto-org-chain/ethermint v0.6.1-0.20231101080732-b9078abfe0fd/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0= github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e h1:rSTc35OBjjCBx47rHPWBCIHNGPbMnEj8f7fNcK2TjVI= github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e/go.mod h1:HBaDqlFjlaXJwVQtA7jHejyaA7xwjXI2o6pU/ccP3tE= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= @@ -1566,6 +1564,8 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= +github.com/yihuang/ethermint v0.6.1-0.20231113092823-55f5531711a4 h1:8fCPulwW6LBDzO8iS3XlagR99C/N5hxDrPhshpk/rcw= +github.com/yihuang/ethermint v0.6.1-0.20231113092823-55f5531711a4/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0= github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= diff --git a/gomod2nix.toml b/gomod2nix.toml index f433fd8f68..3afc1de378 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -216,9 +216,9 @@ schema = 3 hash = "sha256-GgcReGsIIuBE2TabDYqDO9sBGogdVr9RSh4arQzdPnE=" replaced = "github.com/evmos/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20231101080732-b9078abfe0fd" - hash = "sha256-FlKoOdJbNqQfloOxV5AGd5TIm3VLjoZW8YOLnuJY7FY=" - replaced = "github.com/crypto-org-chain/ethermint" + version = "v0.6.1-0.20231113092823-55f5531711a4" + hash = "sha256-QxbKVOM3hr3/nJCg/CnjvKX8jnUmagxf6F5gGgrtCKQ=" + replaced = "github.com/yihuang/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" hash = "sha256-hj6FZQ1fDAV+1wGIViAt8XaAkWZ1I5vJzgjIJa7XRBA=" diff --git a/integration_tests/test_subscribe.py b/integration_tests/test_subscribe.py index 1e88dcc1a5..ed6658a192 100644 --- a/integration_tests/test_subscribe.py +++ b/integration_tests/test_subscribe.py @@ -3,7 +3,6 @@ import time from collections import defaultdict -import pytest import websockets from eth_utils import abi from hexbytes import HexBytes @@ -82,7 +81,6 @@ async def unsubscribe(self, sub_id): TEST_EVENT_TOPIC = Web3.keccak(text="TestEvent(uint256)") -@pytest.mark.flaky(max_runs=2) def test_subscribe_basic(cronos: Cronos): """ test basic subscribe and unsubscribe diff --git a/x/cronos/rpc/api.go b/x/cronos/rpc/api.go index 7ac7f00c3f..bf4fa9fb76 100644 --- a/x/cronos/rpc/api.go +++ b/x/cronos/rpc/api.go @@ -8,7 +8,6 @@ import ( "github.com/cometbft/cometbft/libs/log" coretypes "github.com/cometbft/cometbft/rpc/core/types" - rpcclient "github.com/cometbft/cometbft/rpc/jsonrpc/client" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server" "github.com/crypto-org-chain/cronos/v2/x/cronos/types" @@ -19,6 +18,7 @@ import ( "github.com/ethereum/go-ethereum/rpc" evmrpc "github.com/evmos/ethermint/rpc" "github.com/evmos/ethermint/rpc/backend" + "github.com/evmos/ethermint/rpc/stream" rpctypes "github.com/evmos/ethermint/rpc/types" ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" @@ -40,7 +40,7 @@ func init() { } // CreateCronosRPCAPIs creates extension json-rpc apis -func CreateCronosRPCAPIs(ctx *server.Context, clientCtx client.Context, tmWSClient *rpcclient.WSClient, allowUnprotectedTxs bool, indexer ethermint.EVMTxIndexer) []rpc.API { +func CreateCronosRPCAPIs(ctx *server.Context, clientCtx client.Context, _ *stream.RPCStream, allowUnprotectedTxs bool, indexer ethermint.EVMTxIndexer) []rpc.API { evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx, allowUnprotectedTxs, indexer) return []rpc.API{ { From 964e3ea4cd752a568df5c37de12709888406a2de Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 13 Nov 2023 20:48:28 +0800 Subject: [PATCH 2/6] update ethermint --- go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index b226b1438b..e405a30bc6 100644 --- a/go.mod +++ b/go.mod @@ -234,7 +234,7 @@ replace ( // 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/yihuang/ethermint v0.6.1-0.20231113092823-55f5531711a4 + github.com/evmos/ethermint => github.com/yihuang/ethermint v0.6.1-0.20231113124339-9bedaf3d28d0 // 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 diff --git a/go.sum b/go.sum index afcd546fef..398c7d6879 100644 --- a/go.sum +++ b/go.sum @@ -1564,8 +1564,8 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= -github.com/yihuang/ethermint v0.6.1-0.20231113092823-55f5531711a4 h1:8fCPulwW6LBDzO8iS3XlagR99C/N5hxDrPhshpk/rcw= -github.com/yihuang/ethermint v0.6.1-0.20231113092823-55f5531711a4/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0= +github.com/yihuang/ethermint v0.6.1-0.20231113124339-9bedaf3d28d0 h1:cn7FWGQogxiHyeMi/2S10apD3/mYIvGFM9ZZIOVjvLw= +github.com/yihuang/ethermint v0.6.1-0.20231113124339-9bedaf3d28d0/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0= github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= diff --git a/gomod2nix.toml b/gomod2nix.toml index 3afc1de378..5b48889cb5 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -216,8 +216,8 @@ schema = 3 hash = "sha256-GgcReGsIIuBE2TabDYqDO9sBGogdVr9RSh4arQzdPnE=" replaced = "github.com/evmos/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20231113092823-55f5531711a4" - hash = "sha256-QxbKVOM3hr3/nJCg/CnjvKX8jnUmagxf6F5gGgrtCKQ=" + version = "v0.6.1-0.20231113124339-9bedaf3d28d0" + hash = "sha256-EgS+vT2yjSnJ1UL4LvefB+wMdbJ0q/BStXAPVpxiJTI=" replaced = "github.com/yihuang/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" From 6910f84d40ef0113f730533e83fe9a010faee82c Mon Sep 17 00:00:00 2001 From: mmsqe Date: Tue, 14 Nov 2023 09:08:44 +0800 Subject: [PATCH 3/6] update filter offset to latest so only new changes are fetched in next call --- integration_tests/test_filters.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration_tests/test_filters.py b/integration_tests/test_filters.py index cbde7eeb88..bcd65a786c 100644 --- a/integration_tests/test_filters.py +++ b/integration_tests/test_filters.py @@ -12,6 +12,8 @@ def test_pending_transaction_filter(cluster): w3: Web3 = cluster.w3 flt = w3.eth.filter("pending") + # update offset to latest in stream server side + flt.get_new_entries() assert flt.get_new_entries() == [] receipt = send_transaction(w3, {"to": ADDRS["community"], "value": 1000}) assert receipt.status == 1 From 9e4e0f48855b7f81f13f781965f9bf82e7429836 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Tue, 14 Nov 2023 09:40:24 +0800 Subject: [PATCH 4/6] fix filter --- go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e405a30bc6..7d0f10297c 100644 --- a/go.mod +++ b/go.mod @@ -234,7 +234,7 @@ replace ( // 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/yihuang/ethermint v0.6.1-0.20231113124339-9bedaf3d28d0 + github.com/evmos/ethermint => github.com/yihuang/ethermint v0.6.1-0.20231114013335-14d06feb6110 // 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 diff --git a/go.sum b/go.sum index 398c7d6879..d2af71e2f9 100644 --- a/go.sum +++ b/go.sum @@ -1564,8 +1564,8 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= -github.com/yihuang/ethermint v0.6.1-0.20231113124339-9bedaf3d28d0 h1:cn7FWGQogxiHyeMi/2S10apD3/mYIvGFM9ZZIOVjvLw= -github.com/yihuang/ethermint v0.6.1-0.20231113124339-9bedaf3d28d0/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0= +github.com/yihuang/ethermint v0.6.1-0.20231114013335-14d06feb6110 h1:zO8iAid3OU8HPXnVQv/mc9sEFyW4slwvZ6yNq+PtNjk= +github.com/yihuang/ethermint v0.6.1-0.20231114013335-14d06feb6110/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0= github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= diff --git a/gomod2nix.toml b/gomod2nix.toml index 5b48889cb5..53d528f7f5 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -216,8 +216,8 @@ schema = 3 hash = "sha256-GgcReGsIIuBE2TabDYqDO9sBGogdVr9RSh4arQzdPnE=" replaced = "github.com/evmos/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20231113124339-9bedaf3d28d0" - hash = "sha256-EgS+vT2yjSnJ1UL4LvefB+wMdbJ0q/BStXAPVpxiJTI=" + version = "v0.6.1-0.20231114013335-14d06feb6110" + hash = "sha256-nFz4KwO34T/U7ELn1nebK7Dd7shieszDrZ/2lzthF/U=" replaced = "github.com/yihuang/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" From f4a0708fa2af7e6921675bd3e179b93d279723fd Mon Sep 17 00:00:00 2001 From: HuangYi Date: Tue, 14 Nov 2023 09:59:31 +0800 Subject: [PATCH 5/6] Revert "update filter offset to latest so only new changes are fetched in next call" This reverts commit 6910f84d40ef0113f730533e83fe9a010faee82c. --- integration_tests/test_filters.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/integration_tests/test_filters.py b/integration_tests/test_filters.py index bcd65a786c..cbde7eeb88 100644 --- a/integration_tests/test_filters.py +++ b/integration_tests/test_filters.py @@ -12,8 +12,6 @@ def test_pending_transaction_filter(cluster): w3: Web3 = cluster.w3 flt = w3.eth.filter("pending") - # update offset to latest in stream server side - flt.get_new_entries() assert flt.get_new_entries() == [] receipt = send_transaction(w3, {"to": ADDRS["community"], "value": 1000}) assert receipt.status == 1 From 3f2c0d1c6256544f603d9c5f3fcb240358b1a54c Mon Sep 17 00:00:00 2001 From: HuangYi Date: Tue, 14 Nov 2023 13:56:31 +0800 Subject: [PATCH 6/6] changelog --- CHANGELOG.md | 4 ++++ go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6210d412a..19965fccaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ - [#1232](https://github.com/crypto-org-chain/cronos/pull/1232) Adjust require gas in relayer precompile to be closed with actual consumed. +### Improvements + +- [#1239](https://github.com/crypto-org-chain/cronos/pull/1239) Refactor websocket/subscription system to improve performance and stability. + *October 17, 2023* diff --git a/go.mod b/go.mod index 7d0f10297c..24f5a4ac6e 100644 --- a/go.mod +++ b/go.mod @@ -234,7 +234,7 @@ replace ( // 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/yihuang/ethermint v0.6.1-0.20231114013335-14d06feb6110 + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20231114052006-8b1ec2327fac // 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 diff --git a/go.sum b/go.sum index d2af71e2f9..d28f92ba54 100644 --- a/go.sum +++ b/go.sum @@ -484,6 +484,8 @@ github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 h1:R1 github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63/go.mod h1:rocwIfnS+kA060x64gkSIRvWB9StSppIkJuo5MWzL24= github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20231013072415-eec017435467 h1:m0/aHPIJAzi2MSP3TXzzbLTFf+koRFQiaYmerRZUtK4= github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20231013072415-eec017435467/go.mod h1:G384omH7cXgm90xXR7xpHvsKG7vdBaDuz4To6GpTHUU= +github.com/crypto-org-chain/ethermint v0.6.1-0.20231114052006-8b1ec2327fac h1:b2Zd0b52V+AyCNRGLRiMtxzNGSzG9aLJmrBhmV2wzvc= +github.com/crypto-org-chain/ethermint v0.6.1-0.20231114052006-8b1ec2327fac/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0= github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e h1:rSTc35OBjjCBx47rHPWBCIHNGPbMnEj8f7fNcK2TjVI= github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e/go.mod h1:HBaDqlFjlaXJwVQtA7jHejyaA7xwjXI2o6pU/ccP3tE= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= @@ -1564,8 +1566,6 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= -github.com/yihuang/ethermint v0.6.1-0.20231114013335-14d06feb6110 h1:zO8iAid3OU8HPXnVQv/mc9sEFyW4slwvZ6yNq+PtNjk= -github.com/yihuang/ethermint v0.6.1-0.20231114013335-14d06feb6110/go.mod h1:rbAKU2rftDobCIoCiol3SO+bTqw2cERu9TEki7PvfK0= github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= diff --git a/gomod2nix.toml b/gomod2nix.toml index 53d528f7f5..3a0372dad4 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -216,9 +216,9 @@ schema = 3 hash = "sha256-GgcReGsIIuBE2TabDYqDO9sBGogdVr9RSh4arQzdPnE=" replaced = "github.com/evmos/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20231114013335-14d06feb6110" - hash = "sha256-nFz4KwO34T/U7ELn1nebK7Dd7shieszDrZ/2lzthF/U=" - replaced = "github.com/yihuang/ethermint" + version = "v0.6.1-0.20231114052006-8b1ec2327fac" + hash = "sha256-+Rgexd0GX8/afOw2lMULQfOn8tW5dk5RkxpCFrco3og=" + replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" hash = "sha256-hj6FZQ1fDAV+1wGIViAt8XaAkWZ1I5vJzgjIJa7XRBA="