-
Notifications
You must be signed in to change notification settings - Fork 11
Emergency commit #353
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
Open
MartinOndejka
wants to merge
6
commits into
compatible
Choose a base branch
from
emergency-commit
base: compatible
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Emergency commit #353
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5a380e7
Implement circuit for emergency commit
MartinOndejka d445456
Fix sequencer
MartinOndejka dd4751a
Add emergency commit spec
MartinOndejka fc1387c
fmt
MartinOndejka 174c162
Add emergency commit explanation
MartinOndejka 548fb07
Simplify emergency commit spec
MartinOndejka File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| open Snark_params.Tick | ||
| open Zeko_util | ||
|
|
||
| module Definition = struct | ||
| module Stmt = struct | ||
| type t = | ||
| { source_action_state : Rollup_state.Outer_action_state.t | ||
| ; target_action_state : Rollup_state.Outer_action_state.t | ||
| ; n_commits : Checked32.t | ||
| } | ||
| [@@deriving snarky] | ||
| end | ||
|
|
||
| module Elem = Rollup_state.Outer_action | ||
|
|
||
| let dummy_elem = | ||
| Rollup_state.Outer_action.Witness | ||
| { aux = Field.zero | ||
| ; children_digest = Rollup_state.Zkapp_call_forest.Digest.empty | ||
| ; slot_range = Slot_range.infinite | ||
| } | ||
|
|
||
| module Init = struct | ||
| type t = { original_action_state : Rollup_state.Outer_action_state.t } | ||
| [@@deriving snarky] | ||
| end | ||
|
|
||
| let init ~check:_ ({ original_action_state } : Init.var) : Stmt.var Checked.t | ||
| = | ||
| Checked.return | ||
| ( { source_action_state = original_action_state | ||
| ; target_action_state = original_action_state | ||
| ; n_commits = Checked32.Checked.zero | ||
| } | ||
| : Stmt.var ) | ||
|
|
||
| let step (action : Rollup_state.Outer_action.var) | ||
| ({ source_action_state; target_action_state; n_commits } : Stmt.var) = | ||
| let* target_action_state = | ||
| Rollup_state.Outer_action.push_var action target_action_state | ||
| in | ||
| let*| n_commits = | ||
| let* increment = | ||
| if_ ~typ:Checked32.typ action.is_commit | ||
| ~then_:Checked32.(Checked.constant one) | ||
| ~else_:Checked32.Checked.zero | ||
| in | ||
| Checked32.Checked.add n_commits increment | ||
| in | ||
| Stmt.{ source_action_state; target_action_state; n_commits } | ||
|
|
||
| let name = "count_commits" | ||
|
|
||
| let leaf_iterations = | ||
| Zeko_constants.Folder_iterations.Count_commits.leaf_iterations | ||
|
|
||
| let leaf_option_iterations = | ||
| Zeko_constants.Folder_iterations.Count_commits.leaf_option_iterations | ||
|
|
||
| let extend_iterations = | ||
| Zeko_constants.Folder_iterations.Count_commits.extend_iterations | ||
|
|
||
| let extend_option_iterations = | ||
| Zeko_constants.Folder_iterations.Count_commits.extend_option_iterations | ||
|
|
||
| let wrap_domain = Some `N14 | ||
| end | ||
|
|
||
| include Folder.Make (Definition) () |
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this accurate? It's not clear to me how liveness would be restored. It seems to me that there is no mechanism to update the
sequenceron the outer account, so how would we resume committing if that sequencer stays offline? Since a normal commit requires sequencer signature.