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

Implement ZIP 208: Shorter Block Target Spacing #4025

Merged
merged 50 commits into from Aug 9, 2019

Conversation

@bitcartel
Copy link
Contributor

bitcartel commented May 19, 2019

Closes #3690.

@bitcartel

This comment has been minimized.

Copy link
Contributor Author

bitcartel commented May 19, 2019

@zkbot try

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented May 19, 2019

⌛️ Trying commit 638b687 with merge a29fe4a...

zkbot added a commit that referenced this pull request May 19, 2019
… r=<try>

[WIP] Shorter block target interval zip208

Partial implementation of zip208.  Modified tests pass. Should be no-op on mainnet pre-blossom.  Pushing to test CI and for early review on changes and testing.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented May 20, 2019

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

@bitcartel bitcartel force-pushed the bitcartel:shorter_block_target_interval_zip208 branch 2 times, most recently from 7ba92c3 to 252f4f4 May 20, 2019
@str4d str4d added this to Needs Prioritization in Arborist Team via automation May 28, 2019
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented May 28, 2019

☔️ The latest upstream changes (presumably #2912) made this pull request unmergeable. Please resolve the merge conflicts.

@Eirik0 Eirik0 moved this from Needs Prioritization to Protocol Backlog in Arborist Team Jun 6, 2019
@Eirik0 Eirik0 moved this from Protocol Backlog to Arborist Product Priorities in Arborist Team Jul 11, 2019
@Eirik0 Eirik0 moved this from Arborist Product Priorities to PRs That Need Review + Their Associated Issues in Arborist Team Jul 11, 2019
@Eirik0 Eirik0 moved this from PRs That Need Review + Their Associated Issues to In Review in Arborist Team Jul 11, 2019
@Eirik0 Eirik0 moved this from In Review to In Progress in Arborist Team Jul 11, 2019
@Eirik0 Eirik0 force-pushed the bitcartel:shorter_block_target_interval_zip208 branch from 252f4f4 to d7ebbeb Jul 11, 2019
@Eirik0

This comment has been minimized.

Copy link
Contributor

Eirik0 commented Jul 11, 2019

Rebased on to master

src/pow.cpp Show resolved Hide resolved
src/pow.h Outdated Show resolved Hide resolved
@@ -368,7 +368,8 @@ void MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Pa
MarkBlockAsReceived(hash);

int64_t nNow = GetTimeMicros();
QueuedBlock newentry = {hash, pindex, nNow, pindex != NULL, GetBlockTimeout(nNow, nQueuedValidatedHeaders, consensusParams)};
int nHeight = pindex != NULL ? pindex->nHeight : chainActive.Height(); // Help block timeout computation

This comment has been minimized.

Copy link
@Eirik0

Eirik0 Jul 17, 2019

Contributor

We should add a comment about why we use chainActive.Height() if pindex is null.

zkbot added a commit that referenced this pull request Aug 8, 2019
… r=daira

Implement ZIP 208: Shorter Block Target Spacing

Closes #3690.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 8, 2019

💔 Test failed - pr-merge

@Eirik0

This comment has been minimized.

Copy link
Contributor

Eirik0 commented Aug 9, 2019

On ubuntu:

[ RUN      ] wallet_zkeys_tests.WriteCryptedSaplingZkeyDirectToDb
wallet/gtest/test_wallet_zkeys.cpp:472: Failure
      Expected: 3
To be equal to: addrs.size()
      Which is: 2
[  FAILED  ] wallet_zkeys_tests.WriteCryptedSaplingZkeyDirectToDb (768 ms)
@Eirik0

This comment has been minimized.

Copy link
Contributor

Eirik0 commented Aug 9, 2019

This is not related to this PR.
@zkbot retry

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

⌛️ Testing commit b99003c with merge f18c089...

zkbot added a commit that referenced this pull request Aug 9, 2019
… r=daira

Implement ZIP 208: Shorter Block Target Spacing

Closes #3690.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

💔 Test failed - pr-merge

@Eirik0

This comment has been minimized.

Copy link
Contributor

Eirik0 commented Aug 9, 2019

@zkbot retry

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

⌛️ Testing commit b99003c with merge 8ab669f...

zkbot added a commit that referenced this pull request Aug 9, 2019
… r=daira

Implement ZIP 208: Shorter Block Target Spacing

Closes #3690.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

💔 Test failed - pr-merge

@Eirik0

This comment has been minimized.

Copy link
Contributor

Eirik0 commented Aug 9, 2019

@zkbot retry

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

⌛️ Testing commit b99003c with merge 7ab2a08...

zkbot added a commit that referenced this pull request Aug 9, 2019
… r=daira

Implement ZIP 208: Shorter Block Target Spacing

Closes #3690.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

💔 Test failed - pr-merge

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 9, 2019

Yet another transient failure likely caused by AWS EC2 performance problems 😑

@zkbot retry

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

⌛️ Testing commit b99003c with merge 45b4cba...

zkbot added a commit that referenced this pull request Aug 9, 2019
… r=daira

Implement ZIP 208: Shorter Block Target Spacing

Closes #3690.
@daira

This comment has been minimized.

Copy link
Contributor

daira commented Aug 9, 2019

On ubuntu:

[ RUN      ] wallet_zkeys_tests.WriteCryptedSaplingZkeyDirectToDb
wallet/gtest/test_wallet_zkeys.cpp:472: Failure
      Expected: 3
To be equal to: addrs.size()
      Which is: 2
[  FAILED  ] wallet_zkeys_tests.WriteCryptedSaplingZkeyDirectToDb (768 ms)

Has a ticket been filed for this?

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

💔 Test failed - pr-merge

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 9, 2019

Failed due to transient timeout on one worker, and low disk space on kitchensink. (I manually stopped the other two builders).

I'll wait a bit for the EC2 workers to be auto-stopped, and then retry again.

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Aug 9, 2019

Here we go again...

@zkbot retry

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

⌛️ Testing commit b99003c with merge 2528af6...

zkbot added a commit that referenced this pull request Aug 9, 2019
… r=daira

Implement ZIP 208: Shorter Block Target Spacing

Closes #3690.
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Aug 9, 2019

☀️ Test successful - pr-merge
Approved by: daira
Pushing 2528af6 to master...

@zkbot zkbot merged commit b99003c into zcash:master Aug 9, 2019
1 check passed
1 check passed
homu Test successful
Details
Arborist Team automation moved this from In Review to Released (Merged in Master) Aug 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Arborist Team
  
Released (Merged in Master)
Linked issues

Successfully merging this pull request may close these issues.

7 participants
You can’t perform that action at this time.