@drift-labs/sdk 2.114.0-beta.5 → 2.114.0-beta.7

package/VERSION

@@ -1 +1 @@
-2.114.0-beta.5
+2.114.0-beta.7

package/lib/browser/driftClient.d.ts

@@ -912,6 +912,7 @@ export declare class DriftClient {
     }, feedId: string, encodedVaaAddress: PublicKey): Promise<TransactionInstruction>;
     postPythLazerOracleUpdate(feedIds: number[], pythMessageHex: string): Promise<string>;
     getPostPythLazerOracleUpdateIxs(feedIds: number[], pythMessageHex: string, precedingIxs?: TransactionInstruction[], overrideCustomIxIndex?: number): Promise<TransactionInstruction[]>;
+    getPostManySwitchboardOnDemandUpdatesAtomicIxs(feeds: PublicKey[], recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionInstruction[] | undefined>;
     getPostSwitchboardOnDemandUpdateAtomicIx(feed: PublicKey, recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionInstruction | undefined>;
     postSwitchboardOnDemandUpdate(feed: PublicKey, recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionSignature>;
     private getBuildEncodedVaaIxs;

package/lib/browser/driftClient.js

@@ -4848,6 +4848,30 @@ class DriftClient {
         });
         return [verifyIx, ix];
     }
+    async getPostManySwitchboardOnDemandUpdatesAtomicIxs(feeds, recentSlothash, numSignatures = 3) {
+        const program = await this.getSwitchboardOnDemandProgram();
+        for (const feed of feeds) {
+            const feedAccount = new on_demand_1.PullFeed(program, feed);
+            if (!this.sbProgramFeedConfigs) {
+                this.sbProgramFeedConfigs = new Map();
+            }
+            if (!this.sbProgramFeedConfigs.has(feedAccount.pubkey.toString())) {
+                const feedConfig = await feedAccount.loadConfigs();
+                this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
+            }
+        }
+        const [pullIxs, _responses, success] = await on_demand_1.PullFeed.fetchUpdateManyIx(program, {
+            feeds,
+            numSignatures,
+            recentSlothashes: recentSlothash
+                ? [[new anchor_1.BN(recentSlothash.slot), recentSlothash.hash]]
+                : undefined,
+        });
+        if (!success) {
+            return undefined;
+        }
+        return pullIxs;
+    }
     async getPostSwitchboardOnDemandUpdateAtomicIx(feed, recentSlothash, numSignatures = 3) {
         const program = await this.getSwitchboardOnDemandProgram();
         const feedAccount = new on_demand_1.PullFeed(program, feed);
@@ -4858,15 +4882,17 @@ class DriftClient {
             const feedConfig = await feedAccount.loadConfigs();
             this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
         }
-        const [pullIx, _responses, success] = await feedAccount.fetchUpdateIx({
+        const [pullIx, _responses, success] = await on_demand_1.PullFeed.fetchUpdateManyIx(program, {
+            feeds: [feed],
             numSignatures,
-        }, recentSlothash
-            ? [[new anchor_1.BN(recentSlothash.slot), recentSlothash.hash]]
-            : undefined);
+            recentSlothashes: recentSlothash
+                ? [[new anchor_1.BN(recentSlothash.slot), recentSlothash.hash]]
+                : undefined,
+        });
         if (!success) {
             return undefined;
         }
-        return pullIx;
+        return pullIx[0];
     }
     async postSwitchboardOnDemandUpdate(feed, recentSlothash, numSignatures = 3) {
         const pullIx = await this.getPostSwitchboardOnDemandUpdateAtomicIx(feed, recentSlothash, numSignatures);

package/lib/browser/math/funding.d.ts

@@ -9,17 +9,17 @@ import { OraclePriceData } from '../oracles/types';
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateAllEstimatedFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): Promise<[BN, BN, BN, BN, BN]>;
+export declare function calculateAllEstimatedFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): [BN, BN, BN, BN, BN];
 /**
  * Calculate funding rates in human-readable form. Values will have some lost precision and shouldn't be used in strict accounting.
  * @param period : 'hour' | 'year' :: Use 'hour' for the hourly payment as a percentage, 'year' for the payment as an estimated APR.
  */
-export declare function calculateFormattedLiveFundingRate(market: PerpMarketAccount, oraclePriceData: OraclePriceData, period: 'hour' | 'year'): Promise<{
+export declare function calculateFormattedLiveFundingRate(market: PerpMarketAccount, oraclePriceData: OraclePriceData, period: 'hour' | 'year'): {
     longRate: number;
     shortRate: number;
     fundingRateUnit: string;
     formattedFundingRateSummary: string;
-}>;
+};
 /**
  *
  * @param market
@@ -27,7 +27,7 @@ export declare function calculateFormattedLiveFundingRate(market: PerpMarketAcco
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateLongShortFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): Promise<[BN, BN]>;
+export declare function calculateLongShortFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): [BN, BN];
 /**
  *
  * @param market
@@ -35,7 +35,7 @@ export declare function calculateLongShortFundingRate(market: PerpMarketAccount,
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateLongShortFundingRateAndLiveTwaps(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): Promise<[BN, BN, BN, BN]>;
+export declare function calculateLongShortFundingRateAndLiveTwaps(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): [BN, BN, BN, BN];
 /**
  *
  * @param market

package/lib/browser/math/funding.js

@@ -58,7 +58,7 @@ function shrinkStaleTwaps(market, markTwapWithMantissa, oracleTwapWithMantissa,
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-async function calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now) {
+function calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now) {
     if ((0, types_1.isVariant)(market.status, 'uninitialized')) {
         return [numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO];
     }
@@ -152,9 +152,9 @@ const getFundingRatePct = (rawFundingRate) => {
  * Calculate funding rates in human-readable form. Values will have some lost precision and shouldn't be used in strict accounting.
  * @param period : 'hour' | 'year' :: Use 'hour' for the hourly payment as a percentage, 'year' for the payment as an estimated APR.
  */
-async function calculateFormattedLiveFundingRate(market, oraclePriceData, period) {
+function calculateFormattedLiveFundingRate(market, oraclePriceData, period) {
     const nowBN = new anchor_1.BN(Date.now() / 1000);
-    const [_markTwapLive, _oracleTwapLive, longFundingRate, shortFundingRate] = await calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, undefined, nowBN);
+    const [_markTwapLive, _oracleTwapLive, longFundingRate, shortFundingRate] = calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, undefined, nowBN);
     let longFundingRateNum = getFundingRatePct(longFundingRate);
     let shortFundingRateNum = getFundingRatePct(shortFundingRate);
     if (period == 'year') {
@@ -205,8 +205,8 @@ function getMaxPriceDivergenceForFundingRate(market, oracleTwap) {
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-async function calculateLongShortFundingRate(market, oraclePriceData, markPrice, now) {
-    const [_1, _2, _, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
+function calculateLongShortFundingRate(market, oraclePriceData, markPrice, now) {
+    const [_1, _2, _, cappedAltEst, interpEst] = calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
     if (market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort)) {
         return [cappedAltEst, interpEst];
     }
@@ -225,8 +225,8 @@ exports.calculateLongShortFundingRate = calculateLongShortFundingRate;
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-async function calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, markPrice, now) {
-    const [markTwapLive, oracleTwapLive, _2, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
+function calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, markPrice, now) {
+    const [markTwapLive, oracleTwapLive, _2, cappedAltEst, interpEst] = calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
     if (market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort.abs())) {
         return [markTwapLive, oracleTwapLive, cappedAltEst, interpEst];
     }

package/lib/browser/math/superStake.d.ts

@@ -5,7 +5,6 @@ import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
-import fetch from 'node-fetch';
 export type BSOL_STATS_API_RESPONSE = {
     success: boolean;
     stats?: {
@@ -28,8 +27,8 @@ export type BSOL_EMISSIONS_API_RESPONSE = {
         lend: number;
     };
 };
-export declare function fetchBSolMetrics(): Promise<fetch.Response>;
-export declare function fetchBSolDriftEmissions(): Promise<fetch.Response>;
+export declare function fetchBSolMetrics(): Promise<any>;
+export declare function fetchBSolDriftEmissions(): Promise<any>;
 export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
     marketIndex: number;
     amount: BN;

package/lib/node/driftClient.d.ts

@@ -912,6 +912,7 @@ export declare class DriftClient {
     }, feedId: string, encodedVaaAddress: PublicKey): Promise<TransactionInstruction>;
     postPythLazerOracleUpdate(feedIds: number[], pythMessageHex: string): Promise<string>;
     getPostPythLazerOracleUpdateIxs(feedIds: number[], pythMessageHex: string, precedingIxs?: TransactionInstruction[], overrideCustomIxIndex?: number): Promise<TransactionInstruction[]>;
+    getPostManySwitchboardOnDemandUpdatesAtomicIxs(feeds: PublicKey[], recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionInstruction[] | undefined>;
     getPostSwitchboardOnDemandUpdateAtomicIx(feed: PublicKey, recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionInstruction | undefined>;
     postSwitchboardOnDemandUpdate(feed: PublicKey, recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionSignature>;
     private getBuildEncodedVaaIxs;

package/lib/node/driftClient.js

@@ -4848,6 +4848,30 @@ class DriftClient {
         });
         return [verifyIx, ix];
     }
+    async getPostManySwitchboardOnDemandUpdatesAtomicIxs(feeds, recentSlothash, numSignatures = 3) {
+        const program = await this.getSwitchboardOnDemandProgram();
+        for (const feed of feeds) {
+            const feedAccount = new on_demand_1.PullFeed(program, feed);
+            if (!this.sbProgramFeedConfigs) {
+                this.sbProgramFeedConfigs = new Map();
+            }
+            if (!this.sbProgramFeedConfigs.has(feedAccount.pubkey.toString())) {
+                const feedConfig = await feedAccount.loadConfigs();
+                this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
+            }
+        }
+        const [pullIxs, _responses, success] = await on_demand_1.PullFeed.fetchUpdateManyIx(program, {
+            feeds,
+            numSignatures,
+            recentSlothashes: recentSlothash
+                ? [[new anchor_1.BN(recentSlothash.slot), recentSlothash.hash]]
+                : undefined,
+        });
+        if (!success) {
+            return undefined;
+        }
+        return pullIxs;
+    }
     async getPostSwitchboardOnDemandUpdateAtomicIx(feed, recentSlothash, numSignatures = 3) {
         const program = await this.getSwitchboardOnDemandProgram();
         const feedAccount = new on_demand_1.PullFeed(program, feed);
@@ -4858,15 +4882,17 @@ class DriftClient {
             const feedConfig = await feedAccount.loadConfigs();
             this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
         }
-        const [pullIx, _responses, success] = await feedAccount.fetchUpdateIx({
+        const [pullIx, _responses, success] = await on_demand_1.PullFeed.fetchUpdateManyIx(program, {
+            feeds: [feed],
             numSignatures,
-        }, recentSlothash
-            ? [[new anchor_1.BN(recentSlothash.slot), recentSlothash.hash]]
-            : undefined);
+            recentSlothashes: recentSlothash
+                ? [[new anchor_1.BN(recentSlothash.slot), recentSlothash.hash]]
+                : undefined,
+        });
         if (!success) {
             return undefined;
         }
-        return pullIx;
+        return pullIx[0];
     }
     async postSwitchboardOnDemandUpdate(feed, recentSlothash, numSignatures = 3) {
         const pullIx = await this.getPostSwitchboardOnDemandUpdateAtomicIx(feed, recentSlothash, numSignatures);

package/lib/node/math/funding.d.ts

@@ -9,17 +9,17 @@ import { OraclePriceData } from '../oracles/types';
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateAllEstimatedFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): Promise<[BN, BN, BN, BN, BN]>;
+export declare function calculateAllEstimatedFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): [BN, BN, BN, BN, BN];
 /**
  * Calculate funding rates in human-readable form. Values will have some lost precision and shouldn't be used in strict accounting.
  * @param period : 'hour' | 'year' :: Use 'hour' for the hourly payment as a percentage, 'year' for the payment as an estimated APR.
  */
-export declare function calculateFormattedLiveFundingRate(market: PerpMarketAccount, oraclePriceData: OraclePriceData, period: 'hour' | 'year'): Promise<{
+export declare function calculateFormattedLiveFundingRate(market: PerpMarketAccount, oraclePriceData: OraclePriceData, period: 'hour' | 'year'): {
     longRate: number;
     shortRate: number;
     fundingRateUnit: string;
     formattedFundingRateSummary: string;
-}>;
+};
 /**
  *
  * @param market
@@ -27,7 +27,7 @@ export declare function calculateFormattedLiveFundingRate(market: PerpMarketAcco
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateLongShortFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): Promise<[BN, BN]>;
+export declare function calculateLongShortFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): [BN, BN];
 /**
  *
  * @param market
@@ -35,7 +35,7 @@ export declare function calculateLongShortFundingRate(market: PerpMarketAccount,
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateLongShortFundingRateAndLiveTwaps(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): Promise<[BN, BN, BN, BN]>;
+export declare function calculateLongShortFundingRateAndLiveTwaps(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): [BN, BN, BN, BN];
 /**
  *
  * @param market

package/lib/node/math/funding.js

@@ -58,7 +58,7 @@ function shrinkStaleTwaps(market, markTwapWithMantissa, oracleTwapWithMantissa,
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-async function calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now) {
+function calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now) {
     if ((0, types_1.isVariant)(market.status, 'uninitialized')) {
         return [numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO];
     }
@@ -152,9 +152,9 @@ const getFundingRatePct = (rawFundingRate) => {
  * Calculate funding rates in human-readable form. Values will have some lost precision and shouldn't be used in strict accounting.
  * @param period : 'hour' | 'year' :: Use 'hour' for the hourly payment as a percentage, 'year' for the payment as an estimated APR.
  */
-async function calculateFormattedLiveFundingRate(market, oraclePriceData, period) {
+function calculateFormattedLiveFundingRate(market, oraclePriceData, period) {
     const nowBN = new anchor_1.BN(Date.now() / 1000);
-    const [_markTwapLive, _oracleTwapLive, longFundingRate, shortFundingRate] = await calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, undefined, nowBN);
+    const [_markTwapLive, _oracleTwapLive, longFundingRate, shortFundingRate] = calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, undefined, nowBN);
     let longFundingRateNum = getFundingRatePct(longFundingRate);
     let shortFundingRateNum = getFundingRatePct(shortFundingRate);
     if (period == 'year') {
@@ -205,8 +205,8 @@ function getMaxPriceDivergenceForFundingRate(market, oracleTwap) {
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-async function calculateLongShortFundingRate(market, oraclePriceData, markPrice, now) {
-    const [_1, _2, _, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
+function calculateLongShortFundingRate(market, oraclePriceData, markPrice, now) {
+    const [_1, _2, _, cappedAltEst, interpEst] = calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
     if (market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort)) {
         return [cappedAltEst, interpEst];
     }
@@ -225,8 +225,8 @@ exports.calculateLongShortFundingRate = calculateLongShortFundingRate;
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-async function calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, markPrice, now) {
-    const [markTwapLive, oracleTwapLive, _2, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
+function calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, markPrice, now) {
+    const [markTwapLive, oracleTwapLive, _2, cappedAltEst, interpEst] = calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
     if (market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort.abs())) {
         return [markTwapLive, oracleTwapLive, cappedAltEst, interpEst];
     }

package/lib/node/math/superStake.d.ts

@@ -5,7 +5,6 @@ import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
-import fetch from 'node-fetch';
 export type BSOL_STATS_API_RESPONSE = {
     success: boolean;
     stats?: {
@@ -28,8 +27,8 @@ export type BSOL_EMISSIONS_API_RESPONSE = {
         lend: number;
     };
 };
-export declare function fetchBSolMetrics(): Promise<fetch.Response>;
-export declare function fetchBSolDriftEmissions(): Promise<fetch.Response>;
+export declare function fetchBSolMetrics(): Promise<any>;
+export declare function fetchBSolDriftEmissions(): Promise<any>;
 export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
     marketIndex: number;
     amount: BN;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.114.0-beta.5",
+	"version": "2.114.0-beta.7",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",
@@ -47,7 +47,7 @@
 		"@pythnetwork/pyth-solana-receiver": "0.7.0",
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",
-		"@switchboard-xyz/on-demand": "1.2.42",
+		"@switchboard-xyz/on-demand": "2.2.0",
 		"@triton-one/yellowstone-grpc": "1.3.0",
 		"anchor-bankrun": "0.3.0",
 		"nanoid": "3.3.4",

package/src/driftClient.ts

@@ -9289,6 +9289,39 @@ export class DriftClient {
 		return [verifyIx, ix];
 	}
 
+	public async getPostManySwitchboardOnDemandUpdatesAtomicIxs(
+		feeds: PublicKey[],
+		recentSlothash?: Slothash,
+		numSignatures = 3
+	): Promise<TransactionInstruction[] | undefined> {
+		const program = await this.getSwitchboardOnDemandProgram();
+		for (const feed of feeds) {
+			const feedAccount = new PullFeed(program, feed);
+			if (!this.sbProgramFeedConfigs) {
+				this.sbProgramFeedConfigs = new Map();
+			}
+			if (!this.sbProgramFeedConfigs.has(feedAccount.pubkey.toString())) {
+				const feedConfig = await feedAccount.loadConfigs();
+				this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
+			}
+		}
+
+		const [pullIxs, _responses, success] = await PullFeed.fetchUpdateManyIx(
+			program,
+			{
+				feeds,
+				numSignatures,
+				recentSlothashes: recentSlothash
+					? [[new BN(recentSlothash.slot), recentSlothash.hash]]
+					: undefined,
+			}
+		);
+		if (!success) {
+			return undefined;
+		}
+		return pullIxs;
+	}
+
 	public async getPostSwitchboardOnDemandUpdateAtomicIx(
 		feed: PublicKey,
 		recentSlothash?: Slothash,
@@ -9303,18 +9336,20 @@ export class DriftClient {
 			const feedConfig = await feedAccount.loadConfigs();
 			this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
 		}
-		const [pullIx, _responses, success] = await feedAccount.fetchUpdateIx(
+		const [pullIx, _responses, success] = await PullFeed.fetchUpdateManyIx(
+			program,
 			{
+				feeds: [feed],
 				numSignatures,
-			},
-			recentSlothash
-				? [[new BN(recentSlothash.slot), recentSlothash.hash]]
-				: undefined
+				recentSlothashes: recentSlothash
+					? [[new BN(recentSlothash.slot), recentSlothash.hash]]
+					: undefined,
+			}
 		);
 		if (!success) {
 			return undefined;
 		}
-		return pullIx;
+		return pullIx[0];
 	}
 
 	public async postSwitchboardOnDemandUpdate(

package/src/math/funding.ts

@@ -120,12 +120,12 @@ function shrinkStaleTwaps(
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export async function calculateAllEstimatedFundingRate(
+export function calculateAllEstimatedFundingRate(
 	market: PerpMarketAccount,
 	oraclePriceData?: OraclePriceData,
 	markPrice?: BN,
 	now?: BN
-): Promise<[BN, BN, BN, BN, BN]> {
+): [BN, BN, BN, BN, BN] {
 	if (isVariant(market.status, 'uninitialized')) {
 		return [ZERO, ZERO, ZERO, ZERO, ZERO];
 	}
@@ -263,20 +263,20 @@ const getFundingRatePct = (rawFundingRate: BN) => {
  * Calculate funding rates in human-readable form. Values will have some lost precision and shouldn't be used in strict accounting.
  * @param period : 'hour' | 'year' :: Use 'hour' for the hourly payment as a percentage, 'year' for the payment as an estimated APR.
  */
-export async function calculateFormattedLiveFundingRate(
+export function calculateFormattedLiveFundingRate(
 	market: PerpMarketAccount,
 	oraclePriceData: OraclePriceData,
 	period: 'hour' | 'year'
-): Promise<{
+): {
 	longRate: number;
 	shortRate: number;
 	fundingRateUnit: string;
 	formattedFundingRateSummary: string;
-}> {
+} {
 	const nowBN = new BN(Date.now() / 1000);
 
 	const [_markTwapLive, _oracleTwapLive, longFundingRate, shortFundingRate] =
-		await calculateLongShortFundingRateAndLiveTwaps(
+		calculateLongShortFundingRateAndLiveTwaps(
 			market,
 			oraclePriceData,
 			undefined,
@@ -347,19 +347,18 @@ function getMaxPriceDivergenceForFundingRate(
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export async function calculateLongShortFundingRate(
+export function calculateLongShortFundingRate(
 	market: PerpMarketAccount,
 	oraclePriceData?: OraclePriceData,
 	markPrice?: BN,
 	now?: BN
-): Promise<[BN, BN]> {
-	const [_1, _2, _, cappedAltEst, interpEst] =
-		await calculateAllEstimatedFundingRate(
-			market,
-			oraclePriceData,
-			markPrice,
-			now
-		);
+): [BN, BN] {
+	const [_1, _2, _, cappedAltEst, interpEst] = calculateAllEstimatedFundingRate(
+		market,
+		oraclePriceData,
+		markPrice,
+		now
+	);
 
 	if (market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort)) {
 		return [cappedAltEst, interpEst];
@@ -379,19 +378,14 @@ export async function calculateLongShortFundingRate(
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export async function calculateLongShortFundingRateAndLiveTwaps(
+export function calculateLongShortFundingRateAndLiveTwaps(
 	market: PerpMarketAccount,
 	oraclePriceData?: OraclePriceData,
 	markPrice?: BN,
 	now?: BN
-): Promise<[BN, BN, BN, BN]> {
+): [BN, BN, BN, BN] {
 	const [markTwapLive, oracleTwapLive, _2, cappedAltEst, interpEst] =
-		await calculateAllEstimatedFundingRate(
-			market,
-			oraclePriceData,
-			markPrice,
-			now
-		);
+		calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
 
 	if (
 		market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort.abs())

package/tests/amm/test.ts

@@ -1303,7 +1303,7 @@ describe('AMM Tests', () => {
 		);
 	});
 
-	it('predicted funding rate mock1', async () => {
+	it('predicted funding rate mock1', () => {
 		const myMockPerpMarkets = _.cloneDeep(mockPerpMarkets);
 		const mockMarket1 = myMockPerpMarkets[0];
 
@@ -1350,7 +1350,7 @@ describe('AMM Tests', () => {
 			_lowerboundEst,
 			_cappedAltEst,
 			_interpEst,
-		] = await calculateAllEstimatedFundingRate(
+		] = calculateAllEstimatedFundingRate(
 			mockMarket1,
 			oraclePriceData,
 			currentMarkPrice,
@@ -1358,7 +1358,7 @@ describe('AMM Tests', () => {
 		);
 
 		const [markTwapLive, oracleTwapLive, est1, est2] =
-			await calculateLongShortFundingRateAndLiveTwaps(
+			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				oraclePriceData,
 				currentMarkPrice,
@@ -1376,7 +1376,7 @@ describe('AMM Tests', () => {
 		assert(est2.eq(new BN('16525')));
 	});
 
-	it('predicted funding rate mock2', async () => {
+	it('predicted funding rate mock2', () => {
 		const myMockPerpMarkets = _.cloneDeep(mockPerpMarkets);
 		const mockMarket1 = myMockPerpMarkets[0];
 
@@ -1423,7 +1423,7 @@ describe('AMM Tests', () => {
 			_lowerboundEst,
 			_cappedAltEst,
 			_interpEst,
-		] = await calculateAllEstimatedFundingRate(
+		] = calculateAllEstimatedFundingRate(
 			mockMarket1,
 			oraclePriceData,
 			currentMarkPrice,
@@ -1438,7 +1438,7 @@ describe('AMM Tests', () => {
 		// console.log('-----');
 
 		const [markTwapLive, oracleTwapLive, est1, est2] =
-			await calculateLongShortFundingRateAndLiveTwaps(
+			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				oraclePriceData,
 				currentMarkPrice,
@@ -1465,7 +1465,7 @@ describe('AMM Tests', () => {
 		assert(est2.eq(new BN('-719')));
 	});
 
-	it('predicted funding rate mock clamp', async () => {
+	it('predicted funding rate mock clamp', () => {
 		const myMockPerpMarkets = _.cloneDeep(mockPerpMarkets);
 		const mockMarket1 = myMockPerpMarkets[0];
 
@@ -1513,7 +1513,7 @@ describe('AMM Tests', () => {
 			_lowerboundEst,
 			_cappedAltEst,
 			_interpEst,
-		] = await calculateAllEstimatedFundingRate(
+		] = calculateAllEstimatedFundingRate(
 			mockMarket1,
 			oraclePriceData,
 			currentMarkPrice,
@@ -1528,7 +1528,7 @@ describe('AMM Tests', () => {
 		// console.log('-----');
 
 		let [markTwapLive, oracleTwapLive, est1, est2] =
-			await calculateLongShortFundingRateAndLiveTwaps(
+			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				oraclePriceData,
 				currentMarkPrice,
@@ -1557,7 +1557,7 @@ describe('AMM Tests', () => {
 		mockMarket1.contractTier = ContractTier.C;
 
 		[markTwapLive, oracleTwapLive, est1, est2] =
-			await calculateLongShortFundingRateAndLiveTwaps(
+			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				oraclePriceData,
 				currentMarkPrice,
@@ -1586,7 +1586,7 @@ describe('AMM Tests', () => {
 		mockMarket1.contractTier = ContractTier.SPECULATIVE;
 
 		[markTwapLive, oracleTwapLive, est1, est2] =
-			await calculateLongShortFundingRateAndLiveTwaps(
+			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				oraclePriceData,
 				currentMarkPrice,