chore: merge main into midnight-v1 - #40
Merged
Merged
Conversation
…yperlane-xyz#8677) Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Trevor Porter <tkporter@users.noreply.github.com>
…otedCalls (hyperlane-xyz#8699) Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: hyper-gonk[bot] <246310972+hyper-gonk[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: openhands <openhands@all-hands.dev> Co-authored-by: Claude <claude@hyperlane.xyz>
…yperlane-xyz#9003) Co-authored-by: Troy Kessler <troy.kessler99@gmail.com>
…z#8980) Co-authored-by: pbio <10051819+paulbalaji@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
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.
Merges the latest
main(182 commits) intomidnight-v1.Conflict resolutions
rust/main/agents/relayer/Cargo.toml: kept main's updatedaleofeature (now withdep:hyperlane-aleo) and re-added themidnightfeature line below it.rust/main/hyperlane-core/src/chain.rs: took main's cleaned-up domain list and re-inserted the Midnight pieces:Midnight = 1234(moved into the local-chains block to match main's new layout), theMidnightprotocol variant, and itsLocalTestChain/domain_protocol()/IndexMode::Sequencematch arms.rust/main/Cargo.lock: took main's lockfile and re-resolved. The midnight git deps force minimal bumps of 11 transitive pins (ff,parking_lot,anyhow,sha2,serde_bytes,tracing,flate2,byte-slice-cast,wasm-bindgen-futures,ethnum,rand); everything else stays at main's versions.Verification
cargo check --workspace --all-targets --features aleo,midnight,integration_testpasses (same feature set CI uses).cargo fmt --checkclean on the edited crate.