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

package/lib/accounts/types.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
+/// <reference types="node" />
 import { BankAccount, MarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';

package/lib/addresses/pda.d.ts

@@ -11,3 +11,6 @@ export declare function getMarketPublicKey(programId: PublicKey, marketIndex: BN
 export declare function getBankPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;
 export declare function getBankVaultPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;
 export declare function getBankVaultAuthorityPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;
+export declare function getInsuranceFundVaultPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;
+export declare function getInsuranceFundVaultAuthorityPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;
+export declare function getInsuranceFundStakeAccountPublicKey(programId: PublicKey, authority: PublicKey, bankIndex: BN): PublicKey;

package/lib/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBankVaultAuthorityPublicKey = exports.getBankVaultPublicKey = exports.getBankPublicKey = exports.getMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
+exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultAuthorityPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getBankVaultAuthorityPublicKey = exports.getBankVaultPublicKey = exports.getBankPublicKey = exports.getMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
 const anchor = __importStar(require("@project-serum/anchor"));
 async function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
     return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house'))], programId);
@@ -88,3 +88,25 @@ async function getBankVaultAuthorityPublicKey(programId, bankIndex) {
     ], programId))[0];
 }
 exports.getBankVaultAuthorityPublicKey = getBankVaultAuthorityPublicKey;
+async function getInsuranceFundVaultPublicKey(programId, bankIndex) {
+    return (await anchor.web3.PublicKey.findProgramAddress([
+        Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_vault')),
+        bankIndex.toArrayLike(Buffer, 'le', 8),
+    ], programId))[0];
+}
+exports.getInsuranceFundVaultPublicKey = getInsuranceFundVaultPublicKey;
+async function getInsuranceFundVaultAuthorityPublicKey(programId, bankIndex) {
+    return (await anchor.web3.PublicKey.findProgramAddress([
+        Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_vault_authority')),
+        bankIndex.toArrayLike(Buffer, 'le', 8),
+    ], programId))[0];
+}
+exports.getInsuranceFundVaultAuthorityPublicKey = getInsuranceFundVaultAuthorityPublicKey;
+function getInsuranceFundStakeAccountPublicKey(programId, authority, bankIndex) {
+    return anchor.web3.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_stake')),
+        authority.toBuffer(),
+        bankIndex.toArrayLike(Buffer, 'le', 8),
+    ], programId)[0];
+}
+exports.getInsuranceFundStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey;

package/lib/admin.d.ts

@@ -20,6 +20,7 @@ export declare class Admin extends ClearingHouse {
     updateCurveUpdateIntensity(marketIndex: BN, curveUpdateIntensity: number): Promise<TransactionSignature>;
     updateMarginRatio(marketIndex: BN, marginRatioInitial: number, marginRatioMaintenance: number): Promise<TransactionSignature>;
     updateMarketBaseSpread(marketIndex: BN, baseSpread: number): Promise<TransactionSignature>;
+    updateAmmJitIntensity(marketIndex: BN, ammJitIntensity: number): Promise<TransactionSignature>;
     updateMarketMaxSpread(marketIndex: BN, maxSpread: number): Promise<TransactionSignature>;
     updatePartialLiquidationClosePercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
     updatePartialLiquidationPenaltyPercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
@@ -30,6 +31,8 @@ export declare class Admin extends ClearingHouse {
     updateFee(fees: FeeStructure): Promise<TransactionSignature>;
     updateOracleGuardRails(oracleGuardRails: OracleGuardRails): Promise<TransactionSignature>;
     updateBankWithdrawGuardThreshold(bankIndex: BN, withdrawGuardThreshold: BN): Promise<TransactionSignature>;
+    updateBankIfFactor(bankIndex: BN, userIfFactor: BN, totalIfFactor: BN, liquidationIfFactor: BN): Promise<TransactionSignature>;
+    updateBankInsuranceWithdrawEscrowPeriod(bankIndex: BN, insuranceWithdrawEscrowPeriod: BN): Promise<TransactionSignature>;
     updateLpCooldownTime(marketIndex: BN, cooldownTime: BN): Promise<TransactionSignature>;
     updateMarketOracle(marketIndex: BN, oracle: PublicKey, oracleSource: OracleSource): Promise<TransactionSignature>;
     updateMarketMinimumQuoteAssetTradeSize(marketIndex: BN, minimumTradeSize: BN): Promise<TransactionSignature>;

package/lib/admin.js

@@ -63,6 +63,8 @@ class Admin extends clearingHouse_1.ClearingHouse {
         const bank = await (0, pda_1.getBankPublicKey)(this.program.programId, bankIndex);
         const bankVault = await (0, pda_1.getBankVaultPublicKey)(this.program.programId, bankIndex);
         const bankVaultAuthority = await (0, pda_1.getBankVaultAuthorityPublicKey)(this.program.programId, bankIndex);
+        const insuranceFundVault = await (0, pda_1.getInsuranceFundVaultPublicKey)(this.program.programId, bankIndex);
+        const insuranceFundVaultAuthority = await (0, pda_1.getInsuranceFundVaultAuthorityPublicKey)(this.program.programId, bankIndex);
         const initializeTx = await this.program.transaction.initializeBank(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidationFee, {
             accounts: {
                 admin: this.wallet.publicKey,
@@ -70,6 +72,8 @@ class Admin extends clearingHouse_1.ClearingHouse {
                 bank,
                 bankVault,
                 bankVaultAuthority,
+                insuranceFundVault,
+                insuranceFundVaultAuthority,
                 bankMint: mint,
                 oracle,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
@@ -260,6 +264,15 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updateAmmJitIntensity(marketIndex, ammJitIntensity) {
+        return await this.program.rpc.updateAmmJitIntensity(ammJitIntensity, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                market: await (0, pda_1.getMarketPublicKey)(this.program.programId, marketIndex),
+            },
+        });
+    }
     async updateMarketMaxSpread(marketIndex, maxSpread) {
         return await this.program.rpc.updateMarketMaxSpread(maxSpread, {
             accounts: {
@@ -342,6 +355,24 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updateBankIfFactor(bankIndex, userIfFactor, totalIfFactor, liquidationIfFactor) {
+        return await this.program.rpc.updateBankIfFactor(bankIndex, userIfFactor, totalIfFactor, liquidationIfFactor, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                bank: await (0, pda_1.getBankPublicKey)(this.program.programId, bankIndex),
+            },
+        });
+    }
+    async updateBankInsuranceWithdrawEscrowPeriod(bankIndex, insuranceWithdrawEscrowPeriod) {
+        return await this.program.rpc.updateBankInsuranceWithdrawEscrowPeriod(insuranceWithdrawEscrowPeriod, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                bank: await (0, pda_1.getBankPublicKey)(this.program.programId, bankIndex),
+            },
+        });
+    }
     async updateLpCooldownTime(marketIndex, cooldownTime) {
         return await this.program.rpc.updateLpCooldownTime(cooldownTime, {
             accounts: {

package/lib/clearingHouse.d.ts

@@ -149,8 +149,8 @@ export declare class ClearingHouse {
     getLiquidateBorrowForPerpPnlIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: BN, liabilityBankIndex: BN, maxLiabilityTransfer: BN): Promise<TransactionInstruction>;
     liquidatePerpPnlForDeposit(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: BN, assetBankIndex: BN, maxPnlTransfer: BN): Promise<TransactionSignature>;
     getLiquidatePerpPnlForDepositIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: BN, assetBankIndex: BN, maxPnlTransfer: BN): Promise<TransactionInstruction>;
-    resolvePerpBankruptcy(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: BN): Promise<TransactionSignature>;
-    getResolvePerpBankruptcyIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: BN): Promise<TransactionInstruction>;
+    resolvePerpBankruptcy(userAccountPublicKey: PublicKey, userAccount: UserAccount, bankIndex: BN, marketIndex: BN): Promise<TransactionSignature>;
+    getResolvePerpBankruptcyIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, bankIndex: BN, marketIndex: BN): Promise<TransactionInstruction>;
     resolveBorrowBankruptcy(userAccountPublicKey: PublicKey, userAccount: UserAccount, bankIndex: BN): Promise<TransactionSignature>;
     getResolveBorrowBankruptcyIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, bankIndex: BN): Promise<TransactionInstruction>;
     getRemainingAccountsWithCounterparty(params: {
@@ -164,4 +164,11 @@ export declare class ClearingHouse {
     getSettleFundingPaymentIx(userAccount: PublicKey): Promise<TransactionInstruction>;
     triggerEvent(eventName: keyof ClearingHouseAccountEvents, data?: any): void;
     getOracleDataForMarket(marketIndex: BN): OraclePriceData;
+    initializeInsuranceFundStake(bankIndex: BN): Promise<TransactionSignature>;
+    getInitializeInsuranceFundStakeIx(bankIndex: BN): Promise<TransactionInstruction>;
+    addInsuranceFundStake(bankIndex: BN, amount: BN, collateralAccountPublicKey: PublicKey): Promise<TransactionSignature>;
+    requestRemoveInsuranceFundStake(bankIndex: BN, amount: BN): Promise<TransactionSignature>;
+    cancelRequestRemoveInsuranceFundStake(bankIndex: BN): Promise<TransactionSignature>;
+    removeInsuranceFundStake(bankIndex: BN, collateralAccountPublicKey: PublicKey): Promise<TransactionSignature>;
+    settleRevenueToInsuranceFund(bankIndex: BN): Promise<TransactionSignature>;
 }

package/lib/clearingHouse.js

@@ -1300,22 +1300,28 @@ class ClearingHouse {
             remainingAccounts: remainingAccounts,
         });
     }
-    async resolvePerpBankruptcy(userAccountPublicKey, userAccount, marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
+    async resolvePerpBankruptcy(userAccountPublicKey, userAccount, bankIndex, marketIndex) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, bankIndex, marketIndex)), [], this.opts);
         return txSig;
     }
-    async getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex) {
+    async getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, bankIndex, marketIndex) {
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const remainingAccounts = this.getRemainingAccountsWithCounterparty({
             writableMarketIndex: marketIndex,
+            writableBankIndexes: [bankIndex],
             counterPartyUserAccount: userAccount,
         });
-        return await this.program.instruction.resolvePerpBankruptcy(marketIndex, {
+        const bank = this.getBankAccount(bankIndex);
+        return await this.program.instruction.resolvePerpBankruptcy(bankIndex, marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 authority: this.wallet.publicKey,
                 user: userAccountPublicKey,
                 liquidator: liquidatorPublicKey,
+                bankVault: bank.vault,
+                insuranceFundVault: bank.insuranceFundVault,
+                insuranceFundVaultAuthority: bank.insuranceFundVaultAuthority,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
             remainingAccounts: remainingAccounts,
         });
@@ -1330,12 +1336,17 @@ class ClearingHouse {
             writableBankIndexes: [bankIndex],
             counterPartyUserAccount: userAccount,
         });
+        const bank = this.getBankAccount(bankIndex);
         return await this.program.instruction.resolveBorrowBankruptcy(bankIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 authority: this.wallet.publicKey,
                 user: userAccountPublicKey,
                 liquidator: liquidatorPublicKey,
+                bankVault: bank.vault,
+                insuranceFundVault: bank.insuranceFundVault,
+                insuranceFundVaultAuthority: bank.insuranceFundVaultAuthority,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
             remainingAccounts: remainingAccounts,
         });
@@ -1517,5 +1528,122 @@ class ClearingHouse {
         const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
         return oracleData;
     }
+    async initializeInsuranceFundStake(bankIndex) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getInitializeInsuranceFundStakeIx(bankIndex)), [], this.opts);
+        return txSig;
+    }
+    async getInitializeInsuranceFundStakeIx(bankIndex) {
+        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, bankIndex);
+        return await this.program.instruction.initializeInsuranceFundStake(bankIndex, {
+            accounts: {
+                insuranceFundStake: ifStakeAccountPublicKey,
+                bank: this.getBankAccount(bankIndex).pubkey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+                payer: this.wallet.publicKey,
+                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+                state: await this.getStatePublicKey(),
+            },
+        });
+    }
+    async addInsuranceFundStake(bankIndex, amount, collateralAccountPublicKey) {
+        const bank = this.getBankAccount(bankIndex);
+        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, bankIndex);
+        const remainingAccounts = this.getRemainingAccounts({
+            writableBankIndex: bankIndex,
+        });
+        return await this.program.rpc.addInsuranceFundStake(bankIndex, amount, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                bank: bank.pubkey,
+                insuranceFundStake: ifStakeAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+                insuranceFundVault: bank.insuranceFundVault,
+                userTokenAccount: collateralAccountPublicKey,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+            remainingAccounts,
+        });
+    }
+    async requestRemoveInsuranceFundStake(bankIndex, amount) {
+        const bank = this.getBankAccount(bankIndex);
+        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, bankIndex);
+        const remainingAccounts = this.getRemainingAccounts({
+            writableBankIndex: bankIndex,
+        });
+        return await this.program.rpc.requestRemoveInsuranceFundStake(bankIndex, amount, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                bank: bank.pubkey,
+                insuranceFundStake: ifStakeAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+                insuranceFundVault: bank.insuranceFundVault,
+                // userTokenAccount: collateralAccountPublicKey,
+                // tokenProgram: TOKEN_PROGRAM_ID,
+            },
+            remainingAccounts,
+        });
+    }
+    async cancelRequestRemoveInsuranceFundStake(bankIndex) {
+        const bank = this.getBankAccount(bankIndex);
+        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, bankIndex);
+        const remainingAccounts = this.getRemainingAccounts({
+            writableBankIndex: bankIndex,
+        });
+        return await this.program.rpc.cancelRequestRemoveInsuranceFundStake(bankIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                bank: bank.pubkey,
+                insuranceFundStake: ifStakeAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+                insuranceFundVault: bank.insuranceFundVault,
+                // userTokenAccount: collateralAccountPublicKey,
+                // tokenProgram: TOKEN_PROGRAM_ID,
+            },
+            remainingAccounts,
+        });
+    }
+    async removeInsuranceFundStake(bankIndex, collateralAccountPublicKey) {
+        const bank = this.getBankAccount(bankIndex);
+        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, bankIndex);
+        const remainingAccounts = this.getRemainingAccounts({
+            writableBankIndex: bankIndex,
+        });
+        return await this.program.rpc.removeInsuranceFundStake(bankIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                bank: bank.pubkey,
+                insuranceFundStake: ifStakeAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+                insuranceFundVault: bank.insuranceFundVault,
+                insuranceFundVaultAuthority: bank.insuranceFundVaultAuthority,
+                userTokenAccount: collateralAccountPublicKey,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+            remainingAccounts,
+        });
+    }
+    async settleRevenueToInsuranceFund(bankIndex) {
+        const bank = this.getBankAccount(bankIndex);
+        const remainingAccounts = this.getRemainingAccounts({
+            writableBankIndex: bankIndex,
+        });
+        return await this.program.rpc.settleRevenueToInsuranceFund(bankIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                bank: bank.pubkey,
+                bankVault: bank.vault,
+                bankVaultAuthority: bank.vaultAuthority,
+                insuranceFundVault: bank.insuranceFundVault,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+            remainingAccounts,
+        });
+    }
 }
 exports.ClearingHouse = ClearingHouse;

package/lib/clearingHouseUser.js

@@ -363,7 +363,7 @@ class ClearingHouseUser {
     getTotalPositionValue() {
         return this.getUserAccount().positions.reduce((positionValue, marketPosition) => {
             const market = this.clearingHouse.getMarketAccount(marketPosition.marketIndex);
-            const posVal = (0, margin_1.calculateMarginBaseAssetValue)(market, marketPosition, this.getOracleDataForMarket(market.marketIndex));
+            const posVal = (0, margin_1.calculateBaseAssetValueWithOracle)(market, marketPosition, this.getOracleDataForMarket(market.marketIndex));
             return positionValue.add(posVal);
         }, numericConstants_1.ZERO);
     }
@@ -374,7 +374,7 @@ class ClearingHouseUser {
     getPositionValue(marketIndex, oraclePriceData) {
         const userPosition = this.getUserPosition(marketIndex) || this.getEmptyPosition(marketIndex);
         const market = this.clearingHouse.getMarketAccount(userPosition.marketIndex);
-        return (0, margin_1.calculateMarginBaseAssetValue)(market, userPosition, oraclePriceData);
+        return (0, margin_1.calculateBaseAssetValueWithOracle)(market, userPosition, oraclePriceData);
     }
     getPositionSide(currentPosition) {
         if (currentPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
@@ -411,7 +411,7 @@ class ClearingHouseUser {
             baseAssetValue = (0, _1.calculateBaseAssetValue)(market, position, oraclePriceData);
         }
         else {
-            baseAssetValue = (0, margin_1.calculateMarginBaseAssetValue)(market, position, oraclePriceData);
+            baseAssetValue = (0, margin_1.calculateBaseAssetValueWithOracle)(market, position, oraclePriceData);
         }
         if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
             return [numericConstants_1.ZERO, numericConstants_1.ZERO];
@@ -533,13 +533,13 @@ class ClearingHouseUser {
         if (proposedBaseAssetAmount.eq(numericConstants_1.ZERO))
             return new _1.BN(-1);
         const market = this.clearingHouse.getMarketAccount(proposedMarketPosition.marketIndex);
-        const proposedMarketPositionValue = (0, margin_1.calculateMarginBaseAssetValue)(market, proposedMarketPosition, this.getOracleDataForMarket(market.marketIndex));
+        const proposedMarketPositionValue = (0, margin_1.calculateBaseAssetValueWithOracle)(market, proposedMarketPosition, this.getOracleDataForMarket(market.marketIndex));
         // total position value after trade
         const totalPositionValueAfterTrade = totalPositionValueExcludingTargetMarket.add(proposedMarketPositionValue);
         const marginRequirementExcludingTargetMarket = this.getUserAccount().positions.reduce((totalMarginRequirement, position) => {
             if (!position.marketIndex.eq(marketPosition.marketIndex)) {
                 const market = this.clearingHouse.getMarketAccount(position.marketIndex);
-                const positionValue = (0, margin_1.calculateMarginBaseAssetValue)(market, position, this.getOracleDataForMarket(market.marketIndex));
+                const positionValue = (0, margin_1.calculateBaseAssetValueWithOracle)(market, position, this.getOracleDataForMarket(market.marketIndex));
                 const marketMarginRequirement = positionValue
                     .mul(new _1.BN((0, _1.calculateMarketMarginRatio)(market, position.baseAssetAmount.abs(), 'Maintenance')))
                     .div(numericConstants_1.MARGIN_PRECISION);

package/lib/config.js

@@ -7,7 +7,7 @@ exports.configs = {
     devnet: {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-        CLEARING_HOUSE_PROGRAM_ID: '65sz7dRiWDRPZjiRxcTxPM7AE6VK4Nag9HEK6oBJXhJn',
+        CLEARING_HOUSE_PROGRAM_ID: 'HbUKwqFPjz9r7ZtT416AU8aaecDQMKKiDCTS3AdXnS6c',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
         MARKETS: markets_1.DevnetMarkets,
         BANKS: banks_1.DevnetBanks,

package/lib/constants/banks.d.ts

@@ -7,6 +7,8 @@ export declare type BankConfig = {
     oracle: PublicKey;
     mint: PublicKey;
     oracleSource: OracleSource;
+    precision: BN;
+    precisionExp: BN;
 };
 export declare const WRAPPED_SOL_MINT: PublicKey;
 export declare const DevnetBanks: BankConfig[];

package/lib/constants/banks.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Banks = exports.MainnetBanks = exports.DevnetBanks = exports.WRAPPED_SOL_MINT = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
+const numericConstants_1 = require("./numericConstants");
 exports.WRAPPED_SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
 exports.DevnetBanks = [
     {
@@ -11,6 +12,8 @@ exports.DevnetBanks = [
         oracle: web3_js_1.PublicKey.default,
         oracleSource: __1.OracleSource.QUOTE_ASSET,
         mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
+        precision: numericConstants_1.BANK_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.BANK_BALANCE_PRECISION_EXP,
     },
     {
         symbol: 'SOL',
@@ -18,6 +21,8 @@ exports.DevnetBanks = [
         oracle: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
         oracleSource: __1.OracleSource.PYTH,
         mint: new web3_js_1.PublicKey(exports.WRAPPED_SOL_MINT),
+        precision: numericConstants_1.LAMPORTS_PRECISION,
+        precisionExp: numericConstants_1.LAMPORTS_EXP,
     },
     {
         symbol: 'BTC',
@@ -25,6 +30,8 @@ exports.DevnetBanks = [
         oracle: new web3_js_1.PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
         oracleSource: __1.OracleSource.PYTH,
         mint: new web3_js_1.PublicKey('3BZPwbcqB5kKScF3TEXxwNfx5ipV13kbRVDvfVp5c6fv'),
+        precision: numericConstants_1.BANK_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.BANK_BALANCE_PRECISION_EXP,
     },
 ];
 exports.MainnetBanks = [
@@ -34,6 +41,8 @@ exports.MainnetBanks = [
         oracle: web3_js_1.PublicKey.default,
         oracleSource: __1.OracleSource.QUOTE_ASSET,
         mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
+        precision: numericConstants_1.BANK_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.BANK_BALANCE_PRECISION_EXP,
     },
 ];
 exports.Banks = {

package/lib/constants/numericConstants.d.ts

@@ -41,3 +41,5 @@ export declare const MARGIN_PRECISION: BN;
 export declare const BID_ASK_SPREAD_PRECISION: BN;
 export declare const ONE_YEAR: BN;
 export declare const QUOTE_ASSET_BANK_INDEX: BN;
+export declare const LAMPORTS_PRECISION: BN;
+export declare const LAMPORTS_EXP: BN;

package/lib/constants/numericConstants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QUOTE_ASSET_BANK_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.BANK_IMF_PRECISION = exports.BANK_IMF_PRECISION_EXP = exports.BANK_BALANCE_PRECISION = exports.BANK_BALANCE_PRECISION_EXP = exports.BANK_WEIGHT_PRECISION = exports.BANK_RATE_PRECISION = exports.BANK_UTILIZATION_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION_EXP = exports.BANK_INTEREST_PRECISION = exports.BANK_INTEREST_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP = exports.FUNDING_PAYMENT_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
+exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_ASSET_BANK_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.BANK_IMF_PRECISION = exports.BANK_IMF_PRECISION_EXP = exports.BANK_BALANCE_PRECISION = exports.BANK_BALANCE_PRECISION_EXP = exports.BANK_WEIGHT_PRECISION = exports.BANK_RATE_PRECISION = exports.BANK_UTILIZATION_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION_EXP = exports.BANK_INTEREST_PRECISION = exports.BANK_INTEREST_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP = exports.FUNDING_PAYMENT_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
 exports.ONE = new __1.BN(1);
@@ -43,3 +44,5 @@ exports.MARGIN_PRECISION = exports.TEN_THOUSAND;
 exports.BID_ASK_SPREAD_PRECISION = new __1.BN(1000000);
 exports.ONE_YEAR = new __1.BN(31536000);
 exports.QUOTE_ASSET_BANK_INDEX = new __1.BN(0);
+exports.LAMPORTS_PRECISION = new __1.BN(web3_js_1.LAMPORTS_PER_SOL);
+exports.LAMPORTS_EXP = new __1.BN(Math.log10(web3_js_1.LAMPORTS_PER_SOL));

package/lib/events/sort.js

@@ -11,17 +11,14 @@ function clientSortDescFn() {
 function defaultBlockchainSortFn(currentEvent, newEvent) {
     return currentEvent.slot <= newEvent.slot ? 'less than' : 'greater than';
 }
-function orderRecordSortFn(currentEvent, newEvent) {
-    const currentEventMarketIndex = !currentEvent.maker.equals(index_1.PublicKey.default)
-        ? currentEvent.makerOrder.marketIndex
-        : currentEvent.takerOrder.marketIndex;
-    const newEventMarketIndex = !newEvent.maker.equals(index_1.PublicKey.default)
-        ? newEvent.makerOrder.marketIndex
-        : newEvent.takerOrder.marketIndex;
+function orderActionRecordSortFn(currentEvent, newEvent) {
+    var _a, _b;
+    const currentEventMarketIndex = currentEvent.marketIndex;
+    const newEventMarketIndex = newEvent.marketIndex;
     if (!currentEventMarketIndex.eq(newEventMarketIndex)) {
         return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
     }
-    if (currentEvent.fillRecordId.gt(index_1.ZERO) && newEvent.fillRecordId.gt(index_1.ZERO)) {
+    if (((_a = currentEvent.fillRecordId) === null || _a === void 0 ? void 0 : _a.gt(index_1.ZERO)) && ((_b = newEvent.fillRecordId) === null || _b === void 0 ? void 0 : _b.gt(index_1.ZERO))) {
         return currentEvent.fillRecordId.lte(newEvent.fillRecordId)
             ? 'less than'
             : 'greater than';
@@ -35,8 +32,8 @@ function getSortFn(orderBy, orderDir, eventType) {
         return orderDir === 'asc' ? clientSortAscFn : clientSortDescFn;
     }
     switch (eventType) {
-        case 'OrderRecord':
-            return orderRecordSortFn;
+        case 'OrderActionRecord':
+            return orderActionRecordSortFn;
         default:
             return defaultBlockchainSortFn;
     }

package/lib/events/types.d.ts

@@ -1,5 +1,5 @@
 import { Commitment, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderRecord, SettlePnlRecord } from '../index';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord } from '../index';
 export declare type EventSubscriptionOptions = {
     eventTypes?: EventType[];
     maxEventsPerType?: number;
@@ -27,6 +27,7 @@ export declare type EventMap = {
     LiquidationRecord: Event<LiquidationRecord>;
     FundingRateRecord: Event<FundingRateRecord>;
     OrderRecord: Event<OrderRecord>;
+    OrderActionRecord: Event<OrderActionRecord>;
     SettlePnlRecord: Event<SettlePnlRecord>;
     NewUserRecord: Event<NewUserRecord>;
 };

package/lib/events/types.js

@@ -7,6 +7,7 @@ exports.DefaultEventSubscriptionOptions = {
         'FundingPaymentRecord',
         'LiquidationRecord',
         'OrderRecord',
+        'OrderActionRecord',
         'FundingRateRecord',
         'NewUserRecord',
         'SettlePnlRecord',