@ape.swap/bonds-sdk 5.0.7 → 5.1.0-test.0

package/dist/main.js

@@ -11,7 +11,7 @@ import { getStructDecoder, fixDecoderSize, getU32Decoder, getU8Decoder, getU64De
 import { useWallet } from '@solana/wallet-adapter-react';
 import { useWalletModal } from '@solana/wallet-adapter-react-ui';
 import { ConnectButton as ConnectButton$1 } from '@rainbow-me/rainbowkit';
-import { getAssociatedTokenAddress, getAccount, createAssociatedTokenAccountInstruction, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddress, getAccount, createAssociatedTokenAccountInstruction, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { LiFiWidget } from '@lifi/widget';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -46817,7 +46817,7 @@ const PUBLIC_RPC_URLS = {
     [main.ChainId.BSC_TESTNET]: ['https://data-seed-prebsc-2-s3.binance.org:8545/'],
     [main.ChainId.MATIC]: [
         'https://polygon.drpc.org',
-        'https://polygon-rpc.com/',
+        'https://polygon-rpc.com/', // this is now freemium
         'https://polygon-mainnet.public.blastapi.io/',
         'https://rpc-mainnet.matic.network',
         'https://matic-mainnet.chainstacklabs.com',
@@ -59423,18 +59423,38 @@ const Actions = ({ userBill }) => {
                     : null, disabled: !canPurchaseAgain, children: canPurchaseAgain ? 'Buy again' : 'sold out' })] }));
 };
 
+/**
+ * Detects which token program owns a mint (SPL Token or Token-2022)
+ * @param connection - Solana connection
+ * @param mint - The mint public key to check
+ * @returns The token program ID (TOKEN_PROGRAM_ID or TOKEN_2022_PROGRAM_ID)
+ */
+const getTokenProgramForMint = async (connection, mint) => {
+    const accountInfo = await connection.getAccountInfo(mint);
+    if (!accountInfo) {
+        throw new Error(`Mint account not found: ${mint.toBase58()}`);
+    }
+    if (accountInfo.owner.equals(TOKEN_2022_PROGRAM_ID)) {
+        return TOKEN_2022_PROGRAM_ID;
+    }
+    return TOKEN_PROGRAM_ID;
+};
 /**
  * Checks if an Associated Token Account exists and returns creation instruction if needed
+ * Now supports both SPL Token and Token-2022 by detecting the correct token program
  * @returns Object with ATA address and optional creation instruction
  */
 const getAtaWithCreateInstruction = async (connection, mint, owner, payer = owner) => {
-    const ataAddress = await getAssociatedTokenAddress(mint, owner);
+    // Detect which token program owns this mint
+    const tokenProgram = await getTokenProgramForMint(connection, mint);
+    // Get ATA with the correct token program
+    const ataAddress = await getAssociatedTokenAddress(mint, owner, true, tokenProgram);
     try {
-        await getAccount(connection, ataAddress);
+        await getAccount(connection, ataAddress, undefined, tokenProgram);
         return { address: ataAddress, createInstruction: null };
     }
     catch (_a) {
-        const createInstruction = createAssociatedTokenAccountInstruction(payer, ataAddress, owner, mint);
+        const createInstruction = createAssociatedTokenAccountInstruction(payer, ataAddress, owner, mint, tokenProgram);
         return { address: ataAddress, createInstruction };
     }
 };
@@ -59478,6 +59498,8 @@ const ActionsSolana = ({ userBill }) => {
             const bondIssuancePda = new PublicKey(contractAddress);
             const bondPricingPda = derivePda('bond_pricing', bondIssuancePda, PROGRAM_ID);
             const nftMint = new PublicKey(userBill.asset);
+            // Detect token program for payout mint (supports Token-2022)
+            const payoutTokenProgram = await getTokenProgramForMint(connection, payoutMint);
             const [bondTermPda] = PublicKey.findProgramAddressSync([new TextEncoder().encode('bond_term'), bondIssuancePda.toBuffer()], PROGRAM_ID);
             const [bondPda] = PublicKey.findProgramAddressSync([new TextEncoder().encode('bond'), bondIssuancePda.toBuffer(), nftMint.toBuffer()], PROGRAM_ID);
             // Get user payout ATA and creation instruction if needed
@@ -59494,7 +59516,8 @@ const ActionsSolana = ({ userBill }) => {
                 { pubkey: nftMint, isSigner: false, isWritable: true },
                 { pubkey: userPayoutAta, isSigner: false, isWritable: true },
                 { pubkey: treasuryAta, isSigner: false, isWritable: true },
-                { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+                { pubkey: payoutMint, isSigner: false, isWritable: false }, // payout_mint
+                { pubkey: payoutTokenProgram, isSigner: false, isWritable: false }, // token_program (dynamic)
                 { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
                 { pubkey: new PublicKey('CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d'), isSigner: false, isWritable: false }, // mplCoreProgram
                 { pubkey: PROGRAM_ID, isSigner: false, isWritable: false }, // passing programId is the same as passing null
@@ -59901,6 +59924,8 @@ const UserBondRowSolana = ({ bill }) => {
             const bondIssuancePda = new PublicKey(contractAddress);
             const bondPricingPda = derivePda('bond_pricing', bondIssuancePda, PROGRAM_ID);
             const nftMint = new PublicKey(bill.asset);
+            // Detect token program for payout mint (supports Token-2022)
+            const payoutTokenProgram = await getTokenProgramForMint(connection, payoutMint);
             const [bondTermPda] = PublicKey.findProgramAddressSync([new TextEncoder().encode('bond_term'), bondIssuancePda.toBuffer()], PROGRAM_ID);
             const [bondPda] = PublicKey.findProgramAddressSync([new TextEncoder().encode('bond'), bondIssuancePda.toBuffer(), nftMint.toBuffer()], PROGRAM_ID);
             // Get user payout ATA and creation instruction if needed
@@ -59917,7 +59942,8 @@ const UserBondRowSolana = ({ bill }) => {
                 { pubkey: nftMint, isSigner: false, isWritable: true },
                 { pubkey: userPayoutAta, isSigner: false, isWritable: true },
                 { pubkey: treasuryAta, isSigner: false, isWritable: true },
-                { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+                { pubkey: payoutMint, isSigner: false, isWritable: false }, // payout_mint
+                { pubkey: payoutTokenProgram, isSigner: false, isWritable: false }, // token_program (dynamic)
                 { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
                 { pubkey: new PublicKey('CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d'), isSigner: false, isWritable: false }, // mplCoreProgram
                 { pubkey: PROGRAM_ID, isSigner: false, isWritable: false }, // passing programId is the same as passing null
@@ -62535,10 +62561,12 @@ const getTokenBalanceSolana = async (currency, account) => {
         }
         else {
             const mint = new PublicKey((_a = currency === null || currency === void 0 ? void 0 : currency.address) === null || _a === void 0 ? void 0 : _a[main.ChainId.SOL]);
-            const ata = await getAssociatedTokenAddress(mint, userPubkey);
+            // Detect token program to get correct ATA (supports Token-2022)
+            const tokenProgram = await getTokenProgramForMint(connection, mint);
+            const ata = await getAssociatedTokenAddress(mint, userPubkey, true, tokenProgram);
             if (!ata)
                 return '0';
-            const tokenAccount = await getAccount(connection, ata);
+            const tokenAccount = await getAccount(connection, ata, undefined, tokenProgram);
             const amount = new BigNumber$1(tokenAccount.amount.toString()).dividedBy(new BigNumber$1(10).pow((_b = currency === null || currency === void 0 ? void 0 : currency.decimals) === null || _b === void 0 ? void 0 : _b[main.ChainId.SOL]));
             return amount.toString();
         }
@@ -66189,6 +66217,11 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
             const principalMint = new PublicKey(bondData.lpToken.address[bondData.chainId]);
             const payoutMint = new PublicKey(bondData.earnToken.address[bondData.chainId]);
             const collection = new PublicKey(bondData.billNnftAddress[bondData.chainId]);
+            // Detect token programs for both mints (supports Token-2022)
+            const [principalTokenProgram, payoutTokenProgram] = await Promise.all([
+                getTokenProgramForMint(connection, principalMint),
+                getTokenProgramForMint(connection, payoutMint),
+            ]);
             // Fetch Bond Issuance Account
             const bondIssuanceAccounts = (await getBondIssuanceAccountSolana([
                 bondIssuancePda.toBase58(),
@@ -66205,11 +66238,11 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
             // Create NFT mint
             const nftMint = Keypair.generate();
             const [bondPda] = PublicKey.findProgramAddressSync([buffer.Buffer.from('bond'), bondIssuancePda.toBuffer(), nftMint.publicKey.toBuffer()], PROGRAM_ID);
-            // ATAs
-            const userPrincipalAta = await getAssociatedTokenAddress(principalMint, user);
-            const treasuryAta = await getAssociatedTokenAddress(payoutMint, bondIssuancePda, true);
-            const feePrincipalRecipientAta = await getAssociatedTokenAddress(principalMint, feeRecipient, true);
-            const partnerPrincipalRecipientAta = await getAssociatedTokenAddress(principalMint, partnerRecipient, true);
+            // ATAs - use correct token program for each mint
+            const userPrincipalAta = await getAssociatedTokenAddress(principalMint, user, true, principalTokenProgram);
+            const treasuryAta = await getAssociatedTokenAddress(payoutMint, bondIssuancePda, true, payoutTokenProgram);
+            const feePrincipalRecipientAta = await getAssociatedTokenAddress(principalMint, feeRecipient, true, principalTokenProgram);
+            const partnerPrincipalRecipientAta = await getAssociatedTokenAddress(principalMint, partnerRecipient, true, principalTokenProgram);
             const [feePayoutRecipientAta] = PublicKey.findProgramAddressSync([feePayoutRecipient.toBuffer(), FEE_PAYOUT_CONST_SEED, payoutMint.toBuffer()], FEE_PAYOUT_PDA_PROGRAM);
             // Encode args
             const u64Codec = getU64Codec();
@@ -66230,8 +66263,11 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
                 { pubkey: partnerPrincipalRecipientAta, isSigner: false, isWritable: true },
                 { pubkey: feePayoutRecipientAta, isSigner: false, isWritable: true },
                 { pubkey: treasuryAta, isSigner: false, isWritable: true },
+                { pubkey: principalMint, isSigner: false, isWritable: false },
+                { pubkey: payoutMint, isSigner: false, isWritable: false },
                 { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
-                { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+                { pubkey: principalTokenProgram, isSigner: false, isWritable: false }, // principal_token_program (dynamic)
+                { pubkey: payoutTokenProgram, isSigner: false, isWritable: false }, // payout_token_program (dynamic)
                 { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
                 { pubkey: MPL_CORE_PROGRAM_ID, isSigner: false, isWritable: false },
                 { pubkey: SYSVAR_INSTRUCTIONS_PUBKEY, isSigner: false, isWritable: false },
@@ -66328,11 +66364,11 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
         });
     };
     // Helper: Ensure user's principal token account exists
-    const ensureUserPrincipalAtaExists = async (connection, payer, principalMint, user) => {
-        const userPrincipalAta = await getAssociatedTokenAddress(principalMint, user);
+    const ensureUserPrincipalAtaExists = async (connection, payer, principalMint, user, tokenProgram) => {
+        const userPrincipalAta = await getAssociatedTokenAddress(principalMint, user, true, tokenProgram);
         try {
             // Check if account exists
-            await getAccount(connection, userPrincipalAta);
+            await getAccount(connection, userPrincipalAta, undefined, tokenProgram);
             return { ataAddress: userPrincipalAta, createInstruction: null };
         }
         catch (_a) {
@@ -66340,7 +66376,8 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
             const createAtaIx = createAssociatedTokenAccountInstruction(payer, // fee payer
             userPrincipalAta, // ATA to create
             user, // owner of ATA
-            principalMint);
+            principalMint, // mint
+            tokenProgram);
             return { ataAddress: userPrincipalAta, createInstruction: createAtaIx };
         }
     };
@@ -66402,6 +66439,11 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
             const principalMint = new PublicKey(bondData.lpToken.address[bondData.chainId]);
             const payoutMint = new PublicKey(bondData.earnToken.address[bondData.chainId]);
             const collection = new PublicKey(bondData.billNnftAddress[bondData.chainId]);
+            // Detect token programs for both mints (supports Token-2022)
+            const [principalTokenProgram, payoutTokenProgram] = await Promise.all([
+                getTokenProgramForMint(connection, principalMint),
+                getTokenProgramForMint(connection, payoutMint),
+            ]);
             const bondIssuanceAccounts = (await getBondIssuanceAccountSolana([
                 bondIssuancePda.toBase58(),
             ]));
@@ -66416,10 +66458,10 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
             const nftMint = Keypair.generate();
             const [bondPda] = PublicKey.findProgramAddressSync([buffer.Buffer.from('bond'), bondIssuancePda.toBuffer(), nftMint.publicKey.toBuffer()], PROGRAM_ID);
             // Ensure user's USDC account exists, get creation instruction if needed
-            const { ataAddress: userPrincipalAta, createInstruction: createPrincipalAtaIx } = await ensureUserPrincipalAtaExists(connection, accountSolana, principalMint, accountSolana);
-            const treasuryAta = await getAssociatedTokenAddress(payoutMint, bondIssuancePda, true);
-            const feePrincipalRecipientAta = await getAssociatedTokenAddress(principalMint, feeRecipient, true);
-            const partnerPrincipalRecipientAta = await getAssociatedTokenAddress(principalMint, partnerRecipient, true);
+            const { ataAddress: userPrincipalAta, createInstruction: createPrincipalAtaIx } = await ensureUserPrincipalAtaExists(connection, accountSolana, principalMint, accountSolana, principalTokenProgram);
+            const treasuryAta = await getAssociatedTokenAddress(payoutMint, bondIssuancePda, true, payoutTokenProgram);
+            const feePrincipalRecipientAta = await getAssociatedTokenAddress(principalMint, feeRecipient, true, principalTokenProgram);
+            const partnerPrincipalRecipientAta = await getAssociatedTokenAddress(principalMint, partnerRecipient, true, principalTokenProgram);
             const [feePayoutRecipientAta] = PublicKey.findProgramAddressSync([feePayoutRecipient.toBuffer(), FEE_PAYOUT_CONST_SEED, payoutMint.toBuffer()], FEE_PAYOUT_PDA_PROGRAM);
             const u64Codec = getU64Codec();
             const maxPriceEncoded = buffer.Buffer.from(u64Codec.encode(BigInt(maxPrice)));
@@ -66436,8 +66478,11 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
                 { pubkey: partnerPrincipalRecipientAta, isSigner: false, isWritable: true },
                 { pubkey: feePayoutRecipientAta, isSigner: false, isWritable: true },
                 { pubkey: treasuryAta, isSigner: false, isWritable: true },
+                { pubkey: principalMint, isSigner: false, isWritable: false },
+                { pubkey: payoutMint, isSigner: false, isWritable: false },
                 { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
-                { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+                { pubkey: principalTokenProgram, isSigner: false, isWritable: false }, // principal_token_program (dynamic)
+                { pubkey: payoutTokenProgram, isSigner: false, isWritable: false }, // payout_token_program (dynamic)
                 { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
                 { pubkey: MPL_CORE_PROGRAM_ID, isSigner: false, isWritable: false },
                 { pubkey: SYSVAR_INSTRUCTIONS_PUBKEY, isSigner: false, isWritable: false },
@@ -66468,8 +66513,8 @@ const BuyComponentSolana = ({ onDismiss, bondAddress, bondChain, isProjectView,
                 console.log(`  Setup ${i}: ${ix.accounts.length} accounts`);
                 totalAccounts += ix.accounts.length;
             });
-            console.log('Bond instruction accounts:', 17);
-            console.log('Total accounts:', totalAccounts + 17);
+            console.log('Bond instruction accounts:', 20);
+            console.log('Total accounts:', totalAccounts + 20);
             console.log('=== END ANALYSIS ===');
             // STEP 3: TRY SINGLE TRANSACTION (if direct route)
             if (isDirectRoute) {

package/dist/utils/solanaAtaHelper.d.ts

@@ -1,6 +1,14 @@
 import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
+/**
+ * Detects which token program owns a mint (SPL Token or Token-2022)
+ * @param connection - Solana connection
+ * @param mint - The mint public key to check
+ * @returns The token program ID (TOKEN_PROGRAM_ID or TOKEN_2022_PROGRAM_ID)
+ */
+export declare const getTokenProgramForMint: (connection: Connection, mint: PublicKey) => Promise<PublicKey>;
 /**
  * Checks if an Associated Token Account exists and returns creation instruction if needed
+ * Now supports both SPL Token and Token-2022 by detecting the correct token program
  * @returns Object with ATA address and optional creation instruction
  */
 export declare const getAtaWithCreateInstruction: (connection: Connection, mint: PublicKey, owner: PublicKey, payer?: PublicKey) => Promise<{

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ape Bond SDK",
   "author": "Ape Bond",
   "license": "MIT",
-  "version": "5.0.7",
+  "version": "5.1.0-test.0",
   "module": "dist/main.js",
   "type": "module",
   "types": "dist/main.d.ts",
@@ -62,7 +62,7 @@
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.7.0",
-    "axios": "1.13.2",
+    "axios": "1.13.5",
     "eslint": "^9.28.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",