mirror of
https://github.com/datahaven-xyz/datahaven
synced 2026-05-24 09:50:01 +00:00
## Era-targeted validator set submission with dedicated submitter role > **Note:** This PR includes a detailed specification at [`specs/validator-set-submission/validator-set-submission.md`](https://github.com/datahaven-xyz/datahaven/blob/feat/validator-set-submitter/specs/validator-set-submission/validator-set-submission.md) that covers the design rationale, submission lifecycle, era-targeting rules, and failure modes. Reading the spec first will make the contract, pallet, and daemon changes easier to follow. ### Summary - Introduce a dedicated `validatorSetSubmitter` role on `DataHavenServiceManager`, separating validator set submission authority from the contract owner - Replace the unscoped `sendNewValidatorSet` with `sendNewValidatorSetForEra`, which encodes a `targetEra` into the Snowbridge message payload - Add server-side era validation in the `external-validators` pallet to reject stale, duplicate, or out-of-range submissions - Add a long-running TypeScript daemon that watches session changes and automatically submits each era's validator set at the right time ### Contract changes (`contracts/`) - **New `validatorSetSubmitter` storage slot** — set during `initialize` and rotatable via `setValidatorSetSubmitter` (owner-only). The storage gap is decremented accordingly. - **`sendNewValidatorSet` → `sendNewValidatorSetForEra`** — accepts a `uint64 targetEra` parameter and is restricted to `onlyValidatorSetSubmitter` instead of `onlyOwner`. - **`buildNewValidatorSetMessageForEra`** — the `NewValidatorSetPayload.externalIndex` is now caller-supplied instead of hardcoded to `0`. - **New events** — `ValidatorSetSubmitterUpdated`, `ValidatorSetMessageSubmitted`. - **New error** — `OnlyValidatorSetSubmitter`. - **New test suite** — `ValidatorSetSubmitter.t.sol` covering submitter set/rotate, access control, era encoding, and legacy function removal. ### Pallet changes (`operator/`) - **`validate_target_era`** in `external-validators` — enforces `activeEra < targetEra <= activeEra + 1` and `targetEra > ExternalIndex` (dedup guard). - **New errors** — `TargetEraTooOld`, `TargetEraTooNew`, `DuplicateOrStaleTargetEra`. - **Tests** — five new test cases for era boundary conditions (next-era acceptance, old-era rejection, too-new rejection, duplicate rejection, genesis behavior). Existing `era_hooks_with_external_index` test updated to use valid target eras. - **Runtime test fixes** — `external_index: 0` → `1` in mainnet/stagenet/testnet EigenLayer message processor tests to satisfy the new validation. ### Validator set submitter daemon (`test/tools/validator-set-submitter/`) - Event-driven service that subscribes to finalized `Session.CurrentIndex` via Polkadot-API `watchValue`. - Submits once per era during the last session, targeting `ActiveEra + 1`. - Tracks submitted eras to avoid duplicates; skips if `ExternalIndex` already covers the target. - Startup self-checks: Ethereum connectivity, DataHaven connectivity, on-chain submitter authorization. - Supports `--dry-run` mode and YAML configuration. - Graceful shutdown on `SIGINT`/`SIGTERM`. ### Test & tooling updates - **E2E test** (`validator-set-update.test.ts`) — calls `sendNewValidatorSetForEra` with a computed `targetEra` and filters the substrate event by `external_index`. - **`update-validator-set.ts` script** — accepts `--target-era` flag; defaults to era 1 for fresh networks. - **CLI launch** — wires validator set update as an interactive step after relayer launch. - **`package.json`** — new `submitter` and `submitter:dry-run` scripts. - Regenerated contract bindings, PAPI metadata, state-diff, and storage layout snapshots. ### Test plan - [x] `forge test` — passes, including new `ValidatorSetSubmitter.t.sol` - [x] `cargo test` — passes, including new era-validation tests in `external-validators` - [x] `bun test:e2e` — validator-set-update suite passes with era-targeted flow - [x] Manual: run submitter daemon against local network (`bun submitter`), verify it submits once per era at the correct session ## ⚠️ Breaking Changes ⚠️ - **`sendNewValidatorSet` removed** — replaced by `sendNewValidatorSetForEra(uint64 targetEra, ...)`. Callers must now supply a `targetEra` parameter. - **Access control changed** — validator set submission is now restricted to the `validatorSetSubmitter` role instead of the contract `owner`. The submitter address is set during `initialize` and rotatable via `setValidatorSetSubmitter` (owner-only). - **`external-validators` pallet now validates `targetEra`** — messages with a stale, duplicate, or out-of-range `external_index` are rejected on-chain. Existing integrations sending `external_index: 0` will fail validation. --------- Co-authored-by: Cursor <cursoragent@cursor.com>
111 lines
3.3 KiB
TypeScript
111 lines
3.3 KiB
TypeScript
import { confirmWithTimeout, logger, printDivider, printHeader } from "utils";
|
|
import { fundValidators, setupValidators, updateValidatorSet } from "../../../launcher/validators";
|
|
import type { LaunchOptions } from "..";
|
|
|
|
export const performValidatorOperations = async (
|
|
options: LaunchOptions,
|
|
networkRpcUrl: string,
|
|
contractsDeployed: boolean
|
|
) => {
|
|
printHeader("Funding DataHaven Validators");
|
|
|
|
// If not specified, prompt for funding
|
|
let shouldFundValidators = options.fundValidators;
|
|
if (shouldFundValidators === undefined) {
|
|
shouldFundValidators = await confirmWithTimeout(
|
|
"Do you want to fund validators with tokens and ETH?",
|
|
true,
|
|
10
|
|
);
|
|
} else {
|
|
logger.info(
|
|
`🏳️ Using flag option: ${shouldFundValidators ? "will fund" : "will not fund"} validators`
|
|
);
|
|
}
|
|
|
|
if (shouldFundValidators) {
|
|
if (!contractsDeployed) {
|
|
logger.warn(
|
|
"⚠️ Funding validators but contracts were not deployed in this CLI run. Could have unexpected results."
|
|
);
|
|
}
|
|
|
|
await fundValidators({ rpcUrl: networkRpcUrl });
|
|
printDivider();
|
|
} else {
|
|
logger.info("👍 Skipping validator funding");
|
|
printDivider();
|
|
}
|
|
|
|
printHeader("Setting Up DataHaven Validators");
|
|
|
|
// If not specified, prompt for setup
|
|
let shouldSetupValidators = options.setupValidators;
|
|
if (shouldSetupValidators === undefined) {
|
|
shouldSetupValidators = await confirmWithTimeout(
|
|
"Do you want to register validators in EigenLayer?",
|
|
true,
|
|
10
|
|
);
|
|
} else {
|
|
logger.info(
|
|
`🏳️ Using flag option: ${shouldSetupValidators ? "will register" : "will not register"} validators`
|
|
);
|
|
}
|
|
|
|
if (shouldSetupValidators) {
|
|
if (!contractsDeployed) {
|
|
logger.warn(
|
|
"⚠️ Setting up validators but contracts were not deployed in this CLI run. Could have unexpected results."
|
|
);
|
|
}
|
|
|
|
await setupValidators({ rpcUrl: networkRpcUrl });
|
|
printDivider();
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Performs the validator set update operation based on user options
|
|
* This function is now separate so it can be called after relayers are set up
|
|
*
|
|
* @param options - CLI options for the validator set update
|
|
* @param networkRpcUrl - RPC URL for the Ethereum network
|
|
* @param contractsDeployed - Flag indicating if contracts were deployed in this CLI run
|
|
* @returns Promise resolving when the operation is complete
|
|
*/
|
|
export const performValidatorSetUpdate = async (
|
|
options: LaunchOptions,
|
|
networkRpcUrl: string,
|
|
contractsDeployed: boolean
|
|
) => {
|
|
printHeader("Updating DataHaven Validator Set");
|
|
|
|
let shouldUpdateValidatorSet = options.updateValidatorSet;
|
|
if (shouldUpdateValidatorSet === undefined) {
|
|
shouldUpdateValidatorSet = await confirmWithTimeout(
|
|
"Do you want to update the validator set?",
|
|
true,
|
|
10
|
|
);
|
|
} else {
|
|
logger.info(
|
|
`🏳️ Using flag option: ${shouldUpdateValidatorSet ? "will update" : "will not update"} validator set`
|
|
);
|
|
}
|
|
|
|
if (!shouldUpdateValidatorSet) {
|
|
logger.info("👍 Skipping validator set update");
|
|
printDivider();
|
|
return;
|
|
}
|
|
|
|
if (!contractsDeployed) {
|
|
logger.warn(
|
|
"⚠️ Updating validator set but contracts were not deployed in this CLI run. Could have unexpected results."
|
|
);
|
|
}
|
|
|
|
await updateValidatorSet({ rpcUrl: networkRpcUrl });
|
|
printDivider();
|
|
};
|