@paraswap/dex-lib 3.0.6 → 3.2.5-return-amount-pos.4

package/build/dex/spark/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const SDAI_DEPOSIT_GAS_COST = 165000;
+export declare const SDAI_REDEEM_GAS_COST = 90000;

package/build/dex/spark/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SDAI_REDEEM_GAS_COST = exports.SDAI_DEPOSIT_GAS_COST = void 0;
+exports.SDAI_DEPOSIT_GAS_COST = 165000;
+exports.SDAI_REDEEM_GAS_COST = 90000;
+//# sourceMappingURL=constants.js.map

package/build/dex/spark/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/dex/spark/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG,MAAO,CAAC;AAChC,QAAA,oBAAoB,GAAG,KAAM,CAAC"}

package/build/dex/spark/scripts/validate-state.d.ts

@@ -0,0 +1 @@
+export {};

package/build/dex/spark/scripts/validate-state.js

@@ -0,0 +1,102 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable no-console */
+const dotenv_1 = __importDefault(require("dotenv"));
+dotenv_1.default.config();
+const constants_1 = require("../../../constants");
+const dex_helper_1 = require("../../../dex-helper");
+const ethers_1 = require("ethers");
+const spark_1 = require("../spark");
+const config_1 = require("../config");
+const utils_1 = require("../utils");
+const abi_1 = require("@ethersproject/abi");
+const pot_json_1 = __importDefault(require("../../../abi/maker-psm/pot.json"));
+const network = constants_1.Network.MAINNET;
+const dexKey = 'Spark';
+const { potAddress } = config_1.SDaiConfig[dexKey][network];
+const blockHeaders = {};
+const dexHelper = new dex_helper_1.DummyDexHelper(network);
+const logger = dexHelper.getLogger(dexKey);
+function preprocessField(value) {
+    if (typeof value === 'bigint' ||
+        typeof value === 'number' ||
+        ethers_1.ethers.BigNumber.isBigNumber(value)) {
+        return value.toString();
+    }
+    return value;
+}
+function compareAndLogDifferences(obj1, obj2, keyNames, checkEachKey = false) {
+    let isValid = true;
+    let keys = keyNames;
+    if (checkEachKey) {
+        // find common keys
+        const keys1 = Object.keys(obj1);
+        const keys2 = new Set(Object.keys(obj2));
+        keys = keys1.filter(key => keys2.has(key));
+    }
+    for (let fieldName of keys) {
+        const value1 = preprocessField(obj1[fieldName]);
+        const value2 = preprocessField(obj2[fieldName]);
+        if (value1 !== value2) {
+            console.log(`${fieldName.toString()} mismatch: actual: ${value1} vs pool: ${value2}`);
+            isValid = false;
+        }
+    }
+    return isValid;
+}
+async function isPoolStateEqualToReal(state, blockNumber) {
+    const expected = await (0, utils_1.getOnChainState)(dexHelper.multiContract, potAddress, new abi_1.Interface(pot_json_1.default), blockNumber);
+    const isValidState = compareAndLogDifferences(state, expected, [
+        'rho',
+        'dsr',
+        'dsr',
+    ]);
+    return isValidState;
+}
+async function checkPoolStateForBlockRange(startBlockNumber, endBlockNumber) {
+    const network = constants_1.Network.MAINNET;
+    const dexKey = 'Spark';
+    const dexHelper = new dex_helper_1.DummyDexHelper(network);
+    const spark = new spark_1.Spark(network, dexKey, dexHelper);
+    const pool = await spark.eventPool;
+    const logsToDispatch = await dexHelper.provider.getLogs({
+        fromBlock: startBlockNumber,
+        toBlock: endBlockNumber,
+        address: potAddress,
+    });
+    console.log(logsToDispatch.length);
+    // group logs by block number
+    const logsByBlockNumber = {};
+    for (let log of logsToDispatch) {
+        if (!logsByBlockNumber[log.blockNumber]) {
+            logsByBlockNumber[log.blockNumber] = [];
+        }
+        logsByBlockNumber[log.blockNumber].push(log);
+    }
+    const sortedBlocks = Object.keys(logsByBlockNumber)
+        .map(Number)
+        .sort((a, b) => Number(a) - Number(b));
+    for (let blockNumber of sortedBlocks) {
+        if (!blockHeaders[blockNumber]) {
+            blockHeaders[blockNumber] = await dexHelper.web3Provider.eth.getBlock(blockNumber);
+        }
+        await pool?.update(logsByBlockNumber[blockNumber], {
+            [blockNumber]: blockHeaders[blockNumber],
+        });
+    }
+    const state = pool?.getState(startBlockNumber);
+    return isPoolStateEqualToReal(state, endBlockNumber);
+}
+async function main() {
+    // use findBreakingBlock to find the block where the state is broken
+    // console.log(await findBreakingBlock(startBlockNumber, endBlockNumber));
+    // previously broken block 150502863
+    console.log(await checkPoolStateForBlockRange(19199247 - 10000, 19199247));
+}
+main()
+    .then(() => console.log('Done'))
+    .catch(e => console.error(e));
+//# sourceMappingURL=validate-state.js.map

package/build/dex/spark/scripts/validate-state.js.map

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

package/build/dex/spark/spark-sdai-pool.d.ts

@@ -0,0 +1,16 @@
+import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
+import { Interface } from '@ethersproject/abi';
+import type { IDexHelper } from '../../dex-helper';
+import type { AsyncOrSync, DeepReadonly } from 'ts-essentials';
+import type { Address, BlockHeader, Log, Logger } from '../../types';
+import type { SparkSDaiPoolState } from './types';
+export declare class SparkSDaiEventPool extends StatefulEventSubscriber<SparkSDaiPoolState> {
+    protected dexHelper: IDexHelper;
+    private potAddress;
+    private potInterface;
+    constructor(parentName: string, poolName: string, dexHelper: IDexHelper, potAddress: Address, potInterface: Interface, logger: Logger);
+    protected processLog(state: DeepReadonly<SparkSDaiPoolState>, log: Readonly<Log>, blockHeader: Readonly<BlockHeader>): AsyncOrSync<DeepReadonly<SparkSDaiPoolState> | null>;
+    generateState(blockNumber?: number | 'latest'): Promise<DeepReadonly<SparkSDaiPoolState>>;
+    convertToSDai(daiAmount: bigint, blockNumber: number): bigint;
+    convertToDai(sdaiAmount: bigint, blockNumber: number): bigint;
+}

package/build/dex/spark/spark-sdai-pool.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SparkSDaiEventPool = void 0;
+const bigint_constants_1 = require("../../bigint-constants");
+const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
+const utils_1 = require("./utils");
+const RAY = bigint_constants_1.BI_POWS[27];
+const ZERO = BigInt(0);
+const TWO = BigInt(2);
+const HALF = RAY / TWO;
+// function file(bytes32,uint256)
+const FILE_TOPICHASH = `0x29ae811400000000000000000000000000000000000000000000000000000000`;
+// function drip()
+const DRIP_TOPICHASH = `0x9f678cca00000000000000000000000000000000000000000000000000000000`;
+// function cage()
+const CAGE_TOPICHASH = `0x6924500900000000000000000000000000000000000000000000000000000000`;
+// bytes32 repr of "dsr" string
+const DSR_TOPIC = `0x6473720000000000000000000000000000000000000000000000000000000000`;
+const rpow = (x, n) => {
+    if (!x && !n)
+        return RAY;
+    if (!x)
+        return ZERO;
+    let z = n % TWO > ZERO ? x : RAY;
+    for (n = n / TWO; n; n /= TWO) {
+        x = (x * x + HALF) / RAY;
+        if (n % TWO > ZERO) {
+            z = (z * x + HALF) / RAY;
+        }
+    }
+    return z;
+};
+const calcChi = (state, currentTimestamp) => {
+    currentTimestamp || (currentTimestamp = Math.floor(Date.now() / 1000));
+    if (!state.live)
+        return RAY;
+    const { dsr: dsr_, chi: chi_, rho: rho_ } = state;
+    const now = BigInt(currentTimestamp);
+    const rho = BigInt(rho_);
+    const dsr = BigInt(dsr_);
+    const chi = BigInt(chi_);
+    return now > rho ? (rpow(dsr, now - rho) * chi) / RAY : chi;
+};
+class SparkSDaiEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
+    constructor(parentName, poolName, dexHelper, potAddress, potInterface, logger) {
+        super(parentName, poolName, dexHelper, logger);
+        this.dexHelper = dexHelper;
+        this.potAddress = potAddress;
+        this.potInterface = potInterface;
+        this.addressesSubscribed = [potAddress];
+    }
+    processLog(state, log, blockHeader) {
+        if (log.topics[0] === FILE_TOPICHASH && log.topics[2] === DSR_TOPIC) {
+            return {
+                ...state,
+                dsr: BigInt(log.topics[3]).toString(),
+            };
+        }
+        if (log.topics[0] === DRIP_TOPICHASH) {
+            return {
+                ...state,
+                rho: blockHeader.timestamp.toString(),
+                chi: calcChi(state, +blockHeader.timestamp).toString(),
+            };
+        }
+        return null;
+    }
+    async generateState(blockNumber = 'latest') {
+        return (0, utils_1.getOnChainState)(this.dexHelper.multiContract, this.potAddress, this.potInterface, blockNumber);
+    }
+    convertToSDai(daiAmount, blockNumber) {
+        const state = this.getState(blockNumber);
+        if (!state)
+            throw new Error(`SDai state at ${blockNumber} does not exists`);
+        return (daiAmount * RAY) / calcChi(state);
+    }
+    convertToDai(sdaiAmount, blockNumber) {
+        const state = this.getState(blockNumber);
+        if (!state)
+            throw new Error(`SDai state at ${blockNumber} does not exists`);
+        return (sdaiAmount * calcChi(state)) / RAY;
+    }
+}
+exports.SparkSDaiEventPool = SparkSDaiEventPool;
+//# sourceMappingURL=spark-sdai-pool.js.map

package/build/dex/spark/spark-sdai-pool.js.map

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

package/build/dex/spark/spark.d.ts

@@ -0,0 +1,52 @@
+import { SimpleExchange } from '../simple-exchange';
+import { Context, IDex } from '../idex';
+import { SparkParams, SparkData } from './types';
+import { Network, SwapSide } from '../../constants';
+import { AdapterExchangeParam, Address, DexExchangeParam, ExchangePrices, Logger, NumberAsString, PoolLiquidity, PoolPrices, SimpleExchangeParam, Token } from '../../types';
+import { IDexHelper } from '../../dex-helper';
+import { Interface } from 'ethers/lib/utils';
+import { SparkSDaiEventPool } from './spark-sdai-pool';
+export declare class Spark extends SimpleExchange implements IDex<SparkData, SparkParams> {
+    protected network: Network;
+    protected dexHelper: IDexHelper;
+    readonly daiAddress: string;
+    readonly sdaiAddress: string;
+    readonly potAddress: string;
+    protected adapters: {
+        [side: string]: {
+            name: string;
+            index: number;
+        }[];
+    };
+    protected sdaiInterface: Interface;
+    protected potInterface: Interface;
+    readonly hasConstantPriceLargeAmounts = true;
+    readonly isFeeOnTransferSupported = false;
+    static dexKeysWithNetwork: {
+        key: string;
+        networks: Network[];
+    }[];
+    readonly eventPool: SparkSDaiEventPool;
+    logger: Logger;
+    constructor(network: Network, dexKey: string, dexHelper: IDexHelper, daiAddress?: string, sdaiAddress?: string, potAddress?: string, adapters?: {
+        [side: string]: {
+            name: string;
+            index: number;
+        }[];
+    }, sdaiInterface?: Interface, potInterface?: Interface);
+    getAdapters(side: SwapSide): {
+        name: string;
+        index: number;
+    }[] | null;
+    isSDai(tokenAddress: Address): boolean;
+    isDai(tokenAddress: Address): boolean;
+    isAppropriatePair(srcToken: Token, destToken: Token): boolean;
+    initializePricing(blockNumber: number): Promise<void>;
+    getPoolIdentifiers(srcToken: Token, destToken: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
+    getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[]): Promise<null | ExchangePrices<SparkData>>;
+    getCalldataGasCost(poolPrices: PoolPrices<SparkData>): number | number[];
+    getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
+    getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: SparkData, side: SwapSide): Promise<SimpleExchangeParam>;
+    getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: SparkData, side: SwapSide, _: Context, executorAddress: Address): DexExchangeParam;
+    getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: SparkData, side: SwapSide): AdapterExchangeParam;
+}

package/build/dex/spark/spark.js

@@ -0,0 +1,195 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Spark = void 0;
+const simple_exchange_1 = require("../simple-exchange");
+const types_1 = require("./types");
+const constants_1 = require("../../constants");
+const utils_1 = require("../../utils");
+const config_1 = require("./config");
+const CALLDATA_GAS_COST = __importStar(require("../../calldata-gas-cost"));
+const pot_json_1 = __importDefault(require("../../abi/maker-psm/pot.json"));
+const SavingsDai_abi_json_1 = __importDefault(require("../../abi/sdai/SavingsDai.abi.json"));
+const utils_2 = require("ethers/lib/utils");
+const spark_sdai_pool_1 = require("./spark-sdai-pool");
+const bigint_constants_1 = require("../../bigint-constants");
+const constants_2 = require("./constants");
+const utils_3 = require("../../executor/utils");
+class Spark extends simple_exchange_1.SimpleExchange {
+    constructor(network, dexKey, dexHelper, daiAddress = config_1.SDaiConfig[dexKey][network].daiAddress, sdaiAddress = config_1.SDaiConfig[dexKey][network].sdaiAddress, potAddress = config_1.SDaiConfig[dexKey][network].potAddress, adapters = config_1.Adapters[network] || {}, sdaiInterface = new utils_2.Interface(SavingsDai_abi_json_1.default), potInterface = new utils_2.Interface(pot_json_1.default)) {
+        super(dexHelper, dexKey);
+        this.network = network;
+        this.dexHelper = dexHelper;
+        this.daiAddress = daiAddress;
+        this.sdaiAddress = sdaiAddress;
+        this.potAddress = potAddress;
+        this.adapters = adapters;
+        this.sdaiInterface = sdaiInterface;
+        this.potInterface = potInterface;
+        this.hasConstantPriceLargeAmounts = true;
+        this.isFeeOnTransferSupported = false;
+        this.logger = dexHelper.getLogger(dexKey);
+        this.eventPool = new spark_sdai_pool_1.SparkSDaiEventPool(this.dexKey, `${this.daiAddress}_${this.sdaiAddress}`, dexHelper, this.potAddress, this.potInterface, this.logger);
+    }
+    getAdapters(side) {
+        return this.adapters[side] || null;
+    }
+    isSDai(tokenAddress) {
+        return this.sdaiAddress.toLowerCase() === tokenAddress.toLowerCase();
+    }
+    isDai(tokenAddress) {
+        return this.daiAddress.toLowerCase() === tokenAddress.toLowerCase();
+    }
+    isAppropriatePair(srcToken, destToken) {
+        return ((this.isDai(srcToken.address) && this.isSDai(destToken.address)) ||
+            (this.isDai(destToken.address) && this.isSDai(srcToken.address)));
+    }
+    async initializePricing(blockNumber) {
+        await this.eventPool.initialize(blockNumber);
+    }
+    async getPoolIdentifiers(srcToken, destToken, side, blockNumber) {
+        return this.isAppropriatePair(srcToken, destToken)
+            ? [`${this.dexKey}_${this.sdaiAddress}`]
+            : [];
+    }
+    async getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools) {
+        if (!this.isAppropriatePair(srcToken, destToken))
+            return null;
+        if (!this.eventPool.getState(blockNumber))
+            return null;
+        if (side === constants_1.SwapSide.SELL) {
+            const calcSellFn = (blockNumber, amountIn) => this.isDai(srcToken.address)
+                ? this.eventPool.convertToSDai(amountIn, blockNumber)
+                : this.eventPool.convertToDai(amountIn, blockNumber);
+            return [
+                {
+                    prices: amounts.map(amount => calcSellFn(blockNumber, amount)),
+                    unit: calcSellFn(blockNumber, bigint_constants_1.BI_POWS[18]),
+                    gasCost: constants_2.SDAI_DEPOSIT_GAS_COST,
+                    exchange: this.dexKey,
+                    data: { exchange: `${this.sdaiAddress}` },
+                    poolAddresses: [`${this.sdaiAddress}`],
+                },
+            ];
+        }
+        else {
+            const calcBuyFn = (blockNumber, amountIn) => this.isDai(srcToken.address)
+                ? this.eventPool.convertToDai(amountIn, blockNumber)
+                : this.eventPool.convertToSDai(amountIn, blockNumber);
+            return [
+                {
+                    prices: amounts.map(amount => calcBuyFn(blockNumber, amount)),
+                    unit: calcBuyFn(blockNumber, bigint_constants_1.BI_POWS[18]),
+                    gasCost: constants_2.SDAI_REDEEM_GAS_COST,
+                    exchange: this.dexKey,
+                    data: { exchange: `${this.sdaiAddress}` },
+                    poolAddresses: [`${this.sdaiAddress}`],
+                },
+            ];
+        }
+    }
+    // Returns estimated gas cost of calldata for this DEX in multiSwap
+    getCalldataGasCost(poolPrices) {
+        return CALLDATA_GAS_COST.DEX_NO_PAYLOAD;
+    }
+    async getTopPoolsForToken(tokenAddress, limit) {
+        if (!this.isDai(tokenAddress) && !this.isSDai(tokenAddress))
+            return [];
+        return [
+            {
+                exchange: this.dexKey,
+                address: this.sdaiAddress,
+                connectorTokens: [
+                    {
+                        decimals: 18,
+                        address: this.isDai(tokenAddress)
+                            ? this.sdaiAddress
+                            : this.daiAddress,
+                    },
+                ],
+                liquidityUSD: 1000000000, // Just returning a big number so this DEX will be preferred
+            },
+        ];
+    }
+    async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        const isSell = side === constants_1.SwapSide.SELL;
+        const { exchange } = data;
+        let swapData;
+        if (this.isDai(srcToken)) {
+            swapData = this.sdaiInterface.encodeFunctionData(isSell ? types_1.SparkSDaiFunctions.deposit : types_1.SparkSDaiFunctions.mint, [isSell ? srcAmount : destAmount, this.augustusAddress]);
+        }
+        else {
+            swapData = this.sdaiInterface.encodeFunctionData(isSell ? types_1.SparkSDaiFunctions.redeem : types_1.SparkSDaiFunctions.withdraw, [
+                isSell ? srcAmount : destAmount,
+                this.augustusAddress,
+                this.augustusAddress,
+            ]);
+        }
+        return this.buildSimpleParamWithoutWETHConversion(srcToken, srcAmount, destToken, destAmount, swapData, exchange);
+    }
+    getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side, _, executorAddress) {
+        const isSell = side === constants_1.SwapSide.SELL;
+        const { exchange } = data;
+        let swapData;
+        if (this.isDai(srcToken)) {
+            swapData = this.sdaiInterface.encodeFunctionData(isSell ? types_1.SparkSDaiFunctions.deposit : types_1.SparkSDaiFunctions.mint, [isSell ? srcAmount : destAmount, recipient]);
+        }
+        else {
+            swapData = this.sdaiInterface.encodeFunctionData(isSell ? types_1.SparkSDaiFunctions.redeem : types_1.SparkSDaiFunctions.withdraw, [isSell ? srcAmount : destAmount, recipient, executorAddress]);
+        }
+        return {
+            needWrapNative: this.needWrapNative,
+            dexFuncHasRecipient: true,
+            exchangeData: swapData,
+            targetExchange: exchange,
+            returnAmountPos: isSell
+                ? (0, utils_3.extractReturnAmountPosition)(this.sdaiInterface, this.isDai(srcToken)
+                    ? types_1.SparkSDaiFunctions.deposit
+                    : types_1.SparkSDaiFunctions.redeem, this.isDai(srcToken) ? 'shares' : 'assets')
+                : undefined,
+        };
+    }
+    getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        const { exchange } = data;
+        const payload = this.abiCoder.encodeParameter({
+            ParentStruct: {
+                toStaked: 'bool',
+            },
+        }, {
+            toStaked: this.isDai(srcToken),
+        });
+        return {
+            targetExchange: exchange,
+            payload,
+            networkFee: '0',
+        };
+    }
+}
+exports.Spark = Spark;
+Spark.dexKeysWithNetwork = (0, utils_1.getDexKeysWithNetwork)(config_1.SDaiConfig);
+//# sourceMappingURL=spark.js.map

package/build/dex/spark/spark.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spark.js","sourceRoot":"","sources":["../../../src/dex/spark/spark.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAoD;AAEpD,mCAAqE;AACrE,+CAAoD;AACpD,uCAAoD;AACpD,qCAAgD;AAchD,2EAA6D;AAC7D,4EAAkD;AAClD,6FAA+D;AAC/D,4CAA6C;AAC7C,uDAAuD;AACvD,6DAAiD;AACjD,2CAA0E;AAC1E,gDAAmE;AAEnE,MAAa,KACX,SAAQ,gCAAc;IAYtB,YACY,OAAgB,EAC1B,MAAc,EACJ,SAAqB,EAEtB,aAAqB,mBAAU,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAC3D,cAAsB,mBAAU,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAC7D,aAAqB,mBAAU,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAE1D,WAAW,iBAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAClC,gBAAgB,IAAI,iBAAS,CAAC,6BAAa,CAAC,EAC5C,eAAe,IAAI,iBAAS,CAAC,kBAAM,CAAC;QAE9C,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAZf,YAAO,GAAP,OAAO,CAAS;QAEhB,cAAS,GAAT,SAAS,CAAY;QAEtB,eAAU,GAAV,UAAU,CAAiD;QAC3D,gBAAW,GAAX,WAAW,CAAkD;QAC7D,eAAU,GAAV,UAAU,CAAiD;QAE1D,aAAQ,GAAR,QAAQ,CAA0B;QAClC,kBAAa,GAAb,aAAa,CAA+B;QAC5C,iBAAY,GAAZ,YAAY,CAAwB;QApBvC,iCAA4B,GAAG,IAAI,CAAC;QACpC,6BAAwB,GAAG,KAAK,CAAC;QAsBxC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,oCAAkB,CACrC,IAAI,CAAC,MAAM,EACX,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,EACxC,SAAS,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,MAAM,CACZ,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,IAAc;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,YAAqB;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,WAAW,EAAE,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,YAAqB;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,WAAW,EAAE,CAAC;IACtE,CAAC;IAED,iBAAiB,CAAC,QAAe,EAAE,SAAgB;QACjD,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAChE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CACjE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QACzC,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,QAAe,EACf,SAAgB,EAChB,IAAc,EACd,WAAmB;QAEnB,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC;YAChD,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACxC,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,QAAe,EACf,SAAgB,EAChB,OAAiB,EACjB,IAAc,EACd,WAAmB,EACnB,UAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC;YAAE,OAAO,IAAI,CAAC;QAC9D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,OAAO,IAAI,CAAC;QAEvD,IAAI,IAAI,KAAK,oBAAQ,CAAC,IAAI,EAAE;YAC1B,MAAM,UAAU,GAAG,CAAC,WAAmB,EAAE,QAAgB,EAAE,EAAE,CAC3D,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAC1B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC;gBACrD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAEzD,OAAO;gBACL;oBACE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;oBAC9D,IAAI,EAAE,UAAU,CAAC,WAAW,EAAE,0BAAO,CAAC,EAAE,CAAC,CAAC;oBAC1C,OAAO,EAAE,iCAAqB;oBAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM;oBACrB,IAAI,EAAE,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,EAAE;oBACzC,aAAa,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;iBACvC;aACF,CAAC;SACH;aAAM;YACL,MAAM,SAAS,GAAG,CAAC,WAAmB,EAAE,QAAgB,EAAE,EAAE,CAC1D,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAC1B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC;gBACpD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAE1D,OAAO;gBACL;oBACE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;oBAC7D,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,0BAAO,CAAC,EAAE,CAAC,CAAC;oBACzC,OAAO,EAAE,gCAAoB;oBAC7B,QAAQ,EAAE,IAAI,CAAC,MAAM;oBACrB,IAAI,EAAE,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,EAAE;oBACzC,aAAa,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;iBACvC;aACF,CAAC;SACH;IACH,CAAC;IAED,mEAAmE;IACnE,kBAAkB,CAAC,UAAiC;QAClD,OAAO,iBAAiB,CAAC,cAAc,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,YAAqB,EACrB,KAAa;QAEb,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YAAE,OAAO,EAAE,CAAC;QAEvE,OAAO;YACL;gBACE,QAAQ,EAAE,IAAI,CAAC,MAAM;gBACrB,OAAO,EAAE,IAAI,CAAC,WAAW;gBACzB,eAAe,EAAE;oBACf;wBACE,QAAQ,EAAE,EAAE;wBACZ,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;4BAC/B,CAAC,CAAC,IAAI,CAAC,WAAW;4BAClB,CAAC,CAAC,IAAI,CAAC,UAAU;qBACpB;iBACF;gBACD,YAAY,EAAE,UAAU,EAAE,4DAA4D;aACvF;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAe,EACf,IAAc;QAEd,MAAM,MAAM,GAAG,IAAI,KAAK,oBAAQ,CAAC,IAAI,CAAC;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAE1B,IAAI,QAAgB,CAAC;QACrB,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACxB,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAC9C,MAAM,CAAC,CAAC,CAAC,0BAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,0BAAkB,CAAC,IAAI,EAC7D,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,CACxD,CAAC;SACH;aAAM;YACL,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAC9C,MAAM,CAAC,CAAC,CAAC,0BAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,0BAAkB,CAAC,QAAQ,EAChE;gBACE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;gBAC/B,IAAI,CAAC,eAAe;gBACpB,IAAI,CAAC,eAAe;aACrB,CACF,CAAC;SACH;QAED,OAAO,IAAI,CAAC,qCAAqC,CAC/C,QAAQ,EACR,SAAS,EACT,SAAS,EACT,UAAU,EACV,QAAQ,EACR,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,WAAW,CACT,QAAiB,EACjB,SAAkB,EAClB,SAAyB,EACzB,UAA0B,EAC1B,SAAkB,EAClB,IAAe,EACf,IAAc,EACd,CAAU,EACV,eAAwB;QAExB,MAAM,MAAM,GAAG,IAAI,KAAK,oBAAQ,CAAC,IAAI,CAAC;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAE1B,IAAI,QAAgB,CAAC;QACrB,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACxB,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAC9C,MAAM,CAAC,CAAC,CAAC,0BAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,0BAAkB,CAAC,IAAI,EAC7D,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,SAAS,CAAC,CAC7C,CAAC;SACH;aAAM;YACL,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAC9C,MAAM,CAAC,CAAC,CAAC,0BAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,0BAAkB,CAAC,QAAQ,EAChE,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAC9D,CAAC;SACH;QAED,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,mBAAmB,EAAE,IAAI;YACzB,YAAY,EAAE,QAAQ;YACtB,cAAc,EAAE,QAAQ;YACxB,eAAe,EAAE,MAAM;gBACrB,CAAC,CAAC,IAAA,mCAA2B,EACzB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;oBAClB,CAAC,CAAC,0BAAkB,CAAC,OAAO;oBAC5B,CAAC,CAAC,0BAAkB,CAAC,MAAM,EAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAC3C;gBACH,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;IAED,eAAe,CACb,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAe,EACf,IAAc;QAEd,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAC3C;YACE,YAAY,EAAE;gBACZ,QAAQ,EAAE,MAAM;aACjB;SACF,EACD;YACE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC/B,CACF,CAAC;QAEF,OAAO;YACL,cAAc,EAAE,QAAQ;YACxB,OAAO;YACP,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;;AA9PH,sBA+PC;AAxPe,wBAAkB,GAC9B,IAAA,6BAAqB,EAAC,mBAAU,CAAC,CAAC"}

package/build/dex/spark/types.d.ts

@@ -0,0 +1,21 @@
+import { Address } from '../../types';
+export declare type SparkData = {
+    exchange: Address;
+};
+export declare type SparkParams = {
+    sdaiAddress: Address;
+    daiAddress: Address;
+    potAddress: Address;
+};
+export declare enum SparkSDaiFunctions {
+    deposit = "deposit",
+    redeem = "redeem",
+    withdraw = "withdraw",
+    mint = "mint"
+}
+export declare type SparkSDaiPoolState = {
+    rho: string;
+    chi: string;
+    dsr: string;
+    live: boolean;
+};

package/build/dex/spark/types.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SparkSDaiFunctions = void 0;
+var SparkSDaiFunctions;
+(function (SparkSDaiFunctions) {
+    SparkSDaiFunctions["deposit"] = "deposit";
+    SparkSDaiFunctions["redeem"] = "redeem";
+    SparkSDaiFunctions["withdraw"] = "withdraw";
+    SparkSDaiFunctions["mint"] = "mint";
+})(SparkSDaiFunctions = exports.SparkSDaiFunctions || (exports.SparkSDaiFunctions = {}));
+//# sourceMappingURL=types.js.map

package/build/dex/spark/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/spark/types.ts"],"names":[],"mappings":";;;AAUA,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,uCAAiB,CAAA;IACjB,2CAAqB,CAAA;IACrB,mCAAa,CAAA;AACf,CAAC,EALW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAK7B"}

package/build/dex/spark/utils.d.ts

@@ -0,0 +1,4 @@
+import { Contract } from 'web3-eth-contract';
+import { SparkSDaiPoolState } from './types';
+import { Interface } from '@ethersproject/abi';
+export declare function getOnChainState(multiContract: Contract, potAddress: string, potInterface: Interface, blockNumber: number | 'latest'): Promise<SparkSDaiPoolState>;

package/build/dex/spark/utils.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOnChainState = void 0;
+const abi_1 = require("@ethersproject/abi");
+const coder = new abi_1.AbiCoder();
+// - `dsr`: the Dai Savings Rate
+// - `chi`: the Rate Accumulator
+// - `rho`: time of last drip
+async function getOnChainState(multiContract, potAddress, potInterface, blockNumber) {
+    const data = await multiContract.methods
+        .aggregate([
+        {
+            target: potAddress,
+            callData: potInterface.encodeFunctionData('dsr', []),
+        },
+        {
+            target: potAddress,
+            callData: potInterface.encodeFunctionData('chi', []),
+        },
+        {
+            target: potAddress,
+            callData: potInterface.encodeFunctionData('rho', []),
+        },
+        {
+            target: potAddress,
+            callData: potInterface.encodeFunctionData('live', []),
+        },
+    ])
+        .call({}, blockNumber);
+    const [dsr, chi, rho, live] = data.returnData.map(item => coder.decode(['uint256'], item)[0].toString());
+    return {
+        live: !!live,
+        dsr,
+        chi,
+        rho,
+    };
+}
+exports.getOnChainState = getOnChainState;
+//# sourceMappingURL=utils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dex/spark/utils.ts"],"names":[],"mappings":";;;AAEA,4CAAyD;AAEzD,MAAM,KAAK,GAAG,IAAI,cAAQ,EAAE,CAAC;AAE7B,gCAAgC;AAChC,gCAAgC;AAChC,6BAA6B;AACtB,KAAK,UAAU,eAAe,CACnC,aAAuB,EACvB,UAAkB,EAClB,YAAuB,EACvB,WAA8B;IAE9B,MAAM,IAAI,GAA0B,MAAM,aAAa,CAAC,OAAO;SAC5D,SAAS,CAAC;QACT;YACE,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC;SACrD;QACD;YACE,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC;SACrD;QACD;YACE,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC;SACrD;QACD;YACE,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,YAAY,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC;SACtD;KACF,CAAC;SACD,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IAEzB,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CACvD,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAC9C,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,GAAG;QACH,GAAG;QACH,GAAG;KACJ,CAAC;AACJ,CAAC;AArCD,0CAqCC"}

package/build/dex/stable-pool/stable-pool.js

@@ -9,6 +9,7 @@ const constants_1 = require("../../constants");
 const simple_exchange_1 = require("../simple-exchange");
 const StablePool_json_1 = __importDefault(require("../../abi/StablePool.json"));
 const types_1 = require("./types");
+const utils_1 = require("../../executor/utils");
 class StablePool extends simple_exchange_1.SimpleExchange {
     constructor(dexHelper) {
         super(dexHelper, 'stablePool');
@@ -63,6 +64,9 @@ class StablePool extends simple_exchange_1.SimpleExchange {
             dexFuncHasRecipient: false,
             exchangeData: swapData,
             targetExchange: exchange,
+            returnAmountPos: side === constants_1.SwapSide.SELL
+                ? (0, utils_1.extractReturnAmountPosition)(this.exchangeRouterInterface, types_1.StablePoolFunctions.swap)
+                : undefined,
         };
     }
 }

package/build/dex/stable-pool/stable-pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"stable-pool.js","sourceRoot":"","sources":["../../../src/dex/stable-pool/stable-pool.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAC/C,+CAA2C;AAS3C,wDAAoD;AACpD,gFAAsD;AAEtD,mCAA+E;AAE/E,MAAa,UACX,SAAQ,gCAAc;IActB,YAAY,SAAqB;QAC/B,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAHjC,sBAAiB,GAAG,GAAG,CAAC;QAItB,IAAI,CAAC,uBAAuB,GAAG,IAAI,eAAS,CAAC,yBAAa,CAAC,CAAC;IAC9D,CAAC;IAED,eAAe,CACb,SAAiB,EACjB,UAAkB,EAClB,UAAkB,EAClB,WAAmB,EACnB,IAAoB,EACpB,IAAc;QAEd,IAAI,IAAI,KAAK,oBAAQ,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAEhE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAChC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAC3C;YACE,YAAY,EAAE;gBACZ,CAAC,EAAE,QAAQ;gBACX,CAAC,EAAE,QAAQ;gBACX,QAAQ,EAAE,SAAS;aACpB;SACF,EACD,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,CACnB,CAAC;QACF,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,QAAQ;YAC7B,OAAO;YACP,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAoB,EACpB,IAAc;QAEd,IAAI,IAAI,KAAK,oBAAQ,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAEhE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAC1C,MAAM,kBAAkB,GAAoB;YAC1C,CAAC;YACD,CAAC;YACD,SAAS;YACT,IAAI,CAAC,iBAAiB;YACtB,QAAQ;SACT,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAC9D,2BAAmB,CAAC,IAAI,EACxB,kBAAkB,CACnB,CAAC;QAEF,OAAO,IAAI,CAAC,qCAAqC,CAC/C,QAAQ,EACR,SAAS,EACT,SAAS,EACT,UAAU,EACV,QAAQ,EACR,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,WAAW,CACT,SAAkB,EAClB,UAAmB,EACnB,SAAyB,EACzB,WAA2B,EAC3B,UAAmB,EACnB,IAAoB,EACpB,IAAc;QAEd,IAAI,IAAI,KAAK,oBAAQ,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAEhE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAC1C,MAAM,kBAAkB,GAAoB;YAC1C,CAAC;YACD,CAAC;YACD,SAAS;YACT,IAAI,CAAC,iBAAiB;YACtB,QAAQ;SACT,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAC9D,2BAAmB,CAAC,IAAI,EACxB,kBAAkB,CACnB,CAAC;QAEF,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,mBAAmB,EAAE,KAAK;YAC1B,YAAY,EAAE,QAAQ;YACtB,cAAc,EAAE,QAAQ;SACzB,CAAC;IACJ,CAAC;;AA/GH,gCAgHC;AA5GQ,kBAAO,GAAG;IACf,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,UAAU;IACV,OAAO;IACP,iBAAiB;CAClB,CAAC"}
+{"version":3,"file":"stable-pool.js","sourceRoot":"","sources":["../../../src/dex/stable-pool/stable-pool.ts"],"names":[],"mappings":"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"}

package/build/dex/swaap-v1/swaap-v1.js

@@ -37,6 +37,7 @@ const config_1 = require("./config");
 const swaap_v1_pool_1 = require("./swaap-v1-pool");
 const pool_json_1 = __importDefault(require("../../abi/swaap-v1/pool.json"));
 const PoolQuotations_1 = require("./libraries/PoolQuotations");
+const utils_2 = require("../../executor/utils");
 class SwaapV1 extends simple_exchange_1.SimpleExchange {
     constructor(network, dexKey, dexHelper, adapters = config_1.Adapters[network]) {
         super(dexHelper, dexKey);
@@ -167,6 +168,9 @@ class SwaapV1 extends simple_exchange_1.SimpleExchange {
             dexFuncHasRecipient: false,
             exchangeData: swapData,
             targetExchange: data.pool,
+            returnAmountPos: side === constants_1.SwapSide.SELL
+                ? (0, utils_2.extractReturnAmountPosition)(SwaapV1.poolInterface, functionName, 'tokenAmountOut')
+                : undefined,
         };
     }
     // // Returns list of top pools based on liquidity. Max