@drift-labs/sdk 2.25.4 → 2.26.0-beta.1

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.25.4",
+    "version": "2.26.0-beta.1",
     "name": "drift",
     "instructions": [
         {
@@ -2293,6 +2293,95 @@
                 }
             ]
         },
+        {
+            "name": "initializePhoenixFulfillmentConfig",
+            "accounts": [
+                {
+                    "name": "baseSpotMarket",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "quoteSpotMarket",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "state",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "phoenixProgram",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "phoenixMarket",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "driftSigner",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "phoenixFulfillmentConfig",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "admin",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "rent",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "marketIndex",
+                    "type": "u16"
+                }
+            ]
+        },
+        {
+            "name": "phoenixFulfillmentConfigStatus",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "phoenixFulfillmentConfig",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "admin",
+                    "isMut": true,
+                    "isSigner": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "status",
+                    "type": {
+                        "defined": "SpotFulfillmentConfigStatus"
+                    }
+                }
+            ]
+        },
         {
             "name": "updateSerumVault",
             "accounts": [
@@ -4002,6 +4091,140 @@
         }
     ],
     "accounts": [
+        {
+            "name": "PhoenixV1FulfillmentConfig",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "pubkey",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "phoenixProgramId",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "phoenixLogAuthority",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "phoenixMarket",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "phoenixBaseVault",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "phoenixQuoteVault",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "marketIndex",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "fulfillmentType",
+                        "type": {
+                            "defined": "SpotFulfillmentType"
+                        }
+                    },
+                    {
+                        "name": "status",
+                        "type": {
+                            "defined": "SpotFulfillmentConfigStatus"
+                        }
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u8",
+                                4
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "SerumV3FulfillmentConfig",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "pubkey",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumProgramId",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumMarket",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumRequestQueue",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumEventQueue",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumBids",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumAsks",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumBaseVault",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumQuoteVault",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumOpenOrders",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "serumSignerNonce",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "marketIndex",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "fulfillmentType",
+                        "type": {
+                            "defined": "SpotFulfillmentType"
+                        }
+                    },
+                    {
+                        "name": "status",
+                        "type": {
+                            "defined": "SpotFulfillmentConfigStatus"
+                        }
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u8",
+                                4
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "InsuranceFundStake",
             "type": {
@@ -4423,83 +4646,6 @@
                 ]
             }
         },
-        {
-            "name": "SerumV3FulfillmentConfig",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "pubkey",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumProgramId",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumMarket",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumRequestQueue",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumEventQueue",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumBids",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumAsks",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumBaseVault",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumQuoteVault",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumOpenOrders",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "serumSignerNonce",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "marketIndex",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "fulfillmentType",
-                        "type": {
-                            "defined": "SpotFulfillmentType"
-                        }
-                    },
-                    {
-                        "name": "status",
-                        "type": {
-                            "defined": "SpotFulfillmentConfigStatus"
-                        }
-                    },
-                    {
-                        "name": "padding",
-                        "type": {
-                            "array": [
-                                "u8",
-                                4
-                            ]
-                        }
-                    }
-                ]
-            }
-        },
         {
             "name": "State",
             "type": {
@@ -6212,6 +6358,9 @@
                     },
                     {
                         "name": "Match"
+                    },
+                    {
+                        "name": "PhoenixV1"
                     }
                 ]
             }
@@ -6462,6 +6611,9 @@
                     },
                     {
                         "name": "NoBorrowLiquidity"
+                    },
+                    {
+                        "name": "OrderFillWithPhoenix"
                     }
                 ]
             }
@@ -8531,13 +8683,13 @@
         },
         {
             "code": 6142,
-            "name": "FailedToFillOnSerum",
-            "msg": "FailedToFillOnSerum"
+            "name": "FailedToFillOnExternalMarket",
+            "msg": "FailedToFillOnExternalMarket"
         },
         {
             "code": 6143,
-            "name": "InvalidSerumFulfillmentConfig",
-            "msg": "InvalidSerumFulfillmentConfig"
+            "name": "InvalidFulfillmentConfig",
+            "msg": "InvalidFulfillmentConfig"
         },
         {
             "code": 6144,
@@ -9028,6 +9180,36 @@
             "code": 6241,
             "name": "InvalidSpotFulfillmentParams",
             "msg": "Invalid Spot Fulfillment Params"
+        },
+        {
+            "code": 6242,
+            "name": "FailedToGetMint",
+            "msg": "Failed to Get Mint"
+        },
+        {
+            "code": 6243,
+            "name": "FailedPhoenixCPI",
+            "msg": "FailedPhoenixCPI"
+        },
+        {
+            "code": 6244,
+            "name": "FailedToDeserializePhoenixMarket",
+            "msg": "FailedToDeserializePhoenixMarket"
+        },
+        {
+            "code": 6245,
+            "name": "InvalidPricePrecision",
+            "msg": "InvalidPricePrecision"
+        },
+        {
+            "code": 6246,
+            "name": "InvalidPhoenixProgram",
+            "msg": "InvalidPhoenixProgram"
+        },
+        {
+            "code": 6247,
+            "name": "InvalidPhoenixMarket",
+            "msg": "InvalidPhoenixMarket"
         }
     ]
 }

package/lib/index.d.ts

@@ -53,6 +53,8 @@ export * from './config';
 export * from './constants/numericConstants';
 export * from './serum/serumSubscriber';
 export * from './serum/serumFulfillmentConfigMap';
+export * from './phoenix/phoenixSubscriber';
+export * from './phoenix/phoenixFulfillmentConfigMap';
 export * from './tx/retryTxSender';
 export * from './util/computeUnits';
 export * from './util/tps';
@@ -64,6 +66,8 @@ export * from './dlob/DLOB';
 export * from './dlob/DLOBNode';
 export * from './dlob/DLOBOrders';
 export * from './dlob/NodeList';
+export * from './dlob/DLOBSubscriber';
+export * from './dlob/types';
 export * from './userMap/userMap';
 export * from './userMap/userStatsMap';
 export * from './math/bankruptcy';

package/lib/index.js

@@ -77,6 +77,8 @@ __exportStar(require("./config"), exports);
 __exportStar(require("./constants/numericConstants"), exports);
 __exportStar(require("./serum/serumSubscriber"), exports);
 __exportStar(require("./serum/serumFulfillmentConfigMap"), exports);
+__exportStar(require("./phoenix/phoenixSubscriber"), exports);
+__exportStar(require("./phoenix/phoenixFulfillmentConfigMap"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./util/computeUnits"), exports);
 __exportStar(require("./util/tps"), exports);
@@ -88,6 +90,8 @@ __exportStar(require("./dlob/DLOB"), exports);
 __exportStar(require("./dlob/DLOBNode"), exports);
 __exportStar(require("./dlob/DLOBOrders"), exports);
 __exportStar(require("./dlob/NodeList"), exports);
+__exportStar(require("./dlob/DLOBSubscriber"), exports);
+__exportStar(require("./dlob/types"), exports);
 __exportStar(require("./userMap/userMap"), exports);
 __exportStar(require("./userMap/userStatsMap"), exports);
 __exportStar(require("./math/bankruptcy"), exports);

package/lib/phoenix/phoenixFulfillmentConfigMap.d.ts

@@ -0,0 +1,10 @@
+import { PublicKey } from '@solana/web3.js';
+import { PhoenixV1FulfillmentConfigAccount } from '../types';
+import { DriftClient } from '../driftClient';
+export declare class PhoenixFulfillmentConfigMap {
+    driftClient: DriftClient;
+    map: Map<number, PhoenixV1FulfillmentConfigAccount>;
+    constructor(driftClient: DriftClient);
+    add(marketIndex: number, phoenixMarketAddress: PublicKey): Promise<void>;
+    get(marketIndex: number): PhoenixV1FulfillmentConfigAccount;
+}

package/lib/phoenix/phoenixFulfillmentConfigMap.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PhoenixFulfillmentConfigMap = void 0;
+class PhoenixFulfillmentConfigMap {
+    constructor(driftClient) {
+        this.map = new Map();
+        this.driftClient = driftClient;
+    }
+    async add(marketIndex, phoenixMarketAddress) {
+        const account = await this.driftClient.getPhoenixV1FulfillmentConfig(phoenixMarketAddress);
+        this.map.set(marketIndex, account);
+    }
+    get(marketIndex) {
+        return this.map.get(marketIndex);
+    }
+}
+exports.PhoenixFulfillmentConfigMap = PhoenixFulfillmentConfigMap;

package/lib/phoenix/phoenixSubscriber.d.ts

@@ -0,0 +1,34 @@
+import { Connection, PublicKey } from '@solana/web3.js';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
+import { MarketData, Client } from '@ellipsis-labs/phoenix-sdk';
+import { BN } from '@coral-xyz/anchor';
+export type PhoenixMarketSubscriberConfig = {
+    connection: Connection;
+    programId: PublicKey;
+    marketAddress: PublicKey;
+    accountSubscription: {
+        type: 'polling';
+        accountLoader: BulkAccountLoader;
+    } | {
+        type: 'websocket';
+    };
+};
+export declare class PhoenixSubscriber {
+    connection: Connection;
+    client: Client;
+    programId: PublicKey;
+    marketAddress: PublicKey;
+    subscriptionType: 'polling' | 'websocket';
+    accountLoader: BulkAccountLoader | undefined;
+    market: MarketData;
+    marketCallbackId: string | number;
+    clockCallbackId: string | number;
+    subscribed: boolean;
+    lastSlot: number;
+    lastUnixTimestamp: number;
+    constructor(config: PhoenixMarketSubscriberConfig);
+    subscribe(): Promise<void>;
+    getBestBid(): BN;
+    getBestAsk(): BN;
+    unsubscribe(): Promise<void>;
+}

package/lib/phoenix/phoenixSubscriber.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PhoenixSubscriber = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const phoenix_sdk_1 = require("@ellipsis-labs/phoenix-sdk");
+const numericConstants_1 = require("../constants/numericConstants");
+const anchor_1 = require("@coral-xyz/anchor");
+class PhoenixSubscriber {
+    constructor(config) {
+        this.connection = config.connection;
+        this.programId = config.programId;
+        this.marketAddress = config.marketAddress;
+        if (config.accountSubscription.type === 'polling') {
+            this.subscriptionType = 'polling';
+            this.accountLoader = config.accountSubscription.accountLoader;
+        }
+        else {
+            this.subscriptionType = 'websocket';
+        }
+        this.lastSlot = 0;
+        this.lastUnixTimestamp = 0;
+    }
+    async subscribe() {
+        if (this.subscribed) {
+            return;
+        }
+        this.market = (0, phoenix_sdk_1.deserializeMarketData)((await this.connection.getAccountInfo(this.marketAddress, 'confirmed'))
+            .data);
+        const clock = (0, phoenix_sdk_1.deserializeClockData)((await this.connection.getAccountInfo(web3_js_1.SYSVAR_CLOCK_PUBKEY, 'confirmed'))
+            .data);
+        this.lastUnixTimestamp = (0, phoenix_sdk_1.toNum)(clock.unixTimestamp);
+        if (this.subscriptionType === 'websocket') {
+            this.marketCallbackId = this.connection.onAccountChange(this.marketAddress, (accountInfo, _ctx) => {
+                this.market = (0, phoenix_sdk_1.deserializeMarketData)(accountInfo.data);
+            });
+            this.clockCallbackId = this.connection.onAccountChange(web3_js_1.SYSVAR_CLOCK_PUBKEY, (accountInfo, ctx) => {
+                this.lastSlot = ctx.slot;
+                const clock = (0, phoenix_sdk_1.deserializeClockData)(accountInfo.data);
+                this.lastUnixTimestamp = (0, phoenix_sdk_1.toNum)(clock.unixTimestamp);
+            });
+        }
+        else {
+            this.marketCallbackId = await this.accountLoader.addAccount(this.marketAddress, (buffer, slot) => {
+                this.lastSlot = slot;
+                this.market = (0, phoenix_sdk_1.deserializeMarketData)(buffer);
+            });
+            this.clockCallbackId = await this.accountLoader.addAccount(web3_js_1.SYSVAR_CLOCK_PUBKEY, (buffer, slot) => {
+                this.lastSlot = slot;
+                const clock = (0, phoenix_sdk_1.deserializeClockData)(buffer);
+                this.lastUnixTimestamp = (0, phoenix_sdk_1.toNum)(clock.unixTimestamp);
+            });
+        }
+        this.subscribed = true;
+    }
+    getBestBid() {
+        const ladder = (0, phoenix_sdk_1.getMarketUiLadder)(this.market, this.lastSlot, this.lastUnixTimestamp, 1);
+        return new anchor_1.BN(Math.floor(ladder.bids[0][0] * numericConstants_1.PRICE_PRECISION.toNumber()));
+    }
+    getBestAsk() {
+        const ladder = (0, phoenix_sdk_1.getMarketUiLadder)(this.market, this.lastSlot, this.lastUnixTimestamp, 1);
+        return new anchor_1.BN(Math.floor(ladder.asks[0][0] * numericConstants_1.PRICE_PRECISION.toNumber()));
+    }
+    async unsubscribe() {
+        if (!this.subscribed) {
+            return;
+        }
+        // remove listeners
+        if (this.subscriptionType === 'websocket') {
+            await this.connection.removeAccountChangeListener(this.marketCallbackId);
+            await this.connection.removeAccountChangeListener(this.clockCallbackId);
+        }
+        else {
+            this.accountLoader.removeAccount(this.marketAddress, this.marketCallbackId);
+            this.accountLoader.removeAccount(web3_js_1.SYSVAR_CLOCK_PUBKEY, this.clockCallbackId);
+        }
+        this.subscribed = false;
+    }
+}
+exports.PhoenixSubscriber = PhoenixSubscriber;

package/lib/slot/SlotSubscriber.js

@@ -8,6 +8,9 @@ class SlotSubscriber {
         this.eventEmitter = new events_1.EventEmitter();
     }
     async subscribe() {
+        if (this.subscriptionId) {
+            return;
+        }
         this.currentSlot = await this.connection.getSlot('confirmed');
         this.subscriptionId = this.connection.onSlotChange((slotInfo) => {
             this.currentSlot = slotInfo.slot;

package/lib/tx/retryTxSender.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { TxSender, TxSigAndSlot } from './types';
-import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
+import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
 import { AnchorProvider } from '@coral-xyz/anchor';
 type ResolveReference = {
     resolve?: () => void;
@@ -13,6 +13,7 @@ export declare class RetryTxSender implements TxSender {
     constructor(provider: AnchorProvider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
+    getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;

package/lib/tx/retryTxSender.js

@@ -39,7 +39,7 @@ class RetryTxSender {
         const signedTx = await this.provider.wallet.signTransaction(tx);
         return signedTx;
     }
-    async sendVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts) {
+    async getVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts) {
         if (additionalSigners === undefined) {
             additionalSigners = [];
         }
@@ -52,6 +52,10 @@ class RetryTxSender {
             instructions: ixs,
         }).compileToV0Message(lookupTableAccounts);
         const tx = new web3_js_1.VersionedTransaction(message);
+        return tx;
+    }
+    async sendVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts) {
+        const tx = await this.getVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts);
         // @ts-ignore
         tx.sign(additionalSigners.concat(this.provider.wallet.payer));
         return this.sendRawTransaction(tx.serialize(), opts);

package/lib/tx/types.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="node" />
 import { Provider } from '@coral-xyz/anchor';
-import { AddressLookupTableAccount, ConfirmOptions, Signer, Transaction, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
+import { AddressLookupTableAccount, ConfirmOptions, Signer, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
 export type TxSigAndSlot = {
     txSig: TransactionSignature;
     slot: number;
@@ -8,4 +9,6 @@ export interface TxSender {
     provider: Provider;
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     sendVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
+    sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
 }

package/lib/types.d.ts

@@ -1021,6 +1021,17 @@ export type SerumV3FulfillmentConfigAccount = {
     serumOpenOrders: PublicKey;
     serumSignerNonce: BN;
 };
+export type PhoenixV1FulfillmentConfigAccount = {
+    pubkey: PublicKey;
+    phoenixProgramId: PublicKey;
+    phoenixLogAuthority: PublicKey;
+    phoenixMarket: PublicKey;
+    phoenixBaseVault: PublicKey;
+    phoenixQuoteVault: PublicKey;
+    marketIndex: number;
+    fulfillmentType: SpotFulfillmentType;
+    status: SpotFulfillmentStatus;
+};
 export type ReferrerNameAccount = {
     name: number[];
     user: PublicKey;