Skip to content

Conversation

@byteZorvin
Copy link
Member

Pull Request type

Please add the labels corresponding to the type of changes your PR introduces:

  • Bugfix
  • Feature
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no API changes)
  • Build-related changes
  • Documentation content changes
  • Testing
  • Other (please describe):

What is the current behavior?

Resolves: #NA

What is the new behavior?

Does this introduce a breaking change?

Other information

Copy link
Contributor

@apoorvsadana apoorvsadana left a comment

Choose a reason for hiding this comment

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

let's discuss on the standup regarding how we can test this once!

/// the node will stop with an error instead of performing a reorg. This is useful for
/// operators who want to manually handle chain divergences.
#[clap(env = "MADARA_NO_REORG", long, default_value_t = true)]
pub no_reorg: bool,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
pub no_reorg: bool,
pub disable_reorg: bool,

Copy link
Contributor

@heemankv heemankv left a comment

Choose a reason for hiding this comment

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

Please change no_reorg to disable_reorg
Also have we tested that the full node is able to sync even after one of the blocks had mismatched, I think we might also have to add disable_all_verifications(true) in l2.rs
So that this block could continue, Let's test and discuss


// Check if reorg is disabled
if self.no_reorg {
tracing::error!("❌ REORG DETECTED but --no-reorg flag is enabled!");
Copy link
Contributor

Choose a reason for hiding this comment

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

nitpick : Let's re-write -> --no-reorg flag
to Reorganisation is explicitly denied by config or something that suite you better maybe

Copy link
Contributor

Choose a reason for hiding this comment

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

disagree! previous message was more specific, --no-reorg flag disabled reorging

tracing::error!(" Incoming parent hash: {:#x}", incoming_parent_hash);
tracing::error!("");
tracing::error!("⚠️ Divergent state detected - the local chain has diverged from the upstream chain.");
tracing::error!("⚠️ Blockchain reorganization is required but disabled by --no-reorg flag.");
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above

Copy link
Contributor

Choose a reason for hiding this comment

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

  • for line 309 as well

Copy link
Contributor

Choose a reason for hiding this comment

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

same as above!

@Mohiiit Mohiiit added the madara label Nov 5, 2025
@byteZorvin byteZorvin marked this pull request as draft November 17, 2025 05:33
@byteZorvin byteZorvin marked this pull request as ready for review November 21, 2025 05:45
@byteZorvin byteZorvin added this pull request to the merge queue Nov 21, 2025
Merged via the queue into main with commit d70e9b1 Nov 21, 2025
30 checks passed
@github-project-automation github-project-automation bot moved this to Done in Madara Nov 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants