move vesting update phase into Account.Hardfork.of_stable #18216
+82
−107
Conversation
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
glyh
commented
Dec 8, 2025
|
|
||
| let of_stable (account : Stable.Latest.t) : t = | ||
| (* This function converts Berkeley account to Mesa account *) | ||
| let of_stable ~hardfork_slot (account : Stable.Latest.t) : t = |
Member
Author
There was a problem hiding this comment.
This is the function we expect to expose to o1js's end. hardfork_slot is the slot where HF happen.
hardfork_slot is the slot when HF happen, in Mesa the slot time is different before/after this slot. This is needed only to patch vesting params. Which could be less relevant for testing zkApps. @Trivo25
glyh
commented
Dec 8, 2025
| List.mapi stable_locations_and_accounts ~f:(fun i acct -> | ||
| ( Ledger.Hardfork_db.Addr.of_int_exn ~ledger_depth i | ||
| , Account.Hardfork.of_stable acct ) ) | ||
| , Account.Hardfork.of_stable ~hardfork_slot acct ) ) |
glyh
commented
Dec 8, 2025
| assert (Ledger_hash.equal start_hash (merkle_root ledger)) ; | ||
| (merkle_path ledger new_loc, Account.empty) | ||
|
|
||
| module Converting_for_tests = struct |
Member
Author
There was a problem hiding this comment.
I moved some converting ledger funcs here. This is because with hardfork slot is not known here, and it's not used in anything other than tests.
| new_accounts ) | ||
| |> List.concat | ||
|
|
||
| let convert_and_apply_all_masks_to_ledger ~hardfork_db ({ ledger; _ } : t) = |
Member
Author
There was a problem hiding this comment.
removed as not used & requires hf slot present.
Member
Author
|
!ci-build-me |
Trivo25
approved these changes
Dec 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a request from @Trivo25, having a function exposing the account conversion phase that o1js could refer to, for testing purpose.
Context: https://o1-labs.slack.com/archives/C02BFPS6BA4/p1765170746704759
I also discovered there's a bug when doing this: chunked migration doesn't have vesting param update in it.