@drift-labs/sdk 0.1.30-master.3 → 0.1.32

package/lib/accounts/bulkAccountLoader.d.ts

@@ -30,5 +30,6 @@ export declare class BulkAccountLoader {
     startPolling(): void;
     stopPolling(): void;
     log(msg: string, force?: boolean): void;
+    updatePollingFrequency(pollingFrequency: number): void;
 }
 export {};

package/lib/accounts/bulkAccountLoader.js

@@ -210,5 +210,12 @@ class BulkAccountLoader {
             console.log(msg);
         }
     }
+    updatePollingFrequency(pollingFrequency) {
+        this.stopPolling();
+        this.pollingFrequency = pollingFrequency;
+        if (this.accountsToLoad.size > 0) {
+            this.startPolling();
+        }
+    }
 }
 exports.BulkAccountLoader = BulkAccountLoader;

package/lib/constants/markets.js

@@ -190,7 +190,7 @@ exports.Markets = [
     },
     {
         fullName: 'Serum',
-        category: ['DEX'],
+        category: ['Solana', 'Exchange'],
         symbol: 'SRM-PERP',
         baseAssetSymbol: 'SRM',
         marketIndex: new __1.BN(17),
@@ -199,4 +199,26 @@ exports.Markets = [
         launchTs: 1649877367000,
         oracleSource: __1.OracleSource.PYTH,
     },
+    {
+        fullName: 'StepN',
+        category: ['Solana', 'Shoe'],
+        symbol: 'GMT-PERP',
+        baseAssetSymbol: 'GMT',
+        marketIndex: new __1.BN(18),
+        devnetPublicKey: '7GBoA2oGXMTepYjFgrdHyYVGcPs4FWskUF7S1dGzQsY9',
+        mainnetPublicKey: '81kbdwDfTNsg4d5D1BxE9FHEdxEMk8xCJUj5ujjWQyvd',
+        launchTs: 1650507526000,
+        oracleSource: __1.OracleSource.SWITCHBOARD,
+    },
+    {
+        fullName: 'Curve DAO Token',
+        category: ['Exchange'],
+        symbol: 'CRV-PERP',
+        baseAssetSymbol: 'CRV',
+        marketIndex: new __1.BN(19),
+        devnetPublicKey: 'AuEiE5XG5kD1NFoKgEPrWuN9CdT44A3K7yGDuiUPvh9S',
+        mainnetPublicKey: '61NzdQ9y6KhMhWxyJ8kXEe25NxdixVL1YUnGYLDMaUxH',
+        launchTs: 1651017354000,
+        oracleSource: __1.OracleSource.SWITCHBOARD,
+    },
 ];

package/lib/idl/clearing_house.json

@@ -3832,6 +3832,23 @@
                 ]
             }
         },
+        {
+            "name": "MarginType",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "Init"
+                    },
+                    {
+                        "name": "Partial"
+                    },
+                    {
+                        "name": "Maint"
+                    }
+                ]
+            }
+        },
         {
             "name": "LiquidationType",
             "type": {

package/lib/math/funding.js

@@ -39,7 +39,7 @@ function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustm
         const lastMarkTwapWithMantissa = market.amm.lastMarkPriceTwap;
         const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
         const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
-        const markTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, secondsInHour.sub(timeSinceLastMarkChange));
+        const markTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, anchor_1.BN.max(numericConstants_1.ZERO, secondsInHour.sub(timeSinceLastMarkChange)));
         const baseAssetPriceWithMantissa = (0, market_1.calculateMarkPrice)(market);
         const markTwapWithMantissa = markTwapTimeSinceLastUpdate
             .mul(lastMarkTwapWithMantissa)
@@ -49,6 +49,7 @@ function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustm
         // note: oracle twap depends on `when the chord is struck` (market is trade)
         const lastOracleTwapWithMantissa = market.amm.lastOraclePriceTwap;
         const lastOraclePriceTwapTs = market.amm.lastOraclePriceTwapTs;
+        const oracleInvalidDuration = anchor_1.BN.max(numericConstants_1.ZERO, lastMarkPriceTwapTs.sub(lastOraclePriceTwapTs));
         const timeSinceLastOracleTwapUpdate = now.sub(lastOraclePriceTwapTs);
         const oracleTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, secondsInHour.sub(timeSinceLastOracleTwapUpdate));
         const oraclePrice = oraclePriceData.price;
@@ -64,7 +65,8 @@ function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustm
             oracleTwapWithMantissa = oracleTwapTimeSinceLastUpdate
                 .mul(lastOracleTwapWithMantissa)
                 .add(timeSinceLastMarkChange.mul(oraclePrice))
-                .div(timeSinceLastOracleTwapUpdate.add(oracleTwapTimeSinceLastUpdate));
+                .add(oracleInvalidDuration.mul(lastMarkTwapWithMantissa))
+                .div(timeSinceLastMarkChange.add(oracleTwapTimeSinceLastUpdate).add(oracleInvalidDuration));
         }
         const twapSpread = lastMarkTwapWithMantissa.sub(lastOracleTwapWithMantissa);
         const twapSpreadPct = twapSpread

package/lib/orders.js

@@ -102,7 +102,15 @@ function calculateAmountToTradeForLimit(market, order, oraclePriceData) {
         if (!oraclePriceData) {
             throw Error('Cant calculate limit price for oracle offset oracle without OraclePriceData');
         }
-        limitPrice = oraclePriceData.price.add(order.oraclePriceOffset);
+        const floatingPrice = oraclePriceData.price.add(order.oraclePriceOffset);
+        if (order.postOnly) {
+            limitPrice = (0, types_1.isVariant)(order.direction, 'long')
+                ? _1.BN.min(order.price, floatingPrice)
+                : _1.BN.max(order.price, floatingPrice);
+        }
+        else {
+            limitPrice = floatingPrice;
+        }
     }
     const [maxAmountToTrade, direction] = (0, amm_1.calculateMaxBaseAssetAmountToTrade)(market.amm, limitPrice);
     // Check that directions are the same

package/lib/tx/retryTxSender.d.ts

@@ -16,7 +16,8 @@ export declare class RetryTxSender implements TxSender {
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     getTimestamp(): number;
     sleep(reference: ResolveReference): Promise<void>;
-    promiseTimeout<T>(promise: Promise<T>, timeoutMs: number): Promise<T | null>;
+    promiseTimeout<T>(promises: Promise<T>[], timeoutMs: number): Promise<T | null>;
     sendToAdditionalConnections(rawTx: Buffer, opts: ConfirmOptions): void;
+    addAdditionalConnection(newConnection: Connection): void;
 }
 export {};

package/lib/tx/retryTxSender.js

@@ -99,29 +99,40 @@ class RetryTxSender {
             (0, assert_1.default)(decodedSignature.length === 64, 'signature has invalid length');
             const start = Date.now();
             const subscriptionCommitment = commitment || this.provider.opts.commitment;
-            let subscriptionId;
+            const subscriptionIds = new Array();
+            const connections = [
+                this.provider.connection,
+                ...this.additionalConnections,
+            ];
             let response = null;
-            const confirmPromise = new Promise((resolve, reject) => {
-                try {
-                    subscriptionId = this.provider.connection.onSignature(signature, (result, context) => {
-                        subscriptionId = undefined;
-                        response = {
-                            context,
-                            value: result,
-                        };
-                        resolve(null);
-                    }, subscriptionCommitment);
-                }
-                catch (err) {
-                    reject(err);
-                }
+            const promises = connections.map((connection, i) => {
+                let subscriptionId;
+                const confirmPromise = new Promise((resolve, reject) => {
+                    try {
+                        subscriptionId = connection.onSignature(signature, (result, context) => {
+                            subscriptionIds[i] = undefined;
+                            response = {
+                                context,
+                                value: result,
+                            };
+                            resolve(null);
+                        }, subscriptionCommitment);
+                    }
+                    catch (err) {
+                        reject(err);
+                    }
+                });
+                subscriptionIds.push(subscriptionId);
+                return confirmPromise;
             });
             try {
-                yield this.promiseTimeout(confirmPromise, this.timeout);
+                yield this.promiseTimeout(promises, this.timeout);
             }
             finally {
-                if (subscriptionId) {
-                    this.provider.connection.removeSignatureListener(subscriptionId);
+                for (const [i, subscriptionId] of subscriptionIds.entries()) {
+                    if (subscriptionId) {
+                        connections[i].removeSignatureListener(subscriptionId);
+                    }
                 }
             }
             if (response === null) {
@@ -142,12 +153,12 @@ class RetryTxSender {
             });
         });
     }
-    promiseTimeout(promise, timeoutMs) {
+    promiseTimeout(promises, timeoutMs) {
         let timeoutId;
         const timeoutPromise = new Promise((resolve) => {
             timeoutId = setTimeout(() => resolve(null), timeoutMs);
         });
-        return Promise.race([promise, timeoutPromise]).then((result) => {
+        return Promise.race([...promises, timeoutPromise]).then((result) => {
             clearTimeout(timeoutId);
             return result;
         });
@@ -162,5 +173,14 @@ class RetryTxSender {
             });
         });
     }
+    addAdditionalConnection(newConnection) {
+        const alreadyUsingConnection = this.additionalConnections.filter((connection) => {
+            // @ts-ignore
+            return connection._rpcEndpoint === newConnection.rpcEndpoint;
+        }).length > 0;
+        if (!alreadyUsingConnection) {
+            this.additionalConnections.push(newConnection);
+        }
+    }
 }
 exports.RetryTxSender = RetryTxSender;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.30-master.3",
+	"version": "0.1.32",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkAccountLoader.ts

@@ -257,4 +257,12 @@ export class BulkAccountLoader {
 			console.log(msg);
 		}
 	}
+
+	public updatePollingFrequency(pollingFrequency: number): void {
+		this.stopPolling();
+		this.pollingFrequency = pollingFrequency;
+		if (this.accountsToLoad.size > 0) {
+			this.startPolling();
+		}
+	}
 }

package/src/assert/assert.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assert = void 0;
+function assert(condition, error) {
+    if (!condition) {
+        throw new Error(error || 'Unspecified AssertionError');
+    }
+}
+exports.assert = assert;
+//# sourceMappingURL=assert.js.map

package/src/assert/assert.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assert.js","sourceRoot":"","sources":["assert.ts"],"names":[],"mappings":";;;AAAA,SAAgB,MAAM,CAAC,SAAkB,EAAE,KAAc;IACxD,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,KAAK,IAAI,4BAA4B,CAAC,CAAC;KACvD;AACF,CAAC;AAJD,wBAIC"}

package/src/constants/markets.ts

@@ -200,7 +200,7 @@ export const Markets: MarketConfig[] = [
 	},
 	{
 		fullName: 'Serum',
-		category: ['DEX'],
+		category: ['Solana', 'Exchange'],
 		symbol: 'SRM-PERP',
 		baseAssetSymbol: 'SRM',
 		marketIndex: new BN(17),
@@ -209,4 +209,26 @@ export const Markets: MarketConfig[] = [
 		launchTs: 1649877367000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'StepN',
+		category: ['Solana', 'Shoe'],
+		symbol: 'GMT-PERP',
+		baseAssetSymbol: 'GMT',
+		marketIndex: new BN(18),
+		devnetPublicKey: '7GBoA2oGXMTepYjFgrdHyYVGcPs4FWskUF7S1dGzQsY9',
+		mainnetPublicKey: '81kbdwDfTNsg4d5D1BxE9FHEdxEMk8xCJUj5ujjWQyvd',
+		launchTs: 1650507526000,
+		oracleSource: OracleSource.SWITCHBOARD,
+	},
+	{
+		fullName: 'Curve DAO Token',
+		category: ['Exchange'],
+		symbol: 'CRV-PERP',
+		baseAssetSymbol: 'CRV',
+		marketIndex: new BN(19),
+		devnetPublicKey: 'AuEiE5XG5kD1NFoKgEPrWuN9CdT44A3K7yGDuiUPvh9S',
+		mainnetPublicKey: '61NzdQ9y6KhMhWxyJ8kXEe25NxdixVL1YUnGYLDMaUxH',
+		launchTs: 1651017354000,
+		oracleSource: OracleSource.SWITCHBOARD,
+	},
 ];

package/src/idl/clearing_house.json

@@ -3832,6 +3832,23 @@
         ]
       }
     },
+    {
+      "name": "MarginType",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Init"
+          },
+          {
+            "name": "Partial"
+          },
+          {
+            "name": "Maint"
+          }
+        ]
+      }
+    },
     {
       "name": "LiquidationType",
       "type": {

package/src/math/conversion.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertBaseAssetAmountToNumber = exports.convertToNumber = void 0;
+const numericConstants_1 = require("../constants/numericConstants");
+const convertToNumber = (bigNumber, precision = numericConstants_1.MARK_PRICE_PRECISION) => {
+    if (!bigNumber)
+        return 0;
+    return (bigNumber.div(precision).toNumber() +
+        bigNumber.mod(precision).toNumber() / precision.toNumber());
+};
+exports.convertToNumber = convertToNumber;
+const convertBaseAssetAmountToNumber = (baseAssetAmount) => {
+    return (0, exports.convertToNumber)(baseAssetAmount, numericConstants_1.MARK_PRICE_PRECISION.mul(numericConstants_1.PEG_PRECISION));
+};
+exports.convertBaseAssetAmountToNumber = convertBaseAssetAmountToNumber;
+//# sourceMappingURL=conversion.js.map

package/src/math/conversion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversion.js","sourceRoot":"","sources":["conversion.ts"],"names":[],"mappings":";;;AACA,oEAGuC;AAEhC,MAAM,eAAe,GAAG,CAC9B,SAAa,EACb,YAAgB,uCAAoB,EACnC,EAAE;IACH,IAAI,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC;IACzB,OAAO,CACN,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE;QACnC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC,QAAQ,EAAE,CAC1D,CAAC;AACH,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEK,MAAM,8BAA8B,GAAG,CAAC,eAAmB,EAAE,EAAE;IACrE,OAAO,IAAA,uBAAe,EACrB,eAAe,EACf,uCAAoB,CAAC,GAAG,CAAC,gCAAa,CAAC,CACvC,CAAC;AACH,CAAC,CAAC;AALW,QAAA,8BAA8B,kCAKzC"}

package/src/math/funding.js

@@ -0,0 +1,223 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateFundingPool = exports.calculateLongShortFundingRateAndLiveTwaps = exports.calculateLongShortFundingRate = exports.calculateEstimatedFundingRate = exports.calculateAllEstimatedFundingRate = void 0;
+const anchor_1 = require("@project-serum/anchor");
+const numericConstants_1 = require("../constants/numericConstants");
+const market_1 = require("./market");
+/**
+ *
+ * @param market
+ * @param oraclePriceData
+ * @param periodAdjustment
+ * @returns Estimated funding rate. : Precision //TODO-PRECISION
+ */
+async function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1)) {
+    // periodAdjustment
+    // 	1: hourly
+    //  24: daily
+    //  24 * 365.25: annualized
+    const secondsInHour = new anchor_1.BN(3600);
+    const hoursInDay = new anchor_1.BN(24);
+    if (!market.initialized) {
+        return [numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO];
+    }
+    const payFreq = new anchor_1.BN(market.amm.fundingPeriod);
+    // todo: sufficiently differs from blockchain timestamp?
+    const now = new anchor_1.BN((Date.now() / 1000).toFixed(0));
+    const timeSinceLastUpdate = now.sub(market.amm.lastFundingRateTs);
+    // calculate real-time mark twap
+    const lastMarkTwapWithMantissa = market.amm.lastMarkPriceTwap;
+    const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
+    const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
+    const markTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, secondsInHour.sub(timeSinceLastMarkChange));
+    const baseAssetPriceWithMantissa = (0, market_1.calculateMarkPrice)(market);
+    const markTwapWithMantissa = markTwapTimeSinceLastUpdate
+        .mul(lastMarkTwapWithMantissa)
+        .add(timeSinceLastMarkChange.mul(baseAssetPriceWithMantissa))
+        .div(timeSinceLastMarkChange.add(markTwapTimeSinceLastUpdate));
+    // calculate real-time (predicted) oracle twap
+    // note: oracle twap depends on `when the chord is struck` (market is trade)
+    const lastOracleTwapWithMantissa = market.amm.lastOraclePriceTwap;
+    const lastOraclePriceTwapTs = market.amm.lastOraclePriceTwapTs;
+    const timeSinceLastOracleTwapUpdate = now.sub(lastOraclePriceTwapTs);
+    const oracleTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, secondsInHour.sub(timeSinceLastOracleTwapUpdate));
+    const oraclePrice = oraclePriceData.price;
+    let oracleTwapWithMantissa = lastOracleTwapWithMantissa;
+    const oracleLiveVsTwap = oraclePrice
+        .sub(lastOracleTwapWithMantissa)
+        .abs()
+        .mul(numericConstants_1.MARK_PRICE_PRECISION)
+        .mul(new anchor_1.BN(100))
+        .div(lastOracleTwapWithMantissa);
+    // verify pyth live input is within 10% of last twap for live update
+    if (oracleLiveVsTwap.lte(numericConstants_1.MARK_PRICE_PRECISION.mul(new anchor_1.BN(10)))) {
+        oracleTwapWithMantissa = oracleTwapTimeSinceLastUpdate
+            .mul(lastOracleTwapWithMantissa)
+            .add(timeSinceLastMarkChange.mul(oraclePrice))
+            .div(timeSinceLastOracleTwapUpdate.add(oracleTwapTimeSinceLastUpdate));
+    }
+    const twapSpread = lastMarkTwapWithMantissa.sub(lastOracleTwapWithMantissa);
+    const twapSpreadPct = twapSpread
+        .mul(numericConstants_1.MARK_PRICE_PRECISION)
+        .mul(new anchor_1.BN(100))
+        .div(oracleTwapWithMantissa);
+    const lowerboundEst = twapSpreadPct
+        .mul(payFreq)
+        .mul(anchor_1.BN.min(secondsInHour, timeSinceLastUpdate))
+        .mul(periodAdjustment)
+        .div(secondsInHour)
+        .div(secondsInHour)
+        .div(hoursInDay);
+    const interpEst = twapSpreadPct.mul(periodAdjustment).div(hoursInDay);
+    const interpRateQuote = twapSpreadPct
+        .mul(periodAdjustment)
+        .div(hoursInDay)
+        .div(numericConstants_1.MARK_PRICE_PRECISION.div(numericConstants_1.QUOTE_PRECISION));
+    let feePoolSize = calculateFundingPool(market);
+    if (interpRateQuote.lt(new anchor_1.BN(0))) {
+        feePoolSize = feePoolSize.mul(new anchor_1.BN(-1));
+    }
+    let cappedAltEst;
+    let largerSide;
+    let smallerSide;
+    if (market.baseAssetAmountLong.gt(market.baseAssetAmountShort.abs())) {
+        largerSide = market.baseAssetAmountLong.abs();
+        smallerSide = market.baseAssetAmountShort.abs();
+        if (twapSpread.gt(new anchor_1.BN(0))) {
+            return [
+                markTwapWithMantissa,
+                oracleTwapWithMantissa,
+                lowerboundEst,
+                interpEst,
+                interpEst,
+            ];
+        }
+    }
+    else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort.abs())) {
+        largerSide = market.baseAssetAmountShort.abs();
+        smallerSide = market.baseAssetAmountLong.abs();
+        if (twapSpread.lt(new anchor_1.BN(0))) {
+            return [
+                markTwapWithMantissa,
+                oracleTwapWithMantissa,
+                lowerboundEst,
+                interpEst,
+                interpEst,
+            ];
+        }
+    }
+    else {
+        return [
+            markTwapWithMantissa,
+            oracleTwapWithMantissa,
+            lowerboundEst,
+            interpEst,
+            interpEst,
+        ];
+    }
+    if (largerSide.gt(numericConstants_1.ZERO)) {
+        // funding smaller flow
+        cappedAltEst = smallerSide.mul(twapSpread).div(hoursInDay);
+        const feePoolTopOff = feePoolSize
+            .mul(numericConstants_1.MARK_PRICE_PRECISION.div(numericConstants_1.QUOTE_PRECISION))
+            .mul(numericConstants_1.AMM_RESERVE_PRECISION);
+        cappedAltEst = cappedAltEst.add(feePoolTopOff).div(largerSide);
+        cappedAltEst = cappedAltEst
+            .mul(numericConstants_1.MARK_PRICE_PRECISION)
+            .mul(new anchor_1.BN(100))
+            .div(oracleTwapWithMantissa)
+            .mul(periodAdjustment);
+        if (cappedAltEst.abs().gte(interpEst.abs())) {
+            cappedAltEst = interpEst;
+        }
+    }
+    else {
+        cappedAltEst = interpEst;
+    }
+    return [
+        markTwapWithMantissa,
+        oracleTwapWithMantissa,
+        lowerboundEst,
+        cappedAltEst,
+        interpEst,
+    ];
+}
+exports.calculateAllEstimatedFundingRate = calculateAllEstimatedFundingRate;
+/**
+ *
+ * @param market
+ * @param oraclePriceData
+ * @param periodAdjustment
+ * @param estimationMethod
+ * @returns Estimated funding rate. : Precision //TODO-PRECISION
+ */
+async function calculateEstimatedFundingRate(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1), estimationMethod) {
+    const [_1, _2, lowerboundEst, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment);
+    if (estimationMethod == 'lowerbound') {
+        //assuming remaining funding period has no gap
+        return lowerboundEst;
+    }
+    else if (estimationMethod == 'capped') {
+        return cappedAltEst;
+    }
+    else {
+        return interpEst;
+    }
+}
+exports.calculateEstimatedFundingRate = calculateEstimatedFundingRate;
+/**
+ *
+ * @param market
+ * @param oraclePriceData
+ * @param periodAdjustment
+ * @returns Estimated funding rate. : Precision //TODO-PRECISION
+ */
+async function calculateLongShortFundingRate(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1)) {
+    const [_1, _2, _, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment);
+    if (market.baseAssetAmountLong.gt(market.baseAssetAmountShort)) {
+        return [cappedAltEst, interpEst];
+    }
+    else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort)) {
+        return [interpEst, cappedAltEst];
+    }
+    else {
+        return [interpEst, interpEst];
+    }
+}
+exports.calculateLongShortFundingRate = calculateLongShortFundingRate;
+/**
+ *
+ * @param market
+ * @param oraclePriceData
+ * @param periodAdjustment
+ * @returns Estimated funding rate. : Precision //TODO-PRECISION
+ */
+async function calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1)) {
+    const [markTwapLive, oracleTwapLive, _2, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment);
+    if (market.baseAssetAmountLong.gt(market.baseAssetAmountShort.abs())) {
+        return [markTwapLive, oracleTwapLive, cappedAltEst, interpEst];
+    }
+    else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort.abs())) {
+        return [markTwapLive, oracleTwapLive, interpEst, cappedAltEst];
+    }
+    else {
+        return [markTwapLive, oracleTwapLive, interpEst, interpEst];
+    }
+}
+exports.calculateLongShortFundingRateAndLiveTwaps = calculateLongShortFundingRateAndLiveTwaps;
+/**
+ *
+ * @param market
+ * @returns Estimated fee pool size
+ */
+function calculateFundingPool(market) {
+    // todo
+    const totalFeeLB = market.amm.totalFee.div(new anchor_1.BN(2));
+    const feePool = anchor_1.BN.max(numericConstants_1.ZERO, market.amm.totalFeeMinusDistributions
+        .sub(totalFeeLB)
+        .mul(new anchor_1.BN(2))
+        .div(new anchor_1.BN(3)));
+    return feePool;
+}
+exports.calculateFundingPool = calculateFundingPool;
+//# sourceMappingURL=funding.js.map

package/src/math/funding.js.map

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

package/src/math/funding.ts

@@ -43,9 +43,13 @@ export async function calculateAllEstimatedFundingRate(
 	const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
 
 	const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
-	const markTwapTimeSinceLastUpdate = BN.max(
+	const markTwapTimeSinceLastUpdate = 
+		BN.max(
 		secondsInHour,
-		secondsInHour.sub(timeSinceLastMarkChange)
+		BN.max(
+			ZERO,
+			secondsInHour.sub(timeSinceLastMarkChange)
+		)
 	);
 	const baseAssetPriceWithMantissa = calculateMarkPrice(market);
 
@@ -59,6 +63,8 @@ export async function calculateAllEstimatedFundingRate(
 	const lastOracleTwapWithMantissa = market.amm.lastOraclePriceTwap;
 	const lastOraclePriceTwapTs = market.amm.lastOraclePriceTwapTs;
 
+	const oracleInvalidDuration = BN.max(ZERO, lastMarkPriceTwapTs.sub(lastOraclePriceTwapTs));
+
 	const timeSinceLastOracleTwapUpdate = now.sub(lastOraclePriceTwapTs);
 	const oracleTwapTimeSinceLastUpdate = BN.max(
 		secondsInHour,
@@ -80,7 +86,8 @@ export async function calculateAllEstimatedFundingRate(
 		oracleTwapWithMantissa = oracleTwapTimeSinceLastUpdate
 			.mul(lastOracleTwapWithMantissa)
 			.add(timeSinceLastMarkChange.mul(oraclePrice))
-			.div(timeSinceLastOracleTwapUpdate.add(oracleTwapTimeSinceLastUpdate));
+			.add(oracleInvalidDuration.mul(lastMarkTwapWithMantissa))
+			.div(timeSinceLastMarkChange.add(oracleTwapTimeSinceLastUpdate).add(oracleInvalidDuration));
 	}
 
 	const twapSpread = lastMarkTwapWithMantissa.sub(lastOracleTwapWithMantissa);

package/src/math/insuranceFund.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateInsuranceFundSize = void 0;
+const __1 = require("../");
+/**
+ * In the case of a levered loss, the exchange first pays out undistributed fees and then the insurance fund.
+ * Thus the de facto size of the insurance fund is the amount in the insurance vault plus the sum of each markets
+ * undistributed fees.
+ *
+ * @param connection
+ * @param state
+ * @param marketsAccount
+ * @returns Precision : QUOTE_ASSET_PRECISION
+ */
+async function calculateInsuranceFundSize(connection, state, marketsAccount) {
+    const insuranceVaultPublicKey = state.insuranceVault;
+    const insuranceVaultAmount = new __1.BN((await connection.getTokenAccountBalance(insuranceVaultPublicKey)).value.amount);
+    return marketsAccount.markets.reduce((insuranceVaultAmount, market) => {
+        return insuranceVaultAmount.add(market.amm.totalFee.div(new __1.BN(2)));
+    }, insuranceVaultAmount);
+}
+exports.calculateInsuranceFundSize = calculateInsuranceFundSize;
+//# sourceMappingURL=insuranceFund.js.map

package/src/math/insuranceFund.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"insuranceFund.js","sourceRoot":"","sources":["insuranceFund.ts"],"names":[],"mappings":";;;AACA,2BAAyB;AAGzB;;;;;;;;;GASG;AACI,KAAK,UAAU,0BAA0B,CAC/C,UAAsB,EACtB,KAAmB,EACnB,cAA8B;IAE9B,MAAM,uBAAuB,GAAG,KAAK,CAAC,cAAc,CAAC;IACrD,MAAM,oBAAoB,GAAG,IAAI,MAAE,CAClC,CACC,MAAM,UAAU,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,CAChE,CAAC,KAAK,CAAC,MAAM,CACd,CAAC;IACF,OAAO,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,oBAAoB,EAAE,MAAM,EAAE,EAAE;QACrE,OAAO,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAC1B,CAAC;AAdD,gEAcC"}

package/src/math/position.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateEntryPrice = exports.calculatePositionFundingPNL = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
+const __1 = require("../");
+const numericConstants_1 = require("../constants/numericConstants");
+const types_1 = require("../types");
+const amm_1 = require("./amm");
+/**
+ * calculateBaseAssetValue
+ * = market value of closing entire position
+ * @param market
+ * @param userPosition
+ * @returns Base Asset Value. : Precision QUOTE_PRECISION
+ */
+function calculateBaseAssetValue(market, userPosition) {
+    if (userPosition.baseAssetAmount.eq(numericConstants_1.ZERO)) {
+        return numericConstants_1.ZERO;
+    }
+    const directionToClose = findDirectionToClose(userPosition);
+    const [newQuoteAssetReserve, _] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, 'base', userPosition.baseAssetAmount.abs(), (0, amm_1.getSwapDirection)('base', directionToClose));
+    switch (directionToClose) {
+        case types_1.PositionDirection.SHORT:
+            return market.amm.quoteAssetReserve
+                .sub(newQuoteAssetReserve)
+                .mul(market.amm.pegMultiplier)
+                .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
+        case types_1.PositionDirection.LONG:
+            return newQuoteAssetReserve
+                .sub(market.amm.quoteAssetReserve)
+                .mul(market.amm.pegMultiplier)
+                .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO)
+                .add(numericConstants_1.ONE);
+    }
+}
+exports.calculateBaseAssetValue = calculateBaseAssetValue;
+/**
+ * calculatePositionPNL
+ * = BaseAssetAmount * (Avg Exit Price - Avg Entry Price)
+ * @param market
+ * @param marketPosition
+ * @param withFunding (adds unrealized funding payment pnl to result)
+ * @returns BaseAssetAmount : Precision QUOTE_PRECISION
+ */
+function calculatePositionPNL(market, marketPosition, withFunding = false) {
+    if (marketPosition.baseAssetAmount.eq(numericConstants_1.ZERO)) {
+        return numericConstants_1.ZERO;
+    }
+    const baseAssetValue = calculateBaseAssetValue(market, marketPosition);
+    let pnl;
+    if (marketPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
+        pnl = baseAssetValue.sub(marketPosition.quoteAssetAmount);
+    }
+    else {
+        pnl = marketPosition.quoteAssetAmount.sub(baseAssetValue);
+    }
+    if (withFunding) {
+        const fundingRatePnL = calculatePositionFundingPNL(market, marketPosition).div(numericConstants_1.PRICE_TO_QUOTE_PRECISION);
+        pnl = pnl.add(fundingRatePnL);
+    }
+    return pnl;
+}
+exports.calculatePositionPNL = calculatePositionPNL;
+/**
+ *
+ * @param market
+ * @param marketPosition
+ * @returns // TODO-PRECISION
+ */
+function calculatePositionFundingPNL(market, marketPosition) {
+    if (marketPosition.baseAssetAmount.eq(numericConstants_1.ZERO)) {
+        return numericConstants_1.ZERO;
+    }
+    let ammCumulativeFundingRate;
+    if (marketPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
+        ammCumulativeFundingRate = market.amm.cumulativeFundingRateLong;
+    }
+    else {
+        ammCumulativeFundingRate = market.amm.cumulativeFundingRateShort;
+    }
+    const perPositionFundingRate = ammCumulativeFundingRate
+        .sub(marketPosition.lastCumulativeFundingRate)
+        .mul(marketPosition.baseAssetAmount)
+        .div(numericConstants_1.AMM_RESERVE_PRECISION)
+        .div(numericConstants_1.FUNDING_PAYMENT_PRECISION)
+        .mul(new __1.BN(-1));
+    return perPositionFundingRate;
+}
+exports.calculatePositionFundingPNL = calculatePositionFundingPNL;
+/**
+ *
+ * @param userPosition
+ * @returns Precision: MARK_PRICE_PRECISION (10^10)
+ */
+function calculateEntryPrice(userPosition) {
+    if (userPosition.baseAssetAmount.eq(numericConstants_1.ZERO)) {
+        return numericConstants_1.ZERO;
+    }
+    return userPosition.quoteAssetAmount
+        .mul(numericConstants_1.MARK_PRICE_PRECISION)
+        .mul(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO)
+        .div(userPosition.baseAssetAmount)
+        .abs();
+}
+exports.calculateEntryPrice = calculateEntryPrice;
+function findDirectionToClose(userPosition) {
+    return userPosition.baseAssetAmount.gt(numericConstants_1.ZERO)
+        ? types_1.PositionDirection.SHORT
+        : types_1.PositionDirection.LONG;
+}
+exports.findDirectionToClose = findDirectionToClose;
+function positionCurrentDirection(userPosition) {
+    return userPosition.baseAssetAmount.gte(numericConstants_1.ZERO)
+        ? types_1.PositionDirection.LONG
+        : types_1.PositionDirection.SHORT;
+}
+exports.positionCurrentDirection = positionCurrentDirection;
+function isEmptyPosition(userPosition) {
+    return (userPosition.baseAssetAmount.eq(numericConstants_1.ZERO) && userPosition.openOrders.eq(numericConstants_1.ZERO));
+}
+exports.isEmptyPosition = isEmptyPosition;
+//# sourceMappingURL=position.js.map

package/src/math/position.js.map

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

package/src/math/utils.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.squareRootBN = void 0;
+const __1 = require("../");
+const squareRootBN = (n, closeness = new __1.BN(1)) => {
+    // Assuming the sqrt of n as n only
+    let x = n;
+    // The closed guess will be stored in the root
+    let root;
+    // To count the number of iterations
+    let count = 0;
+    const TWO = new __1.BN(2);
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    while (count < Number.MAX_SAFE_INTEGER) {
+        count++;
+        // Calculate more closed x
+        root = x.add(n.div(x)).div(TWO);
+        // Check for closeness
+        if (x.sub(root).abs().lte(closeness))
+            break;
+        // Update root
+        x = root;
+    }
+    return root;
+};
+exports.squareRootBN = squareRootBN;
+//# sourceMappingURL=utils.js.map

package/src/math/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";;;AAAA,2BAAyB;AAElB,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,IAAI,MAAE,CAAC,CAAC,CAAC,EAAE,EAAE;IACxD,mCAAmC;IACnC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,8CAA8C;IAC9C,IAAI,IAAI,CAAC;IAET,oCAAoC;IACpC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,GAAG,GAAG,IAAI,MAAE,CAAC,CAAC,CAAC,CAAC;IAEtB,6DAA6D;IAC7D,OAAO,KAAK,GAAG,MAAM,CAAC,gBAAgB,EAAE;QACvC,KAAK,EAAE,CAAC;QAER,0BAA0B;QAC1B,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEhC,sBAAsB;QACtB,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,MAAM;QAE5C,cAAc;QACd,CAAC,GAAG,IAAI,CAAC;KACT;IAED,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AA1BW,QAAA,YAAY,gBA0BvB"}

package/src/oracles/switchboardClient.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SwitchboardClient = void 0;
+const switchboard_v2_1 = require("@switchboard-xyz/switchboard-v2");
+const web3_js_1 = require("@solana/web3.js");
+const anchor_1 = require("@project-serum/anchor");
+const numericConstants_1 = require("../constants/numericConstants");
+const wallet_1 = require("../wallet");
+const switchboard_v2_json_1 = __importDefault(require("../idl/switchboard_v2.json"));
+// cache switchboard program for every client object since itll always be the same
+const programMap = new Map();
+class SwitchboardClient {
+    constructor(connection, env) {
+        this.connection = connection;
+        this.env = env;
+    }
+    async getOraclePriceData(pricePublicKey) {
+        const accountInfo = await this.connection.getAccountInfo(pricePublicKey);
+        return this.getOraclePriceDataFromBuffer(accountInfo.data);
+    }
+    async getOraclePriceDataFromBuffer(buffer) {
+        const program = await this.getProgram();
+        const aggregatorAccountData = program.account.aggregatorAccountData.coder.accounts.decode('AggregatorAccountData', buffer);
+        const price = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound.result);
+        const confidence = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound
+            .stdDeviation);
+        const slot = aggregatorAccountData.latestConfirmedRound.roundOpenSlot;
+        return {
+            price,
+            slot,
+            confidence,
+        };
+    }
+    async getProgram() {
+        if (programMap.has(this.env)) {
+            return programMap.get(this.env);
+        }
+        const program = await getSwitchboardProgram(this.env, this.connection);
+        programMap.set(this.env, program);
+        return program;
+    }
+}
+exports.SwitchboardClient = SwitchboardClient;
+async function getSwitchboardProgram(env, connection) {
+    const DEFAULT_KEYPAIR = web3_js_1.Keypair.fromSeed(new Uint8Array(32).fill(1));
+    const programId = (0, switchboard_v2_1.getSwitchboardPid)(env);
+    const wallet = new wallet_1.Wallet(DEFAULT_KEYPAIR);
+    const provider = new anchor_1.Provider(connection, wallet, {});
+    return new anchor_1.Program(switchboard_v2_json_1.default, programId, provider);
+}
+function convertSwitchboardDecimal(switchboardDecimal) {
+    const switchboardPrecision = numericConstants_1.TEN.pow(new anchor_1.BN(switchboardDecimal.scale));
+    return switchboardDecimal.mantissa
+        .mul(numericConstants_1.MARK_PRICE_PRECISION)
+        .div(switchboardPrecision);
+}
+//# sourceMappingURL=switchboardClient.js.map

package/src/oracles/switchboardClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"switchboardClient.js","sourceRoot":"","sources":["switchboardClient.ts"],"names":[],"mappings":";;;;;;AAAA,oEAGyC;AACzC,6CAAiE;AAEjE,kDAAmE;AACnE,oEAA0E;AAE1E,sCAAmC;AACnC,qFAA0D;AAE1D,kFAAkF;AAClF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAmB,CAAC;AAE9C,MAAa,iBAAiB;IAI7B,YAAmB,UAAsB,EAAE,GAAa;QACvD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC9B,cAAyB;QAEzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAEM,KAAK,CAAC,4BAA4B,CACxC,MAAc;QAEd,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAExC,MAAM,qBAAqB,GAC1B,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAC1D,uBAAuB,EACvB,MAAM,CACN,CAAC;QACH,MAAM,KAAK,GAAG,yBAAyB,CACtC,qBAAqB,CAAC,oBAAoB,CAAC,MAA4B,CACvE,CAAC;QAEF,MAAM,UAAU,GAAG,yBAAyB,CAC3C,qBAAqB,CAAC,oBAAoB;aACxC,YAAkC,CACpC,CAAC;QAEF,MAAM,IAAI,GAAO,qBAAqB,CAAC,oBAAoB,CAAC,aAAa,CAAC;QAC1E,OAAO;YACN,KAAK;YACL,IAAI;YACJ,UAAU;SACV,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,UAAU;QACtB,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC7B,OAAO,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAChC;QAED,MAAM,OAAO,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACvE,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClC,OAAO,OAAO,CAAC;IAChB,CAAC;CACD;AApDD,8CAoDC;AAED,KAAK,UAAU,qBAAqB,CACnC,GAAa,EACb,UAAsB;IAEtB,MAAM,eAAe,GAAG,iBAAO,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,IAAA,kCAAiB,EAAC,GAAG,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAEtD,OAAO,IAAI,gBAAO,CAAC,6BAAuB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,yBAAyB,CAAC,kBAAsC;IACxE,MAAM,oBAAoB,GAAG,sBAAG,CAAC,GAAG,CAAC,IAAI,WAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IACvE,OAAO,kBAAkB,CAAC,QAAQ;SAChC,GAAG,CAAC,uCAAoB,CAAC;SACzB,GAAG,CAAC,oBAAoB,CAAC,CAAC;AAC7B,CAAC"}

package/src/orders.ts

@@ -199,7 +199,14 @@ export function calculateAmountToTradeForLimit(
 				'Cant calculate limit price for oracle offset oracle without OraclePriceData'
 			);
 		}
-		limitPrice = oraclePriceData.price.add(order.oraclePriceOffset);
+		const floatingPrice = oraclePriceData.price.add(order.oraclePriceOffset);
+		if (order.postOnly) {
+			limitPrice = isVariant(order.direction, 'long')
+				? BN.min(order.price, floatingPrice)
+				: BN.max(order.price, floatingPrice);
+		} else {
+			limitPrice = floatingPrice;
+		}
 	}
 
 	const [maxAmountToTrade, direction] = calculateMaxBaseAssetAmountToTrade(

package/src/token/index.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseTokenAccount = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+function parseTokenAccount(data) {
+    const accountInfo = spl_token_1.AccountLayout.decode(data);
+    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
+    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
+    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
+    if (accountInfo.delegateOption === 0) {
+        accountInfo.delegate = null;
+        // eslint-disable-next-line new-cap
+        accountInfo.delegatedAmount = new spl_token_1.u64(0);
+    }
+    else {
+        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
+        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
+    }
+    accountInfo.isInitialized = accountInfo.state !== 0;
+    accountInfo.isFrozen = accountInfo.state === 2;
+    if (accountInfo.isNativeOption === 1) {
+        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
+        accountInfo.isNative = true;
+    }
+    else {
+        accountInfo.rentExemptReserve = null;
+        accountInfo.isNative = false;
+    }
+    if (accountInfo.closeAuthorityOption === 0) {
+        accountInfo.closeAuthority = null;
+    }
+    else {
+        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
+    }
+    return accountInfo;
+}
+exports.parseTokenAccount = parseTokenAccount;
+//# sourceMappingURL=index.js.map

package/src/token/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,iDAAoE;AACpE,6CAA4C;AAE5C,SAAgB,iBAAiB,CAAC,IAAY;IAC7C,MAAM,WAAW,GAAG,yBAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/C,WAAW,CAAC,IAAI,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACnD,WAAW,CAAC,KAAK,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACrD,WAAW,CAAC,MAAM,GAAG,eAAG,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAExD,IAAI,WAAW,CAAC,cAAc,KAAK,CAAC,EAAE;QACrC,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC5B,mCAAmC;QACnC,WAAW,CAAC,eAAe,GAAG,IAAI,eAAG,CAAC,CAAC,CAAC,CAAC;KACzC;SAAM;QACN,WAAW,CAAC,QAAQ,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC3D,WAAW,CAAC,eAAe,GAAG,eAAG,CAAC,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;KAC1E;IAED,WAAW,CAAC,aAAa,GAAG,WAAW,CAAC,KAAK,KAAK,CAAC,CAAC;IACpD,WAAW,CAAC,QAAQ,GAAG,WAAW,CAAC,KAAK,KAAK,CAAC,CAAC;IAE/C,IAAI,WAAW,CAAC,cAAc,KAAK,CAAC,EAAE;QACrC,WAAW,CAAC,iBAAiB,GAAG,eAAG,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACrE,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC;KAC5B;SAAM;QACN,WAAW,CAAC,iBAAiB,GAAG,IAAI,CAAC;QACrC,WAAW,CAAC,QAAQ,GAAG,KAAK,CAAC;KAC7B;IAED,IAAI,WAAW,CAAC,oBAAoB,KAAK,CAAC,EAAE;QAC3C,WAAW,CAAC,cAAc,GAAG,IAAI,CAAC;KAClC;SAAM;QACN,WAAW,CAAC,cAAc,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;KACvE;IAED,OAAO,WAAW,CAAC;AACpB,CAAC;AAjCD,8CAiCC"}

package/src/tx/defaultTxSender.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultTxSender = void 0;
+class DefaultTxSender {
+    constructor(provider) {
+        this.provider = provider;
+    }
+    send(tx, additionalSigners, opts) {
+        return this.provider.send(tx, additionalSigners, opts);
+    }
+}
+exports.DefaultTxSender = DefaultTxSender;
+//# sourceMappingURL=defaultTxSender.js.map

package/src/tx/defaultTxSender.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultTxSender.js","sourceRoot":"","sources":["defaultTxSender.ts"],"names":[],"mappings":";;;AASA,MAAa,eAAe;IAG3B,YAAmB,QAAkB;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,IAAI,CACH,EAAe,EACf,iBAAiC,EACjC,IAAqB;QAErB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;CACD;AAdD,0CAcC"}

package/src/tx/retryTxSender.ts

@@ -136,32 +136,43 @@ export class RetryTxSender implements TxSender {
 		const start = Date.now();
 		const subscriptionCommitment = commitment || this.provider.opts.commitment;
 
-		let subscriptionId;
+		const subscriptionIds = new Array<number>();
+		const connections = [
+			this.provider.connection,
+			...this.additionalConnections,
+		];
 		let response: RpcResponseAndContext<SignatureResult> | null = null;
-		const confirmPromise = new Promise((resolve, reject) => {
-			try {
-				subscriptionId = this.provider.connection.onSignature(
-					signature,
-					(result: SignatureResult, context: Context) => {
-						subscriptionId = undefined;
-						response = {
-							context,
-							value: result,
-						};
-						resolve(null);
-					},
-					subscriptionCommitment
-				);
-			} catch (err) {
-				reject(err);
-			}
+		const promises = connections.map((connection, i) => {
+			let subscriptionId;
+			const confirmPromise = new Promise((resolve, reject) => {
+				try {
+					subscriptionId = connection.onSignature(
+						signature,
+						(result: SignatureResult, context: Context) => {
+							subscriptionIds[i] = undefined;
+							response = {
+								context,
+								value: result,
+							};
+							resolve(null);
+						},
+						subscriptionCommitment
+					);
+				} catch (err) {
+					reject(err);
+				}
+			});
+			subscriptionIds.push(subscriptionId);
+			return confirmPromise;
 		});
 
 		try {
-			await this.promiseTimeout(confirmPromise, this.timeout);
+			await this.promiseTimeout(promises, this.timeout);
 		} finally {
-			if (subscriptionId) {
-				this.provider.connection.removeSignatureListener(subscriptionId);
+			for (const [i, subscriptionId] of subscriptionIds.entries()) {
+				if (subscriptionId) {
+					connections[i].removeSignatureListener(subscriptionId);
+				}
 			}
 		}
 
@@ -188,16 +199,21 @@ export class RetryTxSender implements TxSender {
 		});
 	}
 
-	promiseTimeout<T>(promise: Promise<T>, timeoutMs: number): Promise<T | null> {
+	promiseTimeout<T>(
+		promises: Promise<T>[],
+		timeoutMs: number
+	): Promise<T | null> {
 		let timeoutId: ReturnType<typeof setTimeout>;
 		const timeoutPromise: Promise<null> = new Promise((resolve) => {
 			timeoutId = setTimeout(() => resolve(null), timeoutMs);
 		});
 
-		return Promise.race([promise, timeoutPromise]).then((result: T | null) => {
-			clearTimeout(timeoutId);
-			return result;
-		});
+		return Promise.race([...promises, timeoutPromise]).then(
+			(result: T | null) => {
+				clearTimeout(timeoutId);
+				return result;
+			}
+		);
 	}
 
 	sendToAdditionalConnections(rawTx: Buffer, opts: ConfirmOptions): void {
@@ -211,4 +227,16 @@ export class RetryTxSender implements TxSender {
 			});
 		});
 	}
+
+	public addAdditionalConnection(newConnection: Connection): void {
+		const alreadyUsingConnection =
+			this.additionalConnections.filter((connection) => {
+				// @ts-ignore
+				return connection._rpcEndpoint === newConnection.rpcEndpoint;
+			}).length > 0;
+
+		if (!alreadyUsingConnection) {
+			this.additionalConnections.push(newConnection);
+		}
+	}
 }

package/src/tx/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/src/tx/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":""}

package/src/tx/utils.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapInTx = void 0;
+const web3_js_1 = require("@solana/web3.js");
+function wrapInTx(instruction) {
+    return new web3_js_1.Transaction().add(instruction);
+}
+exports.wrapInTx = wrapInTx;
+//# sourceMappingURL=utils.js.map

package/src/tx/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";;;AAAA,6CAAsE;AAEtE,SAAgB,QAAQ,CAAC,WAAmC;IAC3D,OAAO,IAAI,qBAAW,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC3C,CAAC;AAFD,4BAEC"}

package/src/util/computeUnits.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findComputeUnitConsumption = void 0;
+async function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
+    const tx = await connection.getTransaction(txSignature, { commitment });
+    const computeUnits = [];
+    const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of 200000 compute units`);
+    tx.meta.logMessages.forEach((logMessage) => {
+        const match = logMessage.match(regex);
+        if (match && match[1]) {
+            computeUnits.push(match[1]);
+        }
+    });
+    return computeUnits;
+}
+exports.findComputeUnitConsumption = findComputeUnitConsumption;
+//# sourceMappingURL=computeUnits.js.map

package/src/util/computeUnits.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeUnits.js","sourceRoot":"","sources":["computeUnits.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,0BAA0B,CAC/C,SAAoB,EACpB,UAAsB,EACtB,WAAmB,EACnB,aAAuB,WAAW;IAElC,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACxE,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,MAAM,KAAK,GAAG,IAAI,MAAM,CACvB,WAAW,SAAS,CAAC,QAAQ,EAAE,gDAAgD,CAC/E,CAAC;IACF,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;YACtB,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;IACF,CAAC,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACrB,CAAC;AAlBD,gEAkBC"}

package/src/util/tps.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.estimateTps = void 0;
+async function estimateTps(programId, connection, failed) {
+    let signatures = await connection.getSignaturesForAddress(programId, undefined, 'finalized');
+    if (failed) {
+        signatures = signatures.filter((signature) => signature.err);
+    }
+    const numberOfSignatures = signatures.length;
+    if (numberOfSignatures === 0) {
+        return 0;
+    }
+    return (numberOfSignatures /
+        (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
+}
+exports.estimateTps = estimateTps;
+//# sourceMappingURL=tps.js.map

package/src/util/tps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tps.js","sourceRoot":"","sources":["tps.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,WAAW,CAChC,SAAoB,EACpB,UAAsB,EACtB,MAAe;IAEf,IAAI,UAAU,GAAG,MAAM,UAAU,CAAC,uBAAuB,CACxD,SAAS,EACT,SAAS,EACT,WAAW,CACX,CAAC;IACF,IAAI,MAAM,EAAE;QACX,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;KAC7D;IAED,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC;IAE7C,IAAI,kBAAkB,KAAK,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC;KACT;IAED,OAAO,CACN,kBAAkB;QAClB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,UAAU,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CACxE,CAAC;AACH,CAAC;AAxBD,kCAwBC"}