@paraswap/dex-lib 4.3.8 → 4.3.9-ethers-v6.0

package/build/dex/algebra/utils.js

@@ -7,10 +7,11 @@ exports.decodeTicksV1_1 = decodeTicksV1_1;
 const ethers_1 = require("ethers");
 const ts_essentials_1 = require("ts-essentials");
 const decoders_1 = require("../../lib/decoders");
+const bignumber_1 = require("@ethersproject/bignumber");
 function decodeStateMultiCallResultWithRelativeBitmapsV1_1(result) {
     const [isSuccess, toDecode] = (0, decoders_1.extractSuccessAndValue)(result);
     (0, ts_essentials_1.assert)(isSuccess && toDecode !== '0x', `decodeStateMultiCallResultWithRelativeBitmaps failed to get decodable result: ${result}`);
-    const decoded = ethers_1.ethers.utils.defaultAbiCoder.decode([
+    const decoded = ethers_1.ethers.AbiCoder.defaultAbiCoder().decode([
         // I don't want to pass here any interface, so I just use it in ethers format
         `
         tuple(
@@ -62,7 +63,7 @@ function decodeStateMultiCallResultWithRelativeBitmapsV1_1(result) {
 function decodeStateMultiCallResultWithRelativeBitmapsV1_9(result) {
     const [isSuccess, toDecode] = (0, decoders_1.extractSuccessAndValue)(result);
     (0, ts_essentials_1.assert)(isSuccess && toDecode !== '0x', `decodeStateMultiCallResultWithRelativeBitmaps failed to get decodable result: ${result}`);
-    const decoded = ethers_1.ethers.utils.defaultAbiCoder.decode([
+    const decoded = ethers_1.ethers.AbiCoder.defaultAbiCoder().decode([
         // I don't want to pass here any interface, so I just use it in ethers format
         `
         tuple(
@@ -116,7 +117,7 @@ function decodeGlobalStateV1_1(result) {
     const [isSuccess, toDecode] = (0, decoders_1.extractSuccessAndValue)(result);
     (0, ts_essentials_1.assert)(isSuccess && toDecode !== '0x', `decodeGlobalStateV1_1 failed to get decodable result: ${result}`);
     const results = {
-        price: ethers_1.BigNumber.from(0),
+        price: bignumber_1.BigNumber.from(0),
         tick: 0,
         fee: 0,
         communityFeeToken0: 0,
@@ -129,7 +130,7 @@ function decodeGlobalStateV1_1(result) {
         ,
         results.communityFeeToken0,
         results.communityFeeToken1,
-    ] = ethers_1.ethers.utils.defaultAbiCoder.decode([`uint160`, `int24`, `uint16`, `uint16`, `uint8`, `uint8`, `bool`], toDecode);
+    ] = ethers_1.ethers.AbiCoder.defaultAbiCoder().decode([`uint160`, `int24`, `uint16`, `uint16`, `uint8`, `uint8`, `bool`], toDecode);
     // This conversion is not precise, because when we decode, we have more values
     // But used later
     return results;
@@ -138,11 +139,11 @@ function decodeTicksV1_1(result) {
     const [isSuccess, toDecode] = (0, decoders_1.extractSuccessAndValue)(result);
     (0, ts_essentials_1.assert)(isSuccess && toDecode !== '0x', `decodeGlobalStateV1_1 failed to get decodable result: ${result}`);
     const results = {
-        liquidityNet: ethers_1.BigNumber.from(0),
-        liquidityGross: ethers_1.BigNumber.from(0),
+        liquidityNet: bignumber_1.BigNumber.from(0),
+        liquidityGross: bignumber_1.BigNumber.from(0),
         secondsOutside: 0,
-        secondsPerLiquidityOutsideX128: ethers_1.BigNumber.from(0),
-        tickCumulativeOutside: ethers_1.BigNumber.from(0),
+        secondsPerLiquidityOutsideX128: bignumber_1.BigNumber.from(0),
+        tickCumulativeOutside: bignumber_1.BigNumber.from(0),
         initialized: false,
     };
     [
@@ -154,7 +155,7 @@ function decodeTicksV1_1(result) {
         results.secondsPerLiquidityOutsideX128,
         results.secondsOutside,
         results.initialized,
-    ] = ethers_1.ethers.utils.defaultAbiCoder.decode([
+    ] = ethers_1.ethers.AbiCoder.defaultAbiCoder().decode([
         `uint128`,
         `int128`,
         `uint256`,

package/build/dex/algebra/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dex/algebra/utils.ts"],"names":[],"mappings":";;AAWA,8GA6DC;AAED,8GA8DC;AAED,sDAgCC;AAED,0CA4CC;AAxND,mCAAsD;AACtD,iDAAuC;AACvC,iDAA4D;AAS5D,SAAgB,iDAAiD,CAC/D,MAA0C;IAE1C,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,iCAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAA,sBAAM,EACJ,SAAS,IAAI,QAAQ,KAAK,IAAI,EAC9B,iFAAiF,MAAM,EAAE,CAC1F,CAAC;IAEF,MAAM,OAAO,GAAG,eAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CACjD;QACE,6EAA6E;QAC7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyCC;KACF,EACD,QAAQ,CACT,CAAC,CAAC,CAAC,CAAC;IACL,8EAA8E;IAC9E,gDAAgD;IAChD,OAAO,OAA6D,CAAC;AACvE,CAAC;AAED,SAAgB,iDAAiD,CAC/D,MAA0C;IAE1C,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,iCAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAA,sBAAM,EACJ,SAAS,IAAI,QAAQ,KAAK,IAAI,EAC9B,iFAAiF,MAAM,EAAE,CAC1F,CAAC;IAEF,MAAM,OAAO,GAAG,eAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CACjD;QACE,6EAA6E;QAC7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA0CC;KACF,EACD,QAAQ,CACT,CAAC,CAAC,CAAC,CAAC;IACL,8EAA8E;IAC9E,gDAAgD;IAChD,OAAO,OAA6D,CAAC;AACvE,CAAC;AAED,SAAgB,qBAAqB,CACnC,MAA0C;IAE1C,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,iCAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAA,sBAAM,EACJ,SAAS,IAAI,QAAQ,KAAK,IAAI,EAC9B,yDAAyD,MAAM,EAAE,CAClE,CAAC;IAEF,MAAM,OAAO,GAA2B;QACtC,KAAK,EAAE,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACxB,IAAI,EAAE,CAAC;QACP,GAAG,EAAE,CAAC;QACN,kBAAkB,EAAE,CAAC;QACrB,kBAAkB,EAAE,CAAC;KACtB,CAAC;IAEF;QACE,OAAO,CAAC,KAAK;QACb,OAAO,CAAC,IAAI;QACZ,OAAO,CAAC,GAAG;QACX,AADY;QAEZ,OAAO,CAAC,kBAAkB;QAC1B,OAAO,CAAC,kBAAkB;KAC3B,GAAG,eAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CACrC,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAClE,QAAQ,CACT,CAAC;IACF,8EAA8E;IAC9E,iBAAiB;IACjB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAgB,eAAe,CAC7B,MAA0C;IAE1C,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,iCAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAA,sBAAM,EACJ,SAAS,IAAI,QAAQ,KAAK,IAAI,EAC9B,yDAAyD,MAAM,EAAE,CAClE,CAAC;IAEF,MAAM,OAAO,GAA0B;QACrC,YAAY,EAAE,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/B,cAAc,EAAE,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACjC,cAAc,EAAE,CAAC;QACjB,8BAA8B,EAAE,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACjD,qBAAqB,EAAE,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,WAAW,EAAE,KAAK;KACnB,CAAC;IAEF;QACE,OAAO,CAAC,cAAc;QACtB,OAAO,CAAC,YAAY;QACpB,AADqB;QAErB,AADC;QAED,OAAO,CAAC,qBAAqB;QAC7B,OAAO,CAAC,8BAA8B;QACtC,OAAO,CAAC,cAAc;QACtB,OAAO,CAAC,WAAW;KACpB,GAAG,eAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CACrC;QACE,SAAS;QACT,QAAQ;QACR,SAAS;QACT,SAAS;QACT,QAAQ;QACR,SAAS;QACT,QAAQ;QACR,MAAM;KACP,EACD,QAAQ,CACT,CAAC;IACF,8EAA8E;IAC9E,iBAAiB;IACjB,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dex/algebra/utils.ts"],"names":[],"mappings":"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"}

package/build/dex/algebra-integral/algebra-integral.d.ts

@@ -15,7 +15,6 @@ export declare class AlgebraIntegral extends SimpleExchange implements IDex<Alge
     readonly hasConstantPriceLargeAmounts = false;
     readonly needWrapNative = true;
     readonly isFeeOnTransferSupported = true;
-    private readonly factory;
     static dexKeysWithNetwork: {
         key: string;
         networks: Network[];
@@ -23,18 +22,19 @@ export declare class AlgebraIntegral extends SimpleExchange implements IDex<Alge
     logger: Logger;
     private uniswapMulti;
     constructor(network: Network, dexKey: string, dexHelper: IDexHelper, routerIface?: Interface, quoterIface?: Interface, config?: import("./types").DexParams);
-    initializePricing(blockNumber: number): Promise<void>;
     getAdapters(side: SwapSide): {
         name: string;
         index: number;
     }[] | null;
     getPoolIdentifier(srcAddress: Address, destAddress: Address, deployerAddress: Address): string;
+    initializePricing(blockNumber: number): Promise<void>;
     getPoolIdentifiers(srcToken: Token, destToken: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
     getPricingFromRpc(from: Token, to: Token, amounts: bigint[], side: SwapSide, pools: Pool[], transferFees?: TransferFeeParams): Promise<ExchangePrices<AlgebraIntegralData> | null>;
     getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[], transferFees?: TransferFeeParams): Promise<null | ExchangePrices<AlgebraIntegralData>>;
     getCalldataGasCost(poolPrices: PoolPrices<AlgebraIntegralData>): number | number[];
     getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: AlgebraIntegralData, side: SwapSide): DexExchangeParam;
     getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: AlgebraIntegralData, side: SwapSide): AdapterExchangeParam;
+    getAvailablePools(srcToken: Address, destToken: Address): Promise<Pool[]>;
     getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
     private _querySubgraph;
     private _encodePath;

package/build/dex/algebra-integral/algebra-integral.js

@@ -54,7 +54,6 @@ const token_transfer_fee_1 = require("../../lib/token-transfer-fee");
 const config_1 = require("./config");
 const types_2 = require("../../lib/tokens/types");
 const utils_3 = require("../../executor/utils");
-const algebra_integral_factory_1 = require("./algebra-integral-factory");
 const ALGEBRA_QUOTE_GASLIMIT = 2_000_000;
 const ALGEBRA_EFFICIENCY_FACTOR = 3;
 class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
@@ -67,7 +66,6 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
     hasConstantPriceLargeAmounts = false;
     needWrapNative = true;
     isFeeOnTransferSupported = true;
-    factory;
     static dexKeysWithNetwork = (0, utils_2.getDexKeysWithNetwork)(config_1.AlgebraIntegralConfig);
     logger;
     uniswapMulti;
@@ -81,10 +79,6 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
         this.config = config;
         this.logger = dexHelper.getLogger(dexKey);
         this.uniswapMulti = new this.dexHelper.web3Provider.eth.Contract(UniswapMulti_abi_json_1.default, this.config.uniswapMulticall);
-        this.factory = new algebra_integral_factory_1.AlgebraIntegralFactory(dexKey, this.network, dexHelper, this.logger, this.config.factory, this.config.subgraphURL);
-    }
-    async initializePricing(blockNumber) {
-        await this.factory.initialize(blockNumber);
     }
     getAdapters(side) {
         return null;
@@ -93,6 +87,7 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
         const tokenAddresses = this._sortTokens(srcAddress, destAddress).join('_');
         return `${this.dexKey}_${tokenAddresses}_${deployerAddress}`;
     }
+    async initializePricing(blockNumber) { }
     // Returns list of pool identifiers that can be used
     // for a given swap. poolIdentifiers must be unique
     // across DEXes. It is recommended to use
@@ -103,7 +98,7 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
         const [_srcAddress, _destAddress] = this._getLoweredAddresses(_srcToken, _destToken);
         if (_srcAddress === _destAddress)
             return [];
-        const pools = await this.factory.getAvailablePoolsForPair(_srcAddress, _destAddress, blockNumber);
+        const pools = await this.getAvailablePools(_srcAddress, _destAddress);
         if (pools.length === 0)
             return [];
         return pools.map(pool => this.getPoolIdentifier(_srcAddress, _destAddress, pool.deployer));
@@ -120,7 +115,7 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
         this.logger.warn(`fallback to rpc for ${pools.length} pool(s)`);
         const requests = pools.map(pool => ({
             owner: pool.poolAddress,
-            asset: side === constants_1.SwapSide.SELL ? from.address : to.address,
+            asset: side == constants_1.SwapSide.SELL ? from.address : to.address,
             assetType: types_2.AssetType.ERC20,
             ids: [
                 {
@@ -128,46 +123,54 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
                     spenders: [],
                 },
             ],
-        }));
+        }), []);
         const balances = await (0, balancer_fetcher_1.getBalances)(this.dexHelper.multiWrapper, requests);
+        pools = pools.filter((pool, index) => {
+            const balance = balances[index].amounts[types_2.DEFAULT_ID_ERC20_AS_STRING];
+            if (balance >= amounts[amounts.length - 1]) {
+                return true;
+            }
+            this.logger.warn(`[${this.network}] have no balance ${pool.poolAddress} ${from.address} ${to.address}. (Balance: ${balance})`);
+            return false;
+        });
+        pools.forEach(pool => {
+            this.logger.warn(`[${this.network}] fallback to rpc for ${pool.poolAddress} ${from.address} ${to.address}`);
+        });
         const _isSrcTokenTransferFeeToBeExchanged = (0, utils_2.isSrcTokenTransferFeeToBeExchanged)(transferFees);
         const _isDestTokenTransferFeeToBeExchanged = (0, utils_2.isDestTokenTransferFeeToBeExchanged)(transferFees);
+        if (_isSrcTokenTransferFeeToBeExchanged && side == constants_1.SwapSide.BUY) {
+            this.logger.error(`DEX doesn't support buy for tax srcToken ${from.address}`);
+            return null;
+        }
         const unitVolume = (0, utils_2.getBigIntPow)((side === constants_1.SwapSide.SELL ? from : to).decimals);
         const chunks = amounts.length - 1;
         const _width = Math.floor(chunks / this.config.chunksCount);
-        const chunkedAmounts = [unitVolume].concat(Array.from(Array(this.config.chunksCount).keys()).map(i => amounts[(i + 1) * _width]));
-        const availableAmountsPerPool = pools.map((pool, index) => {
-            const balance = balances[index].amounts[types_2.DEFAULT_ID_ERC20_AS_STRING];
-            return chunkedAmounts.map(amount => (balance >= amount ? amount : 0n));
-        });
-        const amountsWithFeePerPool = availableAmountsPerPool.map(poolAmounts => _isSrcTokenTransferFeeToBeExchanged
-            ? (0, token_transfer_fee_1.applyTransferFee)(poolAmounts, side, transferFees.srcDexFee, constants_1.SRC_TOKEN_DEX_TRANSFERS)
-            : poolAmounts);
-        const calldata = pools.flatMap((pool, poolIndex) => {
-            const amountsForPool = amountsWithFeePerPool[poolIndex];
-            return amountsForPool
-                .filter(amount => amount !== 0n)
-                .map(amount => ({
-                target: this.config.quoter,
-                gasLimit: ALGEBRA_QUOTE_GASLIMIT,
-                callData: side === constants_1.SwapSide.SELL
-                    ? this.quoterIface.encodeFunctionData('quoteExactInputSingle', [
-                        from.address,
-                        to.address,
-                        pool.deployer,
-                        amount.toString(),
-                        0,
-                    ])
-                    : this.quoterIface.encodeFunctionData('quoteExactOutputSingle', [
-                        from.address,
-                        to.address,
-                        pool.deployer,
-                        amount.toString(),
-                        0,
-                    ]),
-            }));
-        });
-        const data = await this.uniswapMulti.methods.multicall(calldata).call();
+        const _amounts = [unitVolume].concat(Array.from(Array(this.config.chunksCount).keys()).map(i => amounts[(i + 1) * _width]));
+        const _amountsWithFee = _isSrcTokenTransferFeeToBeExchanged
+            ? (0, token_transfer_fee_1.applyTransferFee)(_amounts, side, transferFees.srcDexFee, constants_1.SRC_TOKEN_DEX_TRANSFERS)
+            : _amounts;
+        const calldata = pools.map(pool => _amountsWithFee.map(_amount => ({
+            target: this.config.quoter,
+            gasLimit: ALGEBRA_QUOTE_GASLIMIT,
+            callData: side === constants_1.SwapSide.SELL
+                ? this.quoterIface.encodeFunctionData('quoteExactInputSingle', [
+                    from.address,
+                    to.address,
+                    pool.deployer,
+                    _amount.toString(),
+                    0, //sqrtPriceLimitX96
+                ])
+                : this.quoterIface.encodeFunctionData('quoteExactOutputSingle', [
+                    from.address,
+                    to.address,
+                    pool.deployer,
+                    _amount.toString(),
+                    0, //sqrtPriceLimitX96
+                ]),
+        })));
+        const data = await this.uniswapMulti.methods
+            .multicall(calldata.flat())
+            .call();
         let totalGasCost = 0;
         let totalSuccessFullSwaps = 0;
         const decode = (j) => {
@@ -184,14 +187,13 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
             ? ALGEBRA_QUOTE_GASLIMIT
             : Math.round(totalGasCost / totalSuccessFullSwaps);
         let i = 0;
-        const result = pools.map((pool, poolIndex) => {
-            const amountsForPool = amountsWithFeePerPool[poolIndex];
-            const _rates = amountsForPool.map(a => (a === 0n ? 0n : decode(i++)));
+        const result = pools.map(pool => {
+            const _rates = _amountsWithFee.map(() => decode(i++));
             const _ratesWithFee = _isDestTokenTransferFeeToBeExchanged
                 ? (0, token_transfer_fee_1.applyTransferFee)(_rates, side, transferFees.destDexFee, constants_1.DEST_TOKEN_DEX_TRANSFERS)
                 : _rates;
             const unit = _ratesWithFee[0];
-            const prices = (0, utils_2.interpolate)(chunkedAmounts.slice(1), _ratesWithFee.slice(1), amounts, side);
+            const prices = (0, utils_2.interpolate)(_amountsWithFee.slice(1), _ratesWithFee.slice(1), amounts, side);
             return {
                 prices,
                 unit,
@@ -224,23 +226,12 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
         destDexFee: 0,
     }) {
         try {
-            const _isSrcTokenTransferFeeToBeExchanged = (0, utils_2.isSrcTokenTransferFeeToBeExchanged)(transferFees);
-            if (_isSrcTokenTransferFeeToBeExchanged && side == constants_1.SwapSide.BUY) {
-                return null;
-            }
             const _srcToken = this.dexHelper.config.wrapETH(srcToken);
             const _destToken = this.dexHelper.config.wrapETH(destToken);
             const [_srcAddress, _destAddress] = this._getLoweredAddresses(_srcToken, _destToken);
             if (_srcAddress === _destAddress)
                 return null;
-            let pools = await this.factory.getAvailablePoolsForPair(_srcAddress, _destAddress, blockNumber);
-            if (limitPools && limitPools.length > 0) {
-                const limitPoolsSet = new Set(limitPools);
-                pools = pools.filter(pool => {
-                    const poolIdentifier = this.getPoolIdentifier(_srcAddress, _destAddress, pool.deployer);
-                    return limitPoolsSet.has(poolIdentifier);
-                });
-            }
+            const pools = await this.getAvailablePools(_srcAddress, _destAddress);
             const rpcPrice = await this.getPricingFromRpc(_srcToken, _destToken, amounts, side, pools, transferFees);
             return rpcPrice;
         }
@@ -318,6 +309,36 @@ class AlgebraIntegral extends simple_exchange_1.SimpleExchange {
             networkFee: '0',
         };
     }
+    async getAvailablePools(srcToken, destToken) {
+        // fetch only pools with positive totalValueLockedUSD
+        const availablePoolsQuery = `query ($token0: Bytes!, $token1: Bytes!) {
+      pools (where :{token0: $token0, token1: $token1, totalValueLockedUSD_gt: 0}, orderBy: totalValueLockedUSD, orderDirection: desc) { 
+         id
+         deployer
+         token0{
+          id 
+          decimals
+         }
+         token1{
+          id 
+          decimals
+         }
+      }
+   }`;
+        const [token0, token1] = parseInt(srcToken, 16) < parseInt(destToken, 16)
+            ? [srcToken, destToken]
+            : [destToken, srcToken];
+        const { data } = await this.dexHelper.httpRequest.querySubgraph(this.config.subgraphURL, {
+            query: availablePoolsQuery,
+            variables: { token0, token1 },
+        }, { timeout: constants_1.SUBGRAPH_TIMEOUT });
+        return data.pools.map(pool => ({
+            poolAddress: pool.id,
+            token0: token0,
+            token1: token1,
+            deployer: pool.deployer,
+        }));
+    }
     // Returns list of top pools based on liquidity. Max
     // limit number pools should be returned.
     async getTopPoolsForToken(tokenAddress, limit) {

package/build/dex/algebra-integral/algebra-integral.js.map

@@ -1 +1 @@
-{"version":3,"file":"algebra-integral.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/algebra-integral.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"algebra-integral.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/algebra-integral.ts"],"names":[],"mappings":"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"}

package/build/dex/algebra-integral/config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AlgebraIntegralConfig = void 0;
 const constants_1 = require("../../constants");
 exports.AlgebraIntegralConfig = {
-    AlgebraIntegral: {
+    QuickSwap: {
         [constants_1.Network.POLYGON]: {
             factory: '0x96117a894c2c99aafeeacb972c3310e6ac83e810',
             subgraphURL: 'B8VaWM5T8miDW4TKdGRAkZXvLekpptQykxNV8vVP8fhg',

package/build/dex/algebra-integral/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/config.ts"],"names":[],"mappings":";;;AAEA,+CAA0C;AAE7B,QAAA,qBAAqB,GAA4B;IAC5D,eAAe,EAAE;QACf,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;YACjB,OAAO,EAAE,4CAA4C;YACrD,WAAW,EAAE,8CAA8C;YAC3D,MAAM,EAAE,4CAA4C;YACpD,MAAM,EAAE,4CAA4C;YACpD,gBAAgB,EAAE,4CAA4C;YAC9D,WAAW,EAAE,EAAE;SAChB;KACF;CACF,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/config.ts"],"names":[],"mappings":";;;AAEA,+CAAoD;AAEvC,QAAA,qBAAqB,GAA4B;IAC5D,SAAS,EAAE;QACT,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;YACjB,OAAO,EAAE,4CAA4C;YACrD,WAAW,EAAE,8CAA8C;YAC3D,MAAM,EAAE,4CAA4C;YACpD,MAAM,EAAE,4CAA4C;YACpD,gBAAgB,EAAE,4CAA4C;YAC9D,WAAW,EAAE,EAAE;SAChB;KACF;CACF,CAAC"}

package/build/dex/algebra-integral/types.d.ts

@@ -25,9 +25,7 @@ export type Pool = {
     token0: Address;
     token1: Address;
     deployer: string;
-    tvlUSD: number;
 };
-export type FactoryState = Record<string, never>;
 export declare enum AlgebraIntegralFunctions {
     exactInput = "exactInput",
     exactOutput = "exactOutput",

package/build/dex/algebra-integral/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/types.ts"],"names":[],"mappings":";;;AAoCA,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,qDAAyB,CAAA;IACzB,uDAA2B,CAAA;IAC3B,oGAAwE,CAAA;AAC1E,CAAC,EAJW,wBAAwB,wCAAxB,wBAAwB,QAInC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/algebra-integral/types.ts"],"names":[],"mappings":";;;AAiCA,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,qDAAyB,CAAA;IACzB,uDAA2B,CAAA;IAC3B,oGAAwE,CAAA;AAC1E,CAAC,EAJW,wBAAwB,wCAAxB,wBAAwB,QAInC"}

package/build/dex/angle-transmuter/angle-transmuter-pool.d.ts

@@ -1,10 +1,10 @@
-import { Interface } from '@ethersproject/abi';
 import { DeepReadonly } from 'ts-essentials';
 import { Address, Logger } from '../../types';
 import { ComposedEventSubscriber } from '../../composed-event-subscriber';
 import { IDexHelper } from '../../dex-helper/idex-helper';
 import { ChainlinkConfig, MorphoConfig, OracleFeed, OracleQuoteType, OracleReadType, PoolConfig, PoolState, PythConfig, TransmuterParams } from './types';
 import { Contract } from 'web3-eth-contract';
+import { Interface } from 'ethers';
 import { SwapSide } from '../../constants';
 export declare class AngleTransmuterEventPool extends ComposedEventSubscriber<PoolState> {
     readonly parentName: string;

package/build/dex/angle-transmuter/angle-transmuter-pool.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AngleTransmuterEventPool = void 0;
-const abi_1 = require("@ethersproject/abi");
 const lens_1 = require("../../lens");
 const composed_event_subscriber_1 = require("../../composed-event-subscriber");
 const chainlink_1 = require("../../lib/chainlink");
@@ -15,12 +14,12 @@ const transmuter_1 = require("./transmuter");
 const pyth_1 = require("./pyth");
 const utils_1 = require("./utils");
 const redstone_1 = require("./redstone");
-const utils_2 = require("ethers/lib/utils");
+const ethers_1 = require("ethers");
 const backedOracle_1 = require("./backedOracle");
 const constants_1 = require("../../constants");
-const ethers_1 = require("ethers");
+const ethers_2 = require("ethers");
 const morphoOracle_1 = require("./morphoOracle");
-const utils_3 = require("../../utils");
+const utils_2 = require("../../utils");
 const morphoVault_1 = require("./morphoVault");
 const lodash_1 = __importDefault(require("lodash"));
 const FORCE_REGENERATE_STATE_INTERVAL_MS = 1000 * 60 * 60 * 24; // 24h
@@ -46,10 +45,9 @@ class AngleTransmuterEventPool extends composed_event_subscriber_1.ComposedEvent
             return acc;
         }, {});
         const morphoMap = Object.entries(config.oracles.morpho).reduce((acc, [key, value]) => {
-            if (value.baseVault && value.baseVault !== ethers_1.ethers.constants.AddressZero)
+            if (value.baseVault && value.baseVault !== ethers_2.ethers.ZeroAddress)
                 acc[value.baseVault] = new morphoVault_1.MorphoVaultSubscriber(value.baseVault, (0, lens_1.lens)().oracles.morphoVault[value.baseVault], dexHelper.getLogger(`${key}:${value.baseVault} Morpho Vault for ${parentName}-${network}`));
-            if (value.quoteVault &&
-                value.quoteVault !== ethers_1.ethers.constants.AddressZero)
+            if (value.quoteVault && value.quoteVault !== ethers_2.ethers.ZeroAddress)
                 acc[value.quoteVault] = new morphoVault_1.MorphoVaultSubscriber(value.quoteVault, (0, lens_1.lens)().oracles.morphoVault[value.quoteVault], dexHelper.getLogger(`${key}:${value.quoteVault} Morpho Vault for ${parentName}-${network}`));
             return acc;
         }, {});
@@ -75,8 +73,8 @@ class AngleTransmuterEventPool extends composed_event_subscriber_1.ComposedEvent
         this.dexHelper = dexHelper;
         this.angleTransmuterIface =
             network === constants_1.Network.MAINNET
-                ? new abi_1.Interface(Transmuter_json_1.default)
-                : new abi_1.Interface(TransmuterSidechain_json_1.default);
+                ? new ethers_1.Interface(Transmuter_json_1.default)
+                : new ethers_1.Interface(TransmuterSidechain_json_1.default);
         this.transmuter = new this.dexHelper.web3Provider.eth.Contract(Transmuter_json_1.default, config.transmuter);
         this.config = config;
         // some oracles don't emit events (redstone), need to regenerate state after some period of time. 1 day should provide up-to-date info
@@ -172,16 +170,16 @@ class AngleTransmuterEventPool extends composed_event_subscriber_1.ComposedEvent
                 .aggregate(morphoOracle_1.MorphoOracleEventPool.getGenerateInfoMultiCallInput(oracleFeed.morpho.oracle))
                 .call({}, blockNumber)).returnData;
             const morphoOracleInfo = morphoOracle_1.MorphoOracleEventPool.generateInfo(morphoOracleResult);
-            if (morphoOracleInfo.baseFeed1 !== ethers_1.ethers.constants.AddressZero)
+            if (morphoOracleInfo.baseFeed1 !== ethers_2.ethers.ZeroAddress)
                 ({ chainlinkMap, backedMap, redstoneMap } =
                     await AngleTransmuterEventPool.generateStateChainlinkLike(morphoOracleInfo.baseFeed1, chainlinkMap, backedMap, redstoneMap, blockNumber, multiContract));
-            if (morphoOracleInfo.baseFeed2 !== ethers_1.ethers.constants.AddressZero)
+            if (morphoOracleInfo.baseFeed2 !== ethers_2.ethers.ZeroAddress)
                 ({ chainlinkMap, backedMap, redstoneMap } =
                     await AngleTransmuterEventPool.generateStateChainlinkLike(morphoOracleInfo.baseFeed2, chainlinkMap, backedMap, redstoneMap, blockNumber, multiContract));
-            if (morphoOracleInfo.quoteFeed1 !== ethers_1.ethers.constants.AddressZero)
+            if (morphoOracleInfo.quoteFeed1 !== ethers_2.ethers.ZeroAddress)
                 ({ chainlinkMap, backedMap, redstoneMap } =
                     await AngleTransmuterEventPool.generateStateChainlinkLike(morphoOracleInfo.quoteFeed1, chainlinkMap, backedMap, redstoneMap, blockNumber, multiContract));
-            if (morphoOracleInfo.quoteFeed2 !== ethers_1.ethers.constants.AddressZero)
+            if (morphoOracleInfo.quoteFeed2 !== ethers_2.ethers.ZeroAddress)
                 ({ chainlinkMap, backedMap, redstoneMap } =
                     await AngleTransmuterEventPool.generateStateChainlinkLike(morphoOracleInfo.quoteFeed2, chainlinkMap, backedMap, redstoneMap, blockNumber, multiContract));
             morphoMap[oracleFeed.morpho.oracle] = morphoOracleInfo;
@@ -347,9 +345,9 @@ class AngleTransmuterEventPool extends composed_event_subscriber_1.ComposedEvent
     }
     _readSpotAndTarget(config, state, collateral, blockNumber) {
         const configOracle = state.transmuter.collaterals[collateral].config;
-        const hyperparameters = (0, utils_1.filterDictionaryOnly)(ethers_1.ethers.utils.defaultAbiCoder.decode(['uint128 userDeviation', 'uint128 burnRatioDeviation'], configOracle.hyperparameters));
-        const userDeviation = Number.parseFloat((0, utils_2.formatEther)(hyperparameters.userDeviation.toString()));
-        const burnRatioDeviation = Number.parseFloat((0, utils_2.formatEther)(hyperparameters.burnRatioDeviation.toString()));
+        const hyperparameters = (0, utils_1.filterDictionaryOnly)(ethers_2.ethers.AbiCoder.defaultAbiCoder().decode(['uint128 userDeviation', 'uint128 burnRatioDeviation'], configOracle.hyperparameters));
+        const userDeviation = Number.parseFloat((0, ethers_1.formatEther)(hyperparameters.userDeviation.toString()));
+        const burnRatioDeviation = Number.parseFloat((0, ethers_1.formatEther)(hyperparameters.burnRatioDeviation.toString()));
         const targetPrice = this._read(config, state, configOracle.targetType, configOracle.targetFeed, 1);
         let oracleValue = this._read(config, state, configOracle.oracleType, configOracle.oracleFeed, targetPrice);
         if (targetPrice * (1 - userDeviation) < oracleValue &&
@@ -397,31 +395,31 @@ class AngleTransmuterEventPool extends composed_event_subscriber_1.ComposedEvent
         }
         else if (oracleType == types_1.OracleReadType.MORPHO_ORACLE) {
             const morphoOracleConfig = config.oracles.morpho[feed.morpho.oracle];
-            const baseVaultPrice = morphoOracleConfig.baseVault !== ethers_1.ethers.constants.AddressZero
+            const baseVaultPrice = morphoOracleConfig.baseVault !== ethers_2.ethers.ZeroAddress
                 ? (morphoOracleConfig.baseVaultConversion *
                     state.oracles.morphoVault[morphoOracleConfig.baseVault]
                         .totalAssets) /
                     state.oracles.morphoVault[morphoOracleConfig.baseVault].totalSupply
                 : 1n;
-            const quoteVaultPrice = morphoOracleConfig.quoteVault !== ethers_1.ethers.constants.AddressZero
+            const quoteVaultPrice = morphoOracleConfig.quoteVault !== ethers_2.ethers.ZeroAddress
                 ? (morphoOracleConfig.quoteVaultConversion *
                     state.oracles.morphoVault[morphoOracleConfig.quoteVault]
                         .totalAssets) /
                     state.oracles.morphoVault[morphoOracleConfig.quoteVault].totalSupply
                 : 1n;
-            const baseFeed1Price = morphoOracleConfig.baseFeed1 !== ethers_1.ethers.constants.AddressZero
+            const baseFeed1Price = morphoOracleConfig.baseFeed1 !== ethers_2.ethers.ZeroAddress
                 ? this._readMorphoFeedChainlink(config, state, morphoOracleConfig.baseFeed1)
                 : 1n;
-            const baseFeed2Price = morphoOracleConfig.baseFeed2 !== ethers_1.ethers.constants.AddressZero
+            const baseFeed2Price = morphoOracleConfig.baseFeed2 !== ethers_2.ethers.ZeroAddress
                 ? this._readMorphoFeedChainlink(config, state, morphoOracleConfig.baseFeed2)
                 : 1n;
-            const quoteFeed1Price = morphoOracleConfig.quoteFeed1 !== ethers_1.ethers.constants.AddressZero
+            const quoteFeed1Price = morphoOracleConfig.quoteFeed1 !== ethers_2.ethers.ZeroAddress
                 ? this._readMorphoFeedChainlink(config, state, morphoOracleConfig.quoteFeed1)
                 : 1n;
-            const quoteFeed2Price = morphoOracleConfig.quoteFeed2 !== ethers_1.ethers.constants.AddressZero
+            const quoteFeed2Price = morphoOracleConfig.quoteFeed2 !== ethers_2.ethers.ZeroAddress
                 ? this._readMorphoFeedChainlink(config, state, morphoOracleConfig.quoteFeed2)
                 : 1n;
-            price = Number.parseFloat((0, utils_2.formatUnits)((morphoOracleConfig.scaleFactor *
+            price = Number.parseFloat((0, ethers_1.formatUnits)((morphoOracleConfig.scaleFactor *
                 baseVaultPrice *
                 baseFeed1Price *
                 baseFeed2Price) /
@@ -439,7 +437,7 @@ class AngleTransmuterEventPool extends composed_event_subscriber_1.ComposedEvent
             decimals = config.oracles.redstone[id].decimals;
         else
             decimals = config.oracles.backed[id].decimals;
-        const rate = Number.parseFloat((0, utils_2.formatUnits)(state.oracles.chainlink[id].answer.toString(), decimals));
+        const rate = Number.parseFloat((0, ethers_1.formatUnits)(state.oracles.chainlink[id].answer.toString(), decimals));
         if (isMultiplied === 1)
             price *= rate;
         else
@@ -448,7 +446,7 @@ class AngleTransmuterEventPool extends composed_event_subscriber_1.ComposedEvent
     }
     _readMorphoFeedChainlink(config, state, id) {
         const { price, decimals } = this._readChainlink(config, state, id, 1, 1);
-        return (0, utils_3.bigIntify)((0, utils_2.parseUnits)(price.toString(), decimals));
+        return (0, utils_2.bigIntify)((0, ethers_1.parseUnits)(price.toString(), decimals));
     }
 }
 exports.AngleTransmuterEventPool = AngleTransmuterEventPool;