wip

Author: RoeeGross

workspace/apps/perpetuals/contracts/src/core/components/assets/assets.cairo

@@ -1,7 +1,6 @@
 #[starknet::component]
 pub mod AssetsComponent {
-    use starknet::SyscallResultTrait;
-use RolesComponent::InternalTrait as RolesInternalTrait;
+    use RolesComponent::InternalTrait as RolesInternalTrait;
     use core::cmp::min;
     use core::hash::Hash;
     use core::iter::{IntoIterator, Iterator};
@@ -25,11 +24,6 @@ use RolesComponent::InternalTrait as RolesInternalTrait;
         UNSORTED_RISK_FACTOR_TIERS, ZERO_MAX_FUNDING_INTERVAL, ZERO_MAX_FUNDING_RATE,
         ZERO_MAX_ORACLE_PRICE, ZERO_MAX_PRICE_INTERVAL,
     };
-    use starknet::storage_access::{
-        StorageBaseAddress, Store, storage_address_from_base, storage_address_from_base_and_offset,
-    };
-    use starknet::syscalls::{storage_read_syscall, storage_write_syscall};
-    use starknet::{ContractAddress, SyscallResult};
     use perpetuals::core::components::assets::events;
     use perpetuals::core::components::assets::interface::IAssets;
     use perpetuals::core::components::operator_nonce::OperatorNonceComponent;
@@ -45,22 +39,25 @@ use RolesComponent::InternalTrait as RolesInternalTrait;
     };
     use perpetuals::core::types::risk_factor::{RiskFactor, RiskFactorTrait};
     use starknet::storage::{
-        Map, Mutable, MutableVecTrait, StorageAsPath, StorageAsPointer, StorageMapReadAccess,
-        StorageMapWriteAccess, StoragePath, StoragePathEntry, StoragePointer0Offset,
-        StoragePointerReadAccess, StoragePointerWriteAccess, Vec, VecTrait, StorableStoragePointerReadAccess, StoragePathUpdateTrait
+        IntoIterRange, Map, Mutable, MutableVecTrait, StorableStoragePointerReadAccess,
+        StorageAsPath, StorageAsPointer, StorageMapReadAccess, StorageMapWriteAccess, StoragePath,
+        StoragePathEntry, StoragePathMutableConversion, StoragePathUpdateTrait,
+        StoragePointer0Offset, StoragePointerReadAccess, StoragePointerWriteAccess, Vec, VecTrait,
     };
-    use starknet::storage::{
-        IntoIterRange,
-        StoragePathMutableConversion
+    use starknet::storage_access::{
+        StorageBaseAddress, Store, storage_address_from_base, storage_address_from_base_and_offset,
     };
+    use starknet::syscalls::{storage_read_syscall, storage_write_syscall};
+    use starknet::{ContractAddress, SyscallResult, SyscallResultTrait};
     use starkware_utils::components::pausable::PausableComponent;
     use starkware_utils::components::pausable::PausableComponent::InternalTrait as PausableInternal;
     use starkware_utils::components::roles::RolesComponent;
     use starkware_utils::constants::{MINUTE, TWO_POW_128, TWO_POW_32, TWO_POW_40};
     use starkware_utils::math::abs::Abs;
     use starkware_utils::signature::stark::{PublicKey, validate_stark_signature};
     use starkware_utils::storage::iterable_map::{
-        IterableMap, IterableMapIntoIterImpl, IterableMapReadAccessImpl, IterableMapWriteAccessImpl, IterableMapTrait,
+        IterableMap, IterableMapIntoIterImpl, IterableMapReadAccessImpl, IterableMapTrait,
+        IterableMapWriteAccessImpl,
     };
     use starkware_utils::storage::utils::{AddToStorage, SubFromStorage};
     use starkware_utils::time::time::{Time, TimeDelta, Timestamp};
@@ -525,9 +522,12 @@ use RolesComponent::InternalTrait as RolesInternalTrait;
             self: @ComponentState<TContractState>, synthetic_id: AssetId,
         ) -> Price {
             let entry = self.synthetic_timely_data.pointer(key: synthetic_id);
-            let price = storage_read_syscall(0, storage_address_from_base_and_offset(entry.__storage_pointer_address__ , 2)).unwrap_syscall();
-            let x: u64 = price.try_into().unwrap();
-            x.into()
+            let price = storage_read_syscall(
+                0, storage_address_from_base_and_offset(entry.__storage_pointer_address__, 2),
+            )
+                .unwrap_syscall();
+            let price: u64 = price.try_into().unwrap();
+            price.into()
         }
 
         /// Get the risk factor of a synthetic asset.
@@ -545,7 +545,9 @@ use RolesComponent::InternalTrait as RolesInternalTrait;
             price: Price,
         ) -> RiskFactor {
             let entry = self.synthetic_config.entry(synthetic_id);
-            let risk_factor_first_tier_boundary = entry.risk_factor_first_tier_boundary.read(); // read 1
+            let risk_factor_first_tier_boundary = entry
+                .risk_factor_first_tier_boundary
+                .read(); // read 1
 
             let asset_risk_factor_tiers = self.risk_factor_tiers.entry(synthetic_id);
             let synthetic_value: u128 = price.mul(rhs: balance).abs();
@@ -560,15 +562,19 @@ use RolesComponent::InternalTrait as RolesInternalTrait;
                 )
             };
             let con_index: u64 = index.try_into().expect('INDEX_SHOULD_NEVER_OVERFLOW');
-            let risk_factor_entry: StoragePath<RiskFactor> = asset_risk_factor_tiers.update(con_index);
+            let risk_factor_entry: StoragePath<RiskFactor> = asset_risk_factor_tiers
+                .update(con_index);
             risk_factor_entry.read()
         }
 
         fn get_funding_index(
             self: @ComponentState<TContractState>, synthetic_id: AssetId,
         ) -> FundingIndex {
             let entry = self.synthetic_timely_data.pointer(key: synthetic_id);
-            let funding_index = storage_read_syscall(0, storage_address_from_base_and_offset(entry.__storage_pointer_address__ , 4)).unwrap_syscall();
+            let funding_index = storage_read_syscall(
+                0, storage_address_from_base_and_offset(entry.__storage_pointer_address__, 4),
+            )
+                .unwrap_syscall();
             let x: i64 = funding_index.try_into().unwrap();
             x.into()
         }

workspace/apps/perpetuals/contracts/src/core/types/funding.cairo

@@ -92,7 +92,7 @@ impl FundingIndexIntoImpl of Into<FundingIndex, i64> {
 
 impl i64IntoImplFundingIndex of Into<i64, FundingIndex> {
     fn into(self: i64) -> FundingIndex {
-        FundingIndex{value: self}
+        FundingIndex { value: self }
     }
 }
 

workspace/apps/perpetuals/contracts/src/core/types/price.cairo

@@ -32,7 +32,7 @@ pub struct Price {
 
 impl u64IntoImplPrice of Into<u64, Price> {
     fn into(self: u64) -> Price {
-        Price{value: self}
+        Price { value: self }
     }
 }
 

workspace/apps/perpetuals/contracts/src/tests/flow_tests/unit_flow_tests.cairo

@@ -2303,10 +2303,7 @@ use starkware_utils_testing::test_utils::cheat_caller_address_once;
 /// gas : 5940188809(L2)
 
 #[test]
-#[fork(
-    url: "https://rpc.starknet.lava.build/",
-    block_number: 1844544,
-)]
+#[fork(url: "https://rpc.starknet.lava.build/", block_number: 1844544)]
 fn test_profile() {
     let caller_address: ContractAddress =
         0x048ddc53f41523d2a6b40c3dff7f69f4bbac799cd8b2e3fc50d3de1d4119441f