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

1570.tromp equihash with libsodium blake.2 #1578

Merged
merged 4 commits into from Oct 21, 2016

Conversation

Projects
None yet
3 participants
@daira
Contributor

daira commented Oct 20, 2016

Remove BLAKE2b implementation from Tromp Equihash solver, and address almost all of @str4d's review comments on #1570. Supercedes #1576.

Signed-off-by: Daira Hopwood daira@jacaranda.org

daira added some commits Oct 20, 2016

Add Tromp's implementation of Equihash solver
(as of tromp/equihash commit 690fc5eff453bc0c1ec66b283395c9df87701e93).

Author: John Tromp <john.tromp@gmail.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Integrate Tromp solver into miner code and remove its dependency on e…
…xtra BLAKE2b implementation.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
@str4d

str4d approved these changes Oct 20, 2016

ACK modulo my logging comment.

LogPrint("pow", "Running Equihash solver with nNonce = %s\n",
pblock->nNonce.ToString());
LogPrint("pow", "Running Equihash solver \"%s\" with nNonce = %s\n",
solver, pblock->nNonce.ToString());

This comment has been minimized.

@str4d

str4d Oct 20, 2016

Contributor

Hmm, with the extra log line above, we probably actually don't need this change here. Does not block.

@str4d

str4d Oct 20, 2016

Contributor

Hmm, with the extra log line above, we probably actually don't need this change here. Does not block.

Show outdated Hide outdated src/miner.cpp Outdated
// Intialization done, start algo driver.
eq.digit0(0);
eq.xfull = eq.bfull = eq.hfull = 0;
eq.showbsizes(0);

This comment has been minimized.

@str4d

str4d Oct 20, 2016

Contributor

This needs to be somehow wrapped in a LogPrint, either inside "pow" or somewhere else. I think the best way to do that would be to modify showbsizes() to return a string, and then print that.

@str4d

str4d Oct 20, 2016

Contributor

This needs to be somehow wrapped in a LogPrint, either inside "pow" or somewhere else. I think the best way to do that would be to modify showbsizes() to return a string, and then print that.

for (u32 r = 1; r < WK; r++) {
(r&1) ? eq.digitodd(r, 0) : eq.digiteven(r, 0);
eq.xfull = eq.bfull = eq.hfull = 0;
eq.showbsizes(r);

This comment has been minimized.

@str4d

str4d Oct 20, 2016

Contributor

Ditto.

@str4d

str4d Oct 20, 2016

Contributor

Ditto.

@str4d

This comment has been minimized.

Show comment
Hide comment
@str4d

str4d Oct 20, 2016

Contributor

I'm not blocking this PR on inclusion of the BLAKE2b changes.

Contributor

str4d commented Oct 20, 2016

I'm not blocking this PR on inclusion of the BLAKE2b changes.

@str4d str4d added this to the 1.0.0-rc2 milestone Oct 20, 2016

@str4d

This comment has been minimized.

Show comment
Hide comment
@str4d

str4d Oct 20, 2016

Contributor

@daira in addition to the log changes above, maybe you could also pull in the upstream changes that were landed this morning?

Contributor

str4d commented Oct 20, 2016

@daira in addition to the log changes above, maybe you could also pull in the upstream changes that were landed this morning?

@str4d

This comment has been minimized.

Show comment
Hide comment
@str4d

str4d Oct 20, 2016

Contributor

Also, the new config flag should be documented in the zcashd help text (in src/init.cpp).

Contributor

str4d commented Oct 20, 2016

Also, the new config flag should be documented in the zcashd help text (in src/init.cpp).

daira added some commits Oct 20, 2016

Add help for -equihashsolver= option.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Assert that the Equihash solver is a supported option.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>

@str4d str4d referenced this pull request Oct 20, 2016

Closed

reject block versions < 4 #1556

@daira

This comment has been minimized.

Show comment
Hide comment
@daira

daira Oct 21, 2016

Contributor

John Tromp said on Slack:

that looks recent enough; i’ve not made any significant gains since

Contributor

daira commented Oct 21, 2016

John Tromp said on Slack:

that looks recent enough; i’ve not made any significant gains since

@daira

This comment has been minimized.

Show comment
Hide comment
@daira

daira Oct 21, 2016

Contributor

I think we should just land this as-is and clean up the logging later.

Contributor

daira commented Oct 21, 2016

I think we should just land this as-is and clean up the logging later.

@str4d

This comment has been minimized.

Show comment
Hide comment
@str4d

str4d Oct 21, 2016

Contributor

Agree that we won't block on my logging comment; we can fix that in RC3 if we find it annoying.

utACK

Contributor

str4d commented Oct 21, 2016

Agree that we won't block on my logging comment; we can fix that in RC3 if we find it annoying.

utACK

@daira

This comment has been minimized.

Show comment
Hide comment
@daira

daira Oct 21, 2016

Contributor

@zkbot r+

Contributor

daira commented Oct 21, 2016

@zkbot r+

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 21, 2016

Contributor

📌 Commit 5f0009b has been approved by daira

Contributor

zkbot commented Oct 21, 2016

📌 Commit 5f0009b has been approved by daira

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 21, 2016

Contributor

⌛️ Testing commit 5f0009b with merge a5aa50d...

Contributor

zkbot commented Oct 21, 2016

⌛️ Testing commit 5f0009b with merge a5aa50d...

zkbot pushed a commit that referenced this pull request Oct 21, 2016

zkbot
Auto merge of #1578 - daira:1570.tromp-equihash-with-libsodium-blake.…
…2, r=daira

1570.tromp equihash with libsodium blake.2

Remove BLAKE2b implementation from Tromp Equihash solver, and address almost all of @str4d's review comments on #1570. Supercedes #1576.

Signed-off-by: Daira Hopwood daira@jacaranda.org
@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 21, 2016

Contributor

💔 Test failed - zcash

Contributor

zkbot commented Oct 21, 2016

💔 Test failed - zcash

@str4d

This comment has been minimized.

Show comment
Hide comment
@str4d

str4d Oct 21, 2016

Contributor

Expected failure, #1598 hadn't been merged yet.

Contributor

str4d commented Oct 21, 2016

Expected failure, #1598 hadn't been merged yet.

@daira

This comment has been minimized.

Show comment
Hide comment
@daira

daira Oct 21, 2016

Contributor

@zkbot retry

Contributor

daira commented Oct 21, 2016

@zkbot retry

zkbot pushed a commit that referenced this pull request Oct 21, 2016

zkbot
Auto merge of #1578 - daira:1570.tromp-equihash-with-libsodium-blake.…
…2, r=daira

1570.tromp equihash with libsodium blake.2

Remove BLAKE2b implementation from Tromp Equihash solver, and address almost all of @str4d's review comments on #1570. Supercedes #1576.

Signed-off-by: Daira Hopwood daira@jacaranda.org
@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 21, 2016

Contributor

⌛️ Testing commit 5f0009b with merge dc21a8a...

Contributor

zkbot commented Oct 21, 2016

⌛️ Testing commit 5f0009b with merge dc21a8a...

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 21, 2016

Contributor

☀️ Test successful - zcash

Contributor

zkbot commented Oct 21, 2016

☀️ Test successful - zcash

@zkbot zkbot merged commit 5f0009b into zcash:master Oct 21, 2016

1 check passed

homu Test successful
Details

@zkbot zkbot referenced this pull request Oct 21, 2016

Merged

Add node metrics screen #1375

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