Skip to content

Commit 0ffd18b

Browse files
committed
Merge branch 'master' into 2714-cairo-native
2 parents 365a752 + 5142fb8 commit 0ffd18b

File tree

36 files changed

+709
-273
lines changed

36 files changed

+709
-273
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
toolchain: stable
3838
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
3939
- uses: actions/checkout@v5
40-
- uses: actions/setup-node@v4
40+
- uses: actions/setup-node@v5
4141
- name: Install sitemap CLI
4242
run: |
4343
npm i -g static-sitemap-cli

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v5
2222

23-
- uses: actions/setup-node@v4
23+
- uses: actions/setup-node@v5
2424
with:
2525
cache: 'npm'
2626
cache-dependency-path: scripts/package-lock.json

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
#### Changed
1313

1414
- Updated the error message returned when calling a nonexistent method on a contract to better align with the format used by the network
15+
- Oracle support in `snforge` is now stable and no longer requires the `--experimental-oracles` CLI flag
1516

1617
### Cast
1718

@@ -20,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2021
- Debug logging for `sncast` commands that can be enabled by setting `CAST_LOG` env variable.
2122
- `sncast declare` command now outputs a ready-to-use deployment command after successful declaration.
2223
- Possibility to use [`starknet-devnet`](https://github.com/0xSpaceShard/starknet-devnet) predeployed accounts directly in `sncast` without needing to import them. They are available under specific names - `devnet-1`, `devnet-2`, ..., `devnet-<N>`. Read more [here](https://foundry-rs.github.io/starknet-foundry/starknet/integration_with_devnet.html#predeployed-accounts)
24+
- Support for automatically declaring the contract when running `sncast deploy`, by providing `--contract-name` flag instead of `--class-hash`.
2325

2426
## [0.50.0] - 2025-09-29
2527

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ pub struct ForgeExtension<'a> {
6060
pub environment_variables: &'a HashMap<String, String>,
6161
pub contracts_data: &'a ContractsData,
6262
pub fuzzer_rng: Option<Arc<Mutex<StdRng>>>,
63-
/// Whether `--experimental-oracles` flag has been enabled.
64-
pub experimental_oracles_enabled: bool,
6563
pub oracle_hint_service: OracleHintService,
6664
}
6765

@@ -80,14 +78,6 @@ impl<'a> ExtensionLogic for ForgeExtension<'a> {
8078
.oracle_hint_service
8179
.accept_cheatcode(selector.as_bytes())
8280
{
83-
if !self.experimental_oracles_enabled {
84-
return Err(anyhow!(
85-
"Oracles are an experimental feature. \
86-
To enable them, pass `--experimental-oracles` CLI flag."
87-
)
88-
.into());
89-
}
90-
9181
let output = self
9282
.oracle_hint_service
9383
.execute_cheatcode(oracle_selector, input_reader.into_remaining());

crates/forge-runner/src/forge_config.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ pub struct TestRunnerConfig {
2626
pub contracts_data: ContractsData,
2727
pub environment_variables: HashMap<String, String>,
2828
pub tracked_resource: ForgeTrackedResource,
29-
pub experimental_oracles: bool,
3029
}
3130

3231
#[derive(Debug, PartialEq)]
@@ -90,7 +89,6 @@ pub struct RuntimeConfig<'a> {
9089
pub contracts_data: &'a ContractsData,
9190
pub environment_variables: &'a HashMap<String, String>,
9291
pub tracked_resource: &'a ForgeTrackedResource,
93-
pub experimental_oracles: bool,
9492
}
9593

9694
impl<'a> RuntimeConfig<'a> {
@@ -103,7 +101,6 @@ impl<'a> RuntimeConfig<'a> {
103101
contracts_data: &value.contracts_data,
104102
environment_variables: &value.environment_variables,
105103
tracked_resource: &value.tracked_resource,
106-
experimental_oracles: value.experimental_oracles,
107104
}
108105
}
109106
}

crates/forge-runner/src/running.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ use tokio::task::JoinHandle;
4646
use universal_sierra_compiler_api::AssembledProgramWithDebugInfo;
4747

4848
pub mod config_run;
49-
mod copied_code;
5049
mod execution;
5150
mod hints;
5251
mod setup;
@@ -231,7 +230,6 @@ pub fn run_test_case(
231230
environment_variables: runtime_config.environment_variables,
232231
contracts_data: runtime_config.contracts_data,
233232
fuzzer_rng,
234-
experimental_oracles_enabled: runtime_config.experimental_oracles,
235233
oracle_hint_service: OracleHintService::new(Some(versioned_program_path.as_std_path())),
236234
};
237235

crates/forge-runner/src/running/copied_code.rs

Lines changed: 0 additions & 69 deletions
This file was deleted.

crates/forge-runner/src/running/execution.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
use crate::running::copied_code::get_call_result;
21
use blockifier::execution::call_info::{CallExecution, CallInfo};
32
use blockifier::execution::contract_class::TrackedResource;
43
use blockifier::execution::entry_point_execution::{
5-
extract_vm_resources, finalize_runner, total_vm_resources,
4+
extract_vm_resources, finalize_runner, get_call_result, total_vm_resources,
65
};
76
use blockifier::execution::errors::PostExecutionError;
87
use blockifier::execution::syscalls::hint_processor::SyscallHintProcessor;

crates/forge/src/combine_configs.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ pub fn combine_configs(
2828
forge_config_from_scarb: &ForgeConfigFromScarb,
2929
additional_args: &[OsString],
3030
trace_args: TraceArgs,
31-
experimental_oracles: bool,
3231
) -> ForgeConfig {
3332
let execution_data_to_save = ExecutionDataToSave::from_flags(
3433
save_trace_data || forge_config_from_scarb.save_trace_data,
@@ -52,7 +51,6 @@ pub fn combine_configs(
5251
contracts_data,
5352
tracked_resource,
5453
environment_variables: env::vars().collect(),
55-
experimental_oracles,
5654
}),
5755
output_config: Arc::new(OutputConfig {
5856
trace_args,
@@ -83,7 +81,6 @@ mod tests {
8381
&ForgeConfigFromScarb::default(),
8482
&[],
8583
TraceArgs::default(),
86-
false,
8784
);
8885
let config2 = combine_configs(
8986
false,
@@ -100,7 +97,6 @@ mod tests {
10097
&ForgeConfigFromScarb::default(),
10198
&[],
10299
TraceArgs::default(),
103-
false,
104100
);
105101

106102
assert_ne!(config.test_runner_config.fuzzer_seed, 0);
@@ -128,7 +124,6 @@ mod tests {
128124
&ForgeConfigFromScarb::default(),
129125
&[],
130126
TraceArgs::default(),
131-
false,
132127
);
133128
assert_eq!(
134129
config,
@@ -143,7 +138,6 @@ mod tests {
143138
cache_dir: Utf8PathBuf::default(),
144139
contracts_data: ContractsData::default(),
145140
environment_variables: config.test_runner_config.environment_variables.clone(),
146-
experimental_oracles: false,
147141
}),
148142
output_config: Arc::new(OutputConfig {
149143
detailed_resources: false,
@@ -184,7 +178,6 @@ mod tests {
184178
&config_from_scarb,
185179
&[],
186180
TraceArgs::default(),
187-
false,
188181
);
189182
assert_eq!(
190183
config,
@@ -199,7 +192,6 @@ mod tests {
199192
cache_dir: Utf8PathBuf::default(),
200193
contracts_data: ContractsData::default(),
201194
environment_variables: config.test_runner_config.environment_variables.clone(),
202-
experimental_oracles: false,
203195
}),
204196
output_config: Arc::new(OutputConfig {
205197
detailed_resources: true,
@@ -244,7 +236,6 @@ mod tests {
244236
&config_from_scarb,
245237
&[],
246238
TraceArgs::default(),
247-
false,
248239
);
249240

250241
assert_eq!(
@@ -260,7 +251,6 @@ mod tests {
260251
cache_dir: Utf8PathBuf::default(),
261252
contracts_data: ContractsData::default(),
262253
environment_variables: config.test_runner_config.environment_variables.clone(),
263-
experimental_oracles: false,
264254
}),
265255
output_config: Arc::new(OutputConfig {
266256
detailed_resources: true,

crates/forge/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,6 @@ pub struct TestArgs {
217217
#[arg(last = true)]
218218
additional_args: Vec<OsString>,
219219

220-
/// Enable experimental oracles support.
221-
#[arg(long, default_value_t = false, env = "SNFORGE_EXPERIMENTAL_ORACLES")]
222-
experimental_oracles: bool,
223-
224220
#[command(flatten)]
225221
scarb_args: ScarbArgs,
226222
}

0 commit comments

Comments
 (0)