@drift-labs/sdk 2.100.0-beta.1 → 2.100.0-beta.11

package/VERSION

@@ -1 +1 @@
-2.100.0-beta.1
+2.100.0-beta.11

package/lib/browser/constants/perpMarkets.js

@@ -310,6 +310,16 @@ exports.DevnetPerpMarkets = [
         launchTs: 1722214583000,
         oracleSource: __1.OracleSource.Prelaunch,
     },
+    {
+        fullName: 'RANDOM-2024',
+        category: ['Prediction'],
+        symbol: 'RANDOM-2024-PREDICT',
+        baseAssetSymbol: 'RANDOM-2024',
+        marketIndex: 28,
+        oracle: new web3_js_1.PublicKey('sDAQaZQJQ4RXAxH3x526mbEXyQZT15ktkL84d7hmk7M'),
+        launchTs: 1729622442000,
+        oracleSource: __1.OracleSource.Prelaunch,
+    },
 ];
 exports.MainnetPerpMarkets = [
     {

package/lib/browser/constants/spotMarkets.js

@@ -106,6 +106,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.EIGHT,
         serumMarket: new web3_js_1.PublicKey('BbJgE7HZMaDp5NTYvRh5jZSkQPVDTU8ubPFtpogUkEj4'),
         phoenixMarket: new web3_js_1.PublicKey('Ew3vFDdtdGrknJAVVfraxCA37uNJtimXYPY4QjnfhFHH'),
+        openbookMarket: new web3_js_1.PublicKey('AT1R2jUNb9iTo4EaRfKSTPiNTX4Jb64KSwnVmig6Hu4t'),
         pythFeedId: '0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
     },
     {
@@ -354,6 +355,16 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.SIX,
         pythFeedId: '0x62742a997d01f7524f791fdb2dd43aaf0e567d765ebf8fd0406a994239e874d4',
     },
+    {
+        symbol: 'cbBTC',
+        marketIndex: 27,
+        oracle: new web3_js_1.PublicKey('486kr3pmFPfTsS4aZgcsQ7kS4i9rjMsYYZup6HQNSTT4'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        mint: new web3_js_1.PublicKey('cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij'),
+        precision: new __1.BN(10).pow(numericConstants_1.EIGHT),
+        precisionExp: numericConstants_1.EIGHT,
+        pythFeedId: '0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,

package/lib/browser/dlob/DLOB.d.ts

@@ -84,7 +84,25 @@ export declare class DLOB {
     protected getBestNode(generatorList: Array<Generator<DLOBNode>>, oraclePriceData: OraclePriceData, slot: number, compareFcn: (bestDLOBNode: DLOBNode, currentDLOBNode: DLOBNode, slot: number, oraclePriceData: OraclePriceData) => boolean, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     getRestingLimitAsks(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     getRestingLimitBids(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
+    /**
+     * This will look at both the taking and resting limit asks
+     * @param marketIndex
+     * @param fallbackAsk
+     * @param slot
+     * @param marketType
+     * @param oraclePriceData
+     * @param filterFcn
+     */
     getAsks(marketIndex: number, fallbackAsk: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
+    /**
+     * This will look at both the taking and resting limit bids
+     * @param marketIndex
+     * @param fallbackBid
+     * @param slot
+     * @param marketType
+     * @param oraclePriceData
+     * @param filterFcn
+     */
     getBids(marketIndex: number, fallbackBid: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     findCrossingRestingLimitOrders(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): NodeToFill[];
     determineMakerAndTaker(askNode: DLOBNode, bidNode: DLOBNode): {

package/lib/browser/dlob/DLOB.js

@@ -675,6 +675,15 @@ class DLOB {
                 .gt(currentNode.getPrice(oraclePriceData, slot));
         }, filterFcn);
     }
+    /**
+     * This will look at both the taking and resting limit asks
+     * @param marketIndex
+     * @param fallbackAsk
+     * @param slot
+     * @param marketType
+     * @param oraclePriceData
+     * @param filterFcn
+     */
     *getAsks(marketIndex, fallbackAsk, slot, marketType, oraclePriceData, filterFcn) {
         if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot asks');
@@ -688,26 +697,24 @@ class DLOB {
             generatorList.push((0, NodeList_1.getVammNodeGenerator)(fallbackAsk));
         }
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
-            const bestNodeTaking = bestNode.order
-                ? (0, __1.isTakingOrder)(bestNode.order, slot)
-                : false;
-            const currentNodeTaking = currentNode.order
-                ? (0, __1.isTakingOrder)(currentNode.order, slot)
-                : false;
-            if (bestNodeTaking && currentNodeTaking) {
+            var _a, _b;
+            const bestNodePrice = (_a = bestNode.getPrice(oraclePriceData, slot)) !== null && _a !== void 0 ? _a : __1.ZERO;
+            const currentNodePrice = (_b = currentNode.getPrice(oraclePriceData, slot)) !== null && _b !== void 0 ? _b : __1.ZERO;
+            if (bestNodePrice.eq(currentNodePrice)) {
                 return bestNode.order.slot.lt(currentNode.order.slot);
             }
-            if (bestNodeTaking) {
-                return true;
-            }
-            if (currentNodeTaking) {
-                return false;
-            }
-            return bestNode
-                .getPrice(oraclePriceData, slot)
-                .lt(currentNode.getPrice(oraclePriceData, slot));
+            return bestNodePrice.lt(currentNodePrice);
         }, filterFcn);
     }
+    /**
+     * This will look at both the taking and resting limit bids
+     * @param marketIndex
+     * @param fallbackBid
+     * @param slot
+     * @param marketType
+     * @param oraclePriceData
+     * @param filterFcn
+     */
     *getBids(marketIndex, fallbackBid, slot, marketType, oraclePriceData, filterFcn) {
         if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot bids');
@@ -721,24 +728,13 @@ class DLOB {
             generatorList.push((0, NodeList_1.getVammNodeGenerator)(fallbackBid));
         }
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
-            const bestNodeTaking = bestNode.order
-                ? (0, __1.isTakingOrder)(bestNode.order, slot)
-                : false;
-            const currentNodeTaking = currentNode.order
-                ? (0, __1.isTakingOrder)(currentNode.order, slot)
-                : false;
-            if (bestNodeTaking && currentNodeTaking) {
+            var _a, _b;
+            const bestNodePrice = (_a = bestNode.getPrice(oraclePriceData, slot)) !== null && _a !== void 0 ? _a : __1.BN_MAX;
+            const currentNodePrice = (_b = currentNode.getPrice(oraclePriceData, slot)) !== null && _b !== void 0 ? _b : __1.BN_MAX;
+            if (bestNodePrice.eq(currentNodePrice)) {
                 return bestNode.order.slot.lt(currentNode.order.slot);
             }
-            if (bestNodeTaking) {
-                return true;
-            }
-            if (currentNodeTaking) {
-                return false;
-            }
-            return bestNode
-                .getPrice(oraclePriceData, slot)
-                .gt(currentNode.getPrice(oraclePriceData, slot));
+            return bestNodePrice.gt(currentNodePrice);
         }, filterFcn);
     }
     findCrossingRestingLimitOrders(marketIndex, slot, marketType, oraclePriceData) {

package/lib/browser/driftClient.d.ts

@@ -141,8 +141,10 @@ export declare class DriftClient {
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
     initializeRFQUser(userAccountPublicKey: PublicKey, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
     getInitializeRFQUserInstruction(userAccountPublicKey: PublicKey): Promise<[PublicKey, TransactionInstruction]>;
-    initializeSwiftUserOrdersAccount(userAccountPublicKey: PublicKey, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
-    getInitializeSwiftUserOrdersAccountInstruction(userAccountPublicKey: PublicKey): Promise<[PublicKey, TransactionInstruction]>;
+    initializeSwiftUserOrders(userAccountPublicKey: PublicKey, numOrders: number, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
+    getInitializeSwiftUserOrdersAccountIx(userAccountPublicKey: PublicKey, numOrders: number): Promise<[PublicKey, TransactionInstruction]>;
+    resizeSwiftUserOrders(userAccountPublicKey: PublicKey, numOrders: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getResizeSwiftUserOrdersInstruction(userAccountPublicKey: PublicKey, numOrders: number): Promise<TransactionInstruction>;
     getInitializeUserInstructions(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
     getNextSubAccountId(): Promise<number>;
     initializeReferrerName(name: string): Promise<TransactionSignature>;
@@ -503,8 +505,6 @@ export declare class DriftClient {
     getUpdateUserFuelBonusIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, userAuthority: PublicKey): Promise<TransactionInstruction>;
     updateUserStatsReferrerStatus(userAuthority: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
     getUpdateUserStatsReferrerStatusIx(userAuthority: PublicKey): Promise<TransactionInstruction>;
-    updateUserStatsReferrerInfo(userStatsAccountPublicKey: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
-    getUpdateUserStatsReferrerInfoIx(userStatsAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     updateUserOpenOrdersCount(userAccountPublicKey: PublicKey, user: UserAccount, txParams?: TxParams, fillerPublicKey?: PublicKey): Promise<TransactionSignature>;
     getUpdateUserOpenOrdersCountIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, fillerPublicKey?: PublicKey): Promise<TransactionInstruction>;
     placeAndTakePerpOrder(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;

package/lib/browser/driftClient.js

@@ -600,17 +600,17 @@ class DriftClient {
         });
         return [rfqUserAccountPublicKey, initializeUserAccountIx];
     }
-    async initializeSwiftUserOrdersAccount(userAccountPublicKey, txParams) {
+    async initializeSwiftUserOrders(userAccountPublicKey, numOrders, txParams) {
         const initializeIxs = [];
-        const [swiftUserAccountPublicKey, initializeUserAccountIx] = await this.getInitializeSwiftUserOrdersAccountInstruction(userAccountPublicKey);
+        const [swiftUserAccountPublicKey, initializeUserAccountIx] = await this.getInitializeSwiftUserOrdersAccountIx(userAccountPublicKey, numOrders);
         initializeIxs.push(initializeUserAccountIx);
         const tx = await this.buildTransaction(initializeIxs, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return [txSig, swiftUserAccountPublicKey];
     }
-    async getInitializeSwiftUserOrdersAccountInstruction(userAccountPublicKey) {
+    async getInitializeSwiftUserOrdersAccountIx(userAccountPublicKey, numOrders) {
         const swiftUserAccountPublicKey = (0, pda_1.getSwiftUserAccountPublicKey)(this.program.programId, userAccountPublicKey);
-        const initializeUserAccountIx = await this.program.instruction.initializeSwiftUserOrders({
+        const initializeUserAccountIx = await this.program.instruction.initializeSwiftUserOrders(numOrders, {
             accounts: {
                 swiftUserOrders: swiftUserAccountPublicKey,
                 authority: this.wallet.publicKey,
@@ -622,6 +622,24 @@ class DriftClient {
         });
         return [swiftUserAccountPublicKey, initializeUserAccountIx];
     }
+    async resizeSwiftUserOrders(userAccountPublicKey, numOrders, txParams) {
+        const resizeUserAccountIx = await this.getResizeSwiftUserOrdersInstruction(userAccountPublicKey, numOrders);
+        const tx = await this.buildTransaction([resizeUserAccountIx], txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getResizeSwiftUserOrdersInstruction(userAccountPublicKey, numOrders) {
+        const swiftUserAccountPublicKey = (0, pda_1.getSwiftUserAccountPublicKey)(this.program.programId, userAccountPublicKey);
+        const resizeUserAccountIx = await this.program.instruction.resizeSwiftUserOrders(numOrders, {
+            accounts: {
+                swiftUserOrders: swiftUserAccountPublicKey,
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                systemProgram: anchor.web3.SystemProgram.programId,
+            },
+        });
+        return resizeUserAccountIx;
+    }
     async getInitializeUserInstructions(subAccountId = 0, name, referrerInfo) {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, subAccountId);
         const remainingAccounts = new Array();
@@ -2824,20 +2842,7 @@ class DriftClient {
     }
     async getUpdateUserStatsReferrerStatusIx(userAuthority) {
         const userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAuthority);
-        return await this.program.instruction.updateStatsReferrerStatus({
-            accounts: {
-                state: await this.getStatePublicKey(),
-                userStats: userStatsAccountPublicKey,
-                authority: this.wallet.publicKey,
-            },
-        });
-    }
-    async updateUserStatsReferrerInfo(userStatsAccountPublicKey, txParams) {
-        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateUserStatsReferrerInfoIx(userStatsAccountPublicKey), txParams), [], this.opts);
-        return txSig;
-    }
-    async getUpdateUserStatsReferrerInfoIx(userStatsAccountPublicKey) {
-        return await this.program.instruction.updateUserStatsReferrerInfo({
+        return await this.program.instruction.updateUserStatsReferrerStatus({
             accounts: {
                 state: await this.getStatePublicKey(),
                 userStats: userStatsAccountPublicKey,
@@ -4219,14 +4224,10 @@ class DriftClient {
             else {
                 marketAccount = this.getSpotMarketAccount(marketIndex);
             }
-            let takeFeeAdjustment;
+            takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
             if (user && user.isHighLeverageMode()) {
-                takeFeeAdjustment = 100;
-            }
-            else {
-                takeFeeAdjustment = marketAccount.feeAdjustment;
+                takerFee *= 2;
             }
-            takerFee += (takerFee * takeFeeAdjustment) / 100;
             makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
         }
         return {

package/lib/browser/idl/drift.json

@@ -144,7 +144,7 @@
                 },
                 {
                     "name": "user",
-                    "isMut": true,
+                    "isMut": false,
                     "isSigner": false
                 },
                 {
@@ -163,7 +163,43 @@
                     "isSigner": false
                 }
             ],
-            "args": []
+            "args": [
+                {
+                    "name": "numOrders",
+                    "type": "u16"
+                }
+            ]
+        },
+        {
+            "name": "resizeSwiftUserOrders",
+            "accounts": [
+                {
+                    "name": "swiftUserOrders",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "user",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "numOrders",
+                    "type": "u16"
+                }
+            ]
         },
         {
             "name": "initializeReferrerName",
@@ -7615,6 +7651,9 @@
         },
         {
             "name": "SwiftUserOrders",
+            "docs": [
+                "* This struct is a duplicate of SwiftUserOrdersZeroCopy\n * It is used to give anchor an struct to generate the idl for clients\n * The struct SwiftUserOrdersZeroCopy is used to load the data in efficiently"
+            ],
             "type": {
                 "kind": "struct",
                 "fields": [
@@ -7622,15 +7661,16 @@
                         "name": "userPubkey",
                         "type": "publicKey"
                     },
+                    {
+                        "name": "padding",
+                        "type": "u32"
+                    },
                     {
                         "name": "swiftOrderData",
                         "type": {
-                            "array": [
-                                {
-                                    "defined": "SwiftOrderId"
-                                },
-                                32
-                            ]
+                            "vec": {
+                                "defined": "SwiftOrderId"
+                            }
                         }
                     }
                 ]
@@ -9836,6 +9876,30 @@
                     {
                         "name": "orderId",
                         "type": "u32"
+                    },
+                    {
+                        "name": "padding",
+                        "type": "u32"
+                    }
+                ]
+            }
+        },
+        {
+            "name": "SwiftUserOrdersFixed",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "userPubkey",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "padding",
+                        "type": "u32"
+                    },
+                    {
+                        "name": "len",
+                        "type": "u32"
                     }
                 ]
             }

package/lib/browser/index.d.ts

@@ -92,6 +92,7 @@ export * from './tx/forwardOnlyTxSender';
 export * from './tx/types';
 export * from './tx/txHandler';
 export * from './util/computeUnits';
+export * from './util/digest';
 export * from './util/tps';
 export * from './util/promiseTimeout';
 export * from './util/pythPullOracleUtils';

package/lib/browser/index.js

@@ -115,6 +115,7 @@ __exportStar(require("./tx/forwardOnlyTxSender"), exports);
 __exportStar(require("./tx/types"), exports);
 __exportStar(require("./tx/txHandler"), exports);
 __exportStar(require("./util/computeUnits"), exports);
+__exportStar(require("./util/digest"), exports);
 __exportStar(require("./util/tps"), exports);
 __exportStar(require("./util/promiseTimeout"), exports);
 __exportStar(require("./util/pythPullOracleUtils"), exports);

package/lib/browser/math/oracles.js

@@ -10,7 +10,7 @@ function oraclePriceBands(market, oraclePriceData) {
     const offset = oraclePriceData.price
         .mul(new index_1.BN(maxPercentDiff))
         .div(numericConstants_1.MARGIN_PRECISION);
-    (0, assert_1.assert)(offset.gt(numericConstants_1.ZERO));
+    (0, assert_1.assert)(offset.gte(numericConstants_1.ZERO));
     return [oraclePriceData.price.sub(offset), oraclePriceData.price.add(offset)];
 }
 exports.oraclePriceBands = oraclePriceBands;

package/lib/browser/types.d.ts

@@ -13,7 +13,8 @@ export declare enum ExchangeStatus {
     LIQ_PAUSED = 16,
     FUNDING_PAUSED = 32,
     SETTLE_PNL_PAUSED = 64,
-    PAUSED = 127
+    AMM_IMMEDIATE_FILL_PAUSED = 128,
+    PAUSED = 255
 }
 export declare class MarketStatus {
     static readonly INITIALIZED: {

package/lib/browser/types.js

@@ -13,7 +13,8 @@ var ExchangeStatus;
     ExchangeStatus[ExchangeStatus["LIQ_PAUSED"] = 16] = "LIQ_PAUSED";
     ExchangeStatus[ExchangeStatus["FUNDING_PAUSED"] = 32] = "FUNDING_PAUSED";
     ExchangeStatus[ExchangeStatus["SETTLE_PNL_PAUSED"] = 64] = "SETTLE_PNL_PAUSED";
-    ExchangeStatus[ExchangeStatus["PAUSED"] = 127] = "PAUSED";
+    ExchangeStatus[ExchangeStatus["AMM_IMMEDIATE_FILL_PAUSED"] = 128] = "AMM_IMMEDIATE_FILL_PAUSED";
+    ExchangeStatus[ExchangeStatus["PAUSED"] = 255] = "PAUSED";
 })(ExchangeStatus = exports.ExchangeStatus || (exports.ExchangeStatus = {}));
 class MarketStatus {
 }

package/lib/browser/userMap/referrerMap.d.ts

@@ -1,17 +1,17 @@
 import { MemcmpFilter } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { DriftClient } from '../driftClient';
 import { ReferrerInfo } from '../types';
 export declare class ReferrerMap {
     /**
-     * map from authority pubkey to ReferrerInfo.
-     * - if a user has not been entered into the map, the value is undefined
-     * - if a user has no referrer, the value is null
-     * - if a user has a referrer, the value is a ReferrerInfo object
+     * map from authority pubkey to referrer pubkey.
      */
-    private referrerMap;
+    private authorityReferrerMap;
+    /**
+     * map from referrer pubkey to ReferrerInfo.
+     * Will be undefined if the referrer is not in the map yet.
+     */
+    private referrerReferrerInfoMap;
     private driftClient;
-    private bulkAccountLoader;
     private parallelSync;
     private fetchPromise?;
     private fetchPromiseResolver;
@@ -19,16 +19,15 @@ export declare class ReferrerMap {
      * Creates a new UserStatsMap instance.
      *
      * @param {DriftClient} driftClient - The DriftClient instance.
-     * @param {BulkAccountLoader} [bulkAccountLoader] - If not provided, a new BulkAccountLoader with polling disabled will be created.
      */
-    constructor(driftClient: DriftClient, bulkAccountLoader?: BulkAccountLoader, parallelSync?: boolean);
+    constructor(driftClient: DriftClient, parallelSync?: boolean);
     /**
      * Subscribe to all UserStats accounts.
      */
     subscribe(): Promise<void>;
     has(authorityPublicKey: string): boolean;
     get(authorityPublicKey: string): ReferrerInfo | undefined;
-    addReferrerInfo(authority: string, referrerInfo?: ReferrerInfo | null): Promise<void>;
+    addReferrer(authority: string, referrer?: string): Promise<void>;
     /**
      * Enforce that a UserStats will exist for the given authorityPublicKey,
      * reading one from the blockchain if necessary.
@@ -36,8 +35,9 @@ export declare class ReferrerMap {
      * @returns
      */
     mustGet(authorityPublicKey: string): Promise<ReferrerInfo | undefined>;
-    values(): IterableIterator<ReferrerInfo | null>;
+    getReferrer(authorityPublicKey: string): ReferrerInfo | undefined;
     size(): number;
+    numberOfReferred(): number;
     sync(): Promise<void>;
     syncAll(): Promise<void>;
     syncReferrer(referrerFilter: MemcmpFilter): Promise<void>;

package/lib/browser/userMap/referrerMap.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferrerMap = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const bulkAccountLoader_1 = require("../accounts/bulkAccountLoader");
 const pda_1 = require("../addresses/pda");
 const memcmp_1 = require("../memcmp");
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
@@ -12,21 +11,18 @@ class ReferrerMap {
      * Creates a new UserStatsMap instance.
      *
      * @param {DriftClient} driftClient - The DriftClient instance.
-     * @param {BulkAccountLoader} [bulkAccountLoader] - If not provided, a new BulkAccountLoader with polling disabled will be created.
      */
-    constructor(driftClient, bulkAccountLoader, parallelSync) {
+    constructor(driftClient, parallelSync) {
         /**
-         * map from authority pubkey to ReferrerInfo.
-         * - if a user has not been entered into the map, the value is undefined
-         * - if a user has no referrer, the value is null
-         * - if a user has a referrer, the value is a ReferrerInfo object
+         * map from authority pubkey to referrer pubkey.
          */
-        this.referrerMap = new Map();
+        this.authorityReferrerMap = new Map();
+        /**
+         * map from referrer pubkey to ReferrerInfo.
+         * Will be undefined if the referrer is not in the map yet.
+         */
+        this.referrerReferrerInfoMap = new Map();
         this.driftClient = driftClient;
-        if (!bulkAccountLoader) {
-            bulkAccountLoader = new bulkAccountLoader_1.BulkAccountLoader(driftClient.connection, driftClient.opts.commitment, 0);
-        }
-        this.bulkAccountLoader = bulkAccountLoader;
         this.parallelSync = parallelSync !== undefined ? parallelSync : true;
     }
     /**
@@ -40,27 +36,20 @@ class ReferrerMap {
         await this.sync();
     }
     has(authorityPublicKey) {
-        return this.referrerMap.has(authorityPublicKey);
+        return this.authorityReferrerMap.has(authorityPublicKey);
     }
     get(authorityPublicKey) {
-        const info = this.referrerMap.get(authorityPublicKey);
-        return info === null ? undefined : info;
+        return this.getReferrer(authorityPublicKey);
     }
-    async addReferrerInfo(authority, referrerInfo) {
-        if (referrerInfo || referrerInfo === null) {
-            this.referrerMap.set(authority, referrerInfo);
+    async addReferrer(authority, referrer) {
+        if (referrer) {
+            this.authorityReferrerMap.set(authority, referrer);
         }
-        else if (referrerInfo === undefined) {
+        else if (referrer === undefined) {
             const userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, new web3_js_1.PublicKey(authority));
             const buffer = (await this.driftClient.connection.getAccountInfo(userStatsAccountPublicKey, 'processed')).data;
             const referrer = bytes_1.bs58.encode(buffer.subarray(40, 72));
-            const referrerKey = new web3_js_1.PublicKey(referrer);
-            this.addReferrerInfo(authority, referrer === DEFAULT_PUBLIC_KEY
-                ? null
-                : {
-                    referrer: (0, pda_1.getUserAccountPublicKeySync)(this.driftClient.program.programId, referrerKey, 0),
-                    referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, referrerKey),
-                });
+            this.addReferrer(authority, referrer);
         }
     }
     /**
@@ -71,15 +60,35 @@ class ReferrerMap {
      */
     async mustGet(authorityPublicKey) {
         if (!this.has(authorityPublicKey)) {
-            await this.addReferrerInfo(authorityPublicKey);
+            await this.addReferrer(authorityPublicKey);
         }
-        return this.get(authorityPublicKey);
+        return this.getReferrer(authorityPublicKey);
     }
-    values() {
-        return this.referrerMap.values();
+    getReferrer(authorityPublicKey) {
+        const referrer = this.authorityReferrerMap.get(authorityPublicKey);
+        if (!referrer) {
+            // return undefined if the referrer is not in the map
+            return undefined;
+        }
+        if (referrer === DEFAULT_PUBLIC_KEY) {
+            return undefined;
+        }
+        if (this.referrerReferrerInfoMap.has(referrer)) {
+            return this.referrerReferrerInfoMap.get(referrer);
+        }
+        const referrerKey = new web3_js_1.PublicKey(referrer);
+        const referrerInfo = {
+            referrer: (0, pda_1.getUserAccountPublicKeySync)(this.driftClient.program.programId, referrerKey, 0),
+            referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, referrerKey),
+        };
+        this.referrerReferrerInfoMap.set(referrer, referrerInfo);
+        return referrerInfo;
     }
     size() {
-        return this.referrerMap.size;
+        return this.authorityReferrerMap.size;
+    }
+    numberOfReferred() {
+        return Array.from(this.authorityReferrerMap.values()).filter((referrer) => referrer !== DEFAULT_PUBLIC_KEY).length;
     }
     async sync() {
         if (this.fetchPromise) {
@@ -102,9 +111,6 @@ class ReferrerMap {
                 await this.syncReferrer((0, memcmp_1.getUserStatsIsReferredOrReferrerFilter)());
             }
         }
-        catch (e) {
-            console.error('error in referrerMap.sync', e);
-        }
         finally {
             this.fetchPromiseResolver();
             this.fetchPromise = undefined;
@@ -132,7 +138,7 @@ class ReferrerMap {
             // only add if it isn't already in the map
             // so that if syncReferrer already set it, we dont overwrite
             if (!this.has(account.pubkey)) {
-                this.addReferrerInfo(account.pubkey, null);
+                this.addReferrer(account.pubkey, DEFAULT_PUBLIC_KEY);
             }
         }
     }
@@ -162,19 +168,14 @@ class ReferrerMap {
                 const buffer = Buffer.from(programAccount.account.data[0], programAccount.account.data[1]);
                 const authority = bytes_1.bs58.encode(buffer.subarray(8, 40));
                 const referrer = bytes_1.bs58.encode(buffer.subarray(40, 72));
-                const referrerKey = new web3_js_1.PublicKey(referrer);
-                this.addReferrerInfo(authority, referrer === DEFAULT_PUBLIC_KEY
-                    ? null
-                    : {
-                        referrer: (0, pda_1.getUserAccountPublicKeySync)(this.driftClient.program.programId, referrerKey, 0),
-                        referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, referrerKey),
-                    });
+                this.addReferrer(authority, referrer);
             }));
             await new Promise((resolve) => setTimeout(resolve, 0));
         }
     }
     async unsubscribe() {
-        this.referrerMap.clear();
+        this.authorityReferrerMap.clear();
+        this.referrerReferrerInfoMap.clear();
     }
 }
 exports.ReferrerMap = ReferrerMap;