@drift-labs/sdk 0.2.0-master.28 → 0.2.0-master.29

package/lib/types.d.ts

@@ -419,8 +419,6 @@ export declare type StateAccount = {
     exchangePaused: boolean;
     adminControlsPrices: boolean;
     insuranceVault: PublicKey;
-    perpFeeStructure: FeeStructure;
-    spotFeeStructure: FeeStructure;
     totalFee: BN;
     totalFeeWithdrawn: BN;
     whitelistMint: PublicKey;
@@ -436,6 +434,8 @@ export declare type StateAccount = {
     minPerpAuctionDuration: number;
     defaultSpotAuctionDuration: number;
     liquidationMarginBufferRatio: number;
+    perpFeeStructure: FeeStructure;
+    spotFeeStructure: FeeStructure;
 };
 export declare type PerpMarketAccount = {
     status: MarketStatus;
@@ -605,10 +605,11 @@ export declare type UserStatsAccount = {
     isReferrer: boolean;
     totalReferrerReward: BN;
     authority: PublicKey;
-    quoteAssetInsuranceFundStake: BN;
+    stakedQuoteAssetAmount: BN;
 };
 export declare type UserAccount = {
     authority: PublicKey;
+    delegate: PublicKey;
     name: number[];
     userId: number;
     spotPositions: SpotPosition[];
@@ -733,40 +734,27 @@ export interface IWallet {
     publicKey: PublicKey;
 }
 export declare type FeeStructure = {
-    feeNumerator: BN;
-    feeDenominator: BN;
-    discountTokenTiers: {
-        firstTier: {
-            minimumBalance: BN;
-            discountNumerator: BN;
-            discountDenominator: BN;
-        };
-        secondTier: {
-            minimumBalance: BN;
-            discountNumerator: BN;
-            discountDenominator: BN;
-        };
-        thirdTier: {
-            minimumBalance: BN;
-            discountNumerator: BN;
-            discountDenominator: BN;
-        };
-        fourthTier: {
-            minimumBalance: BN;
-            discountNumerator: BN;
-            discountDenominator: BN;
-        };
-    };
-    referralDiscount: {
-        referrerRewardNumerator: BN;
-        referrerRewardDenominator: BN;
-        refereeDiscountNumerator: BN;
-        refereeDiscountDenominator: BN;
-    };
+    feeTiers: FeeTier[];
     makerRebateNumerator: BN;
     makerRebateDenominator: BN;
     fillerRewardStructure: OrderFillerRewardStructure;
     flatFillerFee: BN;
+    referrerRewardEpochUpperBound: BN;
+};
+export declare type FeeTier = {
+    feeNumerator: number;
+    feeDenominator: number;
+    makerRebateNumerator: number;
+    makerRebateDenominator: number;
+    referrerRewardNumerator: number;
+    referrerRewardDenominator: number;
+    refereeFeeNumerator: number;
+    refereeFeeDenominator: number;
+};
+export declare type OrderFillerRewardStructure = {
+    rewardNumerator: BN;
+    rewardDenominator: BN;
+    timeBasedRewardLowerBound: BN;
 };
 export declare type OracleGuardRails = {
     priceDivergence: {
@@ -780,11 +768,6 @@ export declare type OracleGuardRails = {
     };
     useForLiquidations: boolean;
 };
-export declare type OrderFillerRewardStructure = {
-    rewardNumerator: BN;
-    rewardDenominator: BN;
-    timeBasedRewardLowerBound: BN;
-};
 export declare type MarginCategory = 'Initial' | 'Maintenance';
 export declare type InsuranceFundStake = {
     marketIndex: BN;

package/package.json

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

package/src/addresses/marketAddresses.js

@@ -0,0 +1,26 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMarketAddress = void 0;
+const pda_1 = require("./pda");
+const CACHE = new Map();
+function getMarketAddress(programId, marketIndex) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cacheKey = `${programId.toString()}-${marketIndex.toString()}`;
+        if (CACHE.has(cacheKey)) {
+            return CACHE.get(cacheKey);
+        }
+        const publicKey = yield pda_1.getMarketPublicKey(programId, marketIndex);
+        CACHE.set(cacheKey, publicKey);
+        return publicKey;
+    });
+}
+exports.getMarketAddress = getMarketAddress;

package/src/admin.ts

@@ -3,12 +3,7 @@ import {
 	SYSVAR_RENT_PUBKEY,
 	TransactionSignature,
 } from '@solana/web3.js';
-import {
-	FeeStructure,
-	OracleGuardRails,
-	OracleSource,
-	OrderFillerRewardStructure,
-} from './types';
+import { FeeStructure, OracleGuardRails, OracleSource } from './types';
 import { BN } from '@project-serum/anchor';
 import * as anchor from '@project-serum/anchor';
 import {
@@ -278,7 +273,7 @@ export class Admin extends ClearingHouse {
 		marketIndex: BN,
 		concentrationScale: BN
 	): Promise<TransactionSignature> {
-		return await this.program.rpc.updateConcentrationScale(concentrationScale, {
+		return await this.program.rpc.updateConcentrationCoef(concentrationScale, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				admin: this.wallet.publicKey,
@@ -611,22 +606,21 @@ export class Admin extends ClearingHouse {
 		);
 	}
 
-	public async updateOrderFillerRewardStructure(
-		orderFillerRewardStructure: OrderFillerRewardStructure
+	public async updatePerpFeeStructure(
+		feeStructure: FeeStructure
 	): Promise<TransactionSignature> {
-		return await this.program.rpc.updateOrderFillerRewardStructure(
-			orderFillerRewardStructure,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-				},
-			}
-		);
+		return await this.program.rpc.updatePerpFeeStructure(feeStructure, {
+			accounts: {
+				admin: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+			},
+		});
 	}
 
-	public async updateFee(fees: FeeStructure): Promise<TransactionSignature> {
-		return await this.program.rpc.updateFee(fees, {
+	public async updateSpotFeeStructure(
+		feeStructure: FeeStructure
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotFeeStructure(feeStructure, {
 			accounts: {
 				admin: this.wallet.publicKey,
 				state: await this.getStatePublicKey(),

package/src/assert/assert.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assert = void 0;
+function assert(condition, error) {
+    if (!condition) {
+        throw new Error(error || 'Unspecified AssertionError');
+    }
+}
+exports.assert = assert;

package/src/clearingHouse.ts

@@ -1,5 +1,10 @@
 import { AnchorProvider, BN, Idl, Program } from '@project-serum/anchor';
-import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import bs58 from 'bs58';
+import {
+	ASSOCIATED_TOKEN_PROGRAM_ID,
+	Token,
+	TOKEN_PROGRAM_ID,
+} from '@solana/spl-token';
 import {
 	StateAccount,
 	IWallet,
@@ -97,6 +102,7 @@ export class ClearingHouse {
 	_isSubscribed = false;
 	txSender: TxSender;
 	marketLastSlotCache = new Map<number, number>();
+	authority: PublicKey;
 
 	public get isSubscribed() {
 		return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -121,6 +127,7 @@ export class ClearingHouse {
 			this.provider
 		);
 
+		this.authority = config.authority ?? this.wallet.publicKey;
 		const userIds = config.userIds ?? [0];
 		this.activeUserId = config.activeUserId ?? userIds[0];
 		this.userAccountSubscriptionConfig =
@@ -138,7 +145,7 @@ export class ClearingHouse {
 				clearingHouse: this,
 				userStatsAccountPublicKey: getUserStatsAccountPublicKey(
 					this.program.programId,
-					this.wallet.publicKey
+					this.authority
 				),
 				accountSubscription: this.userAccountSubscriptionConfig,
 			});
@@ -203,7 +210,7 @@ export class ClearingHouse {
 	): ClearingHouseUser {
 		const userAccountPublicKey = getUserAccountPublicKeySync(
 			this.program.programId,
-			this.wallet.publicKey,
+			this.authority,
 			userId
 		);
 
@@ -494,6 +501,36 @@ export class ClearingHouse {
 		);
 	}
 
+	public async updateUserDelegate(
+		delegate: PublicKey,
+		userId = 0
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateUserDelegate(userId, delegate, {
+			accounts: {
+				user: await this.getUserAccountPublicKey(),
+				authority: this.wallet.publicKey,
+			},
+		});
+	}
+
+	public async getUserAccountsForDelegate(
+		delegate: PublicKey
+	): Promise<UserAccount[]> {
+		const programAccounts = await this.program.account.user.all([
+			{
+				memcmp: {
+					offset: 40,
+					/** data to match, as base-58 encoded string and limited to less than 129 bytes */
+					bytes: bs58.encode(delegate.toBuffer()),
+				},
+			},
+		]);
+
+		return programAccounts.map(
+			(programAccount) => programAccount.account as UserAccount
+		);
+	}
+
 	public getUser(userId?: number): ClearingHouseUser {
 		userId = userId ?? this.activeUserId;
 		if (!this.users.has(userId)) {
@@ -518,7 +555,7 @@ export class ClearingHouse {
 
 		this.userStatsAccountPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
-			this.wallet.publicKey
+			this.authority
 		);
 		return this.userStatsAccountPublicKey;
 	}
@@ -732,7 +769,7 @@ export class ClearingHouse {
 
 		const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
 
-		const authority = this.wallet.publicKey;
+		const authority = this.authority;
 
 		const createWSOLTokenAccount =
 			isSolMarket && collateralAccountPublicKey.equals(authority);
@@ -793,7 +830,7 @@ export class ClearingHouse {
 		const userAccountPublicKey = userId
 			? await getUserAccountPublicKey(
 					this.program.programId,
-					this.wallet.publicKey,
+					this.authority,
 					userId
 			  )
 			: await this.getUserAccountPublicKey();
@@ -841,10 +878,10 @@ export class ClearingHouse {
 		);
 	}
 
-	private async checkIfAccountExists(account: PublicKey) {
+	private async checkIfAccountExists(account: PublicKey): Promise<boolean> {
 		try {
 			const accountInfo = await this.connection.getAccountInfo(account);
-			return accountInfo && true;
+			return accountInfo != null;
 		} catch (e) {
 			// Doesn't already exist
 			return false;
@@ -947,6 +984,23 @@ export class ClearingHouse {
 		return result;
 	}
 
+	public getAssociatedTokenAccountCreationIx(
+		tokenMintAddress: PublicKey,
+		associatedTokenAddress: PublicKey
+	): anchor.web3.TransactionInstruction {
+		const createAssociatedAccountIx =
+			Token.createAssociatedTokenAccountInstruction(
+				ASSOCIATED_TOKEN_PROGRAM_ID,
+				TOKEN_PROGRAM_ID,
+				tokenMintAddress,
+				associatedTokenAddress,
+				this.wallet.publicKey,
+				this.wallet.publicKey
+			);
+
+		return createAssociatedAccountIx;
+	}
+
 	/**
 	 * Creates the Clearing House User account for a user, and deposits some initial collateral
 	 * @param amount
@@ -1109,6 +1163,18 @@ export class ClearingHouse {
 			});
 
 			signers.forEach((signer) => additionalSigners.push(signer));
+		} else {
+			const accountExists = await this.checkIfAccountExists(userTokenAccount);
+
+			if (!accountExists) {
+				const createAssociatedTokenAccountIx =
+					this.getAssociatedTokenAccountCreationIx(
+						spotMarketAccount.mint,
+						userTokenAccount
+					);
+
+				tx.add(createAssociatedTokenAccountIx);
+			}
 		}
 
 		const withdrawCollateral = await this.getWithdrawIx(

package/src/clearingHouseConfig.ts

@@ -19,6 +19,7 @@ export type ClearingHouseConfig = {
 	oracleInfos?: OracleInfo[];
 	env?: DriftEnv;
 	userStats?: boolean;
+	authority?: PublicKey; // explicitly pass an authority if signer is delegate
 };
 
 type ClearingHouseSubscriptionConfig =

package/src/clearingHouseUser.ts

@@ -1395,11 +1395,11 @@ export class ClearingHouseUser {
 	 * @returns feeForQuote : Precision QUOTE_PRECISION
 	 */
 	public calculateFeeForQuoteAmount(quoteAmount: BN): BN {
-		const feeStructure = this.clearingHouse.getStateAccount().perpFeeStructure;
-
+		const feeTier =
+			this.clearingHouse.getStateAccount().perpFeeStructure.feeTiers[0];
 		return quoteAmount
-			.mul(feeStructure.feeNumerator)
-			.div(feeStructure.feeDenominator);
+			.mul(new BN(feeTier.feeNumerator))
+			.div(new BN(feeTier.feeDenominator));
 	}
 
 	/**

package/src/config.ts

@@ -28,7 +28,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: 'CUowJP5Dea7pkc2mKrkX2RuZUrPXL3u419iBRXyZEWQz',
+		CLEARING_HOUSE_PROGRAM_ID: '6MVFno8SFkVffGuCCQzg2wi8FvF8sPRFDNHa13ZPP9cK',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		PERP_MARKETS: DevnetPerpMarkets,
 		SPOT_MARKETS: DevnetSpotMarkets,

package/src/constants/banks.js

@@ -0,0 +1,42 @@
+"use strict";
+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("../");
+exports.WRAPPED_SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
+exports.DevnetBanks = [
+    {
+        symbol: 'USDC',
+        bankIndex: new __1.BN(0),
+        oracle: web3_js_1.PublicKey.default,
+        oracleSource: __1.OracleSource.QUOTE_ASSET,
+        mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
+    },
+    {
+        symbol: 'SOL',
+        bankIndex: new __1.BN(1),
+        oracle: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
+        oracleSource: __1.OracleSource.PYTH,
+        mint: new web3_js_1.PublicKey(exports.WRAPPED_SOL_MINT),
+    },
+    {
+        symbol: 'BTC',
+        bankIndex: new __1.BN(2),
+        oracle: new web3_js_1.PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
+        oracleSource: __1.OracleSource.PYTH,
+        mint: new web3_js_1.PublicKey('3BZPwbcqB5kKScF3TEXxwNfx5ipV13kbRVDvfVp5c6fv'),
+    },
+];
+exports.MainnetBanks = [
+    {
+        symbol: 'USDC',
+        bankIndex: new __1.BN(0),
+        oracle: web3_js_1.PublicKey.default,
+        oracleSource: __1.OracleSource.QUOTE_ASSET,
+        mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
+    },
+];
+exports.Banks = {
+    devnet: exports.DevnetBanks,
+    'mainnet-beta': exports.MainnetBanks,
+};

package/src/constants/markets.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Markets = exports.MainnetMarkets = exports.DevnetMarkets = void 0;
+const __1 = require("../");
+const web3_js_1 = require("@solana/web3.js");
+exports.DevnetMarkets = [
+    {
+        fullName: 'Solana',
+        category: ['L1', 'Infra'],
+        symbol: 'SOL-PERP',
+        baseAssetSymbol: 'SOL',
+        marketIndex: new __1.BN(0),
+        oracle: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
+        launchTs: 1655751353000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
+    {
+        fullName: 'Bitcoin',
+        category: ['L1', 'Payment'],
+        symbol: 'BTC-PERP',
+        baseAssetSymbol: 'BTC',
+        marketIndex: new __1.BN(1),
+        oracle: new web3_js_1.PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
+        launchTs: 1655751353000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
+    {
+        fullName: 'Ethereum',
+        category: ['L1', 'Infra'],
+        symbol: 'ETH-PERP',
+        baseAssetSymbol: 'ETH',
+        marketIndex: new __1.BN(2),
+        oracle: new web3_js_1.PublicKey('EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw'),
+        launchTs: 1637691133472,
+        oracleSource: __1.OracleSource.PYTH,
+    },
+];
+exports.MainnetMarkets = [];
+exports.Markets = {
+    devnet: exports.DevnetMarkets,
+    'mainnet-beta': [],
+};

package/src/events/eventList.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventList = void 0;
+class Node {
+    constructor(event, next, prev) {
+        this.event = event;
+        this.next = next;
+        this.prev = prev;
+    }
+}
+class EventList {
+    constructor(eventType, maxSize, sortFn, orderDirection) {
+        this.eventType = eventType;
+        this.maxSize = maxSize;
+        this.sortFn = sortFn;
+        this.orderDirection = orderDirection;
+        this.size = 0;
+    }
+    insert(event) {
+        this.size++;
+        const newNode = new Node(event);
+        if (this.head === undefined) {
+            this.head = this.tail = newNode;
+            return;
+        }
+        if (this.sortFn(this.head.event, newNode.event) ===
+            (this.orderDirection === 'asc' ? 'less than' : 'greater than')) {
+            this.head.prev = newNode;
+            newNode.next = this.head;
+            this.head = newNode;
+        }
+        else {
+            let currentNode = this.head;
+            while (currentNode.next !== undefined &&
+                this.sortFn(currentNode.next.event, newNode.event) !==
+                    (this.orderDirection === 'asc' ? 'less than' : 'greater than')) {
+                currentNode = currentNode.next;
+            }
+            newNode.next = currentNode.next;
+            if (currentNode.next !== undefined) {
+                newNode.next.prev = newNode;
+            }
+            currentNode.next = newNode;
+            newNode.prev = currentNode;
+        }
+        if (this.size > this.maxSize) {
+            this.detach();
+        }
+    }
+    detach() {
+        const node = this.tail;
+        if (node.prev !== undefined) {
+            node.prev.next = node.next;
+        }
+        else {
+            this.head = node.next;
+        }
+        if (node.next !== undefined) {
+            node.next.prev = node.prev;
+        }
+        else {
+            this.tail = node.prev;
+        }
+        this.size--;
+    }
+    toArray() {
+        return Array.from(this);
+    }
+    *[Symbol.iterator]() {
+        let node = this.head;
+        while (node) {
+            yield node.event;
+            node = node.next;
+        }
+    }
+}
+exports.EventList = EventList;

package/src/events/txEventCache.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TxEventCache = void 0;
+class Node {
+    constructor(key, value, next, prev) {
+        this.key = key;
+        this.value = value;
+        this.next = next;
+        this.prev = prev;
+    }
+}
+// lru cache
+class TxEventCache {
+    constructor(maxTx = 1024) {
+        this.maxTx = maxTx;
+        this.size = 0;
+        this.cacheMap = {};
+    }
+    add(key, events) {
+        const existingNode = this.cacheMap[key];
+        if (existingNode) {
+            this.detach(existingNode);
+            this.size--;
+        }
+        else if (this.size === this.maxTx) {
+            delete this.cacheMap[this.tail.key];
+            this.detach(this.tail);
+            this.size--;
+        }
+        // Write to head of LinkedList
+        if (!this.head) {
+            this.head = this.tail = new Node(key, events);
+        }
+        else {
+            const node = new Node(key, events, this.head);
+            this.head.prev = node;
+            this.head = node;
+        }
+        // update cacheMap with LinkedList key and Node reference
+        this.cacheMap[key] = this.head;
+        this.size++;
+    }
+    has(key) {
+        return this.cacheMap.hasOwnProperty(key);
+    }
+    get(key) {
+        var _a;
+        return (_a = this.cacheMap[key]) === null || _a === void 0 ? void 0 : _a.value;
+    }
+    detach(node) {
+        if (node.prev !== undefined) {
+            node.prev.next = node.next;
+        }
+        else {
+            this.head = node.next;
+        }
+        if (node.next !== undefined) {
+            node.next.prev = node.prev;
+        }
+        else {
+            this.tail = node.prev;
+        }
+    }
+    clear() {
+        this.head = undefined;
+        this.tail = undefined;
+        this.size = 0;
+        this.cacheMap = {};
+    }
+}
+exports.TxEventCache = TxEventCache;