Skip to content

Commit 1a3a137

Browse files
chore(perpetuals): add token address to deposit events
1 parent d4ed699 commit 1a3a137

File tree

5 files changed

+15
-0
lines changed

5 files changed

+15
-0
lines changed

workspace/apps/perpetuals/contracts/src/core/components/deposit/deposit_manager.cairo

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ pub(crate) mod DepositManager {
277277
position_id,
278278
depositing_address: depositor,
279279
collateral_id: asset_id,
280+
token_address: token_contract.contract_address,
280281
quantized_amount,
281282
unquantized_amount,
282283
deposit_request_hash: deposit_hash,
@@ -365,6 +366,7 @@ pub(crate) mod DepositManager {
365366
position_id,
366367
depositing_address: caller_address,
367368
collateral_id: asset_id,
369+
token_address: token_contract.contract_address,
368370
quantized_amount,
369371
unquantized_amount,
370372
deposit_request_hash: deposit_hash,

workspace/apps/perpetuals/contracts/src/core/components/deposit/events.cairo

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ pub struct Deposit {
99
#[key]
1010
pub depositing_address: ContractAddress,
1111
pub collateral_id: AssetId,
12+
pub token_address: ContractAddress,
1213
pub quantized_amount: u64,
1314
pub unquantized_amount: u64,
1415
#[key]
@@ -23,6 +24,7 @@ pub struct DepositProcessed {
2324
#[key]
2425
pub depositing_address: ContractAddress,
2526
pub collateral_id: AssetId,
27+
pub token_address: ContractAddress,
2628
pub quantized_amount: u64,
2729
pub unquantized_amount: u256,
2830
#[key]

workspace/apps/perpetuals/contracts/src/tests/event_test_utils.cairo

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ pub fn assert_deposit_event_with_expected(
4242
position_id: PositionId,
4343
depositing_address: ContractAddress,
4444
collateral_id: AssetId,
45+
token_address: ContractAddress,
4546
quantized_amount: u64,
4647
unquantized_amount: u64,
4748
deposit_request_hash: felt252,
@@ -51,6 +52,7 @@ pub fn assert_deposit_event_with_expected(
5152
position_id,
5253
depositing_address,
5354
collateral_id,
55+
token_address,
5456
quantized_amount,
5557
unquantized_amount,
5658
deposit_request_hash,
@@ -97,6 +99,7 @@ pub fn assert_deposit_processed_event_with_expected(
9799
position_id: PositionId,
98100
depositing_address: ContractAddress,
99101
collateral_id: AssetId,
102+
token_address: ContractAddress,
100103
quantized_amount: u64,
101104
unquantized_amount: u64,
102105
deposit_request_hash: felt252,
@@ -106,6 +109,7 @@ pub fn assert_deposit_processed_event_with_expected(
106109
position_id,
107110
depositing_address,
108111
collateral_id,
112+
token_address,
109113
quantized_amount,
110114
unquantized_amount: unquantized_amount.into(),
111115
deposit_request_hash,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -891,6 +891,7 @@ pub impl PerpsTestsFacadeImpl of PerpsTestsFacadeTrait {
891891
:position_id,
892892
depositing_address: address,
893893
collateral_id: asset_id,
894+
token_address: token_state.address,
894895
:quantized_amount,
895896
:unquantized_amount,
896897
deposit_request_hash: deposit_hash,
@@ -994,6 +995,7 @@ pub impl PerpsTestsFacadeImpl of PerpsTestsFacadeTrait {
994995
:position_id,
995996
depositing_address: depositor.address,
996997
collateral_id: asset_id,
998+
token_address: token_state.address,
997999
:quantized_amount,
9981000
unquantized_amount: quantized_amount * self.collateral_quantum,
9991001
deposit_request_hash: deposit_hash,

workspace/apps/perpetuals/contracts/src/tests/unit_tests/unit_tests.cairo

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,6 +1735,7 @@ fn test_successful_deposit() {
17351735
position_id: user.position_id,
17361736
depositing_address: user.address,
17371737
collateral_id: cfg.collateral_cfg.collateral_id,
1738+
token_address: token_state.address,
17381739
quantized_amount: DEPOSIT_AMOUNT,
17391740
unquantized_amount: DEPOSIT_AMOUNT * COLLATERAL_QUANTUM,
17401741
deposit_request_hash: deposit_hash,
@@ -1846,6 +1847,7 @@ fn test_successful_process_deposit() {
18461847
position_id: user.position_id,
18471848
depositing_address: user.address,
18481849
collateral_id: cfg.collateral_cfg.collateral_id,
1850+
token_address: token_state.address,
18491851
quantized_amount: DEPOSIT_AMOUNT,
18501852
unquantized_amount: DEPOSIT_AMOUNT * COLLATERAL_QUANTUM,
18511853
deposit_request_hash: deposit_hash,
@@ -5159,6 +5161,7 @@ fn test_successful_vault_token_deposit() {
51595161
position_id: user.position_id,
51605162
depositing_address: user.address,
51615163
collateral_id: cfg.vault_share_cfg.collateral_id,
5164+
token_address: cfg.vault_share_cfg.contract_address,
51625165
quantized_amount: DEPOSIT_AMOUNT,
51635166
unquantized_amount: DEPOSIT_AMOUNT * cfg.vault_share_cfg.quantum,
51645167
deposit_request_hash: deposit_hash,
@@ -5301,6 +5304,7 @@ fn test_successful_vault_token_cancel_deposit() {
53015304
position_id: user.position_id,
53025305
depositing_address: user.address,
53035306
collateral_id: cfg.vault_share_cfg.collateral_id,
5307+
token_address: cfg.vault_share_cfg.contract_address,
53045308
quantized_amount: DEPOSIT_AMOUNT,
53055309
unquantized_amount: DEPOSIT_AMOUNT * cfg.vault_share_cfg.quantum,
53065310
deposit_request_hash: deposit_hash,
@@ -5411,6 +5415,7 @@ fn test_successful_vault_share_process_deposit() {
54115415
position_id: user.position_id,
54125416
depositing_address: user.address,
54135417
collateral_id: cfg.vault_share_cfg.collateral_id,
5418+
token_address: vault_share_state.address,
54145419
quantized_amount: DEPOSIT_AMOUNT,
54155420
unquantized_amount: DEPOSIT_AMOUNT * cfg.vault_share_cfg.quantum,
54165421
deposit_request_hash: deposit_hash,

0 commit comments

Comments
 (0)