fix #1927: upgrade btcd#1928
Closed
vikstrous2 wants to merge 2 commits intocelo-org:masterfrom
Closed
Conversation
vikstrous2
requested review from
hbandura and
mcortesi
and removed request for
a team
Contributor
|
@vikstrous2 I haven't had time to review this yet, but could you resolve the conflicts still? Thanks |
vikstrous2
force-pushed
the
upgrade-btcd
branch
from
786855c to
0292e58
Compare
Contributor
Author
|
Rebased. It seems like CI is not configured to run against PRs from forks? |
Contributor
Author
|
Bump? This is blocking us from being able to upgrade our btcd dependency (unless we fork celo-blockchain). |
Contributor
|
@vikstrous2 we've updated our CI config to run forked PRs, if you could merge master again and resolve the conflicts then we can see how CI fares. |
vikstrous2
force-pushed
the
upgrade-btcd
branch
from
0292e58 to
ccbda52
Compare
Contributor
Author
|
rebased |
Collaborator
|
@vikstrous2 Thanks for this PR, I cherry-picked your commit and added a commit to disable the broken ios build in #1990. |
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
4 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.
Description
Upgrading some dependencies - see #1927
Ported ethereum/go-ethereum#24533 and made some extra changes to make things work
Other changes
Some changes ported from ethereum/go-ethereum#24533 might not have been absolutely necessary (ex. fixing a typo)
Tested
Existing tests
Related issues
Backwards compatibility
According to #24533, the changes are perfectly compatible and affect only non-cgo builds anyway. Looks like celo-blockchain can't build without cgo yet, so this is definitely not going to be an issue.