blockworks-foundation
/
mango-v4
mirror of https://github.com/blockworks-foundation/mango-v4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

program: fix bug where expansion would not move positions whose size remained same (#262) 

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
This commit is contained in:
microwavedcola1 2022-10-03 13:06:04 +02:00 committed by GitHub
parent b906e3dc78
commit 5b549fb59f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
programs/mango-v4/src/state/mango_account.rs
View File

@ -974,7 +974,7 @@ impl<
// expand dynamic components by first moving existing positions, and then setting new ones to defaults
// perp oo
if new_header.perp_oo_count() > old_header.perp_oo_count() {
if old_header.perp_oo_count() > 0 {
unsafe {
sol_memmove(
&mut dynamic[new_header.perp_oo_offset(0)],
@ -982,14 +982,14 @@ impl<
size_of::<PerpOpenOrder>() * old_header.perp_oo_count(),
);
}
for i in old_header.perp_oo_count..new_perp_oo_count {
*get_helper_mut(dynamic, new_header.perp_oo_offset(i.into())) =
PerpOpenOrder::default();
}
}
for i in old_header.perp_oo_count..new_perp_oo_count {
*get_helper_mut(dynamic, new_header.perp_oo_offset(i.into())) =
PerpOpenOrder::default();
}
// perp positions
if new_header.perp_count() > old_header.perp_count() {
if old_header.perp_count() > 0 {
unsafe {
sol_memmove(
&mut dynamic[new_header.perp_offset(0)],
@ -997,14 +997,13 @@ impl<
size_of::<PerpPosition>() * old_header.perp_count(),
);
}
for i in old_header.perp_count..new_perp_count {
*get_helper_mut(dynamic, new_header.perp_offset(i.into())) =
PerpPosition::default();
}
}
for i in old_header.perp_count..new_perp_count {
*get_helper_mut(dynamic, new_header.perp_offset(i.into())) = PerpPosition::default();
}
// serum3 positions
if new_header.serum3_count() > old_header.serum3_count() {
if old_header.serum3_count() > 0 {
unsafe {
sol_memmove(
&mut dynamic[new_header.serum3_offset(0)],
@ -1012,14 +1011,13 @@ impl<
size_of::<Serum3Orders>() * old_header.serum3_count(),
);
}
for i in old_header.serum3_count..new_serum3_count {
*get_helper_mut(dynamic, new_header.serum3_offset(i.into())) =
Serum3Orders::default();
}
}
for i in old_header.serum3_count..new_serum3_count {
*get_helper_mut(dynamic, new_header.serum3_offset(i.into())) = Serum3Orders::default();
}
// token positions
if new_header.token_count() > old_header.token_count() {
if old_header.token_count() > 0 {
unsafe {
sol_memmove(
&mut dynamic[new_header.token_offset(0)],
@ -1027,10 +1025,9 @@ impl<
size_of::<TokenPosition>() * old_header.token_count(),
);
}
for i in old_header.token_count..new_token_count {
*get_helper_mut(dynamic, new_header.token_offset(i.into())) =
TokenPosition::default();
}
}
for i in old_header.token_count..new_token_count {
*get_helper_mut(dynamic, new_header.token_offset(i.into())) = TokenPosition::default();
}
// update the already-parsed header

24
programs/mango-v4/tests/test_basic.rs
View File

@ -43,7 +43,7 @@ async fn test_basic() -> Result<(), TransportError> {
AccountCreateInstruction {
account_num: 0,
token_count: 8,
serum3_count: 0,
serum3_count: 7,
perp_count: 0,
perp_oo_count: 0,
group,
@ -54,6 +54,17 @@ async fn test_basic() -> Result<(), TransportError> {
.await
.unwrap()
.account;
let account_data: MangoAccount = solana.get_account(account).await;
assert_eq!(account_data.tokens.len(), 8);
assert_eq!(
account_data.tokens.iter().filter(|t| t.is_active()).count(),
0
);
assert_eq!(account_data.serum3.len(), 7);
assert_eq!(
account_data.serum3.iter().filter(|s| s.is_active()).count(),
0
);
send_tx(
solana,
@ -71,6 +82,17 @@ async fn test_basic() -> Result<(), TransportError> {
.await
.unwrap()
.account;
let account_data: MangoAccount = solana.get_account(account).await;
assert_eq!(account_data.tokens.len(), 16);
assert_eq!(
account_data.tokens.iter().filter(|t| t.is_active()).count(),
0
);
assert_eq!(account_data.serum3.len(), 8);
assert_eq!(
account_data.serum3.iter().filter(|s| s.is_active()).count(),
0
);
//
// TEST: Deposit funds