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

package/src/accounts/webSocketUserAccountSubscriber.js

@@ -0,0 +1,113 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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;
+exports.WebSocketUserAccountSubscriber = void 0;
+var types_1 = require("./types");
+var events_1 = require("events");
+var webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
+var WebSocketUserAccountSubscriber = /** @class */ (function () {
+    function WebSocketUserAccountSubscriber(program, userAccountPublicKey) {
+        this.isSubscribed = false;
+        this.program = program;
+        this.userAccountPublicKey = userAccountPublicKey;
+        this.eventEmitter = new events_1.EventEmitter();
+    }
+    WebSocketUserAccountSubscriber.prototype.subscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isSubscribed) {
+                            return [2 /*return*/, true];
+                        }
+                        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey);
+                        return [4 /*yield*/, this.userDataAccountSubscriber.subscribe(function (data) {
+                                _this.eventEmitter.emit('userAccountUpdate', data);
+                                _this.eventEmitter.emit('update');
+                            })];
+                    case 1:
+                        _a.sent();
+                        this.eventEmitter.emit('update');
+                        this.isSubscribed = true;
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    WebSocketUserAccountSubscriber.prototype.fetch = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, Promise.all([this.userDataAccountSubscriber.fetch()])];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    WebSocketUserAccountSubscriber.prototype.unsubscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.isSubscribed) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, Promise.all([this.userDataAccountSubscriber.unsubscribe()])];
+                    case 1:
+                        _a.sent();
+                        this.isSubscribed = false;
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    WebSocketUserAccountSubscriber.prototype.assertIsSubscribed = function () {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    };
+    WebSocketUserAccountSubscriber.prototype.getUserAccountAndSlot = function () {
+        this.assertIsSubscribed();
+        return this.userDataAccountSubscriber.dataAndSlot;
+    };
+    return WebSocketUserAccountSubscriber;
+}());
+exports.WebSocketUserAccountSubscriber = WebSocketUserAccountSubscriber;

package/src/accounts/webSocketUserStatsAccountSubsriber.js

@@ -0,0 +1,113 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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;
+exports.WebSocketUserStatsAccountSubscriber = void 0;
+var types_1 = require("./types");
+var events_1 = require("events");
+var webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
+var WebSocketUserStatsAccountSubscriber = /** @class */ (function () {
+    function WebSocketUserStatsAccountSubscriber(program, userStatsAccountPublicKey) {
+        this.isSubscribed = false;
+        this.program = program;
+        this.userStatsAccountPublicKey = userStatsAccountPublicKey;
+        this.eventEmitter = new events_1.EventEmitter();
+    }
+    WebSocketUserStatsAccountSubscriber.prototype.subscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isSubscribed) {
+                            return [2 /*return*/, true];
+                        }
+                        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey);
+                        return [4 /*yield*/, this.userStatsAccountSubscriber.subscribe(function (data) {
+                                _this.eventEmitter.emit('userStatsAccountUpdate', data);
+                                _this.eventEmitter.emit('update');
+                            })];
+                    case 1:
+                        _a.sent();
+                        this.eventEmitter.emit('update');
+                        this.isSubscribed = true;
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    WebSocketUserStatsAccountSubscriber.prototype.fetch = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, Promise.all([this.userStatsAccountSubscriber.fetch()])];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    WebSocketUserStatsAccountSubscriber.prototype.unsubscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.isSubscribed) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, Promise.all([this.userStatsAccountSubscriber.unsubscribe()])];
+                    case 1:
+                        _a.sent();
+                        this.isSubscribed = false;
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    WebSocketUserStatsAccountSubscriber.prototype.assertIsSubscribed = function () {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    };
+    WebSocketUserStatsAccountSubscriber.prototype.getUserStatsAccountAndSlot = function () {
+        this.assertIsSubscribed();
+        return this.userStatsAccountSubscriber.dataAndSlot;
+    };
+    return WebSocketUserStatsAccountSubscriber;
+}());
+exports.WebSocketUserStatsAccountSubscriber = WebSocketUserStatsAccountSubscriber;

package/src/addresses/pda.js

@@ -0,0 +1,186 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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;
+exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getClearingHouseSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
+var anchor = require("@project-serum/anchor");
+function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house'))], programId)];
+        });
+    });
+}
+exports.getClearingHouseStateAccountPublicKeyAndNonce = getClearingHouseStateAccountPublicKeyAndNonce;
+function getClearingHouseStateAccountPublicKey(programId) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getClearingHouseStateAccountPublicKeyAndNonce(programId)];
+                case 1: return [2 /*return*/, (_a.sent())[0]];
+            }
+        });
+    });
+}
+exports.getClearingHouseStateAccountPublicKey = getClearingHouseStateAccountPublicKey;
+function getUserAccountPublicKeyAndNonce(programId, authority, userId) {
+    if (userId === void 0) { userId = 0; }
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, anchor.web3.PublicKey.findProgramAddress([
+                    Buffer.from(anchor.utils.bytes.utf8.encode('user')),
+                    authority.toBuffer(),
+                    Uint8Array.from([userId]),
+                ], programId)];
+        });
+    });
+}
+exports.getUserAccountPublicKeyAndNonce = getUserAccountPublicKeyAndNonce;
+function getUserAccountPublicKey(programId, authority, userId) {
+    if (userId === void 0) { userId = 0; }
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getUserAccountPublicKeyAndNonce(programId, authority, userId)];
+                case 1: return [2 /*return*/, (_a.sent())[0]];
+            }
+        });
+    });
+}
+exports.getUserAccountPublicKey = getUserAccountPublicKey;
+function getUserAccountPublicKeySync(programId, authority, userId) {
+    if (userId === void 0) { userId = 0; }
+    return anchor.web3.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('user')),
+        authority.toBuffer(),
+        Uint8Array.from([userId]),
+    ], programId)[0];
+}
+exports.getUserAccountPublicKeySync = getUserAccountPublicKeySync;
+function getUserStatsAccountPublicKey(programId, authority) {
+    return anchor.web3.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('user_stats')),
+        authority.toBuffer(),
+    ], programId)[0];
+}
+exports.getUserStatsAccountPublicKey = getUserStatsAccountPublicKey;
+function getMarketPublicKey(programId, marketIndex) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, anchor.web3.PublicKey.findProgramAddress([
+                        Buffer.from(anchor.utils.bytes.utf8.encode('market')),
+                        marketIndex.toArrayLike(Buffer, 'le', 8),
+                    ], programId)];
+                case 1: return [2 /*return*/, (_a.sent())[0]];
+            }
+        });
+    });
+}
+exports.getMarketPublicKey = getMarketPublicKey;
+function getSpotMarketPublicKey(programId, marketIndex) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, anchor.web3.PublicKey.findProgramAddress([
+                        Buffer.from(anchor.utils.bytes.utf8.encode('spot_market')),
+                        marketIndex.toArrayLike(Buffer, 'le', 8),
+                    ], programId)];
+                case 1: return [2 /*return*/, (_a.sent())[0]];
+            }
+        });
+    });
+}
+exports.getSpotMarketPublicKey = getSpotMarketPublicKey;
+function getSpotMarketVaultPublicKey(programId, marketIndex) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, anchor.web3.PublicKey.findProgramAddress([
+                        Buffer.from(anchor.utils.bytes.utf8.encode('spot_market_vault')),
+                        marketIndex.toArrayLike(Buffer, 'le', 8),
+                    ], programId)];
+                case 1: return [2 /*return*/, (_a.sent())[0]];
+            }
+        });
+    });
+}
+exports.getSpotMarketVaultPublicKey = getSpotMarketVaultPublicKey;
+function getInsuranceFundVaultPublicKey(programId, marketIndex) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, anchor.web3.PublicKey.findProgramAddress([
+                        Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_vault')),
+                        marketIndex.toArrayLike(Buffer, 'le', 8),
+                    ], programId)];
+                case 1: return [2 /*return*/, (_a.sent())[0]];
+            }
+        });
+    });
+}
+exports.getInsuranceFundVaultPublicKey = getInsuranceFundVaultPublicKey;
+function getInsuranceFundStakeAccountPublicKey(programId, authority, marketIndex) {
+    return anchor.web3.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_stake')),
+        authority.toBuffer(),
+        marketIndex.toArrayLike(Buffer, 'le', 8),
+    ], programId)[0];
+}
+exports.getInsuranceFundStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey;
+function getClearingHouseSignerPublicKey(programId) {
+    return anchor.web3.PublicKey.findProgramAddressSync([Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house_signer'))], programId)[0];
+}
+exports.getClearingHouseSignerPublicKey = getClearingHouseSignerPublicKey;
+function getSerumOpenOrdersPublicKey(programId, market) {
+    return anchor.web3.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('serum_open_orders')),
+        market.toBuffer(),
+    ], programId)[0];
+}
+exports.getSerumOpenOrdersPublicKey = getSerumOpenOrdersPublicKey;
+function getSerumSignerPublicKey(programId, market, nonce) {
+    return anchor.web3.PublicKey.createProgramAddressSync([market.toBuffer(), nonce.toArrayLike(Buffer, 'le', 8)], programId);
+}
+exports.getSerumSignerPublicKey = getSerumSignerPublicKey;
+function getSerumFulfillmentConfigPublicKey(programId, market) {
+    return anchor.web3.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('serum_fulfillment_config')),
+        market.toBuffer(),
+    ], programId)[0];
+}
+exports.getSerumFulfillmentConfigPublicKey = getSerumFulfillmentConfigPublicKey;

package/src/addresses/pda.ts

@@ -85,45 +85,30 @@ export async function getMarketPublicKey(
 	)[0];
 }
 
-export async function getBankPublicKey(
+export async function getSpotMarketPublicKey(
 	programId: PublicKey,
-	bankIndex: BN
-): Promise<PublicKey> {
-	return (
-		await anchor.web3.PublicKey.findProgramAddress(
-			[
-				Buffer.from(anchor.utils.bytes.utf8.encode('bank')),
-				bankIndex.toArrayLike(Buffer, 'le', 8),
-			],
-			programId
-		)
-	)[0];
-}
-
-export async function getBankVaultPublicKey(
-	programId: PublicKey,
-	bankIndex: BN
+	marketIndex: BN
 ): Promise<PublicKey> {
 	return (
 		await anchor.web3.PublicKey.findProgramAddress(
 			[
-				Buffer.from(anchor.utils.bytes.utf8.encode('bank_vault')),
-				bankIndex.toArrayLike(Buffer, 'le', 8),
+				Buffer.from(anchor.utils.bytes.utf8.encode('spot_market')),
+				marketIndex.toArrayLike(Buffer, 'le', 8),
 			],
 			programId
 		)
 	)[0];
 }
 
-export async function getBankVaultAuthorityPublicKey(
+export async function getSpotMarketVaultPublicKey(
 	programId: PublicKey,
-	bankIndex: BN
+	marketIndex: BN
 ): Promise<PublicKey> {
 	return (
 		await anchor.web3.PublicKey.findProgramAddress(
 			[
-				Buffer.from(anchor.utils.bytes.utf8.encode('bank_vault_authority')),
-				bankIndex.toArrayLike(Buffer, 'le', 8),
+				Buffer.from(anchor.utils.bytes.utf8.encode('spot_market_vault')),
+				marketIndex.toArrayLike(Buffer, 'le', 8),
 			],
 			programId
 		)
@@ -132,30 +117,13 @@ export async function getBankVaultAuthorityPublicKey(
 
 export async function getInsuranceFundVaultPublicKey(
 	programId: PublicKey,
-	bankIndex: BN
+	marketIndex: BN
 ): Promise<PublicKey> {
 	return (
 		await anchor.web3.PublicKey.findProgramAddress(
 			[
 				Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_vault')),
-				bankIndex.toArrayLike(Buffer, 'le', 8),
-			],
-			programId
-		)
-	)[0];
-}
-
-export async function getInsuranceFundVaultAuthorityPublicKey(
-	programId: PublicKey,
-	bankIndex: BN
-): Promise<PublicKey> {
-	return (
-		await anchor.web3.PublicKey.findProgramAddress(
-			[
-				Buffer.from(
-					anchor.utils.bytes.utf8.encode('insurance_fund_vault_authority')
-				),
-				bankIndex.toArrayLike(Buffer, 'le', 8),
+				marketIndex.toArrayLike(Buffer, 'le', 8),
 			],
 			programId
 		)
@@ -165,13 +133,13 @@ export async function getInsuranceFundVaultAuthorityPublicKey(
 export function getInsuranceFundStakeAccountPublicKey(
 	programId: PublicKey,
 	authority: PublicKey,
-	bankIndex: BN
+	marketIndex: BN
 ): PublicKey {
 	return anchor.web3.PublicKey.findProgramAddressSync(
 		[
 			Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_stake')),
 			authority.toBuffer(),
-			bankIndex.toArrayLike(Buffer, 'le', 8),
+			marketIndex.toArrayLike(Buffer, 'le', 8),
 		],
 		programId
 	)[0];
@@ -185,3 +153,40 @@ export function getClearingHouseSignerPublicKey(
 		programId
 	)[0];
 }
+
+export function getSerumOpenOrdersPublicKey(
+	programId: PublicKey,
+	market: PublicKey
+): PublicKey {
+	return anchor.web3.PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('serum_open_orders')),
+			market.toBuffer(),
+		],
+		programId
+	)[0];
+}
+
+export function getSerumSignerPublicKey(
+	programId: PublicKey,
+	market: PublicKey,
+	nonce: BN
+): PublicKey {
+	return anchor.web3.PublicKey.createProgramAddressSync(
+		[market.toBuffer(), nonce.toArrayLike(Buffer, 'le', 8)],
+		programId
+	);
+}
+
+export function getSerumFulfillmentConfigPublicKey(
+	programId: PublicKey,
+	market: PublicKey
+): PublicKey {
+	return anchor.web3.PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('serum_fulfillment_config')),
+			market.toBuffer(),
+		],
+		programId
+	)[0];
+}