Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into v2 #1873

Merged
merged 109 commits into from
Oct 21, 2024
Merged

Merge main into v2 #1873

merged 109 commits into from
Oct 21, 2024

Conversation

Trivo25
Copy link
Member

@Trivo25 Trivo25 commented Oct 18, 2024

all the goods

most of the PR merges main into v2; some additional v2 prep is happening here 33b7c6a

CHANGELOG.md Show resolved Hide resolved
CHANGELOG.md Show resolved Hide resolved
Copy link
Contributor

@ymekuria ymekuria left a comment

Choose a reason for hiding this comment

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

LGTM. I just had a minor comment/question.

CHANGELOG.md Outdated Show resolved Hide resolved
@@ -15,7 +15,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
_Security_ in case of vulnerabilities.
-->

## [Unreleased](https://github.com/o1-labs/o1js/compare/f15293a69...HEAD)
## [Unreleased](https://github.com/o1-labs/o1js/compare/7e9394...HEAD)

## [2.0.0](https://github.com/o1-labs/o1js/compare/f15293a69...HEAD)
Copy link
Contributor

Choose a reason for hiding this comment

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

[NIT]

I think this compare should use 7e9394 as the base, rather than f15293a69 which comes from v1.9.0

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep! Still need to shuffle commits around, I'll pick the final commit in a separate release PR

@Trivo25 Trivo25 merged commit b04520d into v2 Oct 21, 2024
25 checks passed
@Trivo25 Trivo25 deleted the merge-main-v2-1 branch October 21, 2024 21:18
@45930
Copy link
Contributor

45930 commented Oct 21, 2024

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.

8 participants