Skip to content

Merge main into release/0.6.2 (resolve #1038 conflicts) - #1051

Closed
FletcherMan wants to merge 62 commits into
release/0.6.2from
merge/main-into-release-0.6.2
Closed

Merge main into release/0.6.2 (resolve #1038 conflicts)#1051
FletcherMan wants to merge 62 commits into
release/0.6.2from
merge/main-into-release-0.6.2

Conversation

@FletcherMan

Copy link
Copy Markdown
Collaborator

Summary

  • Replaces #1038, which cannot be updated because its head is protected main.
  • Merges current main into release/0.6.2 with all conflicted files taken from main (Makefile, go-ethereum submodule, and every conflicting go.mod/go.sum).
  • Resulting tree matches main (release-only geth v2.2.5 pin yields to main's morph-v2.2.6).

Test plan

  • Confirm GitHub shows this PR as mergeable into release/0.6.2
  • Confirm conflicted files on the merge result match main (Makefile pins morph-v2.2.6, go-ethereum is 5744b8f)
  • After merge, close Centralization cleanup #1038 as superseded

Made with Cursor

curryxbo and others added 30 commits August 11, 2026 15:29
…h guard, metrics port) (#1034)

Co-authored-by: corey <corey.zhang@bitget.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: corey <corey.zhang@bitget.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Program vkey: 0x00c684101523a06415be6d72d011eebaf465b4c1da4e3b18ab052a29d7ac6e88

ELF SHA-256: f916cf05f462c08692b28a112ecc65ae7a66e7648bdedcd264648993fa666719
SegueII and others added 24 commits August 19, 2026 08:44
feat: complete post-centralization cleanup
Co-authored-by: allen.wu <allen.wu@bitget.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: kukoo.yue <kukoo.yue@bitget.com>
chore(challenge-handler): opt proveState
Stop documenting blob_count_mismatch as a BatchStatus divergence, and stop wrapping ErrBatchVerifyDivergence on that packing error so the sentinel matches the call site.

Co-authored-by: Cursor <cursoragent@cursor.com>
Restore the ErrBatchVerifyDivergence wrap on blob_count_mismatch and the surrounding comment text; correct only the sentences that claimed the rebuildBlob path sets BatchStatus=stateException.

Co-authored-by: Cursor <cursoragent@cursor.com>
…entinel

docs(derivation): stateException is only from verifyBatchRoots
…d never rough-estimate past a revert

commitBatch / commitState / finalizeBatch all carry onlyActiveSubmitter on L1,
but the activity probe only ran once, in PreCheck at Start(). A submitter can be
removed, slashed, priced out by a raised minimum stake, or start withdrawing at
any point afterwards, and the rollup / finalize loops kept submitting against a
stale startup result.

With rough_estimate_gas enabled this became a funds leak rather than a stall:
eth_estimateGas fails on the revert, the rough fallback swallowed that failure
and guessed a gas limit, and the tx was signed and sent anyway. The reverting tx
refunds unused execution gas, but a commitBatch blob tx is charged its full blob
fee regardless of revert. Nothing broke the cycle — the failed receipt only logs
a warning, and once the tx leaves the pending pool the loop re-derives the same
batch index and resends, with no low-balance guard.

- extract ensureActiveSubmitter and call it at the top of rollup() and
  finalize(); an RPC failure on the probe also stops submission rather than
  assuming the wallet is still eligible
- gate both rough-estimate fallbacks on utils.IsExecutionRevertErr, so the flag
  still covers a flaky/unreachable node but never guesses past a contract
  rejection

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
fix(tx-submitter): re-check submitter activity before each submit, and never rough-estimate past a revert
Resolve PR #1038 conflicts by keeping main versions of Makefile,
go.mod/go.sum files, and the go-ethereum submodule.

Co-authored-by: Cursor <cursoragent@cursor.com>
@FletcherMan
FletcherMan requested a review from a team as a code owner August 31, 2026 07:07
@FletcherMan
FletcherMan requested a review from dylanCai9 August 31, 2026 07:07
@coderabbitai

coderabbitai Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: a19f1b0d-2c37-4f4e-87bc-0c5b49a91d27

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Warning

Billing warning: we have not been able to collect payment for this subscription for more than 72 hours. Please update the payment method or pay any pending invoices in Billing to avoid service interruption.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@FletcherMan

Copy link
Copy Markdown
Collaborator Author

Closing: keep the original main → release/0.6.2 path on #1038 instead of a side-branch PR.

@FletcherMan
FletcherMan deleted the merge/main-into-release-0.6.2 branch August 31, 2026 07:09
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.

6 participants