Skip to content

Add slot to the error context of EpochRewardsPeriodActiveErrorData and SlotNotEpochBoundaryErrorData #6962

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.

Sign up for GitHub

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

Merged
steveluscher merged 5 commits into from
Jul 21, 2025
+53 −1
Merged

Add slot to the error context of EpochRewardsPeriodActiveErrorData and SlotNotEpochBoundaryErrorData #6962

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0e3390
Add `slot` to the error context of `EpochRewardsPeriodActiveErrorData…
steveluscher Jul 14, 2025
b725908
Add CHANGELOG entries
steveluscher Jul 16, 2025
0ab1060
Directly serialize the JSON-RPC error data, rather than bouncing it t…
steveluscher Jul 18, 2025
cf51538
Make `EpochRewardsPeriodActiveErrorData` from the perspective of dese…
steveluscher Jul 18, 2025
3c96902
Merge branch 'master' into error-context-on-epoch-rewards-period-error
steveluscher Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion rpc-client-api/src/custom_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ pub struct MinContextSlotNotReachedErrorData {
pub struct EpochRewardsPeriodActiveErrorData {
pub current_block_height: u64,
pub rewards_complete_block_height: u64,
pub slot: u64,
}

#[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct SlotNotEpochBoundaryErrorData {
pub slot: u64,
}

impl From<EncodeError> for RpcCustomError {
Expand Down Expand Up @@ -237,6 +244,7 @@ impl From<RpcCustomError> for Error {
data: Some(serde_json::json!(EpochRewardsPeriodActiveErrorData {
current_block_height,
rewards_complete_block_height,
slot,
})),
},
RpcCustomError::SlotNotEpochBoundary { slot } => Self {
Expand All @@ -245,7 +253,7 @@ impl From<RpcCustomError> for Error {
"Rewards cannot be found because slot {slot} is not the epoch boundary. This \
may be due to gap in the queried node's local ledger or long-term storage"
),
data: None,
data: Some(serde_json::json!(SlotNotEpochBoundaryErrorData { slot })),
},
RpcCustomError::LongTermStorageUnreachable => Self {
code: ErrorCode::ServerError(JSON_RPC_SERVER_ERROR_LONG_TERM_STORAGE_UNREACHABLE),
Expand Down
Loading