From 0ccd9157ee579003a4de46c2b96c1988143e0742 Mon Sep 17 00:00:00 2001
From: Arrowana <Arrowana@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:52:11 +1100
Subject: [PATCH] the usual hack for jup usage

---
 interfaces/stakedex_interface/src/instructions.rs | 4 ++--
 jup_interface/src/pool_pair/common.rs             | 6 +-----
 jup_interface/src/pool_pair/two_way.rs            | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/interfaces/stakedex_interface/src/instructions.rs b/interfaces/stakedex_interface/src/instructions.rs
index 328a5b1..7f298aa 100644
--- a/interfaces/stakedex_interface/src/instructions.rs
+++ b/interfaces/stakedex_interface/src/instructions.rs
@@ -1317,7 +1317,7 @@ impl From<DepositStakeKeys> for [AccountMeta; DEPOSIT_STAKE_IX_ACCOUNTS_LEN] {
         [
             AccountMeta {
                 pubkey: keys.user,
-                is_signer: true,
+                is_signer: false,
                 is_writable: true,
             },
             AccountMeta {
@@ -1600,7 +1600,7 @@ impl From<PrefundWithdrawStakeKeys> for [AccountMeta; PREFUND_WITHDRAW_STAKE_IX_
         [
             AccountMeta {
                 pubkey: keys.user,
-                is_signer: true,
+                is_signer: false,
                 is_writable: true,
             },
             AccountMeta {
diff --git a/jup_interface/src/pool_pair/common.rs b/jup_interface/src/pool_pair/common.rs
index 4382224..150611a 100644
--- a/jup_interface/src/pool_pair/common.rs
+++ b/jup_interface/src/pool_pair/common.rs
@@ -93,11 +93,7 @@ pub fn manual_concat_get_account_metas<W: WithdrawStake + ?Sized, D: DepositStak
     Ok(prefund_withdraw_prefix
         .into_iter()
         .chain(withdraw_from.virtual_ix(&withdraw_quote)?.accounts)
-        .chain(std::iter::once(AccountMeta {
-            pubkey: jup_v6_program_id::ID,
-            is_signer: false,
-            is_writable: false,
-        }))
+        .chain(std::iter::once(swap_params.placeholder_account_meta()))
         .chain(deposit_prefix)
         .chain(
             deposit_to
diff --git a/jup_interface/src/pool_pair/two_way.rs b/jup_interface/src/pool_pair/two_way.rs
index e1fcdd3..aad479c 100644
--- a/jup_interface/src/pool_pair/two_way.rs
+++ b/jup_interface/src/pool_pair/two_way.rs
@@ -168,7 +168,7 @@ where
         account_metas.extend(other_account_metas);
         account_metas.push(swap_params.placeholder_account_meta());
         Ok(SwapAndAccountMetas {
-            swap: Swap::StakeDexPrefundSwapViaStake { bridge_stake_seed },
+            swap: Swap::StakeDexPrefundWithdrawStakeAndDepositStake { bridge_stake_seed },
             account_metas,
         })
     }