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

ZIP 32 preparations #3447

Merged
merged 5 commits into from Aug 5, 2018

Conversation

@str4d
Copy link
Contributor

str4d commented Aug 4, 2018

Includes Makefile changes cherry-picked from the following upstream PRs:

Part of #3380.

@str4d str4d added this to the v2.0.0 milestone Aug 4, 2018

@str4d str4d requested review from daira , ebfull and Eirik0 and removed request for daira Aug 4, 2018

@str4d str4d added this to In Review in Zcashd Team Aug 4, 2018

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 4, 2018

This PR primarily addresses build system changes necessary to get the ZIP 32 code to compile (fixing linker bugs in the build system, and upgrading Rust).

@daira

daira approved these changes Aug 4, 2018

Copy link
Contributor

daira left a comment

utACK. I did not check the Rust hashes.

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 4, 2018

Pushed another small change to enable the wallet to link to code in the common library. I've now run into linker errors both for ZIP 32 and z_sendmany, so it's a necessary change.

@bitcartel
Copy link
Contributor

bitcartel left a comment

utACK, modulo this builds ok with proton flag enabled.

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 4, 2018

The debian8-kitchensink builder runs with --enable-proton, so we will see any regression.

@zkbot r+

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 4, 2018

📌 Commit b410083 has been approved by str4d

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 4, 2018

⌛️ Testing commit b410083 with merge 0d9fbb0...

zkbot added a commit that referenced this pull request Aug 4, 2018

Auto merge of #3447 - str4d:zip32-prep, r=str4d
ZIP 32 preparations

Includes Makefile changes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7689
- bitcoin/bitcoin#10849

Part of #3380.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 4, 2018

💔 Test failed - pr-merge

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 4, 2018

Hmm, it compiled fine locally.

@zkbot retry

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 4, 2018

⌛️ Testing commit b410083 with merge baae904...

zkbot added a commit that referenced this pull request Aug 4, 2018

Auto merge of #3447 - str4d:zip32-prep, r=str4d
ZIP 32 preparations

Includes Makefile changes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7689
- bitcoin/bitcoin#10849

Part of #3380.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 5, 2018

💔 Test failed - pr-merge

@daira

This comment has been minimized.

Copy link
Contributor

daira commented Aug 5, 2018

kitchensink fails with

make[2]: *** No rule to make target 'libbitcoinconsensus.c', needed by 'libbitcoinconsensus.lo'.  Stop.
LIBBITCOIN_PROTON=libbitcoin_proton.a
endif
if BUILD_BITCOIN_LIBS
LIBBITCOINCONSENSUS=libbitcoinconsensus.la

This comment has been minimized.

@str4d

str4d Aug 5, 2018

Contributor

Oops, here's the bug. I missed a spot when editing the upstream commit.

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 5, 2018

Trivial fix.

@zkbot r+

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 5, 2018

📌 Commit d6bd584 has been approved by str4d

zkbot added a commit that referenced this pull request Aug 5, 2018

Auto merge of #3447 - str4d:zip32-prep, r=str4d
ZIP 32 preparations

Includes Makefile changes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7689
- bitcoin/bitcoin#10849

Part of #3380.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 5, 2018

⌛️ Testing commit d6bd584 with merge 29de8c8...

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 5, 2018

💔 Test failed - pr-merge

jonasschnelli and others added some commits Jul 7, 2017

str4d and others added some commits Aug 3, 2018

crypter: shuffle Makefile so that crypto can be used by the wallet
Wallet must come before crypto, otherwise linking fails on some platforms.

Includes a tangentially-related general cleanup rather than making the Makefile
sloppier.
@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 5, 2018

Fixed the bug in the library name, but not the one right next to it in the variable name 😅

@str4d str4d force-pushed the str4d:zip32-prep branch from d6bd584 to d0372cf Aug 5, 2018

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 5, 2018

Rebased to squash the fixes into the upstream commit.

@zkbot r+

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 5, 2018

📌 Commit d0372cf has been approved by str4d

zkbot added a commit that referenced this pull request Aug 5, 2018

Auto merge of #3447 - str4d:zip32-prep, r=str4d
ZIP 32 preparations

Includes Makefile changes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7689
- bitcoin/bitcoin#10849

Part of #3380.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 5, 2018

⌛️ Testing commit d0372cf with merge 6eecedb...

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 5, 2018

💔 Test failed - pr-merge

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 5, 2018

Ugh, transient timeout.

@zkbot retry

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 5, 2018

⌛️ Testing commit d0372cf with merge 8df048b...

zkbot added a commit that referenced this pull request Aug 5, 2018

Auto merge of #3447 - str4d:zip32-prep, r=str4d
ZIP 32 preparations

Includes Makefile changes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7689
- bitcoin/bitcoin#10849

Part of #3380.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 5, 2018

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

@zkbot zkbot merged commit d0372cf into zcash:master Aug 5, 2018

1 check passed

homu Test successful
Details

Zcashd Team automation moved this from In Review to Released (Merged in Master) Aug 5, 2018

@str4d str4d deleted the str4d:zip32-prep branch Aug 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment