Merge pull request #237 from mrgnlabs/e/fixing-for-fuse

Allow off-curve addresses for fuse
mrgnlabs · Sep 15, 2023 · bfc5d77 · bfc5d77 · vercel · Sep 15, 2023
2 parents 113fe82 + e02a466
commit bfc5d77
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/apps/marginfi-v2-ui/src/components/CampaignWizard.tsx b/apps/marginfi-v2-ui/src/components/CampaignWizard.tsx
@@ -79,7 +79,7 @@ const CampaignWizardInputBox: FC<CampaignWizardInputBox> = ({
   );
 };
 
-interface CampaignWizardProps {}
+interface CampaignWizardProps { }
 
 const CampaignWizard: FC<CampaignWizardProps> = () => {
   const [guaranteedApy, setGuaranteedApy] = useState(0);
@@ -133,7 +133,7 @@ const CampaignWizard: FC<CampaignWizardProps> = () => {
 
     const campaignKeypair = Keypair.generate();
     console.log("creating campaign", campaignKeypair.publicKey.toBase58());
-    const userTokenAtaPk = getAssociatedTokenAddressSync(campaignBank.mint, lipClient.wallet.publicKey);
+    const userTokenAtaPk = getAssociatedTokenAddressSync(campaignBank.mint, lipClient.wallet.publicKey, true); // We allow off curve addresses here to support Fuse.
 
     const tx = new Transaction();
 
@@ -271,7 +271,7 @@ const CampaignWizard: FC<CampaignWizardProps> = () => {
         <CampaignWizardInputBox
           value={guaranteedApy * 100}
           setValue={(value) => setGuaranteedApy(value / 100)}
-          loadingSafetyCheck={() => {}}
+          loadingSafetyCheck={() => { }}
           maxDecimals={2}
           disabled={!walletContext.connected}
         />
@@ -282,7 +282,7 @@ const CampaignWizard: FC<CampaignWizardProps> = () => {
           <CampaignWizardInputBox
             value={lockupPeriodInDays}
             setValue={setLockupPeriodInDays}
-            loadingSafetyCheck={() => {}}
+            loadingSafetyCheck={() => { }}
             maxDecimals={4}
             disabled={!walletContext.connected}
           />
@@ -293,7 +293,7 @@ const CampaignWizard: FC<CampaignWizardProps> = () => {
         <CampaignWizardInputBox
           value={depositCapacity}
           setValue={setDepositCapacity}
-          loadingSafetyCheck={() => {}}
+          loadingSafetyCheck={() => { }}
           maxDecimals={3}
           disabled={!walletContext.connected}
         />
@@ -343,12 +343,12 @@ const CampaignWizard: FC<CampaignWizardProps> = () => {
           >
             {campaignBank
               ? percentFormatterDyn.format(
-                  computeGuaranteedApy(
-                    contractInputs.lockupPeriod.toNumber(),
-                    contractInputs.maxDeposits.toNumber(),
-                    contractInputs.maxRewards.toNumber()
-                  )
+                computeGuaranteedApy(
+                  contractInputs.lockupPeriod.toNumber(),
+                  contractInputs.maxDeposits.toNumber(),
+                  contractInputs.maxRewards.toNumber()
                 )
+              )
               : 0}
           </span>
         </div>

diff --git a/apps/omni/src/api/ai/tools/walletBalances.ts b/apps/omni/src/api/ai/tools/walletBalances.ts
@@ -66,7 +66,7 @@ class WalletBalancesTool extends Tool {
       };
     }
 
-    const ataAddresses = mintList.map((mint) => getAssociatedTokenAddressSync(mint.address, wallet!));
+    const ataAddresses = mintList.map((mint) => getAssociatedTokenAddressSync(mint.address, wallet!, true)); // We allow off curve addresses here to support Fuse.
 
     // Fetch relevant accounts
     const accountsAiList = await this.connection.getMultipleAccountsInfo([wallet, ...ataAddresses]);

diff --git a/packages/lip-client/src/account.ts b/packages/lip-client/src/account.ts
@@ -67,7 +67,7 @@ class LipAccount {
   async makeClosePositionIx(deposit: Deposit): Promise<InstructionsWrapper> {
     let ixs = [];
 
-    const userAta = getAssociatedTokenAddressSync(deposit.campaign.bank.mint, this.client.wallet.publicKey);
+    const userAta = getAssociatedTokenAddressSync(deposit.campaign.bank.mint, this.client.wallet.publicKey, true); // We allow off curve addresses here to support Fuse.
     const createAtaIdempotentIx = createAssociatedTokenAccountIdempotentInstruction(
       this.client.wallet.publicKey,
       userAta,

diff --git a/packages/lip-client/src/client.ts b/packages/lip-client/src/client.ts
@@ -150,7 +150,7 @@ class LipClient {
   async makeDepositIx(campaign: PublicKey, amount: Amount, bank: Bank): Promise<InstructionsWrapper> {
     const depositKeypair = Keypair.generate();
     const tempTokenAccountKeypair = Keypair.generate();
-    const userTokenAtaPk = getAssociatedTokenAddressSync(bank.mint, this.mfiClient.provider.wallet.publicKey);
+    const userTokenAtaPk = getAssociatedTokenAddressSync(bank.mint, this.mfiClient.provider.wallet.publicKey, true); // We allow off curve addresses here to support Fuse.
     const amountNative = uiToNative(amount, bank.mintDecimals);
 
     const ixs = [];

diff --git a/packages/marginfi-client-v2/src/models/account/pure.ts b/packages/marginfi-client-v2/src/models/account/pure.ts
@@ -390,7 +390,7 @@ class MarginfiAccount {
     const bank = banks.get(bankAddress.toBase58());
     if (!bank) throw Error(`Bank ${bankAddress.toBase58()} not found`);
 
-    const userTokenAtaPk = getAssociatedTokenAddressSync(bank.mint, this.authority);
+    const userTokenAtaPk = getAssociatedTokenAddressSync(bank.mint, this.authority, true); // We allow off curve addresses here to support Fuse.
     const remainingAccounts = this.getHealthCheckAccounts(banks, [bank]);
     const ix = await instructions.makeDepositIx(
       program,
@@ -432,7 +432,7 @@ class MarginfiAccount {
 
     // Add emissions-related instructions if necessary
     if (repayAll && !bank.emissionsMint.equals(PublicKey.default)) {
-      const userAta = getAssociatedTokenAddressSync(bank.emissionsMint, this.authority);
+      const userAta = getAssociatedTokenAddressSync(bank.emissionsMint, this.authority, true); // We allow off curve addresses here to support Fuse.
       const createAtaIdempotentIx = createAssociatedTokenAccountIdempotentInstruction(
         this.authority,
         userAta,
@@ -445,7 +445,7 @@ class MarginfiAccount {
     }
 
     // Add repay-related instructions
-    const userAta = getAssociatedTokenAddressSync(bank.mint, this.authority);
+    const userAta = getAssociatedTokenAddressSync(bank.mint, this.authority, true); // We allow off curve addresses here to support Fuse.
     const remainingAccounts = repayAll
       ? this.getHealthCheckAccounts(banks, [], [bank])
       : this.getHealthCheckAccounts(banks, [bank], []);
@@ -490,7 +490,7 @@ class MarginfiAccount {
 
     // Add emissions-related instructions if necessary
     if (withdrawAll && !bank.emissionsMint.equals(PublicKey.default)) {
-      const userAta = getAssociatedTokenAddressSync(bank.emissionsMint, this.authority);
+      const userAta = getAssociatedTokenAddressSync(bank.emissionsMint, this.authority, true); // We allow off curve addresses here to support Fuse.
       const createAtaIdempotentIx = createAssociatedTokenAccountIdempotentInstruction(
         this.authority,
         userAta,
@@ -548,7 +548,7 @@ class MarginfiAccount {
 
     let ixs = [];
 
-    const userAta = getAssociatedTokenAddressSync(bank.mint, this.authority);
+    const userAta = getAssociatedTokenAddressSync(bank.mint, this.authority, true); // We allow off curve addresses here to support Fuse.
 
     // Add additional CU request if necessary
     const activeBalances = this.balances.filter((b) => b.active);
@@ -599,7 +599,7 @@ class MarginfiAccount {
 
     let ixs = [];
 
-    const userAta = getAssociatedTokenAddressSync(bank.emissionsMint, this.authority);
+    const userAta = getAssociatedTokenAddressSync(bank.emissionsMint, this.authority, true); // We allow off curve addresses here to support Fuse.
     const createAtaIdempotentIx = createAssociatedTokenAccountIdempotentInstruction(
       this.authority,
       userAta,

diff --git a/packages/marginfi-client-v2/src/utils.ts b/packages/marginfi-client-v2/src/utils.ts
@@ -71,6 +71,6 @@ export function makeWrapSolIxs(walletAddress: PublicKey, amount: BigNumber): Tra
 }
 
 export function makeUnwrapSolIx(walletAddress: PublicKey): TransactionInstruction {
-  const address = getAssociatedTokenAddressSync(NATIVE_MINT, walletAddress);
+  const address = getAssociatedTokenAddressSync(NATIVE_MINT, walletAddress, true); // We allow off curve addresses here to support Fuse.
   return createCloseAccountInstruction(address, walletAddress, walletAddress);
 }
diff --git a/packages/marginfi-v2-ui-state/src/lib/mrgnlend.ts b/packages/marginfi-v2-ui-state/src/lib/mrgnlend.ts
@@ -350,7 +350,7 @@ async function fetchTokenAccounts(
     };
   }
 
-  const ataAddresses = mintList.map((mint) => getAssociatedTokenAddressSync(mint.address, walletAddress!));
+  const ataAddresses = mintList.map((mint) => getAssociatedTokenAddressSync(mint.address, walletAddress!, true)); // We allow off curve addresses here to support Fuse.
 
   // Fetch relevant accounts
   const accountsAiList = await connection.getMultipleAccountsInfo([walletAddress, ...ataAddresses]);