logos-blockchain/lssa
1
0
Fork 0
mirror of https://github.com/logos-blockchain/lssa.git synced 2026-01-05 23:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: suggestions added

Browse Source
This commit is contained in:
Pravdyvy 2025-12-19 19:12:58 +02:00
parent 1b0dea11f6
commit d427d49c65
3 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration_tests/src/test_suite_map.rs
View File

@ -2401,8 +2401,8 @@ pub fn prepare_function_map() -> HashMap<String, TestFunction> {
user_holding_b: make_public_account_input_from_str(&recipient_account_id_2.to_string()), user_holding_b: make_public_account_input_from_str(&recipient_account_id_2.to_string()),
user_holding_lp: make_public_account_input_from_str(&user_holding_lp.to_string()), user_holding_lp: make_public_account_input_from_str(&user_holding_lp.to_string()),
balance_lp: 2, balance_lp: 2,
max_amount_a: 1, min_amount_a: 1,
max_amount_b: 1, min_amount_b: 1,
}; };
wallet::cli::execute_subcommand(Command::AMM(subcommand)) wallet::cli::execute_subcommand(Command::AMM(subcommand))

12
wallet/src/cli/programs/amm.rs
View File

@ -92,9 +92,9 @@ pub enum AmmProgramAgnosticSubcommand {
#[arg(long)] #[arg(long)]
balance_lp: u128, balance_lp: u128,
#[arg(long)] #[arg(long)]
max_amount_a: u128, min_amount_a: u128,
#[arg(long)] #[arg(long)]
max_amount_b: u128, min_amount_b: u128,
}, },
} }
@ -238,8 +238,8 @@ impl WalletSubcommand for AmmProgramAgnosticSubcommand {
user_holding_b, user_holding_b,
user_holding_lp, user_holding_lp,
balance_lp, balance_lp,
max_amount_a, min_amount_a,
max_amount_b, min_amount_b,
} => { } => {
let (user_holding_a, user_holding_a_privacy) = let (user_holding_a, user_holding_a_privacy) =
parse_addr_with_privacy_prefix(&user_holding_a)?; parse_addr_with_privacy_prefix(&user_holding_a)?;
@ -268,8 +268,8 @@ impl WalletSubcommand for AmmProgramAgnosticSubcommand {
user_holding_b, user_holding_b,
user_holding_lp, user_holding_lp,
balance_lp, balance_lp,
max_amount_a, min_amount_a,
max_amount_b, min_amount_b,
) )
.await?; .await?;

37
wallet/src/program_facades/amm.rs
View File

@ -123,7 +123,7 @@ impl AMM<'_> {
.ok_or(ExecutionFailureKind::AccountDataError(user_holding_a))? .ok_or(ExecutionFailureKind::AccountDataError(user_holding_a))?
.definition_id; .definition_id;
let definition_token_b_id = TokenHolding::parse(&user_b_acc.data) let definition_token_b_id = TokenHolding::parse(&user_b_acc.data)
.ok_or(ExecutionFailureKind::AccountDataError(user_holding_a))? .ok_or(ExecutionFailureKind::AccountDataError(user_holding_b))?
.definition_id; .definition_id;
let amm_pool = let amm_pool =
@ -289,11 +289,11 @@ impl AMM<'_> {
user_holding_b: AccountId, user_holding_b: AccountId,
user_holding_lp: AccountId, user_holding_lp: AccountId,
balance_lp: u128, balance_lp: u128,
max_amount_a: u128, min_amount_a: u128,
max_amount_b: u128, min_amount_b: u128,
) -> Result<SendTxResponse, ExecutionFailureKind> { ) -> Result<SendTxResponse, ExecutionFailureKind> {
let (instruction, program) = let (instruction, program) =
amm_program_preparation_remove_liq(balance_lp, max_amount_a, max_amount_b); amm_program_preparation_remove_liq(balance_lp, min_amount_a, min_amount_b);
let amm_program_id = Program::amm().id(); let amm_program_id = Program::amm().id();
@ -431,8 +431,8 @@ fn amm_program_preparation_add_liq(
fn amm_program_preparation_remove_liq( fn amm_program_preparation_remove_liq(
balance_lp: u128, balance_lp: u128,
max_amount_a: u128, min_amount_a: u128,
max_amount_b: u128, min_amount_b: u128,
) -> (OrphanHack49BytesInput, Program) { ) -> (OrphanHack49BytesInput, Program) {
// An instruction data byte string of length 49, amounts for minimum amount of liquidity to // An instruction data byte string of length 49, amounts for minimum amount of liquidity to
// redeem (balance_lp), minimum balance of each token to remove (min_amount_a and // redeem (balance_lp), minimum balance of each token to remove (min_amount_a and
@ -441,32 +441,11 @@ fn amm_program_preparation_remove_liq(
instruction[0] = 0x03; instruction[0] = 0x03;
instruction[1..17].copy_from_slice(&balance_lp.to_le_bytes()); instruction[1..17].copy_from_slice(&balance_lp.to_le_bytes());
instruction[17..33].copy_from_slice(&max_amount_a.to_le_bytes()); instruction[17..33].copy_from_slice(&min_amount_a.to_le_bytes());
instruction[33..49].copy_from_slice(&max_amount_b.to_le_bytes()); instruction[33..49].copy_from_slice(&min_amount_b.to_le_bytes());
let instruction_data = OrphanHack49BytesInput::expand(instruction); let instruction_data = OrphanHack49BytesInput::expand(instruction);
let program = Program::amm(); let program = Program::amm();
(instruction_data, program) (instruction_data, program)
} }
#[cfg(test)]
mod tests {
use crate::program_facades::amm::OrphanHack65BytesInput;
#[test]
fn test_correct_ser() {
let mut arr = [0u8; 65];
for (i, item) in arr.iter_mut().enumerate().take(64) {
*item = i as u8;
}
let hack = OrphanHack65BytesInput::expand(arr);
let instruction_data = serde_json::to_string(&hack).unwrap();
println!("{instruction_data:?}");
// assert_eq!(serialization_res_1, serialization_res_2);
}
}