Make oracles support not experimental (#3926)

Closes #3732

commit-id:cf38af52

---

**Stack**:
- #3926 ⬅
- #3925
- #3850
- #3849
- #3848
- #3847


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*

---------

Co-authored-by: Marek Kaput <[email protected]>

Author: cptartur

.github/actions/setup-tools/action.yml

@@ -10,6 +10,10 @@ inputs:
     description: 'Whether to setup scarb'
     required: false
     default: 'true'
+  scarb-version:
+    description: 'Optional: Scarb version to install. If not set, uses version from .tool-versions'
+    required: false
+    default: ''
   setup-usc:
     description: 'Whether to setup universal-sierra-compiler'
     required: false
@@ -24,6 +28,8 @@ runs:
 
     - uses: software-mansion/setup-scarb@v1
       if: ${{ inputs.setup-scarb == 'true' }}
+      with:
+        scarb-version: ${{ inputs.scarb-version }}
 
     - uses: software-mansion/setup-universal-sierra-compiler@v1
       if: ${{ inputs.setup-usc == 'true' }}

.github/workflows/ci.yml

@@ -259,6 +259,16 @@ jobs:
       - name: Run Data Transformer tests
         run: cargo test --profile ci -p data-transformer
 
+  test-forge-oracles:
+    name: Test Oracles in Forge
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: ./.github/actions/setup-tools
+        with:
+          scarb-version: '2.13.1'
+      - run: cargo test --profile ci -p forge --features run_test_for_scarb_since_2_13_1 e2e::oracles
+
   test-forge-scarb-plugin:
     name: Test Forge Scarb Plugin
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Fixed
 
 - Cheatcodes are now reflected in called contract, when directly using a library call from test code
+- Oracles are fully supported for Scarb versions >= 2.13.1. Bugs related to oracles' output handling have been fixed.
+  Removed the `--experimental-oracles` flag.`
 
 ### Cast
 
@@ -26,7 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 #### Fixed
 
-- Restored missing `command` missing from some responses when using `--json` output format. 
+- Restored missing `command` missing from some responses when using `--json` output format.
 
 ## [0.53.0] - 2025-11-24
 

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/execution_info.rs

@@ -3,10 +3,8 @@ use cairo_vm::{
     types::relocatable::{MaybeRelocatable, Relocatable},
     vm::vm_core::VirtualMachine,
 };
-use conversions::{
-    IntoConv,
-    serde::serialize::{SerializeToFeltVec, raw::RawFeltVec},
-};
+use conversions::serde::SerializedValue;
+use conversions::{IntoConv, serde::serialize::SerializeToFeltVec};
 use starknet_types_core::felt::Felt;
 
 fn get_cheated_block_info_ptr(
@@ -90,8 +88,10 @@ fn get_cheated_tx_info_ptr(
         new_tx_info[7] = MaybeRelocatable::Int(nonce);
     }
     if let Some(resource_bounds) = resource_bounds {
-        let (resource_bounds_start_ptr, resource_bounds_end_ptr) =
-            add_vec_memory_segment(&RawFeltVec::new(resource_bounds).serialize_to_vec(), vm);
+        let (resource_bounds_start_ptr, resource_bounds_end_ptr) = add_vec_memory_segment(
+            &SerializedValue::new(resource_bounds).serialize_to_vec(),
+            vm,
+        );
         new_tx_info[8] = resource_bounds_start_ptr.into();
         new_tx_info[9] = resource_bounds_end_ptr.into();
     }

crates/cheatnet/src/runtime_extensions/forge_runtime_extension/mod.rs

@@ -35,8 +35,9 @@ use cairo_vm::vm::{
 };
 use conversions::byte_array::ByteArray;
 use conversions::felt::{ToShortString, TryInferFormat};
+use conversions::serde::SerializedValue;
 use conversions::serde::deserialize::BufferReader;
-use conversions::serde::serialize::CairoSerialize;
+use conversions::serde::serialize::{CairoSerialize, SerializeToFeltVec};
 use data_transformer::cairo_types::CairoU256;
 use rand::prelude::StdRng;
 use runtime::{
@@ -64,8 +65,6 @@ pub struct ForgeExtension<'a> {
     pub environment_variables: &'a HashMap<String, String>,
     pub contracts_data: &'a ContractsData,
     pub fuzzer_rng: Option<Arc<Mutex<StdRng>>>,
-    /// Whether `--experimental-oracles` flag has been enabled.
-    pub experimental_oracles_enabled: bool,
     pub oracle_hint_service: OracleHintService,
 }
 
@@ -86,18 +85,16 @@ impl<'a> ExtensionLogic for ForgeExtension<'a> {
             .oracle_hint_service
             .accept_cheatcode(selector.as_bytes())
         {
-            if !self.experimental_oracles_enabled {
-                return Err(anyhow!(
-                    "Oracles are an experimental feature. \
-                    To enable them, pass `--experimental-oracles` CLI flag."
-                )
-                .into());
-            }
-
             let output = self
                 .oracle_hint_service
                 .execute_cheatcode(oracle_selector, input_reader.into_remaining());
-            return Ok(CheatcodeHandlingResult::Handled(output));
+            let mut reader = BufferReader::new(&output);
+            let deserialized: Result<SerializedValue<Felt>, ByteArray> = reader.read()?;
+            let converted = deserialized
+                .map_err(|error| EnhancedHintError::OracleError { error })
+                .map(|r| r.serialize_to_vec())?;
+
+            return Ok(CheatcodeHandlingResult::Handled(converted));
         }
 
         match selector {

crates/conversions/src/serde.rs

@@ -1,2 +1,5 @@
 pub mod deserialize;
 pub mod serialize;
+pub mod serialized_value;
+
+pub use serialized_value::SerializedValue;

crates/conversions/src/serde/deserialize/deserialize_impl.rs

@@ -43,7 +43,7 @@ where
 {
     fn deserialize(reader: &mut BufferReader<'_>) -> BufferReadResult<Self> {
         let variant: Felt = reader.read()?;
-        let variant: usize = variant.to_usize().ok_or(BufferReadError::ParseFailed)?;
+        let variant = variant.to_usize().ok_or(BufferReadError::ParseFailed)?;
 
         match variant {
             0 => Ok(Some(reader.read()?)),
@@ -53,6 +53,19 @@ where
     }
 }
 
+impl<T: CairoDeserialize, E: CairoDeserialize> CairoDeserialize for Result<T, E> {
+    fn deserialize(reader: &mut BufferReader<'_>) -> BufferReadResult<Self> {
+        let variant: Felt = reader.read()?;
+        let variant = variant.to_usize().ok_or(BufferReadError::ParseFailed)?;
+
+        match variant {
+            0 => Ok(Ok(reader.read()?)),
+            1 => Ok(Err(reader.read()?)),
+            _ => Err(BufferReadError::ParseFailed),
+        }
+    }
+}
+
 impl CairoDeserialize for bool {
     fn deserialize(reader: &mut BufferReader<'_>) -> BufferReadResult<Self> {
         let num: usize = reader.read()?;

crates/conversions/src/serde/lib.rs

@@ -2,7 +2,6 @@ use starknet_types_core::felt::Felt;
 
 pub use cairo_serde_macros::CairoSerialize;
 
-pub mod raw;
 mod serialize_impl;
 
 pub struct BufferWriter {