Merge develop #1223
Merged
Merge develop #1223
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove some tests
avalkov
approved these changes
Jan 10, 2025
marcello33
approved these changes
Jan 10, 2025
Raneet10
added a commit
that referenced
this pull request
Jan 16, 2025
* New propose span msg * helper: temporarily set antevortaHeight for testing * bor: fix nil author clause * bor: fix TestProposeSpanOne and TestGetNextSpanSeed * bor: avoid nil ptr deref * Add support for new msg propose span in cli and rest * Enable all hardforks at zero height * helper: temporarily add non-zero hf heights for testing * bor: fix handler * When proposing span query height from the node * Enable all forks on zero height * Add temporary commands to test malicious cases * Add temporary commands to test malicious cases * Let the bridge propose only the first two spans * Dont enable antevorta from zero height * Restrict new msg pre-hardfork * set non-zero height for antevorta * Add debug logging * Lower enable fork height * Clean up * Cleanup * Fix lint * Fix comments * fix: nil logger * Unify how we check for Jorvik height * Allow new and old span propose messages only at correct heights in PostHandle * Propose span only if proposedSpanID-2 is finished * Propose span only if proposedSpanID-2 is finished * rm: useless tests (#1223) Co-authored-by: marcello33 <marcelloardizzone@hotmail.it> * bor,bridge,helper: rename antevorta to danelaw fork * bor,bridge: rebase and renaming to danelaw * Fix rollback command (#1217) * cmd: fix rollback * cmd: init rootmultistore from given db * cmd: disable rollback * align go deps * cmd: renable rollback * Rename Antevorta to Danelaw in error logs * helper: set danelaw height for amoy * Fixes for profiles, removing some unecessary postinst file, update to prerm, and postrm.profile --------- Co-authored-by: Angel Valkov <avalkov@polygon.technology> Co-authored-by: marcello33 <marcelloardizzone@hotmail.it> Co-authored-by: Daniel Jones <djones@polygon.technology>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
PR to merge develop.
Changes
Checklist
Testing