@drift-labs/sdk 2.20.0-beta.0 → 2.20.0-beta.2

package/lib/accounts/bulkAccountLoader.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Commitment, Connection, PublicKey } from '@solana/web3.js';
 import { BufferAndSlot } from './types';
-declare type AccountToLoad = {
+type AccountToLoad = {
     publicKey: PublicKey;
     callbacks: Map<string, (buffer: Buffer, slot: number) => void>;
 };

package/lib/accounts/bulkAccountLoader.js

@@ -18,7 +18,7 @@ class BulkAccountLoader {
     }
     async addAccount(publicKey, callback) {
         const existingSize = this.accountsToLoad.size;
-        const callbackId = uuid_1.v4();
+        const callbackId = (0, uuid_1.v4)();
         const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
         if (existingAccountToLoad) {
             existingAccountToLoad.callbacks.set(callbackId, callback);
@@ -52,7 +52,7 @@ class BulkAccountLoader {
         }
     }
     addErrorCallbacks(callback) {
-        const callbackId = uuid_1.v4();
+        const callbackId = (0, uuid_1.v4)();
         this.errorCallbacks.set(callbackId, callback);
         return callbackId;
     }
@@ -114,7 +114,7 @@ class BulkAccountLoader {
                 args,
             });
         }
-        const rpcResponses = await promiseTimeout_1.promiseTimeout(
+        const rpcResponses = await (0, promiseTimeout_1.promiseTimeout)(
         // @ts-ignore
         this.connection._rpcBatchRequest(requests), 10 * 1000 // 30 second timeout
         );
@@ -131,8 +131,11 @@ class BulkAccountLoader {
             const accountsToLoad = accountsToLoadChunks[i];
             for (const j in accountsToLoad) {
                 const accountToLoad = accountsToLoad[j];
-                const key = accountToLoad.publicKey.toString();
+                const key = accountToLoad.publicKey.toBase58();
                 const oldRPCResponse = this.bufferAndSlotMap.get(key);
+                if (oldRPCResponse && newSlot <= oldRPCResponse.slot) {
+                    continue;
+                }
                 let newBuffer = undefined;
                 if (rpcResponse.result.value[j]) {
                     const raw = rpcResponse.result.value[j].data[0];
@@ -147,9 +150,6 @@ class BulkAccountLoader {
                     this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
                     continue;
                 }
-                if (newSlot <= oldRPCResponse.slot) {
-                    continue;
-                }
                 const oldBuffer = oldRPCResponse.buffer;
                 if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
                     this.bufferAndSlotMap.set(key, {

package/lib/accounts/fetch.d.ts

@@ -2,4 +2,5 @@ import { Connection, PublicKey } from '@solana/web3.js';
 import { UserAccount, UserStatsAccount } from '../types';
 import { Program } from '@project-serum/anchor';
 export declare function fetchUserAccounts(connection: Connection, program: Program, authority: PublicKey, limit?: number): Promise<(UserAccount | undefined)[]>;
+export declare function fetchUserAccountsUsingKeys(connection: Connection, program: Program, userAccountPublicKeys: PublicKey[]): Promise<(UserAccount | undefined)[]>;
 export declare function fetchUserStatsAccount(connection: Connection, program: Program, authority: PublicKey): Promise<UserStatsAccount | undefined>;

package/lib/accounts/fetch.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchUserStatsAccount = exports.fetchUserAccounts = void 0;
+exports.fetchUserStatsAccount = exports.fetchUserAccountsUsingKeys = exports.fetchUserAccounts = void 0;
 const pda_1 = require("../addresses/pda");
 async function fetchUserAccounts(connection, program, authority, limit = 8) {
     const userAccountPublicKeys = new Array();
     for (let i = 0; i < limit; i++) {
-        userAccountPublicKeys.push(await pda_1.getUserAccountPublicKey(program.programId, authority, i));
+        userAccountPublicKeys.push(await (0, pda_1.getUserAccountPublicKey)(program.programId, authority, i));
     }
+    return fetchUserAccountsUsingKeys(connection, program, userAccountPublicKeys);
+}
+exports.fetchUserAccounts = fetchUserAccounts;
+async function fetchUserAccountsUsingKeys(connection, program, userAccountPublicKeys) {
     const accountInfos = await connection.getMultipleAccountsInfo(userAccountPublicKeys, 'confirmed');
     return accountInfos.map((accountInfo) => {
         if (!accountInfo) {
@@ -15,9 +19,9 @@ async function fetchUserAccounts(connection, program, authority, limit = 8) {
         return program.account.user.coder.accounts.decode('User', accountInfo.data);
     });
 }
-exports.fetchUserAccounts = fetchUserAccounts;
+exports.fetchUserAccountsUsingKeys = fetchUserAccountsUsingKeys;
 async function fetchUserStatsAccount(connection, program, authority) {
-    const userStatsPublicKey = pda_1.getUserStatsAccountPublicKey(program.programId, authority);
+    const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(program.programId, authority);
     const accountInfo = await connection.getAccountInfo(userStatsPublicKey, 'confirmed');
     return accountInfo
         ? program.account.user.coder.accounts.decode('UserStats', accountInfo.data)

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -58,7 +58,7 @@ class PollingDriftClientAccountSubscriber {
         if (this.accountsToPoll.size > 0) {
             return;
         }
-        const statePublicKey = await pda_1.getDriftStateAccountPublicKey(this.program.programId);
+        const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
         this.accountsToPoll.set(statePublicKey.toString(), {
             key: 'state',
             publicKey: statePublicKey,
@@ -74,7 +74,7 @@ class PollingDriftClientAccountSubscriber {
         return true;
     }
     async addPerpMarketAccountToPoll(marketIndex) {
-        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, marketIndex);
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         this.accountsToPoll.set(perpMarketPublicKey.toString(), {
             key: 'perpMarket',
             publicKey: perpMarketPublicKey,
@@ -90,7 +90,7 @@ class PollingDriftClientAccountSubscriber {
         return true;
     }
     async addSpotMarketAccountToPoll(marketIndex) {
-        const marketPublicKey = await pda_1.getSpotMarketPublicKey(this.program.programId, marketIndex);
+        const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
         this.accountsToPoll.set(marketPublicKey.toString(), {
             key: 'spotMarket',
             publicKey: marketPublicKey,
@@ -129,7 +129,7 @@ class PollingDriftClientAccountSubscriber {
         accountToPoll.callbackId = await this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
             if (!buffer)
                 return;
-            const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+            const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
             const dataAndSlot = {
                 data: account,
                 slot,
@@ -168,7 +168,7 @@ class PollingDriftClientAccountSubscriber {
         for (const [_, accountToPoll] of this.accountsToPoll) {
             const { buffer, slot } = this.accountLoader.getBufferAndSlot(accountToPoll.publicKey);
             if (buffer) {
-                const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 if (accountToPoll.mapKey != undefined) {
                     this[accountToPoll.key].set(accountToPoll.mapKey, {
                         data: account,
@@ -214,7 +214,7 @@ class PollingDriftClientAccountSubscriber {
         this.isSubscribed = false;
     }
     async addSpotMarket(marketIndex) {
-        const marketPublicKey = await pda_1.getSpotMarketPublicKey(this.program.programId, marketIndex);
+        const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
         if (this.accountsToPoll.has(marketPublicKey.toString())) {
             return true;
         }
@@ -224,7 +224,7 @@ class PollingDriftClientAccountSubscriber {
         return true;
     }
     async addPerpMarket(marketIndex) {
-        const marketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, marketIndex);
+        const marketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         if (this.accountsToPoll.has(marketPublicKey.toString())) {
             return true;
         }

package/lib/accounts/pollingTokenAccountSubscriber.js

@@ -34,7 +34,7 @@ class PollingTokenAccountSubscriber {
             return;
         }
         this.callbackId = await this.accountLoader.addAccount(this.publicKey, (buffer, slot) => {
-            const tokenAccount = token_1.parseTokenAccount(buffer);
+            const tokenAccount = (0, token_1.parseTokenAccount)(buffer);
             this.tokenAccountAndSlot = { data: tokenAccount, slot };
             // @ts-ignore
             this.eventEmitter.emit('tokenAccountUpdate', tokenAccount);
@@ -47,7 +47,7 @@ class PollingTokenAccountSubscriber {
     async fetch() {
         await this.accountLoader.load();
         const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.publicKey);
-        this.tokenAccountAndSlot = { data: token_1.parseTokenAccount(buffer), slot };
+        this.tokenAccountAndSlot = { data: (0, token_1.parseTokenAccount)(buffer), slot };
     }
     async unsubscribe() {
         if (!this.isSubscribed) {

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -39,7 +39,7 @@ class PollingUserAccountSubscriber {
                 if (!buffer) {
                     return;
                 }
-                const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 this[accountToPoll.key] = { data: account, slot };
                 // @ts-ignore
                 this.eventEmitter.emit(accountToPoll.eventType, account);
@@ -67,7 +67,7 @@ class PollingUserAccountSubscriber {
         for (const [_, accountToPoll] of this.accountsToPoll) {
             const { buffer, slot } = this.accountLoader.getBufferAndSlot(accountToPoll.publicKey);
             if (buffer) {
-                const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 this[accountToPoll.key] = { data: account, slot };
             }
         }

package/lib/accounts/pollingUserStatsAccountSubscriber.js

@@ -39,7 +39,7 @@ class PollingUserStatsAccountSubscriber {
                 if (!buffer) {
                     return;
                 }
-                const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 this[accountToPoll.key] = { data: account, slot };
                 // @ts-ignore
                 this.eventEmitter.emit(accountToPoll.eventType, account);
@@ -67,7 +67,7 @@ class PollingUserStatsAccountSubscriber {
         for (const [_, accountToPoll] of this.accountsToPoll) {
             const { buffer, slot } = this.accountLoader.getBufferAndSlot(accountToPoll.publicKey);
             if (buffer) {
-                const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 this[accountToPoll.key] = { data: account, slot };
             }
         }

package/lib/accounts/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -79,23 +80,23 @@ export interface OracleAccountSubscriber {
     unsubscribe(): Promise<void>;
     getOraclePriceData(): DataAndSlot<OraclePriceData>;
 }
-export declare type AccountToPoll = {
+export type AccountToPoll = {
     key: string;
     publicKey: PublicKey;
     eventType: string;
     callbackId?: string;
     mapKey?: number;
 };
-export declare type OraclesToPoll = {
+export type OraclesToPoll = {
     publicKey: PublicKey;
     source: OracleSource;
     callbackId?: string;
 };
-export declare type BufferAndSlot = {
+export type BufferAndSlot = {
     slot: number;
     buffer: Buffer | undefined;
 };
-export declare type DataAndSlot<T> = {
+export type DataAndSlot<T> = {
     data: T;
     slot: number;
 };

package/lib/accounts/webSocketAccountSubscriber.js

@@ -77,7 +77,7 @@ class WebSocketAccountSubscriber {
             return this.decodeBufferFn(buffer);
         }
         else {
-            return this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), buffer);
+            return this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), buffer);
         }
     }
     unsubscribe() {

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -33,7 +33,7 @@ class WebSocketDriftClientAccountSubscriber {
         this.subscriptionPromise = new Promise((res) => {
             this.subscriptionPromiseResolver = res;
         });
-        const statePublicKey = await pda_1.getDriftStateAccountPublicKey(this.program.programId);
+        const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
         // create and activate main state account subscription
         this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey);
         await this.stateAccountSubscriber.subscribe((data) => {
@@ -59,7 +59,7 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async subscribeToPerpMarketAccount(marketIndex) {
-        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, marketIndex);
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('perpMarketAccountUpdate', data);
@@ -75,7 +75,7 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async subscribeToSpotMarketAccount(marketIndex) {
-        const marketPublicKey = await pda_1.getSpotMarketPublicKey(this.program.programId, marketIndex);
+        const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('spotMarketAccountUpdate', data);

package/lib/addresses/marketAddresses.js

@@ -8,7 +8,7 @@ async function getMarketAddress(programId, marketIndex) {
     if (CACHE.has(cacheKey)) {
         return CACHE.get(cacheKey);
     }
-    const publicKey = await pda_1.getPerpMarketPublicKey(programId, marketIndex);
+    const publicKey = await (0, pda_1.getPerpMarketPublicKey)(programId, marketIndex);
     CACHE.set(cacheKey, publicKey);
     return publicKey;
 }

package/lib/addresses/pda.d.ts

@@ -16,3 +16,4 @@ export declare function getDriftSignerPublicKey(programId: PublicKey): PublicKey
 export declare function getSerumOpenOrdersPublicKey(programId: PublicKey, market: PublicKey): PublicKey;
 export declare function getSerumSignerPublicKey(programId: PublicKey, market: PublicKey, nonce: BN): PublicKey;
 export declare function getSerumFulfillmentConfigPublicKey(programId: PublicKey, market: PublicKey): PublicKey;
+export declare function getReferrerNamePublicKeySync(programId: PublicKey, nameBuffer: number[]): PublicKey;

package/lib/addresses/pda.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getReferrerNamePublicKeySync = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@project-serum/anchor"));
 async function getDriftStateAccountPublicKeyAndNonce(programId) {
@@ -115,3 +119,10 @@ function getSerumFulfillmentConfigPublicKey(programId, market) {
     ], programId)[0];
 }
 exports.getSerumFulfillmentConfigPublicKey = getSerumFulfillmentConfigPublicKey;
+function getReferrerNamePublicKeySync(programId, nameBuffer) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('referrer_name')),
+        Buffer.from(nameBuffer),
+    ], programId)[0];
+}
+exports.getReferrerNamePublicKeySync = getReferrerNamePublicKeySync;