@paraswap/dex-lib 4.7.25-0 → 4.7.25

package/build/dex/jarvis.js

@@ -0,0 +1,163 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Jarvis = void 0;
+const abi_1 = require("@ethersproject/abi");
+const constants_1 = require("../constants");
+const simple_exchange_1 = require("./simple-exchange");
+const Jarvis_json_1 = __importDefault(require("../abi/Jarvis.json"));
+const utils_1 = require("../executor/utils");
+const THIRTY_MINUTES = 60 * 30;
+var JarvisFunctions;
+(function (JarvisFunctions) {
+    JarvisFunctions["mint"] = "mint";
+    JarvisFunctions["redeem"] = "redeem";
+    JarvisFunctions["exchange"] = "exchange";
+})(JarvisFunctions || (JarvisFunctions = {}));
+class Jarvis extends simple_exchange_1.SimpleExchange {
+    constructor(dexHelper) {
+        super(dexHelper, 'jarvis');
+        this.needWrapNative = false;
+        this.poolInterface = new abi_1.Interface(Jarvis_json_1.default);
+    }
+    getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        const { method } = data;
+        const type = [
+            JarvisFunctions.mint,
+            JarvisFunctions.redeem,
+            JarvisFunctions.exchange,
+        ].indexOf(method);
+        if (type === undefined) {
+            throw new Error(`Jarvis: Invalid OpType ${method}, Should be one of ['mint', 'exchange', 'redeem']`);
+        }
+        const payload = this.abiCoder.encodeParameter({
+            ParentStruct: {
+                opType: 'uint',
+                derivatives: 'address',
+                destDerivatives: 'address',
+                fee: 'uint128',
+                destPool: 'address',
+                expiration: 'uint128',
+            },
+        }, {
+            opType: type,
+            derivatives: data.derivatives,
+            destDerivatives: data.destDerivatives || constants_1.NULL_ADDRESS,
+            fee: data.fee,
+            destPool: data.pools[1] || constants_1.NULL_ADDRESS,
+            expiration: (Date.now() / 1000 + THIRTY_MINUTES).toFixed(0),
+        });
+        return {
+            targetExchange: data.pools[0],
+            payload,
+            networkFee: '0',
+        };
+    }
+    async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        const swapFunction = data.method;
+        const timestamp = (Date.now() / 1000 + THIRTY_MINUTES).toFixed(0);
+        let swapFunctionParams;
+        switch (swapFunction) {
+            case JarvisFunctions.mint:
+                swapFunctionParams = [
+                    data.derivatives,
+                    destAmount,
+                    srcAmount,
+                    data.fee,
+                    timestamp,
+                    this.augustusAddress,
+                ];
+                break;
+            case JarvisFunctions.redeem:
+                swapFunctionParams = [
+                    data.derivatives,
+                    srcAmount,
+                    destAmount,
+                    data.fee,
+                    timestamp,
+                    this.augustusAddress,
+                ];
+                break;
+            case JarvisFunctions.exchange:
+                swapFunctionParams = [
+                    data.derivatives,
+                    data.pools[1],
+                    data.destDerivatives,
+                    srcAmount,
+                    destAmount,
+                    data.fee,
+                    timestamp,
+                    this.augustusAddress,
+                ];
+                break;
+            default:
+                throw new Error(`Unknown function ${swapFunction}`);
+        }
+        const swapData = this.poolInterface.encodeFunctionData(swapFunction, [
+            swapFunctionParams,
+        ]);
+        return this.buildSimpleParamWithoutWETHConversion(srcToken, srcAmount, destToken, destAmount, swapData, data.pools[0]);
+    }
+    getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
+        const swapFunction = data.method;
+        const timestamp = (Date.now() / 1000 + THIRTY_MINUTES).toFixed(0);
+        let swapFunctionParams;
+        let outputName;
+        switch (swapFunction) {
+            case JarvisFunctions.mint:
+                swapFunctionParams = [
+                    data.derivatives,
+                    destAmount,
+                    srcAmount,
+                    data.fee,
+                    timestamp,
+                    recipient,
+                ];
+                outputName = 'syntheticTokensMinted';
+                break;
+            case JarvisFunctions.redeem:
+                swapFunctionParams = [
+                    data.derivatives,
+                    srcAmount,
+                    destAmount,
+                    data.fee,
+                    timestamp,
+                    recipient,
+                ];
+                outputName = 'collateralRedeemed';
+                break;
+            case JarvisFunctions.exchange:
+                swapFunctionParams = [
+                    data.derivatives,
+                    data.pools[1],
+                    data.destDerivatives,
+                    srcAmount,
+                    destAmount,
+                    data.fee,
+                    timestamp,
+                    recipient,
+                ];
+                outputName = 'destNumTokensMinted';
+                break;
+            default:
+                throw new Error(`Unknown function ${swapFunction}`);
+        }
+        const swapData = this.poolInterface.encodeFunctionData(swapFunction, [
+            swapFunctionParams,
+        ]);
+        return {
+            needWrapNative: this.needWrapNative,
+            dexFuncHasRecipient: true,
+            exchangeData: swapData,
+            targetExchange: data.pools[0],
+            returnAmountPos: side === constants_1.SwapSide.SELL
+                ? (0, utils_1.extractReturnAmountPosition)(this.poolInterface, swapFunction, outputName)
+                : undefined,
+        };
+    }
+}
+exports.Jarvis = Jarvis;
+Jarvis.dexKeys = ['jarvis'];
+//# sourceMappingURL=jarvis.js.map

package/build/dex/jarvis.js.map

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

package/build/dex/mStable.d.ts

@@ -0,0 +1,44 @@
+import { Interface } from '@ethersproject/abi';
+import { SwapSide } from '../constants';
+import { AdapterExchangeParam, SimpleExchangeParam } from '../types';
+import { IDexTxBuilder } from './idex';
+import { SimpleExchange } from './simple-exchange';
+import { IDexHelper } from '../dex-helper';
+declare enum MStableFunctions {
+    mint = "mint",
+    swap = "swap",
+    redeem = "redeem"
+}
+declare type MStableData = {
+    exchange: string;
+    opType: MStableFunctions;
+    isAssetContract: boolean;
+};
+declare type MStableMint = [
+    _input: string,
+    _inputQuantity: string,
+    _minOutputQuantity: string,
+    _recipient: string
+];
+declare type MStableSwap = [
+    _input: string,
+    _output: string,
+    _inputQuantity: string,
+    _minOutputQuantity: string,
+    _recipient: string
+];
+declare type MStableRedeem = [
+    _output: string,
+    _mAssetQuantity: string,
+    _minOutputQuantity: string,
+    _recipient: string
+];
+declare type MStableParam = MStableMint | MStableSwap | MStableRedeem;
+export declare class MStable extends SimpleExchange implements IDexTxBuilder<MStableData, MStableParam> {
+    static dexKeys: string[];
+    mStableAsset: Interface;
+    constructor(dexHelper: IDexHelper);
+    getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: MStableData, side: SwapSide): AdapterExchangeParam;
+    getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: MStableData, side: SwapSide): Promise<SimpleExchangeParam>;
+}
+export {};

package/build/dex/mStable.js

@@ -0,0 +1,75 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MStable = void 0;
+const abi_1 = require("@ethersproject/abi");
+const simple_exchange_1 = require("./simple-exchange");
+const MStableAsset_json_1 = __importDefault(require("../abi/MStableAsset.json"));
+var MStableFunctions;
+(function (MStableFunctions) {
+    MStableFunctions["mint"] = "mint";
+    MStableFunctions["swap"] = "swap";
+    MStableFunctions["redeem"] = "redeem";
+})(MStableFunctions || (MStableFunctions = {}));
+class MStable extends simple_exchange_1.SimpleExchange {
+    constructor(dexHelper) {
+        super(dexHelper, 'mStable');
+        this.mStableAsset = new abi_1.Interface(MStableAsset_json_1.default);
+    }
+    getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        const { opType } = data;
+        const type = [
+            MStableFunctions.swap,
+            MStableFunctions.mint,
+            MStableFunctions.redeem,
+        ].indexOf(opType);
+        if (type === undefined) {
+            throw new Error(`mStable: Invalid OpType ${opType}, Should be one of ['mint', 'swap', 'redeem']`);
+        }
+        const payload = this.abiCoder.encodeParameter({
+            ParentStruct: {
+                opType: 'uint',
+            },
+        }, {
+            opType: type,
+        });
+        return {
+            targetExchange: data.exchange,
+            payload,
+            networkFee: '0',
+        };
+    }
+    async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        const { opType, isAssetContract } = data;
+        const [swapFunction, swapFunctionsParams] = (() => {
+            switch (opType) {
+                case MStableFunctions.mint:
+                    return [
+                        opType,
+                        [srcToken, srcAmount, destAmount, this.augustusAddress],
+                    ];
+                case MStableFunctions.swap:
+                    return [
+                        opType,
+                        [srcToken, destToken, srcAmount, destAmount, this.augustusAddress],
+                    ];
+                case MStableFunctions.redeem:
+                    return [
+                        opType,
+                        [destToken, srcAmount, destAmount, this.augustusAddress],
+                    ];
+                default:
+                    throw new Error(`mStable's OpType ${opType} not supported, failed to build`);
+            }
+        })();
+        // mStableAsset & mStablePool both have the same interface hence we can
+        // simply use mStableAsset contract
+        const swapData = this.mStableAsset.encodeFunctionData(swapFunction, swapFunctionsParams);
+        return this.buildSimpleParamWithoutWETHConversion(srcToken, srcAmount, destToken, destAmount, swapData, data.exchange);
+    }
+}
+exports.MStable = MStable;
+MStable.dexKeys = ['mStable'];
+//# sourceMappingURL=mStable.js.map

package/build/dex/mStable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mStable.js","sourceRoot":"","sources":["../../src/dex/mStable.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA6D;AAK7D,uDAAmD;AACnD,iFAAuD;AAIvD,IAAK,gBAIJ;AAJD,WAAK,gBAAgB;IACnB,iCAAa,CAAA;IACb,iCAAa,CAAA;IACb,qCAAiB,CAAA;AACnB,CAAC,EAJI,gBAAgB,KAAhB,gBAAgB,QAIpB;AA4BD,MAAa,OACX,SAAQ,gCAAc;IAMtB,YAAY,SAAqB;QAC/B,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,eAAS,CAAC,2BAAiC,CAAC,CAAC;IACvE,CAAC;IAED,eAAe,CACb,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAiB,EACjB,IAAc;QAEd,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,MAAM,IAAI,GAAG;YACX,gBAAgB,CAAC,IAAI;YACrB,gBAAgB,CAAC,IAAI;YACrB,gBAAgB,CAAC,MAAM;SACxB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAElB,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,+CAA+C,CACjF,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAC3C;YACE,YAAY,EAAE;gBACZ,MAAM,EAAE,MAAM;aACf;SACF,EACD;YACE,MAAM,EAAE,IAAI;SACb,CACF,CAAC;QAEF,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,IAAiB,EACjB,IAAc;QAEd,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,CAAC,YAAY,EAAE,mBAAmB,CAAC,GAAG,CAAC,GAG3C,EAAE;YACF,QAAQ,MAAM,EAAE;gBACd,KAAK,gBAAgB,CAAC,IAAI;oBACxB,OAAO;wBACL,MAAM;wBACN,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC;qBACxD,CAAC;gBACJ,KAAK,gBAAgB,CAAC,IAAI;oBACxB,OAAO;wBACL,MAAM;wBACN,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC;qBACnE,CAAC;gBACJ,KAAK,gBAAgB,CAAC,MAAM;oBAC1B,OAAO;wBACL,MAAM;wBACN,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC;qBACzD,CAAC;gBACJ;oBACE,MAAM,IAAI,KAAK,CACb,oBAAoB,MAAM,iCAAiC,CAC5D,CAAC;aACL;QACH,CAAC,CAAC,EAAE,CAAC;QAEL,uEAAuE;QACvE,mCAAmC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CACnD,YAAY,EACZ,mBAAmB,CACpB,CAAC;QAEF,OAAO,IAAI,CAAC,qCAAqC,CAC/C,QAAQ,EACR,SAAS,EACT,SAAS,EACT,UAAU,EACV,QAAQ,EACR,IAAI,CAAC,QAAQ,CACd,CAAC;IACJ,CAAC;;AAvGH,0BAwGC;AApGQ,eAAO,GAAG,CAAC,SAAS,CAAC,CAAC"}

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

@@ -1,11 +1,50 @@
-import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger, NumberAsString, DexExchangeParam, ExchangeTxInfo, PreprocessTransactionOptions } from '../../types';
+import { DeepReadonly } from 'ts-essentials';
+import { Token, Address, ExchangePrices, PoolPrices, Log, 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';
-import { MakerPsmEventPool } from './maker-psm-event-pool';
+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>>;
+}
 export declare class MakerPsm extends SimpleExchange implements IDex<MakerPsmData, MakerPsmDirectPayload> {
     protected network: Network;
     protected dexHelper: IDexHelper;
@@ -36,7 +75,6 @@ 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;
@@ -61,6 +99,5 @@ 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,23 +36,143 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MakerPsm = void 0;
+exports.MakerPsm = exports.MakerPsmEventPool = 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 maker_psm_event_pool_1 = require("./maker-psm-event-pool");
+const vatInterface = new abi_1.Interface(vat_json_1.default);
 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;
@@ -76,23 +196,18 @@ 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 maker_psm_event_pool_1.MakerPsmEventPool(dexKey, network, dexHelper, this.logger, p, this.vatAddress)));
+        poolConfigs.forEach(p => (this.eventPools[p.gem.address.toLowerCase()] = new MakerPsmEventPool(dexKey, network, dexHelper, this.logger, p, this.vatAddress)));
     }
     static getDirectFunctionNameV6() {
         return [core_1.ContractMethodV6.swapExactAmountInOutOnMakerPSM];
     }
     async initializePricing(blockNumber) {
-        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);
-            }
+        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],
+            });
         }));
     }
     // Returns the list of contract adapters (name and index)
@@ -345,45 +460,33 @@ 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 token = tokenAddress.toLowerCase();
-        const isDAI = this.dai.address.toLowerCase() === token;
+        const _tokenAddress = tokenAddress.toLowerCase();
         // 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;
-            const minLimit = buyLimit < sellLimit ? buyLimit : sellLimit;
-            const liquidity = Number(minLimit) / Number(bigint_constants_1.BI_POWS[18]);
-            return liquidity > 0 ? 2 * liquidity : 0;
+            return (2 *
+                parseInt(((buyLimit > sellLimit ? sellLimit : buyLimit) / bigint_constants_1.BI_POWS[18]).toString()));
         };
-        const validPoolConfigs = isDAI
+        const isDai = _tokenAddress === this.dai.address;
+        const validPoolConfigs = isDai
             ? this.poolConfigs
-            : this.eventPools[token]
-                ? [this.eventPools[token].poolConfig]
+            : this.eventPools[_tokenAddress]
+                ? [this.eventPools[_tokenAddress].poolConfig]
                 : [];
         if (!validPoolConfigs.length)
             return [];
-        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);
+        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],
+        }));
     }
 }
 exports.MakerPsm = MakerPsm;