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

package/lib/idl/clearing_house.json

@@ -26,7 +26,7 @@
                     "isSigner": false
                 },
                 {
-                    "name": "insuranceVaultAuthority",
+                    "name": "clearingHouseSigner",
                     "isMut": false,
                     "isSigner": false
                 },
@@ -71,18 +71,13 @@
                     "isMut": true,
                     "isSigner": false
                 },
-                {
-                    "name": "bankVaultAuthority",
-                    "isMut": false,
-                    "isSigner": false
-                },
                 {
                     "name": "insuranceFundVault",
                     "isMut": true,
                     "isSigner": false
                 },
                 {
-                    "name": "insuranceFundVaultAuthority",
+                    "name": "clearingHouseSigner",
                     "isMut": false,
                     "isSigner": false
                 },
@@ -316,8 +311,8 @@
                     "isSigner": false
                 },
                 {
-                    "name": "bankVaultAuthority",
-                    "isMut": true,
+                    "name": "clearingHouseSigner",
+                    "isMut": false,
                     "isSigner": false
                 },
                 {
@@ -974,8 +969,8 @@
                     "isSigner": false
                 },
                 {
-                    "name": "insuranceFundVaultAuthority",
-                    "isMut": true,
+                    "name": "clearingHouseSigner",
+                    "isMut": false,
                     "isSigner": false
                 },
                 {
@@ -1029,8 +1024,8 @@
                     "isSigner": false
                 },
                 {
-                    "name": "insuranceFundVaultAuthority",
-                    "isMut": true,
+                    "name": "clearingHouseSigner",
+                    "isMut": false,
                     "isSigner": false
                 },
                 {
@@ -1100,8 +1095,8 @@
                     "isSigner": false
                 },
                 {
-                    "name": "bankVaultAuthority",
-                    "isMut": true,
+                    "name": "clearingHouseSigner",
+                    "isMut": false,
                     "isSigner": false
                 },
                 {
@@ -1146,7 +1141,7 @@
                     "isSigner": false
                 },
                 {
-                    "name": "insuranceVaultAuthority",
+                    "name": "clearingHouseSigner",
                     "isMut": false,
                     "isSigner": false
                 },
@@ -1192,7 +1187,7 @@
                     "isSigner": false
                 },
                 {
-                    "name": "insuranceVaultAuthority",
+                    "name": "clearingHouseSigner",
                     "isMut": false,
                     "isSigner": false
                 },
@@ -2414,8 +2409,8 @@
                     "isSigner": false
                 },
                 {
-                    "name": "bankVaultAuthority",
-                    "isMut": true,
+                    "name": "clearingHouseSigner",
+                    "isMut": false,
                     "isSigner": false
                 },
                 {
@@ -2565,6 +2560,11 @@
         {
             "name": "removeInsuranceFundStake",
             "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
                 {
                     "name": "bank",
                     "isMut": false,
@@ -2591,8 +2591,8 @@
                     "isSigner": false
                 },
                 {
-                    "name": "insuranceFundVaultAuthority",
-                    "isMut": true,
+                    "name": "clearingHouseSigner",
+                    "isMut": false,
                     "isSigner": false
                 },
                 {
@@ -2646,26 +2646,10 @@
                         "name": "vault",
                         "type": "publicKey"
                     },
-                    {
-                        "name": "vaultAuthority",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "vaultAuthorityNonce",
-                        "type": "u8"
-                    },
                     {
                         "name": "insuranceFundVault",
                         "type": "publicKey"
                     },
-                    {
-                        "name": "insuranceFundVaultAuthority",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "insuranceFundVaultAuthorityNonce",
-                        "type": "u8"
-                    },
                     {
                         "name": "revenuePool",
                         "type": {
@@ -2976,14 +2960,6 @@
                         "name": "insuranceVault",
                         "type": "publicKey"
                     },
-                    {
-                        "name": "insuranceVaultAuthority",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "insuranceVaultNonce",
-                        "type": "u8"
-                    },
                     {
                         "name": "marginRatioInitial",
                         "type": "u128"
@@ -3072,6 +3048,14 @@
                         "name": "liquidationMarginBufferRatio",
                         "type": "u8"
                     },
+                    {
+                        "name": "signer",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "signerNonce",
+                        "type": "u8"
+                    },
                     {
                         "name": "padding0",
                         "type": "u128"
@@ -3352,6 +3336,10 @@
                         "name": "quoteAssetAmount",
                         "type": "i128"
                     },
+                    {
+                        "name": "lpShares",
+                        "type": "u128"
+                    },
                     {
                         "name": "userPnl",
                         "type": "i128"
@@ -4478,6 +4466,23 @@
                 ]
             }
         },
+        {
+            "name": "LPAction",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "AddLiquidity"
+                    },
+                    {
+                        "name": "RemoveLiquidity"
+                    },
+                    {
+                        "name": "SettleLiquidity"
+                    }
+                ]
+            }
+        },
         {
             "name": "LiquidationType",
             "type": {
@@ -5173,6 +5178,53 @@
                 }
             ]
         },
+        {
+            "name": "LPRecord",
+            "fields": [
+                {
+                    "name": "ts",
+                    "type": "i64",
+                    "index": false
+                },
+                {
+                    "name": "user",
+                    "type": "publicKey",
+                    "index": false
+                },
+                {
+                    "name": "action",
+                    "type": {
+                        "defined": "LPAction"
+                    },
+                    "index": false
+                },
+                {
+                    "name": "nShares",
+                    "type": "u128",
+                    "index": false
+                },
+                {
+                    "name": "marketIndex",
+                    "type": "u64",
+                    "index": false
+                },
+                {
+                    "name": "deltaBaseAssetAmount",
+                    "type": "i128",
+                    "index": false
+                },
+                {
+                    "name": "deltaQuoteAssetAmount",
+                    "type": "i128",
+                    "index": false
+                },
+                {
+                    "name": "pnl",
+                    "type": "i128",
+                    "index": false
+                }
+            ]
+        },
         {
             "name": "LiquidationRecord",
             "fields": [

package/lib/index.d.ts

@@ -29,6 +29,7 @@ export * from './factory/oracleClient';
 export * from './factory/bigNum';
 export * from './events/types';
 export * from './events/eventSubscriber';
+export * from './events/fetchLogs';
 export * from './math/auction';
 export * from './math/conversion';
 export * from './math/funding';

package/lib/index.js

@@ -52,6 +52,7 @@ __exportStar(require("./factory/oracleClient"), exports);
 __exportStar(require("./factory/bigNum"), exports);
 __exportStar(require("./events/types"), exports);
 __exportStar(require("./events/eventSubscriber"), exports);
+__exportStar(require("./events/fetchLogs"), exports);
 __exportStar(require("./math/auction"), exports);
 __exportStar(require("./math/conversion"), exports);
 __exportStar(require("./math/funding"), exports);

package/lib/math/amm.d.ts

@@ -33,9 +33,11 @@ export declare type AssetType = 'quote' | 'base';
  * @returns quoteAssetReserve and baseAssetReserve after swap. : Precision AMM_RESERVE_PRECISION
  */
 export declare function calculateAmmReservesAfterSwap(amm: Pick<AMM, 'pegMultiplier' | 'quoteAssetReserve' | 'sqrtK' | 'baseAssetReserve'>, inputAssetType: AssetType, swapAmount: BN, swapDirection: SwapDirection): [BN, BN];
+export declare function calculateMarketOpenBidAsk(baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN): [BN, BN];
+export declare function calculateInventoryScale(netBaseAssetAmount: BN, baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN): number;
 export declare function calculateEffectiveLeverage(baseSpread: number, quoteAssetReserve: BN, terminalQuoteAssetReserve: BN, pegMultiplier: BN, netBaseAssetAmount: BN, markPrice: BN, totalFeeMinusDistributions: BN): number;
 export declare function calculateMaxSpread(marginRatioInitial: number): number;
-export declare function calculateSpreadBN(baseSpread: number, lastOracleMarkSpreadPct: BN, lastOracleConfPct: BN, maxSpread: number, quoteAssetReserve: BN, terminalQuoteAssetReserve: BN, pegMultiplier: BN, netBaseAssetAmount: BN, markPrice: BN, totalFeeMinusDistributions: BN): [number, number];
+export declare function calculateSpreadBN(baseSpread: number, lastOracleMarkSpreadPct: BN, lastOracleConfPct: BN, maxSpread: number, quoteAssetReserve: BN, terminalQuoteAssetReserve: BN, pegMultiplier: BN, netBaseAssetAmount: BN, markPrice: BN, totalFeeMinusDistributions: BN, baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN): [number, number];
 export declare function calculateSpread(amm: AMM, direction: PositionDirection, oraclePriceData: OraclePriceData): number;
 export declare function calculateSpreadReserves(amm: AMM, direction: PositionDirection, oraclePriceData: OraclePriceData): {
     baseAssetReserve: BN;

package/lib/math/amm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
+exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateInventoryScale = exports.calculateMarketOpenBidAsk = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
@@ -165,6 +165,36 @@ function calculateAmmReservesAfterSwap(amm, inputAssetType, swapAmount, swapDire
     return [newQuoteAssetReserve, newBaseAssetReserve];
 }
 exports.calculateAmmReservesAfterSwap = calculateAmmReservesAfterSwap;
+function calculateMarketOpenBidAsk(baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve) {
+    // open orders
+    let openAsks;
+    if (maxBaseAssetReserve > baseAssetReserve) {
+        openAsks = maxBaseAssetReserve.sub(baseAssetReserve).mul(new anchor_1.BN(-1));
+    }
+    else {
+        openAsks = numericConstants_1.ZERO;
+    }
+    let openBids;
+    if (minBaseAssetReserve < baseAssetReserve) {
+        openBids = baseAssetReserve.sub(minBaseAssetReserve);
+    }
+    else {
+        openBids = numericConstants_1.ZERO;
+    }
+    return [openBids, openAsks];
+}
+exports.calculateMarketOpenBidAsk = calculateMarketOpenBidAsk;
+function calculateInventoryScale(netBaseAssetAmount, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve) {
+    // inventory skew
+    const [openBids, openAsks] = calculateMarketOpenBidAsk(baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve);
+    const totalLiquidity = anchor_1.BN.max(openBids.abs().add(openAsks.abs()), new anchor_1.BN(1));
+    const inventoryScale = anchor_1.BN.min(netBaseAssetAmount.abs(), totalLiquidity)
+        .mul(numericConstants_1.BID_ASK_SPREAD_PRECISION.mul(new anchor_1.BN(5)))
+        .div(totalLiquidity)
+        .toNumber() / numericConstants_1.BID_ASK_SPREAD_PRECISION.toNumber();
+    return inventoryScale;
+}
+exports.calculateInventoryScale = calculateInventoryScale;
 function calculateEffectiveLeverage(baseSpread, quoteAssetReserve, terminalQuoteAssetReserve, pegMultiplier, netBaseAssetAmount, markPrice, totalFeeMinusDistributions) {
     // inventory skew
     const netBaseAssetValue = quoteAssetReserve
@@ -187,7 +217,7 @@ function calculateMaxSpread(marginRatioInitial) {
     return maxTargetSpread;
 }
 exports.calculateMaxSpread = calculateMaxSpread;
-function calculateSpreadBN(baseSpread, lastOracleMarkSpreadPct, lastOracleConfPct, maxSpread, quoteAssetReserve, terminalQuoteAssetReserve, pegMultiplier, netBaseAssetAmount, markPrice, totalFeeMinusDistributions) {
+function calculateSpreadBN(baseSpread, lastOracleMarkSpreadPct, lastOracleConfPct, maxSpread, quoteAssetReserve, terminalQuoteAssetReserve, pegMultiplier, netBaseAssetAmount, markPrice, totalFeeMinusDistributions, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve) {
     let longSpread = baseSpread / 2;
     let shortSpread = baseSpread / 2;
     if (lastOracleMarkSpreadPct.gt(numericConstants_1.ZERO)) {
@@ -198,6 +228,14 @@ function calculateSpreadBN(baseSpread, lastOracleMarkSpreadPct, lastOracleConfPc
     }
     const maxTargetSpread = maxSpread;
     const MAX_INVENTORY_SKEW = 5;
+    const inventoryScale = calculateInventoryScale(netBaseAssetAmount, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve);
+    const inventorySpreadScale = Math.min(MAX_INVENTORY_SKEW, 1 + inventoryScale);
+    if (netBaseAssetAmount.gt(numericConstants_1.ZERO)) {
+        longSpread *= inventorySpreadScale;
+    }
+    else if (netBaseAssetAmount.lt(numericConstants_1.ZERO)) {
+        shortSpread *= inventorySpreadScale;
+    }
     const effectiveLeverage = calculateEffectiveLeverage(baseSpread, quoteAssetReserve, terminalQuoteAssetReserve, pegMultiplier, netBaseAssetAmount, markPrice, totalFeeMinusDistributions);
     if (totalFeeMinusDistributions.gt(numericConstants_1.ZERO)) {
         const spreadScale = Math.min(MAX_INVENTORY_SKEW, 1 + effectiveLeverage);
@@ -240,7 +278,7 @@ function calculateSpread(amm, direction, oraclePriceData) {
     const confIntervalPct = confInterval
         .mul(numericConstants_1.BID_ASK_SPREAD_PRECISION)
         .div(markPrice);
-    const [longSpread, shortSpread] = calculateSpreadBN(amm.baseSpread, targetMarkSpreadPct, confIntervalPct, amm.maxSpread, amm.quoteAssetReserve, amm.terminalQuoteAssetReserve, amm.pegMultiplier, amm.netBaseAssetAmount, markPrice, amm.totalFeeMinusDistributions);
+    const [longSpread, shortSpread] = calculateSpreadBN(amm.baseSpread, targetMarkSpreadPct, confIntervalPct, amm.maxSpread, amm.quoteAssetReserve, amm.terminalQuoteAssetReserve, amm.pegMultiplier, amm.netBaseAssetAmount, markPrice, amm.totalFeeMinusDistributions, amm.baseAssetReserve, amm.minBaseAssetReserve, amm.maxBaseAssetReserve);
     let spread;
     if ((0, types_1.isVariant)(direction, 'long')) {
         spread = longSpread;

package/lib/types.d.ts

@@ -175,6 +175,27 @@ export declare type CurveRecord = {
     oraclePrice: BN;
     tradeId: BN;
 };
+export declare type LPRecord = {
+    ts: BN;
+    user: PublicKey;
+    action: LPAction;
+    nShares: BN;
+    marketIndex: BN;
+    deltaBaseAssetAmount: BN;
+    deltaQuoteAssetAmount: BN;
+    pnl: BN;
+};
+export declare class LPAction {
+    static readonly ADD_LIQUIDITY: {
+        addLiquidity: {};
+    };
+    static readonly REMOVE_LIQUIDITY: {
+        removeLiquidity: {};
+    };
+    static readonly SETTLE_LIQUIDITY: {
+        settleLiquidity: {};
+    };
+}
 export declare type FundingRateRecord = {
     ts: BN;
     recordId: BN;
@@ -243,6 +264,7 @@ export declare type LiquidatePerpRecord = {
     oraclePrice: BN;
     baseAssetAmount: BN;
     quoteAssetAmount: BN;
+    lpShares: BN;
     userPnl: BN;
     liquidatorPnl: BN;
     canceledOrdersFee: BN;
@@ -337,8 +359,6 @@ export declare type StateAccount = {
     exchangePaused: boolean;
     adminControlsPrices: boolean;
     insuranceVault: PublicKey;
-    insuranceVaultAuthority: PublicKey;
-    insuranceVaultNonce: number;
     marginRatioInitial: BN;
     marginRatioMaintenance: BN;
     marginRatioPartial: BN;
@@ -360,6 +380,8 @@ export declare type StateAccount = {
     numberOfMarkets: BN;
     numberOfBanks: BN;
     minOrderQuoteAssetAmount: BN;
+    signer: PublicKey;
+    signerNonce: number;
     maxAuctionDuration: number;
     minAuctionDuration: number;
 };
@@ -387,11 +409,7 @@ export declare type BankAccount = {
     pubkey: PublicKey;
     mint: PublicKey;
     vault: PublicKey;
-    vaultAuthority: PublicKey;
-    vaultAuthorityNonce: number;
     insuranceFundVault: PublicKey;
-    insuranceFundVaultAuthority: PublicKey;
-    insuranceFundVaultAuthorityNonce: number;
     insuranceWithdrawEscrowPeriod: BN;
     revenuePool: PoolBalance;
     totalIfShares: BN;
@@ -455,6 +473,7 @@ export declare type AMM = {
     cumulativeFeePerLp: BN;
     cumulativeNetBaseAssetAmountPerLp: BN;
     userLpShares: BN;
+    netUnsettledLpBaseAssetAmount: BN;
     minimumQuoteAssetTradeSize: BN;
     baseAssetAmountStepSize: BN;
     maxBaseAssetAmountRatio: number;

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultOrderParams = exports.LiquidationType = exports.TradeSide = exports.isOneOfVariant = exports.isVariant = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderDiscountTier = exports.OrderStatus = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.BankBalanceType = exports.SwapDirection = void 0;
+exports.DefaultOrderParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.isOneOfVariant = exports.isVariant = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderDiscountTier = exports.OrderStatus = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.BankBalanceType = exports.SwapDirection = void 0;
 const _1 = require(".");
 // # Utility Types / Enums / Constants
 class SwapDirection {
@@ -94,6 +94,12 @@ var TradeSide;
     TradeSide[TradeSide["Buy"] = 1] = "Buy";
     TradeSide[TradeSide["Sell"] = 2] = "Sell";
 })(TradeSide = exports.TradeSide || (exports.TradeSide = {}));
+class LPAction {
+}
+exports.LPAction = LPAction;
+LPAction.ADD_LIQUIDITY = { addLiquidity: {} };
+LPAction.REMOVE_LIQUIDITY = { removeLiquidity: {} };
+LPAction.SETTLE_LIQUIDITY = { settleLiquidity: {} };
 class LiquidationType {
 }
 exports.LiquidationType = LiquidationType;

package/package.json

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

package/src/addresses/pda.ts

@@ -176,3 +176,12 @@ export function getInsuranceFundStakeAccountPublicKey(
 		programId
 	)[0];
 }
+
+export function getClearingHouseSignerPublicKey(
+	programId: PublicKey
+): PublicKey {
+	return anchor.web3.PublicKey.findProgramAddressSync(
+		[Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house_signer'))],
+		programId
+	)[0];
+}

package/src/admin.ts

@@ -13,12 +13,10 @@ import { BN } from '@project-serum/anchor';
 import * as anchor from '@project-serum/anchor';
 import {
 	getClearingHouseStateAccountPublicKeyAndNonce,
-	getBankVaultAuthorityPublicKey,
 	getBankPublicKey,
 	getBankVaultPublicKey,
 	getMarketPublicKey,
 	getInsuranceFundVaultPublicKey,
-	getInsuranceFundVaultAuthorityPublicKey,
 } from './addresses/pda';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { ClearingHouse } from './clearingHouse';
@@ -38,20 +36,16 @@ export class Admin extends ClearingHouse {
 			throw new Error('Clearing house already initialized');
 		}
 
+		const [clearingHouseStatePublicKey] =
+			await getClearingHouseStateAccountPublicKeyAndNonce(
+				this.program.programId
+			);
+
 		const [insuranceVaultPublicKey] = await PublicKey.findProgramAddress(
 			[Buffer.from(anchor.utils.bytes.utf8.encode('insurance_vault'))],
 			this.program.programId
 		);
 
-		const [insuranceVaultAuthority] = await PublicKey.findProgramAddress(
-			[insuranceVaultPublicKey.toBuffer()],
-			this.program.programId
-		);
-
-		const [clearingHouseStatePublicKey] =
-			await getClearingHouseStateAccountPublicKeyAndNonce(
-				this.program.programId
-			);
 		const initializeTx = await this.program.transaction.initialize(
 			adminControlsPrices,
 			{
@@ -59,9 +53,9 @@ export class Admin extends ClearingHouse {
 					admin: this.wallet.publicKey,
 					state: clearingHouseStatePublicKey,
 					quoteAssetMint: usdcMint,
-					insuranceVault: insuranceVaultPublicKey,
-					insuranceVaultAuthority: insuranceVaultAuthority,
 					rent: SYSVAR_RENT_PUBKEY,
+					insuranceVault: insuranceVaultPublicKey,
+					clearingHouseSigner: this.getSignerPublicKey(),
 					systemProgram: anchor.web3.SystemProgram.programId,
 					tokenProgram: TOKEN_PROGRAM_ID,
 				},
@@ -99,22 +93,11 @@ export class Admin extends ClearingHouse {
 			bankIndex
 		);
 
-		const bankVaultAuthority = await getBankVaultAuthorityPublicKey(
-			this.program.programId,
-			bankIndex
-		);
-
 		const insuranceFundVault = await getInsuranceFundVaultPublicKey(
 			this.program.programId,
 			bankIndex
 		);
 
-		const insuranceFundVaultAuthority =
-			await getInsuranceFundVaultAuthorityPublicKey(
-				this.program.programId,
-				bankIndex
-			);
-
 		const initializeTx = await this.program.transaction.initializeBank(
 			optimalUtilization,
 			optimalRate,
@@ -132,9 +115,8 @@ export class Admin extends ClearingHouse {
 					state: await this.getStatePublicKey(),
 					bank,
 					bankVault,
-					bankVaultAuthority,
 					insuranceFundVault,
-					insuranceFundVaultAuthority,
+					clearingHouseSigner: this.getSignerPublicKey(),
 					bankMint: mint,
 					oracle,
 					rent: SYSVAR_RENT_PUBKEY,
@@ -355,7 +337,7 @@ export class Admin extends ClearingHouse {
 				state: await this.getStatePublicKey(),
 				bank: bank.pubkey,
 				insuranceVault: state.insuranceVault,
-				insuranceVaultAuthority: state.insuranceVaultAuthority,
+				clearingHouseSigner: this.getSignerPublicKey(),
 				recipient: recipient,
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},
@@ -379,7 +361,7 @@ export class Admin extends ClearingHouse {
 				market: marketPublicKey,
 				bank: bank.pubkey,
 				bankVault: bank.vault,
-				bankVaultAuthority: bank.vaultAuthority,
+				clearingHouseSigner: this.getSignerPublicKey(),
 				recipient: recipient,
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},
@@ -399,10 +381,9 @@ export class Admin extends ClearingHouse {
 				state: await this.getStatePublicKey(),
 				market: await getMarketPublicKey(this.program.programId, marketIndex),
 				insuranceVault: state.insuranceVault,
-				insuranceVaultAuthority: state.insuranceVaultAuthority,
+				clearingHouseSigner: this.getSignerPublicKey(),
 				bank: bank.pubkey,
 				bankVault: bank.vault,
-				bankVaultAuthority: bank.vaultAuthority,
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},
 		});

package/src/clearingHouse.ts

@@ -39,6 +39,7 @@ import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import {
+	getClearingHouseSignerPublicKey,
 	getClearingHouseStateAccountPublicKey,
 	getInsuranceFundStakeAccountPublicKey,
 	getMarketPublicKey,
@@ -260,6 +261,17 @@ export class ClearingHouse {
 		return this.statePublicKey;
 	}
 
+	signerPublicKey?: PublicKey;
+	public getSignerPublicKey(): PublicKey {
+		if (this.signerPublicKey) {
+			return this.signerPublicKey;
+		}
+		this.signerPublicKey = getClearingHouseSignerPublicKey(
+			this.program.programId
+		);
+		return this.signerPublicKey;
+	}
+
 	public getStateAccount(): StateAccount {
 		return this.accountSubscriber.getStateAccountAndSlot().data;
 	}
@@ -1064,7 +1076,7 @@ export class ClearingHouse {
 					state: await this.getStatePublicKey(),
 					bank: bank.pubkey,
 					bankVault: bank.vault,
-					bankVaultAuthority: bank.vaultAuthority,
+					clearingHouseSigner: this.getSignerPublicKey(),
 					user: userAccountPublicKey,
 					userStats: this.getUserStatsAccountPublicKey(),
 					userTokenAccount: userTokenAccount,
@@ -2221,7 +2233,7 @@ export class ClearingHouse {
 					liquidator: liquidatorPublicKey,
 					bankVault: bank.vault,
 					insuranceFundVault: bank.insuranceFundVault,
-					insuranceFundVaultAuthority: bank.insuranceFundVaultAuthority,
+					clearingHouseSigner: this.getSignerPublicKey(),
 					tokenProgram: TOKEN_PROGRAM_ID,
 				},
 				remainingAccounts: remainingAccounts,
@@ -2270,7 +2282,7 @@ export class ClearingHouse {
 				liquidator: liquidatorPublicKey,
 				bankVault: bank.vault,
 				insuranceFundVault: bank.insuranceFundVault,
-				insuranceFundVaultAuthority: bank.insuranceFundVaultAuthority,
+				clearingHouseSigner: this.getSignerPublicKey(),
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},
 			remainingAccounts: remainingAccounts,
@@ -2659,7 +2671,7 @@ export class ClearingHouse {
 				userStats: this.getUserStatsAccountPublicKey(),
 				authority: this.wallet.publicKey,
 				insuranceFundVault: bank.insuranceFundVault,
-				insuranceFundVaultAuthority: bank.insuranceFundVaultAuthority,
+				clearingHouseSigner: this.getSignerPublicKey(),
 				userTokenAccount: collateralAccountPublicKey,
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},
@@ -2681,7 +2693,7 @@ export class ClearingHouse {
 				state: await this.getStatePublicKey(),
 				bank: bank.pubkey,
 				bankVault: bank.vault,
-				bankVaultAuthority: bank.vaultAuthority,
+				clearingHouseSigner: this.getSignerPublicKey(),
 				insuranceFundVault: bank.insuranceFundVault,
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},