feat(block-producer): merge next#538
Merged
Mirko-von-Leipzig merged 10 commits intonext-block-producerfrom Nov 3, 2024
Merged
Conversation
* feat: improve node errors * docs: update `CHANGELOG.md`
* feat: Return code for FPI * Rename var * CHANGELOG * Address comments * Check earlier * Address comments * Force proto rebuild * Update crates/rpc-proto/proto/responses.proto Co-authored-by: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com> * Update description * Proto rebuild * Update description --------- Co-authored-by: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com>
…532) * feat: avoid cloning in-memory data structures on `apply_block` * docs: update `CHANGELOG.md` * chore: update `miden-crypto` dependency Co-authored-by: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com> * chore: update `Cargo.lock` * refactor: address review comments * fix: prevent inconsistent in-memory and DB states * refactor: address review comments --------- Co-authored-by: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com>
* feat: improve node errors * docs: update `CHANGELOG.md` * feat: save/restore faucet state and keypair to/from files * feat: make faucet account public, request account state on submission error * feat: introduce `ClientError` * fix: update config * fix: save new faucet state to in-memory store after getting from the server * fix: remove `macros` feature from axum dependency * docs: update `CHANGELOG.md` * docs: add comment for `seed` field Co-authored-by: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com> * fix: log message Co-authored-by: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com> * refactor: address review comments * refactor: initial changes * refactor: impl Send and Sync for FaucetDataStore * chore: update changelog * refactor: remove unnecessary async, add warning ignore to makefile * refactor: update genesis generation, read faucet account from `faucet.mac`, request faucet state on initialization * feat: faucet account creation * fix: handling of account not found error * refactor: use Arc and Mutex * chore: removed unneeded cast * fix: lint * docs: update CHANGELOG.md * fix: compilation errors * docs: add `TODO` for incorrect and unsafe `Send` implementation * refactor: small refactoring * refactor: address review comments * docs: update `README.md` for faucet * docs: improve instructions and clarifications in faucet's `README.md` --------- Co-authored-by: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com> Co-authored-by: Andrey <andrey@polygon.technology> Co-authored-by: Bobbin Threadbare <bobbinth@protonmail.com>
Doing this now in an effort to simplify subsequent work that will be less isolated.
bobbinth
approved these changes
Nov 2, 2024
Contributor
bobbinth
left a comment
bobbinth
left a comment
There was a problem hiding this comment.
Looks good! Thank you! I left a couple of small comments inline.
Contributor
|
Actually, I pushed a small commit that addresses my comments. Feel free to revert it if you think that's not the right place for it. |
Collaborator
Author
I think its fine since they're small changes; but in a technical sense probably more correct to change those directly on |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Merge
nextintonext-block-producerin anticipation of touching more common code.To date the
block-producerrework has been done in disjoint files fromnext, meaning the parallel branch has had close to zero merge conflicts. The next steps involve swopping out thenextblock-producer for the one onnext-block-producerwhich likely means merge conflicts will occur more commonly.This PR pre-emptively merges
nextin order to minimize merge conflicts going forward.This merge had no conflicts; just an auto-merge aka it should be safe as is.
I'd suggest auditing the
block-producercrate's diff specifically and the rest can be ignored. Within that crate the changes are also in locations not touched by the rework and should be safe.