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.

Sign up for GitHub

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

Jump to bottom

feat(zk_os): works with main zk_ee branch #3380

Merged
merged 2 commits into from
Dec 12, 2024
Merged

feat(zk_os): works with main zk_ee branch #3380

merged 2 commits into from
Dec 12, 2024

Conversation

AntonD3
Copy link
Contributor

@AntonD3 AntonD3 commented Dec 12, 2024

What ❔

Use main branch of zk_ee and fixes to make it works.

Why ❔

to integrate newest zk_ee changes

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.
  • Code has been formatted via zkstack dev fmt and zkstack dev lint.

@AntonD3 AntonD3 changed the title feat: works with main zk_ee branch feat(zk_os): works with main zk_ee branch Dec 12, 2024
@RomanBrodetski RomanBrodetski merged commit 9947071 into zkos-dev Dec 12, 2024
16 of 29 checks passed
@RomanBrodetski RomanBrodetski deleted the ad-zkos-use-zk-ee-main branch December 12, 2024 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RomanBrodetski RomanBrodetski RomanBrodetski approved these changes

@perekopskiy perekopskiy Awaiting requested review from perekopskiy

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AntonD3 @RomanBrodetski