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: make monero extra data less strict #6117

Merged

Conversation

SWvheerden
Copy link
Collaborator

Description

It reverts a change to make the extra field acceptance less strict.
Motivation and Context

Tari only cares about the Merge mining field and not the rest. As long as that deserializes correct we are secure.

@SWvheerden SWvheerden requested a review from a team as a code owner February 2, 2024 11:09
@SWvheerden SWvheerden changed the title fix: make more monero extra data less strict fix: make monero extra data less strict Feb 2, 2024
@ghpbot-tari-project ghpbot-tari-project added P-acks_required Process - Requires more ACKs or utACKs P-reviews_required Process - Requires a review from a lead maintainer to be merged labels Feb 2, 2024
stringhandler
stringhandler previously approved these changes Feb 2, 2024
Copy link
Collaborator

@stringhandler stringhandler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy for this to go in

@@ -105,8 +105,11 @@ pub fn verify_header(
) -> Result<MoneroPowData, MergeMineError> {
let monero_data = MoneroPowData::from_header(header, consensus)?;
let expected_merge_mining_hash = header.merge_mining_hash();
let extra_field = ExtraField::try_parse(&monero_data.coinbase_tx_extra)
.map_err(|_| MergeMineError::DeserializeError("Invalid extra field".to_string()))?;
let extra_field = ExtraField::try_parse(&monero_data.coinbase_tx_extra);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there no other data about the error here?
Maybe create an issue to add more data about what went wrong

@ghpbot-tari-project ghpbot-tari-project removed P-reviews_required Process - Requires a review from a lead maintainer to be merged labels Feb 2, 2024
Copy link

github-actions bot commented Feb 2, 2024

Test Results (CI)

1 269 tests   1 269 ✅  11m 26s ⏱️
   39 suites      0 💤
    1 files        0 ❌

Results for commit c67d4d0.

♻️ This comment has been updated with latest results.

Copy link

github-actions bot commented Feb 2, 2024

Test Results (Integration tests)

29 tests  +29   29 ✅ +29   12m 12s ⏱️ + 12m 12s
11 suites +11    0 💤 ± 0 
 2 files   + 2    0 ❌ ± 0 

Results for commit c67d4d0. ± Comparison against base commit 0074559.

♻️ This comment has been updated with latest results.

@ghpbot-tari-project ghpbot-tari-project added the P-reviews_required Process - Requires a review from a lead maintainer to be merged label Feb 2, 2024
@SWvheerden SWvheerden merged commit 38b9113 into tari-project:development Feb 2, 2024
13 of 14 checks passed
@SWvheerden SWvheerden deleted the sw_supress_extra_field_error branch February 2, 2024 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P-acks_required Process - Requires more ACKs or utACKs P-reviews_required Process - Requires a review from a lead maintainer to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants