Add custom error and use in getInflationReward

anza-xyz · Jun 25, 2024 · fa40c26 · fa40c26
1 parent f2ecfb9
commit fa40c26
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/rpc-client-api/src/custom_error.rs b/rpc-client-api/src/custom_error.rs
@@ -24,6 +24,7 @@ pub const JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_LEN_MISMATCH: i64 = -32013
 pub const JSON_RPC_SERVER_ERROR_BLOCK_STATUS_NOT_AVAILABLE_YET: i64 = -32014;
 pub const JSON_RPC_SERVER_ERROR_UNSUPPORTED_TRANSACTION_VERSION: i64 = -32015;
 pub const JSON_RPC_SERVER_ERROR_MIN_CONTEXT_SLOT_NOT_REACHED: i64 = -32016;
+pub const JSON_RPC_SERVER_ERROR_EPOCH_REWARDS_PERIOD_ACTIVE: i64 = -32017;
 
 #[derive(Error, Debug)]
 pub enum RpcCustomError {
@@ -65,6 +66,8 @@ pub enum RpcCustomError {
     UnsupportedTransactionVersion(u8),
     #[error("MinContextSlotNotReached")]
     MinContextSlotNotReached { context_slot: Slot },
+    #[error("EpochRewardsPeriodActive")]
+    EpochRewardsPeriodActive { slot: Slot },
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -206,6 +209,11 @@ impl From<RpcCustomError> for Error {
                     context_slot,
                 })),
             },
+            RpcCustomError::EpochRewardsPeriodActive { slot } => Self {
+                code: ErrorCode::ServerError(JSON_RPC_SERVER_ERROR_EPOCH_REWARDS_PERIOD_ACTIVE),
+                message: format!("Epoch rewards period still active at slot {slot}"),
+                data: None,
+            },
         }
     }
 }
diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
@@ -704,9 +704,12 @@ impl JsonRpcRequestProcessor {
                 .await?;
 
             for (partition_index, addresses) in partition_index_addresses.iter() {
-                let slot = *block_list
-                    .get(*partition_index)
-                    .ok_or_else(Error::internal_error)?;
+                let slot = *block_list.get(*partition_index).ok_or_else(||
+                        // If block_list.len() too short to contain
+                        // partition_index, the epoch rewards period must be
+                        // currently active.
+                        { RpcCustomError::EpochRewardsPeriodActive { slot: bank.slot() }
+                    })?;
 
                 let Ok(Some(block)) = self
                     .get_block(