Skip to content

swift msg type enum #130

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 3, 2025
Merged

swift msg type enum #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ tokio-stream = "0.1.17"
tokio-tungstenite = { version = "0.26", features = ["native-tls"] }

drift-pubsub-client = { version = "0.1.1", path = "crates/pubsub-client" }
arrayvec = "0.7.6"

[dev-dependencies]
bytes = "1"
Expand Down
65 changes: 3 additions & 62 deletions crates/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use solana_sdk::{
signature::Signature,
};
pub use solana_sdk::{address_lookup_table::AddressLookupTableAccount, pubkey::Pubkey};
use swift_order_subscriber::SignedDelegateOrderInfo;

use crate::{
account_map::AccountMap,
Expand Down Expand Up @@ -1665,10 +1664,7 @@ impl<'a> TransactionBuilder<'a> {
authority: self.authority,
user: self.sub_account,
user_stats: Wallet::derive_stats_account(&self.authority),
taker: Wallet::derive_user_account(
&taker_account.authority,
signed_order_info.taker_subaccount_id(),
),
taker: signed_order_info.taker_subaccount(&taker_account.authority),
taker_stats: Wallet::derive_stats_account(&taker_account.authority),
taker_signed_msg_user_orders: Wallet::derive_swift_order_account(
&taker_account.authority,
Expand Down Expand Up @@ -1708,7 +1704,7 @@ impl<'a> TransactionBuilder<'a> {
/// or see `place_and_make_swift_order`
///
/// * `signed_order_info` - the signed swift order info
/// * `taker_account` - taker account data (authority of the swift order)
/// * `taker_account` - taker subaccount data
///
pub fn place_swift_order(
mut self,
Expand All @@ -1727,62 +1723,7 @@ impl<'a> TransactionBuilder<'a> {
types::accounts::PlaceSignedMsgTakerOrder {
state: *state_account(),
authority: self.authority,
user: Wallet::derive_user_account(
&taker_account.authority,
signed_order_info.taker_subaccount_id(),
),
user_stats: Wallet::derive_stats_account(&taker_account.authority),
signed_msg_user_orders: Wallet::derive_swift_order_account(
&taker_account.authority,
),
ix_sysvar: SYSVAR_INSTRUCTIONS_PUBKEY,
},
&[taker_account],
self.force_markets.readable.iter(),
perp_writable
.iter()
.chain(self.force_markets.writeable.iter()),
);

let swift_taker_ix_data = signed_order_info.to_ix_data();
let ed25519_verify_ix = crate::utils::new_ed25519_ix_ptr(
swift_taker_ix_data.as_slice(),
self.ixs.len() as u16 + 1,
);

let place_swift_ix = Instruction {
program_id: constants::PROGRAM_ID,
accounts,
data: InstructionData::data(&drift_idl::instructions::PlaceSignedMsgTakerOrder {
signed_msg_order_params_message_bytes: swift_taker_ix_data,
is_delegate_signer: signed_order_info.using_delegate_signing(),
}),
};

self.ixs
.extend_from_slice(&[ed25519_verify_ix, place_swift_ix]);
self
}

/// Place a swift delegate order. Same as above but with a different account type provided
pub fn place_swift_delegate_order(
mut self,
signed_order_info: &SignedDelegateOrderInfo,
taker_account: &User,
) -> Self {
let order_params = signed_order_info.order_params();
assert!(
order_params.market_type == MarketType::Perp,
"only swift perps are supported"
);

let perp_writable = [MarketId::perp(order_params.market_index)];
let accounts = build_accounts(
self.program_data,
types::accounts::PlaceSignedMsgTakerOrder {
state: *state_account(),
authority: self.authority,
user: signed_order_info.taker_pubkey(),
user: signed_order_info.taker_subaccount(&taker_account.authority),
user_stats: Wallet::derive_stats_account(&taker_account.authority),
signed_msg_user_orders: Wallet::derive_swift_order_account(
&taker_account.authority,
Expand Down
Loading
Loading