Client: Jupiter swaps preserve ata/token instructions

Cargo.lock

@@ -1276,6 +1276,7 @@ dependencies = [
  "solana-account-decoder",
  "solana-client",
  "solana-sdk",
+ "spl-associated-token-account",
  "thiserror",
  "tokio",
 ]

client/Cargo.toml

@@ -21,6 +21,7 @@ shellexpand = "2.1.0"
 solana-account-decoder = "~1.10.29"
 solana-client = "~1.10.29"
 solana-sdk = "~1.10.29"
+spl-associated-token-account = "1.0.3"
 thiserror = "1.0.31"
 log = "0.4"
 reqwest = "0.11.11"

client/src/client.rs

@@ -953,19 +953,12 @@ impl MangoClient {
                     .context("base64 decoding jupiter transaction")?,
             )
             .context("parsing jupiter transaction")?;
+        let ata_program = anchor_spl::associated_token::ID;
+        let token_program = anchor_spl::token::ID;
+        let is_setup_ix = |k: Pubkey| -> bool { k == ata_program || k == token_program };
         let jup_ixs = deserialize_instructions(&jup_tx.message)
             .into_iter()
-            // TODO: possibly creating associated token accounts if they don't exist yet is good?!
-            // we could squeeze the FlashLoan instructions in the middle:
-            //   - beginning AToken...
-            //   - FlashLoanBegin
-            //   - other JUP ix
-            //   - FlashLoanEnd
-            //   - ending AToken
-            .filter(|ix| {
-                ix.program_id
-                    != Pubkey::from_str("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL").unwrap()
-            })
+            .filter(|ix| !is_setup_ix(ix.program_id))
             .collect::<Vec<_>>();
 
         let bank_ams = [
@@ -1014,7 +1007,19 @@ impl MangoClient {
             .context("building health accounts")?;
 
         let program = self.program();
-        let mut builder = program.request().instruction(Instruction {
+        let mut builder = program.request();
+
+        builder = builder.instruction(create_associated_token_account_idempotent(
+            &self.owner.pubkey(),
+            &self.owner.pubkey(),
+            &source_token.mint_info.mint,
+        ));
+        builder = builder.instruction(create_associated_token_account_idempotent(
+            &self.owner.pubkey(),
+            &self.owner.pubkey(),
+            &target_token.mint_info.mint,
+        ));
+        builder = builder.instruction(Instruction {
             program_id: mango_v4::id(),
             accounts: {
                 let mut ams = anchor_lang::ToAccountMetas::to_account_metas(
@@ -1035,7 +1040,7 @@ impl MangoClient {
             }),
         });
         for ix in jup_ixs {
-            builder = builder.instruction(ix);
+            builder = builder.instruction(ix.clone());
         }
         builder = builder.instruction(Instruction {
             program_id: mango_v4::id(),
@@ -1175,3 +1180,17 @@ fn to_writable_account_meta(pubkey: Pubkey) -> AccountMeta {
         is_signer: false,
     }
 }
+
+// FUTURE: use spl_associated_token_account::instruction::create_associated_token_account_idempotent
+// Right now anchor depends on an earlier version of this package...
+fn create_associated_token_account_idempotent(
+    funder: &Pubkey,
+    owner: &Pubkey,
+    mint: &Pubkey,
+) -> Instruction {
+    let mut instr = spl_associated_token_account::instruction::create_associated_token_account(
+        funder, owner, mint,
+    );
+    instr.data = vec![0x1]; // CreateIdempotent
+    instr
+}

client/src/jupiter.rs

@@ -33,7 +33,7 @@ pub struct QueryMarketInfo {
     pub lp_fee: QueryFee,
     pub platform_fee: QueryFee,
     pub not_enough_liquidity: bool,
-    pub price_impact_pct: f64,
+    pub price_impact_pct: Option<f64>,
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
@@ -41,7 +41,7 @@ pub struct QueryMarketInfo {
 pub struct QueryFee {
     pub amount: u64,
     pub mint: String,
-    pub pct: f64,
+    pub pct: Option<f64>,
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
@@ -49,6 +49,7 @@ pub struct QueryFee {
 pub struct SwapRequest {
     pub route: QueryRoute,
     pub user_public_key: String,
+    #[serde(rename = "wrapUnwrapSOL")]
     pub wrap_unwrap_sol: bool,
 }