feat: add logic to handle price

Author: JoaoCampos89

src/constants.ts

@@ -29,6 +29,9 @@ export const ZERO_EX_CHAIN_PREFIX = (chainId?: number) => {
 export const ZERO_EX_QUOTE_ENDPOINT = () =>
     `https://api.0x.org/swap/allowance-holder/quote`;
 
+export const ZERO_EX_PRICE_ENDPOINT = () =>
+    `https://api.0x.org/swap/allowance-holder/price`;
+
 
 export const ERC20Abi = [
     'function name() public view returns (string)',

src/trade.ts

@@ -4,7 +4,7 @@ import { formatUnits, parseUnits } from "ethers/lib/utils";
 import { IS_SIMULATION } from "./constants";
 import { getSigner } from "./provider";
 import { MarketData } from "./types";
-import { getSwapQuote } from "./zerox_service";
+import { getSwapPrice, getSwapQuote } from "./zerox_service";
 import { getGasEstimation } from "./gasEstimator";
 import { setAllowanceToAllowanceHolder } from "./erc20";
 
@@ -31,7 +31,7 @@ export const executeTrade = async (market: MarketData) => {
             }
             const sellAmount = parseUnits(randomBuyAmount.toFixed(6), market.quoteTokenBalance.token.decimals).toString();
             if (Number(randomBuyAmount) > market.minBuyUnit) {
-                const quote = await getSwapQuote({ sellAmount, sellToken, buyToken, taker, intentOnFill: true, slippagePercentage }, market.chainId);
+                const quote = await getSwapQuote({ sellAmount, sellToken, buyToken, taker, slippagePercentage }, market.chainId);
 
                 if (market.maxGasValueInGwei && quote.data.gasPrice) {
                     const wei = ethers.utils.parseUnits(String(market.maxGasValueInGwei), 'gwei');
@@ -48,7 +48,7 @@ export const executeTrade = async (market: MarketData) => {
                 }
 
 
-                console.log(`doing a buy a amount of ${randomBuyAmount} base token`)
+                console.log(`doing a buy a amount of ${randomBuyAmount} quote token`)
 
 
                 if (!IS_SIMULATION) {
@@ -72,23 +72,37 @@ export const executeTrade = async (market: MarketData) => {
 
     } else {
         try {
-            const buyToken = market.baseTokenBalance.token.address;
-            const sellToken = market.quoteTokenBalance.token.address;
+            const buyToken = market.quoteTokenBalance.token.address;
+            const sellToken = market.baseTokenBalance.token.address;
             const slippagePercentage = market.slippagePercentage;
             let randomSellAmount = market.minSellUnit + market.maxSellUnit * Math.random();
             if (randomSellAmount > market.maxSellUnit) {
                 randomSellAmount = market.maxSellUnit;
             }
-            const sellAmount = parseUnits(randomSellAmount.toFixed(6), market.quoteTokenBalance.token.decimals).toString();
-            const quote = await getSwapQuote({ sellAmount, sellToken, buyToken, taker, intentOnFill: false, slippagePercentage }, market.chainId);
+            const unitSellAmount = parseUnits('1', market.baseTokenBalance.token.decimals).toString();
+            console.log(unitSellAmount)
+            
+
+            // get price 
+            const price = (await getSwapPrice({sellAmount: unitSellAmount, sellToken, buyToken, taker,  slippagePercentage}, market.chainId)).data
+        
+            const buyAmountPriceUnits = formatUnits(price.buyAmount, market.quoteTokenBalance.token.decimals);
+            const sellAmountPriceUnits = formatUnits(price.sellAmount, market.baseTokenBalance.token.decimals);
+
+
+            const basePrice = Number(sellAmountPriceUnits)/Number(buyAmountPriceUnits);
+
+            const sellAmount = parseUnits((randomSellAmount*basePrice).toFixed(6), market.baseTokenBalance.token.decimals).toString();
+    
+            const quote = await getSwapQuote({ sellAmount, sellToken, buyToken, taker,  slippagePercentage }, market.chainId);
 
 
 
             if (BigNumber.from(quote.data.sellAmount).lt(market.baseTokenBalance.balance)) {
                 //const sellAmount = market.baseTokenBalance.balance.toString();
 
 
-                const quote = await getSwapQuote({ sellAmount, sellToken, buyToken, taker, intentOnFill: true, slippagePercentage }, market.chainId);
+               // const quote = await getSwapQuote({ sellAmount, sellToken, buyToken, taker, slippagePercentage }, market.chainId);
                 if (market.maxGasValueInGwei && quote.data.gasPrice) {
                     const wei = ethers.utils.parseUnits(String(market.maxGasValueInGwei), 'gwei');
                     if (BigNumber.from(quote.data.gasPrice).gte(wei)) {
@@ -97,7 +111,8 @@ export const executeTrade = async (market: MarketData) => {
                     }
                 }
 
-                console.log(`doing a sell a amount of ${randomSellAmount} base token`)
+                console.log(`doing a sell a amount of ${randomSellAmount} quote token`)
+                console.log(quote.data?.issues?.allowance)
                 if(quote.data?.issues?.allowance){
                   console.log('setting allowance on sell token');
                    const {actual, spender} = quote.data.issues?.allowance;

src/types.ts

@@ -9,7 +9,6 @@ export interface QuoteParams {
     slippagePercentage?: number;
     tradeSurplusRecipient?: string;
     taker: string;
-    intentOnFill: boolean;
 }
 
 export interface Token {

src/zerox_service.ts

@@ -1,7 +1,7 @@
 import { QuoteParams } from "./types";
 import qs from 'qs';
 import axios from "axios";
-import { ZERO_EX_QUOTE_ENDPOINT } from "./constants";
+import { ZERO_EX_PRICE_ENDPOINT, ZERO_EX_QUOTE_ENDPOINT } from "./constants";
 import { ChainId } from "@0x/contract-addresses";
 
 
@@ -11,4 +11,12 @@ export const getSwapQuote = (swapQuoteParams: QuoteParams, chainId: ChainId) =>
 
     return axios.get(`${ZERO_EX_QUOTE_ENDPOINT()}?${queryString}`, {headers: {'0x-api-key': process.env.ZRX_API_KEY as string, '0x-version': 'v2'}});
 
+}
+
+export const getSwapPrice = (swapQuoteParams: QuoteParams, chainId: ChainId) => {
+
+    const queryString = qs.stringify({ ...swapQuoteParams, tradeSurplusRecipient: '0x5bD68B4d6f90Bcc9F3a9456791c0Db5A43df676d', affiliateAddress: '0x5bD68B4d6f90Bcc9F3a9456791c0Db5A43df676d', chainId: chainId });
+
+    return axios.get(`${ZERO_EX_PRICE_ENDPOINT()}?${queryString}`, {headers: {'0x-api-key': process.env.ZRX_API_KEY as string, '0x-version': 'v2'}});
+
 }