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

Aeon upstream 7 #180

Merged
merged 24 commits into from
Jun 4, 2020
Merged

Aeon upstream 7 #180

merged 24 commits into from
Jun 4, 2020

Conversation

stoffu
Copy link

@stoffu stoffu commented Jun 4, 2020

This PR merges upstream PRs after monero-project#4219 which is the (only) one taken in the last upstream merge PR #175. This PR includes upstream PRs from monero-project#4147 up to monero-project#4347, both merged on Sep 14, 2018 (while skipping monero-project#4372 for obvious reasons):

moneromooo-monero and others added 24 commits June 3, 2020 18:43
The two vectors should be the same size anyway, so add an assert
to catch any case where they aren't
This ensures it can't end up filled with the actual placeholders
It would switch to a new set of blocks and fail, getting out of sync
with the hash chain in the process
Aeon note: this is of course irrelevant in practice, since Ledger doesn't support Aeon and also we don't use RingCT.
When this throws in a loop, stack trace generation can take
a significant amount of CPU
Aeon note: the heights were completely identical to Monero's and thus wrong. They are corrected now.
Aeon note: This patch is noop since neither RingCT nor multisig are currently in use.
@stoffu stoffu force-pushed the aeon-upstream-7 branch from 8402678 to 3bac43a Compare June 4, 2020 09:22
@aeonix aeonix merged commit dbfc620 into aeonix:master Jun 4, 2020
@stoffu stoffu mentioned this pull request Jun 12, 2020
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.

5 participants