fix: set allowance to allowance holder

Author: JoaoCampos89

src/erc20.ts

@@ -32,7 +32,7 @@ export const prepare = async (marketConfig: MarketConfig): Promise<MarketData> =
 
     const multi = new MultiCall(signer.provider);
 
-    const [blockNumber, balancesAndAllowances] = await multi.getBalancesAndAllowances(tokens, owner, spender)
+   const [blockNumber, balancesAndAllowances] = await multi.getBalancesAndAllowances(tokens, owner, spender)
 
     const {
         balance: quoteBalance,
@@ -42,7 +42,7 @@ export const prepare = async (marketConfig: MarketConfig): Promise<MarketData> =
 
 
 
-    if (quoteAllowance.lt(MINIMUM_ALLOWANCE_THRESHOLD)) {
+   /* if (quoteAllowance.lt(MINIMUM_ALLOWANCE_THRESHOLD)) {
         const tokenContract = new ethers.Contract(quoteToken, ERC20Abi, signer);
         console.log('Preparing allowance for quote token')
         if (!IS_SIMULATION) {
@@ -51,14 +51,14 @@ export const prepare = async (marketConfig: MarketConfig): Promise<MarketData> =
             const tx = await tokenContract.approve(spender, MAX_ALLOWANCE, gasEstimation);
             await tx.wait();
         }
-    }
+    }*/
 
     const {
         balance: baseBalance,
         allowance: baseAllowance
     } = balancesAndAllowances[baseToken];
 
-    if (baseAllowance.lt(MINIMUM_ALLOWANCE_THRESHOLD)) {
+   /* if (baseAllowance.lt(MINIMUM_ALLOWANCE_THRESHOLD)) {
         const tokenContract = new ethers.Contract(baseToken, ERC20Abi, signer);
         console.log('Preparing allowance for base token')
         if (!IS_SIMULATION) {
@@ -68,9 +68,8 @@ export const prepare = async (marketConfig: MarketConfig): Promise<MarketData> =
             await tx.wait();
         }
 
-    }
+    }*/
 
-    console.log('All allowances ok we are ready for trade');
 
     return {
         ...marketConfig,
@@ -85,6 +84,16 @@ export const prepare = async (marketConfig: MarketConfig): Promise<MarketData> =
     }
 }
 
+export async function setAllowanceToAllowanceHolder({actual, spender, chainId, baseToken}: {actual: string, spender: string, chainId: number, baseToken: string}){
+    const signer = getSigner(chainId);
+    const tokenContract = new ethers.Contract(baseToken, ERC20Abi, signer);
+    if(Number(actual) === 0){
+         const gasEstimation = await getGasEstimation(chainId)
+         const tx = await tokenContract.approve(spender, MAX_ALLOWANCE, gasEstimation);
+         await tx.wait();
+    }
+}
+
 export const refetchBalances = async (marketData: MarketData): Promise<MarketData> => {
     const chainId = marketData.chainId;
     const baseToken = marketData.baseTokenBalance.token;

src/trade.ts

@@ -6,6 +6,7 @@ import { getSigner } from "./provider";
 import { MarketData } from "./types";
 import { getSwapQuote } from "./zerox_service";
 import { getGasEstimation } from "./gasEstimator";
+import { setAllowanceToAllowanceHolder } from "./erc20";
 
 
 
@@ -39,12 +40,20 @@ export const executeTrade = async (market: MarketData) => {
                         return;
                     }
                 }
+                
+                if(quote.data?.issues?.allowance){
+                    console.log('setting allowance on sell token');
+                   const {actual, spender} = quote.data.issues?.allowance;
+                   await setAllowanceToAllowanceHolder({actual, spender, chainId: market.chainId, baseToken: sellToken})
+                }
+
+
                 console.log(`doing a buy a amount of ${randomBuyAmount} base token`)
 
 
                 if (!IS_SIMULATION) {
                     const gasEstimator = await getGasEstimation(market.chainId);
-                    const { data, to, value, gas, gasPrice } = quote.data.transaction;
+                    const { data, to, value} = quote.data.transaction;
                     const tx = await signer.sendTransaction({ data, to, value, ...gasEstimator });
                     console.log(`waiting buy trade to be validated onchain: `, tx)
                     await tx.wait();
@@ -73,7 +82,7 @@ export const executeTrade = async (market: MarketData) => {
             const sellAmount = parseUnits(randomSellAmount.toFixed(6), market.quoteTokenBalance.token.decimals).toString();
             const quote = await getSwapQuote({ sellAmount, sellToken, buyToken, taker, intentOnFill: false, slippagePercentage }, market.chainId);
 
-            console.log(quote.data.gasPrice);
+    
 
             if (BigNumber.from(quote.data.sellAmount).lt(market.baseTokenBalance.balance)) {
                 //const sellAmount = market.baseTokenBalance.balance.toString();
@@ -87,12 +96,17 @@ export const executeTrade = async (market: MarketData) => {
                         return;
                     }
                 }
+               
                 console.log(`doing a sell a amount of ${randomSellAmount} base token`)
-            
+                if(quote.data?.issues?.allowance){
+                  console.log('setting allowance on sell token');
+                   const {actual, spender} = quote.data.issues?.allowance;
+                   await setAllowanceToAllowanceHolder({actual, spender, chainId: market.chainId, baseToken: sellToken})
+                }
 
                 if (!IS_SIMULATION) {
                     const gasEstimator = await getGasEstimation(market.chainId);
-                    const { data, to, value, gas, gasPrice } = quote.data.transaction;
+                    const { data, to, value  } = quote.data.transaction;
                     const tx = await signer.sendTransaction({ data, to, value, ...gasEstimator });
                     console.log(`waiting sell trade to be validated onchain:`, tx)
                     await tx.wait();