Skip to content

chore: sync 95 clean commits from upstream hyperlane-monorepo#406

Closed
danwt wants to merge 96 commits intomain-dymfrom
danwt/claude/upstream-sync-clean
Closed

chore: sync 95 clean commits from upstream hyperlane-monorepo#406
danwt wants to merge 96 commits intomain-dymfrom
danwt/claude/upstream-sync-clean

Conversation

@danwt
Copy link
Copy Markdown

@danwt danwt commented Dec 12, 2025

Summary

Cherry-picks 95 upstream commits that apply cleanly without conflicts (no manual resolution required).

Strategy: Attempted to cherry-pick 255 upstream commits that don't touch files modified by both forks. Of these, 95 applied cleanly. The remaining 160 had conflicts due to:

  • Files Dymension deleted that upstream later modified (modify/delete conflicts)
  • CHANGELOG/package.json version conflicts
  • Dependency on commits that conflicted earlier

Changes by area (264 files changed, +52K/-1.9K lines):

  • typescript/sdk - 26 files (token adapters, config utils, warp core improvements)
  • typescript/infra - 22 files (scripts, warp deploy checks, igp claim script)
  • typescript/cli - 12 files (submit improvements, process handling)
  • rust/main - 12 files (cursor indexer improvements, transaction deduplication)
  • solidity/contracts - 6 files (fork contract exclusions, coverage fixes)
  • Plus: radix-sdk, widgets, utils, ccip-server, workflows

Key improvements pulled in:

Excluded (would conflict):

  • Solidity refactor changes (significant structural changes to token contracts)
  • Rust relayer structural changes
  • TypeScript token type changes (enum→const migration)

Test plan

  • CI passes
  • Build succeeds (yarn build)
  • Rust tests pass (cargo test)

🤖 Generated with Claude Code

yorhodes and others added 30 commits December 12, 2025 14:17
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Danil Nemirovsky <4614623+ameten@users.noreply.github.com>
Co-authored-by: Paul Balaji <10051819+paulbalaji@users.noreply.github.com>
Co-authored-by: Paul Balaji <10051819+paulbalaji@users.noreply.github.com>
…rs (hyperlane-xyz#7077)

Co-authored-by: Paul Balaji <10051819+paulbalaji@users.noreply.github.com>
…ll for sealevel (hyperlane-xyz#7102)

Co-authored-by: Jeff <jeff.no.zhao@gmail.com>
Co-authored-by: Jamin <57451149+yjamin@users.noreply.github.com>
…hyperlane-xyz#7126)

Co-authored-by: Danil Nemirovsky <4614623+ameten@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…erlane-xyz#7158)

Co-authored-by: Danil Nemirovsky <4614623+ameten@users.noreply.github.com>
ameten and others added 28 commits December 12, 2025 14:17
…yperlane-xyz#7349)

Co-authored-by: Danil Nemirovsky <4614623+ameten@users.noreply.github.com>
Co-authored-by: Jamin <57451149+yjamin@users.noreply.github.com>
Co-authored-by: Jeff <jeff.no.zhao@gmail.com>
Co-authored-by: Paul Balaji <10051819+paulbalaji@users.noreply.github.com>
Co-authored-by: Danil Nemirovsky <ameten@users.noreply.github.com>
Co-authored-by: Danil Nemirovsky <4614623+ameten@users.noreply.github.com>
Co-authored-by: Mohammed Hussan <22501692+Mo-Hussain@users.noreply.github.com>
Co-authored-by: Christopher Brumm <97845034+christopherbrumm@users.noreply.github.com>
Co-authored-by: Lee <6251863+ltyu@users.noreply.github.com>
Co-authored-by: Troy Kessler <43882936+troykessler@users.noreply.github.com>
Co-authored-by: iPLAY888 <133153661+letmehateu@users.noreply.github.com>
Co-authored-by: xeno097 <xeno097.cp@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrey Taranov <86911+antigremlin@users.noreply.github.com>
…lane-xyz#7455)

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Claude <noreply@anthropic.com>
The fx-portal submodule was added to the fork but the .gitmodules entry
was missing, causing CI to fail with "No url found for submodule path".

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
@danwt
Copy link
Copy Markdown
Author

danwt commented Dec 30, 2025

too risky

@danwt danwt closed this Dec 30, 2025
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.