Move starknet-contract-class to SiR

Author: MegaRedHand

Cargo.lock

@@ -11,24 +11,27 @@ with_mimalloc = ["mimalloc"]
 cairo_1_tests = []
 
 [workspace]
-members = ["crates/starknet-contract-class", "cli", "fuzzer"]
+members = ["cli", "fuzzer"]
 
 [workspace.dependencies]
-cairo-vm = { version = "0.8.1", features = ["cairo-1-hints"]}
+cairo-vm = { version = "0.8.1", features = ["cairo-1-hints"] }
 starknet_api = "0.1.0"
 num-traits = "0.2.15"
 
 [dependencies]
 cairo-lang-starknet = "2.0.0"
 cairo-lang-casm = "2.0.0"
-cairo-vm = { workspace=true, features = ["cairo-1-hints"]}
+cairo-vm = { workspace = true, features = ["cairo-1-hints"] }
 getset = "0.1.2"
 lazy_static = "1.4.0"
 num-bigint = { version = "0.4", features = ["serde"] }
 num-integer = "0.1.45"
 num-traits = { workspace = true }
 serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0", features = ["arbitrary_precision", "raw_value"] }
+serde_json = { version = "1.0", features = [
+    "arbitrary_precision",
+    "raw_value",
+] }
 sha3 = "0.10.1"
 starknet_api = { workspace = true }
 starknet-crypto = "0.5.1"
@@ -38,7 +41,6 @@ mimalloc = { version = "0.1.29", default-features = false, optional = true }
 hex = "0.4.3"
 cargo-llvm-cov = "0.5.14"
 anyhow = "1.0.66"
-starknet-contract-class = { path = "./crates/starknet-contract-class", version = "0.2.0" }
 once_cell = "1.17.1"
 
 [dev-dependencies]

Cargo.toml

@@ -12,5 +12,4 @@ num-traits = { workspace = true }
 starknet_api = { workspace = true }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 tempfile = "3.2.0"
-cairo-vm = { workspace=true, features = ["cairo-1-hints"]}
-starknet-contract-class = { path = "../crates/starknet-contract-class/", version = "0.2.0" }
+cairo-vm = { workspace = true, features = ["cairo-1-hints"] }

crates/starknet-contract-class/Cargo.toml

@@ -6,7 +6,7 @@ extern crate honggfuzz;
 use cairo_vm::felt::Felt252;
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use num_traits::Zero;
-use starknet_contract_class::EntryPointType;
+use starknet_in_rust::EntryPointType;
 use starknet_in_rust::{
     definitions::{block_context::BlockContext, constants::TRANSACTION_VERSION},
     execution::{

fuzzer/Cargo.toml

@@ -1,3 +1,6 @@
+use crate::services::api::contract_classes::deprecated_parsed_contract_class::{
+    ContractEntryPoint, EntryPointType,
+};
 /// Contains functionality for computing class hashes for deprecated Declare transactions
 /// (ie, declarations that do not correspond to Cairo 1 contracts)
 /// The code used for hinted class hash computation was extracted from the Pathfinder and xJonathanLEI implementations
@@ -13,7 +16,6 @@ use cairo_vm::felt::Felt252;
 use num_traits::Zero;
 use serde::Serialize;
 use sha3::Digest;
-use starknet_contract_class::{ContractEntryPoint, EntryPointType};
 use std::{borrow::Cow, collections::BTreeMap, io};
 
 /// Instead of doing a Mask with 250 bits, we are only masking the most significant byte.
@@ -352,10 +354,10 @@ mod tests {
     use std::{fs, str::FromStr};
 
     use super::*;
+    use crate::services::api::contract_classes::deprecated_parsed_contract_class::ParsedContractClass;
     use cairo_vm::felt::{felt_str, Felt252};
     use coverage_helper::test;
     use num_traits::Num;
-    use starknet_contract_class::ParsedContractClass;
 
     #[test]
     fn test_compute_hinted_class_hash_with_abi() {

fuzzer/src/main.rs

@@ -1,9 +1,11 @@
 use crate::core::errors::contract_address_errors::ContractAddressError;
+use crate::services::api::contract_classes::deprecated_parsed_contract_class::{
+    ContractEntryPoint, EntryPointType,
+};
 use cairo_lang_starknet::{
     contract::starknet_keccak, contract_class::ContractClass as SierraContractClass,
 };
 use cairo_vm::felt::Felt252;
-use starknet_contract_class::{ContractEntryPoint, EntryPointType};
 use starknet_crypto::{poseidon_hash_many, FieldElement};
 
 const CONTRACT_CLASS_VERSION: &[u8] = b"CONTRACT_CLASS_V0.1.0";

src/core/contract_address/deprecated_contract_address.rs

@@ -1,3 +1,6 @@
+use crate::services::api::contract_classes::deprecated_parsed_contract_class::{
+    ContractEntryPoint, EntryPointType,
+};
 use crate::{
     definitions::{block_context::BlockContext, constants::DEFAULT_ENTRY_POINT_SELECTOR},
     runner::StarknetRunner,
@@ -31,7 +34,6 @@ use cairo_vm::{
         vm_core::VirtualMachine,
     },
 };
-use starknet_contract_class::{ContractEntryPoint, EntryPointType};
 
 use super::{
     CallInfo, CallResult, CallType, OrderedEvent, OrderedL2ToL1Message, TransactionExecutionContext,

src/core/contract_address/sierra_contract_address.rs

@@ -2,6 +2,7 @@ pub mod execution_entry_point;
 pub mod gas_usage;
 pub mod os_usage;
 
+use crate::services::api::contract_classes::deprecated_parsed_contract_class::EntryPointType;
 use crate::{
     definitions::{
         block_context::StarknetChainId, constants::CONSTRUCTOR_ENTRY_POINT_SELECTOR,
@@ -19,7 +20,6 @@ use cairo_vm::{
 };
 use getset::Getters;
 use num_traits::{ToPrimitive, Zero};
-use starknet_contract_class::EntryPointType;
 use std::collections::{HashMap, HashSet};
 
 #[derive(Debug, Clone, PartialEq, Eq)]

src/execution/execution_entry_point.rs

@@ -25,11 +25,13 @@ use utils::Address;
 extern crate assert_matches;
 
 // Re-exports
+pub use crate::services::api::contract_classes::deprecated_parsed_contract_class::{
+    ContractEntryPoint, EntryPointType,
+};
 pub use cairo_lang_starknet::casm_contract_class::CasmContractClass;
 pub use cairo_lang_starknet::contract_class::ContractClass;
 pub use cairo_lang_starknet::contract_class::ContractClass as SierraContractClass;
 pub use cairo_vm::felt::Felt252;
-pub use starknet_contract_class::EntryPointType;
 
 pub mod core;
 pub mod definitions;
@@ -205,6 +207,7 @@ mod test {
     use crate::estimate_message_fee;
     use crate::hash_utils::calculate_contract_address;
     use crate::services::api::contract_classes::deprecated_contract_class::ContractClass;
+    use crate::services::api::contract_classes::deprecated_parsed_contract_class::EntryPointType;
     use crate::state::state_api::State;
     use crate::testing::{
         create_account_tx_test_state, TEST_ACCOUNT_CONTRACT_ADDRESS, TEST_CONTRACT_ADDRESS,
@@ -218,7 +221,6 @@ mod test {
     use cairo_lang_starknet::contract_class::ContractClass as SierraContractClass;
     use cairo_vm::felt::{felt_str, Felt252};
     use num_traits::{Num, One, Zero};
-    use starknet_contract_class::EntryPointType;
 
     use crate::{
         call_contract,
@@ -258,7 +260,7 @@ mod test {
             ContractClass::try_from(PathBuf::from(TEST_CONTRACT_PATH)).unwrap();
 
         let entrypoints = contract_class.entry_points_by_type;
-        let entrypoint_selector = &entrypoints.get(&EntryPointType::External).unwrap()[0].selector;
+        let entrypoint_selector = entrypoints.get(&EntryPointType::External).unwrap()[0].selector();
 
         let (block_context, state) = create_account_tx_test_state().unwrap();