@drift-labs/sdk 2.100.0-beta.2 → 2.100.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.100.0-beta.2
+2.100.0-beta.3

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) {
@@ -132,7 +141,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 +171,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;

package/lib/node/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/node/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) {
@@ -132,7 +141,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 +171,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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.100.0-beta.2",
+	"version": "2.100.0-beta.3",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/src/userMap/referrerMap.ts

@@ -3,7 +3,6 @@ import {
 	PublicKey,
 	RpcResponseAndContext,
 } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { DriftClient } from '../driftClient';
 import { ReferrerInfo } from '../types';
 import {
@@ -21,14 +20,15 @@ const DEFAULT_PUBLIC_KEY = PublicKey.default.toBase58();
 
 export 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 = new Map<string, ReferrerInfo | null>();
+	private authorityReferrerMap = new Map<string, string>();
+	/**
+	 * map from referrer pubkey to ReferrerInfo.
+	 * Will be undefined if the referrer is not in the map yet.
+	 */
+	private referrerReferrerInfoMap = new Map<string, ReferrerInfo>();
 	private driftClient: DriftClient;
-	private bulkAccountLoader: BulkAccountLoader;
 	private parallelSync: boolean;
 
 	private fetchPromise?: Promise<void>;
@@ -38,22 +38,9 @@ export 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) {
 		this.driftClient = driftClient;
-		if (!bulkAccountLoader) {
-			bulkAccountLoader = new BulkAccountLoader(
-				driftClient.connection,
-				driftClient.opts.commitment,
-				0
-			);
-		}
-		this.bulkAccountLoader = bulkAccountLoader;
 		this.parallelSync = parallelSync !== undefined ? parallelSync : true;
 	}
 
@@ -70,21 +57,17 @@ export class ReferrerMap {
 	}
 
 	public has(authorityPublicKey: string): boolean {
-		return this.referrerMap.has(authorityPublicKey);
+		return this.authorityReferrerMap.has(authorityPublicKey);
 	}
 
 	public get(authorityPublicKey: string): ReferrerInfo | undefined {
-		const info = this.referrerMap.get(authorityPublicKey);
-		return info === null ? undefined : info;
+		return this.getReferrer(authorityPublicKey);
 	}
 
-	public async addReferrerInfo(
-		authority: string,
-		referrerInfo?: ReferrerInfo | null
-	) {
-		if (referrerInfo || referrerInfo === null) {
-			this.referrerMap.set(authority, referrerInfo);
-		} else if (referrerInfo === undefined) {
+	public async addReferrer(authority: string, referrer?: string) {
+		if (referrer) {
+			this.authorityReferrerMap.set(authority, referrer);
+		} else if (referrer === undefined) {
 			const userStatsAccountPublicKey = getUserStatsAccountPublicKey(
 				this.driftClient.program.programId,
 				new PublicKey(authority)
@@ -98,23 +81,7 @@ export class ReferrerMap {
 
 			const referrer = bs58.encode(buffer.subarray(40, 72));
 
-			const referrerKey = new PublicKey(referrer);
-			this.addReferrerInfo(
-				authority,
-				referrer === DEFAULT_PUBLIC_KEY
-					? null
-					: {
-							referrer: getUserAccountPublicKeySync(
-								this.driftClient.program.programId,
-								referrerKey,
-								0
-							),
-							referrerStats: getUserStatsAccountPublicKey(
-								this.driftClient.program.programId,
-								referrerKey
-							),
-					  }
-			);
+			this.addReferrer(authority, referrer);
 		}
 	}
 
@@ -128,17 +95,51 @@ export class ReferrerMap {
 		authorityPublicKey: string
 	): Promise<ReferrerInfo | undefined> {
 		if (!this.has(authorityPublicKey)) {
-			await this.addReferrerInfo(authorityPublicKey);
+			await this.addReferrer(authorityPublicKey);
 		}
-		return this.get(authorityPublicKey);
+		return this.getReferrer(authorityPublicKey);
 	}
 
-	public values(): IterableIterator<ReferrerInfo | null> {
-		return this.referrerMap.values();
+	public getReferrer(authorityPublicKey: string): ReferrerInfo | undefined {
+		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 PublicKey(referrer);
+		const referrerInfo = {
+			referrer: getUserAccountPublicKeySync(
+				this.driftClient.program.programId,
+				referrerKey,
+				0
+			),
+			referrerStats: getUserStatsAccountPublicKey(
+				this.driftClient.program.programId,
+				referrerKey
+			),
+		};
+
+		this.referrerReferrerInfoMap.set(referrer, referrerInfo);
+		return referrerInfo;
 	}
 
 	public size(): number {
-		return this.referrerMap.size;
+		return this.authorityReferrerMap.size;
+	}
+
+	public numberOfReferred(): number {
+		return Array.from(this.authorityReferrerMap.values()).filter(
+			(referrer) => referrer !== DEFAULT_PUBLIC_KEY
+		).length;
 	}
 
 	public async sync(): Promise<void> {
@@ -205,7 +206,7 @@ export 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);
 			}
 		}
 	}
@@ -254,23 +255,7 @@ export class ReferrerMap {
 					const authority = bs58.encode(buffer.subarray(8, 40));
 					const referrer = bs58.encode(buffer.subarray(40, 72));
 
-					const referrerKey = new PublicKey(referrer);
-					this.addReferrerInfo(
-						authority,
-						referrer === DEFAULT_PUBLIC_KEY
-							? null
-							: {
-									referrer: getUserAccountPublicKeySync(
-										this.driftClient.program.programId,
-										referrerKey,
-										0
-									),
-									referrerStats: getUserStatsAccountPublicKey(
-										this.driftClient.program.programId,
-										referrerKey
-									),
-							  }
-					);
+					this.addReferrer(authority, referrer);
 				})
 			);
 			await new Promise((resolve) => setTimeout(resolve, 0));
@@ -278,6 +263,7 @@ export class ReferrerMap {
 	}
 
 	public async unsubscribe() {
-		this.referrerMap.clear();
+		this.authorityReferrerMap.clear();
+		this.referrerReferrerInfoMap.clear();
 	}
 }