test(multi-collateral): add transfer utils

Author: MohammadNassar1

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

@@ -196,6 +196,11 @@ pub impl FlowTestImpl of FlowTestExtendedTrait {
     ) -> RequestInfo {
         self.flow_test_base.facade.transfer_request(:sender, :recipient, :amount)
     }
+    fn transfer_spot_request(
+        ref self: FlowTestExtended, sender: User, recipient: User, asset_id: AssetId, amount: u64,
+    ) -> RequestInfo {
+        self.flow_test_base.facade.transfer_spot_request(:sender, :recipient, :asset_id, :amount)
+    }
     fn transfer(ref self: FlowTestExtended, transfer_info: RequestInfo) {
         self.flow_test_base.facade.transfer(:transfer_info)
     }

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

@@ -1141,6 +1141,18 @@ pub impl PerpsTestsFacadeImpl of PerpsTestsFacadeTrait {
 
     fn transfer_request(
         ref self: PerpsTestsFacade, sender: User, recipient: User, amount: u64,
+    ) -> RequestInfo {
+        self._transfer_request(:sender, recipient: recipient, asset_id: self.collateral_id, :amount)
+    }
+
+    fn transfer_spot_request(
+        ref self: PerpsTestsFacade, sender: User, recipient: User, asset_id: AssetId, amount: u64,
+    ) -> RequestInfo {
+        self._transfer_request(:sender, recipient: recipient, :asset_id, :amount)
+    }
+
+    fn _transfer_request(
+        ref self: PerpsTestsFacade, sender: User, recipient: User, asset_id: AssetId, amount: u64,
     ) -> RequestInfo {
         let expiration = Time::now().add(delta: Time::weeks(1));
 
@@ -1149,7 +1161,7 @@ pub impl PerpsTestsFacadeImpl of PerpsTestsFacadeTrait {
             position_id: sender.position_id,
             salt,
             expiration,
-            collateral_id: self.collateral_id,
+            collateral_id: asset_id,
             amount,
             recipient: recipient.position_id,
         };
@@ -1160,8 +1172,8 @@ pub impl PerpsTestsFacadeImpl of PerpsTestsFacadeTrait {
         sender.account.set_as_caller(self.perpetuals_contract);
         ICoreDispatcher { contract_address: self.perpetuals_contract }
             .transfer_request(
-                signature,
-                asset_id: self.collateral_id,
+                :signature,
+                asset_id: asset_id,
                 recipient: recipient.position_id,
                 position_id: sender.position_id,
                 :amount,
@@ -1175,15 +1187,15 @@ pub impl PerpsTestsFacadeImpl of PerpsTestsFacadeTrait {
             spied_event: self.get_last_event(contract_address: self.perpetuals_contract),
             position_id: sender.position_id,
             recipient: recipient.position_id,
-            collateral_id: self.collateral_id,
+            collateral_id: asset_id,
             :amount,
             :expiration,
             transfer_request_hash: request_hash,
             :salt,
         );
 
         RequestInfo {
-            asset_id: self.collateral_id,
+            asset_id,
             recipient,
             position_id: sender.position_id,
             amount,
@@ -1197,13 +1209,18 @@ pub impl PerpsTestsFacadeImpl of PerpsTestsFacadeTrait {
         let RequestInfo {
             asset_id, recipient, position_id, amount, expiration, salt, request_hash,
         } = transfer_info;
-        let dispatcher = IPositionsDispatcher { contract_address: self.perpetuals_contract };
-        let sender_balance_before = dispatcher
-            .get_position_assets(position_id: position_id)
-            .collateral_balance;
-        let recipient_balance_before = dispatcher
-            .get_position_assets(position_id: recipient.position_id)
-            .collateral_balance;
+
+        let sender_balance_before = if (asset_id == self.collateral_id) {
+            self.get_position_collateral_balance(position_id)
+        } else {
+            self.get_position_asset_balance(position_id, asset_id)
+        };
+
+        let recipient_balance_before = if (asset_id == self.collateral_id) {
+            self.get_position_collateral_balance(recipient.position_id)
+        } else {
+            self.get_position_asset_balance(recipient.position_id, asset_id)
+        };
 
         let operator_nonce = self.get_nonce();
         self.operator.set_as_caller(self.perpetuals_contract);
@@ -1223,16 +1240,32 @@ pub impl PerpsTestsFacadeImpl of PerpsTestsFacadeTrait {
                 request_hash: request_hash, expected_status: RequestStatus::PROCESSED,
             );
 
-        self
-            .validate_collateral_balance(
-                position_id: position_id, expected_balance: sender_balance_before - amount.into(),
-            );
+        if (asset_id == self.collateral_id) {
+            self
+                .validate_collateral_balance(
+                    :position_id, expected_balance: sender_balance_before - amount.into(),
+                );
 
-        self
-            .validate_collateral_balance(
-                position_id: recipient.position_id,
-                expected_balance: recipient_balance_before + amount.into(),
-            );
+            self
+                .validate_collateral_balance(
+                    position_id: recipient.position_id,
+                    expected_balance: recipient_balance_before + amount.into(),
+                );
+        } else {
+            self
+                .validate_asset_balance(
+                    :position_id,
+                    :asset_id,
+                    expected_balance: sender_balance_before - amount.into(),
+                );
+
+            self
+                .validate_asset_balance(
+                    position_id: recipient.position_id,
+                    :asset_id,
+                    expected_balance: recipient_balance_before + amount.into(),
+                );
+        }
 
         assert_transfer_event_with_expected(
             spied_event: self.get_last_event(contract_address: self.perpetuals_contract),

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

@@ -2481,3 +2481,68 @@ fn test_unfair_deleverage() {
             deleveraged_quote: 204,
         );
 }
+
+#[test]
+fn test_spot_collateral_deposit_transfer_withdraw() {
+    // Setup.
+    let risk_factor_data = RiskFactorTiers {
+        tiers: array![10].span(), first_tier_boundary: MAX_U128, tier_size: 1,
+    };
+    let mut state: FlowTestBase = FlowTestBaseTrait::new();
+
+    // Create a custom spot collateral asset (not the base collateral).
+    let token = snforge_std::Token::STRK;
+    let erc20_contract_address = token.contract_address();
+    let asset_info = AssetInfoTrait::new_collateral(
+        asset_name: 'SPOT', :risk_factor_data, oracles_len: 1, :erc20_contract_address,
+    );
+    let asset_id = asset_info.asset_id;
+    state.facade.add_active_collateral(asset_info: @asset_info, initial_price: 100);
+
+    // Create users.
+    let user_1 = state.new_user_with_position();
+    let user_2 = state.new_user_with_position();
+    snforge_std::set_balance(target: user_1.account.address, new_balance: 5000000, :token);
+    snforge_std::set_balance(target: user_2.account.address, new_balance: 5000000, :token);
+
+    // Deposit spot collateral asset to user_1.
+    let deposit_info_user_1 = state
+        .facade
+        .deposit_spot(
+            depositor: user_1.account,
+            :asset_id,
+            position_id: user_1.position_id,
+            quantized_amount: 100000,
+        );
+    state.facade.process_deposit(deposit_info: deposit_info_user_1);
+
+    // Transfer partial amount from user_1 to user_2.
+    let transfer_info = state
+        .facade
+        .transfer_spot_request(sender: user_1, recipient: user_2, :asset_id, amount: 40000);
+    state.facade.transfer(:transfer_info);
+    // Withdraw from user_1 (first withdrawal).
+    let mut withdraw_info = state
+        .facade
+        .withdraw_spot_request(user: user_1, :asset_id, amount: 30000);
+    state.facade.withdraw(withdraw_info: withdraw_info);
+
+    // Withdraw from user_2 (second withdrawal).
+    withdraw_info = state.facade.withdraw_spot_request(user: user_2, :asset_id, amount: 40000);
+    state.facade.withdraw(withdraw_info: withdraw_info);
+
+    // Verify final balances.
+    let balance_user_1: i64 = state
+        .facade
+        .get_position_asset_balance(user_1.position_id, asset_id)
+        .into();
+    let balance_user_2: i64 = state
+        .facade
+        .get_position_asset_balance(user_2.position_id, asset_id)
+        .into();
+
+    // user_1: 100000 (deposit) - 40000 (transfer) - 30000 (withdraw) = 30000
+    assert_eq!(balance_user_1, 30000_i64);
+    // user_2: 40000 (transfer) - 40000 (withdraw) = 0
+    assert_eq!(balance_user_2, 0_i64);
+}