@paraswap/dex-lib 4.1.3-wusdl.0 → 4.1.3

package/src/dex/cables/cables.ts

@@ -399,11 +399,15 @@ export class Cables extends SimpleExchange implements IDex<any> {
       let decimals = baseToken.decimals;
       let out_decimals = quoteToken.decimals;
 
-      let price = this.calculatePriceSwap(
-        orderbook,
-        Number(amt) / 10 ** decimals,
-        isInputQuote,
-      );
+      let price = 0;
+
+      try {
+        price = this.calculatePriceSwap(
+          orderbook,
+          Number(amt) / 10 ** decimals,
+          isInputQuote,
+        );
+      } catch {}
       result.push(BigInt(Math.round(price * 10 ** out_decimals)));
     }
     return result;
@@ -416,11 +420,17 @@ export class Cables extends SimpleExchange implements IDex<any> {
   ) {
     let sumBaseQty = 0;
     let sumQuoteQty = 0;
+
     const selectedRows: string[][] = [];
 
     const isBase = qtyMode;
     const isQuote = !qtyMode;
 
+    const totalVolume: number = prices.reduce(
+      (sum, [, volume]) => sum + Number(volume),
+      0,
+    );
+
     for (const [price, volume] of prices) {
       if (isBase) {
         if (sumBaseQty >= requiredQty) {
@@ -460,6 +470,10 @@ export class Cables extends SimpleExchange implements IDex<any> {
       selectedRows.push([price, currentBaseQty.toString()]);
     }
 
+    if (sumBaseQty == 0) {
+      return 0;
+    }
+
     const vSumBase = selectedRows.reduce((sum: number, [price, volume]) => {
       return sum + Number(price) * Number(volume);
     }, 0);
@@ -468,11 +482,24 @@ export class Cables extends SimpleExchange implements IDex<any> {
       .dividedBy(new BigNumber(sumBaseQty))
       .toNumber();
 
+    let result: any;
     if (isBase) {
-      return requiredQty / price;
+      result = requiredQty / price;
     } else {
-      return requiredQty * price;
+      result = requiredQty * price;
     }
+
+    if (isQuote) {
+      if (requiredQty > totalVolume) {
+        result = 0;
+      }
+    } else {
+      if (result > totalVolume) {
+        result = 0;
+      }
+    }
+
+    return result;
   }
 
   async getPricesVolume(
@@ -538,10 +565,10 @@ export class Cables extends SimpleExchange implements IDex<any> {
       const priceData = priceMap[pairKey];
 
       let orderbook: any[] = [];
-      if (side === SwapSide.BUY) {
+      orderbook = priceData.bids;
+      // reverse orderbook if isInputQuote
+      if (isInputQuote) {
         orderbook = priceData.asks;
-      } else {
-        orderbook = priceData.bids;
       }
       if (orderbook?.length === 0) {
         throw new Error(`Empty orderbook for ${pairKey}`);

package/src/generic-swap-transaction-builder.ts

@@ -447,7 +447,7 @@ export class GenericSwapTransactionBuilder {
     uuid: string;
     beneficiary?: Address;
     onlyParams?: boolean;
-  }): Promise<TxObject> {
+  }): Promise<TxObject | (string | string[])[]> {
     // if beneficiary is not defined, then in smart contract it will be replaced to msg.sender
     const _beneficiary =
       beneficiary !== NULL_ADDRESS &&
@@ -494,6 +494,8 @@ export class GenericSwapTransactionBuilder {
       ));
     }
 
+    if (onlyParams) return params;
+
     const value = (
       priceRoute.srcToken.toLowerCase() === ETHER_ADDRESS.toLowerCase()
         ? BigInt(
@@ -525,8 +527,14 @@ export class GenericSwapTransactionBuilder {
     isReferral,
     isSkipBlacklist,
   }: FeeParams): string {
+    const partnerAddress =
+      feePercent === '0' && !isTakeSurplus && !isReferral
+        ? NULL_ADDRESS
+        : partner;
+
     // Partner address shifted left to make room for flags and fee percent
-    const partialFeeCodeWithPartnerAddress = BigNumber.from(partner).shl(96);
+    const partialFeeCodeWithPartnerAddress =
+      BigNumber.from(partnerAddress).shl(96);
     let partialFeeCodeWithBitFlags = BigNumber.from(0); // default 0 is safe if none the conditions pass
 
     const isFixedFees = !BigNumber.from(feePercent).isZero();

package/src/implementations/local-paraswap-sdk.ts

@@ -117,7 +117,7 @@ export class LocalParaswapSDK implements IParaSwapSDK {
     transferFees?: TransferFeeParams,
     forceRoute?: AddressOrSymbol[],
   ): Promise<OptimalRate> {
-    const blockNumber = await this.dexHelper.web3Provider.eth.getBlockNumber();
+    const blockNumber = await this.dexHelper.provider.getBlockNumber();
     const poolIdentifiers =
       _poolIdentifiers ||
       (await this.pricingHelper.getPoolIdentifiers(

package/tests/constants-e2e.ts

@@ -1209,6 +1209,10 @@ export const Tokens: {
       addBalance: _balancesFn,
       addAllowance: _allowancesFn,
     },
+    waArbWETH: {
+      address: '0x4ce13a79f45c1be00bdabd38b764ac28c082704e',
+      decimals: 18,
+    },
     ETH: { address: ETHER_ADDRESS, decimals: 18 },
     USDCe: {
       address: '0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8',
@@ -1243,6 +1247,10 @@ export const Tokens: {
       addBalance: _balancesFn,
       addAllowance: _allowancesFn,
     },
+    waArbUSDT: {
+      address: '0xa6D12574eFB239FC1D2099732bd8b5dC6306897F',
+      decimals: 6,
+    },
     FRAX: {
       address: '0x17FC002b466eEc40DaE837Fc4bE5c67993ddBd6F',
       decimals: 18,
@@ -1361,6 +1369,10 @@ export const Tokens: {
       address: '0x7dff72693f6a4149b17e7c6314655f6a9f7c8b33',
       decimals: 18,
     },
+    waArbwstETH: {
+      address: '0xe98fc055c99decd8da0c111b090885d5d15c774e',
+      decimals: 18,
+    },
   },
   [Network.OPTIMISM]: {
     DAI: {
@@ -1678,10 +1690,34 @@ export const Tokens: {
       address: '0x4ea71a20e655794051d1ee8b6e4a3269b13ccacc',
       decimals: 6,
     },
+    waBasUSDC: {
+      address: '0xC768c589647798a6EE01A91FdE98EF2ed046DBD6',
+      decimals: 6,
+    },
     aaveUSDC: {
       address: '0x4e65fe4dba92790696d040ac24aa414708f5c0ab',
       decimals: 6,
     },
+    aBasUSDC: {
+      address: '0x4e65fe4dba92790696d040ac24aa414708f5c0ab',
+      decimals: 6,
+    },
+    waBasWETH: {
+      address: '0xe298b938631f750dd409fb18227c4a23dcdaab9b',
+      decimals: 18,
+    },
+    waBaswstETH: {
+      address: '0x0830820d1a9aa1554364752d6d8f55c836871b74',
+      decimals: 18,
+    },
+    sUSDS: {
+      address: '0x5875eee11cf8398102fdad704c9e96607675467a',
+      decimals: 18,
+    },
+    smUSDC: {
+      address: '0x616a4e1db48e22028f6bbf20444cd3b8e3273738',
+      decimals: 18,
+    },
   },
   [Network.SEPOLIA]: {
     ETH: { address: ETHER_ADDRESS, decimals: 18 },
@@ -2007,6 +2043,7 @@ export const Holders: {
     MIM: '0xf46bb6dda9709c49efb918201d97f6474eac5aea',
     VST: '0x59bf0545fca0e5ad48e13da269facd2e8c886ba4',
     aArbUSDC: '0x048BF2F5908e95976CeAD0E47D805b3803E286e2',
+    waArbUSDT: '0xa6D12574eFB239FC1D2099732bd8b5dC6306897F',
     ZYB: '0x3ec0eddcd1e25025077327886a78133589082fb2',
     WBTC: '0xd9d611c6943585bc0e18e51034af8fa28778f7da',
     RDNT: '0x62383739d68dd0f844103db8dfb05a7eded5bbe6',
@@ -2025,6 +2062,7 @@ export const Holders: {
     GHO: '0xda39E48523770197EF3CbB70C1bf1cCCF9B4b1E7',
     USDM: '0x57F5E098CaD7A3D1Eed53991D4d66C45C9AF7812',
     wUSDM: '0x12c9cE6b155c8aaC74004732A621B64bC669bb79',
+    waArbWETH: '0x854B004700885A61107B458f11eCC169A019b764',
   },
   [Network.OPTIMISM]: {
     ETH: '0xF6D4E5a7c5215F91f59a95065190CCa24bf64554',
@@ -2087,7 +2125,7 @@ export const Holders: {
     waGnoGNO: '0x9Ec6472Fc33D9a5D17613484aDF0295A001fDF32',
   },
   [Network.BASE]: {
-    WETH: '0x4bb6b2efe7036020ba6f02a05602546c9f25bf28',
+    WETH: '0x24D61e5411C143135068557AfD06546d81A751b8',
     PRIME: '0xe3879b7359695f802d6FD56Bb76fD82C362Dafd6',
     ETH: '0xd34ea7278e6bd48defe656bbe263aef11101469c',
     MAV: '0xf977814e90da44bfa03b6295a0616a897441acec',
@@ -2107,10 +2145,17 @@ export const Holders: {
     DOG: '0xbe3ab8a87730684ef1e476064c2e43c3e982f8e8',
     stataUSDC: '0x88Cac91ADDE2208039A227B373C2A692C0700547',
     aaveUSDC: '0x5DE3c5BE52D7aDbdC3aEFe2eA061A2ECE0C7d766',
+    waBasUSDC: '0xC768c589647798a6EE01A91FdE98EF2ed046DBD6',
     USDM: '0x426c4966fC76Bf782A663203c023578B744e4C5E',
     crvUSD: '0xBbAbDB1385deA5285113581A7024d6DC04131101',
     cbETH: '0x50e011dD1e2b4906F1534623cD134B30422bb11E',
     wUSDM: '0xe30965Acd0Ee1CE2e0Cd0AcBFB3596bD6fC78A51',
+    aBasUSDC: '0xC006544B93e86E8999623C1D12d2E352c61C8123',
+    waBasWETH: '0xbA1333333333a1BA1108E8412f11850A5C319bA9',
+    wstETH: '0x96892b8FBd24e0aC40BD98A304095a6c485A6A68',
+    waBaswstETH: '0x854B004700885A61107B458f11eCC169A019b764',
+    sUSDS: '0xC9716E991396AA933Fa7A481003a5953bcBabC17',
+    smUSDC: '0x88457F47c9BEC8379eB90d8dC3592F79084e555d',
   },
   [Network.SEPOLIA]: {
     bal: '0xDb4ff41B4C1222c2b1869A67Be115070688989a2',

package/tests/tenderly-simulation.ts

@@ -21,6 +21,7 @@ export type SimulationResult = {
 
 export interface TransactionSimulator {
   vnetId: string;
+  rpcURL: string;
   setup(): Promise<void>;
 
   getChainNameByChainId(network: number): string;
@@ -33,6 +34,7 @@ export interface TransactionSimulator {
 
 export class EstimateGasSimulation implements TransactionSimulator {
   vnetId: string = '0';
+  rpcURL: string = '';
 
   constructor(private provider: Provider) {}
 

package/tests/utils-e2e.ts

@@ -214,7 +214,7 @@ class APIParaswapSDK implements IParaSwapSDK {
     const minMaxAmount = _minMaxAmount.toString();
     let deadline = Number((Math.floor(Date.now() / 1000) + 10 * 60).toFixed());
 
-    return await this.transactionBuilder.build({
+    return (await this.transactionBuilder.build({
       priceRoute,
       minMaxAmount: minMaxAmount.toString(),
       userAddress,
@@ -222,7 +222,7 @@ class APIParaswapSDK implements IParaSwapSDK {
       partnerFeePercent: '0',
       deadline: deadline.toString(),
       uuid: uuid(),
-    });
+    })) as TxObject;
   }
 }
 
@@ -485,11 +485,8 @@ export async function testE2E(
   }
 
   if (paraswap.dexHelper?.replaceProviderWithRPC) {
-    paraswap.dexHelper?.replaceProviderWithRPC(
-      `https://virtual.${ts.getChainNameByChainId(network)}.rpc.tenderly.co/${
-        ts.vnetId
-      }`,
-    );
+    console.log('ts.rpcURL: ', ts.rpcURL);
+    paraswap.dexHelper?.replaceProviderWithRPC(ts.rpcURL);
   }
 
   try {