-
Notifications
You must be signed in to change notification settings - Fork 166
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add rust-sdk position test #601
Open
pauldragonfly
wants to merge
2
commits into
main
Choose a base branch
from
paul/rust-sdk-add-position-test
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,32 @@ | ||
use solana_sdk::{pubkey::Pubkey, signer::Signer, system_program}; | ||
use std::error::Error; | ||
|
||
use orca_whirlpools_client::{ | ||
get_fee_tier_address, get_token_badge_address, get_whirlpool_address, InitializePoolV2, | ||
InitializePoolV2InstructionArgs, | ||
get_bundled_position_address, get_fee_tier_address, get_position_address, | ||
get_position_bundle_address, get_token_badge_address, get_whirlpool_address, InitializePoolV2, | ||
InitializePoolV2InstructionArgs, InitializePositionBundle, OpenBundledPosition, | ||
OpenBundledPositionInstructionArgs, OpenPosition, OpenPositionInstructionArgs, | ||
}; | ||
use orca_whirlpools_core::tick_index_to_sqrt_price; | ||
use solana_program::program_pack::Pack; | ||
use solana_program::sysvar::rent::ID as RENT_PROGRAM_ID; | ||
use solana_sdk::{ | ||
pubkey::Pubkey, | ||
signer::{keypair::Keypair, Signer}, | ||
system_instruction, system_program, | ||
}; | ||
use spl_associated_token_account::{ | ||
get_associated_token_address, get_associated_token_address_with_program_id, | ||
instruction::create_associated_token_account, | ||
}; | ||
use spl_token::{state::Mint, ID as TOKEN_PROGRAM_ID}; | ||
use spl_token_2022::{state::Mint as Token2022Mint, ID as TOKEN_2022_PROGRAM_ID}; | ||
use std::error::Error; | ||
|
||
use crate::WHIRLPOOLS_CONFIG_ADDRESS; | ||
|
||
use super::rpc::RpcContext; | ||
|
||
use crate::tests::token::{setup_ata, setup_mint_with_decimals}; | ||
use crate::tests::token_extensions::setup_mint_te; | ||
|
||
pub async fn setup_whirlpool( | ||
ctx: &RpcContext, | ||
token_a: Pubkey, | ||
|
@@ -60,14 +75,165 @@ pub async fn setup_whirlpool( | |
Ok(whirlpool) | ||
} | ||
|
||
pub async fn setup_position(_whirlpool: Pubkey) -> Result<Pubkey, Box<dyn Error>> { | ||
todo!() | ||
pub async fn setup_position(whirlpool: Pubkey) -> Result<Pubkey, Box<dyn Error>> { | ||
let ctx = RpcContext::new().await; | ||
|
||
// Use token utility functions | ||
let position_mint = setup_mint_with_decimals(&ctx, 0).await?; | ||
let position_token_account = setup_ata(&ctx, position_mint).await?; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You don't have to setup mint and ata when opening a position. The OpenPosition instruction will do that |
||
|
||
let (position_pubkey, position_bump) = get_position_address(&position_mint)?; | ||
|
||
let open_position_ix = OpenPosition { | ||
funder: ctx.signer.pubkey(), | ||
owner: ctx.signer.pubkey(), | ||
position: position_pubkey, | ||
position_mint, | ||
position_token_account, | ||
whirlpool, | ||
token_program: TOKEN_PROGRAM_ID, | ||
system_program: system_program::id(), | ||
associated_token_program: spl_associated_token_account::id(), | ||
rent: RENT_PROGRAM_ID, | ||
} | ||
.instruction(OpenPositionInstructionArgs { | ||
tick_lower_index: -128, | ||
tick_upper_index: 128, | ||
position_bump, | ||
}); | ||
|
||
ctx.send_transaction(vec![open_position_ix]).await?; | ||
|
||
Ok(position_pubkey) | ||
} | ||
|
||
pub async fn setup_te_position(_whirlpool: Pubkey) -> Result<Pubkey, Box<dyn Error>> { | ||
todo!() | ||
pub async fn setup_te_position(whirlpool: Pubkey) -> Result<Pubkey, Box<dyn Error>> { | ||
let ctx = RpcContext::new().await; | ||
|
||
let position_mint = Keypair::new(); | ||
let lamports = ctx | ||
.rpc | ||
.get_minimum_balance_for_rent_exemption(Token2022Mint::LEN) | ||
.await?; | ||
|
||
let create_mint_ix = system_instruction::create_account( | ||
&ctx.signer.pubkey(), | ||
&position_mint.pubkey(), | ||
lamports, | ||
Token2022Mint::LEN as u64, | ||
&TOKEN_2022_PROGRAM_ID, | ||
); | ||
|
||
let init_mint_ix = spl_token_2022::instruction::initialize_mint( | ||
&TOKEN_2022_PROGRAM_ID, | ||
&position_mint.pubkey(), | ||
&ctx.signer.pubkey(), | ||
None, | ||
0, | ||
)?; | ||
|
||
let position_token_account = | ||
get_associated_token_address(&ctx.signer.pubkey(), &position_mint.pubkey()); | ||
|
||
let create_ata_ix = create_associated_token_account( | ||
&ctx.signer.pubkey(), | ||
&ctx.signer.pubkey(), | ||
&position_mint.pubkey(), | ||
&TOKEN_2022_PROGRAM_ID, | ||
); | ||
|
||
let (position_pubkey, position_bump) = get_position_address(&position_mint.pubkey())?; | ||
|
||
let tick_lower_index: i32 = -128; | ||
let tick_upper_index: i32 = 128; | ||
|
||
let open_position_ix = OpenPosition { | ||
funder: ctx.signer.pubkey(), | ||
owner: ctx.signer.pubkey(), | ||
position: position_pubkey, | ||
position_mint: position_mint.pubkey(), | ||
position_token_account, | ||
whirlpool, | ||
token_program: TOKEN_2022_PROGRAM_ID, | ||
system_program: system_program::id(), | ||
associated_token_program: spl_associated_token_account::id(), | ||
rent: RENT_PROGRAM_ID, | ||
} | ||
.instruction(OpenPositionInstructionArgs { | ||
tick_lower_index, | ||
tick_upper_index, | ||
position_bump, | ||
}); | ||
|
||
ctx.send_transaction_with_signers( | ||
vec![ | ||
create_mint_ix, | ||
init_mint_ix, | ||
create_ata_ix, | ||
open_position_ix, | ||
], | ||
vec![&position_mint], | ||
) | ||
.await?; | ||
|
||
Ok(position_pubkey) | ||
} | ||
|
||
pub async fn setup_position_bundle(_whirlpool: Pubkey) -> Result<Pubkey, Box<dyn Error>> { | ||
todo!() | ||
/// Creates a Position Bundle and initializes the specified number of bundled positions | ||
/// Calls `OpenBundledPosition` for each position specified in `bundle_positions` | ||
pub async fn setup_position_bundle( | ||
whirlpool: Pubkey, | ||
bundle_positions: Option<Vec<()>>, | ||
) -> Result<Pubkey, Box<dyn Error>> { | ||
let ctx = RpcContext::new().await; | ||
|
||
// Use token utility functions | ||
let position_bundle_mint = setup_mint_with_decimals(&ctx, 0).await?; | ||
let position_bundle_token_account = setup_ata(&ctx, position_bundle_mint).await?; | ||
|
||
let (position_bundle_address, _) = get_position_bundle_address(&position_bundle_mint)?; | ||
|
||
let open_bundle_ix = InitializePositionBundle { | ||
funder: ctx.signer.pubkey(), | ||
position_bundle: position_bundle_address, | ||
position_bundle_mint, | ||
position_bundle_token_account, | ||
position_bundle_owner: ctx.signer.pubkey(), | ||
token_program: TOKEN_PROGRAM_ID, | ||
system_program: system_program::id(), | ||
associated_token_program: spl_associated_token_account::id(), | ||
rent: RENT_PROGRAM_ID, | ||
} | ||
.instruction(); | ||
|
||
ctx.send_transaction(vec![open_bundle_ix]).await?; | ||
|
||
// Initialize bundled positions | ||
if let Some(positions) = bundle_positions { | ||
for (i, _) in positions.iter().enumerate() { | ||
let bundle_index = i as u16; | ||
let (bundled_position_address, _) = | ||
get_bundled_position_address(&position_bundle_mint, bundle_index as u8)?; | ||
|
||
let open_bundled_ix = OpenBundledPosition { | ||
funder: ctx.signer.pubkey(), | ||
bundled_position: bundled_position_address, | ||
position_bundle: position_bundle_address, | ||
position_bundle_authority: ctx.signer.pubkey(), | ||
position_bundle_token_account, | ||
whirlpool, | ||
system_program: system_program::id(), | ||
rent: RENT_PROGRAM_ID, | ||
} | ||
.instruction(OpenBundledPositionInstructionArgs { | ||
tick_lower_index: -128, | ||
tick_upper_index: 128, | ||
bundle_index, | ||
}); | ||
|
||
ctx.send_transaction(vec![open_bundled_ix]).await?; | ||
} | ||
} | ||
|
||
Ok(position_bundle_address) | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be nice to add a position bundle and te_position as well to check if
fetch_positions_for_owner
finds those positions as well.Same goes from the
fetch_positions_in_pool
test