@d8x/perpetuals-sdk 1.3.6 → 2.0.0-alpha

package/dist/cjs/perpetualDataHandler.js

@@ -3,14 +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 abstract_signer_1 = require("@ethersproject/abstract-signer");
-const bignumber_1 = require("@ethersproject/bignumber");
-const constants_1 = require("@ethersproject/constants");
-const contracts_1 = require("@ethersproject/contracts");
-const providers_1 = require("@ethersproject/providers");
-const constants_2 = require("./constants");
-const contracts_2 = require("./contracts");
+const ethers_1 = require("ethers");
+const constants_1 = require("./constants");
+const contracts_1 = require("./contracts");
 const d8XMath_1 = require("./d8XMath");
 const priceFeeds_1 = __importDefault(require("./priceFeeds"));
 const utils_1 = require("./utils");
@@ -40,14 +35,15 @@ class PerpetualDataHandler {
         this.symbolToTokenAddrMap = new Map();
         this.perpetualIdToSymbol = new Map();
         this.nestedPerpetualIDs = new Array();
-        this.chainId = config.chainId;
+        this.chainId = BigInt(config.chainId);
+        this.network = new ethers_1.Network(config.name || "", this.chainId);
         this.proxyAddr = config.proxyAddr;
         this.nodeURL = config.nodeURL;
         this.proxyABI = config.proxyABI;
         this.lobFactoryABI = config.lobFactoryABI;
         this.lobABI = config.lobABI;
         this.shareTokenABI = config.shareTokenABI;
-        this.symbolList = constants_2.SYMBOL_LIST;
+        this.symbolList = constants_1.SYMBOL_LIST;
         this.priceFeedGetter = new priceFeeds_1.default(this, config.priceFeedConfigNetwork);
     }
     async initContractsAndData(signerOrProvider, overrides) {
@@ -55,11 +51,11 @@ class PerpetualDataHandler {
         // check network
         let network;
         try {
-            if (signerOrProvider instanceof abstract_signer_1.Signer) {
+            if (signerOrProvider.provider) {
                 network = await signerOrProvider.provider.getNetwork();
             }
             else {
-                network = await signerOrProvider.getNetwork();
+                throw new Error("Signer has no provider"); // TODO: check
             }
         }
         catch (error) {
@@ -69,8 +65,8 @@ class PerpetualDataHandler {
         if (network.chainId !== this.chainId) {
             throw new Error(`Provider: chain id ${network.chainId} does not match config (${this.chainId})`);
         }
-        this.proxyContract = new contracts_1.Contract(this.proxyAddr, this.config.proxyABI, signerOrProvider);
-        this.multicall = contracts_2.Multicall3__factory.connect(this.config.multicall ?? constants_2.MULTICALL_ADDRESS, this.signerOrProvider);
+        this.proxyContract = new ethers_1.Contract(this.proxyAddr, this.config.proxyABI, signerOrProvider);
+        this.multicall = contracts_1.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, this.signerOrProvider);
         await this._fillSymbolMaps(overrides);
     }
     /**
@@ -78,14 +74,22 @@ class PerpetualDataHandler {
      * @param symbol symbol of the form ETH-USD-MATIC
      * @returns order book contract for the perpetual
      */
-    getOrderBookContract(symbol, provider) {
+    getOrderBookContract(symbol, signerOrProvider) {
         let orderBookAddr = this.symbolToPerpStaticInfo.get(symbol)?.limitOrderBookAddr;
-        if (orderBookAddr == "" || orderBookAddr == undefined || this.signerOrProvider == null) {
+        if (orderBookAddr == "" || orderBookAddr == undefined) {
             throw Error(`no limit order book found for ${symbol} or no signer`);
         }
-        let lobContract = contracts_2.LimitOrderBook__factory.connect(orderBookAddr, provider ?? this.signerOrProvider);
+        let lobContract = contracts_1.LimitOrderBook__factory.connect(orderBookAddr, signerOrProvider ?? this.signerOrProvider);
         return lobContract;
     }
+    /**
+     * Returns the order-book contract for the symbol if found or fails
+     * @param symbol symbol of the form ETH-USD-MATIC
+     * @returns order book contract for the perpetual
+     */
+    getOrderBookAddress(symbol) {
+        return this.symbolToPerpStaticInfo.get(symbol)?.limitOrderBookAddr;
+    }
     /**
      * Get perpetuals for the given ids from onchain
      * @param ids perpetual ids
@@ -123,7 +127,7 @@ class PerpetualDataHandler {
         const tokenOverrides = require("./config/tokenOverrides.json");
         let poolInfo = await PerpetualDataHandler.getPoolStaticInfo(this.proxyContract, overrides);
         this.nestedPerpetualIDs = poolInfo.nestedPerpetualIDs;
-        const IERC20 = new abi_1.Interface(constants_2.ERC20_ABI);
+        const IERC20 = contracts_1.ERC20__factory.createInterface();
         const proxyCalls = poolInfo.poolMarginTokenAddr.map((tokenAddr) => ({
             target: tokenAddr,
             allowFailure: false,
@@ -140,7 +144,7 @@ class PerpetualDataHandler {
             callData: this.proxyContract.interface.encodeFunctionData("getOracleFactory"),
         });
         // multicall
-        const encodedResults = await this.multicall.callStatic.aggregate3(proxyCalls, overrides || {});
+        const encodedResults = await this.multicall.aggregate3.staticCall(proxyCalls, overrides || {});
         // decimals
         for (let j = 0; j < poolInfo.nestedPerpetualIDs.length; j++) {
             const decimals = IERC20.decodeFunctionResult("decimals", encodedResults[j].returnData)[0];
@@ -148,26 +152,26 @@ class PerpetualDataHandler {
                 poolId: j + 1,
                 poolMarginSymbol: "",
                 poolMarginTokenAddr: poolInfo.poolMarginTokenAddr[j],
-                poolMarginTokenDecimals: decimals,
+                poolMarginTokenDecimals: Number(decimals),
                 poolSettleSymbol: "",
                 poolSettleTokenAddr: poolInfo.poolMarginTokenAddr[j],
-                poolSettleTokenDecimals: decimals,
+                poolSettleTokenDecimals: Number(decimals),
                 shareTokenAddr: poolInfo.poolShareTokenAddr[j],
                 oracleFactoryAddr: poolInfo.oracleFactory,
-                isRunning: poolInfo.poolShareTokenAddr[j] != constants_1.AddressZero,
+                isRunning: poolInfo.poolShareTokenAddr[j] != ethers_1.ZeroAddress,
                 MgnToSettleTriangulation: ["*", "1"], // correct later
             };
             this.poolStaticInfos.push(info);
         }
         //pyth
-        const oracle = contracts_2.OracleFactory__factory.connect(poolInfo.oracleFactory, this.signerOrProvider);
+        const oracle = contracts_1.OracleFactory__factory.connect(poolInfo.oracleFactory, this.signerOrProvider);
         this.pythAddr = await oracle.pyth();
-        if (this.pythAddr == constants_2.ZERO_ADDRESS) {
+        if (this.pythAddr == constants_1.ZERO_ADDRESS) {
             this.pythAddr = await oracle.onDemandFeed();
         }
         // order book factory
         this.lobFactoryAddr = this.proxyContract.interface.decodeFunctionResult("getOrderBookFactoryAddress", encodedResults[encodedResults.length - 2].returnData)[0];
-        this.lobFactoryContract = contracts_2.LimitOrderBookFactory__factory.connect(this.lobFactoryAddr, this.signerOrProvider);
+        this.lobFactoryContract = contracts_1.LimitOrderBookFactory__factory.connect(this.lobFactoryAddr, this.signerOrProvider);
         // oracle factory
         this.oraclefactoryAddr = this.proxyContract.interface.decodeFunctionResult("getOracleFactory", encodedResults[encodedResults.length - 1].returnData)[0];
         let perpStaticInfos = await PerpetualDataHandler.getPerpetualStaticInfo(this.proxyContract, this.nestedPerpetualIDs, this.symbolList, overrides);
@@ -194,10 +198,10 @@ class PerpetualDataHandler {
                     const base3 = perp.S3Symbol.split("-")[0];
                     // we find out the pool currency by looking at all perpetuals
                     // from the perpetual.
-                    if (perp.collateralCurrencyType == constants_2.COLLATERAL_CURRENCY_BASE) {
+                    if (perp.collateralCurrencyType == constants_1.COLLATERAL_CURRENCY_BASE) {
                         poolCCY = base;
                     }
-                    else if (perp.collateralCurrencyType == constants_2.COLLATERAL_CURRENCY_QUOTE) {
+                    else if (perp.collateralCurrencyType == constants_1.COLLATERAL_CURRENCY_QUOTE) {
                         poolCCY = quote;
                     }
                     else {
@@ -250,14 +254,12 @@ class PerpetualDataHandler {
             currPoolId = poolId;
             // We only assume the flag to be correct
             // in the first perpetual of the pool
-            const flag = perpStaticInfos[j].perpFlags == undefined
-                ? bignumber_1.BigNumber.from(0)
-                : bignumber_1.BigNumber.from(perpStaticInfos[j].perpFlags.toString());
+            const flag = perpStaticInfos[j].perpFlags == undefined ? 0n : BigInt(perpStaticInfos[j].perpFlags.toString());
             // find settlement setting for this flag
             let s = undefined;
             for (let j = 0; j < this.settlementConfig.length; j++) {
-                const masked = flag.and(bignumber_1.BigNumber.from(this.settlementConfig[j].perpFlags.toString()));
-                if (!masked.isZero()) {
+                const masked = flag & BigInt(this.settlementConfig[j].perpFlags.toString());
+                if (masked != 0n) {
                     s = this.settlementConfig[j];
                     break;
                 }
@@ -456,7 +458,7 @@ class PerpetualDataHandler {
         // query blockchain in chunks
         const infoArr = new Array();
         for (let k = 0; k < ids.length; k++) {
-            let perpInfos = await _proxyContract.getPerpetualStaticInfo(ids[k], overrides || {});
+            let perpInfos = (await _proxyContract.getPerpetualStaticInfo(ids[k], overrides || {}));
             for (let j = 0; j < perpInfos.length; j++) {
                 let base = (0, utils_1.contractSymbolToSymbol)(perpInfos[j].S2BaseCCY, symbolList);
                 let quote = (0, utils_1.contractSymbolToSymbol)(perpInfos[j].S2QuoteCCY, symbolList);
@@ -465,12 +467,12 @@ class PerpetualDataHandler {
                 let sym2 = base + "-" + quote;
                 let sym3 = base3 == "" ? "" : base3 + "-" + quote3;
                 let info = {
-                    id: perpInfos[j].id,
-                    poolId: Math.floor(perpInfos[j].id / 100000),
+                    id: Number(perpInfos[j].id),
+                    poolId: Math.floor(Number(perpInfos[j].id) / 100000),
                     limitOrderBookAddr: perpInfos[j].limitOrderBookAddr,
                     initialMarginRate: (0, d8XMath_1.ABDK29ToFloat)(perpInfos[j].fInitialMarginRate),
                     maintenanceMarginRate: (0, d8XMath_1.ABDK29ToFloat)(perpInfos[j].fMaintenanceMarginRate),
-                    collateralCurrencyType: perpInfos[j].collCurrencyType,
+                    collateralCurrencyType: Number(perpInfos[j].collCurrencyType),
                     S2Symbol: sym2,
                     S3Symbol: sym3,
                     lotSizeBC: (0, d8XMath_1.ABK64x64ToFloat)(perpInfos[j].fLotSizeBC),
@@ -528,22 +530,22 @@ class PerpetualDataHandler {
                 isRunning: orig.isRunning,
                 iPerpetualCount: Number(orig.iPerpetualCount),
                 id: Number(orig.id),
-                fCeilPnLShare: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fCeilPnLShare)),
+                fCeilPnLShare: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fCeilPnLShare)),
                 marginTokenDecimals: Number(orig.marginTokenDecimals),
                 iTargetPoolSizeUpdateTime: Number(orig.iTargetPoolSizeUpdateTime),
                 marginTokenAddress: orig.marginTokenAddress,
                 prevAnchor: Number(orig.prevAnchor),
-                fRedemptionRate: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fRedemptionRate)),
+                fRedemptionRate: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fRedemptionRate)),
                 shareTokenAddress: orig.shareTokenAddress,
-                fPnLparticipantsCashCC: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fPnLparticipantsCashCC)),
-                fTargetAMMFundSize: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fTargetAMMFundSize)),
-                fDefaultFundCashCC: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fDefaultFundCashCC)),
-                fTargetDFSize: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fTargetDFSize)),
-                fBrokerCollateralLotSize: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fBrokerCollateralLotSize)),
-                prevTokenAmount: (0, d8XMath_1.dec18ToFloat)(bignumber_1.BigNumber.from(orig.prevTokenAmount)),
-                nextTokenAmount: (0, d8XMath_1.dec18ToFloat)(bignumber_1.BigNumber.from(orig.nextTokenAmount)),
-                totalSupplyShareToken: (0, d8XMath_1.dec18ToFloat)(bignumber_1.BigNumber.from(orig.totalSupplyShareToken)),
-                fBrokerFundCashCC: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fBrokerFundCashCC)), // state: amount of cash in broker fund
+                fPnLparticipantsCashCC: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fPnLparticipantsCashCC)),
+                fTargetAMMFundSize: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fTargetAMMFundSize)),
+                fDefaultFundCashCC: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fDefaultFundCashCC)),
+                fTargetDFSize: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fTargetDFSize)),
+                fBrokerCollateralLotSize: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fBrokerCollateralLotSize)),
+                prevTokenAmount: (0, d8XMath_1.dec18ToFloat)(BigInt(orig.prevTokenAmount)),
+                nextTokenAmount: (0, d8XMath_1.dec18ToFloat)(BigInt(orig.nextTokenAmount)),
+                totalSupplyShareToken: (0, d8XMath_1.dec18ToFloat)(BigInt(orig.totalSupplyShareToken)),
+                fBrokerFundCashCC: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fBrokerFundCashCC)), // state: amount of cash in broker fund
             };
             p.push(v);
         }
@@ -558,6 +560,7 @@ class PerpetualDataHandler {
      * @returns array of PerpetualData converted into decimals
      */
     static async _getPerpetuals(ids, _proxyContract, _symbolList, overrides) {
+        // TODO: can't be type safe here because proxyContract's abi is not static across chains (zkevm is the exception)
         const rawPerps = await _proxyContract.getPerpetuals(ids, overrides || {});
         let p = new Array();
         for (let k = 0; k < rawPerps.length; k++) {
@@ -570,7 +573,7 @@ class PerpetualDataHandler {
                 iLastFundingTime: Number(orig.iLastFundingTime),
                 fDFCoverNRate: (0, d8XMath_1.ABDK29ToFloat)(Number(orig.fDFCoverNRate)),
                 fMaintenanceMarginRate: (0, d8XMath_1.ABDK29ToFloat)(Number(orig.fMaintenanceMarginRate)),
-                perpetualState: constants_2.PERP_STATE_STR[Number(orig.state)],
+                perpetualState: constants_1.PERP_STATE_STR[Number(orig.state)],
                 eCollateralCurrency: Number(orig.eCollateralCurrency),
                 S2BaseCCY: (0, utils_1.contractSymbolToSymbol)((0, utils_1.fromBytes4)(Buffer.from(orig.S2BaseCCY.toString())), _symbolList),
                 S2QuoteCCY: (0, utils_1.contractSymbolToSymbol)((0, utils_1.fromBytes4)(Buffer.from(orig.S2QuoteCCY.toString())), _symbolList),
@@ -581,44 +584,41 @@ class PerpetualDataHandler {
                 fSigma3: (0, d8XMath_1.ABDK29ToFloat)(Number(orig.fSigma3)),
                 fRho23: (0, d8XMath_1.ABDK29ToFloat)(Number(orig.fRho23)),
                 liquidationPenaltyRateBps: Number(orig.liquidationPenaltyRateTbps) / 10,
-                currentMarkPremiumRatePrice: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.currentMarkPremiumRate.fPrice)),
+                currentMarkPremiumRatePrice: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.currentMarkPremiumRate.fPrice)),
                 currentMarkPremiumRateTime: Number(orig.currentMarkPremiumRate.time),
-                premiumRatesEMA: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.premiumRatesEMA)),
-                fUnitAccumulatedFunding: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fUnitAccumulatedFunding)),
-                fOpenInterest: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fOpenInterest)),
-                fTargetAMMFundSize: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fTargetAMMFundSize)),
-                fCurrentTraderExposureEMA: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fCurrentTraderExposureEMA)),
-                fCurrentFundingRate: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fCurrentFundingRate)),
-                fLotSizeBC: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fLotSizeBC)),
-                fReferralRebateCC: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fReferralRebateCC)),
-                fTargetDFSize: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fTargetDFSize)),
-                fkStar: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fkStar)),
-                fAMMTargetDD: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fAMMTargetDD)),
+                premiumRatesEMA: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.premiumRatesEMA)),
+                fUnitAccumulatedFunding: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fUnitAccumulatedFunding)),
+                fOpenInterest: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fOpenInterest)),
+                fTargetAMMFundSize: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fTargetAMMFundSize)),
+                fCurrentTraderExposureEMA: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fCurrentTraderExposureEMA)),
+                fCurrentFundingRate: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fCurrentFundingRate)),
+                fLotSizeBC: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fLotSizeBC)),
+                fReferralRebateCC: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fReferralRebateCC)),
+                fTargetDFSize: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fTargetDFSize)),
+                fkStar: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fkStar)),
+                fAMMTargetDD: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fAMMTargetDD)),
                 perpFlags: Number(orig.perpFlags?.toString()),
-                fMinimalTraderExposureEMA: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fMinimalTraderExposureEMA)),
-                fMinimalAMMExposureEMA: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fMinimalAMMExposureEMA)),
-                fSettlementS3PriceData: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fSettlementS3PriceData)),
-                fSettlementS2PriceData: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fSettlementS2PriceData)),
-                fTotalMarginBalance: (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fTotalMarginBalance)),
+                fMinimalTraderExposureEMA: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fMinimalTraderExposureEMA)),
+                fMinimalAMMExposureEMA: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fMinimalAMMExposureEMA)),
+                fSettlementS3PriceData: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fSettlementS3PriceData)),
+                fSettlementS2PriceData: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fSettlementS2PriceData)),
+                fTotalMarginBalance: (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fTotalMarginBalance)),
                 fMarkPriceEMALambda: (0, d8XMath_1.ABK64x64ToFloat)(Number(orig.fMarkPriceEMALambda)),
                 fFundingRateClamp: (0, d8XMath_1.ABK64x64ToFloat)(Number(orig.fFundingRateClamp)),
                 fMaximalTradeSizeBumpUp: (0, d8XMath_1.ABK64x64ToFloat)(Number(orig.fMaximalTradeSizeBumpUp)),
                 iLastTargetPoolSizeTime: Number(orig.iLastTargetPoolSizeTime),
                 fStressReturnS3: [
-                    (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fStressReturnS3[0])),
-                    (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fStressReturnS3[1])),
-                ],
-                fDFLambda: [
-                    (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fDFLambda[0])),
-                    (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fDFLambda[1])),
+                    (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fStressReturnS3[0])),
+                    (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fStressReturnS3[1])),
                 ],
+                fDFLambda: [(0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fDFLambda[0])), (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fDFLambda[1]))],
                 fCurrentAMMExposureEMA: [
-                    (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fCurrentAMMExposureEMA[0])),
-                    (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fCurrentAMMExposureEMA[1])),
+                    (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fCurrentAMMExposureEMA[0])),
+                    (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fCurrentAMMExposureEMA[1])),
                 ],
                 fStressReturnS2: [
-                    (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fStressReturnS2[0])),
-                    (0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(orig.fStressReturnS2[1])),
+                    (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fStressReturnS2[0])),
+                    (0, d8XMath_1.ABK64x64ToFloat)(BigInt(orig.fStressReturnS2[1])),
                 ], // parameter: negative and positive stress returns for base-quote asset
             };
             p.push(v);
@@ -634,9 +634,11 @@ class PerpetualDataHandler {
         let poolMarginTokenAddr = [];
         let oracleFactory = "";
         while (lenReceived == len) {
-            let res = await _proxyContract.getPoolStaticInfo(idxFrom, idxFrom + len - 1, overrides || {});
+            const res = (await _proxyContract.getPoolStaticInfo(idxFrom, idxFrom + len - 1, overrides || {}));
             lenReceived = res.length;
-            nestedPerpetualIDs = nestedPerpetualIDs.concat(res[0]);
+            const nestedIds = res[0].map((ids) => ids.map((id) => Number(id)));
+            nestedPerpetualIDs = nestedPerpetualIDs.concat(nestedIds);
+            // TODO: this looks like a bug if num pools > 10 --- concat?
             poolShareTokenAddr = res[1];
             poolMarginTokenAddr = res[2];
             oracleFactory = res[3];
@@ -656,22 +658,22 @@ class PerpetualDataHandler {
         const idx_mark_price = 8;
         const idx_lvg = 7;
         const idx_s3 = 9;
-        let isEmpty = traderState[idx_notional].eq(0);
+        let isEmpty = traderState[idx_notional] == 0n;
         let cash = (0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_cash]);
-        let S2Liq = 0, S3Liq = 0, tau = Infinity, pnl = 0, unpaidFundingCC = 0, fLockedIn = bignumber_1.BigNumber.from(0), side = constants_2.CLOSED_SIDE, entryPrice = 0;
+        let S2Liq = 0, S3Liq = 0, tau = Infinity, pnl = 0, unpaidFundingCC = 0, fLockedIn = BigInt(0), side = constants_1.CLOSED_SIDE, entryPrice = 0;
         if (!isEmpty) {
             [S2Liq, S3Liq, tau, pnl, unpaidFundingCC] = PerpetualDataHandler._calculateLiquidationPrice(symbol, traderState, _pxS2S3[0], symbolToPerpStaticInfo);
             fLockedIn = traderState[idx_locked_in];
-            side = traderState[idx_notional].gt(0) ? constants_2.BUY_SIDE : constants_2.SELL_SIDE;
-            entryPrice = (0, d8XMath_1.ABK64x64ToFloat)((0, d8XMath_1.div64x64)(fLockedIn, traderState[idx_notional]).abs());
+            side = traderState[idx_notional] > 0n ? constants_1.BUY_SIDE : constants_1.SELL_SIDE;
+            entryPrice = Math.abs((0, d8XMath_1.ABK64x64ToFloat)((0, d8XMath_1.div64x64)(fLockedIn, traderState[idx_notional])));
         }
         let mgn = {
             symbol: symbol,
-            positionNotionalBaseCCY: isEmpty ? 0 : (0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_notional].abs()),
-            side: isEmpty ? constants_2.CLOSED_SIDE : side,
+            positionNotionalBaseCCY: isEmpty ? 0 : Math.abs((0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_notional])),
+            side: isEmpty ? constants_1.CLOSED_SIDE : side,
             entryPrice: isEmpty ? 0 : entryPrice,
             leverage: isEmpty ? 0 : (0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_lvg]),
-            markPrice: (0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_mark_price].abs()),
+            markPrice: Math.abs((0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_mark_price])),
             unrealizedPnlQuoteCCY: isEmpty ? 0 : pnl,
             unrealizedFundingCollateralCCY: isEmpty ? 0 : unpaidFundingCC,
             collateralCC: cash,
@@ -731,7 +733,7 @@ class PerpetualDataHandler {
                 break;
             }
             const curIds = new Set(orderBundles[1]);
-            for (let k = 0; k < res[0].length && res[2][k] !== constants_2.ZERO_ADDRESS; k++) {
+            for (let k = 0; k < res[0].length && res[2][k] !== constants_1.ZERO_ADDRESS; k++) {
                 if (!curIds.has(res[1][k])) {
                     orderBundles[0].push(res[0][k]);
                     orderBundles[1].push(res[1][k]);
@@ -771,7 +773,7 @@ class PerpetualDataHandler {
         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, {});
         const orderBookSC = this.getOrderBookContract(symbol).connect(provider);
         let numOrders = await orderBookSC.orderCount(overrides || {});
         return Number(numOrders);
@@ -807,22 +809,22 @@ class PerpetualDataHandler {
         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 });
         const orderBookSC = this.getOrderBookContract(symbol).connect(provider);
-        const multicall = contracts_2.Multicall3__factory.connect(this.config.multicall ?? constants_2.MULTICALL_ADDRESS, provider);
-        if (typeof startAfter === "undefined") {
-            startAfter = constants_2.ZERO_ORDER_ID;
+        const multicall = contracts_1.Multicall3__factory.connect(this.config.multicall ?? constants_1.MULTICALL_ADDRESS, provider);
+        if (startAfter == undefined) {
+            startAfter = constants_1.ZERO_ORDER_ID;
         }
         else if (typeof startAfter === "string") {
             startAfter = 0; // TODO: fix
         }
         // first get client orders (incl. dependency info)
-        let [orders, orderIds] = await orderBookSC.pollRange(startAfter, bignumber_1.BigNumber.from(numElements), overrides || {});
+        let [orders, orderIds] = await orderBookSC.pollRange(startAfter, numElements, overrides || {});
         let userFriendlyOrders = new Array();
         let traderAddr = [];
         let orderIdsOut = [];
         let k = 0;
-        while (k < numElements && k < orders.length && orders[k].traderAddr !== constants_2.ZERO_ADDRESS) {
+        while (k < numElements && k < orders.length && orders[k].traderAddr !== constants_1.ZERO_ADDRESS) {
             userFriendlyOrders.push(PerpetualDataHandler.fromClientOrder(orders[k], this.symbolToPerpStaticInfo));
             orderIdsOut.push(orderIds[k]);
             traderAddr.push(orders[k].traderAddr);
@@ -830,11 +832,11 @@ class PerpetualDataHandler {
         }
         // then get perp orders (incl. submitted ts info)
         const multicalls = orderIdsOut.map((id) => ({
-            target: orderBookSC.address,
+            target: orderBookSC.target,
             allowFailure: true,
             callData: orderBookSC.interface.encodeFunctionData("orderOfDigest", [id]),
         }));
-        const encodedResults = await multicall.callStatic.aggregate3(multicalls, overrides || {});
+        const encodedResults = await multicall.aggregate3.staticCall(multicalls, overrides || {});
         // order status
         encodedResults.map((res, k) => {
             if (res.success) {
@@ -862,7 +864,7 @@ class PerpetualDataHandler {
             throw new Error("traderAddr, symbol and pxS2S3 should all have the same length");
         }
         const proxyCalls = traderAddrs.map((_addr, i) => ({
-            target: _proxyContract.address,
+            target: _proxyContract.target,
             allowFailure: true,
             callData: _proxyContract.interface.encodeFunctionData("getTraderState", [
                 PerpetualDataHandler.symbolToPerpetualId(symbols[i], symbolToPerpStaticInfo),
@@ -870,7 +872,7 @@ class PerpetualDataHandler {
                 _pxS2S3s[i].map((x) => (0, d8XMath_1.floatToABK64x64)(x)),
             ]),
         }));
-        const encodedResults = await _multicall.callStatic.aggregate3(proxyCalls, overrides || {});
+        const encodedResults = await _multicall.aggregate3.staticCall(proxyCalls, overrides || {});
         const traderStates = encodedResults.map(({ success, returnData }, i) => {
             if (!success)
                 throw new Error(`Failed to get perp info for ${symbols[i]}`);
@@ -898,10 +900,10 @@ class PerpetualDataHandler {
         let perpId = PerpetualDataHandler.symbolToPerpetualId(symbol, symbolToPerpStaticInfo);
         let staticInfo = symbolToPerpStaticInfo.get(symbol);
         let [S2, S3] = [indexPrices[0], indexPrices[1]];
-        if (staticInfo.collateralCurrencyType == constants_2.CollaterlCCY.BASE) {
+        if (staticInfo.collateralCurrencyType == constants_1.CollaterlCCY.BASE) {
             S3 = S2;
         }
-        else if (staticInfo.collateralCurrencyType == constants_2.CollaterlCCY.QUOTE) {
+        else if (staticInfo.collateralCurrencyType == constants_1.CollaterlCCY.QUOTE) {
             S3 = 1;
         }
         let ammState = await _proxyContract.getAMMState(perpId, [S2, S3].map(d8XMath_1.floatToABK64x64), overrides || {});
@@ -912,16 +914,16 @@ class PerpetualDataHandler {
         let staticInfo = symbolToPerpStaticInfo.get(symbol);
         let ccy = symbol.split("-");
         let [S2, S3] = [indexPrices[0], indexPrices[1]];
-        if (staticInfo.collateralCurrencyType == constants_2.CollaterlCCY.BASE) {
+        if (staticInfo.collateralCurrencyType == constants_1.CollaterlCCY.BASE) {
             S3 = S2;
         }
-        else if (staticInfo.collateralCurrencyType == constants_2.CollaterlCCY.QUOTE) {
+        else if (staticInfo.collateralCurrencyType == constants_1.CollaterlCCY.QUOTE) {
             S3 = 1;
         }
         let markPrice = S2 * (1 + (0, d8XMath_1.ABK64x64ToFloat)(ammState[8]));
         let state = {
             id: perpId,
-            state: constants_2.PERP_STATE_STR[ammState[13].toNumber()],
+            state: constants_1.PERP_STATE_STR[Number(ammState[13])],
             baseCurrency: ccy[0],
             quoteCurrency: ccy[1],
             indexPrice: S2,
@@ -961,14 +963,14 @@ class PerpetualDataHandler {
         let position = (0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_notional]);
         let cashCC = (0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_availableCashCC]);
         let Sm = (0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_mark_price]);
-        let unpaidFundingCC = (0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_availableCashCC].sub(traderState[idx_cash]));
+        let unpaidFundingCC = (0, d8XMath_1.ABK64x64ToFloat)(traderState[idx_availableCashCC] - traderState[idx_cash]);
         let unpaidFunding = unpaidFundingCC;
-        if (perpInfo.collateralCurrencyType == constants_2.CollaterlCCY.BASE) {
+        if (perpInfo.collateralCurrencyType == constants_1.CollaterlCCY.BASE) {
             S2Liq = (0, d8XMath_1.calculateLiquidationPriceCollateralBase)(lockedInValueQC, position, cashCC, tau);
             S3Liq = S2Liq;
             unpaidFunding = unpaidFunding / S2;
         }
-        else if (perpInfo.collateralCurrencyType == constants_2.CollaterlCCY.QUANTO) {
+        else if (perpInfo.collateralCurrencyType == constants_1.CollaterlCCY.QUANTO) {
             let S3 = S3Liq;
             S3Liq = S3;
             S2Liq = (0, d8XMath_1.calculateLiquidationPriceCollateralQuanto)(lockedInValueQC, position, cashCC, tau, S3, Sm);
@@ -1025,24 +1027,24 @@ class PerpetualDataHandler {
     }
     static fromSmartContractOrder(order, symbolToPerpInfoMap) {
         // find symbol of perpetual id
-        let symbol = PerpetualDataHandler._getByValue(symbolToPerpInfoMap, order.iPerpetualId, "id");
+        let symbol = PerpetualDataHandler._getByValue(symbolToPerpInfoMap, Number(order.iPerpetualId), "id");
         if (symbol == undefined) {
-            throw Error(`Perpetual id ${order.iPerpetualId} not found. Check with marketData.exchangeInfo().`);
+            throw new Error(`Perpetual id ${order.iPerpetualId} not found. Check with marketData.exchangeInfo().`);
         }
-        let side = order.fAmount > bignumber_1.BigNumber.from(0) ? constants_2.BUY_SIDE : constants_2.SELL_SIDE;
+        let side = order.fAmount > BigInt(0) ? constants_1.BUY_SIDE : constants_1.SELL_SIDE;
         let limitPrice, stopPrice;
-        let fLimitPrice = bignumber_1.BigNumber.from(order.fLimitPrice);
-        if (fLimitPrice.eq(0)) {
-            limitPrice = side == constants_2.BUY_SIDE ? undefined : 0;
+        let fLimitPrice = BigInt(order.fLimitPrice);
+        if (fLimitPrice == 0n) {
+            limitPrice = side == constants_1.BUY_SIDE ? undefined : 0;
         }
-        else if (fLimitPrice.eq(constants_2.MAX_64x64)) {
-            limitPrice = side == constants_2.BUY_SIDE ? Infinity : undefined;
+        else if (fLimitPrice == constants_1.MAX_64x64) {
+            limitPrice = side == constants_1.BUY_SIDE ? Infinity : undefined;
         }
         else {
             limitPrice = (0, d8XMath_1.ABK64x64ToFloat)(fLimitPrice);
         }
-        let fStopPrice = bignumber_1.BigNumber.from(order.fTriggerPrice);
-        if (fStopPrice.eq(0) || fStopPrice.eq(constants_2.MAX_64x64)) {
+        let fStopPrice = BigInt(order.fTriggerPrice);
+        if (fStopPrice == 0n || fStopPrice == constants_1.MAX_64x64) {
             stopPrice = undefined;
         }
         else {
@@ -1051,13 +1053,13 @@ class PerpetualDataHandler {
         let userOrder = {
             symbol: symbol,
             side: side,
-            type: PerpetualDataHandler._flagToOrderType(bignumber_1.BigNumber.from(order.flags), bignumber_1.BigNumber.from(order.fLimitPrice)),
-            quantity: Math.abs((0, d8XMath_1.ABK64x64ToFloat)(bignumber_1.BigNumber.from(order.fAmount))),
-            reduceOnly: (0, utils_1.containsFlag)(bignumber_1.BigNumber.from(order.flags), constants_2.MASK_CLOSE_ONLY),
+            type: PerpetualDataHandler._flagToOrderType(BigInt(order.flags), BigInt(order.fLimitPrice)),
+            quantity: Math.abs((0, d8XMath_1.ABK64x64ToFloat)(BigInt(order.fAmount))),
+            reduceOnly: (0, utils_1.containsFlag)(BigInt(order.flags), constants_1.MASK_CLOSE_ONLY),
             limitPrice: limitPrice,
-            keepPositionLvg: (0, utils_1.containsFlag)(bignumber_1.BigNumber.from(order.flags), constants_2.MASK_KEEP_POS_LEVERAGE),
+            keepPositionLvg: (0, utils_1.containsFlag)(BigInt(order.flags), constants_1.MASK_KEEP_POS_LEVERAGE),
             brokerFeeTbps: order.brokerFeeTbps == 0 ? undefined : Number(order.brokerFeeTbps),
-            brokerAddr: order.brokerAddr == constants_2.ZERO_ADDRESS ? undefined : order.brokerAddr,
+            brokerAddr: order.brokerAddr == constants_1.ZERO_ADDRESS ? undefined : order.brokerAddr.toString(),
             brokerSignature: order.brokerSignature == "0x" ? undefined : order.brokerSignature,
             stopPrice: stopPrice,
             leverage: Number(order.leverageTDR) / 100,
@@ -1082,17 +1084,17 @@ class PerpetualDataHandler {
         PerpetualDataHandler.checkOrder(order, perpStaticInfo);
         // translate order
         let flags = PerpetualDataHandler._orderTypeToFlag(order);
-        let brokerSig = order.brokerSignature == undefined ? [] : order.brokerSignature;
+        let brokerSig = order.brokerSignature == undefined ? "0x" : order.brokerSignature;
         let perpetualId = PerpetualDataHandler.symbolToPerpetualId(order.symbol, perpStaticInfo);
         let fAmount;
-        if (order.side == constants_2.BUY_SIDE) {
+        if (order.side == constants_1.BUY_SIDE) {
             fAmount = (0, d8XMath_1.floatToABK64x64)(Math.abs(order.quantity));
         }
-        else if (order.side == constants_2.SELL_SIDE) {
+        else if (order.side == constants_1.SELL_SIDE) {
             fAmount = (0, d8XMath_1.floatToABK64x64)(-Math.abs(order.quantity));
         }
         else {
-            throw Error(`invalid side in order spec, use ${constants_2.BUY_SIDE} or ${constants_2.SELL_SIDE}`);
+            throw Error(`invalid side in order spec, use ${constants_1.BUY_SIDE} or ${constants_1.SELL_SIDE}`);
         }
         let fLimitPrice;
         if (order.limitPrice == undefined) {
@@ -1100,20 +1102,20 @@ class PerpetualDataHandler {
             // the trade to go through
             // Also: stop orders always have limits set, so even  for this case
             // we set the limit to 0 or infinity
-            fLimitPrice = order.side == constants_2.BUY_SIDE ? constants_2.MAX_64x64 : bignumber_1.BigNumber.from(0);
+            fLimitPrice = order.side == constants_1.BUY_SIDE ? constants_1.MAX_64x64 : BigInt(0);
         }
         else {
             fLimitPrice = (0, d8XMath_1.floatToABK64x64)(order.limitPrice);
         }
-        let iDeadline = order.deadline == undefined ? Date.now() / 1000 + constants_2.ORDER_MAX_DURATION_SEC : order.deadline;
-        let fTriggerPrice = order.stopPrice == undefined ? bignumber_1.BigNumber.from(0) : (0, d8XMath_1.floatToABK64x64)(order.stopPrice);
+        let iDeadline = order.deadline == undefined ? Date.now() / 1000 + constants_1.ORDER_MAX_DURATION_SEC : order.deadline;
+        let fTriggerPrice = order.stopPrice == undefined ? BigInt(0) : (0, d8XMath_1.floatToABK64x64)(order.stopPrice);
         let smOrder = {
             flags: flags,
             iPerpetualId: perpetualId,
             brokerFeeTbps: order.brokerFeeTbps == undefined ? 0 : order.brokerFeeTbps,
             traderAddr: traderAddr,
-            brokerAddr: order.brokerAddr == undefined ? constants_2.ZERO_ADDRESS : order.brokerAddr,
-            executorAddr: constants_2.ZERO_ADDRESS,
+            brokerAddr: order.brokerAddr == undefined ? constants_1.ZERO_ADDRESS : order.brokerAddr,
+            executorAddr: constants_1.ZERO_ADDRESS,
             brokerSignature: brokerSig,
             fAmount: fAmount,
             fLimitPrice: fLimitPrice,
@@ -1146,9 +1148,9 @@ class PerpetualDataHandler {
             leverageTDR: scOrder.leverageTDR,
             iDeadline: scOrder.iDeadline,
             executionTimestamp: scOrder.executionTimestamp,
-            parentChildDigest1: parentChildIds ? parentChildIds[0] : constants_2.ZERO_ORDER_ID,
-            parentChildDigest2: parentChildIds ? parentChildIds[1] : constants_2.ZERO_ORDER_ID,
-            callbackTarget: constants_2.ZERO_ADDRESS,
+            parentChildDigest1: parentChildIds ? parentChildIds[0] : constants_1.ZERO_ORDER_ID,
+            parentChildDigest2: parentChildIds ? parentChildIds[1] : constants_1.ZERO_ORDER_ID,
+            callbackTarget: constants_1.ZERO_ADDRESS,
         };
     }
     /**
@@ -1182,28 +1184,29 @@ class PerpetualDataHandler {
             executionTimestamp: obOrder.executionTimestamp,
         };
         const order = PerpetualDataHandler.fromSmartContractOrder(scOrder, perpStaticInfo);
-        if (obOrder.parentChildDigest1.toString() != constants_2.ZERO_ORDER_ID ||
-            obOrder.parentChildDigest2.toString() != constants_2.ZERO_ORDER_ID) {
+        if (obOrder.parentChildDigest1.toString() != constants_1.ZERO_ORDER_ID ||
+            obOrder.parentChildDigest2.toString() != constants_1.ZERO_ORDER_ID) {
             order.parentChildOrderIds = [obOrder.parentChildDigest1.toString(), obOrder.parentChildDigest2.toString()];
         }
         return order;
     }
     static _flagToOrderType(orderFlags, orderLimitPrice) {
-        let flag = bignumber_1.BigNumber.from(orderFlags);
-        let isLimit = (0, utils_1.containsFlag)(flag, constants_2.MASK_LIMIT_ORDER);
-        let hasLimit = !bignumber_1.BigNumber.from(orderLimitPrice).eq(0) || !bignumber_1.BigNumber.from(orderLimitPrice).eq(constants_2.MAX_64x64);
-        let isStop = (0, utils_1.containsFlag)(flag, constants_2.MASK_STOP_ORDER);
+        // TODO: check
+        let flag = BigInt(orderFlags);
+        let isLimit = (0, utils_1.containsFlag)(flag, constants_1.MASK_LIMIT_ORDER);
+        let hasLimit = BigInt(orderLimitPrice) != 0n || BigInt(orderLimitPrice) != constants_1.MAX_64x64;
+        let isStop = (0, utils_1.containsFlag)(flag, constants_1.MASK_STOP_ORDER);
         if (isStop && hasLimit) {
-            return constants_2.ORDER_TYPE_STOP_LIMIT;
+            return constants_1.ORDER_TYPE_STOP_LIMIT;
         }
         else if (isStop && !hasLimit) {
-            return constants_2.ORDER_TYPE_STOP_MARKET;
+            return constants_1.ORDER_TYPE_STOP_MARKET;
         }
         else if (isLimit && !isStop) {
-            return constants_2.ORDER_TYPE_LIMIT;
+            return constants_1.ORDER_TYPE_LIMIT;
         }
         else {
-            return constants_2.ORDER_TYPE_MARKET;
+            return constants_1.ORDER_TYPE_MARKET;
         }
     }
     /**
@@ -1216,38 +1219,38 @@ class PerpetualDataHandler {
         let flag;
         order.type = order.type.toUpperCase();
         switch (order.type) {
-            case constants_2.ORDER_TYPE_LIMIT:
-                flag = constants_2.MASK_LIMIT_ORDER;
+            case constants_1.ORDER_TYPE_LIMIT:
+                flag = constants_1.MASK_LIMIT_ORDER;
                 break;
-            case constants_2.ORDER_TYPE_MARKET:
-                flag = constants_2.MASK_MARKET_ORDER;
+            case constants_1.ORDER_TYPE_MARKET:
+                flag = constants_1.MASK_MARKET_ORDER;
                 break;
-            case constants_2.ORDER_TYPE_STOP_MARKET:
-                flag = constants_2.MASK_STOP_ORDER;
+            case constants_1.ORDER_TYPE_STOP_MARKET:
+                flag = constants_1.MASK_STOP_ORDER;
                 break;
-            case constants_2.ORDER_TYPE_STOP_LIMIT:
-                flag = constants_2.MASK_STOP_ORDER;
+            case constants_1.ORDER_TYPE_STOP_LIMIT:
+                flag = constants_1.MASK_STOP_ORDER;
                 break;
             default: {
                 throw Error(`Order type ${order.type} not found.`);
             }
         }
         if (order.keepPositionLvg != undefined && order.keepPositionLvg) {
-            flag = (0, utils_1.combineFlags)(flag, constants_2.MASK_KEEP_POS_LEVERAGE);
+            flag = (0, utils_1.combineFlags)(flag, constants_1.MASK_KEEP_POS_LEVERAGE);
         }
         if (order.reduceOnly != undefined && order.reduceOnly) {
-            flag = (0, utils_1.combineFlags)(flag, constants_2.MASK_CLOSE_ONLY);
+            flag = (0, utils_1.combineFlags)(flag, constants_1.MASK_CLOSE_ONLY);
         }
-        if ((order.type == constants_2.ORDER_TYPE_LIMIT || order.type == constants_2.ORDER_TYPE_STOP_LIMIT) && order.limitPrice == undefined) {
+        if ((order.type == constants_1.ORDER_TYPE_LIMIT || order.type == constants_1.ORDER_TYPE_STOP_LIMIT) && order.limitPrice == undefined) {
             throw Error(`Order type ${order.type} requires limit price.`);
         }
-        if ((order.type == constants_2.ORDER_TYPE_STOP_MARKET || order.type == constants_2.ORDER_TYPE_STOP_LIMIT) && order.stopPrice == undefined) {
+        if ((order.type == constants_1.ORDER_TYPE_STOP_MARKET || order.type == constants_1.ORDER_TYPE_STOP_LIMIT) && order.stopPrice == undefined) {
             throw Error(`Order type ${order.type} requires trigger price.`);
         }
-        if ((order.type == constants_2.ORDER_TYPE_MARKET || order.type == constants_2.ORDER_TYPE_LIMIT) && order.stopPrice != undefined) {
+        if ((order.type == constants_1.ORDER_TYPE_MARKET || order.type == constants_1.ORDER_TYPE_LIMIT) && order.stopPrice != undefined) {
             throw Error(`Order type ${order.type} has no trigger price.`);
         }
-        if (order.type != constants_2.ORDER_TYPE_STOP_LIMIT && order.type != constants_2.ORDER_TYPE_STOP_MARKET && order.stopPrice != undefined) {
+        if (order.type != constants_1.ORDER_TYPE_STOP_LIMIT && order.type != constants_1.ORDER_TYPE_STOP_MARKET && order.stopPrice != undefined) {
             throw Error(`Order type ${order.type} has no trigger price.`);
         }
         return flag;
@@ -1300,7 +1303,7 @@ class PerpetualDataHandler {
      * @returns NodeSDKConfig
      */
     static getConfigByName(name, version) {
-        let configFile = constants_2.DEFAULT_CONFIG.filter((c) => c.name == name);
+        let configFile = constants_1.DEFAULT_CONFIG.filter((c) => c.name == name);
         if (configFile.length == 0) {
             throw Error(`No SDK config found with name ${name}.`);
         }
@@ -1337,7 +1340,7 @@ class PerpetualDataHandler {
      * @returns NodeSDKConfig
      */
     static getConfigByChainId(chainId, version) {
-        let configFile = constants_2.DEFAULT_CONFIG.filter((c) => c.chainId == chainId);
+        let configFile = constants_1.DEFAULT_CONFIG.filter((c) => c.chainId == chainId);
         if (configFile.length == 0) {
             throw Error(`No SDK config found for chain ID ${chainId}.`);
         }
@@ -1370,7 +1373,7 @@ class PerpetualDataHandler {
      * main();
      */
     static getAvailableConfigs() {
-        let configFile = constants_2.DEFAULT_CONFIG;
+        let configFile = constants_1.DEFAULT_CONFIG;
         let ids = new Set();
         for (let k = 0; k < configFile.length; k++) {
             const el = configFile[k].chainId.toString() + "; " + configFile[k].name;
@@ -1379,13 +1382,13 @@ class PerpetualDataHandler {
         return ids;
     }
     /**
-     * Get the ABI of a function in a given contract
+     * Get the ABI of a function in a given contract. Undefined if it doesn't exist.
      * @param contract A contract instance, e.g. this.proxyContract
      * @param functionName Name of the function whose ABI we want
      * @returns Function ABI as a single JSON string
      */
     static _getABIFromContract(contract, functionName) {
-        return contract.interface.getFunction(functionName).format(abi_1.FormatTypes.full);
+        return contract.interface.getFunction(functionName)?.format("full");
     }
     /**
      * Gets the pool index (starting at 0 in exchangeInfo, not ID!) corresponding to a given symbol.
@@ -1503,9 +1506,12 @@ class PerpetualDataHandler {
     static checkOrder(order, 
     // traderAccount: MarginAccount,
     perpStaticInfo) {
+        if (!perpStaticInfo.has(order.symbol)) {
+            throw new Error(`Perpetual not found for symbol ${order.symbol}`);
+        }
         // check side
-        if (order.side != constants_2.BUY_SIDE && order.side != constants_2.SELL_SIDE) {
-            throw Error(`order side must be ${constants_2.BUY_SIDE} or ${constants_2.SELL_SIDE}`);
+        if (order.side != constants_1.BUY_SIDE && order.side != constants_1.SELL_SIDE) {
+            throw Error(`order side must be ${constants_1.BUY_SIDE} or ${constants_1.SELL_SIDE}`);
         }
         // check amount
         let lotSize = perpStaticInfo.get(order.symbol).lotSizeBC;
@@ -1519,7 +1525,7 @@ class PerpetualDataHandler {
             throw Error(`trade amount too small: ${order.quantity} ${perpStaticInfo.get(order.symbol).S2Symbol}`);
         }
         // check limit price
-        if (order.side == constants_2.BUY_SIDE && order.limitPrice != undefined && order.limitPrice <= 0) {
+        if (order.side == constants_1.BUY_SIDE && order.limitPrice != undefined && order.limitPrice <= 0) {
             throw Error(`invalid limit price for buy order: ${order.limitPrice}`);
         }
         // broker fee
@@ -1539,14 +1545,14 @@ class PerpetualDataHandler {
     static fromClientOrderToTypeSafeOrder(order) {
         return {
             iPerpetualId: +order.iPerpetualId.toString(),
-            fLimitPrice: BigInt(bignumber_1.BigNumber.from(order.fLimitPrice).toString()),
+            fLimitPrice: order.fLimitPrice,
             leverageTDR: +order.leverageTDR.toString(),
             executionTimestamp: +order.executionTimestamp.toString(),
-            flags: BigInt(bignumber_1.BigNumber.from(order.flags).toString()),
+            flags: BigInt(order.flags),
             iDeadline: +order.iDeadline.toString(),
             brokerAddr: order.brokerAddr,
-            fTriggerPrice: BigInt(bignumber_1.BigNumber.from(order.fTriggerPrice).toString()),
-            fAmount: BigInt(bignumber_1.BigNumber.from(order.fAmount).toString()),
+            fTriggerPrice: order.fTriggerPrice,
+            fAmount: order.fAmount,
             parentChildDigest1: order.parentChildDigest1,
             traderAddr: order.traderAddr,
             parentChildDigest2: order.parentChildDigest2,