@d8x/perpetuals-sdk 1.3.6 → 2.0.0-alpha

package/dist/cjs/marketData.js

@@ -3,13 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const abi_1 = require("@ethersproject/abi");
-const bignumber_1 = require("@ethersproject/bignumber");
-const contracts_1 = require("@ethersproject/contracts");
-const providers_1 = require("@ethersproject/providers");
-const units_1 = require("@ethersproject/units");
+const ethers_1 = require("ethers");
 const constants_1 = require("./constants");
-const contracts_2 = require("./contracts");
+const contracts_1 = require("./contracts");
 const d8XMath_1 = require("./d8XMath");
 const perpetualDataHandler_1 = __importDefault(require("./perpetualDataHandler"));
 const utils_1 = require("./utils");
@@ -48,16 +44,16 @@ class MarketData extends perpetualDataHandler_1.default {
      * @param providerOrMarketData optional provider or existing market data instance
      */
     async createProxyInstance(providerOrMarketData, overrides) {
-        if (providerOrMarketData == undefined || providers_1.Provider.isProvider(providerOrMarketData)) {
-            this.provider = providerOrMarketData ?? new providers_1.StaticJsonRpcProvider(this.nodeURL);
+        if (providerOrMarketData == undefined || !("createProxyInstance" in providerOrMarketData)) {
+            this.provider = providerOrMarketData ?? new ethers_1.JsonRpcProvider(this.nodeURL);
             await this.initContractsAndData(this.provider, overrides);
         }
         else {
             const mktData = providerOrMarketData;
             this.nodeURL = mktData.config.nodeURL;
-            this.provider = new providers_1.StaticJsonRpcProvider(mktData.config.nodeURL);
-            this.proxyContract = new contracts_1.Contract(mktData.getProxyAddress(), this.config.proxyABI, this.provider);
-            this.multicall = contracts_2.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, this.provider);
+            this.provider = new ethers_1.JsonRpcProvider(mktData.config.nodeURL, mktData.network, { staticNetwork: true });
+            this.proxyContract = new ethers_1.Contract(mktData.getProxyAddress(), this.config.proxyABI, this.provider);
+            this.multicall = contracts_1.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, this.provider);
             ({
                 nestedPerpetualIDs: this.nestedPerpetualIDs,
                 poolStaticInfos: this.poolStaticInfos,
@@ -77,7 +73,7 @@ class MarketData extends perpetualDataHandler_1.default {
         if (this.proxyContract == null) {
             throw Error("no proxy contract initialized. Use createProxyInstance().");
         }
-        return this.proxyContract.address;
+        return this.proxyContract.target.toString();
     }
     /**
      * Get the pre-computed triangulations
@@ -144,8 +140,8 @@ class MarketData extends perpetualDataHandler_1.default {
         if (overrides) {
             ({ rpcURL, ...overrides } = overrides);
         }
-        const provider = new providers_1.StaticJsonRpcProvider(rpcURL ?? this.nodeURL);
-        return await MarketData._exchangeInfo(new contracts_1.Contract(this.proxyAddr, this.config.proxyABI, provider), contracts_2.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, provider), this.poolStaticInfos, this.symbolToPerpStaticInfo, this.perpetualIdToSymbol, this.nestedPerpetualIDs, this.symbolList, this.priceFeedGetter, this.oraclefactoryAddr, // not undefined if proxy contract was initialized
+        const provider = new ethers_1.JsonRpcProvider(rpcURL ?? this.nodeURL, this.network, { staticNetwork: true });
+        return await MarketData._exchangeInfo(new ethers_1.Contract(this.proxyAddr, this.config.proxyABI, provider), contracts_1.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, provider), this.poolStaticInfos, this.symbolToPerpStaticInfo, this.perpetualIdToSymbol, this.nestedPerpetualIDs, this.symbolList, this.priceFeedGetter, this.oraclefactoryAddr, // not undefined if proxy contract was initialized
         overrides);
     }
     /**
@@ -185,7 +181,7 @@ class MarketData extends perpetualDataHandler_1.default {
         if (overrides) {
             ({ rpcURL, ...overrides } = overrides);
         }
-        const provider = new providers_1.StaticJsonRpcProvider(rpcURL ?? this.nodeURL);
+        const provider = new ethers_1.JsonRpcProvider(rpcURL ?? this.nodeURL, this.network, { staticNetwork: true });
         if (symbols.length < 1) {
             throw new Error(`No perpetuals found for symbol ${symbol}`);
         }
@@ -207,7 +203,7 @@ class MarketData extends perpetualDataHandler_1.default {
      */
     async _openOrdersOfPerpetual(traderAddr, symbol, provider, overrides) {
         // open orders requested only for given symbol
-        const orderBookContract = contracts_2.LimitOrderBook__factory.connect(this.getOrderBookContract(symbol).address, provider);
+        const orderBookContract = this.getOrderBookContract(symbol, provider);
         const orders = await MarketData.openOrdersOnOrderBook(traderAddr, orderBookContract, this.symbolToPerpStaticInfo, overrides);
         const digests = await MarketData.orderIdsOfTrader(traderAddr, orderBookContract, overrides);
         return { orders: orders, orderIds: digests };
@@ -223,8 +219,8 @@ class MarketData extends perpetualDataHandler_1.default {
         // filter by perpetuals with valid order book
         symbols = symbols.filter((symbol) => this.symbolToPerpStaticInfo.get(symbol)?.limitOrderBookAddr !== constants_1.ZERO_ADDRESS);
         // open orders requested only for given symbol
-        const orderBookContracts = symbols.map((symbol) => contracts_2.LimitOrderBook__factory.connect(this.getOrderBookContract(symbol).address, provider));
-        const multicall = contracts_2.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, provider);
+        const orderBookContracts = symbols.map((symbol) => this.getOrderBookContract(symbol, provider), this);
+        const multicall = contracts_1.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, provider);
         const { orders, digests } = await MarketData._openOrdersOnOrderBooks(traderAddr, orderBookContracts, multicall, this.symbolToPerpStaticInfo, overrides);
         return symbols.map((_symbol, i) => ({ orders: orders[i], orderIds: digests[i] }));
     }
@@ -268,7 +264,7 @@ class MarketData extends perpetualDataHandler_1.default {
         if (overrides) {
             ({ rpcURL, ...overrides } = overrides);
         }
-        const provider = new providers_1.StaticJsonRpcProvider(rpcURL ?? this.nodeURL);
+        const provider = new ethers_1.JsonRpcProvider(rpcURL ?? this.nodeURL, this.network, { staticNetwork: true });
         if (symbols.length < 1) {
             throw new Error(`No perpetuals found for symbol ${symbol}`);
         }
@@ -290,7 +286,7 @@ class MarketData extends perpetualDataHandler_1.default {
      */
     async _positionRiskForTraderInPerpetual(traderAddr, symbol, provider, overrides) {
         let obj = await this.priceFeedGetter.fetchPricesForPerpetual(symbol);
-        let mgnAcct = await perpetualDataHandler_1.default.getMarginAccount(traderAddr, symbol, this.symbolToPerpStaticInfo, new contracts_1.Contract(this.proxyAddr, this.config.proxyABI, provider), [obj.idxPrices[0], obj.idxPrices[1]], overrides);
+        let mgnAcct = await perpetualDataHandler_1.default.getMarginAccount(traderAddr, symbol, this.symbolToPerpStaticInfo, new ethers_1.Contract(this.proxyAddr, this.config.proxyABI, provider), [obj.idxPrices[0], obj.idxPrices[1]], overrides);
         return mgnAcct;
     }
     /**
@@ -311,7 +307,7 @@ class MarketData extends perpetualDataHandler_1.default {
         let callSymbols = symbols.slice(0, MAX_SYMBOLS_PER_CALL);
         let pxS2S3 = S2S3.slice(0, MAX_SYMBOLS_PER_CALL);
         while (callSymbols.length > 0) {
-            let acc = await perpetualDataHandler_1.default.getMarginAccounts(Array(callSymbols.length).fill(traderAddr), callSymbols, this.symbolToPerpStaticInfo, contracts_2.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, provider), new contracts_1.Contract(this.proxyAddr, this.config.proxyABI, provider), pxS2S3, overrides);
+            let acc = await perpetualDataHandler_1.default.getMarginAccounts(Array(callSymbols.length).fill(traderAddr), callSymbols, this.symbolToPerpStaticInfo, contracts_1.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, provider), new ethers_1.Contract(this.proxyAddr, this.config.proxyABI, provider), pxS2S3, overrides);
             mgnAcct = mgnAcct.concat(acc);
             callSymbols = symbols.slice(mgnAcct.length, mgnAcct.length + MAX_SYMBOLS_PER_CALL);
             pxS2S3 = S2S3.slice(mgnAcct.length, mgnAcct.length + MAX_SYMBOLS_PER_CALL);
@@ -371,19 +367,19 @@ class MarketData extends perpetualDataHandler_1.default {
         const proxyCalls = [
             // 0: traderState
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: true,
                 callData: this.proxyContract.interface.encodeFunctionData("getTraderState", [perpId, traderAddr, fS2S3]),
             },
             // 1: ammState
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: true,
                 callData: this.proxyContract.interface.encodeFunctionData("getAMMState", [perpId, fS2S3]),
             },
             // 2: exchangeFee
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: false,
                 callData: this.proxyContract.interface.encodeFunctionData("queryExchangeFee", [
                     poolId,
@@ -393,7 +389,7 @@ class MarketData extends perpetualDataHandler_1.default {
             },
             // 3: perpetual price
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: true,
                 callData: this.proxyContract.interface.encodeFunctionData("queryPerpetualPrice", [
                     perpId,
@@ -403,31 +399,27 @@ class MarketData extends perpetualDataHandler_1.default {
             },
             // 4: max long pos
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: false,
                 callData: this.proxyContract.interface.encodeFunctionData("getMaxSignedOpenTradeSizeForPos", [
                     perpId,
-                    account
-                        ? (0, d8XMath_1.floatToABK64x64)(account.positionNotionalBaseCCY * (account.side === constants_1.BUY_SIDE ? 1 : -1))
-                        : bignumber_1.BigNumber.from(0),
+                    account ? (0, d8XMath_1.floatToABK64x64)(account.positionNotionalBaseCCY * (account.side === constants_1.BUY_SIDE ? 1 : -1)) : 0n,
                     true,
                 ]),
             },
             // 5: max short pos
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: false,
                 callData: this.proxyContract.interface.encodeFunctionData("getMaxSignedOpenTradeSizeForPos", [
                     perpId,
-                    account
-                        ? (0, d8XMath_1.floatToABK64x64)(account.positionNotionalBaseCCY * (account.side === constants_1.BUY_SIDE ? 1 : -1))
-                        : bignumber_1.BigNumber.from(0),
+                    account ? (0, d8XMath_1.floatToABK64x64)(account.positionNotionalBaseCCY * (account.side === constants_1.BUY_SIDE ? 1 : -1)) : 0n,
                     false,
                 ]),
             },
         ];
         // multicall
-        const encodedResults = await this.multicall.callStatic.aggregate3(proxyCalls, (overrides || {}));
+        const encodedResults = await this.multicall.aggregate3.staticCall(proxyCalls, (overrides || {}));
         // positionRisk to apply this trade on: if not given, defaults to the current trader's position
         if (!account) {
             let traderState;
@@ -509,8 +501,8 @@ class MarketData extends perpetualDataHandler_1.default {
         // max sell
         const fMaxShort = this.proxyContract.interface.decodeFunctionResult("getMaxSignedOpenTradeSizeForPos", encodedResults[5].returnData)[0];
         const maxShortTrade = account.side == constants_1.SELL_SIDE
-            ? Math.max(0, (0, d8XMath_1.ABK64x64ToFloat)(fMaxShort.abs()) - (accountGiven ? 0 : Math.abs(account.positionNotionalBaseCCY)))
-            : (0, d8XMath_1.ABK64x64ToFloat)(fMaxShort.abs()) + Math.abs(account.positionNotionalBaseCCY);
+            ? Math.max(0, Math.abs((0, d8XMath_1.ABK64x64ToFloat)(fMaxShort)) - (accountGiven ? 0 : Math.abs(account.positionNotionalBaseCCY)))
+            : Math.abs((0, d8XMath_1.ABK64x64ToFloat)(fMaxShort)) + Math.abs(account.positionNotionalBaseCCY);
         // Current state:
         let lotSizeBC = MarketData._getLotSize(order.symbol, this.symbolToPerpStaticInfo);
         // Too small, no change to account
@@ -534,7 +526,7 @@ class MarketData extends perpetualDataHandler_1.default {
         let newSide = newPositionBC > 0 ? constants_1.BUY_SIDE : newPositionBC < 0 ? constants_1.SELL_SIDE : constants_1.CLOSED_SIDE;
         if (tradingFeeTbps === undefined) {
             // use usual input if not overriden
-            tradingFeeTbps = exchangeFeeTbps + (order.brokerFeeTbps ?? 0);
+            tradingFeeTbps = Number(exchangeFeeTbps) + (order.brokerFeeTbps ?? 0);
         }
         let tradingFeeCC = (Math.abs(tradeAmountBC) * tradingFeeTbps * 1e-5 * S2) / S3;
         let referralFeeCC = this.symbolToPerpStaticInfo.get(account.symbol).referralRebate;
@@ -754,10 +746,10 @@ class MarketData extends perpetualDataHandler_1.default {
     async getWalletBalance(address, symbol, overrides) {
         let poolIdx = this.getPoolStaticInfoIndexFromSymbol(symbol);
         let settleTokenAddr = this.poolStaticInfos[poolIdx].poolSettleTokenAddr;
-        let token = contracts_2.ERC20__factory.connect(settleTokenAddr, this.provider);
+        let token = contracts_1.ERC20__factory.connect(settleTokenAddr, this.provider);
         let walletBalance = await token.balanceOf(address, overrides || {});
         let decimals = this.poolStaticInfos[poolIdx].poolSettleTokenDecimals;
-        return Number((0, units_1.formatUnits)(walletBalance, decimals));
+        return Number((0, ethers_1.formatUnits)(walletBalance, decimals));
     }
     /**
      * Get the address' balance of the pool share token
@@ -791,7 +783,7 @@ class MarketData extends perpetualDataHandler_1.default {
      */
     async _getPoolShareTokenBalanceFromId(address, poolId, overrides) {
         let shareTokenAddr = this.poolStaticInfos[poolId - 1].shareTokenAddr;
-        let shareToken = contracts_2.ERC20__factory.connect(shareTokenAddr, this.provider);
+        let shareToken = contracts_1.ERC20__factory.connect(shareTokenAddr, this.provider);
         let d18ShareTokenBalanceOfAddr = await shareToken.balanceOf(address, overrides || {});
         return (0, d8XMath_1.dec18ToFloat)(d18ShareTokenBalanceOfAddr);
     }
@@ -900,7 +892,7 @@ class MarketData extends perpetualDataHandler_1.default {
         const poolId = this.getPoolIdFromSymbol(symbol);
         const poolInfo = this.poolStaticInfos[this.getPoolStaticInfoIndexFromSymbol(symbol)];
         const perpInfo = this.getPerpetualStaticInfo(symbol);
-        const IERC20 = new abi_1.Interface(constants_1.ERC20_ABI);
+        const IERC20 = new ethers_1.Interface(constants_1.ERC20_ABI);
         const indexPriceInfo = await this.priceFeedGetter
             .fetchPricesForPerpetual(symbol)
             .then((obj) => [obj.idxPrices[0], obj.idxPrices[1], obj.mktClosed[0], obj.mktClosed[1]]);
@@ -909,7 +901,7 @@ class MarketData extends perpetualDataHandler_1.default {
         const proxyCalls = [
             // 0: traderState
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: false,
                 callData: this.proxyContract.interface.encodeFunctionData("getTraderState", [perpId, traderAddr, fS2S3]),
             },
@@ -921,7 +913,7 @@ class MarketData extends perpetualDataHandler_1.default {
             },
             // 2: exchange fee
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: false,
                 callData: this.proxyContract.interface.encodeFunctionData("queryExchangeFee", [
                     poolId,
@@ -931,7 +923,7 @@ class MarketData extends perpetualDataHandler_1.default {
             },
         ];
         // multicall
-        const encodedResults = await this.multicall.callStatic.aggregate3(proxyCalls, overrides || {});
+        const encodedResults = await this.multicall.aggregate3.staticCall(proxyCalls, overrides || {});
         // position risk
         const idxNotional = 4;
         const traderState = this.proxyContract.interface.decodeFunctionResult("getTraderState", encodedResults[0].returnData)[0];
@@ -940,14 +932,14 @@ class MarketData extends perpetualDataHandler_1.default {
             indexPriceInfo[1],
         ]);
         // fee rate
-        const feeRate = 1e-5 *
-            this.proxyContract.interface.decodeFunctionResult("queryExchangeFee", encodedResults[2].returnData)[0];
+        const feeRateTbps = this.proxyContract.interface.decodeFunctionResult("queryExchangeFee", encodedResults[2].returnData)[0];
+        const feeRate = 1e-5 * Number(feeRateTbps);
         // Max based on margin requirements:
         const walletBalance = (0, d8XMath_1.decNToFloat)(IERC20.decodeFunctionResult("balanceOf", encodedResults[1].returnData)[0], poolInfo.poolSettleTokenDecimals);
         const proxyCalls2 = [
             // 0: max long
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: false,
                 callData: this.proxyContract.interface.encodeFunctionData("getMaxSignedOpenTradeSizeForPos", [
                     perpId,
@@ -957,7 +949,7 @@ class MarketData extends perpetualDataHandler_1.default {
             },
             // 1: max short
             {
-                target: this.proxyContract.address,
+                target: this.proxyContract.target,
                 allowFailure: false,
                 callData: this.proxyContract.interface.encodeFunctionData("getMaxSignedOpenTradeSizeForPos", [
                     perpId,
@@ -967,7 +959,7 @@ class MarketData extends perpetualDataHandler_1.default {
             },
         ];
         // multicall
-        const encodedResults2 = await this.multicall.callStatic.aggregate3(proxyCalls2, overrides || {});
+        const encodedResults2 = await this.multicall.aggregate3.staticCall(proxyCalls2, overrides || {});
         // Max based on perp:
         // max buy
         const maxLongOrderPerp = (0, d8XMath_1.ABK64x64ToFloat)(this.proxyContract.interface.decodeFunctionResult("getMaxSignedOpenTradeSizeForPos", encodedResults2[0].returnData)[0]);
@@ -1015,7 +1007,7 @@ class MarketData extends perpetualDataHandler_1.default {
     async maxSignedPosition(side, symbol, overrides) {
         let perpId = this.getPerpIdFromSymbol(symbol);
         let isBuy = side == constants_1.BUY_SIDE;
-        let maxSignedPos = await this.proxyContract.getMaxSignedOpenTradeSizeForPos(perpId, bignumber_1.BigNumber.from(0), isBuy, overrides || {});
+        let maxSignedPos = await this.proxyContract.getMaxSignedOpenTradeSizeForPos(perpId, 0n, isBuy, overrides || {});
         return (0, d8XMath_1.ABK64x64ToFloat)(maxSignedPos);
     }
     /**
@@ -1071,7 +1063,7 @@ class MarketData extends perpetualDataHandler_1.default {
             throw Error("no proxy contract initialized. Use createProxyInstance().");
         }
         const orderBookContract = this.getOrderBookContract(symbol);
-        const status = (await orderBookContract.getOrderStatus(orderId, overrides || {}));
+        const status = Number(await orderBookContract.getOrderStatus(orderId, overrides || {}));
         return status;
     }
     /**
@@ -1100,12 +1092,12 @@ class MarketData extends perpetualDataHandler_1.default {
         }
         const orderBookContract = this.getOrderBookContract(symbol);
         const statusCalls = orderId.map((id) => ({
-            target: orderBookContract.address,
+            target: orderBookContract.target,
             allowFailure: false,
             callData: orderBookContract.interface.encodeFunctionData("getOrderStatus", [id]),
         }));
         // multicall
-        const encodedResults = await this.multicall.callStatic.aggregate3(statusCalls, overrides || {});
+        const encodedResults = await this.multicall.aggregate3.staticCall(statusCalls, overrides || {});
         // order status
         return encodedResults.map((encodedResult) => orderBookContract.interface.decodeFunctionResult("getOrderStatus", encodedResult.returnData)[0]);
     }
@@ -1311,17 +1303,17 @@ class MarketData extends perpetualDataHandler_1.default {
             const contracts = orderBookContracts.filter((_c, i) => haveMoreOrders[i]);
             // prepare calls
             const ordersCalls = contracts.map((c, i) => ({
-                target: c.address,
+                target: c.target,
                 allowFailure: true,
                 callData: c.interface.encodeFunctionData("getOrders", [traderAddr, from[i], bulkSize]),
             }));
             const digestsCalls = contracts.map((c, i) => ({
-                target: c.address,
+                target: c.target,
                 allowFailure: true,
                 callData: c.interface.encodeFunctionData("limitDigestsOfTrader", [traderAddr, from[i], bulkSize]),
             }));
             // call
-            const encodedResults = await multicall.callStatic.aggregate3(ordersCalls.concat(digestsCalls), overrides || {});
+            const encodedResults = await multicall.aggregate3.staticCall(ordersCalls.concat(digestsCalls), overrides || {});
             const encodedOrders = encodedResults.slice(0, ordersCalls.length);
             const encodedDigests = encodedResults.slice(ordersCalls.length);
             // parse
@@ -1329,19 +1321,19 @@ class MarketData extends perpetualDataHandler_1.default {
                 .slice(0, ordersCalls.length)
                 .map(({ success, returnData }, i) => {
                 if (!success)
-                    throw new Error(`Failed to get orders for order book ${contracts[i].address}`);
+                    throw new Error(`Failed to get orders for order book ${contracts[i].target}`);
                 return contracts[i].interface.decodeFunctionResult("getOrders", returnData)[0];
             });
             const allDigests = encodedDigests.map(({ success, returnData }, i) => {
                 if (!success)
-                    throw new Error(`Failed to get orders for order book ${contracts[i].address}`);
+                    throw new Error(`Failed to get orders for order book ${contracts[i].target}`);
                 return contracts[i].interface.decodeFunctionResult("limitDigestsOfTrader", returnData)[0];
             });
             // arrange
             for (let j = 0; j < contracts.length; j++) {
                 let orders = allOrders[j].filter((o) => o.traderAddr != constants_1.ZERO_ADDRESS);
                 let digests = allDigests[j].filter((d) => d != constants_1.ZERO_ORDER_ID);
-                let i = orderBookContracts.findIndex((c) => c.address == contracts[j].address);
+                let i = orderBookContracts.findIndex((c) => c.target == contracts[j].target);
                 let k = 0;
                 while (k < orders.length && orders[k].traderAddr != constants_1.ZERO_ADDRESS) {
                     userFriendlyOrders[i].push(perpetualDataHandler_1.default.fromClientOrder(orders[k], symbolToPerpStaticInfo));
@@ -1365,7 +1357,7 @@ class MarketData extends perpetualDataHandler_1.default {
         let digestsRaw = await orderBookContract.limitDigestsOfTrader(traderAddr, 0, 15, overrides || {});
         let k = 0;
         let digests = [];
-        while (k < digestsRaw.length && bignumber_1.BigNumber.from(digestsRaw[k]).gt(0)) {
+        while (k < digestsRaw.length && BigInt(digestsRaw[k]) > 0n) {
             digests.push(digestsRaw[k]);
             k++;
         }
@@ -1541,7 +1533,7 @@ class MarketData extends perpetualDataHandler_1.default {
                 let symbol3s = _perpetualIdToSymbol.get(id);
                 let info = _symbolToPerpStaticInfo.get(symbol3s);
                 let S2 = (0, d8XMath_1.floatToABK64x64)(_idxPriceMap.get(info.S2Symbol)[0]);
-                let S3 = bignumber_1.BigNumber.from(0);
+                let S3 = 0n;
                 if (info.S3Symbol != "") {
                     S3 = (0, d8XMath_1.floatToABK64x64)(_idxPriceMap.get(info.S3Symbol)[0]);
                 }
@@ -1549,13 +1541,13 @@ class MarketData extends perpetualDataHandler_1.default {
                 indexPrices.push(S3);
             }
             proxyCalls.push({
-                target: _proxyContract.address,
+                target: _proxyContract.target,
                 allowFailure: false,
                 callData: _proxyContract.interface.encodeFunctionData("queryMidPrices", [perpetualIDChunks[k], indexPrices]),
             });
         }
         // multicall
-        const encodedResults = await _multicall.callStatic.aggregate3(proxyCalls, overrides || {});
+        const encodedResults = await _multicall.aggregate3.staticCall(proxyCalls, overrides || {});
         // apply results
         for (let k = 0; k < perpetualIDChunks.length; k++) {
             let fMidPrice = _proxyContract.interface.decodeFunctionResult("queryMidPrices", encodedResults[k].returnData)[0];
@@ -1586,13 +1578,13 @@ class MarketData extends perpetualDataHandler_1.default {
             const proxyCalls = [
                 // getLiquidityPools
                 {
-                    target: _proxyContract.address,
+                    target: _proxyContract.target,
                     allowFailure: false,
                     callData: _proxyContract.interface.encodeFunctionData("getLiquidityPools", [iFrom, iFrom + chunkSize - 1]), // from-to includes "to"
                 },
                 // getPerpetuals
                 {
-                    target: _proxyContract.address,
+                    target: _proxyContract.target,
                     allowFailure: false,
                     callData: _proxyContract.interface.encodeFunctionData("getPerpetuals", [
                         _nestedPerpetualIDs.slice(iFrom - 1, iFrom + chunkSize - 1).flat(), // from-to does not include "to"
@@ -1600,7 +1592,7 @@ class MarketData extends perpetualDataHandler_1.default {
                 },
             ];
             // multicall
-            const encodedResults = await _multicall.callStatic.aggregate3(proxyCalls, overrides || {});
+            const encodedResults = await _multicall.aggregate3.staticCall(proxyCalls, overrides || {});
             const pools = _proxyContract.interface.decodeFunctionResult("getLiquidityPools", encodedResults[0].returnData)[0];
             const perps = _proxyContract.interface.decodeFunctionResult("getPerpetuals", encodedResults[1].returnData)[0];
             poolStates = poolStates.concat(MarketData._poolDataToPoolState(pools, _poolStaticInfos));
@@ -1639,7 +1631,7 @@ class MarketData extends perpetualDataHandler_1.default {
      */
     static _perpetualDataToPerpetualState(_perpetuals, _symbolList) {
         const perpStates = _perpetuals.map((perp) => ({
-            id: perp.id,
+            id: Number(perp.id),
             state: constants_1.PERP_STATE_STR[perp.state],
             baseCurrency: (0, utils_1.contractSymbolToSymbol)(perp.S2BaseCCY, _symbolList),
             quoteCurrency: (0, utils_1.contractSymbolToSymbol)(perp.S2QuoteCCY, _symbolList),
@@ -1669,7 +1661,11 @@ class MarketData extends perpetualDataHandler_1.default {
      */
     static async _exchangeInfo(_proxyContract, _multicall, _poolStaticInfos, _symbolToPerpStaticInfo, _perpetualIdToSymbol, _nestedPerpetualIDs, _symbolList, _priceFeedGetter, _oracleFactoryAddr, overrides) {
         // get the factory address (shared among all pools)
-        let info = { pools: [], oracleFactoryAddr: _oracleFactoryAddr, proxyAddr: _proxyContract.address };
+        let info = {
+            pools: [],
+            oracleFactoryAddr: _oracleFactoryAddr,
+            proxyAddr: _proxyContract.target.toString(),
+        };
         // get all prices from off-chain price-sources: no RPC calls
         let idxPriceMap = await MarketData._getAllIndexPrices(_symbolToPerpStaticInfo, _priceFeedGetter);
         // query mid-prices from on-chain conditional on the off-chain prices
@@ -1768,7 +1764,7 @@ class MarketData extends perpetualDataHandler_1.default {
                 this.getPerpIdFromSymbol(s),
             ]),
         }));
-        const encodedResults = await this.multicall.callStatic.aggregate3(proxyCalls);
+        const encodedResults = await this.multicall.aggregate3.staticCall(proxyCalls);
         const prices = encodedResults.map((result) => this.proxyContract.interface.decodeFunctionResult("getLastPerpetualBaseToUSDConversion", result.returnData)[0]);
         prices.forEach((px, i) => {
             const s = `${symbols[i].split("-")[0]}-USD`;