@paraswap/dex-lib 4.7.5-unified-blacklist.2 → 4.7.5-unified-blacklist.3

package/build/dex/idle-dao/idle-dao.d.ts

@@ -38,5 +38,6 @@ export declare class IdleDao extends SimpleExchange implements IDex<IdleDaoData>
     getCalldataGasCost(poolPrices: PoolPrices<IdleDaoData>): number | number[];
     getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: IdleDaoData, side: SwapSide): AdapterExchangeParam;
     getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: IdleDaoData, side: SwapSide, _: Context, executorAddress: Address): DexExchangeParam;
+    updatePoolState(): Promise<void>;
     getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
 }

package/build/dex/idle-dao/idle-dao.js

@@ -242,25 +242,36 @@ class IdleDao extends simple_exchange_1.SimpleExchange {
             skipApproval: data.fromIdleToken,
         };
     }
-    async getTopPoolsForToken(tokenAddress, limit) {
+    async updatePoolState() {
         await this.initializeTokens();
+    }
+    async getTopPoolsForToken(tokenAddress, limit) {
         const idleTokens = (0, tokens_1.getPoolsByTokenAddress)(this.network, tokenAddress);
         if (idleTokens.length > 0) {
-            return idleTokens
-                .map((idleToken) => ({
-                // liquidity is infinite, tokens are minted when swapping for idle tokens
-                liquidityUSD: 1e8,
-                exchange: this.dexKey,
-                address: idleToken.cdoAddress,
-                connectorTokens: [(0, tokens_1.getTokenFromIdleToken)(idleToken)],
-            }))
-                .slice(0, limit);
+            const poolMap = {};
+            idleTokens.forEach((idleToken) => {
+                const cdoAddress = idleToken.cdoAddress;
+                const token = (0, tokens_1.getTokenFromIdleToken)(idleToken);
+                if (!poolMap[cdoAddress]) {
+                    poolMap[cdoAddress] = {
+                        exchange: this.dexKey,
+                        address: cdoAddress,
+                        connectorTokens: [token],
+                        liquidityUSD: constants_1.UNLIMITED_USD_LIQUIDITY,
+                    };
+                }
+                else {
+                    if (!poolMap[cdoAddress].connectorTokens.some(t => t.address.toLowerCase() === token.address.toLowerCase())) {
+                        poolMap[cdoAddress].connectorTokens.push(token);
+                    }
+                }
+            });
+            return Object.values(poolMap);
         }
         const idleToken = (0, tokens_1.getIdleTokenByAddress)(this.network, tokenAddress.toLowerCase());
         if (idleToken) {
             return [
                 {
-                    liquidityUSD: 1e9,
                     exchange: this.dexKey,
                     address: idleToken.cdoAddress,
                     connectorTokens: [
@@ -269,6 +280,7 @@ class IdleDao extends simple_exchange_1.SimpleExchange {
                             decimals: idleToken.decimals,
                         },
                     ],
+                    liquidityUSD: constants_1.UNLIMITED_USD_LIQUIDITY,
                 },
             ];
         }

package/build/dex/idle-dao/idle-dao.js.map

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

package/build/dex/maker-psm/maker-psm-event-pool.d.ts

@@ -0,0 +1,43 @@
+import { DeepReadonly } from 'ts-essentials';
+import { Address, Log, Logger } from '../../types';
+import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
+import { IDexHelper } from '../../dex-helper/idex-helper';
+import { PoolState, PoolConfig } from './types';
+export declare class MakerPsmEventPool extends StatefulEventSubscriber<PoolState> {
+    protected network: number;
+    protected dexHelper: IDexHelper;
+    poolConfig: PoolConfig;
+    protected vatAddress: Address;
+    handlers: {
+        [event: string]: (event: any, pool: PoolState, log: Log) => PoolState;
+    };
+    logDecoder: (log: Log) => any;
+    to18ConversionFactor: bigint;
+    bytes32Tout: string;
+    bytes32Tin: string;
+    constructor(parentName: string, network: number, dexHelper: IDexHelper, logger: Logger, poolConfig: PoolConfig, vatAddress: Address);
+    handleFile(event: any, pool: PoolState, log: Log): PoolState;
+    handleSellGem(event: any, pool: PoolState, log: Log): PoolState;
+    handleBuyGem(event: any, pool: PoolState, log: Log): PoolState;
+    getIdentifier(): string;
+    /**
+     * The function is called every time any of the subscribed
+     * addresses release log. The function accepts the current
+     * state, updates the state according to the log, and returns
+     * the updated state.
+     * @param state - Current state of event subscriber
+     * @param log - Log released by one of the subscribed addresses
+     * @returns Updates state of the event subscriber after the log
+     */
+    protected processLog(state: DeepReadonly<PoolState>, log: Readonly<Log>): DeepReadonly<PoolState> | null;
+    /**
+     * The function generates state using on-chain calls. This
+     * function is called to regenerate state if the event based
+     * system fails to fetch events and the local state is no
+     * more correct.
+     * @param blockNumber - Blocknumber for which the state should
+     * should be generated
+     * @returns state of the event subscriber at blocknumber
+     */
+    generateState(blockNumber: number): Promise<Readonly<PoolState>>;
+}

package/build/dex/maker-psm/maker-psm-event-pool.js

@@ -0,0 +1,132 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MakerPsmEventPool = void 0;
+const abi_1 = require("@ethersproject/abi");
+const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
+const utils_1 = require("../../utils");
+const psm_json_1 = __importDefault(require("../../abi/maker-psm/psm.json"));
+const vat_json_1 = __importDefault(require("../../abi/maker-psm/vat.json"));
+const vatInterface = new abi_1.Interface(vat_json_1.default);
+const psmInterface = new abi_1.Interface(psm_json_1.default);
+const bigIntify = (b) => BigInt(b.toString());
+async function getOnChainState(multiContract, poolConfigs, vatAddress, blockNumber) {
+    const callData = poolConfigs
+        .map(c => [
+        {
+            target: c.psmAddress,
+            callData: psmInterface.encodeFunctionData('tin', []),
+        },
+        {
+            target: c.psmAddress,
+            callData: psmInterface.encodeFunctionData('tout', []),
+        },
+        {
+            target: vatAddress,
+            callData: vatInterface.encodeFunctionData('ilks', [c.identifier]),
+        },
+    ])
+        .flat();
+    const res = await multiContract.methods
+        .aggregate(callData)
+        .call({}, blockNumber);
+    let i = 0;
+    return poolConfigs.map(c => {
+        const tin = bigIntify(psmInterface.decodeFunctionResult('tin', res.returnData[i++])[0]);
+        const tout = bigIntify(psmInterface.decodeFunctionResult('tout', res.returnData[i++])[0]);
+        const ilks = vatInterface.decodeFunctionResult('ilks', res.returnData[i++]);
+        const Art = bigIntify(ilks.Art);
+        const line = bigIntify(ilks.line);
+        const rate = bigIntify(ilks.rate);
+        return {
+            tin,
+            tout,
+            Art,
+            line,
+            rate,
+        };
+    });
+}
+class MakerPsmEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
+    network;
+    dexHelper;
+    poolConfig;
+    vatAddress;
+    handlers = {};
+    logDecoder;
+    to18ConversionFactor;
+    bytes32Tout = '0x746f757400000000000000000000000000000000000000000000000000000000'; // bytes32('tout')
+    bytes32Tin = '0x74696e0000000000000000000000000000000000000000000000000000000000'; // bytes32('tin')
+    constructor(parentName, network, dexHelper, logger, poolConfig, vatAddress) {
+        super(parentName, poolConfig.identifier, dexHelper, logger);
+        this.network = network;
+        this.dexHelper = dexHelper;
+        this.poolConfig = poolConfig;
+        this.vatAddress = vatAddress;
+        this.logDecoder = (log) => psmInterface.parseLog(log);
+        this.addressesSubscribed = [poolConfig.psmAddress];
+        this.to18ConversionFactor = (0, utils_1.getBigIntPow)(18 - poolConfig.gem.decimals);
+        // Add handlers
+        this.handlers['File'] = this.handleFile.bind(this);
+        this.handlers['SellGem'] = this.handleSellGem.bind(this);
+        this.handlers['BuyGem'] = this.handleBuyGem.bind(this);
+    }
+    handleFile(event, pool, log) {
+        if (event.args.what === this.bytes32Tin) {
+            pool.tin = bigIntify(event.args.data);
+        }
+        else if (event.args.what === this.bytes32Tout) {
+            pool.tout = bigIntify(event.args.data);
+        }
+        return pool;
+    }
+    handleSellGem(event, pool, log) {
+        pool.Art += bigIntify(event.args.value) * this.to18ConversionFactor;
+        return pool;
+    }
+    handleBuyGem(event, pool, log) {
+        pool.Art -= bigIntify(event.args.value) * this.to18ConversionFactor;
+        return pool;
+    }
+    getIdentifier() {
+        return `${this.parentName}_${this.poolConfig.psmAddress}`.toLowerCase();
+    }
+    /**
+     * The function is called every time any of the subscribed
+     * addresses release log. The function accepts the current
+     * state, updates the state according to the log, and returns
+     * the updated state.
+     * @param state - Current state of event subscriber
+     * @param log - Log released by one of the subscribed addresses
+     * @returns Updates state of the event subscriber after the log
+     */
+    processLog(state, log) {
+        try {
+            const event = this.logDecoder(log);
+            if (event.name in this.handlers) {
+                return this.handlers[event.name](event, state, log);
+            }
+            return state;
+        }
+        catch (e) {
+            this.logger.error(`Error_${this.parentName}_processLog could not parse the log with topic ${log.topics}:`, e);
+            return null;
+        }
+    }
+    /**
+     * The function generates state using on-chain calls. This
+     * function is called to regenerate state if the event based
+     * system fails to fetch events and the local state is no
+     * more correct.
+     * @param blockNumber - Blocknumber for which the state should
+     * should be generated
+     * @returns state of the event subscriber at blocknumber
+     */
+    async generateState(blockNumber) {
+        return (await getOnChainState(this.dexHelper.multiContract, [this.poolConfig], this.vatAddress, blockNumber))[0];
+    }
+}
+exports.MakerPsmEventPool = MakerPsmEventPool;
+//# sourceMappingURL=maker-psm-event-pool.js.map

package/build/dex/maker-psm/maker-psm-event-pool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"maker-psm-event-pool.js","sourceRoot":"","sources":["../../../src/dex/maker-psm/maker-psm-event-pool.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAI/C,+EAA0E;AAC1E,uCAA2C;AAG3C,4EAAkD;AAClD,4EAAkD;AAElD,MAAM,YAAY,GAAG,IAAI,eAAS,CAAC,kBAAM,CAAC,CAAC;AAC3C,MAAM,YAAY,GAAG,IAAI,eAAS,CAAC,kBAAM,CAAC,CAAC;AAE3C,MAAM,SAAS,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAEnD,KAAK,UAAU,eAAe,CAC5B,aAAuB,EACvB,WAAyB,EACzB,UAAmB,EACnB,WAA8B;IAE9B,MAAM,QAAQ,GAAG,WAAW;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACR;YACE,MAAM,EAAE,CAAC,CAAC,UAAU;YACpB,QAAQ,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC;SACrD;QACD;YACE,MAAM,EAAE,CAAC,CAAC,UAAU;YACpB,QAAQ,EAAE,YAAY,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC;SACtD;QACD;YACE,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,YAAY,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;SAClE;KACF,CAAC;SACD,IAAI,EAAE,CAAC;IAEV,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,OAAO;SACpC,SAAS,CAAC,QAAQ,CAAC;SACnB,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IAEzB,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QACzB,MAAM,GAAG,GAAG,SAAS,CACnB,YAAY,CAAC,oBAAoB,CAAC,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CACjE,CAAC;QACF,MAAM,IAAI,GAAG,SAAS,CACpB,YAAY,CAAC,oBAAoB,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAClE,CAAC;QACF,MAAM,IAAI,GAAG,YAAY,CAAC,oBAAoB,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5E,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO;YACL,GAAG;YACH,IAAI;YACJ,GAAG;YACH,IAAI;YACJ,IAAI;SACL,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAa,iBAAkB,SAAQ,mDAAkC;IAe3D;IACA;IAEH;IACG;IAlBZ,QAAQ,GAEJ,EAAE,CAAC;IAEP,UAAU,CAAoB;IAE9B,oBAAoB,CAAS;IAC7B,WAAW,GACT,oEAAoE,CAAC,CAAC,kBAAkB;IAC1F,UAAU,GACR,oEAAoE,CAAC,CAAC,iBAAiB;IAEzF,YACE,UAAkB,EACR,OAAe,EACf,SAAqB,EAC/B,MAAc,EACP,UAAsB,EACnB,UAAmB;QAE7B,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QANlD,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAY;QAExB,eAAU,GAAV,UAAU,CAAY;QACnB,eAAU,GAAV,UAAU,CAAS;QAI7B,IAAI,CAAC,UAAU,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,CAAC,mBAAmB,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,oBAAoB,GAAG,IAAA,oBAAY,EAAC,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEvE,eAAe;QACf,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,UAAU,CAAC,KAAU,EAAE,IAAe,EAAE,GAAQ;QAC9C,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YAChD,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,KAAU,EAAE,IAAe,EAAE,GAAQ;QACjD,IAAI,CAAC,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,KAAU,EAAE,IAAe,EAAE,GAAQ;QAChD,IAAI,CAAC,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa;QACX,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1E,CAAC;IAED;;;;;;;;OAQG;IACO,UAAU,CAClB,KAA8B,EAC9B,GAAkB;QAElB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YACtD,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,SAAS,IAAI,CAAC,UAAU,kDAAkD,GAAG,CAAC,MAAM,GAAG,EACvF,CAAC,CACF,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,aAAa,CAAC,WAAmB;QACrC,OAAO,CACL,MAAM,eAAe,CACnB,IAAI,CAAC,SAAS,CAAC,aAAa,EAC5B,CAAC,IAAI,CAAC,UAAU,CAAC,EACjB,IAAI,CAAC,UAAU,EACf,WAAW,CACZ,CACF,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;CACF;AAvGD,8CAuGC"}

package/build/dex/maker-psm/maker-psm.d.ts

@@ -1,50 +1,11 @@
-import { DeepReadonly } from 'ts-essentials';
-import { Token, Address, ExchangePrices, PoolPrices, Log, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger, NumberAsString, DexExchangeParam, ExchangeTxInfo, PreprocessTransactionOptions } from '../../types';
+import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger, NumberAsString, DexExchangeParam, ExchangeTxInfo, PreprocessTransactionOptions } from '../../types';
 import { SwapSide, Network } from '../../constants';
-import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
 import { IDex } from '../../dex/idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
 import { MakerPsmData, PoolState, PoolConfig, MakerPsmDirectPayload } from './types';
 import { SimpleExchange } from '../simple-exchange';
 import { OptimalSwapExchange } from '@paraswap/core';
-export declare class MakerPsmEventPool extends StatefulEventSubscriber<PoolState> {
-    protected network: number;
-    protected dexHelper: IDexHelper;
-    poolConfig: PoolConfig;
-    protected vatAddress: Address;
-    handlers: {
-        [event: string]: (event: any, pool: PoolState, log: Log) => PoolState;
-    };
-    logDecoder: (log: Log) => any;
-    to18ConversionFactor: bigint;
-    bytes32Tout: string;
-    bytes32Tin: string;
-    constructor(parentName: string, network: number, dexHelper: IDexHelper, logger: Logger, poolConfig: PoolConfig, vatAddress: Address);
-    handleFile(event: any, pool: PoolState, log: Log): PoolState;
-    handleSellGem(event: any, pool: PoolState, log: Log): PoolState;
-    handleBuyGem(event: any, pool: PoolState, log: Log): PoolState;
-    getIdentifier(): string;
-    /**
-     * The function is called every time any of the subscribed
-     * addresses release log. The function accepts the current
-     * state, updates the state according to the log, and returns
-     * the updated state.
-     * @param state - Current state of event subscriber
-     * @param log - Log released by one of the subscribed addresses
-     * @returns Updates state of the event subscriber after the log
-     */
-    protected processLog(state: DeepReadonly<PoolState>, log: Readonly<Log>): DeepReadonly<PoolState> | null;
-    /**
-     * The function generates state using on-chain calls. This
-     * function is called to regenerate state if the event based
-     * system fails to fetch events and the local state is no
-     * more correct.
-     * @param blockNumber - Blocknumber for which the state should
-     * should be generated
-     * @returns state of the event subscriber at blocknumber
-     */
-    generateState(blockNumber: number): Promise<Readonly<PoolState>>;
-}
+import { MakerPsmEventPool } from './maker-psm-event-pool';
 export declare class MakerPsm extends SimpleExchange implements IDex<MakerPsmData, MakerPsmDirectPayload> {
     protected network: Network;
     protected dexHelper: IDexHelper;
@@ -75,6 +36,7 @@ export declare class MakerPsm extends SimpleExchange implements IDex<MakerPsmDat
     }, dai?: Token, vatAddress?: Address, poolConfigs?: PoolConfig[]);
     static getDirectFunctionNameV6(): string[];
     initializePricing(blockNumber: number): Promise<void>;
+    private initializeEventPools;
     getAdapters(side: SwapSide): {
         name: string;
         index: number;
@@ -99,5 +61,6 @@ export declare class MakerPsm extends SimpleExchange implements IDex<MakerPsmDat
         encoder: (...params: (string | MakerPsmDirectPayload)[]) => string;
         networkFee: string;
     };
+    updatePoolState(): Promise<void>;
     getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
 }

package/build/dex/maker-psm/maker-psm.js

@@ -36,143 +36,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MakerPsm = exports.MakerPsmEventPool = void 0;
+exports.MakerPsm = void 0;
 const abi_1 = require("@ethersproject/abi");
 const constants_1 = require("../../constants");
 const CALLDATA_GAS_COST = __importStar(require("../../calldata-gas-cost"));
-const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
 const utils_1 = require("../../utils");
 const simple_exchange_1 = require("../simple-exchange");
 const config_1 = require("./config");
 const psm_json_1 = __importDefault(require("../../abi/maker-psm/psm.json"));
-const vat_json_1 = __importDefault(require("../../abi/maker-psm/vat.json"));
 const bigint_constants_1 = require("../../bigint-constants");
 const types_1 = require("../../executor/types");
 const bytes_1 = require("@ethersproject/bytes");
 const core_1 = require("@paraswap/core");
 const ethers_1 = require("ethers");
-const vatInterface = new abi_1.Interface(vat_json_1.default);
+const maker_psm_event_pool_1 = require("./maker-psm-event-pool");
 const psmInterface = new abi_1.Interface(psm_json_1.default);
 const WAD = bigint_constants_1.BI_POWS[18];
-const bigIntify = (b) => BigInt(b.toString());
 const ceilDiv = (a, b) => (a + b - 1n) / b;
-async function getOnChainState(multiContract, poolConfigs, vatAddress, blockNumber) {
-    const callData = poolConfigs
-        .map(c => [
-        {
-            target: c.psmAddress,
-            callData: psmInterface.encodeFunctionData('tin', []),
-        },
-        {
-            target: c.psmAddress,
-            callData: psmInterface.encodeFunctionData('tout', []),
-        },
-        {
-            target: vatAddress,
-            callData: vatInterface.encodeFunctionData('ilks', [c.identifier]),
-        },
-    ])
-        .flat();
-    const res = await multiContract.methods
-        .aggregate(callData)
-        .call({}, blockNumber);
-    let i = 0;
-    return poolConfigs.map(c => {
-        const tin = bigIntify(psmInterface.decodeFunctionResult('tin', res.returnData[i++])[0]);
-        const tout = bigIntify(psmInterface.decodeFunctionResult('tout', res.returnData[i++])[0]);
-        const ilks = vatInterface.decodeFunctionResult('ilks', res.returnData[i++]);
-        const Art = bigIntify(ilks.Art);
-        const line = bigIntify(ilks.line);
-        const rate = bigIntify(ilks.rate);
-        return {
-            tin,
-            tout,
-            Art,
-            line,
-            rate,
-        };
-    });
-}
-class MakerPsmEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
-    network;
-    dexHelper;
-    poolConfig;
-    vatAddress;
-    handlers = {};
-    logDecoder;
-    to18ConversionFactor;
-    bytes32Tout = '0x746f757400000000000000000000000000000000000000000000000000000000'; // bytes32('tout')
-    bytes32Tin = '0x74696e0000000000000000000000000000000000000000000000000000000000'; // bytes32('tin')
-    constructor(parentName, network, dexHelper, logger, poolConfig, vatAddress) {
-        super(parentName, poolConfig.identifier, dexHelper, logger);
-        this.network = network;
-        this.dexHelper = dexHelper;
-        this.poolConfig = poolConfig;
-        this.vatAddress = vatAddress;
-        this.logDecoder = (log) => psmInterface.parseLog(log);
-        this.addressesSubscribed = [poolConfig.psmAddress];
-        this.to18ConversionFactor = (0, utils_1.getBigIntPow)(18 - poolConfig.gem.decimals);
-        // Add handlers
-        this.handlers['File'] = this.handleFile.bind(this);
-        this.handlers['SellGem'] = this.handleSellGem.bind(this);
-        this.handlers['BuyGem'] = this.handleBuyGem.bind(this);
-    }
-    handleFile(event, pool, log) {
-        if (event.args.what === this.bytes32Tin) {
-            pool.tin = bigIntify(event.args.data);
-        }
-        else if (event.args.what === this.bytes32Tout) {
-            pool.tout = bigIntify(event.args.data);
-        }
-        return pool;
-    }
-    handleSellGem(event, pool, log) {
-        pool.Art += bigIntify(event.args.value) * this.to18ConversionFactor;
-        return pool;
-    }
-    handleBuyGem(event, pool, log) {
-        pool.Art -= bigIntify(event.args.value) * this.to18ConversionFactor;
-        return pool;
-    }
-    getIdentifier() {
-        return `${this.parentName}_${this.poolConfig.psmAddress}`.toLowerCase();
-    }
-    /**
-     * The function is called every time any of the subscribed
-     * addresses release log. The function accepts the current
-     * state, updates the state according to the log, and returns
-     * the updated state.
-     * @param state - Current state of event subscriber
-     * @param log - Log released by one of the subscribed addresses
-     * @returns Updates state of the event subscriber after the log
-     */
-    processLog(state, log) {
-        try {
-            const event = this.logDecoder(log);
-            if (event.name in this.handlers) {
-                return this.handlers[event.name](event, state, log);
-            }
-            return state;
-        }
-        catch (e) {
-            this.logger.error(`Error_${this.parentName}_processLog could not parse the log with topic ${log.topics}:`, e);
-            return null;
-        }
-    }
-    /**
-     * The function generates state using on-chain calls. This
-     * function is called to regenerate state if the event based
-     * system fails to fetch events and the local state is no
-     * more correct.
-     * @param blockNumber - Blocknumber for which the state should
-     * should be generated
-     * @returns state of the event subscriber at blocknumber
-     */
-    async generateState(blockNumber) {
-        return (await getOnChainState(this.dexHelper.multiContract, [this.poolConfig], this.vatAddress, blockNumber))[0];
-    }
-}
-exports.MakerPsmEventPool = MakerPsmEventPool;
 class MakerPsm extends simple_exchange_1.SimpleExchange {
     network;
     dexHelper;
@@ -196,18 +76,23 @@ class MakerPsm extends simple_exchange_1.SimpleExchange {
         this.poolConfigs = poolConfigs;
         this.logger = dexHelper.getLogger(dexKey);
         this.eventPools = {};
-        poolConfigs.forEach(p => (this.eventPools[p.gem.address.toLowerCase()] = new MakerPsmEventPool(dexKey, network, dexHelper, this.logger, p, this.vatAddress)));
+        poolConfigs.forEach(p => (this.eventPools[p.gem.address.toLowerCase()] = new maker_psm_event_pool_1.MakerPsmEventPool(dexKey, network, dexHelper, this.logger, p, this.vatAddress)));
     }
     static getDirectFunctionNameV6() {
         return [core_1.ContractMethodV6.swapExactAmountInOutOnMakerPSM];
     }
     async initializePricing(blockNumber) {
-        const poolStates = await getOnChainState(this.dexHelper.multiContract, this.poolConfigs, this.vatAddress, blockNumber);
-        await Promise.all(this.poolConfigs.map(async (p, i) => {
-            const eventPool = this.eventPools[p.gem.address.toLowerCase()];
-            await eventPool.initialize(blockNumber, {
-                state: poolStates[i],
-            });
+        await this.initializeEventPools(blockNumber);
+    }
+    async initializeEventPools(blockNumber, subscribe = true) {
+        await Promise.all(Object.values(this.eventPools).map(async (eventPool) => {
+            if (subscribe) {
+                await eventPool.initialize(blockNumber);
+            }
+            else {
+                const state = await eventPool.generateState(blockNumber);
+                eventPool.setState(state, blockNumber);
+            }
         }));
     }
     // Returns the list of contract adapters (name and index)
@@ -460,33 +345,45 @@ class MakerPsm extends simple_exchange_1.SimpleExchange {
         };
         return { params: payload, encoder, networkFee: '0' };
     }
+    async updatePoolState() {
+        const blockNumber = await this.dexHelper.web3Provider.eth.getBlockNumber();
+        await this.initializeEventPools(blockNumber, false);
+    }
     // Returns list of top pools based on liquidity. Max
     // limit number pools should be returned.
     async getTopPoolsForToken(tokenAddress, limit) {
-        const _tokenAddress = tokenAddress.toLowerCase();
+        const token = tokenAddress.toLowerCase();
+        const isDAI = this.dai.address.toLowerCase() === token;
         // Liquidity depends on the swapping side hence we simply use the min
         // Its always in terms of stable coin hence liquidityUSD = liquidity
         const minLiq = (poolState) => {
             const buyLimit = poolState.Art;
             const sellLimit = (poolState.line - poolState.Art * poolState.rate) / poolState.rate;
-            return (2 *
-                parseInt(((buyLimit > sellLimit ? sellLimit : buyLimit) / bigint_constants_1.BI_POWS[18]).toString()));
+            const minLimit = buyLimit < sellLimit ? buyLimit : sellLimit;
+            const liquidity = Number(minLimit) / Number(bigint_constants_1.BI_POWS[18]);
+            return liquidity > 0 ? 2 * liquidity : 0;
         };
-        const isDai = _tokenAddress === this.dai.address;
-        const validPoolConfigs = isDai
+        const validPoolConfigs = isDAI
             ? this.poolConfigs
-            : this.eventPools[_tokenAddress]
-                ? [this.eventPools[_tokenAddress].poolConfig]
+            : this.eventPools[token]
+                ? [this.eventPools[token].poolConfig]
                 : [];
         if (!validPoolConfigs.length)
             return [];
-        const poolStates = await getOnChainState(this.dexHelper.multiContract, validPoolConfigs, this.vatAddress, 'latest');
-        return validPoolConfigs.map((p, i) => ({
-            exchange: this.dexKey,
-            address: p.psmAddress,
-            liquidityUSD: minLiq(poolStates[i]),
-            connectorTokens: [isDai ? p.gem : this.dai],
-        }));
+        const pools = validPoolConfigs.map(config => {
+            const eventPoolKey = config.gem.address.toLowerCase();
+            const eventPool = this.eventPools[eventPoolKey];
+            const state = eventPool?.getStaleState();
+            if (!state)
+                return null;
+            return {
+                exchange: this.dexKey,
+                address: config.psmAddress,
+                liquidityUSD: minLiq(state),
+                connectorTokens: [isDAI ? config.gem : this.dai],
+            };
+        });
+        return pools.filter(p => !!p).slice(0, limit);
     }
 }
 exports.MakerPsm = MakerPsm;