Skip to content

Commit

Permalink
Problem: subscription deadlock fix is not backported to 0.6.x (#352)
Browse files Browse the repository at this point in the history
* Problem: Websocket blocks after terminating without unsubscribing

Closes: #207
Solution:
- backport the fix to 0.6.x

* update gomod2nix.toml

* Update CHANGELOG.md

* tag ethermint
  • Loading branch information
yihuang authored Feb 21, 2022
1 parent 16dab5d commit 485d128
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

### Bug Fixes

- (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*

## 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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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/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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +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-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/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=
Expand Down
6 changes: 3 additions & 3 deletions gomod2nix.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3712,13 +3712,13 @@
sha256 = "1sgjf2vaq554ybc0cwkzn17cz2ibzph2rq0dgaw21c2hym09437x"

["github.com/tharsis/ethermint"]
sumVersion = "v0.7.2-cronos-8"
sumVersion = "v0.7.2-cronos-9"
vendorPath = "github.com/crypto-org-chain/ethermint"
["github.com/tharsis/ethermint".fetch]
type = "git"
url = "https://github.com/crypto-org-chain/ethermint"
rev = "ad83067f4a5f4d72b5bcc64e52da0ae5c8b6d74b"
sha256 = "03zzqxf94i4y5lgsr3iwdikbbljw32p78zmqzwikj0jbjb53rrqs"
rev = "8fe755d23a29b2ff454e7573e5178e3e1ef5e908"
sha256 = "0m8jr3710mx8011580azx2akz70zv7sks3hmx8425nvbnn3kl2ps"

["github.com/tidwall/gjson"]
sumVersion = "v1.6.7"
Expand Down

0 comments on commit 485d128

Please sign in to comment.