@drift-labs/sdk 2.111.0-beta.1 → 2.111.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.111.0-beta.1
+2.111.0-beta.3

package/lib/browser/constants/perpMarkets.js

@@ -374,9 +374,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'ETH-PERP',
         baseAssetSymbol: 'ETH',
         marketIndex: 2,
-        oracle: new web3_js_1.PublicKey('6bEp2MiyoiiiDxcVqE8rUHQWwHirXUXtKfAEATTVqNzT'),
+        oracle: new web3_js_1.PublicKey('93FG52TzNKCnMiasV14Ba34BYcHDb9p4zK4GjZnLwqWR'),
         launchTs: 1670347281000,
-        oracleSource: __1.OracleSource.PYTH_PULL,
+        oracleSource: __1.OracleSource.PYTH_LAZER,
         pythFeedId: '0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
         pythLazerId: 2,
     },

package/lib/browser/constants/spotMarkets.js

@@ -97,8 +97,8 @@ exports.MainnetSpotMarkets = [
         symbol: 'USDC',
         marketIndex: 0,
         poolId: 0,
-        oracle: new web3_js_1.PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
-        oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
+        oracle: new web3_js_1.PublicKey('9VCioxmni2gDLv11qufWzT3RDERhQE4iY5Gf7NTfYyAV'),
+        oracleSource: __1.OracleSource.PYTH_LAZER_STABLE_COIN,
         mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
         precision: numericConstants_1.QUOTE_PRECISION,
         precisionExp: numericConstants_1.QUOTE_PRECISION_EXP,
@@ -136,8 +136,8 @@ exports.MainnetSpotMarkets = [
         symbol: 'wBTC',
         marketIndex: 3,
         poolId: 0,
-        oracle: new web3_js_1.PublicKey('9Tq8iN5WnMX2PcZGj4iSFEAgHCi8cM6x8LsDUbuzq8uw'),
-        oracleSource: __1.OracleSource.PYTH_PULL,
+        oracle: new web3_js_1.PublicKey('fqPfDa6uQr9ndMvwaFp4mUBeUrHmLop8Jxfb1XJNmVm'),
+        oracleSource: __1.OracleSource.PYTH_LAZER,
         mint: new web3_js_1.PublicKey('3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh'),
         precision: new __1.BN(10).pow(numericConstants_1.EIGHT),
         precisionExp: numericConstants_1.EIGHT,

package/lib/browser/driftClient.d.ts

@@ -146,6 +146,22 @@ export declare class DriftClient {
      * Adds and subscribes to users based on params set by the constructor or by updateWallet.
      */
     addAndSubscribeToUsers(authority?: PublicKey): Promise<boolean>;
+    /**
+     * Returns the instructions to initialize a user account and the public key of the user account.
+     * @param subAccountId
+     * @param name
+     * @param referrerInfo
+     * @returns [instructions, userAccountPublicKey]
+     */
+    getInitializeUserAccountIxs(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[TransactionInstruction[], PublicKey]>;
+    /**
+     * Initializes a user account and returns the transaction signature and the public key of the user account.
+     * @param subAccountId
+     * @param name
+     * @param referrerInfo
+     * @param txParams
+     * @returns [transactionSignature, userAccountPublicKey]
+     */
     initializeUserAccount(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
     initializeSignedMsgUserOrders(authority: PublicKey, numOrders: number, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
@@ -156,7 +172,7 @@ export declare class DriftClient {
     getInitializeFuelOverflowIx(authority?: PublicKey): Promise<TransactionInstruction>;
     sweepFuel(authority?: PublicKey): Promise<TransactionSignature>;
     getSweepFuelIx(authority?: PublicKey): Promise<TransactionInstruction>;
-    getInitializeUserInstructions(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
+    private getInitializeUserInstructions;
     getNextSubAccountId(): Promise<number>;
     initializeReferrerName(name: string): Promise<TransactionSignature>;
     updateUserName(name: string, subAccountId?: number): Promise<TransactionSignature>;

package/lib/browser/driftClient.js

@@ -578,7 +578,14 @@ class DriftClient {
         }
         return result;
     }
-    async initializeUserAccount(subAccountId = 0, name, referrerInfo, txParams) {
+    /**
+     * Returns the instructions to initialize a user account and the public key of the user account.
+     * @param subAccountId
+     * @param name
+     * @param referrerInfo
+     * @returns [instructions, userAccountPublicKey]
+     */
+    async getInitializeUserAccountIxs(subAccountId = 0, name, referrerInfo) {
         const initializeIxs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         if (subAccountId === 0) {
@@ -587,6 +594,18 @@ class DriftClient {
             }
         }
         initializeIxs.push(initializeUserAccountIx);
+        return [initializeIxs, userAccountPublicKey];
+    }
+    /**
+     * Initializes a user account and returns the transaction signature and the public key of the user account.
+     * @param subAccountId
+     * @param name
+     * @param referrerInfo
+     * @param txParams
+     * @returns [transactionSignature, userAccountPublicKey]
+     */
+    async initializeUserAccount(subAccountId = 0, name, referrerInfo, txParams) {
+        const [initializeIxs, userAccountPublicKey] = await this.getInitializeUserAccountIxs(subAccountId, name, referrerInfo);
         const tx = await this.buildTransaction(initializeIxs, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         await this.addUser(subAccountId);

package/lib/node/constants/perpMarkets.js

@@ -374,9 +374,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'ETH-PERP',
         baseAssetSymbol: 'ETH',
         marketIndex: 2,
-        oracle: new web3_js_1.PublicKey('6bEp2MiyoiiiDxcVqE8rUHQWwHirXUXtKfAEATTVqNzT'),
+        oracle: new web3_js_1.PublicKey('93FG52TzNKCnMiasV14Ba34BYcHDb9p4zK4GjZnLwqWR'),
         launchTs: 1670347281000,
-        oracleSource: __1.OracleSource.PYTH_PULL,
+        oracleSource: __1.OracleSource.PYTH_LAZER,
         pythFeedId: '0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
         pythLazerId: 2,
     },

package/lib/node/constants/spotMarkets.js

@@ -97,8 +97,8 @@ exports.MainnetSpotMarkets = [
         symbol: 'USDC',
         marketIndex: 0,
         poolId: 0,
-        oracle: new web3_js_1.PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
-        oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
+        oracle: new web3_js_1.PublicKey('9VCioxmni2gDLv11qufWzT3RDERhQE4iY5Gf7NTfYyAV'),
+        oracleSource: __1.OracleSource.PYTH_LAZER_STABLE_COIN,
         mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
         precision: numericConstants_1.QUOTE_PRECISION,
         precisionExp: numericConstants_1.QUOTE_PRECISION_EXP,
@@ -136,8 +136,8 @@ exports.MainnetSpotMarkets = [
         symbol: 'wBTC',
         marketIndex: 3,
         poolId: 0,
-        oracle: new web3_js_1.PublicKey('9Tq8iN5WnMX2PcZGj4iSFEAgHCi8cM6x8LsDUbuzq8uw'),
-        oracleSource: __1.OracleSource.PYTH_PULL,
+        oracle: new web3_js_1.PublicKey('fqPfDa6uQr9ndMvwaFp4mUBeUrHmLop8Jxfb1XJNmVm'),
+        oracleSource: __1.OracleSource.PYTH_LAZER,
         mint: new web3_js_1.PublicKey('3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh'),
         precision: new __1.BN(10).pow(numericConstants_1.EIGHT),
         precisionExp: numericConstants_1.EIGHT,

package/lib/node/driftClient.d.ts

@@ -146,6 +146,22 @@ export declare class DriftClient {
      * Adds and subscribes to users based on params set by the constructor or by updateWallet.
      */
     addAndSubscribeToUsers(authority?: PublicKey): Promise<boolean>;
+    /**
+     * Returns the instructions to initialize a user account and the public key of the user account.
+     * @param subAccountId
+     * @param name
+     * @param referrerInfo
+     * @returns [instructions, userAccountPublicKey]
+     */
+    getInitializeUserAccountIxs(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[TransactionInstruction[], PublicKey]>;
+    /**
+     * Initializes a user account and returns the transaction signature and the public key of the user account.
+     * @param subAccountId
+     * @param name
+     * @param referrerInfo
+     * @param txParams
+     * @returns [transactionSignature, userAccountPublicKey]
+     */
     initializeUserAccount(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
     initializeSignedMsgUserOrders(authority: PublicKey, numOrders: number, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
@@ -156,7 +172,7 @@ export declare class DriftClient {
     getInitializeFuelOverflowIx(authority?: PublicKey): Promise<TransactionInstruction>;
     sweepFuel(authority?: PublicKey): Promise<TransactionSignature>;
     getSweepFuelIx(authority?: PublicKey): Promise<TransactionInstruction>;
-    getInitializeUserInstructions(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
+    private getInitializeUserInstructions;
     getNextSubAccountId(): Promise<number>;
     initializeReferrerName(name: string): Promise<TransactionSignature>;
     updateUserName(name: string, subAccountId?: number): Promise<TransactionSignature>;

package/lib/node/driftClient.js

@@ -578,7 +578,14 @@ class DriftClient {
         }
         return result;
     }
-    async initializeUserAccount(subAccountId = 0, name, referrerInfo, txParams) {
+    /**
+     * Returns the instructions to initialize a user account and the public key of the user account.
+     * @param subAccountId
+     * @param name
+     * @param referrerInfo
+     * @returns [instructions, userAccountPublicKey]
+     */
+    async getInitializeUserAccountIxs(subAccountId = 0, name, referrerInfo) {
         const initializeIxs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         if (subAccountId === 0) {
@@ -587,6 +594,18 @@ class DriftClient {
             }
         }
         initializeIxs.push(initializeUserAccountIx);
+        return [initializeIxs, userAccountPublicKey];
+    }
+    /**
+     * Initializes a user account and returns the transaction signature and the public key of the user account.
+     * @param subAccountId
+     * @param name
+     * @param referrerInfo
+     * @param txParams
+     * @returns [transactionSignature, userAccountPublicKey]
+     */
+    async initializeUserAccount(subAccountId = 0, name, referrerInfo, txParams) {
+        const [initializeIxs, userAccountPublicKey] = await this.getInitializeUserAccountIxs(subAccountId, name, referrerInfo);
         const tx = await this.buildTransaction(initializeIxs, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         await this.addUser(subAccountId);

package/package.json

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

package/src/constants/perpMarkets.ts

@@ -415,9 +415,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'ETH-PERP',
 		baseAssetSymbol: 'ETH',
 		marketIndex: 2,
-		oracle: new PublicKey('6bEp2MiyoiiiDxcVqE8rUHQWwHirXUXtKfAEATTVqNzT'),
+		oracle: new PublicKey('93FG52TzNKCnMiasV14Ba34BYcHDb9p4zK4GjZnLwqWR'),
 		launchTs: 1670347281000,
-		oracleSource: OracleSource.PYTH_PULL,
+		oracleSource: OracleSource.PYTH_LAZER,
 		pythFeedId:
 			'0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
 		pythLazerId: 2,

package/src/constants/spotMarkets.ts

@@ -134,8 +134,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'USDC',
 		marketIndex: 0,
 		poolId: 0,
-		oracle: new PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
-		oracleSource: OracleSource.PYTH_STABLE_COIN_PULL,
+		oracle: new PublicKey('9VCioxmni2gDLv11qufWzT3RDERhQE4iY5Gf7NTfYyAV'),
+		oracleSource: OracleSource.PYTH_LAZER_STABLE_COIN,
 		mint: new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
 		precision: QUOTE_PRECISION,
 		precisionExp: QUOTE_PRECISION_EXP,
@@ -180,8 +180,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'wBTC',
 		marketIndex: 3,
 		poolId: 0,
-		oracle: new PublicKey('9Tq8iN5WnMX2PcZGj4iSFEAgHCi8cM6x8LsDUbuzq8uw'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('fqPfDa6uQr9ndMvwaFp4mUBeUrHmLop8Jxfb1XJNmVm'),
+		oracleSource: OracleSource.PYTH_LAZER,
 		mint: new PublicKey('3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh'),
 		precision: new BN(10).pow(EIGHT),
 		precisionExp: EIGHT,

package/src/driftClient.ts

@@ -996,13 +996,19 @@ export class DriftClient {
 		return result;
 	}
 
-	public async initializeUserAccount(
+	/**
+	 * Returns the instructions to initialize a user account and the public key of the user account.
+	 * @param subAccountId
+	 * @param name
+	 * @param referrerInfo
+	 * @returns [instructions, userAccountPublicKey]
+	 */
+	public async getInitializeUserAccountIxs(
 		subAccountId = 0,
 		name?: string,
-		referrerInfo?: ReferrerInfo,
-		txParams?: TxParams
-	): Promise<[TransactionSignature, PublicKey]> {
-		const initializeIxs = [];
+		referrerInfo?: ReferrerInfo
+	): Promise<[TransactionInstruction[], PublicKey]> {
+		const initializeIxs: TransactionInstruction[] = [];
 
 		const [userAccountPublicKey, initializeUserAccountIx] =
 			await this.getInitializeUserInstructions(
@@ -1020,6 +1026,27 @@ export class DriftClient {
 		}
 
 		initializeIxs.push(initializeUserAccountIx);
+
+		return [initializeIxs, userAccountPublicKey];
+	}
+
+	/**
+	 * Initializes a user account and returns the transaction signature and the public key of the user account.
+	 * @param subAccountId
+	 * @param name
+	 * @param referrerInfo
+	 * @param txParams
+	 * @returns [transactionSignature, userAccountPublicKey]
+	 */
+	public async initializeUserAccount(
+		subAccountId = 0,
+		name?: string,
+		referrerInfo?: ReferrerInfo,
+		txParams?: TxParams
+	): Promise<[TransactionSignature, PublicKey]> {
+		const [initializeIxs, userAccountPublicKey] =
+			await this.getInitializeUserAccountIxs(subAccountId, name, referrerInfo);
+
 		const tx = await this.buildTransaction(initializeIxs, txParams);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -1172,7 +1199,7 @@ export class DriftClient {
 		});
 	}
 
-	async getInitializeUserInstructions(
+	private async getInitializeUserInstructions(
 		subAccountId = 0,
 		name?: string,
 		referrerInfo?: ReferrerInfo

package/tests/ci/verifyConstants.ts

@@ -68,9 +68,10 @@ describe('Verify Constants', function () {
 		await devnetDriftClient.subscribe();
 		await mainnetDriftClient.subscribe();
 
-		const lookupTables =
-			await mainnetDriftClient.fetchAllLookupTableAccounts();
-		lutAccounts = lookupTables.map((lut) => lut.state.addresses.map((x) => x.toBase58())).flat();
+		const lookupTables = await mainnetDriftClient.fetchAllLookupTableAccounts();
+		lutAccounts = lookupTables
+			.map((lut) => lut.state.addresses.map((x) => x.toBase58()))
+			.flat();
 	});
 
 	after(async () => {