Skip to content

Commit

Permalink
refactor: streamline class info object to match contract class
Browse files Browse the repository at this point in the history
  • Loading branch information
ArniStarkware committed Oct 7, 2024
1 parent 112302a commit 0c792be
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 42 deletions.
51 changes: 21 additions & 30 deletions crates/blockifier/src/execution/contract_class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -561,10 +561,9 @@ fn convert_entry_points_v1(external: &[CasmContractEntryPoint]) -> Vec<EntryPoin

#[derive(Clone, Debug)]
// TODO(Ayelet,10/02/2024): Change to bytes.
pub struct ClassInfo {
contract_class: ContractClass,
sierra_program_length: usize,
abi_length: usize,
pub enum ClassInfo {
V0 { contract_class: ContractClassV0, abi_length: usize },
V1 { contract_class: ContractClassV1, sierra_program_length: usize, abi_length: usize },
}

impl TryFrom<&starknet_api::contract_class::ClassInfo> for ClassInfo {
Expand All @@ -577,7 +576,7 @@ impl TryFrom<&starknet_api::contract_class::ClassInfo> for ClassInfo {
abi_length,
} = class_info;

Ok(Self {
Ok(Self::V1 {
contract_class: casm_contract_class.try_into()?,
sierra_program_length: *sierra_program_length,
abi_length: *abi_length,
Expand All @@ -595,7 +594,7 @@ impl TryFrom<starknet_api::contract_class::ClassInfo> for ClassInfo {
abi_length,
} = class_info;

Ok(Self {
Ok(Self::V1 {
contract_class: casm_contract_class.try_into()?,
sierra_program_length,
abi_length,
Expand All @@ -605,19 +604,31 @@ impl TryFrom<starknet_api::contract_class::ClassInfo> for ClassInfo {

impl ClassInfo {
pub fn bytecode_length(&self) -> usize {
self.contract_class.bytecode_length()
match self {
ClassInfo::V0 { contract_class, .. } => contract_class.bytecode_length(),
ClassInfo::V1 { contract_class, .. } => contract_class.bytecode_length(),
}
}

pub fn contract_class(&self) -> ContractClass {
self.contract_class.clone()
match self {
ClassInfo::V0 { contract_class, .. } => ContractClass::V0(contract_class.clone()),
ClassInfo::V1 { contract_class, .. } => ContractClass::V1(contract_class.clone()),
}
}

pub fn sierra_program_length(&self) -> usize {
self.sierra_program_length
match self {
ClassInfo::V0 { .. } => 0,
ClassInfo::V1 { sierra_program_length, .. } => *sierra_program_length,
}
}

pub fn abi_length(&self) -> usize {
self.abi_length
match self {
ClassInfo::V0 { abi_length, .. } => *abi_length,
ClassInfo::V1 { abi_length, .. } => *abi_length,
}
}

pub fn code_size(&self) -> usize {
Expand All @@ -626,24 +637,4 @@ impl ClassInfo {
* eth_gas_constants::WORD_WIDTH
+ self.abi_length()
}

pub fn new_v1(
contract_class: ContractClassV1,
sierra_program_length: usize,
abi_length: usize,
) -> Self {
Self {
contract_class: ContractClass::V1(contract_class),
sierra_program_length,
abi_length,
}
}

pub fn new_v0(contract_class: ContractClassV0, abi_length: usize) -> Self {
Self {
contract_class: ContractClass::V0(contract_class),
sierra_program_length: 0,
abi_length,
}
}
}
5 changes: 2 additions & 3 deletions crates/blockifier/src/transaction/test_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -369,10 +369,9 @@ fn create_all_resource_bounds(
pub fn calculate_class_info_for_testing(contract_class: ContractClass) -> ClassInfo {
let abi_length = 100;
match contract_class {
ContractClass::V0(contract_class) => ClassInfo::new_v0(contract_class, abi_length),
ContractClass::V0(contract_class) => ClassInfo::V0 { contract_class, abi_length },
ContractClass::V1(contract_class) => {
let sierra_program_length = 100;
ClassInfo::new_v1(contract_class, sierra_program_length, abi_length)
ClassInfo::V1 { contract_class, sierra_program_length: 100, abi_length }
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions crates/native_blockifier/src/py_transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,17 @@ impl PyClassInfo {
| starknet_api::transaction::DeclareTransaction::V1(_) => {
let contract_class =
ContractClassV0::try_from_json_string(&py_class_info.raw_contract_class)?;
ClassInfo::new_v0(contract_class, py_class_info.abi_length)
ClassInfo::V0 { contract_class, abi_length: py_class_info.abi_length }
}
starknet_api::transaction::DeclareTransaction::V2(_)
| starknet_api::transaction::DeclareTransaction::V3(_) => {
let contract_class =
ContractClassV1::try_from_json_string(&py_class_info.raw_contract_class)?;
ClassInfo::new_v1(
ClassInfo::V1 {
contract_class,
py_class_info.sierra_program_length,
py_class_info.abi_length,
)
sierra_program_length: py_class_info.sierra_program_length,
abi_length: py_class_info.abi_length,
}
}
};
Ok(class_info)
Expand Down
8 changes: 4 additions & 4 deletions crates/papyrus_execution/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ fn to_blockifier_tx(
}
},
)?;
let class_info = ClassInfo::new_v0(contract_class, abi_length);
let class_info = ClassInfo::V0 { contract_class, abi_length };
BlockifierTransaction::from_api(
Transaction::Declare(DeclareTransaction::V0(declare_tx)),
tx_hash,
Expand All @@ -763,7 +763,7 @@ fn to_blockifier_tx(
only_query,
) => {
let contract_class = deprecated_class.try_into().map_err(BlockifierError::new)?;
let class_info = ClassInfo::new_v0(contract_class, abi_length);
let class_info = ClassInfo::V0 { contract_class, abi_length };
BlockifierTransaction::from_api(
Transaction::Declare(DeclareTransaction::V1(declare_tx)),
tx_hash,
Expand All @@ -782,7 +782,7 @@ fn to_blockifier_tx(
only_query,
) => {
let contract_class = compiled_class.try_into().map_err(BlockifierError::new)?;
let class_info = ClassInfo::new_v1(contract_class, sierra_program_length, abi_length);
let class_info = ClassInfo::V1 { contract_class, sierra_program_length, abi_length };
BlockifierTransaction::from_api(
Transaction::Declare(DeclareTransaction::V2(declare_tx)),
tx_hash,
Expand All @@ -801,7 +801,7 @@ fn to_blockifier_tx(
only_query,
) => {
let contract_class = compiled_class.try_into().map_err(BlockifierError::new)?;
let class_info = ClassInfo::new_v1(contract_class, sierra_program_length, abi_length);
let class_info = ClassInfo::V1 { contract_class, sierra_program_length, abi_length };
BlockifierTransaction::from_api(
Transaction::Declare(DeclareTransaction::V3(declare_tx)),
tx_hash,
Expand Down

0 comments on commit 0c792be

Please sign in to comment.