Remove blockifier testing feature; use VersionedConstants 0.13.2 (#690)

* Improve scripts/install_foundry.sh

Author: FabijanC

Cargo.lock

@@ -12,7 +12,7 @@ description = "Starknet core logic for devnet"
 workspace = true
 
 [dependencies]
-blockifier = { workspace = true, features = ["testing"] }
+blockifier = { workspace = true }
 cairo-lang-starknet-classes = { workspace = true }
 clap = { workspace = true }
 ethers = { workspace = true }

crates/starknet-devnet-core/Cargo.toml

@@ -268,18 +268,20 @@ impl StarknetTransaction {
 
 #[cfg(test)]
 mod tests {
+    use blockifier::state::cached_state::CachedState;
     use blockifier::transaction::objects::TransactionExecutionInfo;
     use starknet_rs_core::types::{TransactionExecutionStatus, TransactionFinalityStatus};
     use starknet_types::rpc::transactions::{TransactionTrace, TransactionWithHash};
 
     use super::{StarknetTransaction, StarknetTransactions};
     use crate::starknet::transaction_trace::create_trace;
+    use crate::state::state_readers::DictState;
     use crate::traits::HashIdentifiedMut;
     use crate::utils::test_utils::dummy_declare_transaction_v1;
 
     fn dummy_trace(tx: &TransactionWithHash) -> TransactionTrace {
         create_trace(
-            &mut Default::default(),
+            &mut CachedState::<DictState>::new(Default::default()),
             tx.get_type(),
             &Default::default(),
             Default::default(),

crates/starknet-devnet-core/src/transactions.rs

@@ -1,5 +1,5 @@
 use blockifier::bouncer::{BouncerConfig, BouncerWeights, BuiltinCount};
-use blockifier::versioned_constants::VersionedConstants;
+use blockifier::versioned_constants::{StarknetVersion, VersionedConstants};
 use serde_json::Value;
 use starknet_rs_core::types::contract::CompiledClass;
 use starknet_rs_core::types::Felt;
@@ -40,7 +40,7 @@ pub(crate) fn get_storage_var_address(
 }
 
 pub(crate) fn get_versioned_constants() -> VersionedConstants {
-    VersionedConstants::create_for_testing()
+    VersionedConstants::get(StarknetVersion::V0_13_2).clone()
 }
 
 /// Values not present here: https://docs.starknet.io/tools/limits-and-triggers/

crates/starknet-devnet-core/src/utils.rs

@@ -1,7 +1,18 @@
 #!/bin/bash
 
+# If foundryup becomes buggy, consider switching to directly downloading binary from GitHub tag:
+# git_asset="https://github.com/foundry-rs/foundry/releases/download/$foundry_version/foundry_nightly_linux_amd64.tar.gz"
+# foundry_bin="$HOME/.foundry/bin"
+# mkdir -p "$foundry_bin"
+# curl -L "$git_asset" | tar -xvz -C "$foundry_bin"
+# export PATH="$PATH:$HOME/$foundry_bin"
+
 set -eu
 
+foundry_version="nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a"
+
+echo "Installing foundry $foundry_version"
+
 echo "Installing foundryup"
 curl -L https://foundry.paradigm.xyz | bash || echo "As expected, received a non-zero exit code"
 
@@ -13,7 +24,7 @@ if [ -n "$CIRCLE_BRANCH" ]; then
 fi
 
 echo "Installing foundry"
-foundryup --install nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a
+foundryup --install "$foundry_version"
 
 # assert it works
 anvil --version

scripts/install_foundry.sh

@@ -5,7 +5,8 @@ use starknet_core::constants::DEVNET_DEFAULT_GAS_PRICE;
 use starknet_rs_accounts::{Account, AccountError, ExecutionEncoding, SingleOwnerAccount};
 use starknet_rs_core::chain_id::SEPOLIA;
 use starknet_rs_core::types::{Felt, ResourcePrice, StarknetError};
-use starknet_rs_providers::ProviderError;
+use starknet_rs_core::utils::cairo_short_string_to_felt;
+use starknet_rs_providers::{Provider, ProviderError};
 use starknet_rs_signers::Signer;
 
 use crate::common::background_devnet::BackgroundDevnet;
@@ -47,14 +48,15 @@ impl SetGasPrice for BackgroundDevnet {
 /// 1. Execute simulateTransactions with a declare transaction and check gas fees.
 /// 2. Set the gas values.
 /// 3. Execute simulateTransactions again and check gas fees.
-async fn set_gas_scenario(devnet: BackgroundDevnet, expected_chain_id: &str) {
+/// Chain ID assertion justified in: https://github.com/0xSpaceShard/starknet-devnet-rs/pull/551#discussion_r1682755696
+async fn set_gas_scenario(devnet: BackgroundDevnet, expected_chain_id: Felt) {
     // get account
     let (signer, account_address) = devnet.get_first_predeployed_account().await;
     let account = SingleOwnerAccount::new(
         devnet.clone_provider(),
         signer.clone(),
         account_address,
-        Felt::from_hex_unchecked(expected_chain_id),
+        expected_chain_id,
         ExecutionEncoding::New,
     );
 
@@ -93,7 +95,7 @@ async fn set_gas_scenario(devnet: BackgroundDevnet, expected_chain_id: &str) {
         })
     };
 
-    let chain_id = &devnet.send_custom_rpc("starknet_chainId", json!({})).await.unwrap();
+    let chain_id = devnet.json_rpc_client.chain_id().await.unwrap();
     assert_eq!(chain_id, expected_chain_id);
 
     let params_skip_fee_charge = get_params(&["SKIP_FEE_CHARGE"]);
@@ -109,7 +111,7 @@ async fn set_gas_scenario(devnet: BackgroundDevnet, expected_chain_id: &str) {
         resp_no_flags["fee_estimation"]["data_gas_price"],
         to_hex_felt(&DEVNET_DEFAULT_GAS_PRICE)
     );
-    assert_eq!(resp_no_flags["fee_estimation"]["overall_fee"], "0x7398c659d800");
+    assert_eq!(resp_no_flags["fee_estimation"]["overall_fee"], "0xa7275ca6d3000");
 
     let params_skip_validation_and_fee_charge = get_params(&["SKIP_VALIDATE", "SKIP_FEE_CHARGE"]);
     let resp_skip_validation = &devnet
@@ -127,7 +129,7 @@ async fn set_gas_scenario(devnet: BackgroundDevnet, expected_chain_id: &str) {
         resp_skip_validation["fee_estimation"]["data_gas_price"],
         to_hex_felt(&DEVNET_DEFAULT_GAS_PRICE)
     );
-    assert_eq!(resp_skip_validation["fee_estimation"]["overall_fee"], "0x736a356c0800");
+    assert_eq!(resp_skip_validation["fee_estimation"]["overall_fee"], "0xa7247397f6000");
 
     assert_difference_if_validation(
         resp_no_flags,
@@ -148,7 +150,7 @@ async fn set_gas_scenario(devnet: BackgroundDevnet, expected_chain_id: &str) {
 
     assert_eq!(gas_response, &gas_request);
 
-    let chain_id = &devnet.send_custom_rpc("starknet_chainId", json!({})).await.unwrap();
+    let chain_id = devnet.json_rpc_client.chain_id().await.unwrap();
     assert_eq!(chain_id, expected_chain_id);
 
     let resp_no_flags = &devnet
@@ -158,7 +160,7 @@ async fn set_gas_scenario(devnet: BackgroundDevnet, expected_chain_id: &str) {
 
     assert_eq!(resp_no_flags["fee_estimation"]["gas_price"], to_hex_felt(&wei_price));
     assert_eq!(resp_no_flags["fee_estimation"]["data_gas_price"], to_hex_felt(&wei_price_data));
-    assert_eq!(resp_no_flags["fee_estimation"]["overall_fee"], "0x261b37abed7125c0000");
+    assert_eq!(resp_no_flags["fee_estimation"]["overall_fee"], "0x38008384ec45ab780000");
 
     let resp_skip_validation = &devnet
         .send_custom_rpc("starknet_simulateTransactions", params_skip_validation_and_fee_charge)
@@ -169,7 +171,7 @@ async fn set_gas_scenario(devnet: BackgroundDevnet, expected_chain_id: &str) {
         resp_skip_validation["fee_estimation"]["data_gas_price"],
         to_hex_felt(&wei_price_data)
     );
-    assert_eq!(resp_skip_validation["fee_estimation"]["overall_fee"], "0x260b9ade6354d540000");
+    assert_eq!(resp_skip_validation["fee_estimation"]["overall_fee"], "0x37ff89b813a3e6700000");
 
     assert_difference_if_validation(
         resp_no_flags,
@@ -184,7 +186,7 @@ async fn set_gas() {
     let devnet = BackgroundDevnet::spawn().await.expect("Could not start Devnet");
 
     // Testnet gas modification test scenario
-    set_gas_scenario(devnet, &SEPOLIA.to_hex_string()).await;
+    set_gas_scenario(devnet, SEPOLIA).await;
 }
 
 #[tokio::test]
@@ -194,7 +196,8 @@ async fn set_gas_fork() {
     let fork_devnet = BackgroundDevnet::spawn_with_additional_args(&cli_args).await.unwrap();
 
     // Sepolia fork gas modification test scenario
-    set_gas_scenario(fork_devnet, "0x534e5f494e544547524154494f4e5f5345504f4c4941").await;
+    set_gas_scenario(fork_devnet, cairo_short_string_to_felt("SN_INTEGRATION_SEPOLIA").unwrap())
+        .await;
 }
 
 #[tokio::test]