Make oracles support not experimental

cptartur · cptartur · commit e1bc3379d8d0 · 2025-11-07T12:23:36.000+01:00
Closes #3732 commit-id:cf38af52
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Forge
+
+#### Fixed
+
+- Oracles are fully supported for Scarb versions >= 2.13.1. Bugs related to oracles output handling have been fixed.
+
 ## [0.52.0] - 2025-11-05
 
 ### Forge
diff --git a/crates/cheatnet/src/runtime_extensions/forge_runtime_extension/mod.rs b/crates/cheatnet/src/runtime_extensions/forge_runtime_extension/mod.rs
@@ -65,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,
 }
 
@@ -87,14 +85,6 @@ 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());
diff --git a/crates/forge-runner/src/forge_config.rs b/crates/forge-runner/src/forge_config.rs
@@ -26,7 +26,6 @@ pub struct TestRunnerConfig {
     pub contracts_data: ContractsData,
     pub environment_variables: HashMap<String, String>,
     pub tracked_resource: ForgeTrackedResource,
-    pub experimental_oracles: bool,
 }
 
 #[derive(Debug, PartialEq)]
@@ -91,7 +90,6 @@ pub struct RuntimeConfig<'a> {
     pub contracts_data: &'a ContractsData,
     pub environment_variables: &'a HashMap<String, String>,
     pub tracked_resource: &'a ForgeTrackedResource,
-    pub experimental_oracles: bool,
 }
 
 impl<'a> RuntimeConfig<'a> {
@@ -104,7 +102,6 @@ impl<'a> RuntimeConfig<'a> {
             contracts_data: &value.contracts_data,
             environment_variables: &value.environment_variables,
             tracked_resource: &value.tracked_resource,
-            experimental_oracles: value.experimental_oracles,
         }
     }
 }
diff --git a/crates/forge-runner/src/running.rs b/crates/forge-runner/src/running.rs
@@ -238,7 +238,6 @@ pub fn run_test_case(
         environment_variables: runtime_config.environment_variables,
         contracts_data: runtime_config.contracts_data,
         fuzzer_rng,
-        experimental_oracles_enabled: runtime_config.experimental_oracles,
         oracle_hint_service: OracleHintService::new(Some(versioned_program_path.as_std_path())),
     };
 
diff --git a/crates/forge/src/combine_configs.rs b/crates/forge/src/combine_configs.rs
@@ -29,7 +29,6 @@ pub fn combine_configs(
     forge_config_from_scarb: &ForgeConfigFromScarb,
     additional_args: &[OsString],
     trace_args: TraceArgs,
-    experimental_oracles: bool,
 ) -> ForgeConfig {
     let execution_data_to_save = ExecutionDataToSave::from_flags(
         save_trace_data || forge_config_from_scarb.save_trace_data,
@@ -53,7 +52,6 @@ pub fn combine_configs(
             contracts_data,
             tracked_resource,
             environment_variables: env::vars().collect(),
-            experimental_oracles,
         }),
         output_config: Arc::new(OutputConfig {
             trace_args,
@@ -86,7 +84,6 @@ mod tests {
             &ForgeConfigFromScarb::default(),
             &[],
             TraceArgs::default(),
-            false,
         );
         let config2 = combine_configs(
             false,
@@ -104,7 +101,6 @@ mod tests {
             &ForgeConfigFromScarb::default(),
             &[],
             TraceArgs::default(),
-            false,
         );
 
         assert_ne!(config.test_runner_config.fuzzer_seed, 0);
@@ -133,7 +129,6 @@ mod tests {
             &ForgeConfigFromScarb::default(),
             &[],
             TraceArgs::default(),
-            false,
         );
         assert_eq!(
             config,
@@ -148,7 +143,6 @@ mod tests {
                     cache_dir: Utf8PathBuf::default(),
                     contracts_data: ContractsData::default(),
                     environment_variables: config.test_runner_config.environment_variables.clone(),
-                    experimental_oracles: false,
                 }),
                 output_config: Arc::new(OutputConfig {
                     detailed_resources: false,
@@ -192,7 +186,6 @@ mod tests {
             &config_from_scarb,
             &[],
             TraceArgs::default(),
-            false,
         );
         assert_eq!(
             config,
@@ -207,7 +200,6 @@ mod tests {
                     cache_dir: Utf8PathBuf::default(),
                     contracts_data: ContractsData::default(),
                     environment_variables: config.test_runner_config.environment_variables.clone(),
-                    experimental_oracles: false,
                 }),
                 output_config: Arc::new(OutputConfig {
                     detailed_resources: true,
@@ -255,7 +247,6 @@ mod tests {
             &config_from_scarb,
             &[],
             TraceArgs::default(),
-            false,
         );
 
         assert_eq!(
@@ -271,7 +262,6 @@ mod tests {
                     cache_dir: Utf8PathBuf::default(),
                     contracts_data: ContractsData::default(),
                     environment_variables: config.test_runner_config.environment_variables.clone(),
-                    experimental_oracles: false,
                 }),
                 output_config: Arc::new(OutputConfig {
                     detailed_resources: true,
diff --git a/crates/forge/src/lib.rs b/crates/forge/src/lib.rs
@@ -221,10 +221,6 @@ pub struct TestArgs {
     #[arg(last = true)]
     additional_args: Vec<OsString>,
 
-    /// Enable experimental oracles support.
-    #[arg(long, default_value_t = false, env = "SNFORGE_EXPERIMENTAL_ORACLES")]
-    experimental_oracles: bool,
-
     #[command(flatten)]
     scarb_args: ScarbArgs,
 }
diff --git a/crates/forge/src/run_tests/package.rs b/crates/forge/src/run_tests/package.rs
@@ -110,7 +110,6 @@ impl RunForPackageArgs {
             &forge_config_from_scarb,
             &args.additional_args,
             args.trace_args.clone(),
-            args.experimental_oracles,
         ));
 
         let test_filter = TestsFilter::from_flags(
diff --git a/crates/forge/tests/e2e/oracles.rs b/crates/forge/tests/e2e/oracles.rs
@@ -18,7 +18,6 @@ fn wasm() {
     let output = test_runner(&temp)
         // Output of oracle is different depending on the env, and Intellij sets it automatically
         .env_remove("RUST_BACKTRACE")
-        .arg("--experimental-oracles")
         .assert()
         .code(1);
 
diff --git a/crates/forge/tests/integration/setup_fork.rs b/crates/forge/tests/integration/setup_fork.rs
@@ -157,7 +157,6 @@ fn fork_aliased_decorator() {
                             .unwrap(),
                         tracked_resource: ForgeTrackedResource::CairoSteps,
                         environment_variables: test.env().clone(),
-                        experimental_oracles: false,
                     }),
                     output_config: Arc::new(OutputConfig {
                         detailed_resources: false,
@@ -248,7 +247,6 @@ fn fork_aliased_decorator_overrding() {
                             .unwrap(),
                         tracked_resource: ForgeTrackedResource::CairoSteps,
                         environment_variables: test.env().clone(),
-                        experimental_oracles: false,
                     }),
                     output_config: Arc::new(OutputConfig {
                         detailed_resources: false,
diff --git a/crates/forge/tests/utils/running_tests.rs b/crates/forge/tests/utils/running_tests.rs
@@ -73,7 +73,6 @@ pub fn run_test_case(
                     contracts_data: ContractsData::try_from(test.contracts(&ui).unwrap()).unwrap(),
                     tracked_resource,
                     environment_variables: test.env().clone(),
-                    experimental_oracles: false,
                 }),
                 output_config: Arc::new(OutputConfig {
                     detailed_resources: false,
diff --git a/docs/src/appendix/snforge/test.md b/docs/src/appendix/snforge/test.md
@@ -139,10 +139,6 @@ Use Scarb release profile.
 ## `--dev`
 Use Scarb dev profile.
 
-## `--experimental-oracles`
-
-Enable experimental [oracles](../../snforge-advanced-features/oracles.md) support.
-
 ## `-h`, `--help`
 
 Print help.
diff --git a/docs/src/snforge-advanced-features/oracles.md b/docs/src/snforge-advanced-features/oracles.md
@@ -2,8 +2,9 @@
 
 > ⚠️ **Warning**
 >
-> Oracles are an experimental feature.
-> To enable them, you must pass the `--experimental-oracles` flag to `snforge`.
+> Oracles are fully supported starting from Scarb 2.13.1.
+> Using oracles in Starknet Foundry with older versions of Scarb is not supported and may result in unexpected behaviour
+> and test failures.
 
 An [oracle][oracle docs] is an external process (like a script, binary, or web service)
 that exposes custom logic or data to a Cairo program at runtime. You use it to perform tasks the Cairo VM can't, such as

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ pub struct TestRunnerConfig {`
`26`	`26`	`pub contracts_data: ContractsData,`
`27`	`27`	`pub environment_variables: HashMap<String, String>,`
`28`	`28`	`pub tracked_resource: ForgeTrackedResource,`
`29`		`- pub experimental_oracles: bool,`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`#[derive(Debug, PartialEq)]`
`@@ -91,7 +90,6 @@ pub struct RuntimeConfig<'a> {`
`91`	`90`	`pub contracts_data: &'a ContractsData,`
`92`	`91`	`pub environment_variables: &'a HashMap<String, String>,`
`93`	`92`	`pub tracked_resource: &'a ForgeTrackedResource,`
`94`		`- pub experimental_oracles: bool,`
`95`	`93`	`}`
`96`	`94`
`97`	`95`	`impl<'a> RuntimeConfig<'a> {`
`@@ -104,7 +102,6 @@ impl<'a> RuntimeConfig<'a> {`
`104`	`102`	`contracts_data: &value.contracts_data,`
`105`	`103`	`environment_variables: &value.environment_variables,`
`106`	`104`	`tracked_resource: &value.tracked_resource,`
`107`		`- experimental_oracles: value.experimental_oracles,`
`108`	`105`	`}`
`109`	`106`	`}`
`110`	`107`	`}`