@drift-labs/sdk 0.2.0-master.10 → 0.2.0-master.11

package/lib/idl/{mock_usdc_faucet.json → token_faucet.json}

@@ -1,23 +1,23 @@
 {
-    "version": "0.0.0",
-    "name": "mock_usdc_faucet",
+    "version": "0.1.0",
+    "name": "token_faucet",
     "instructions": [
         {
             "name": "initialize",
             "accounts": [
                 {
-                    "name": "mockUsdcFaucetState",
+                    "name": "faucetConfig",
                     "isMut": true,
                     "isSigner": false
                 },
                 {
                     "name": "admin",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": true
                 },
                 {
                     "name": "mintAccount",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -29,20 +29,20 @@
                     "name": "systemProgram",
                     "isMut": false,
                     "isSigner": false
-                }
-            ],
-            "args": [
+                },
                 {
-                    "name": "mockUsdcFaucetNonce",
-                    "type": "u8"
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
                 }
-            ]
+            ],
+            "args": []
         },
         {
             "name": "mintToUser",
             "accounts": [
                 {
-                    "name": "mockUsdcFaucetState",
+                    "name": "faucetConfig",
                     "isMut": false,
                     "isSigner": false
                 },
@@ -73,11 +73,42 @@
                     "type": "u64"
                 }
             ]
+        },
+        {
+            "name": "transferMintAuthority",
+            "accounts": [
+                {
+                    "name": "faucetConfig",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "admin",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "mintAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "mintAuthority",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": []
         }
     ],
     "accounts": [
         {
-            "name": "MockUSDCFaucetState",
+            "name": "FaucetConfig",
             "type": {
                 "kind": "struct",
                 "fields": [
@@ -103,17 +134,9 @@
     ],
     "errors": [
         {
-            "code": 300,
+            "code": 6000,
             "name": "InvalidMintAccountAuthority",
             "msg": "Program not mint authority"
-        },
-        {
-            "code": 301,
-            "name": "Unauthorized",
-            "msg": "Signer must be MockUSDCFaucet admin"
         }
-    ],
-    "metadata": {
-        "address": "2z2DLVD3tBWc86pbvvy5qN31v1NXprM6zA5MDr2FMx64"
-    }
+    ]
 }

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import { BN } from '@project-serum/anchor';
 import { PublicKey } from '@solana/web3.js';
 import pyth from '@pythnetwork/client';
-export * from './mockUSDCFaucet';
+export * from './tokenFaucet';
 export * from './oracles/types';
 export * from './oracles/pythClient';
 export * from './oracles/switchboardClient';

package/lib/index.js

@@ -24,7 +24,7 @@ const web3_js_1 = require("@solana/web3.js");
 Object.defineProperty(exports, "PublicKey", { enumerable: true, get: function () { return web3_js_1.PublicKey; } });
 const client_1 = __importDefault(require("@pythnetwork/client"));
 exports.pyth = client_1.default;
-__exportStar(require("./mockUSDCFaucet"), exports);
+__exportStar(require("./tokenFaucet"), exports);
 __exportStar(require("./oracles/types"), exports);
 __exportStar(require("./oracles/pythClient"), exports);
 __exportStar(require("./oracles/switchboardClient"), exports);

package/lib/{mockUSDCFaucet.d.ts → tokenFaucet.d.ts}

@@ -5,22 +5,24 @@ import { AccountInfo } from '@solana/spl-token';
 import { ConfirmOptions, Connection, PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { BN } from '.';
 import { IWallet } from './types';
-export declare class MockUSDCFaucet {
+export declare class TokenFaucet {
     connection: Connection;
     wallet: IWallet;
     program: Program;
     provider: AnchorProvider;
+    mint: PublicKey;
     opts?: ConfirmOptions;
-    constructor(connection: Connection, wallet: IWallet, programId: PublicKey, opts?: ConfirmOptions);
-    getMockUSDCFaucetStatePublicKeyAndNonce(): Promise<[
+    constructor(connection: Connection, wallet: IWallet, programId: PublicKey, mint: PublicKey, opts?: ConfirmOptions);
+    getFaucetConfigPublicKeyAndNonce(): Promise<[
         PublicKey,
         number
     ]>;
-    mockUSDCFaucetStatePublicKey?: PublicKey;
-    getMockUSDCFaucetStatePublicKey(): Promise<PublicKey>;
+    getMintAuthority(): Promise<PublicKey>;
+    getFaucetConfigPublicKey(): Promise<PublicKey>;
     initialize(): Promise<TransactionSignature>;
     fetchState(): Promise<any>;
     mintToUser(userTokenAccount: PublicKey, amount: BN): Promise<TransactionSignature>;
+    transferMintAuthority(): Promise<TransactionSignature>;
     createAssociatedTokenAccountAndMintTo(userPublicKey: PublicKey, amount: BN): Promise<[PublicKey, TransactionSignature]>;
     createAssociatedTokenAccountAndMintToInstructions(userPublicKey: PublicKey, amount: BN): Promise<[PublicKey, TransactionInstruction, TransactionInstruction]>;
     getAssosciatedMockUSDMintAddress(props: {

package/lib/{mockUSDCFaucet.js → tokenFaucet.js}

@@ -26,74 +26,75 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockUSDCFaucet = void 0;
+exports.TokenFaucet = void 0;
 const anchor = __importStar(require("@project-serum/anchor"));
 const anchor_1 = require("@project-serum/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const mock_usdc_faucet_json_1 = __importDefault(require("./idl/mock_usdc_faucet.json"));
-class MockUSDCFaucet {
-    constructor(connection, wallet, programId, opts) {
+const token_faucet_json_1 = __importDefault(require("./idl/token_faucet.json"));
+class TokenFaucet {
+    constructor(connection, wallet, programId, mint, opts) {
         this.connection = connection;
         this.wallet = wallet;
         this.opts = opts || anchor_1.AnchorProvider.defaultOptions();
         const provider = new anchor_1.AnchorProvider(connection, wallet, this.opts);
         this.provider = provider;
-        this.program = new anchor_1.Program(mock_usdc_faucet_json_1.default, programId, provider);
+        this.program = new anchor_1.Program(token_faucet_json_1.default, programId, provider);
+        this.mint = mint;
     }
-    async getMockUSDCFaucetStatePublicKeyAndNonce() {
-        return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('mock_usdc_faucet'))], this.program.programId);
+    async getFaucetConfigPublicKeyAndNonce() {
+        return anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('faucet_config')),
+            this.mint.toBuffer(),
+        ], this.program.programId);
     }
-    async getMockUSDCFaucetStatePublicKey() {
-        if (this.mockUSDCFaucetStatePublicKey) {
-            return this.mockUSDCFaucetStatePublicKey;
-        }
-        this.mockUSDCFaucetStatePublicKey = (await this.getMockUSDCFaucetStatePublicKeyAndNonce())[0];
-        return this.mockUSDCFaucetStatePublicKey;
+    async getMintAuthority() {
+        return (await anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('mint_authority')),
+            this.mint.toBuffer(),
+        ], this.program.programId))[0];
+    }
+    async getFaucetConfigPublicKey() {
+        return (await this.getFaucetConfigPublicKeyAndNonce())[0];
     }
     async initialize() {
-        const stateAccountRPCResponse = await this.connection.getParsedAccountInfo(await this.getMockUSDCFaucetStatePublicKey());
-        if (stateAccountRPCResponse.value !== null) {
-            throw new Error('Faucet already initialized');
-        }
-        const fakeUSDCMint = anchor.web3.Keypair.generate();
-        const createUSDCMintAccountIx = web3_js_1.SystemProgram.createAccount({
-            fromPubkey: this.wallet.publicKey,
-            newAccountPubkey: fakeUSDCMint.publicKey,
-            lamports: await spl_token_1.Token.getMinBalanceRentForExemptMint(this.connection),
-            space: spl_token_1.MintLayout.span,
-            programId: spl_token_1.TOKEN_PROGRAM_ID,
-        });
-        const [mintAuthority, _mintAuthorityNonce] = await web3_js_1.PublicKey.findProgramAddress([fakeUSDCMint.publicKey.toBuffer()], this.program.programId);
-        const initUSDCMintIx = spl_token_1.Token.createInitMintInstruction(spl_token_1.TOKEN_PROGRAM_ID, fakeUSDCMint.publicKey, 6, mintAuthority, null);
-        const [mockUSDCFaucetStatePublicKey, mockUSDCFaucetStateNonce] = await this.getMockUSDCFaucetStatePublicKeyAndNonce();
-        return await this.program.rpc.initialize(mockUSDCFaucetStateNonce, {
+        const [faucetConfigPublicKey] = await this.getFaucetConfigPublicKeyAndNonce();
+        return await this.program.rpc.initialize({
             accounts: {
-                mockUsdcFaucetState: mockUSDCFaucetStatePublicKey,
+                faucetConfig: faucetConfigPublicKey,
                 admin: this.wallet.publicKey,
-                mintAccount: fakeUSDCMint.publicKey,
+                mintAccount: this.mint,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                 systemProgram: anchor.web3.SystemProgram.programId,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
-            instructions: [createUSDCMintAccountIx, initUSDCMintIx],
-            signers: [fakeUSDCMint],
         });
     }
     async fetchState() {
-        return await this.program.account.mockUsdcFaucetState.fetch(await this.getMockUSDCFaucetStatePublicKey());
+        return await this.program.account.faucetConfig.fetch(await this.getFaucetConfigPublicKey());
     }
     async mintToUser(userTokenAccount, amount) {
-        const state = await this.fetchState();
         return await this.program.rpc.mintToUser(amount, {
             accounts: {
-                mockUsdcFaucetState: await this.getMockUSDCFaucetStatePublicKey(),
-                mintAccount: state.mint,
+                faucetConfig: await this.getFaucetConfigPublicKey(),
+                mintAccount: this.mint,
                 userTokenAccount,
-                mintAuthority: state.mintAuthority,
+                mintAuthority: await this.getMintAuthority(),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
         });
     }
+    async transferMintAuthority() {
+        return await this.program.rpc.transferMintAuthority({
+            accounts: {
+                faucetConfig: await this.getFaucetConfigPublicKey(),
+                mintAccount: this.mint,
+                mintAuthority: await this.getMintAuthority(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                admin: this.wallet.publicKey,
+            },
+        });
+    }
     async createAssociatedTokenAccountAndMintTo(userPublicKey, amount) {
         const [associatedTokenPublicKey, createAssociatedAccountIx, mintToTx] = await this.createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount);
         const tx = new web3_js_1.Transaction().add(createAssociatedAccountIx).add(mintToTx);
@@ -106,7 +107,7 @@ class MockUSDCFaucet {
         const createAssociatedAccountIx = spl_token_1.Token.createAssociatedTokenAccountInstruction(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, state.mint, associateTokenPublicKey, userPublicKey, this.wallet.publicKey);
         const mintToIx = await this.program.instruction.mintToUser(amount, {
             accounts: {
-                mockUsdcFaucetState: await this.getMockUSDCFaucetStatePublicKey(),
+                faucetConfig: await this.getFaucetConfigPublicKey(),
                 mintAccount: state.mint,
                 userTokenAccount: associateTokenPublicKey,
                 mintAuthority: state.mintAuthority,
@@ -143,4 +144,4 @@ class MockUSDCFaucet {
         }
     }
 }
-exports.MockUSDCFaucet = MockUSDCFaucet;
+exports.TokenFaucet = TokenFaucet;

package/lib/types.d.ts

@@ -187,20 +187,66 @@ export declare type FundingPaymentRecord = {
 };
 export declare type LiquidationRecord = {
     ts: BN;
-    recordId: BN;
-    userAuthority: PublicKey;
     user: PublicKey;
-    partial: boolean;
-    baseAssetValue: BN;
-    baseAssetValueClosed: BN;
-    liquidationFee: BN;
-    feeToLiquidator: BN;
-    feeToInsuranceFund: BN;
     liquidator: PublicKey;
+    liquidationType: LiquidationType;
+    marginRequirement: BN;
     totalCollateral: BN;
-    collateral: BN;
-    unrealizedPnl: BN;
-    marginRatio: BN;
+    liquidatePerp: LiquidatePerpRecord;
+    liquidateBorrow: LiquidateBorrowRecord;
+    liquidateBorrowForPerpPnl: LiquidateBorrowForPerpPnlRecord;
+    liquidatePerpPnlForDeposit: LiquidatePerpPnlForDepositRecord;
+};
+export declare class LiquidationType {
+    static readonly LIQUIDATE_PERP: {
+        liquidatePerp: {};
+    };
+    static readonly LIQUIDATE_BORROW: {
+        liquidateBorrow: {};
+    };
+    static readonly LIQUIDATE_BORROW_FOR_PERP_PNL: {
+        liquidateBorrowForPerpPnl: {};
+    };
+    static readonly LIQUIDATE_PERP_PNL_FOR_DEPOSIT: {
+        liquidatePerpPnlForDeposit: {};
+    };
+}
+export declare type LiquidatePerpRecord = {
+    marketIndex: BN;
+    orderIds: BN[];
+    oraclePrice: BN;
+    baseAssetAmount: BN;
+    quoteAssetAmount: BN;
+    userPnl: BN;
+    liquidatorPnl: BN;
+    canceledOrdersFee: BN;
+    userOrderId: BN;
+    liquidatorOrderId: BN;
+    fillRecordId: BN;
+};
+export declare type LiquidateBorrowRecord = {
+    assetBankIndex: BN;
+    assetPrice: BN;
+    assetTransfer: BN;
+    liabilityBankIndex: BN;
+    liabilityPrice: BN;
+    liabilityTransfer: BN;
+};
+export declare type LiquidateBorrowForPerpPnlRecord = {
+    marketIndex: BN;
+    marketOraclePrice: BN;
+    pnlTransfer: BN;
+    liabilityBankIndex: BN;
+    liabilityPrice: BN;
+    liabilityTransfer: BN;
+};
+export declare type LiquidatePerpPnlForDepositRecord = {
+    marketIndex: BN;
+    marketOraclePrice: BN;
+    pnlTransfer: BN;
+    assetBankIndex: BN;
+    assetPrice: BN;
+    assetTransfer: BN;
 };
 export declare type OrderRecord = {
     ts: BN;
@@ -264,9 +310,9 @@ export declare type MarketAccount = {
     openInterest: BN;
     marginRatioInitial: number;
     marginRatioMaintenance: number;
-    marginRatioPartial: number;
     nextFillRecordId: BN;
     pnlPool: PoolBalance;
+    liquidationFee: BN;
 };
 export declare type BankAccount = {
     bankIndex: BN;
@@ -289,6 +335,7 @@ export declare type BankAccount = {
     maintenanceAssetWeight: BN;
     initialLiabilityWeight: BN;
     maintenanceLiabilityWeight: BN;
+    liquidationFee: BN;
 };
 export declare type PoolBalance = {
     balance: BN;
@@ -366,6 +413,7 @@ export declare type UserAccount = {
     };
     positions: UserPosition[];
     orders: Order[];
+    beingLiquidated: boolean;
 };
 export declare type UserBankBalance = {
     bankIndex: BN;
@@ -505,6 +553,7 @@ export declare type FeeStructure = {
     makerRebateNumerator: BN;
     makerRebateDenominator: BN;
     fillerRewardStructure: OrderFillerRewardStructure;
+    cancelOrderFee: BN;
 };
 export declare type OracleGuardRails = {
     priceDivergence: {
@@ -523,4 +572,4 @@ export declare type OrderFillerRewardStructure = {
     rewardDenominator: BN;
     timeBasedRewardLowerBound: BN;
 };
-export declare type MarginCategory = 'Initial' | 'Partial' | 'Maintenance';
+export declare type MarginCategory = 'Initial' | 'Maintenance';

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultOrderParams = 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.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 {
@@ -91,6 +91,17 @@ var TradeSide;
     TradeSide[TradeSide["Buy"] = 1] = "Buy";
     TradeSide[TradeSide["Sell"] = 2] = "Sell";
 })(TradeSide = exports.TradeSide || (exports.TradeSide = {}));
+class LiquidationType {
+}
+exports.LiquidationType = LiquidationType;
+LiquidationType.LIQUIDATE_PERP = { liquidatePerp: {} };
+LiquidationType.LIQUIDATE_BORROW = { liquidateBorrow: {} };
+LiquidationType.LIQUIDATE_BORROW_FOR_PERP_PNL = {
+    liquidateBorrowForPerpPnl: {},
+};
+LiquidationType.LIQUIDATE_PERP_PNL_FOR_DEPOSIT = {
+    liquidatePerpPnlForDeposit: {},
+};
 exports.DefaultOrderParams = {
     orderType: OrderType.MARKET,
     userOrderId: 0,

package/lib/util/computeUnits.js

@@ -4,7 +4,7 @@ exports.findComputeUnitConsumption = void 0;
 async function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
     const tx = await connection.getTransaction(txSignature, { commitment });
     const computeUnits = [];
-    const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of 200000 compute units`);
+    const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
     tx.meta.logMessages.forEach((logMessage) => {
         const match = logMessage.match(regex);
         if (match && match[1]) {

package/package.json

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

package/src/admin.ts

@@ -20,7 +20,7 @@ import {
 } from './addresses/pda';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { ClearingHouse } from './clearingHouse';
-import { PEG_PRECISION } from './constants/numericConstants';
+import { PEG_PRECISION, ZERO } from './constants/numericConstants';
 import { calculateTargetPriceTrade } from './math/trade';
 import { calculateAmmReservesAfterSwap, getSwapDirection } from './math/amm';
 
@@ -86,7 +86,8 @@ export class Admin extends ClearingHouse {
 		maintenanceAssetWeight: BN,
 		initialLiabilityWeight: BN,
 		maintenanceLiabilityWeight: BN,
-		imfFactor = new BN(0)
+		imfFactor = new BN(0),
+		liquidationFee = ZERO
 	): Promise<TransactionSignature> {
 		const bankIndex = this.getStateAccount().numberOfBanks;
 		const bank = await getBankPublicKey(this.program.programId, bankIndex);
@@ -111,6 +112,7 @@ export class Admin extends ClearingHouse {
 			initialLiabilityWeight,
 			maintenanceLiabilityWeight,
 			imfFactor,
+			liquidationFee,
 			{
 				accounts: {
 					admin: this.wallet.publicKey,
@@ -146,8 +148,8 @@ export class Admin extends ClearingHouse {
 		pegMultiplier: BN = PEG_PRECISION,
 		oracleSource: OracleSource = OracleSource.PYTH,
 		marginRatioInitial = 2000,
-		marginRatioPartial = 625,
-		marginRatioMaintenance = 500
+		marginRatioMaintenance = 500,
+		liquidationFee = ZERO
 	): Promise<TransactionSignature> {
 		const marketPublicKey = await getMarketPublicKey(
 			this.program.programId,
@@ -161,8 +163,8 @@ export class Admin extends ClearingHouse {
 			pegMultiplier,
 			oracleSource,
 			marginRatioInitial,
-			marginRatioPartial,
 			marginRatioMaintenance,
+			liquidationFee,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -422,12 +424,10 @@ export class Admin extends ClearingHouse {
 	public async updateMarginRatio(
 		marketIndex: BN,
 		marginRatioInitial: number,
-		marginRatioPartial: number,
 		marginRatioMaintenance: number
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateMarginRatio(
 			marginRatioInitial,
-			marginRatioPartial,
 			marginRatioMaintenance,
 			{
 				accounts: {