@drift-labs/sdk 2.41.0-beta.2 → 2.41.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.41.0-beta.2
+2.41.0-beta.4

package/lib/accounts/bulkAccountLoader.js

@@ -17,6 +17,9 @@ class BulkAccountLoader {
         this.pollingFrequency = pollingFrequency;
     }
     async addAccount(publicKey, callback) {
+        if (!publicKey) {
+            console.trace(`Caught adding blank publickey to bulkAccountLoader`);
+        }
         const existingSize = this.accountsToLoad.size;
         const callbackId = (0, uuid_1.v4)();
         const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
@@ -122,24 +125,22 @@ class BulkAccountLoader {
             this.log('request to rpc timed out');
             return;
         }
-        for (const i in rpcResponses) {
-            const rpcResponse = rpcResponses[i];
+        rpcResponses.forEach((rpcResponse, i) => {
             if (!rpcResponse.result) {
                 console.error('rpc response missing result:');
                 console.log(JSON.stringify(rpcResponse));
-                continue;
+                return;
             }
             const newSlot = rpcResponse.result.context.slot;
             if (newSlot > this.mostRecentSlot) {
                 this.mostRecentSlot = newSlot;
             }
             const accountsToLoad = accountsToLoadChunks[i];
-            for (const j in accountsToLoad) {
-                const accountToLoad = accountsToLoad[j];
+            accountsToLoad.forEach((accountToLoad, j) => {
                 const key = accountToLoad.publicKey.toBase58();
                 const oldRPCResponse = this.bufferAndSlotMap.get(key);
                 if (oldRPCResponse && newSlot <= oldRPCResponse.slot) {
-                    continue;
+                    return;
                 }
                 let newBuffer = undefined;
                 if (rpcResponse.result.value[j]) {
@@ -153,7 +154,7 @@ class BulkAccountLoader {
                         buffer: newBuffer,
                     });
                     this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
-                    continue;
+                    return;
                 }
                 const oldBuffer = oldRPCResponse.buffer;
                 if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
@@ -163,8 +164,8 @@ class BulkAccountLoader {
                     });
                     this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
                 }
-            }
-        }
+            });
+        });
     }
     handleAccountCallbacks(accountToLoad, buffer, slot) {
         for (const [_, callback] of accountToLoad.callbacks) {

package/lib/adminClient.d.ts

@@ -67,6 +67,7 @@ export declare class AdminClient extends DriftClient {
     updatePerpMarketUnrealizedAssetWeight(perpMarketIndex: number, unrealizedInitialAssetWeight: number, unrealizedMaintenanceAssetWeight: number): Promise<TransactionSignature>;
     updatePerpMarketMaxImbalances(perpMarketIndex: number, unrealizedMaxImbalance: BN, maxRevenueWithdrawPerPeriod: BN, quoteMaxInsurance: BN): Promise<TransactionSignature>;
     updatePerpMarketMaxOpenInterest(perpMarketIndex: number, maxOpenInterest: BN): Promise<TransactionSignature>;
+    updatePerpMarketFeeAdjustment(perpMarketIndex: number, feeAdjustment: number): Promise<TransactionSignature>;
     updateSerumVault(srmVault: PublicKey): Promise<TransactionSignature>;
     updatePerpMarketLiquidationFee(perpMarketIndex: number, liquidatorFee: number, ifLiquidationFee: number): Promise<TransactionSignature>;
     updateSpotMarketLiquidationFee(spotMarketIndex: number, liquidatorFee: number, ifLiquidationFee: number): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -764,6 +764,15 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async updatePerpMarketFeeAdjustment(perpMarketIndex, feeAdjustment) {
+        return await this.program.rpc.updatePerpMarketFeeAdjustment(feeAdjustment, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+            },
+        });
+    }
     async updateSerumVault(srmVault) {
         return await this.program.rpc.updateSerumVault({
             accounts: {

package/lib/driftClient.js

@@ -925,27 +925,29 @@ class DriftClient {
      * @param reduceOnly
      */
     async deposit(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false) {
-        const ixs = [];
+        const tx = new web3_js_1.Transaction();
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+            units: 600000,
+        }));
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const signerAuthority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && associatedTokenAccount.equals(signerAuthority);
         if (createWSOLTokenAccount) {
-            const { ixs: wrappedSolIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
+            const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             associatedTokenAccount = pubkey;
-            wrappedSolIxs.forEach((ix) => {
-                ixs.push(ix);
+            ixs.forEach((ix) => {
+                tx.add(ix);
             });
         }
         const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly, true);
-        ixs.push(depositCollateralIx);
+        tx.add(depositCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            ixs.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAccount, signerAuthority, signerAuthority, []));
+            tx.add((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAccount, signerAuthority, signerAuthority, []));
         }
-        console.log(ixs);
-        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(ixs, { computeUnits: 600000 }, 0), additionalSigners, this.opts);
+        const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }

package/lib/events/fetchLogs.js

@@ -56,8 +56,7 @@ async function fetchTransactionLogs(connection, signatures, finality) {
         return Promise.reject('RPC request timed out fetching transactions');
     }
     const logs = new Array();
-    for (const i in rpcResponses) {
-        const rpcResponse = rpcResponses[i];
+    for (const rpcResponse of rpcResponses) {
         if (rpcResponse.result) {
             logs.push(mapTransactionResponseToLog(rpcResponse.result));
         }

package/lib/idl/drift.json

@@ -2396,7 +2396,7 @@
                 },
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -4422,6 +4422,32 @@
                 }
             ]
         },
+        {
+            "name": "updatePerpMarketFeeAdjustment",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "perpMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "feeAdjustment",
+                    "type": "i16"
+                }
+            ]
+        },
         {
             "name": "updateAdmin",
             "accounts": [
@@ -5109,7 +5135,7 @@
                     },
                     {
                         "name": "padding1",
-                        "type": "bool"
+                        "type": "u8"
                     },
                     {
                         "name": "quoteSpotMarketIndex",
@@ -5118,12 +5144,21 @@
                         ],
                         "type": "u16"
                     },
+                    {
+                        "name": "feeAdjustment",
+                        "docs": [
+                            "Between -100 and 100, represents what % to increase/decrease the fee by",
+                            "E.g. if this is -50 and the fee is 5bps, the new fee will be 2.5bps",
+                            "if this is 50 and the fee is 5bps, the new fee will be 7.5bps"
+                        ],
+                        "type": "i16"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                48
+                                46
                             ]
                         }
                     }

package/lib/types.d.ts

@@ -664,6 +664,7 @@ export type PerpMarketAccount = {
         quoteMaxInsurance: BN;
     };
     quoteSpotMarketIndex: number;
+    feeAdjustment: number;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.41.0-beta.2",
+	"version": "2.41.0-beta.4",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkAccountLoader.ts

@@ -40,6 +40,10 @@ export class BulkAccountLoader {
 		publicKey: PublicKey,
 		callback: (buffer: Buffer, slot: number) => void
 	): Promise<string> {
+		if (!publicKey) {
+			console.trace(`Caught adding blank publickey to bulkAccountLoader`);
+		}
+
 		const existingSize = this.accountsToLoad.size;
 
 		const callbackId = uuidv4();
@@ -172,12 +176,11 @@ export class BulkAccountLoader {
 			return;
 		}
 
-		for (const i in rpcResponses) {
-			const rpcResponse = rpcResponses[i];
+		rpcResponses.forEach((rpcResponse, i) => {
 			if (!rpcResponse.result) {
 				console.error('rpc response missing result:');
 				console.log(JSON.stringify(rpcResponse));
-				continue;
+				return;
 			}
 			const newSlot = rpcResponse.result.context.slot;
 
@@ -186,13 +189,12 @@ export class BulkAccountLoader {
 			}
 
 			const accountsToLoad = accountsToLoadChunks[i];
-			for (const j in accountsToLoad) {
-				const accountToLoad = accountsToLoad[j];
+			accountsToLoad.forEach((accountToLoad, j) => {
 				const key = accountToLoad.publicKey.toBase58();
 				const oldRPCResponse = this.bufferAndSlotMap.get(key);
 
 				if (oldRPCResponse && newSlot <= oldRPCResponse.slot) {
-					continue;
+					return;
 				}
 
 				let newBuffer: Buffer | undefined = undefined;
@@ -208,7 +210,7 @@ export class BulkAccountLoader {
 						buffer: newBuffer,
 					});
 					this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
-					continue;
+					return;
 				}
 
 				const oldBuffer = oldRPCResponse.buffer;
@@ -219,8 +221,8 @@ export class BulkAccountLoader {
 					});
 					this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
 				}
-			}
-		}
+			});
+		});
 	}
 
 	handleAccountCallbacks(

package/src/adminClient.ts

@@ -1464,6 +1464,22 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
+	public async updatePerpMarketFeeAdjustment(
+		perpMarketIndex: number,
+		feeAdjustment: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updatePerpMarketFeeAdjustment(feeAdjustment, {
+			accounts: {
+				admin: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				perpMarket: await getPerpMarketPublicKey(
+					this.program.programId,
+					perpMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updateSerumVault(
 		srmVault: PublicKey
 	): Promise<TransactionSignature> {

package/src/driftClient.ts

@@ -1557,7 +1557,12 @@ export class DriftClient {
 		subAccountId?: number,
 		reduceOnly = false
 	): Promise<TransactionSignature> {
-		const ixs: Array<TransactionInstruction> = [];
+		const tx = new Transaction();
+		tx.add(
+			ComputeBudgetProgram.setComputeUnitLimit({
+				units: 600_000,
+			})
+		);
 
 		const additionalSigners: Array<Signer> = [];
 
@@ -1571,13 +1576,15 @@ export class DriftClient {
 			isSolMarket && associatedTokenAccount.equals(signerAuthority);
 
 		if (createWSOLTokenAccount) {
-			const { ixs: wrappedSolIxs, pubkey } =
-				await this.getWrappedSolAccountCreationIxs(amount, true);
+			const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(
+				amount,
+				true
+			);
 
 			associatedTokenAccount = pubkey;
 
-			wrappedSolIxs.forEach((ix) => {
-				ixs.push(ix);
+			ixs.forEach((ix) => {
+				tx.add(ix);
 			});
 		}
 
@@ -1590,11 +1597,11 @@ export class DriftClient {
 			true
 		);
 
-		ixs.push(depositCollateralIx);
+		tx.add(depositCollateralIx);
 
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
-			ixs.push(
+			tx.add(
 				createCloseAccountInstruction(
 					associatedTokenAccount,
 					signerAuthority,
@@ -1604,9 +1611,8 @@ export class DriftClient {
 			);
 		}
 
-		console.log(ixs);
 		const { txSig, slot } = await this.sendTransaction(
-			await this.buildTransaction(ixs, { computeUnits: 600_000 }, 0),
+			tx,
 			additionalSigners,
 			this.opts
 		);

package/src/events/fetchLogs.ts

@@ -117,8 +117,7 @@ export async function fetchTransactionLogs(
 	}
 
 	const logs = new Array<Log>();
-	for (const i in rpcResponses) {
-		const rpcResponse = rpcResponses[i];
+	for (const rpcResponse of rpcResponses) {
 		if (rpcResponse.result) {
 			logs.push(mapTransactionResponseToLog(rpcResponse.result));
 		}

package/src/idl/drift.json

@@ -2396,7 +2396,7 @@
         },
         {
           "name": "spotMarket",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {
@@ -4422,6 +4422,32 @@
         }
       ]
     },
+    {
+      "name": "updatePerpMarketFeeAdjustment",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "feeAdjustment",
+          "type": "i16"
+        }
+      ]
+    },
     {
       "name": "updateAdmin",
       "accounts": [
@@ -5109,7 +5135,7 @@
           },
           {
             "name": "padding1",
-            "type": "bool"
+            "type": "u8"
           },
           {
             "name": "quoteSpotMarketIndex",
@@ -5118,12 +5144,21 @@
             ],
             "type": "u16"
           },
+          {
+            "name": "feeAdjustment",
+            "docs": [
+              "Between -100 and 100, represents what % to increase/decrease the fee by",
+              "E.g. if this is -50 and the fee is 5bps, the new fee will be 2.5bps",
+              "if this is 50 and the fee is 5bps, the new fee will be 7.5bps"
+            ],
+            "type": "i16"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                48
+                46
               ]
             }
           }

package/src/types.ts

@@ -585,6 +585,7 @@ export type PerpMarketAccount = {
 		quoteMaxInsurance: BN;
 	};
 	quoteSpotMarketIndex: number;
+	feeAdjustment: number;
 };
 
 export type HistoricalOracleData = {

package/tests/dlob/helpers.ts

@@ -178,6 +178,7 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 			quoteMaxInsurance: new BN(0),
 		},
 		quoteSpotMarketIndex: 0,
+		feeAdjustment: 0,
 	},
 	{
 		status: MarketStatus.INITIALIZED,
@@ -215,6 +216,7 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 			quoteMaxInsurance: new BN(0),
 		},
 		quoteSpotMarketIndex: 0,
+		feeAdjustment: 0,
 	},
 	{
 		status: MarketStatus.INITIALIZED,
@@ -252,6 +254,7 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 			quoteMaxInsurance: new BN(0),
 		},
 		quoteSpotMarketIndex: 0,
+		feeAdjustment: 0,
 	},
 ];