@drift-labs/sdk 0.2.0-master.24 → 0.2.0-master.26

package/src/types.ts

@@ -2,12 +2,24 @@ import { PublicKey, Transaction } from '@solana/web3.js';
 import { BN, ZERO } from '.';
 
 // # Utility Types / Enums / Constants
+
+export class MarketStatus {
+	static readonly INITIALIZED = { initialized: {} };
+	static readonly REDUCEONLY = { reduceonly: {} };
+	static readonly SETTLEMENT = { settlement: {} };
+}
+
+export class ContractType {
+	static readonly PERPETUAL = { perpetual: {} };
+	static readonly FUTURE = { future: {} };
+}
+
 export class SwapDirection {
 	static readonly ADD = { add: {} };
 	static readonly REMOVE = { remove: {} };
 }
 
-export class BankBalanceType {
+export class SpotBalanceType {
 	static readonly DEPOSIT = { deposit: {} };
 	static readonly BORROW = { borrow: {} };
 }
@@ -35,6 +47,11 @@ export class OrderType {
 	static readonly MARKET = { market: {} };
 }
 
+export class MarketType {
+	static readonly SPOT = { spot: {} };
+	static readonly PERP = { perp: {} };
+}
+
 export class OrderStatus {
 	static readonly INIT = { init: {} };
 	static readonly OPEN = { open: {} };
@@ -77,6 +94,15 @@ export class OrderTriggerCondition {
 	static readonly BELOW = { below: {} };
 }
 
+export class SpotFulfillmentType {
+	static readonly SERUM_v3 = { serumV3: {} };
+}
+
+export class SpotFulfillmentStatus {
+	static readonly ENABLED = { enabled: {} };
+	static readonly DISABLED = { disabled: {} };
+}
+
 export function isVariant(object: unknown, type: string) {
 	return object.hasOwnProperty(type);
 }
@@ -120,7 +146,7 @@ export type DepositRecord = {
 		deposit?: any;
 		withdraw?: any;
 	};
-	bankIndex: BN;
+	marketIndex: BN;
 	amount: BN;
 	oraclePrice: BN;
 	referrer: PublicKey;
@@ -148,6 +174,36 @@ export type CurveRecord = {
 	tradeId: BN;
 };
 
+export declare type InsuranceFundRecord = {
+	ts: BN;
+	bankIndex: BN;
+	marketIndex: BN;
+	userIfFactor: BN;
+	totalIfFactor: BN;
+	vaultAmountBefore: BN;
+	insuranceVaultAmountBefore: BN;
+	amount: BN;
+	totalIfSharesBefore: BN;
+	totalIfSharesAfter: BN;
+};
+
+export type LPRecord = {
+	ts: BN;
+	user: PublicKey;
+	action: LPAction;
+	nShares: BN;
+	marketIndex: BN;
+	deltaBaseAssetAmount: BN;
+	deltaQuoteAssetAmount: BN;
+	pnl: BN;
+};
+
+export class LPAction {
+	static readonly ADD_LIQUIDITY = { addLiquidity: {} };
+	static readonly REMOVE_LIQUIDITY = { removeLiquidity: {} };
+	static readonly SETTLE_LIQUIDITY = { settleLiquidity: {} };
+}
+
 export type FundingRateRecord = {
 	ts: BN;
 	recordId: BN;
@@ -216,6 +272,7 @@ export type LiquidatePerpRecord = {
 	oraclePrice: BN;
 	baseAssetAmount: BN;
 	quoteAssetAmount: BN;
+	lpShares: BN;
 	userPnl: BN;
 	liquidatorPnl: BN;
 	canceledOrdersFee: BN;
@@ -225,28 +282,28 @@ export type LiquidatePerpRecord = {
 };
 
 export type LiquidateBorrowRecord = {
-	assetBankIndex: BN;
+	assetMarketIndex: BN;
 	assetPrice: BN;
 	assetTransfer: BN;
-	liabilityBankIndex: BN;
+	liabilityMarketIndex: BN;
 	liabilityPrice: BN;
 	liabilityTransfer: BN;
 };
 
 export type LiquidateBorrowForPerpPnlRecord = {
-	marketIndex: BN;
+	perpMarketIndex: BN;
 	marketOraclePrice: BN;
 	pnlTransfer: BN;
-	liabilityBankIndex: BN;
+	liabilityMarketIndex: BN;
 	liabilityPrice: BN;
 	liabilityTransfer: BN;
 };
 
 export type LiquidatePerpPnlForDepositRecord = {
-	marketIndex: BN;
+	perpMarketIndex: BN;
 	marketOraclePrice: BN;
 	pnlTransfer: BN;
-	assetBankIndex: BN;
+	assetMarketIndex: BN;
 	assetPrice: BN;
 	assetTransfer: BN;
 };
@@ -258,7 +315,7 @@ export type PerpBankruptcyRecord = {
 };
 
 export type BorrowBankruptcyRecord = {
-	bankIndex: BN;
+	marketIndex: BN;
 	borrowAmount: BN;
 	cumulativeDepositInterestDelta: BN;
 };
@@ -270,7 +327,7 @@ export type SettlePnlRecord = {
 	pnl: BN;
 	baseAssetAmount: BN;
 	quoteAssetAmountAfter: BN;
-	quoteEntryamount: BN;
+	quoteEntryAmount: BN;
 	settlePrice: BN;
 };
 
@@ -300,12 +357,14 @@ export type OrderActionRecord = {
 	quoteAssetAmountSurplus: BN | null;
 	taker: PublicKey | null;
 	takerOrderId: BN | null;
+	takerOrderDirection: PositionDirection | null;
 	takerOrderBaseAssetAmount: BN | null;
 	takerOrderBaseAssetAmountFilled: BN | null;
 	takerOrderQuoteAssetAmountFilled: BN | null;
 	takerOrderFee: BN | null;
 	maker: PublicKey | null;
 	makerOrderId: BN | null;
+	makerOrderDirection: PositionDirection | null;
 	makerOrderBaseAssetAmount: BN | null;
 	makerOrderBaseAssetAmountFilled: BN | null;
 	makerOrderQuoteAssetAmountFilled: BN | null;
@@ -319,8 +378,6 @@ export type StateAccount = {
 	exchangePaused: boolean;
 	adminControlsPrices: boolean;
 	insuranceVault: PublicKey;
-	insuranceVaultAuthority: PublicKey;
-	insuranceVaultNonce: number;
 	marginRatioInitial: BN;
 	marginRatioMaintenance: BN;
 	marginRatioPartial: BN;
@@ -332,7 +389,8 @@ export type StateAccount = {
 	fullLiquidationPenaltyPercentageDenominator: BN;
 	partialLiquidationLiquidatorShareDenominator: BN;
 	fullLiquidationLiquidatorShareDenominator: BN;
-	feeStructure: FeeStructure;
+	perpFeeStructure: FeeStructure;
+	spotFeeStructure: FeeStructure;
 	totalFee: BN;
 	totalFeeWithdrawn: BN;
 	whitelistMint: PublicKey;
@@ -340,14 +398,20 @@ export type StateAccount = {
 	oracleGuardRails: OracleGuardRails;
 	maxDeposit: BN;
 	numberOfMarkets: BN;
-	numberOfBanks: BN;
+	numberOfSpotMarkets: BN;
 	minOrderQuoteAssetAmount: BN;
+	signer: PublicKey;
+	signerNonce: number;
 	maxAuctionDuration: number;
 	minAuctionDuration: number;
+	liquidationMarginBufferRatio: number;
 };
 
-export type MarketAccount = {
-	initialized: boolean;
+export type PerpMarketAccount = {
+	status: MarketStatus;
+	contractType: ContractType;
+	expiryTs: BN;
+	settlementPrice: BN;
 	marketIndex: BN;
 	pubkey: PublicKey;
 	amm: AMM;
@@ -362,21 +426,23 @@ export type MarketAccount = {
 	liquidationFee: BN;
 	imfFactor: BN;
 	unrealizedImfFactor: BN;
+	unrealizedMaxImbalance: BN;
 	unrealizedInitialAssetWeight: number;
 	unrealizedMaintenanceAssetWeight: number;
+	revenueWithdrawSinceLastSettle: BN;
+	maxRevenueWithdrawPerPeriod: BN;
+	lastRevenueWithdrawTs: BN;
+	quoteSettledInsurance: BN;
+	quoteMaxInsurance: BN;
 };
 
-export type BankAccount = {
-	bankIndex: BN;
+export type SpotMarketAccount = {
+	marketIndex: BN;
 	pubkey: PublicKey;
 	mint: PublicKey;
 	vault: PublicKey;
-	vaultAuthority: PublicKey;
-	vaultAuthorityNonce: number;
 
 	insuranceFundVault: PublicKey;
-	insuranceFundVaultAuthority: PublicKey;
-	insuranceFundVaultAuthorityNonce: number;
 	insuranceWithdrawEscrowPeriod: BN;
 	revenuePool: PoolBalance;
 
@@ -409,6 +475,13 @@ export type BankAccount = {
 	depositTokenTwap: BN;
 	borrowTokenTwap: BN;
 	utilizationTwap: BN;
+
+	orderStepSize: BN;
+	nextFillRecordId: BN;
+	spotFeePool: {
+		balance: BN;
+	};
+	totalSpotFee: BN;
 };
 
 export type PoolBalance = {
@@ -446,6 +519,7 @@ export type AMM = {
 	cumulativeFeePerLp: BN;
 	cumulativeNetBaseAssetAmountPerLp: BN;
 	userLpShares: BN;
+	netUnsettledLpBaseAssetAmount: BN;
 	minimumQuoteAssetTradeSize: BN;
 	baseAssetAmountStepSize: BN;
 	maxBaseAssetAmountRatio: number;
@@ -462,21 +536,24 @@ export type AMM = {
 	totalMmFee: BN;
 	netRevenueSinceLastFunding: BN;
 	lastUpdateSlot: BN;
+	lastOracleValid: boolean;
 	lastBidPriceTwap: BN;
 	lastAskPriceTwap: BN;
 	longSpread: BN;
 	shortSpread: BN;
 	maxSpread: number;
-	marketPosition: UserPosition;
-	marketPositionPerLp: UserPosition;
+	marketPosition: PerpPosition;
+	marketPositionPerLp: PerpPosition;
 	ammJitIntensity: number;
 	maxBaseAssetReserve: BN;
 	minBaseAssetReserve: BN;
+	cumulativeSocialLoss: BN;
 };
 
 // # User Account Types
-export type UserPosition = {
+export type PerpPosition = {
 	baseAssetAmount: BN;
+	remainderBaseAssetAmount: BN;
 	lastCumulativeFundingRate: BN;
 	marketIndex: BN;
 	quoteAssetAmount: BN;
@@ -516,8 +593,8 @@ export type UserAccount = {
 	authority: PublicKey;
 	name: number[];
 	userId: number;
-	bankBalances: UserBankBalance[];
-	positions: UserPosition[];
+	spotPositions: SpotPosition[];
+	perpPositions: PerpPosition[];
 	orders: Order[];
 	beingLiquidated: boolean;
 	bankrupt: boolean;
@@ -525,15 +602,19 @@ export type UserAccount = {
 	nextOrderId: BN;
 };
 
-export type UserBankBalance = {
-	bankIndex: BN;
-	balanceType: BankBalanceType;
+export type SpotPosition = {
+	marketIndex: BN;
+	balanceType: SpotBalanceType;
 	balance: BN;
+	openOrders: number;
+	openBids: BN;
+	openAsks: BN;
 };
 
 export type Order = {
 	status: OrderStatus;
 	orderType: OrderType;
+	marketType: MarketType;
 	ts: BN;
 	slot: BN;
 	orderId: BN;
@@ -561,6 +642,7 @@ export type Order = {
 
 export type OrderParams = {
 	orderType: OrderType;
+	marketType: MarketType;
 	userOrderId: number;
 	direction: PositionDirection;
 	baseAssetAmount: BN;
@@ -575,10 +657,6 @@ export type OrderParams = {
 	oraclePriceOffset: BN;
 	padding0: boolean;
 	padding1: BN;
-	optionalAccounts: {
-		discountToken: boolean;
-		referrer: boolean;
-	};
 };
 
 export type NecessaryOrderParams = {
@@ -594,6 +672,7 @@ export type OptionalOrderParams = {
 
 export const DefaultOrderParams = {
 	orderType: OrderType.MARKET,
+	marketType: MarketType.PERP,
 	userOrderId: 0,
 	direction: PositionDirection.LONG,
 	baseAssetAmount: ZERO,
@@ -608,10 +687,6 @@ export const DefaultOrderParams = {
 	oraclePriceOffset: ZERO,
 	padding0: ZERO,
 	padding1: ZERO,
-	optionalAccounts: {
-		discountToken: false,
-		referrer: false,
-	},
 };
 
 export type MakerInfo = {
@@ -698,7 +773,7 @@ export type OrderFillerRewardStructure = {
 export type MarginCategory = 'Initial' | 'Maintenance';
 
 export type InsuranceFundStake = {
-	bankIndex: BN;
+	marketIndex: BN;
 	authority: PublicKey;
 
 	ifShares: BN;
@@ -708,3 +783,20 @@ export type InsuranceFundStake = {
 	lastWithdrawRequestValue: BN;
 	lastWithdrawRequestTs: BN;
 };
+
+export type SerumV3FulfillmentConfigAccount = {
+	fulfillmentType: SpotFulfillmentType;
+	status: SpotFulfillmentStatus;
+	pubkey: PublicKey;
+	marketIndex: BN;
+	serumProgramId: PublicKey;
+	serumMarket: PublicKey;
+	serumRequestQueue: PublicKey;
+	serumEventQueue: PublicKey;
+	serumBids: PublicKey;
+	serumAsks: PublicKey;
+	serumBaseVault: PublicKey;
+	serumQuoteVault: PublicKey;
+	serumOpenOrders: PublicKey;
+	serumSignerNonce: BN;
+};

package/src/userName.js

@@ -1,20 +1,20 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+exports.__esModule = true;
 exports.decodeName = exports.encodeName = exports.DEFAULT_USER_NAME = exports.MAX_NAME_LENGTH = void 0;
 exports.MAX_NAME_LENGTH = 32;
 exports.DEFAULT_USER_NAME = 'Main Account';
 function encodeName(name) {
     if (name.length > exports.MAX_NAME_LENGTH) {
-        throw Error(`User name (${name}) longer than 32 characters`);
+        throw Error("User name (".concat(name, ") longer than 32 characters"));
     }
-    const buffer = Buffer.alloc(32);
+    var buffer = Buffer.alloc(32);
     buffer.fill(name);
     buffer.fill(' ', name.length);
-    return Array(...buffer);
+    return Array.apply(void 0, buffer);
 }
 exports.encodeName = encodeName;
 function decodeName(bytes) {
-    const buffer = Buffer.from(bytes);
+    var buffer = Buffer.from(bytes);
     return buffer.toString('utf8').trim();
 }
 exports.decodeName = decodeName;

package/src/util/computeUnits.js

@@ -8,20 +8,55 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
 exports.findComputeUnitConsumption = void 0;
-function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const tx = yield connection.getTransaction(txSignature, { commitment });
-        const computeUnits = [];
-        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
-        tx.meta.logMessages.forEach((logMessage) => {
-            const match = logMessage.match(regex);
-            if (match && match[1]) {
-                computeUnits.push(match[1]);
+function findComputeUnitConsumption(programId, connection, txSignature, commitment) {
+    if (commitment === void 0) { commitment = 'confirmed'; }
+    return __awaiter(this, void 0, void 0, function () {
+        var tx, computeUnits, regex;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, connection.getTransaction(txSignature, { commitment: commitment })];
+                case 1:
+                    tx = _a.sent();
+                    computeUnits = [];
+                    regex = new RegExp("Program ".concat(programId.toString(), " consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units"));
+                    tx.meta.logMessages.forEach(function (logMessage) {
+                        var match = logMessage.match(regex);
+                        if (match && match[1]) {
+                            computeUnits.push(match[1]);
+                        }
+                    });
+                    return [2 /*return*/, computeUnits];
             }
         });
-        return computeUnits;
     });
 }
 exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/src/util/promiseTimeout.js

@@ -1,12 +1,12 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+exports.__esModule = true;
 exports.promiseTimeout = void 0;
 function promiseTimeout(promise, timeoutMs) {
-    let timeoutId;
-    const timeoutPromise = new Promise((resolve) => {
-        timeoutId = setTimeout(() => resolve(null), timeoutMs);
+    var timeoutId;
+    var timeoutPromise = new Promise(function (resolve) {
+        timeoutId = setTimeout(function () { return resolve(null); }, timeoutMs);
     });
-    return Promise.race([promise, timeoutPromise]).then((result) => {
+    return Promise.race([promise, timeoutPromise]).then(function (result) {
         clearTimeout(timeoutId);
         return result;
     });

package/src/util/tps.js

@@ -8,20 +8,54 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
 exports.estimateTps = void 0;
 function estimateTps(programId, connection, failed) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let signatures = yield 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));
+    return __awaiter(this, void 0, void 0, function () {
+        var signatures, numberOfSignatures;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, connection.getSignaturesForAddress(programId, undefined, 'finalized')];
+                case 1:
+                    signatures = _a.sent();
+                    if (failed) {
+                        signatures = signatures.filter(function (signature) { return signature.err; });
+                    }
+                    numberOfSignatures = signatures.length;
+                    if (numberOfSignatures === 0) {
+                        return [2 /*return*/, 0];
+                    }
+                    return [2 /*return*/, (numberOfSignatures /
+                            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime))];
+            }
+        });
     });
 }
 exports.estimateTps = estimateTps;

package/src/wallet.js

@@ -8,28 +8,65 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
 exports.Wallet = void 0;
-class Wallet {
-    constructor(payer) {
+var Wallet = /** @class */ (function () {
+    function Wallet(payer) {
         this.payer = payer;
     }
-    signTransaction(tx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            tx.partialSign(this.payer);
-            return tx;
+    Wallet.prototype.signTransaction = function (tx) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                tx.partialSign(this.payer);
+                return [2 /*return*/, tx];
+            });
         });
-    }
-    signAllTransactions(txs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return txs.map((t) => {
-                t.partialSign(this.payer);
-                return t;
+    };
+    Wallet.prototype.signAllTransactions = function (txs) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, txs.map(function (t) {
+                        t.partialSign(_this.payer);
+                        return t;
+                    })];
             });
         });
-    }
-    get publicKey() {
-        return this.payer.publicKey;
-    }
-}
+    };
+    Object.defineProperty(Wallet.prototype, "publicKey", {
+        get: function () {
+            return this.payer.publicKey;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return Wallet;
+}());
 exports.Wallet = Wallet;

package/lib/math/bankBalance.d.ts

@@ -1,15 +0,0 @@
-/// <reference types="bn.js" />
-import { BankAccount, BankBalanceType, MarginCategory } from '../types';
-import { BN } from '@project-serum/anchor';
-export declare function getBalance(tokenAmount: BN, bank: BankAccount, balanceType: BankBalanceType): BN;
-export declare function getTokenAmount(balanceAmount: BN, bank: BankAccount, balanceType: BankBalanceType): BN;
-export declare function calculateAssetWeight(balanceAmount: BN, bank: BankAccount, marginCategory: MarginCategory): BN;
-export declare function calculateLiabilityWeight(balanceAmount: BN, bank: BankAccount, marginCategory: MarginCategory): BN;
-export declare function calculateInterestAccumulated(bank: BankAccount, now: BN): {
-    borrowInterest: BN;
-    depositInterest: BN;
-};
-export declare function calculateWithdrawLimit(bank: BankAccount, now: BN): {
-    borrowLimit: BN;
-    withdrawLimit: BN;
-};