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

Fix getblocksubsidy suggestions #25

Closed

Conversation

daira
Copy link

@daira daira commented Oct 4, 2024

  • Rename INSUFFICIENT_ADDRESSES to INSUFFICIENT_RECIPIENTS.
  • sapling::Builder: add funding stream outputs in a more predictable order.
  • Simplify GetActiveFundingStreamElements.

Note that GetActiveFundingStreamElements is used by consensus, so this requires consensus-level review.

template construction. fixes zcash#6960

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
@daira
Copy link
Author

daira commented Oct 4, 2024

Commit-by-commit review recommended.

I would be fine with omitting the last commit if we think it's too risky at this stage.

@daira
Copy link
Author

daira commented Oct 4, 2024

@str4d and I decided this should be retargeted to after v6.0.0.

@daira daira marked this pull request as draft October 4, 2024 12:13
str4d and others added 5 commits October 4, 2024 13:18
Ensure that the "future timestamp" rule is correctly applied by block template construction
…ENTS.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
…der.

Previously it was deterministic, but depended on details of the `operator<`
implementations of `FundingStreamRecipient`, `SaplingPaymentAddress`, and
`CScript`. Now it is just the same order as in `vFundingStreams`.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
@daira daira force-pushed the fix-getblocksubsidy-suggestions branch from 1540631 to 96bf945 Compare October 4, 2024 16:55
@daira
Copy link
Author

daira commented Oct 4, 2024

Closing in favour of zcash#6965.

@daira daira closed this Oct 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants