Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bech32 encoding support #3202

Merged
merged 4 commits into from May 8, 2018
Merged

Bech32 encoding support #3202

merged 4 commits into from May 8, 2018

Conversation

str4d
Copy link
Contributor

@str4d str4d commented Apr 23, 2018

Cherry-picked from the following upstream PRs:

Part of #3058.

@str4d str4d requested review from bitcartel and mdr0id April 23, 2018 22:07
@str4d str4d added this to the v1.1.1 milestone Apr 23, 2018
@str4d str4d changed the title 3058 sapling bech32 Bech32 encoding support Apr 23, 2018
@str4d str4d changed the title Bech32 encoding support Bech32 encoding support and t-addr encoding refactor Apr 23, 2018
@str4d str4d added C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. C-cleanup Category: PRs that clean code up or issues documenting cleanup. labels Apr 23, 2018
@str4d str4d added this to Implemented — Waiting for ACKs in Arborist Team Apr 23, 2018
@str4d
Copy link
Contributor Author

str4d commented Apr 23, 2018

@zkbot try

@zkbot
Copy link
Contributor

zkbot commented Apr 23, 2018

⌛ Trying commit 1f6f5a2 with merge 2c1f65d...

zkbot added a commit that referenced this pull request Apr 23, 2018
Bech32 encoding support and t-addr encoding refactor

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7922
- bitcoin/bitcoin#7825
- bitcoin/bitcoin#8317
- bitcoin/bitcoin#9804
  - Only the commit that changed `base58.cpp`
- bitcoin/bitcoin#11117
- bitcoin/bitcoin#11259
- bitcoin/bitcoin#11167
  - Only the first three commits (the fourth commit depends on #2390, later ones are SegWit-specific).

Part of #3058.
@zkbot
Copy link
Contributor

zkbot commented Apr 24, 2018

☀️ Test successful - pr-try
State: approved= try=True

@str4d
Copy link
Contributor Author

str4d commented Apr 24, 2018

Updated PR so that it now contains both the CBitcoinAddress and CBitcoinSecret refactors.

@zkbot try

@zkbot
Copy link
Contributor

zkbot commented Apr 24, 2018

⌛ Trying commit 2219e6f with merge 1c2f24793b665e4b56a85e6eebabc40b7a59e554...

@zkbot
Copy link
Contributor

zkbot commented Apr 25, 2018

☀️ Test successful - pr-try
State: approved= try=True

@str4d
Copy link
Contributor Author

str4d commented Apr 25, 2018

Implemented the changes to remove CZCEncoding, and then pulled in the remaining upstream changes to clean up transparent address encoding.

@zkbot try

@zkbot
Copy link
Contributor

zkbot commented Apr 25, 2018

⌛ Trying commit ebf0745 with merge d5b558ba5be0186b049bbc764139e50fa059e72b...

@str4d str4d changed the title Bech32 encoding support and t-addr encoding refactor Bech32 encoding support and address encoding refactor Apr 25, 2018
@zkbot
Copy link
Contributor

zkbot commented Apr 25, 2018

💔 Test failed - pr-try

@str4d
Copy link
Contributor Author

str4d commented Apr 25, 2018

Missed some includes in Zcash-specific code; pushed a commit to fix.

@zkbot try

@zkbot
Copy link
Contributor

zkbot commented Apr 25, 2018

⌛ Trying commit cb13473 with merge 962ba99b3658005a16711eb2a11fd30a5ea94a05...

@zkbot
Copy link
Contributor

zkbot commented Apr 25, 2018

💔 Test failed - pr-try

@str4d
Copy link
Contributor Author

str4d commented Apr 25, 2018

Transient failure in one of the RPC tests.

@str4d str4d moved this from In Review to In Progress in Arborist Team Apr 26, 2018
@bitcartel
Copy link
Contributor

@zkbot try

@zkbot
Copy link
Contributor

zkbot commented May 7, 2018

⌛ Trying commit 768cd14 with merge 19ac942...

zkbot added a commit that referenced this pull request May 7, 2018
Bech32 encoding support

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#8578
- bitcoin/bitcoin#11167
  - Only the second and third commits (first is in #3228, fourth depends on #2390, later ones are SegWit-specific).
- bitcoin/bitcoin#12757
  - Only the change to `src/bech32.h`

Part of #3058.
@str4d
Copy link
Contributor Author

str4d commented May 7, 2018

I'm gonna interrupt the try above, as we've already run one (modulo the merge conflict rebase), and any information the try would add to the two ACKs can be gleaned from the merge CI suite without the extra 1.5 hours.

@zkbot
Copy link
Contributor

zkbot commented May 7, 2018

💔 Test failed - pr-try

@str4d
Copy link
Contributor Author

str4d commented May 7, 2018

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented May 7, 2018

📌 Commit 768cd14 has been approved by str4d

@zkbot
Copy link
Contributor

zkbot commented May 7, 2018

⌛ Testing commit 768cd14 with merge 42037a9b35a3543d97c01343b6c6987117135f47...

@zkbot
Copy link
Contributor

zkbot commented May 8, 2018

💔 Test failed - pr-merge

@bitcartel
Copy link
Contributor

Build error, nullifier test time out.

Tests successful
--- Success: wallet_overwintertx.py ---
=== Running testscript wallet_nullifiers.py ===
command timed out: 1200 seconds without output running ['./qa/zcash/full_test_suite.py', 'rpc'], attempting to kill
process killed by signal 9
program finished with exit code -1
elapsedTime=3088.330927

@str4d
Copy link
Contributor Author

str4d commented May 8, 2018

Yeah, transient failures (AWS-related likely).

@zkbot retry p=1

@zkbot
Copy link
Contributor

zkbot commented May 8, 2018

⌛ Testing commit 768cd14 with merge c31718fea2d983d0021914c8b77de60b80a80d45...

@zkbot
Copy link
Contributor

zkbot commented May 8, 2018

💔 Test failed - pr-merge

@str4d
Copy link
Contributor Author

str4d commented May 8, 2018 via email

@zkbot
Copy link
Contributor

zkbot commented May 8, 2018

⌛ Testing commit 768cd14 with merge 01b1962cb60b23e936d5607d37d591d2878de704...

@zkbot
Copy link
Contributor

zkbot commented May 8, 2018

💔 Test failed - pr-merge

@str4d
Copy link
Contributor Author

str4d commented May 8, 2018

Another transient hang in one of the EC2 workers 😠

@zkbot retry

@zkbot
Copy link
Contributor

zkbot commented May 8, 2018

⌛ Testing commit 768cd14 with merge b1d2a69...

zkbot added a commit that referenced this pull request May 8, 2018
Bech32 encoding support

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#8578
- bitcoin/bitcoin#11167
  - Only the second and third commits (first is in #3228, fourth depends on #2390, later ones are SegWit-specific).
- bitcoin/bitcoin#12757
  - Only the change to `src/bech32.h`

Part of #3058.
@zkbot
Copy link
Contributor

zkbot commented May 8, 2018

☀️ Test successful - pr-merge
Approved by: str4d
Pushing b1d2a69 to master...

@zkbot zkbot merged commit 768cd14 into zcash:master May 8, 2018
Arborist Team automation moved this from In Review to Released (Merged in Master) May 8, 2018
@str4d str4d mentioned this pull request May 8, 2018
@str4d str4d deleted the 3058-sapling-bech32 branch June 7, 2018 05:41
mkjekk pushed a commit to mkjekk/zcash that referenced this pull request Aug 12, 2018
Refactor t-address encoding

Includes code cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#11117
- bitcoin/bitcoin#11259
  - Only the second commit (first is for QT code)
- bitcoin/bitcoin#11167
  - Only the first commit (the rest are not part of the t-address
encoding refactor).

Part of zcash#3058. Precursor to zcash#3202.
mkjekk added a commit to mkjekk/zcash that referenced this pull request Aug 12, 2018
Refactor t-address encoding

Includes code cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#11117
- bitcoin/bitcoin#11259
  - Only the second commit (first is for QT code)
- bitcoin/bitcoin#11167
  - Only the first commit (the rest are not part of the t-address
encoding refactor).

Part of zcash#3058. Precursor to zcash#3202.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. External Encoding
Projects
Arborist Team
  
Released (Merged in Master)
Development

Successfully merging this pull request may close these issues.

None yet

5 participants