-
Notifications
You must be signed in to change notification settings - Fork 44
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
feat(block-producer): merge next #538
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 <[email protected]> * Update description * Proto rebuild * Update description --------- Co-authored-by: Mirko <[email protected]>
…532) * feat: avoid cloning in-memory data structures on `apply_block` * docs: update `CHANGELOG.md` * chore: update `miden-crypto` dependency Co-authored-by: Mirko <[email protected]> * Update CHANGELOG.md Co-authored-by: Mirko <[email protected]> * chore: update `Cargo.lock` * refactor: address review comments * fix: prevent inconsistent in-memory and DB states * refactor: address review comments --------- Co-authored-by: Mirko <[email protected]>
* 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 <[email protected]> * fix: log message Co-authored-by: Mirko <[email protected]> * 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 <[email protected]> Co-authored-by: Andrey <[email protected]> Co-authored-by: Bobbin Threadbare <[email protected]>
Doing this now in an effort to simplify subsequent work that will be less isolated.
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.
Looks good! Thank you! I left a couple of small comments inline.
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. |
I think its fine since they're small changes; but in a technical sense probably more correct to change those directly on |
Merge
next
intonext-block-producer
in anticipation of touching more common code.To date the
block-producer
rework has been done in disjoint files fromnext
, meaning the parallel branch has had close to zero merge conflicts. The next steps involve swopping out thenext
block-producer for the one onnext-block-producer
which likely means merge conflicts will occur more commonly.This PR pre-emptively merges
next
in 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-producer
crate'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.