Api : deferred call endpoint versioning

massalabs · Dec 11, 2024 · 820ed1e · 820ed1e
1 parent cb30010
commit 820ed1e
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/massa-api/src/public.rs b/massa-api/src/public.rs
@@ -1160,6 +1160,16 @@ impl MassaRpcServer for API<Public> {
         &self,
         req: Vec<DeferredCallsQuoteRequest>,
     ) -> RpcResult<Vec<DeferredCallsQuoteResponse>> {
+        let current_network_version = self
+            .0
+            .keypair_factory
+            .mip_store
+            .get_network_version_current();
+
+        if current_network_version < 1 {
+            return Err(ApiError::NotFound.into());
+        }
+
         if req.len() as u64 > self.0.api_settings.max_arguments {
             return Err(ApiError::BadRequest("too many arguments".into()).into());
         }
@@ -1205,6 +1215,16 @@ impl MassaRpcServer for API<Public> {
         &self,
         arg: Vec<String>,
     ) -> RpcResult<Vec<DeferredCallResponse>> {
+        let current_network_version = self
+            .0
+            .keypair_factory
+            .mip_store
+            .get_network_version_current();
+
+        if current_network_version < 1 {
+            return Err(ApiError::NotFound.into());
+        }
+
         if arg.len() as u64 > self.0.api_settings.max_arguments {
             return Err(ApiError::BadRequest("too many arguments".into()).into());
         }
@@ -1245,6 +1265,16 @@ impl MassaRpcServer for API<Public> {
         &self,
         slots: Vec<Slot>,
     ) -> RpcResult<Vec<DeferredCallsSlotResponse>> {
+        let current_network_version = self
+            .0
+            .keypair_factory
+            .mip_store
+            .get_network_version_current();
+
+        if current_network_version < 1 {
+            return Err(ApiError::NotFound.into());
+        }
+
         if slots.len() as u64 > self.0.api_settings.max_arguments {
             return Err(ApiError::BadRequest("too many arguments".into()).into());
         }

diff --git a/massa-execution-exports/src/mapping_grpc.rs b/massa-execution-exports/src/mapping_grpc.rs
@@ -21,6 +21,7 @@ use massa_proto_rs::massa::model::v1 as grpc_model;
 /// Convert a `grpc_api::ScExecutionEventsRequest` to a `ScExecutionEventsRequest`
 pub fn to_querystate_filter(
     query: grpc_api::ExecutionQueryRequestItem,
+    network_version: u32,
 ) -> Result<ExecutionQueryRequestItem, ModelsError> {
     if let Some(item) = query.request_item {
         match item {
@@ -135,6 +136,12 @@ pub fn to_querystate_filter(
                 Ok(ExecutionQueryRequestItem::Events(event_filter))
             }
             exec::RequestItem::DeferredCallQuote(value) => {
+                if network_version < 1 {
+                    return Err(ModelsError::InvalidVersionError(
+                        "deferred call quote is not supported in this network version".to_string(),
+                    ));
+                }
+
                 Ok(ExecutionQueryRequestItem::DeferredCallQuote {
                     target_slot: value
                         .target_slot
@@ -147,10 +154,22 @@ pub fn to_querystate_filter(
                 })
             }
             exec::RequestItem::DeferredCallInfo(info) => {
+                if network_version < 1 {
+                    return Err(ModelsError::InvalidVersionError(
+                        "deferred call quote is not supported in this network version".to_string(),
+                    ));
+                }
+
                 let id = DeferredCallId::from_str(&info.call_id)?;
                 Ok(ExecutionQueryRequestItem::DeferredCallInfo(id))
             }
             exec::RequestItem::DeferredCallsBySlot(value) => {
+                if network_version < 1 {
+                    return Err(ModelsError::InvalidVersionError(
+                        "deferred call quote is not supported in this network version".to_string(),
+                    ));
+                }
+
                 Ok(ExecutionQueryRequestItem::DeferredCallsBySlot(
                     value
                         .slot

diff --git a/massa-grpc/src/public.rs b/massa-grpc/src/public.rs
@@ -992,11 +992,13 @@ pub(crate) fn query_state(
     grpc: &MassaPublicGrpc,
     request: tonic::Request<grpc_api::QueryStateRequest>,
 ) -> Result<grpc_api::QueryStateResponse, GrpcError> {
+    let current_network_version = grpc.keypair_factory.mip_store.get_network_version_current();
+
     let queries = request
         .into_inner()
         .queries
         .into_iter()
-        .map(to_querystate_filter)
+        .map(|q| to_querystate_filter(q, current_network_version))
         .collect::<Result<Vec<_>, _>>()?;
 
     if queries.is_empty() {