feat: error pool creation using WBBA

Author: fiqriBTI

src/features/liquidityPool/services.ts

@@ -7,7 +7,8 @@ import {
 	createInitializeMintInstruction,
 	getMint,
 	NATIVE_MINT,
-	createSyncNativeInstruction
+	createSyncNativeInstruction,
+	createApproveInstruction
 } from '@bbachain/spl-token'
 import {
 	CurveType,
@@ -735,12 +736,19 @@ export const useCreatePool = () => {
 						console.log('💰 BBA/Token pool (BBA as base)')
 
 						// Check BBA balance (native daltons)
-						const userBBABalance = await connection.getBalance(ownerAddress)
-						const requiredBBA = bbaTodaltons(liquidityBaseAmount)
+						const userWBBATokenAccount = await getAssociatedTokenAddress(NATIVE_MINT, ownerAddress)
+						console.log('ini lewat bang')
+						const userWBBAInfo = await connection.getAccountInfo(userWBBATokenAccount)
+						if (!userWBBAInfo) {
+							throw new Error(
+								'WBBA token account not found. Please ensure you have the required tokens.'
+							)
+						}
 
-						if (userBBABalance < requiredBBA) {
+						const userWBBABalance = new BN(userWBBAInfo.data.slice(64, 72), 'le')
+						if (userWBBABalance.lt(new BN(baseAmountDaltons))) {
 							throw new Error(
-								`Insufficient BBA balance. Required: ${liquidityBaseAmount} BBA, Available: ${daltonsToBBA(userBBABalance)} BBA`
+								`Insufficient ${payload.baseToken.symbol} balance. Required: ${liquidityBaseAmount}, Available: ${userWBBABalance.div(new BN(1000000)).toString()}`
 							)
 						}
 
@@ -761,28 +769,34 @@ export const useCreatePool = () => {
 							)
 						}
 
-						// Transfer BBA to pool (using special BBA handling)
-						console.log('🔄 Transferring BBA to pool account...')
-						const transferBBAIx = SystemProgram.transfer({
-							fromPubkey: ownerAddress,
-							toPubkey: swapTokenAAccount,
-							daltons: requiredBBA
-						})
-
-						const { createSyncNativeInstruction } = await import('@bbachain/spl-token')
-						const syncBBAIx = createSyncNativeInstruction(swapTokenAAccount)
-
 						// Transfer quote token (standard SPL transfer)
 						const { createTransferInstruction } = await import('@bbachain/spl-token')
+
+						const transferBBAIx = createTransferInstruction(
+							userWBBATokenAccount,
+							swapTokenAAccount,
+							ownerAddress,
+							baseAmountDaltons
+						)
+
 						const transferQuoteIx = createTransferInstruction(
 							userQuoteTokenAccount,
 							swapTokenBAccount,
 							ownerAddress,
 							quoteAmountDaltons
 						)
 
+						console.log('re-check', {
+							swapTokenA: swapTokenAAccount.toBase58(),
+							wbbaTokenAccount: userWBBATokenAccount.toBase58(),
+							wbbaDaltons: baseAmountDaltons,
+							wbbaAmount: baseAmount
+						})
+
 						// Combine all transfers
-						const liquidityTx = new Transaction().add(transferBBAIx, syncBBAIx, transferQuoteIx)
+						const liquidityTx = new Transaction().add(transferBBAIx, transferQuoteIx)
+
+						console.log('this causes error')
 						const liquiditySig = await sendTransactionWithRetry(
 							liquidityTx,
 							connection,

src/features/swap/services.ts

@@ -1,46 +1,25 @@
 import * as BufferLayout from '@bbachain/buffer-layout'
 import {
 	getAssociatedTokenAddress,
-	createAssociatedTokenAccountInstruction,
 	TOKEN_PROGRAM_ID,
 	NATIVE_MINT,
-	createApproveInstruction,
-	createSyncNativeInstruction,
-	createCloseAccountInstruction,
-	ASSOCIATED_TOKEN_PROGRAM_ID
+	createApproveInstruction
 } from '@bbachain/spl-token'
 import {
 	createSwapInstruction,
 	PROGRAM_ID as TOKEN_SWAP_PROGRAM_ID
 } from '@bbachain/spl-token-swap'
 import { useConnection, useWallet } from '@bbachain/wallet-adapter-react'
-import {
-	PublicKey,
-	Transaction,
-	SystemProgram,
-	Keypair,
-	TransactionInstruction
-} from '@bbachain/web3.js'
+import { PublicKey, Transaction, TransactionInstruction } from '@bbachain/web3.js'
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
 import axios from 'axios'
 
 import { TGetTokensResponse } from '@/app/api/tokens/route'
 import ENDPOINTS from '@/constants/endpoint'
 import SERVICES_KEY from '@/constants/service'
-import {
-	wrapBBAtoWBBA,
-	unwrapWBBAtoBBA,
-	createTokenAccountManual,
-	bbaTodaltons,
-	daltonsToBBA
-} from '@/lib/bbaWrapping'
+import { bbaTodaltons } from '@/lib/bbaWrapping'
 import { getTokenAccounts2 } from '@/lib/tokenAccount'
-import {
-	isNativeBBA,
-	getWBBAMintAddress,
-	isBBAPool,
-	getBBAPositionInPool
-} from '@/staticData/tokens'
+import { isNativeBBA } from '@/staticData/tokens'
 
 import { getAllPoolsFromOnchain, OnchainPoolData } from '../liquidityPool/onchain'
 import { TGetTokenDataResponse, TGetTokenResponse } from '../tokens/types'