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

package/VERSION

@@ -1 +1 @@
-2.121.0-beta.0
+2.121.0-beta.2

package/lib/browser/memcmp.d.ts

@@ -6,6 +6,7 @@ export declare function getUserWithoutOrderFilter(): MemcmpFilter;
 export declare function getUserWithAuctionFilter(): MemcmpFilter;
 export declare function getUserThatHasBeenLP(): MemcmpFilter;
 export declare function getUserWithName(name: string): MemcmpFilter;
+export declare function getUsersWithPoolId(poolId: number): MemcmpFilter;
 export declare function getUserStatsFilter(): MemcmpFilter;
 export declare function getUserStatsIsReferredFilter(): MemcmpFilter;
 export declare function getUserStatsIsReferredOrReferrerFilter(): MemcmpFilter;

package/lib/browser/memcmp.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSignedMsgUserOrdersFilter = exports.getUserStatsIsReferredOrReferrerFilter = exports.getUserStatsIsReferredFilter = exports.getUserStatsFilter = exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithoutOrderFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
+exports.getSignedMsgUserOrdersFilter = exports.getUserStatsIsReferredOrReferrerFilter = exports.getUserStatsIsReferredFilter = exports.getUserStatsFilter = exports.getUsersWithPoolId = exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithoutOrderFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const anchor_1 = require("@coral-xyz/anchor");
 const userName_1 = require("./userName");
@@ -70,6 +70,15 @@ function getUserWithName(name) {
     };
 }
 exports.getUserWithName = getUserWithName;
+function getUsersWithPoolId(poolId) {
+    return {
+        memcmp: {
+            offset: 4356,
+            bytes: bs58_1.default.encode(Uint8Array.from([poolId])),
+        },
+    };
+}
+exports.getUsersWithPoolId = getUsersWithPoolId;
 function getUserStatsFilter() {
     return {
         memcmp: {

package/lib/browser/swift/swiftOrderSubscriber.d.ts

@@ -29,7 +29,7 @@ export declare class SwiftOrderSubscriber {
     getSymbolForMarketIndex(marketIndex: number): string;
     generateChallengeResponse(nonce: string): string;
     handleAuthMessage(message: any): void;
-    subscribe(onOrder: (orderMessageRaw: any, signedMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, isDelegateSigner?: boolean) => Promise<void>): Promise<void>;
+    subscribe(onOrder: (orderMessageRaw: any, signedMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, isDelegateSigner?: boolean) => Promise<void>, acceptSanitized?: boolean): Promise<void>;
     getPlaceAndMakeSignedMsgOrderIxs(orderMessageRaw: any, signedMsgOrderParamsMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, makerOrderParams: OptionalOrderParams): Promise<TransactionInstruction[]>;
     private startHeartbeatTimer;
     private reconnect;

package/lib/browser/swift/swiftOrderSubscriber.js

@@ -55,7 +55,7 @@ class SwiftOrderSubscriber {
             });
         }
     }
-    async subscribe(onOrder) {
+    async subscribe(onOrder, acceptSanitized = false) {
         this.onOrder = onOrder;
         const endpoint = this.config.endpoint || this.config.driftEnv === 'devnet'
             ? 'wss://master.swift.drift.trade/ws'
@@ -72,6 +72,10 @@ class SwiftOrderSubscriber {
                 }
                 if (message['order']) {
                     const order = message['order'];
+                    // ignore likely sanitized orders by default
+                    if (order['will_sanitize'] === true && !acceptSanitized) {
+                        return;
+                    }
                     const signedMsgOrderParamsBuf = Buffer.from(order['order_message'], 'hex');
                     const isDelegateSigner = signedMsgOrderParamsBuf
                         .slice(0, 8)

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

@@ -23,6 +23,7 @@ export declare class UserMap implements UserMapInterface {
     private connection;
     private commitment;
     private includeIdle;
+    private filterByPoolId?;
     private additionalFilters?;
     private disableSyncOnTotalAccountsChange;
     private lastNumberOfSubAccounts;
@@ -82,6 +83,7 @@ export declare class UserMap implements UserMapInterface {
      */
     getUniqueAuthorities(filterCriteria?: UserFilterCriteria): PublicKey[];
     sync(): Promise<void>;
+    private getFilters;
     /**
      * Syncs the UserMap using the default sync method (single getProgramAccounts call with filters).
      * This method may fail when drift has too many users. (nodejs response size limits)

package/lib/browser/userMap/userMap.js

@@ -38,6 +38,7 @@ class UserMap {
                 ? (_a = config.subscriptionConfig.commitment) !== null && _a !== void 0 ? _a : this.driftClient.opts.commitment
                 : this.driftClient.opts.commitment;
         this.includeIdle = (_b = config.includeIdle) !== null && _b !== void 0 ? _b : false;
+        this.filterByPoolId = config.filterByPoolId;
         this.additionalFilters = config.additionalFilters;
         this.disableSyncOnTotalAccountsChange =
             (_c = config.disableSyncOnTotalAccountsChange) !== null && _c !== void 0 ? _c : false;
@@ -263,6 +264,19 @@ class UserMap {
             return this.paginatedSync();
         }
     }
+    getFilters() {
+        const filters = [(0, memcmp_1.getUserFilter)()];
+        if (!this.includeIdle) {
+            filters.push((0, memcmp_1.getNonIdleUserFilter)());
+        }
+        if (this.filterByPoolId !== undefined) {
+            filters.push((0, memcmp_1.getUsersWithPoolId)(this.filterByPoolId));
+        }
+        if (this.additionalFilters) {
+            filters.push(...this.additionalFilters);
+        }
+        return filters;
+    }
     /**
      * Syncs the UserMap using the default sync method (single getProgramAccounts call with filters).
      * This method may fail when drift has too many users. (nodejs response size limits)
@@ -277,18 +291,11 @@ class UserMap {
             this.syncPromiseResolver = resolver;
         });
         try {
-            const filters = [(0, memcmp_1.getUserFilter)()];
-            if (!this.includeIdle) {
-                filters.push((0, memcmp_1.getNonIdleUserFilter)());
-            }
-            if (this.additionalFilters) {
-                filters.push(...this.additionalFilters);
-            }
             const rpcRequestArgs = [
                 this.driftClient.program.programId.toBase58(),
                 {
                     commitment: this.commitment,
-                    filters,
+                    filters: this.getFilters(),
                     encoding: 'base64+zstd',
                     withContext: true,
                 },
@@ -359,10 +366,7 @@ class UserMap {
         try {
             const accountsPrefetch = await this.connection.getProgramAccounts(this.driftClient.program.programId, {
                 dataSlice: { offset: 0, length: 0 },
-                filters: [
-                    (0, memcmp_1.getUserFilter)(),
-                    ...(!this.includeIdle ? [(0, memcmp_1.getNonIdleUserFilter)()] : []),
-                ],
+                filters: this.getFilters(),
             });
             const accountPublicKeys = accountsPrefetch.map((account) => account.pubkey);
             const limitConcurrency = async (tasks, limit) => {

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

@@ -35,5 +35,6 @@ export type UserMapConfig = {
     disableSyncOnTotalAccountsChange?: boolean;
     syncConfig?: SyncConfig;
     throwOnFailedSync?: boolean;
+    filterByPoolId?: number;
     additionalFilters?: MemcmpFilter[];
 };

package/lib/node/memcmp.d.ts

@@ -6,6 +6,7 @@ export declare function getUserWithoutOrderFilter(): MemcmpFilter;
 export declare function getUserWithAuctionFilter(): MemcmpFilter;
 export declare function getUserThatHasBeenLP(): MemcmpFilter;
 export declare function getUserWithName(name: string): MemcmpFilter;
+export declare function getUsersWithPoolId(poolId: number): MemcmpFilter;
 export declare function getUserStatsFilter(): MemcmpFilter;
 export declare function getUserStatsIsReferredFilter(): MemcmpFilter;
 export declare function getUserStatsIsReferredOrReferrerFilter(): MemcmpFilter;

package/lib/node/memcmp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memcmp.d.ts","sourceRoot":"","sources":["../../src/memcmp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,wBAAgB,aAAa,IAAI,YAAY,CAO5C;AAED,wBAAgB,oBAAoB,IAAI,YAAY,CAOnD;AAED,wBAAgB,sBAAsB,IAAI,YAAY,CAOrD;AAED,wBAAgB,yBAAyB,IAAI,YAAY,CAOxD;AAED,wBAAgB,wBAAwB,IAAI,YAAY,CAOvD;AAED,wBAAgB,oBAAoB,IAAI,YAAY,CAOnD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAO1D;AAED,wBAAgB,kBAAkB,IAAI,YAAY,CAOjD;AAED,wBAAgB,4BAA4B,IAAI,YAAY,CAO3D;AAED,wBAAgB,sCAAsC,IAAI,YAAY,CAOrE;AAED,wBAAgB,4BAA4B,IAAI,YAAY,CAS3D"}
+{"version":3,"file":"memcmp.d.ts","sourceRoot":"","sources":["../../src/memcmp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,wBAAgB,aAAa,IAAI,YAAY,CAO5C;AAED,wBAAgB,oBAAoB,IAAI,YAAY,CAOnD;AAED,wBAAgB,sBAAsB,IAAI,YAAY,CAOrD;AAED,wBAAgB,yBAAyB,IAAI,YAAY,CAOxD;AAED,wBAAgB,wBAAwB,IAAI,YAAY,CAOvD;AAED,wBAAgB,oBAAoB,IAAI,YAAY,CAOnD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAO1D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAO/D;AAED,wBAAgB,kBAAkB,IAAI,YAAY,CAOjD;AAED,wBAAgB,4BAA4B,IAAI,YAAY,CAO3D;AAED,wBAAgB,sCAAsC,IAAI,YAAY,CAOrE;AAED,wBAAgB,4BAA4B,IAAI,YAAY,CAS3D"}

package/lib/node/memcmp.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSignedMsgUserOrdersFilter = exports.getUserStatsIsReferredOrReferrerFilter = exports.getUserStatsIsReferredFilter = exports.getUserStatsFilter = exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithoutOrderFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
+exports.getSignedMsgUserOrdersFilter = exports.getUserStatsIsReferredOrReferrerFilter = exports.getUserStatsIsReferredFilter = exports.getUserStatsFilter = exports.getUsersWithPoolId = exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithoutOrderFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const anchor_1 = require("@coral-xyz/anchor");
 const userName_1 = require("./userName");
@@ -70,6 +70,15 @@ function getUserWithName(name) {
     };
 }
 exports.getUserWithName = getUserWithName;
+function getUsersWithPoolId(poolId) {
+    return {
+        memcmp: {
+            offset: 4356,
+            bytes: bs58_1.default.encode(Uint8Array.from([poolId])),
+        },
+    };
+}
+exports.getUsersWithPoolId = getUsersWithPoolId;
 function getUserStatsFilter() {
     return {
         memcmp: {

package/lib/node/swift/swiftOrderSubscriber.d.ts

@@ -29,7 +29,7 @@ export declare class SwiftOrderSubscriber {
     getSymbolForMarketIndex(marketIndex: number): string;
     generateChallengeResponse(nonce: string): string;
     handleAuthMessage(message: any): void;
-    subscribe(onOrder: (orderMessageRaw: any, signedMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, isDelegateSigner?: boolean) => Promise<void>): Promise<void>;
+    subscribe(onOrder: (orderMessageRaw: any, signedMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, isDelegateSigner?: boolean) => Promise<void>, acceptSanitized?: boolean): Promise<void>;
     getPlaceAndMakeSignedMsgOrderIxs(orderMessageRaw: any, signedMsgOrderParamsMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, makerOrderParams: OptionalOrderParams): Promise<TransactionInstruction[]>;
     private startHeartbeatTimer;
     private reconnect;

package/lib/node/swift/swiftOrderSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swiftOrderSubscriber.d.ts","sourceRoot":"","sources":["../../../src/swift/swiftOrderSubscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,WAAW,EACX,QAAQ,EAKR,mBAAmB,EAEnB,mCAAmC,EACnC,2BAA2B,EAC3B,WAAW,EACX,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,OAAO,EAAa,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAO7E,MAAM,WAAW,aAAa;IAC7B,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CAC5D;AAED,MAAM,MAAM,0BAA0B,GAAG;IACxC,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,CAAC,EAAE,aAAa,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;MAIE;IACF,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,qBAAa,oBAAoB;IAgBpB,OAAO,CAAC,MAAM;IAf1B,OAAO,CAAC,gBAAgB,CAA+B;IACvD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAC7C,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,WAAW,CAAc;IAC1B,iBAAiB,CAAC,EAAE,aAAa,CAAC;IAClC,OAAO,EAAE,CACf,eAAe,EAAE,GAAG,EACpB,aAAa,EACV,2BAA2B,GAC3B,mCAAmC,EACtC,gBAAgB,CAAC,EAAE,OAAO,KACtB,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnB,UAAU,UAAS;gBAEC,MAAM,EAAE,0BAA0B;IAKtD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAQpD,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAUhD,iBAAiB,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI;IA6B/B,SAAS,CACd,OAAO,EAAE,CACR,eAAe,EAAE,GAAG,EACpB,aAAa,EACV,2BAA2B,GAC3B,mCAAmC,EACtC,gBAAgB,CAAC,EAAE,OAAO,KACtB,OAAO,CAAC,IAAI,CAAC,GAChB,OAAO,CAAC,IAAI,CAAC;IA4FV,gCAAgC,CACrC,eAAe,EAAE,GAAG,EACpB,2BAA2B,EACxB,2BAA2B,GAC3B,mCAAmC,EACtC,gBAAgB,EAAE,mBAAmB,GACnC,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAiEpC,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,SAAS;CAWjB"}
+{"version":3,"file":"swiftOrderSubscriber.d.ts","sourceRoot":"","sources":["../../../src/swift/swiftOrderSubscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,WAAW,EACX,QAAQ,EAKR,mBAAmB,EAEnB,mCAAmC,EACnC,2BAA2B,EAC3B,WAAW,EACX,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,OAAO,EAAa,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAO7E,MAAM,WAAW,aAAa;IAC7B,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CAC5D;AAED,MAAM,MAAM,0BAA0B,GAAG;IACxC,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,CAAC,EAAE,aAAa,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;MAIE;IACF,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,qBAAa,oBAAoB;IAgBpB,OAAO,CAAC,MAAM;IAf1B,OAAO,CAAC,gBAAgB,CAA+B;IACvD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAC7C,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,WAAW,CAAc;IAC1B,iBAAiB,CAAC,EAAE,aAAa,CAAC;IAClC,OAAO,EAAE,CACf,eAAe,EAAE,GAAG,EACpB,aAAa,EACV,2BAA2B,GAC3B,mCAAmC,EACtC,gBAAgB,CAAC,EAAE,OAAO,KACtB,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnB,UAAU,UAAS;gBAEC,MAAM,EAAE,0BAA0B;IAKtD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAQpD,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAUhD,iBAAiB,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI;IA6B/B,SAAS,CACd,OAAO,EAAE,CACR,eAAe,EAAE,GAAG,EACpB,aAAa,EACV,2BAA2B,GAC3B,mCAAmC,EACtC,gBAAgB,CAAC,EAAE,OAAO,KACtB,OAAO,CAAC,IAAI,CAAC,EAClB,eAAe,UAAQ,GACrB,OAAO,CAAC,IAAI,CAAC;IAgGV,gCAAgC,CACrC,eAAe,EAAE,GAAG,EACpB,2BAA2B,EACxB,2BAA2B,GAC3B,mCAAmC,EACtC,gBAAgB,EAAE,mBAAmB,GACnC,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAiEpC,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,SAAS;CAWjB"}

package/lib/node/swift/swiftOrderSubscriber.js

@@ -55,7 +55,7 @@ class SwiftOrderSubscriber {
             });
         }
     }
-    async subscribe(onOrder) {
+    async subscribe(onOrder, acceptSanitized = false) {
         this.onOrder = onOrder;
         const endpoint = this.config.endpoint || this.config.driftEnv === 'devnet'
             ? 'wss://master.swift.drift.trade/ws'
@@ -72,6 +72,10 @@ class SwiftOrderSubscriber {
                 }
                 if (message['order']) {
                     const order = message['order'];
+                    // ignore likely sanitized orders by default
+                    if (order['will_sanitize'] === true && !acceptSanitized) {
+                        return;
+                    }
                     const signedMsgOrderParamsBuf = Buffer.from(order['order_message'], 'hex');
                     const isDelegateSigner = signedMsgOrderParamsBuf
                         .slice(0, 8)

package/lib/node/userMap/userMap.d.ts

@@ -23,6 +23,7 @@ export declare class UserMap implements UserMapInterface {
     private connection;
     private commitment;
     private includeIdle;
+    private filterByPoolId?;
     private additionalFilters?;
     private disableSyncOnTotalAccountsChange;
     private lastNumberOfSubAccounts;
@@ -82,6 +83,7 @@ export declare class UserMap implements UserMapInterface {
      */
     getUniqueAuthorities(filterCriteria?: UserFilterCriteria): PublicKey[];
     sync(): Promise<void>;
+    private getFilters;
     /**
      * Syncs the UserMap using the default sync method (single getProgramAccounts call with filters).
      * This method may fail when drift has too many users. (nodejs response size limits)

package/lib/node/userMap/userMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/userMap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"userMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/userMap.ts"],"names":[],"mappings":"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"}

package/lib/node/userMap/userMap.js

@@ -38,6 +38,7 @@ class UserMap {
                 ? (_a = config.subscriptionConfig.commitment) !== null && _a !== void 0 ? _a : this.driftClient.opts.commitment
                 : this.driftClient.opts.commitment;
         this.includeIdle = (_b = config.includeIdle) !== null && _b !== void 0 ? _b : false;
+        this.filterByPoolId = config.filterByPoolId;
         this.additionalFilters = config.additionalFilters;
         this.disableSyncOnTotalAccountsChange =
             (_c = config.disableSyncOnTotalAccountsChange) !== null && _c !== void 0 ? _c : false;
@@ -263,6 +264,19 @@ class UserMap {
             return this.paginatedSync();
         }
     }
+    getFilters() {
+        const filters = [(0, memcmp_1.getUserFilter)()];
+        if (!this.includeIdle) {
+            filters.push((0, memcmp_1.getNonIdleUserFilter)());
+        }
+        if (this.filterByPoolId !== undefined) {
+            filters.push((0, memcmp_1.getUsersWithPoolId)(this.filterByPoolId));
+        }
+        if (this.additionalFilters) {
+            filters.push(...this.additionalFilters);
+        }
+        return filters;
+    }
     /**
      * Syncs the UserMap using the default sync method (single getProgramAccounts call with filters).
      * This method may fail when drift has too many users. (nodejs response size limits)
@@ -277,18 +291,11 @@ class UserMap {
             this.syncPromiseResolver = resolver;
         });
         try {
-            const filters = [(0, memcmp_1.getUserFilter)()];
-            if (!this.includeIdle) {
-                filters.push((0, memcmp_1.getNonIdleUserFilter)());
-            }
-            if (this.additionalFilters) {
-                filters.push(...this.additionalFilters);
-            }
             const rpcRequestArgs = [
                 this.driftClient.program.programId.toBase58(),
                 {
                     commitment: this.commitment,
-                    filters,
+                    filters: this.getFilters(),
                     encoding: 'base64+zstd',
                     withContext: true,
                 },
@@ -359,10 +366,7 @@ class UserMap {
         try {
             const accountsPrefetch = await this.connection.getProgramAccounts(this.driftClient.program.programId, {
                 dataSlice: { offset: 0, length: 0 },
-                filters: [
-                    (0, memcmp_1.getUserFilter)(),
-                    ...(!this.includeIdle ? [(0, memcmp_1.getNonIdleUserFilter)()] : []),
-                ],
+                filters: this.getFilters(),
             });
             const accountPublicKeys = accountsPrefetch.map((account) => account.pubkey);
             const limitConcurrency = async (tasks, limit) => {

package/lib/node/userMap/userMapConfig.d.ts

@@ -35,6 +35,7 @@ export type UserMapConfig = {
     disableSyncOnTotalAccountsChange?: boolean;
     syncConfig?: SyncConfig;
     throwOnFailedSync?: boolean;
+    filterByPoolId?: number;
     additionalFilters?: MemcmpFilter[];
 };
 //# sourceMappingURL=userMapConfig.d.ts.map

package/lib/node/userMap/userMapConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userMapConfig.d.ts","sourceRoot":"","sources":["../../../src/userMap/userMapConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,MAAM,MAAM,yBAAyB,GAAG;IAEvC,aAAa,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,UAAU,GACnB;IACA,IAAI,EAAE,SAAS,CAAC;CACf,GACD;IACA,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEL,MAAM,MAAM,aAAa,GAAG;IAC3B,WAAW,EAAE,WAAW,CAAC;IAEzB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,EACf;QACA,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,UAAU,CAAC;KACvB,GACD;QACA,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC1B,GACD;QACA,IAAI,EAAE,WAAW,CAAC;QAClB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;KACvB,CAAC;IAGL,eAAe,CAAC,EAAE,OAAO,CAAC;IAG1B,WAAW,CAAC,EAAE,OAAO,CAAC;IAGtB,UAAU,CAAC,EAAE,OAAO,CAAC;IAIrB,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAE3C,UAAU,CAAC,EAAE,UAAU,CAAC;IAGxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;CACnC,CAAC"}
+{"version":3,"file":"userMapConfig.d.ts","sourceRoot":"","sources":["../../../src/userMap/userMapConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,MAAM,MAAM,yBAAyB,GAAG;IAEvC,aAAa,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,UAAU,GACnB;IACA,IAAI,EAAE,SAAS,CAAC;CACf,GACD;IACA,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEL,MAAM,MAAM,aAAa,GAAG;IAC3B,WAAW,EAAE,WAAW,CAAC;IAEzB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,EACf;QACA,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,UAAU,CAAC;KACvB,GACD;QACA,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC1B,GACD;QACA,IAAI,EAAE,WAAW,CAAC;QAClB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;KACvB,CAAC;IAGL,eAAe,CAAC,EAAE,OAAO,CAAC;IAG1B,WAAW,CAAC,EAAE,OAAO,CAAC;IAGtB,UAAU,CAAC,EAAE,OAAO,CAAC;IAIrB,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAE3C,UAAU,CAAC,EAAE,UAAU,CAAC;IAGxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAG5B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;CACnC,CAAC"}

package/package.json

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

package/src/memcmp.ts

@@ -66,6 +66,15 @@ export function getUserWithName(name: string): MemcmpFilter {
 	};
 }
 
+export function getUsersWithPoolId(poolId: number): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 4356,
+			bytes: bs58.encode(Uint8Array.from([poolId])),
+		},
+	};
+}
+
 export function getUserStatsFilter(): MemcmpFilter {
 	return {
 		memcmp: {

package/src/swift/swiftOrderSubscriber.ts

@@ -112,7 +112,8 @@ export class SwiftOrderSubscriber {
 				| SignedMsgOrderParamsMessage
 				| SignedMsgOrderParamsDelegateMessage,
 			isDelegateSigner?: boolean
-		) => Promise<void>
+		) => Promise<void>,
+		acceptSanitized = false
 	): Promise<void> {
 		this.onOrder = onOrder;
 
@@ -137,6 +138,10 @@ export class SwiftOrderSubscriber {
 
 				if (message['order']) {
 					const order = message['order'];
+					// ignore likely sanitized orders by default
+					if (order['will_sanitize'] === true && !acceptSanitized) {
+						return;
+					}
 					const signedMsgOrderParamsBuf = Buffer.from(
 						order['order_message'],
 						'hex'

package/src/userMap/userMap.ts

@@ -29,7 +29,11 @@ import {
 } from '@solana/web3.js';
 import { Buffer } from 'buffer';
 import { ZSTDDecoder } from 'zstddec';
-import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
+import {
+	getNonIdleUserFilter,
+	getUserFilter,
+	getUsersWithPoolId,
+} from '../memcmp';
 import {
 	SyncConfig,
 	UserAccountFilterCriteria as UserFilterCriteria,
@@ -76,6 +80,7 @@ export class UserMap implements UserMapInterface {
 	private connection: Connection;
 	private commitment: Commitment;
 	private includeIdle: boolean;
+	private filterByPoolId?: number;
 	private additionalFilters?: MemcmpFilter[];
 	private disableSyncOnTotalAccountsChange: boolean;
 	private lastNumberOfSubAccounts: BN;
@@ -115,6 +120,7 @@ export class UserMap implements UserMapInterface {
 				  this.driftClient.opts.commitment
 				: this.driftClient.opts.commitment;
 		this.includeIdle = config.includeIdle ?? false;
+		this.filterByPoolId = config.filterByPoolId;
 		this.additionalFilters = config.additionalFilters;
 		this.disableSyncOnTotalAccountsChange =
 			config.disableSyncOnTotalAccountsChange ?? false;
@@ -394,6 +400,20 @@ export class UserMap implements UserMapInterface {
 		}
 	}
 
+	private getFilters(): MemcmpFilter[] {
+		const filters = [getUserFilter()];
+		if (!this.includeIdle) {
+			filters.push(getNonIdleUserFilter());
+		}
+		if (this.filterByPoolId !== undefined) {
+			filters.push(getUsersWithPoolId(this.filterByPoolId));
+		}
+		if (this.additionalFilters) {
+			filters.push(...this.additionalFilters);
+		}
+		return filters;
+	}
+
 	/**
 	 * Syncs the UserMap using the default sync method (single getProgramAccounts call with filters).
 	 * This method may fail when drift has too many users. (nodejs response size limits)
@@ -408,18 +428,11 @@ export class UserMap implements UserMapInterface {
 		});
 
 		try {
-			const filters = [getUserFilter()];
-			if (!this.includeIdle) {
-				filters.push(getNonIdleUserFilter());
-			}
-			if (this.additionalFilters) {
-				filters.push(...this.additionalFilters);
-			}
 			const rpcRequestArgs = [
 				this.driftClient.program.programId.toBase58(),
 				{
 					commitment: this.commitment,
-					filters,
+					filters: this.getFilters(),
 					encoding: 'base64+zstd',
 					withContext: true,
 				},
@@ -517,10 +530,7 @@ export class UserMap implements UserMapInterface {
 				this.driftClient.program.programId,
 				{
 					dataSlice: { offset: 0, length: 0 },
-					filters: [
-						getUserFilter(),
-						...(!this.includeIdle ? [getNonIdleUserFilter()] : []),
-					],
+					filters: this.getFilters(),
 				}
 			);
 			const accountPublicKeys = accountsPrefetch.map(

package/src/userMap/userMapConfig.ts

@@ -59,5 +59,8 @@ export type UserMapConfig = {
 	// Whether to throw an error if the userMap fails to sync. Defaults to true.
 	throwOnFailedSync?: boolean;
 
+	// Whether to filter users by poolId. Defaults to false (all users).
+	filterByPoolId?: number;
+
 	additionalFilters?: MemcmpFilter[];
 };