four-flap-meme-sdk 1.2.43 → 1.2.44

package/dist/flap/portal-bundle-merkle/swap-buy-first.js

@@ -80,15 +80,6 @@ export async function flapBundleBuyFirstMerkle(params) {
         sellAmountWei,
         skipBalanceCheck: sameAddress
     });
-    const approvalTx = await buildApprovalTransaction({
-        tokenAddress,
-        provider: chainContext.provider,
-        seller,
-        decimals: sellerInfo.decimals,
-        portalAddress: chainContext.portalAddress,
-        chainId: chainContext.chainId,
-        config
-    });
     const portalBuyer = new Contract(chainContext.portalAddress, PORTAL_ABI, buyer);
     const portalSeller = new Contract(chainContext.portalAddress, PORTAL_ABI, seller);
     const buyUnsigned = await portalBuyer.swapExactInput.populateTransaction({
@@ -110,6 +101,19 @@ export async function flapBundleBuyFirstMerkle(params) {
     const gasPrice = await getOptimizedGasPrice(chainContext.provider, getGasPriceConfig(config));
     const txType = getTxType(config);
     const priorityFee = gasPrice / 10n === 0n ? 1n : gasPrice / 10n;
+    const nonceManager = new NonceManager(chainContext.provider);
+    const approvalTx = await buildApprovalTransaction({
+        tokenAddress,
+        provider: chainContext.provider,
+        seller,
+        decimals: sellerInfo.decimals,
+        portalAddress: chainContext.portalAddress,
+        chainId: chainContext.chainId,
+        config,
+        nonceManager,
+        gasPrice,
+        txType
+    });
     const profitAmount = calculateProfitAmount(estimatedSellFunds);
     await validateNativeBalances({
         sameAddress,
@@ -122,7 +126,6 @@ export async function flapBundleBuyFirstMerkle(params) {
         provider: chainContext.provider,
         nativeToken: chainContext.nativeToken
     });
-    const nonceManager = new NonceManager(chainContext.provider);
     const noncePlan = await planNonces({
         buyer,
         seller,
@@ -243,17 +246,14 @@ async function ensureSellerBalance({ tokenAddress, provider, seller, sellAmountW
     }
     return { decimals };
 }
-async function buildApprovalTransaction({ tokenAddress, provider, seller, decimals, portalAddress, chainId, config }) {
+async function buildApprovalTransaction({ tokenAddress, provider, seller, decimals, portalAddress, chainId, config, nonceManager, gasPrice, txType }) {
     const allowanceContract = new Contract(tokenAddress, ERC20_ALLOWANCE_ABI, provider);
     const currentAllowance = await allowanceContract.allowance(seller.address, portalAddress);
     const approvalThreshold = ethers.parseUnits('1000000000', decimals);
     if (currentAllowance >= approvalThreshold) {
         return null;
     }
-    const nonceManager = new NonceManager(provider);
     const approvalNonce = await nonceManager.getNextNonce(seller);
-    const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
-    const txType = getTxType(config);
     return await seller.signTransaction({
         to: tokenAddress,
         data: APPROVE_INTERFACE.encodeFunctionData('approve', [portalAddress, ethers.MaxUint256]),

package/dist/pancake/bundle-buy-first.js

@@ -73,14 +73,6 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         provider: context.provider
     });
     const decimals = await getTokenDecimals(context.provider, tokenAddress);
-    const approvalTx = await ensureSellerApproval({
-        tokenAddress,
-        seller,
-        provider: context.provider,
-        decimals,
-        chainId: context.chainId,
-        config
-    });
     const swapUnsigned = await buildRouteTransactions({
         routeParams,
         buyerFundsWei: buyerFundsInfo.buyerFundsWei,
@@ -103,12 +95,23 @@ export async function pancakeBundleBuyFirstMerkle(params) {
     const finalGasLimit = getGasLimit(config);
     const gasPrice = await getGasPrice(context.provider, config);
     const txType = config.txType ?? 0;
+    const nonceManager = new NonceManager(context.provider);
+    const approvalTx = await ensureSellerApproval({
+        tokenAddress,
+        seller,
+        provider: context.provider,
+        decimals,
+        chainId: context.chainId,
+        config,
+        nonceManager,
+        gasPrice,
+        txType
+    });
     const profitAmount = await estimateProfitAmount({
         provider: context.provider,
         tokenAddress,
         sellAmountToken: quoteResult.quotedTokenOut
     });
-    const nonceManager = new NonceManager(context.provider);
     const noncePlan = await planNonces({
         buyer,
         seller,
@@ -265,7 +268,7 @@ function calculateBuyerNeed({ quotedNative, buyerBalance, reserveGas, slippageBp
         : buyerBalance - reserveGas;
     return { buyerNeedTotal, maxBuyerValue };
 }
-async function ensureSellerApproval({ tokenAddress, seller, provider, decimals, chainId, config }) {
+async function ensureSellerApproval({ tokenAddress, seller, provider, decimals, chainId, config, nonceManager, gasPrice, txType }) {
     if (config.skipApprovalCheck) {
         return null;
     }
@@ -275,10 +278,7 @@ async function ensureSellerApproval({ tokenAddress, seller, provider, decimals,
     if (currentAllowance >= threshold) {
         return null;
     }
-    const nonceManager = new NonceManager(provider);
     const approvalNonce = await nonceManager.getNextNonce(seller);
-    const gasPrice = await getGasPrice(provider, config);
-    const txType = config.txType ?? 0;
     return await seller.signTransaction({
         to: tokenAddress,
         data: APPROVE_INTERFACE.encodeFunctionData('approve', [PANCAKE_PROXY_ADDRESS, ethers.MaxUint256]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.2.43",
+  "version": "1.2.44",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",