feat: merge-train/spartan - #25375
Open
AztecBot wants to merge 2 commits into
Open
Conversation
…tors (#25292) Was missing this when setting up my own sequencer: - **Node.js prerequisite**: Adds a Node.js section to the node operator prerequisites page, instructing operators to install Node.js 24.12.0 via nvm. Was installing aztec on Ubuntu server 24.04 and was missing this in the prerequisites. - **Staking provider key security warning**: Adds a warning to the key generation step of the staking provider guide covering how the generated keystore and mnemonic must be handled and what compromise or loss costs: holders can trigger slashing and redirect block rewards but cannot steal the delegated stake, lost keys cannot be rotated, and at most 5% of the stake can be slashed before ejection, which permanently ends the delegation.
Contributor
|
The conflicts come from #25292, which edited four files under the in-tree #25377 reverts it on the train — verified locally that The docs content is re-landed in the new repo: aztec-labs-eng/aztec-node#112. |
…25377) Unblocks #25375. #25292 edited four files under the in-tree `docs/`, which #25321 deleted (those components are now built from the `labs/` submodule). Every merge of `next` into the train therefore hits a modify/delete conflict on: - `docs/docs-operate/operators/prerequisites.md` - `docs/docs-operate/operators/setup/staking-provider.md` - `docs/network_versioned_docs/version-v5.2.0/operators/prerequisites.md` - `docs/network_versioned_docs/version-v5.2.0/operators/setup/staking-provider.md` Reverting restores those files to their pre-#25292 content, so `next`'s deletion applies cleanly and the automated next-to-train merge succeeds. The docs content is re-landed against `docs/` in aztec-node: aztec-labs-eng/aztec-node#112.
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
2 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.
See merge-train-readme.md.
This is a merge-train.