Skip to content

Merge main into next#2998

Merged
huitseeker merged 81 commits intonextfrom
huitseeker/merge/main-into-next-reconciled
Apr 13, 2026
Merged

Merge main into next#2998
huitseeker merged 81 commits intonextfrom
huitseeker/merge/main-into-next-reconciled

Conversation

@huitseeker
Copy link
Copy Markdown
Collaborator

@huitseeker huitseeker commented Apr 13, 2026

This replaces #2984 and #2985 by a straight merge main -> next that keeps next where next was already ahead, takes main where there was no semantic drift, and leaves the remaining protocol fixture conflicts in the exact state described by #2984 and #2985.

Cost/benefit:

bobbinth and others added 30 commits March 21, 2026 10:19
Update MAST package structure for project assembly
The getrandom crate is transitively depended on via miden-crypto, and
this fails to build in no-std environments. We don't actually use the
functionality though (I believe this dependency is activated due to 
the miden-core-lib build script needing the std feature of 
miden-assembly), so we can simply configure get_random to use its
"unsupported" backend, which lets the build succeed, but will return an
error if actually used
The intent of these gates is to cover all Wasm targets, but specifying
target_arch=wasm32 is too narrow. The recommended practice is to use
target_family=wasm instead.
…gest case when there are multiple dependents
Copy link
Copy Markdown
Contributor

@adr1anh adr1anh left a comment

Choose a reason for hiding this comment

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

LGMT

@huitseeker huitseeker merged commit a781c48 into next Apr 13, 2026
20 checks passed
@huitseeker huitseeker deleted the huitseeker/merge/main-into-next-reconciled branch April 13, 2026 19:29
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.

5 participants