@drift-labs/sdk 2.23.0 → 2.25.0-beta.0

package/lib/orderParams.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="bn.js" />
 import { OptionalOrderParams, OrderTriggerCondition } from './types';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 export declare function getLimitOrderParams(params: Omit<OptionalOrderParams, 'orderType' | 'marketType'> & {
     price: BN;
 }): OptionalOrderParams;

package/lib/serum/serumSubscriber.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="bn.js" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { Market, Orderbook } from '@project-serum/serum';
 import { SerumMarketSubscriberConfig } from './types';
-import { BN } from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
 export declare class SerumSubscriber {
     connection: Connection;
     programId: PublicKey;

package/lib/serum/serumSubscriber.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SerumSubscriber = void 0;
 const serum_1 = require("@project-serum/serum");
-const anchor_1 = require("@project-serum/anchor");
+const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 class SerumSubscriber {
     constructor(config) {

package/lib/tokenFaucet.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="bn.js" />
-import * as anchor from '@project-serum/anchor';
-import { AnchorProvider, Program } from '@project-serum/anchor';
+import * as anchor from '@coral-xyz/anchor';
+import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { AccountInfo } from '@solana/spl-token';
 import { ConfirmOptions, Connection, PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { BN } from '.';

package/lib/tokenFaucet.js

@@ -27,8 +27,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenFaucet = void 0;
-const anchor = __importStar(require("@project-serum/anchor"));
-const anchor_1 = require("@project-serum/anchor");
+const anchor = __importStar(require("@coral-xyz/anchor"));
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const token_faucet_json_1 = __importDefault(require("./idl/token_faucet.json"));

package/lib/tx/retryTxSender.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { TxSender, TxSigAndSlot } from './types';
 import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
-import { AnchorProvider } from '@project-serum/anchor';
+import { AnchorProvider } from '@coral-xyz/anchor';
 type ResolveReference = {
     resolve?: () => void;
 };

package/lib/tx/types.d.ts

@@ -1,4 +1,4 @@
-import { Provider } from '@project-serum/anchor';
+import { Provider } from '@coral-xyz/anchor';
 import { AddressLookupTableAccount, ConfirmOptions, Signer, Transaction, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 export type TxSigAndSlot = {
     txSig: TransactionSignature;

package/lib/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { PublicKey, Transaction } from '@solana/web3.js';
 import { BN } from '.';
 export declare enum ExchangeStatus {
@@ -253,8 +252,11 @@ export declare class OrderTriggerCondition {
     };
 }
 export declare class SpotFulfillmentType {
-    static readonly SERUM_v3: {
-        serumV3: {};
+    static readonly EXTERNAL: {
+        external: {};
+    };
+    static readonly MATCH: {
+        match: {};
     };
 }
 export declare class SpotFulfillmentStatus {
@@ -928,6 +930,9 @@ export type NecessaryOrderParams = {
 export type OptionalOrderParams = {
     [Property in keyof OrderParams]?: OrderParams[Property];
 } & NecessaryOrderParams;
+export type ModifyOrderParams = {
+    [Property in keyof OrderParams]?: OrderParams[Property] | null;
+};
 export declare const DefaultOrderParams: OrderParams;
 export type MakerInfo = {
     maker: PublicKey;
@@ -991,6 +996,7 @@ export type OracleGuardRails = {
 };
 export type MarginCategory = 'Initial' | 'Maintenance';
 export type InsuranceFundStake = {
+    costBasis: BN;
     marketIndex: number;
     authority: PublicKey;
     ifShares: BN;

package/lib/types.js

@@ -162,7 +162,8 @@ OrderTriggerCondition.TRIGGERED_BELOW = { triggeredBelow: {} }; // below conditi
 class SpotFulfillmentType {
 }
 exports.SpotFulfillmentType = SpotFulfillmentType;
-SpotFulfillmentType.SERUM_v3 = { serumV3: {} };
+SpotFulfillmentType.EXTERNAL = { external: {} };
+SpotFulfillmentType.MATCH = { match: {} };
 class SpotFulfillmentStatus {
 }
 exports.SpotFulfillmentStatus = SpotFulfillmentStatus;

package/lib/user.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.23.0",
+	"version": "2.25.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -33,7 +33,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@project-serum/anchor": "0.25.0-beta.1",
+		"@coral-xyz/anchor": "0.26.0",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
 		"@solana/spl-token": "^0.1.6",

package/src/accounts/fetch.ts

@@ -4,7 +4,7 @@ import {
 	getUserAccountPublicKey,
 	getUserStatsAccountPublicKey,
 } from '../addresses/pda';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 
 export async function fetchUserAccounts(
 	connection: Connection,

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -6,7 +6,7 @@ import {
 	NotSubscribedError,
 	OraclesToPoll,
 } from './types';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import {

package/src/accounts/pollingOracleAccountSubscriber.ts

@@ -4,7 +4,7 @@ import {
 	OracleEvents,
 	OracleAccountSubscriber,
 } from './types';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';

package/src/accounts/pollingTokenAccountSubscriber.ts

@@ -4,7 +4,7 @@ import {
 	TokenAccountEvents,
 	TokenAccountSubscriber,
 } from './types';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -5,7 +5,7 @@ import {
 	UserAccountEvents,
 	UserAccountSubscriber,
 } from './types';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';

package/src/accounts/pollingUserStatsAccountSubscriber.ts

@@ -5,7 +5,7 @@ import {
 	UserStatsAccountSubscriber,
 	UserStatsAccountEvents,
 } from './types';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';

package/src/accounts/webSocketAccountSubscriber.ts

@@ -1,5 +1,5 @@
 import { DataAndSlot, BufferAndSlot, AccountSubscriber } from './types';
-import { AnchorProvider, Program } from '@project-serum/anchor';
+import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { AccountInfo, Context, PublicKey } from '@solana/web3.js';
 import { capitalize } from './utils';
 import * as Buffer from 'buffer';

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -5,7 +5,7 @@ import {
 } from './types';
 import { AccountSubscriber, NotSubscribedError } from './types';
 import { SpotMarketAccount, PerpMarketAccount, StateAccount } from '../types';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import {

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -5,7 +5,7 @@ import {
 	UserAccountEvents,
 	UserAccountSubscriber,
 } from './types';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';

package/src/accounts/webSocketUserStatsAccountSubsriber.ts

@@ -5,7 +5,7 @@ import {
 	UserStatsAccountSubscriber,
 	UserStatsAccountEvents,
 } from './types';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';

package/src/addresses/pda.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
-import * as anchor from '@project-serum/anchor';
-import { BN } from '@project-serum/anchor';
+import * as anchor from '@coral-xyz/anchor';
+import { BN } from '@coral-xyz/anchor';
 
 export async function getDriftStateAccountPublicKeyAndNonce(
 	programId: PublicKey

package/src/adminClient.ts

@@ -14,8 +14,8 @@ import {
 	SpotFulfillmentConfigStatus,
 } from './types';
 import { DEFAULT_MARKET_NAME, encodeName } from './userName';
-import { BN } from '@project-serum/anchor';
-import * as anchor from '@project-serum/anchor';
+import { BN } from '@coral-xyz/anchor';
+import * as anchor from '@coral-xyz/anchor';
 import {
 	getDriftStateAccountPublicKeyAndNonce,
 	getSpotMarketPublicKey,
@@ -182,6 +182,7 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async initializePerpMarket(
+		marketIndex: number,
 		priceOracle: PublicKey,
 		baseAssetReserve: BN,
 		quoteAssetReserve: BN,
@@ -203,6 +204,7 @@ export class AdminClient extends DriftClient {
 		const nameBuffer = encodeName(name);
 		const initializeMarketTx =
 			await this.program.transaction.initializePerpMarket(
+				marketIndex,
 				baseAssetReserve,
 				quoteAssetReserve,
 				periodicity,
@@ -243,6 +245,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async deleteInitializedPerpMarket(
+		marketIndex: number
+	): Promise<TransactionSignature> {
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
+			this.program.programId,
+			marketIndex
+		);
+
+		const deleteInitializeMarketTx =
+			await this.program.transaction.deleteInitializedPerpMarket(marketIndex, {
+				accounts: {
+					state: await this.getStatePublicKey(),
+					admin: this.wallet.publicKey,
+					perpMarket: perpMarketPublicKey,
+				},
+			});
+
+		const { txSig } = await this.sendTransaction(
+			deleteInitializeMarketTx,
+			[],
+			this.opts
+		);
+
+		return txSig;
+	}
+
 	public async moveAmmPrice(
 		perpMarketIndex: number,
 		baseAssetReserve: BN,

package/src/constants/perpMarkets.ts

@@ -56,7 +56,7 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 	},
 	{
 		fullName: 'Bonk',
-		category: ['Meme'],
+		category: ['Meme', 'Dog'],
 		symbol: '1MBONK-PERP',
 		baseAssetSymbol: '1MBONK',
 		marketIndex: 4,
@@ -84,6 +84,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1679501812000, //todo
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Doge',
+		category: ['Meme', 'Dog'],
+		symbol: 'DOGE-PERP',
+		baseAssetSymbol: 'DOGE',
+		marketIndex: 7,
+		oracle: new PublicKey('4L6YhY8VvUgmqG5MvJkUJATtzB2rFqdrJwQCmFLv4Jzy'),
+		launchTs: 1680808053000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -157,6 +167,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1679501812000, //todo
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Doge',
+		category: ['Meme', 'Dog'],
+		symbol: 'DOGE-PERP',
+		baseAssetSymbol: 'DOGE',
+		marketIndex: 7,
+		oracle: new PublicKey('FsSM3s38PX9K7Dn6eGzuE29S2Dsk1Sss1baytTQdCaQj'),
+		launchTs: 1680808053000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/dlob/DLOBOrders.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
-import { Idl } from '@project-serum/anchor';
-import { IdlCoder } from '@project-serum/anchor/dist/cjs/coder/borsh/idl';
+import { Idl } from '@coral-xyz/anchor';
+import { IdlCoder } from '@coral-xyz/anchor/dist/cjs/coder/borsh/idl';
 import dlobIDL from './dlobIdl.json';
 import { Order } from '../types';