jsonrpc: update jsonrpsee to 0.24.7

Cargo.toml

@@ -373,13 +373,7 @@ integer-encoding = "3.0.1"
 ipnetwork = "0.20.0"
 itertools = "0.13.0"
 jemalloc-ctl = "^0.5"
-jsonrpsee = { git = "https://github.com/wlmyng/jsonrpsee.git", rev = "b1b300784795f6a64d0fcdf8f03081a9bc38bde8", features = [
-    "server",
-    "macros",
-    "ws-client",
-    "http-client",
-    "jsonrpsee-core",
-] }
+jsonrpsee = { version = "0.24.7", features = ["server", "macros", "ws-client", "http-client", "jsonrpsee-core"] }
 json_to_table = { git = "https://github.com/zhiburt/tabled/", rev = "e449317a1c02eb6b29e409ad6617e5d9eb7b3bd4" }
 leb128 = "0.2.5"
 lru = "0.10"

crates/sui-e2e-tests/tests/traffic_control_tests.rs

@@ -6,10 +6,7 @@
 
 use core::panic;
 use fastcrypto::encoding::Base64;
-use jsonrpsee::{
-    core::{client::ClientT, RpcResult},
-    rpc_params,
-};
+use jsonrpsee::{core::client::ClientT, rpc_params};
 use std::fs::File;
 use std::num::NonZeroUsize;
 use std::time::Duration;
@@ -201,7 +198,7 @@ async fn test_fullnode_traffic_control_dry_run() -> Result<(), anyhow::Error> {
 
     // it should take no more than 4 requests to be added to the blocklist
     for _ in 0..txn_count {
-        let response: RpcResult<SuiTransactionBlockResponse> = jsonrpc_client
+        let response: Result<SuiTransactionBlockResponse, _> = jsonrpc_client
             .request("sui_getTransactionBlock", rpc_params![*tx_digest])
             .await;
         assert!(
@@ -307,7 +304,7 @@ async fn test_fullnode_traffic_control_spam_blocked() -> Result<(), anyhow::Erro
 
     // it should take no more than 4 requests to be added to the blocklist
     for _ in 0..txn_count {
-        let response: RpcResult<SuiTransactionBlockResponse> = jsonrpc_client
+        let response: Result<SuiTransactionBlockResponse, _> = jsonrpc_client
             .request("sui_getTransactionBlock", rpc_params![*tx_digest])
             .await;
         if let Err(err) = response {
@@ -362,7 +359,7 @@ async fn test_fullnode_traffic_control_error_blocked() -> Result<(), anyhow::Err
             SuiTransactionBlockResponseOptions::new(),
             ExecuteTransactionRequestType::WaitForLocalExecution
         ];
-        let response: RpcResult<SuiTransactionBlockResponse> = jsonrpc_client
+        let response: Result<SuiTransactionBlockResponse, _> = jsonrpc_client
             .request("sui_executeTransactionBlock", params.clone())
             .await;
         if let Err(err) = response {
@@ -517,7 +514,7 @@ async fn test_fullnode_traffic_control_spam_delegated() -> Result<(), anyhow::Er
     assert!(confirmed_local_execution.unwrap());
 
     for _ in 0..txn_count {
-        let response: RpcResult<SuiTransactionBlockResponse> = jsonrpc_client
+        let response: Result<SuiTransactionBlockResponse, _> = jsonrpc_client
             .request("sui_getTransactionBlock", rpc_params![*tx_digest])
             .await;
         assert!(response.is_ok(), "Expected request to succeed");
@@ -845,7 +842,7 @@ async fn assert_validator_traffic_control_dry_run(
 
     // it should take no more than 4 requests to be added to the blocklist
     for _ in 0..txn_count {
-        let response: RpcResult<SuiTransactionBlockResponse> = jsonrpc_client
+        let response: Result<SuiTransactionBlockResponse, _> = jsonrpc_client
             .request("sui_getTransactionBlock", rpc_params![*tx_digest])
             .await;
         assert!(

crates/sui-indexer-alt-jsonrpc/src/api/mod.rs

@@ -8,11 +8,7 @@ use diesel::query_dsl::methods::LimitDsl;
 use diesel::result::Error as DieselError;
 use diesel_async::methods::LoadQuery;
 use diesel_async::RunQueryDsl;
-use jsonrpsee::core::Error as RpcError;
-use jsonrpsee::types::{
-    error::{CallError, INTERNAL_ERROR_CODE},
-    ErrorObject,
-};
+use jsonrpsee::types::{error::INTERNAL_ERROR_CODE, ErrorObject};
 use sui_pg_db as db;
 use tracing::debug;
 
@@ -49,20 +45,16 @@ impl<'p> Connection<'p> {
     }
 }
 
-impl From<DbError> for RpcError {
-    fn from(err: DbError) -> RpcError {
+impl From<DbError> for ErrorObject<'static> {
+    fn from(err: DbError) -> Self {
         match err {
-            DbError::Connect(err) => RpcError::Call(CallError::Custom(ErrorObject::owned(
-                INTERNAL_ERROR_CODE,
-                err.to_string(),
-                None::<()>,
-            ))),
+            DbError::Connect(err) => {
+                ErrorObject::owned(INTERNAL_ERROR_CODE, err.to_string(), None::<()>)
+            }
 
-            DbError::RunQuery(err) => RpcError::Call(CallError::Custom(ErrorObject::owned(
-                INTERNAL_ERROR_CODE,
-                err.to_string(),
-                None::<()>,
-            ))),
+            DbError::RunQuery(err) => {
+                ErrorObject::owned(INTERNAL_ERROR_CODE, err.to_string(), None::<()>)
+            }
         }
     }
 }

crates/sui-indexer-alt-jsonrpc/src/lib.rs

@@ -76,9 +76,7 @@ impl RpcService {
 
         info!("Starting JSON-RPC service on {listen_address}",);
 
-        let handle = server
-            .start(modules)
-            .context("Failed to start JSON-RPC service")?;
+        let handle = server.start(modules);
 
         Ok(tokio::spawn(async move {
             handle.stopped().await;

crates/sui-indexer/src/apis/extended_api.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::indexer_reader::IndexerReader;
+use crate::{errors::IndexerError, indexer_reader::IndexerReader};
 use jsonrpsee::{core::RpcResult, RpcModule};
 use sui_json_rpc::SuiRpcModule;
 use sui_json_rpc_api::{validate_limit, ExtendedApiServer, QUERY_MAX_RESULT_LIMIT_CHECKPOINTS};
@@ -29,7 +29,8 @@ impl ExtendedApiServer for ExtendedApi {
         limit: Option<usize>,
         descending_order: Option<bool>,
     ) -> RpcResult<EpochPage> {
-        let limit = validate_limit(limit, QUERY_MAX_RESULT_LIMIT_CHECKPOINTS)?;
+        let limit = validate_limit(limit, QUERY_MAX_RESULT_LIMIT_CHECKPOINTS)
+            .map_err(IndexerError::from)?;
         let mut epochs = self
             .inner
             .get_epochs(
@@ -60,10 +61,7 @@ impl ExtendedApiServer for ExtendedApi {
         _cursor: Option<CheckpointedObjectID>,
         _limit: Option<usize>,
     ) -> RpcResult<QueryObjectsPage> {
-        Err(jsonrpsee::types::error::CallError::Custom(
-            jsonrpsee::types::error::ErrorCode::MethodNotFound.into(),
-        )
-        .into())
+        Err(jsonrpsee::types::error::ErrorCode::MethodNotFound.into())
     }
 
     async fn get_total_transactions(&self) -> RpcResult<BigInt<u64>> {

crates/sui-indexer/src/apis/indexer_api.rs

@@ -3,9 +3,8 @@
 
 use async_trait::async_trait;
 use jsonrpsee::core::RpcResult;
-use jsonrpsee::types::SubscriptionEmptyError;
-use jsonrpsee::types::SubscriptionResult;
-use jsonrpsee::{RpcModule, SubscriptionSink};
+use jsonrpsee::core::SubscriptionResult;
+use jsonrpsee::{PendingSubscriptionSink, RpcModule};
 use tap::TapFallible;
 
 use sui_json_rpc::name_service::{Domain, NameRecord, NameServiceConfig, NameServiceError};
@@ -67,7 +66,8 @@ impl IndexerApi {
             .collect::<Result<Vec<_>, _>>()
             .map_err(|e| {
                 tracing::error!("Error joining object read futures.");
-                jsonrpsee::core::Error::Custom(format!("Error joining object read futures. {}", e))
+                crate::errors::IndexerError::from(e)
+                // jsonrpsee::core::Error::Custom(format!("Error joining object read futures. {}", e))
             })?
             .into_iter()
             .collect::<Result<Vec<_>, _>>()
@@ -119,9 +119,11 @@ impl IndexerApi {
             .await
             .into_iter()
             .collect::<Result<Vec<_>, _>>()
-            .map_err(|e: tokio::task::JoinError| anyhow::anyhow!(e))?
+            .map_err(|e: tokio::task::JoinError| anyhow::anyhow!(e))
+            .map_err(IndexerError::from)?
             .into_iter()
-            .collect::<Result<Vec<_>, anyhow::Error>>()?;
+            .collect::<Result<Vec<_>, anyhow::Error>>()
+            .map_err(IndexerError::from)?;
 
         Ok(Page {
             data,
@@ -168,8 +170,7 @@ impl IndexerApiServer for IndexerApi {
                 limit + 1,
                 descending_order.unwrap_or(false),
             )
-            .await
-            .map_err(|e: IndexerError| anyhow::anyhow!(e))?;
+            .await?;
 
         let has_next_page = results.len() > limit;
         results.truncate(limit);
@@ -254,7 +255,9 @@ impl IndexerApiServer for IndexerApi {
             | sui_types::object::ObjectRead::Deleted(_) => {}
             sui_types::object::ObjectRead::Exists(object_ref, o, layout) => {
                 return Ok(SuiObjectResponse::new_with_data(
-                    (object_ref, o, layout, options, None).try_into()?,
+                    (object_ref, o, layout, options, None)
+                        .try_into()
+                        .map_err(IndexerError::from)?,
                 ));
             }
         }
@@ -274,7 +277,9 @@ impl IndexerApiServer for IndexerApi {
             | sui_types::object::ObjectRead::Deleted(_) => {}
             sui_types::object::ObjectRead::Exists(object_ref, o, layout) => {
                 return Ok(SuiObjectResponse::new_with_data(
-                    (object_ref, o, layout, options, None).try_into()?,
+                    (object_ref, o, layout, options, None)
+                        .try_into()
+                        .map_err(IndexerError::from)?,
                 ));
             }
         }
@@ -284,16 +289,20 @@ impl IndexerApiServer for IndexerApi {
         ))
     }
 
-    fn subscribe_event(&self, _sink: SubscriptionSink, _filter: EventFilter) -> SubscriptionResult {
-        Err(SubscriptionEmptyError)
+    fn subscribe_event(
+        &self,
+        _sink: PendingSubscriptionSink,
+        _filter: EventFilter,
+    ) -> SubscriptionResult {
+        Err("disabled".into())
     }
 
     fn subscribe_transaction(
         &self,
-        _sink: SubscriptionSink,
+        _sink: PendingSubscriptionSink,
         _filter: TransactionFilter,
     ) -> SubscriptionResult {
-        Err(SubscriptionEmptyError)
+        Err("disabled".into())
     }
 
     async fn resolve_name_service_address(&self, name: String) -> RpcResult<Option<SuiAddress>> {

crates/sui-indexer/src/apis/read_api.rs

@@ -142,32 +142,23 @@ impl ReadApiServer for ReadApi {
         _version: SequenceNumber,
         _options: Option<SuiObjectDataOptions>,
     ) -> RpcResult<SuiPastObjectResponse> {
-        Err(jsonrpsee::types::error::CallError::Custom(
-            jsonrpsee::types::error::ErrorCode::MethodNotFound.into(),
-        )
-        .into())
+        Err(jsonrpsee::types::error::ErrorCode::MethodNotFound.into())
     }
 
     async fn try_get_object_before_version(
         &self,
         _: ObjectID,
         _: SequenceNumber,
     ) -> RpcResult<SuiPastObjectResponse> {
-        Err(jsonrpsee::types::error::CallError::Custom(
-            jsonrpsee::types::error::ErrorCode::MethodNotFound.into(),
-        )
-        .into())
+        Err(jsonrpsee::types::error::ErrorCode::MethodNotFound.into())
     }
 
     async fn try_multi_get_past_objects(
         &self,
         _past_objects: Vec<SuiGetPastObjectRequest>,
         _options: Option<SuiObjectDataOptions>,
     ) -> RpcResult<Vec<SuiPastObjectResponse>> {
-        Err(jsonrpsee::types::error::CallError::Custom(
-            jsonrpsee::types::error::ErrorCode::MethodNotFound.into(),
-        )
-        .into())
+        Err(jsonrpsee::types::error::ErrorCode::MethodNotFound.into())
     }
 
     async fn get_latest_checkpoint_sequence_number(&self) -> RpcResult<BigInt<u64>> {
@@ -209,20 +200,6 @@ impl ReadApiServer for ReadApi {
         })
     }
 
-    async fn get_checkpoints_deprecated_limit(
-        &self,
-        cursor: Option<BigInt<u64>>,
-        limit: Option<BigInt<u64>>,
-        descending_order: bool,
-    ) -> RpcResult<CheckpointPage> {
-        self.get_checkpoints(
-            cursor,
-            limit.map(|l| l.into_inner() as usize),
-            descending_order,
-        )
-        .await
-    }
-
     async fn get_events(&self, transaction_digest: TransactionDigest) -> RpcResult<Vec<SuiEvent>> {
         self.inner
             .get_transaction_events(transaction_digest)
@@ -282,7 +259,11 @@ async fn object_read_to_object_response(
                     Ok(rendered_fields) => display_fields = Some(rendered_fields),
                     Err(e) => {
                         return Ok(SuiObjectResponse::new(
-                            Some((object_ref, o, layout, options, None).try_into()?),
+                            Some(
+                                (object_ref, o, layout, options, None)
+                                    .try_into()
+                                    .map_err(IndexerError::from)?,
+                            ),
                             Some(SuiObjectResponseError::DisplayError {
                                 error: e.to_string(),
                             }),
@@ -291,7 +272,9 @@ async fn object_read_to_object_response(
                 }
             }
             Ok(SuiObjectResponse::new_with_data(
-                (object_ref, o, layout, options, display_fields).try_into()?,
+                (object_ref, o, layout, options, display_fields)
+                    .try_into()
+                    .map_err(IndexerError::from)?,
             ))
         }
         ObjectRead::Deleted((object_id, version, digest)) => Ok(SuiObjectResponse::new_with_error(

crates/sui-indexer/src/apis/write_api.rs

@@ -44,7 +44,8 @@ impl WriteApiServer for WriteApi {
         let sui_transaction_response = self
             .fullnode
             .execute_transaction_block(tx_bytes, signatures, options.clone(), request_type)
-            .await?;
+            .await
+            .map_err(crate::errors::client_error_to_error_object)?;
         Ok(SuiTransactionBlockResponseWithOptions {
             response: sui_transaction_response,
             options: options.unwrap_or_default(),
@@ -69,13 +70,17 @@ impl WriteApiServer for WriteApi {
                 additional_args,
             )
             .await
+            .map_err(crate::errors::client_error_to_error_object)
     }
 
     async fn dry_run_transaction_block(
         &self,
         tx_bytes: Base64,
     ) -> RpcResult<DryRunTransactionBlockResponse> {
-        self.fullnode.dry_run_transaction_block(tx_bytes).await
+        self.fullnode
+            .dry_run_transaction_block(tx_bytes)
+            .await
+            .map_err(crate::errors::client_error_to_error_object)
     }
 }
 

crates/sui-indexer/src/errors.rs

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use fastcrypto::error::FastCryptoError;
-use jsonrpsee::core::Error as RpcError;
-use jsonrpsee::types::error::CallError;
+use jsonrpsee::types::ErrorObjectOwned as RpcError;
 use sui_json_rpc::name_service::NameServiceError;
 use thiserror::Error;
 
@@ -155,7 +154,11 @@ impl<T> Context<T> for Result<T, IndexerError> {
 
 impl From<IndexerError> for RpcError {
     fn from(e: IndexerError) -> Self {
-        RpcError::Call(CallError::Failed(e.into()))
+        RpcError::owned(
+            jsonrpsee::types::error::CALL_EXECUTION_FAILED_CODE,
+            e.to_string(),
+            None::<()>,
+        )
     }
 }
 
@@ -170,3 +173,16 @@ impl From<diesel_async::pooled_connection::bb8::RunError> for IndexerError {
         Self::PgPoolConnectionError(value.to_string())
     }
 }
+
+pub(crate) fn client_error_to_error_object(
+    e: jsonrpsee::core::ClientError,
+) -> jsonrpsee::types::ErrorObjectOwned {
+    match e {
+        jsonrpsee::core::ClientError::Call(e) => e,
+        _ => jsonrpsee::types::ErrorObjectOwned::owned(
+            jsonrpsee::types::error::UNKNOWN_ERROR_CODE,
+            e.to_string(),
+            None::<()>,
+        ),
+    }
+}