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

package/src/oracles/pythClient.js

@@ -8,72 +8,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-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;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertPythPrice = exports.PythClient = void 0;
-var client_1 = require("@pythnetwork/client");
-var anchor_1 = require("@project-serum/anchor");
-var numericConstants_1 = require("../constants/numericConstants");
-var PythClient = /** @class */ (function () {
-    function PythClient(connection) {
+const client_1 = require("@pythnetwork/client");
+const anchor_1 = require("@project-serum/anchor");
+const numericConstants_1 = require("../constants/numericConstants");
+class PythClient {
+    constructor(connection) {
         this.connection = connection;
     }
-    PythClient.prototype.getOraclePriceData = function (pricePublicKey) {
-        return __awaiter(this, void 0, void 0, function () {
-            var accountInfo;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.connection.getAccountInfo(pricePublicKey)];
-                    case 1:
-                        accountInfo = _a.sent();
-                        return [2 /*return*/, this.getOraclePriceDataFromBuffer(accountInfo.data)];
-                }
-            });
+    getOraclePriceData(pricePublicKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const accountInfo = yield this.connection.getAccountInfo(pricePublicKey);
+            return this.getOraclePriceDataFromBuffer(accountInfo.data);
         });
-    };
-    PythClient.prototype.getOraclePriceDataFromBuffer = function (buffer) {
-        var priceData = (0, client_1.parsePriceData)(buffer);
+    }
+    getOraclePriceDataFromBuffer(buffer) {
+        const priceData = client_1.parsePriceData(buffer);
         return {
             price: convertPythPrice(priceData.aggregate.price, priceData.exponent),
             slot: new anchor_1.BN(priceData.lastSlot.toString()),
             confidence: convertPythPrice(priceData.confidence, priceData.exponent),
             twap: convertPythPrice(priceData.twap.value, priceData.exponent),
             twapConfidence: convertPythPrice(priceData.twac.value, priceData.exponent),
-            hasSufficientNumberOfDataPoints: true
+            hasSufficientNumberOfDataPoints: true,
         };
-    };
-    return PythClient;
-}());
+    }
+}
 exports.PythClient = PythClient;
 function convertPythPrice(price, exponent) {
     exponent = Math.abs(exponent);
-    var pythPrecision = numericConstants_1.TEN.pow(new anchor_1.BN(exponent).abs());
+    const pythPrecision = numericConstants_1.TEN.pow(new anchor_1.BN(exponent).abs());
     return new anchor_1.BN(price * Math.pow(10, exponent))
         .mul(numericConstants_1.MARK_PRICE_PRECISION)
         .div(pythPrecision);

package/src/oracles/quoteAssetOracleClient.js

@@ -8,56 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-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;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuoteAssetOracleClient = exports.QUOTE_ORACLE_PRICE_DATA = void 0;
-var anchor_1 = require("@project-serum/anchor");
-var numericConstants_1 = require("../constants/numericConstants");
+const anchor_1 = require("@project-serum/anchor");
+const numericConstants_1 = require("../constants/numericConstants");
 exports.QUOTE_ORACLE_PRICE_DATA = {
     price: numericConstants_1.MARK_PRICE_PRECISION,
     slot: new anchor_1.BN(0),
     confidence: new anchor_1.BN(1),
-    hasSufficientNumberOfDataPoints: true
+    hasSufficientNumberOfDataPoints: true,
 };
-var QuoteAssetOracleClient = /** @class */ (function () {
-    function QuoteAssetOracleClient() {
-    }
-    QuoteAssetOracleClient.prototype.getOraclePriceData = function (_pricePublicKey) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, Promise.resolve(exports.QUOTE_ORACLE_PRICE_DATA)];
-            });
+class QuoteAssetOracleClient {
+    constructor() { }
+    getOraclePriceData(_pricePublicKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Promise.resolve(exports.QUOTE_ORACLE_PRICE_DATA);
         });
-    };
-    QuoteAssetOracleClient.prototype.getOraclePriceDataFromBuffer = function (_buffer) {
+    }
+    getOraclePriceDataFromBuffer(_buffer) {
         return exports.QUOTE_ORACLE_PRICE_DATA;
-    };
-    return QuoteAssetOracleClient;
-}());
+    }
+}
 exports.QuoteAssetOracleClient = QuoteAssetOracleClient;

package/src/oracles/switchboardClient.js

@@ -8,93 +8,61 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-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 };
-    }
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.SwitchboardClient = void 0;
-var web3_js_1 = require("@solana/web3.js");
-var anchor_1 = require("@project-serum/anchor");
-var numericConstants_1 = require("../constants/numericConstants");
-var wallet_1 = require("../wallet");
-var switchboard_v2_json_1 = require("../idl/switchboard_v2.json");
-var program;
-var SwitchboardClient = /** @class */ (function () {
-    function SwitchboardClient(connection) {
+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"));
+let program;
+class SwitchboardClient {
+    constructor(connection) {
         this.connection = connection;
     }
-    SwitchboardClient.prototype.getOraclePriceData = function (pricePublicKey) {
-        return __awaiter(this, void 0, void 0, function () {
-            var accountInfo;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.connection.getAccountInfo(pricePublicKey)];
-                    case 1:
-                        accountInfo = _a.sent();
-                        return [2 /*return*/, this.getOraclePriceDataFromBuffer(accountInfo.data)];
-                }
-            });
+    getOraclePriceData(pricePublicKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const accountInfo = yield this.connection.getAccountInfo(pricePublicKey);
+            return this.getOraclePriceDataFromBuffer(accountInfo.data);
         });
-    };
-    SwitchboardClient.prototype.getOraclePriceDataFromBuffer = function (buffer) {
-        var program = this.getProgram();
-        var aggregatorAccountData = program.account.aggregatorAccountData.coder.accounts.decode('AggregatorAccountData', buffer);
-        var price = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound.result);
-        var confidence = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound
+    }
+    getOraclePriceDataFromBuffer(buffer) {
+        const program = this.getProgram();
+        const aggregatorAccountData = program.account.aggregatorAccountData.coder.accounts.decode('AggregatorAccountData', buffer);
+        const price = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound.result);
+        const confidence = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound
             .stdDeviation);
-        var hasSufficientNumberOfDataPoints = aggregatorAccountData.latestConfirmedRound.numSuccess >=
+        const hasSufficientNumberOfDataPoints = aggregatorAccountData.latestConfirmedRound.numSuccess >=
             aggregatorAccountData.minOracleResults;
-        var slot = aggregatorAccountData.latestConfirmedRound.roundOpenSlot;
+        const slot = aggregatorAccountData.latestConfirmedRound.roundOpenSlot;
         return {
-            price: price,
-            slot: slot,
-            confidence: confidence,
-            hasSufficientNumberOfDataPoints: hasSufficientNumberOfDataPoints
+            price,
+            slot,
+            confidence,
+            hasSufficientNumberOfDataPoints,
         };
-    };
-    SwitchboardClient.prototype.getProgram = function () {
+    }
+    getProgram() {
         if (program) {
             return program;
         }
         program = getSwitchboardProgram(this.connection);
         return program;
-    };
-    return SwitchboardClient;
-}());
+    }
+}
 exports.SwitchboardClient = SwitchboardClient;
 function getSwitchboardProgram(connection) {
-    var DEFAULT_KEYPAIR = web3_js_1.Keypair.fromSeed(new Uint8Array(32).fill(1));
-    var programId = web3_js_1.PublicKey["default"];
-    var wallet = new wallet_1.Wallet(DEFAULT_KEYPAIR);
-    var provider = new anchor_1.AnchorProvider(connection, wallet, {});
-    return new anchor_1.Program(switchboard_v2_json_1["default"], programId, provider);
+    const DEFAULT_KEYPAIR = web3_js_1.Keypair.fromSeed(new Uint8Array(32).fill(1));
+    const programId = web3_js_1.PublicKey.default;
+    const wallet = new wallet_1.Wallet(DEFAULT_KEYPAIR);
+    const provider = new anchor_1.AnchorProvider(connection, wallet, {});
+    return new anchor_1.Program(switchboard_v2_json_1.default, programId, provider);
 }
 function convertSwitchboardDecimal(switchboardDecimal) {
-    var switchboardPrecision = numericConstants_1.TEN.pow(new anchor_1.BN(switchboardDecimal.scale));
+    const switchboardPrecision = numericConstants_1.TEN.pow(new anchor_1.BN(switchboardDecimal.scale));
     return switchboardDecimal.mantissa
         .mul(numericConstants_1.MARK_PRICE_PRECISION)
         .div(switchboardPrecision);

package/src/oracles/types.js

@@ -1,2 +1,2 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/token/index.js

@@ -1,10 +1,10 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTokenAccount = void 0;
-var spl_token_1 = require("@solana/spl-token");
-var web3_js_1 = require("@solana/web3.js");
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
 function parseTokenAccount(data) {
-    var accountInfo = spl_token_1.AccountLayout.decode(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);

package/src/tx/types.js

@@ -1,2 +1,2 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/tx/utils.js

@@ -1,16 +1,15 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrapInTx = void 0;
-var web3_js_1 = require("@solana/web3.js");
-var COMPUTE_UNITS_DEFAULT = 200000;
-function wrapInTx(instruction, computeUnits // TODO, requires less code change
+const web3_js_1 = require("@solana/web3.js");
+const COMPUTE_UNITS_DEFAULT = 200000;
+function wrapInTx(instruction, computeUnits = 600000 // TODO, requires less code change
 ) {
-    if (computeUnits === void 0) { computeUnits = 600000; }
-    var tx = new web3_js_1.Transaction();
+    const tx = new web3_js_1.Transaction();
     if (computeUnits != COMPUTE_UNITS_DEFAULT) {
         tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
             units: computeUnits,
-            additionalFee: 0
+            additionalFee: 0,
         }));
     }
     return tx.add(instruction);

package/src/types.ts

@@ -7,6 +7,7 @@ export class MarketStatus {
 	static readonly INITIALIZED = { initialized: {} };
 	static readonly REDUCEONLY = { reduceonly: {} };
 	static readonly SETTLEMENT = { settlement: {} };
+	static readonly DELISTED = { delisted: {} };
 }
 
 export class ContractType {
@@ -47,6 +48,7 @@ export class OrderType {
 	static readonly MARKET = { market: {} };
 }
 
+export declare type MarketTypeStr = 'perp' | 'spot';
 export class MarketType {
 	static readonly SPOT = { spot: {} };
 	static readonly PERP = { perp: {} };
@@ -113,6 +115,10 @@ export function isOneOfVariant(object: unknown, types: string[]) {
 	}, false);
 }
 
+export function getVariant(object: unknown): string {
+	return Object.keys(object)[0];
+}
+
 export enum TradeSide {
 	None = 0,
 	Buy = 1,
@@ -241,6 +247,7 @@ export type LiquidationRecord = {
 	marginRequirement: BN;
 	totalCollateral: BN;
 	liquidationId: number;
+	canceledOrderIds: BN[];
 	liquidatePerp: LiquidatePerpRecord;
 	liquidateBorrow: LiquidateBorrowRecord;
 	liquidateBorrowForPerpPnl: LiquidateBorrowForPerpPnlRecord;
@@ -268,17 +275,16 @@ export class LiquidationType {
 
 export type LiquidatePerpRecord = {
 	marketIndex: BN;
-	orderIds: BN[];
 	oraclePrice: BN;
 	baseAssetAmount: BN;
 	quoteAssetAmount: BN;
 	lpShares: BN;
 	userPnl: BN;
 	liquidatorPnl: BN;
-	canceledOrdersFee: BN;
 	userOrderId: BN;
 	liquidatorOrderId: BN;
 	fillRecordId: BN;
+	ifFee: BN;
 };
 
 export type LiquidateBorrowRecord = {
@@ -288,6 +294,7 @@ export type LiquidateBorrowRecord = {
 	liabilityMarketIndex: BN;
 	liabilityPrice: BN;
 	liabilityTransfer: BN;
+	ifFee: BN;
 };
 
 export type LiquidateBorrowForPerpPnlRecord = {
@@ -378,17 +385,6 @@ export type StateAccount = {
 	exchangePaused: boolean;
 	adminControlsPrices: boolean;
 	insuranceVault: PublicKey;
-	marginRatioInitial: BN;
-	marginRatioMaintenance: BN;
-	marginRatioPartial: BN;
-	partialLiquidationClosePercentageNumerator: BN;
-	partialLiquidationClosePercentageDenominator: BN;
-	partialLiquidationPenaltyPercentageNumerator: BN;
-	partialLiquidationPenaltyPercentageDenominator: BN;
-	fullLiquidationPenaltyPercentageNumerator: BN;
-	fullLiquidationPenaltyPercentageDenominator: BN;
-	partialLiquidationLiquidatorShareDenominator: BN;
-	fullLiquidationLiquidatorShareDenominator: BN;
 	perpFeeStructure: FeeStructure;
 	spotFeeStructure: FeeStructure;
 	totalFee: BN;
@@ -402,8 +398,9 @@ export type StateAccount = {
 	minOrderQuoteAssetAmount: BN;
 	signer: PublicKey;
 	signerNonce: number;
-	maxAuctionDuration: number;
-	minAuctionDuration: number;
+	defaultMarketOrderTimeInForce: number;
+	minPerpAuctionDuration: number;
+	defaultSpotAuctionDuration: number;
 	liquidationMarginBufferRatio: number;
 };
 
@@ -423,7 +420,8 @@ export type PerpMarketAccount = {
 	marginRatioMaintenance: number;
 	nextFillRecordId: BN;
 	pnlPool: PoolBalance;
-	liquidationFee: BN;
+	liquidatorFee: BN;
+	ifLiquidationFee: BN;
 	imfFactor: BN;
 	unrealizedImfFactor: BN;
 	unrealizedMaxImbalance: BN;
@@ -451,7 +449,7 @@ export type SpotMarketAccount = {
 
 	userIfFactor: BN;
 	totalIfFactor: BN;
-	liquidationIfFactor: BN;
+	ifLiquidationFee: BN;
 
 	decimals: number;
 	optimalUtilization: BN;
@@ -468,7 +466,7 @@ export type SpotMarketAccount = {
 	maintenanceAssetWeight: BN;
 	initialLiabilityWeight: BN;
 	maintenanceLiabilityWeight: BN;
-	liquidationFee: BN;
+	liquidatorFee: BN;
 	imfFactor: BN;
 
 	withdrawGuardThreshold: BN;
@@ -600,6 +598,7 @@ export type UserAccount = {
 	bankrupt: boolean;
 	nextLiquidationId: number;
 	nextOrderId: BN;
+	customMarginRatio: number;
 };
 
 export type SpotPosition = {
@@ -638,6 +637,7 @@ export type Order = {
 	auctionDuration: number;
 	auctionStartPrice: BN;
 	auctionEndPrice: BN;
+	timeInForce: number;
 };
 
 export type OrderParams = {
@@ -655,8 +655,9 @@ export type OrderParams = {
 	triggerCondition: OrderTriggerCondition;
 	positionLimit: BN;
 	oraclePriceOffset: BN;
-	padding0: boolean;
-	padding1: BN;
+	auctionDuration: number | null;
+	timeInForce: number | null;
+	auctionStartPrice: BN | null;
 };
 
 export type NecessaryOrderParams = {
@@ -685,8 +686,9 @@ export const DefaultOrderParams = {
 	triggerCondition: OrderTriggerCondition.ABOVE,
 	positionLimit: ZERO,
 	oraclePriceOffset: ZERO,
-	padding0: ZERO,
-	padding1: ZERO,
+	auctionDuration: null,
+	timeInForce: null,
+	auctionStartPrice: null,
 };
 
 export type MakerInfo = {
@@ -748,7 +750,7 @@ export type FeeStructure = {
 	makerRebateNumerator: BN;
 	makerRebateDenominator: BN;
 	fillerRewardStructure: OrderFillerRewardStructure;
-	cancelOrderFee: BN;
+	flatFillerFee: BN;
 };
 
 export type OracleGuardRails = {

package/src/userMap/userMap.ts

@@ -0,0 +1,100 @@
+import {
+	ClearingHouseUser,
+	ClearingHouse,
+	UserAccount,
+	bulkPollingUserSubscribe,
+	OrderRecord,
+	ClearingHouseUserAccountSubscriptionConfig,
+} from '..';
+import { ProgramAccount } from '@project-serum/anchor';
+
+import { PublicKey } from '@solana/web3.js';
+
+export class UserMap {
+	private userMap = new Map<string, ClearingHouseUser>();
+	private clearingHouse: ClearingHouse;
+	private accountSubscription: ClearingHouseUserAccountSubscriptionConfig;
+
+	constructor(
+		clearingHouse: ClearingHouse,
+		accountSubscription: ClearingHouseUserAccountSubscriptionConfig
+	) {
+		this.clearingHouse = clearingHouse;
+		this.accountSubscription = accountSubscription;
+	}
+
+	public async fetchAllUsers() {
+		const userArray: ClearingHouseUser[] = [];
+
+		const programUserAccounts =
+			(await this.clearingHouse.program.account.user.all()) as ProgramAccount<UserAccount>[];
+		for (const programUserAccount of programUserAccounts) {
+			if (this.userMap.has(programUserAccount.publicKey.toString())) {
+				continue;
+			}
+
+			const user = new ClearingHouseUser({
+				clearingHouse: this.clearingHouse,
+				userAccountPublicKey: programUserAccount.publicKey,
+				accountSubscription: this.accountSubscription,
+			});
+			userArray.push(user);
+		}
+
+		if (this.accountSubscription.type === 'polling') {
+			await bulkPollingUserSubscribe(
+				userArray,
+				this.accountSubscription.accountLoader
+			);
+		}
+
+		for (const user of userArray) {
+			this.userMap.set(user.getUserAccountPublicKey().toString(), user);
+		}
+	}
+
+	public async addPubkey(userAccountPublicKey: PublicKey) {
+		const user = new ClearingHouseUser({
+			clearingHouse: this.clearingHouse,
+			userAccountPublicKey,
+			accountSubscription: this.accountSubscription,
+		});
+		await user.subscribe();
+		this.userMap.set(userAccountPublicKey.toString(), user);
+	}
+
+	public has(key: string): boolean {
+		return this.userMap.has(key);
+	}
+
+	/**
+	 * gets the ClearingHouseUser for a particular userAccountPublicKey, if no ClearingHouseUser exists, undefined is returned
+	 * @param key userAccountPublicKey to get ClearngHouseUserFor
+	 * @returns user ClearingHouseUser | undefined
+	 */
+	public get(key: string): ClearingHouseUser | undefined {
+		return this.userMap.get(key);
+	}
+
+	/**
+	 * gets the ClearingHouseUser for a particular userAccountPublicKey, if no ClearingHouseUser exists, new one is created
+	 * @param key userAccountPublicKey to get ClearngHouseUserFor
+	 * @returns  ClearingHouseUser
+	 */
+	public async mustGet(key: string): Promise<ClearingHouseUser> {
+		if (!this.has(key)) {
+			await this.addPubkey(new PublicKey(key));
+		}
+		const user = this.userMap.get(key);
+		await user.fetchAccounts();
+		return user;
+	}
+
+	public async updateWithOrderRecord(record: OrderRecord) {
+		await this.addPubkey(record.user);
+	}
+
+	public values(): IterableIterator<ClearingHouseUser> {
+		return this.userMap.values();
+	}
+}