Redeem and cancel

00labs · Sep 7, 2024 · 702ced7 · 702ced7
1 parent f4e6f3d
commit 702ced7
Show file tree

Hide file tree

Showing 25 changed files with 4,596 additions and 2,520 deletions.
diff --git a/packages/huma-shared/src/solana/ProgramHelper.ts b/packages/huma-shared/src/solana/ProgramHelper.ts
@@ -1,7 +1,7 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor'
 import { AnchorWallet } from '@solana/wallet-adapter-react'
 import { Connection } from '@solana/web3.js'
-import { HumaSolana as HumaSolanaDevnet } from '../v2/idl/devnet'
+import { Huma as HumaSolanaDevnet } from '../v2/idl/devnet'
 import HumaDevnetIDL from '../v2/idl/devnet.json'
 import { SolanaChainEnum } from '../utils'
 

diff --git a/packages/huma-shared/src/solana/TokenAccountHelper.ts b/packages/huma-shared/src/solana/TokenAccountHelper.ts
@@ -8,7 +8,13 @@ import { SolanaPoolInfo } from '../v2'
 export const getTokenAccounts = (
   poolInfo: SolanaPoolInfo,
   account: PublicKey,
-): [PublicKey, PublicKey, PublicKey] => {
+): {
+  underlyingTokenATA: PublicKey
+  seniorTrancheATA: PublicKey
+  juniorTrancheATA: PublicKey
+  poolSeniorTrancheATA: PublicKey
+  poolJuniorTrancheATA: PublicKey
+} => {
   const underlyingTokenATA = getAssociatedTokenAddressSync(
     new PublicKey(poolInfo.underlyingMint.address),
     account,
@@ -22,11 +28,29 @@ export const getTokenAccounts = (
     TOKEN_2022_PROGRAM_ID,
   )
   const seniorTrancheATA = getAssociatedTokenAddressSync(
-    new PublicKey(poolInfo.juniorTrancheMint),
+    new PublicKey(poolInfo.seniorTrancheMint),
     account,
     false,
     TOKEN_2022_PROGRAM_ID,
   )
+  const poolJuniorTrancheATA = getAssociatedTokenAddressSync(
+    new PublicKey(poolInfo.juniorTrancheMint),
+    new PublicKey(poolInfo.poolAuthority),
+    true,
+    TOKEN_2022_PROGRAM_ID,
+  )
+  const poolSeniorTrancheATA = getAssociatedTokenAddressSync(
+    new PublicKey(poolInfo.seniorTrancheMint),
+    new PublicKey(poolInfo.poolAuthority),
+    true,
+    TOKEN_2022_PROGRAM_ID,
+  )
 
-  return [underlyingTokenATA, juniorTrancheATA, seniorTrancheATA]
+  return {
+    underlyingTokenATA,
+    seniorTrancheATA,
+    juniorTrancheATA,
+    poolJuniorTrancheATA,
+    poolSeniorTrancheATA,
+  }
 }