From cbb180dd0725c939da649d473065a9d25809f585 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 21 Feb 2022 12:27:43 +0800 Subject: [PATCH 1/4] Problem: Websocket blocks after terminating without unsubscribing Closes: #207 Solution: - backport the fix to 0.6.x --- CHANGELOG.md | 8 ++++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ac490b8fd..dbb8557249 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ ### Bug Fixes +- (rpc) [cronos#]() fix newPendingTransactions subscription deadlock issue, backport the fix in ethermint. + +*February 18, 2022* + +## v0.6.6 + +### Bug Fixes + - (rpc) [cronos#343](https://github.com/crypto-org-chain/cronos/pull/343) newPendingTransactions filter should return ethereum tx hash. ### Improvements diff --git a/go.mod b/go.mod index 2da8d2c363..74898fa71f 100644 --- a/go.mod +++ b/go.mod @@ -164,7 +164,7 @@ replace github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethere // TODO: remove when ibc-go and ethermint upgrades cosmos-sdk replace github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.44.7-0.20220214161517-8a26cd10b4be -replace github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.7.2-cronos-8 +replace github.com/tharsis/ethermint => github.com/yihuang/ethermint v0.7.2-cronos-7.0.20220221042333-8fe755d23a29 // Note: gorocksdb bindings for OptimisticTransactionDB are not merged upstream, so we use a fork // See https://github.com/tecbot/gorocksdb/pull/216 diff --git a/go.sum b/go.sum index 9abc81d7a0..1121a96d25 100644 --- a/go.sum +++ b/go.sum @@ -237,8 +237,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/crypto-org-chain/ethermint v0.7.2-cronos-8 h1:uYYprF6KqlJnnCM2dPtnf4g/0rxNoqG0yDPjqTPU0BA= -github.com/crypto-org-chain/ethermint v0.7.2-cronos-8/go.mod h1:J96LX4KvLyl+5jV6+mt/4l6srtGX/mdDTuqQQuYrdDk= github.com/crypto-org-chain/go-ethereum v1.10.3-patched h1:kr6oQIYOi2VC8SZwkhlUDZE1Omit/YHVysKMgCB2nes= github.com/crypto-org-chain/go-ethereum v1.10.3-patched/go.mod h1:99onQmSd1GRGOziyGldI41YQb7EESX3Q4H41IfJgIQQ= github.com/crypto-org-chain/ibc-go v1.2.1-hooks h1:wuWaQqm/TFKJQwuFgjCPiPumQio+Yik5Z1DObDExrrU= @@ -1024,6 +1022,8 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: github.com/xtaci/kcp-go v5.4.20+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= +github.com/yihuang/ethermint v0.7.2-cronos-7.0.20220221042333-8fe755d23a29 h1:6Z3wLongbiQ2fMvSjUqMbFduDwd97r6b3LbXPvx+BaQ= +github.com/yihuang/ethermint v0.7.2-cronos-7.0.20220221042333-8fe755d23a29/go.mod h1:J96LX4KvLyl+5jV6+mt/4l6srtGX/mdDTuqQQuYrdDk= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From 46a104f78e39cd329da1f99e455f71e06ba1a0cc Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 21 Feb 2022 13:27:46 +0800 Subject: [PATCH 2/4] update gomod2nix.toml --- gomod2nix.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gomod2nix.toml b/gomod2nix.toml index 0217a788aa..26f41c7699 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -3712,13 +3712,13 @@ sha256 = "1sgjf2vaq554ybc0cwkzn17cz2ibzph2rq0dgaw21c2hym09437x" ["github.com/tharsis/ethermint"] - sumVersion = "v0.7.2-cronos-8" - vendorPath = "github.com/crypto-org-chain/ethermint" + sumVersion = "v0.7.2-cronos-7.0.20220221042333-8fe755d23a29" + vendorPath = "github.com/yihuang/ethermint" ["github.com/tharsis/ethermint".fetch] type = "git" - url = "https://github.com/crypto-org-chain/ethermint" - rev = "ad83067f4a5f4d72b5bcc64e52da0ae5c8b6d74b" - sha256 = "03zzqxf94i4y5lgsr3iwdikbbljw32p78zmqzwikj0jbjb53rrqs" + url = "https://github.com/yihuang/ethermint" + rev = "8fe755d23a29b2ff454e7573e5178e3e1ef5e908" + sha256 = "0m8jr3710mx8011580azx2akz70zv7sks3hmx8425nvbnn3kl2ps" ["github.com/tidwall/gjson"] sumVersion = "v1.6.7" From a222b2619504840f825173785c1b9c64a454968a Mon Sep 17 00:00:00 2001 From: yihuang Date: Mon, 21 Feb 2022 14:37:15 +0800 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbb8557249..5e96974c5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Bug Fixes -- (rpc) [cronos#]() fix newPendingTransactions subscription deadlock issue, backport the fix in ethermint. +- (rpc) [cronos#352](https://github.com/crypto-org-chain/cronos/pull/352) fix newPendingTransactions subscription deadlock issue, backport the fix in ethermint. *February 18, 2022* From a2c1a1bdbe9a9c1a80df50784a30ed670120d3a1 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 21 Feb 2022 15:00:25 +0800 Subject: [PATCH 4/4] tag ethermint --- go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 74898fa71f..e073d34ebf 100644 --- a/go.mod +++ b/go.mod @@ -164,7 +164,7 @@ replace github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethere // TODO: remove when ibc-go and ethermint upgrades cosmos-sdk replace github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.44.7-0.20220214161517-8a26cd10b4be -replace github.com/tharsis/ethermint => github.com/yihuang/ethermint v0.7.2-cronos-7.0.20220221042333-8fe755d23a29 +replace github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.7.2-cronos-9 // Note: gorocksdb bindings for OptimisticTransactionDB are not merged upstream, so we use a fork // See https://github.com/tecbot/gorocksdb/pull/216 diff --git a/go.sum b/go.sum index 1121a96d25..e61a77f9fe 100644 --- a/go.sum +++ b/go.sum @@ -237,6 +237,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/crypto-org-chain/ethermint v0.7.2-cronos-9 h1:irEh7GgeDz17acQwU0FKjUVnNMIXmoY8C9XRH9SH+RU= +github.com/crypto-org-chain/ethermint v0.7.2-cronos-9/go.mod h1:J96LX4KvLyl+5jV6+mt/4l6srtGX/mdDTuqQQuYrdDk= github.com/crypto-org-chain/go-ethereum v1.10.3-patched h1:kr6oQIYOi2VC8SZwkhlUDZE1Omit/YHVysKMgCB2nes= github.com/crypto-org-chain/go-ethereum v1.10.3-patched/go.mod h1:99onQmSd1GRGOziyGldI41YQb7EESX3Q4H41IfJgIQQ= github.com/crypto-org-chain/ibc-go v1.2.1-hooks h1:wuWaQqm/TFKJQwuFgjCPiPumQio+Yik5Z1DObDExrrU= @@ -1022,8 +1024,6 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: github.com/xtaci/kcp-go v5.4.20+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= -github.com/yihuang/ethermint v0.7.2-cronos-7.0.20220221042333-8fe755d23a29 h1:6Z3wLongbiQ2fMvSjUqMbFduDwd97r6b3LbXPvx+BaQ= -github.com/yihuang/ethermint v0.7.2-cronos-7.0.20220221042333-8fe755d23a29/go.mod h1:J96LX4KvLyl+5jV6+mt/4l6srtGX/mdDTuqQQuYrdDk= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/gomod2nix.toml b/gomod2nix.toml index 26f41c7699..a25b2102fb 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -3712,11 +3712,11 @@ sha256 = "1sgjf2vaq554ybc0cwkzn17cz2ibzph2rq0dgaw21c2hym09437x" ["github.com/tharsis/ethermint"] - sumVersion = "v0.7.2-cronos-7.0.20220221042333-8fe755d23a29" - vendorPath = "github.com/yihuang/ethermint" + sumVersion = "v0.7.2-cronos-9" + vendorPath = "github.com/crypto-org-chain/ethermint" ["github.com/tharsis/ethermint".fetch] type = "git" - url = "https://github.com/yihuang/ethermint" + url = "https://github.com/crypto-org-chain/ethermint" rev = "8fe755d23a29b2ff454e7573e5178e3e1ef5e908" sha256 = "0m8jr3710mx8011580azx2akz70zv7sks3hmx8425nvbnn3kl2ps"