Rebase web3, use upstream ethabi#2362
Merged
Merged
Conversation
Closed
lutter
approved these changes
Apr 9, 2021
This was referenced Apr 12, 2021
Closed
Closed
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I've rebased web3 to the upstream master in the
leo/test-rebase-upstream-masterbranch, if this change is successful that can be made the new master. The primary goal is to have web3 use tokio 1.0, mixing tokio 1.0 with 0.1 might be the potential cause of the deadlocks we're seeing after upgrading to tokio 1.0. Our ethabi patches have been upstreamed (thanks @vkgnosis), so we can switch back to upstream ethabi.This leaves the jsonrpc server as the only outdated tokio, which is sufficiently isolated to not cause problems.
Read with whitespace diff disabled.