refactor(blockifier): remove WORD_WIDTH from blockifier, use starkn e…

…t_api instead
starkware-libs · Nov 12, 2024 · 4632773 · 4632773
1 parent 4276a78
commit 4632773
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/crates/blockifier/src/execution/contract_class.rs b/crates/blockifier/src/execution/contract_class.rs
@@ -38,7 +38,6 @@ use crate::execution::errors::{ContractClassError, PreExecutionError};
 use crate::execution::execution_utils::{poseidon_hash_many_cost, sn_api_to_cairo_vm_program};
 #[cfg(feature = "cairo_native")]
 use crate::execution::native::contract_class::NativeContractClassV1;
-use crate::fee::eth_gas_constants;
 use crate::transaction::errors::TransactionExecutionError;
 use crate::versioned_constants::CompilerVersion;
 
@@ -562,7 +561,7 @@ impl ClassInfo {
     pub fn code_size(&self) -> usize {
         (self.bytecode_length() + self.sierra_program_length())
             // We assume each felt is a word.
-            * eth_gas_constants::WORD_WIDTH
+            * starknet_api::core::WORD_WIDTH
             + self.abi_length()
     }
 

diff --git a/crates/blockifier/src/fee/eth_gas_constants.rs b/crates/blockifier/src/fee/eth_gas_constants.rs
@@ -1,9 +1,7 @@
 // Calldata.
 pub const GAS_PER_MEMORY_ZERO_BYTE: usize = 4;
 pub const GAS_PER_MEMORY_BYTE: usize = 16;
-// TODO(AvivG): use starknet_api::core::WORD_WIDTH instead.
-pub const WORD_WIDTH: usize = 32;
-pub const GAS_PER_MEMORY_WORD: usize = GAS_PER_MEMORY_BYTE * WORD_WIDTH;
+pub const GAS_PER_MEMORY_WORD: usize = GAS_PER_MEMORY_BYTE * starknet_api::core::WORD_WIDTH;
 
 // Blob Data.
 pub const FIELD_ELEMENTS_PER_BLOB: usize = 1 << 12;
@@ -21,7 +19,7 @@ pub const GAS_PER_COUNTER_DECREASE: usize =
 pub const GAS_PER_LOG: usize = 375;
 pub const GAS_PER_LOG_TOPIC: usize = 375;
 pub const GAS_PER_LOG_DATA_BYTE: usize = 8;
-pub const GAS_PER_LOG_DATA_WORD: usize = GAS_PER_LOG_DATA_BYTE * WORD_WIDTH;
+pub const GAS_PER_LOG_DATA_WORD: usize = GAS_PER_LOG_DATA_BYTE * starknet_api::core::WORD_WIDTH;
 
 // SHARP empirical costs.
 pub const SHARP_ADDITIONAL_GAS_PER_MEMORY_WORD: usize = 100; // This value is not accurate.
@@ -34,5 +32,5 @@ pub const SHARP_GAS_PER_DA_WORD: usize = SHARP_GAS_PER_MEMORY_WORD - DISCOUNT_PE
 // TODO(Yoni, 1/1/2025): rename this file to `_utils`.
 pub fn get_calldata_word_cost(n_nonzero_bytes: usize) -> usize {
     n_nonzero_bytes * GAS_PER_MEMORY_BYTE
-        + (WORD_WIDTH - n_nonzero_bytes) * GAS_PER_MEMORY_ZERO_BYTE
+        + (starknet_api::core::WORD_WIDTH - n_nonzero_bytes) * GAS_PER_MEMORY_ZERO_BYTE
 }
diff --git a/crates/blockifier/src/fee/receipt_test.rs b/crates/blockifier/src/fee/receipt_test.rs
@@ -86,7 +86,7 @@ fn test_calculate_tx_gas_usage_basic<'a>(
         let code_gas_cost = (gas_per_code_byte
             * u64_from_usize(
                 (class_info.bytecode_length() + class_info.sierra_program_length())
-                    * eth_gas_constants::WORD_WIDTH
+                    * starknet_api::core::WORD_WIDTH
                     + class_info.abi_length(),
             ))
         .to_integer()