@drift-labs/sdk 0.1.33 → 0.1.34-master.2

package/lib/accounts/pollingClearingHouseAccountSubscriber.d.ts

@@ -35,6 +35,7 @@ export declare class PollingClearingHouseAccountSubscriber implements ClearingHo
     getClearingHouseAccounts(): Promise<ClearingHouseAccounts>;
     addToAccountLoader(): Promise<void>;
     fetch(): Promise<void>;
+    didSubscriptionSucceed(): boolean;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
     assertOptionalIsSubscribed(optionalSubscription: ClearingHouseAccountTypes): void;

package/lib/accounts/pollingClearingHouseAccountSubscriber.js

@@ -42,11 +42,14 @@ class PollingClearingHouseAccountSubscriber {
             yield this.updateAccountsToPoll();
             yield this.addToAccountLoader();
             yield this.fetch();
-            this.eventEmitter.emit('update');
+            const subscriptionSucceeded = this.didSubscriptionSucceed();
+            if (subscriptionSucceeded) {
+                this.eventEmitter.emit('update');
+            }
             this.isSubscribing = false;
-            this.isSubscribed = true;
-            this.subscriptionPromiseResolver(true);
-            return true;
+            this.isSubscribed = subscriptionSucceeded;
+            this.subscriptionPromiseResolver(subscriptionSucceeded);
+            return subscriptionSucceeded;
         });
     }
     updateAccountsToPoll() {
@@ -177,6 +180,16 @@ class PollingClearingHouseAccountSubscriber {
             }
         });
     }
+    didSubscriptionSucceed() {
+        let success = true;
+        for (const [_, accountToPoll] of this.accountsToPoll) {
+            if (!this[accountToPoll.key]) {
+                success = false;
+                break;
+            }
+        }
+        return success;
+    }
     unsubscribe() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isSubscribed) {

package/lib/accounts/pollingUserAccountSubscriber.d.ts

@@ -24,6 +24,7 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     addToAccountLoader(userPublicKeys?: UserPublicKeys): Promise<void>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;
+    didSubscriptionSucceed(): boolean;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
     getUserAccount(): UserAccount;

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -31,9 +31,12 @@ class PollingUserAccountSubscriber {
             }
             yield this.addToAccountLoader();
             yield this.fetchIfUnloaded();
-            this.eventEmitter.emit('update');
-            this.isSubscribed = true;
-            return true;
+            const subscriptionSucceeded = this.didSubscriptionSucceed();
+            if (subscriptionSucceeded) {
+                this.eventEmitter.emit('update');
+            }
+            this.isSubscribed = subscriptionSucceeded;
+            return subscriptionSucceeded;
         });
     }
     addToAccountLoader(userPublicKeys) {
@@ -122,6 +125,17 @@ class PollingUserAccountSubscriber {
             }
         });
     }
+    didSubscriptionSucceed() {
+        let success = true;
+        for (const [_, accountToPoll] of this.accountsToPoll) {
+            // userOrders may not exist
+            if (accountToPoll.key !== 'userOrders' && !this[accountToPoll.key]) {
+                success = false;
+                break;
+            }
+        }
+        return success;
+    }
     unsubscribe() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isSubscribed) {

package/lib/admin.d.ts

@@ -24,6 +24,7 @@ export declare class Admin extends ClearingHouse {
     withdrawFromInsuranceVaultToMarket(marketIndex: BN, amount: BN): Promise<TransactionSignature>;
     updateAdmin(admin: PublicKey): Promise<TransactionSignature>;
     updateMarginRatio(marketIndex: BN, marginRatioInitial: number, marginRatioPartial: number, marginRatioMaintenance: number): Promise<TransactionSignature>;
+    updateMarketBaseSpread(marketIndex: BN, baseSpread: number): Promise<TransactionSignature>;
     updatePartialLiquidationClosePercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
     updatePartialLiquidationPenaltyPercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
     updateFullLiquidationPenaltyPercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;

package/lib/admin.js

@@ -338,6 +338,17 @@ class Admin extends clearingHouse_1.ClearingHouse {
             });
         });
     }
+    updateMarketBaseSpread(marketIndex, baseSpread) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.program.rpc.updateMarketBaseSpread(marketIndex, baseSpread, {
+                accounts: {
+                    admin: this.wallet.publicKey,
+                    state: yield this.getStatePublicKey(),
+                    markets: this.getStateAccount().markets,
+                },
+            });
+        });
+    }
     updatePartialLiquidationClosePercentage(numerator, denominator) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.program.rpc.updatePartialLiquidationClosePercentage(numerator, denominator, {

package/lib/constants/numericConstants.d.ts

@@ -6,6 +6,7 @@ export declare const TWO: BN;
 export declare const TEN: BN;
 export declare const TEN_THOUSAND: BN;
 export declare const BN_MAX: BN;
+export declare const TEN_MILLION: BN;
 export declare const MAX_LEVERAGE: BN;
 export declare const QUOTE_PRECISION: BN;
 export declare const MARK_PRICE_PRECISION: BN;
@@ -17,3 +18,4 @@ export declare const AMM_TO_QUOTE_PRECISION_RATIO: BN;
 export declare const PRICE_TO_QUOTE_PRECISION: BN;
 export declare const AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO: BN;
 export declare const MARGIN_PRECISION: BN;
+export declare const BID_ASK_SPREAD_PRECISION: BN;

package/lib/constants/numericConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.MAX_LEVERAGE = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
+exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
 exports.ONE = new __1.BN(1);
@@ -8,6 +8,7 @@ exports.TWO = new __1.BN(2);
 exports.TEN = new __1.BN(10);
 exports.TEN_THOUSAND = new __1.BN(10000);
 exports.BN_MAX = new __1.BN(Number.MAX_SAFE_INTEGER);
+exports.TEN_MILLION = exports.TEN_THOUSAND.mul(exports.TEN_THOUSAND);
 exports.MAX_LEVERAGE = new __1.BN(5);
 exports.QUOTE_PRECISION = new __1.BN(Math.pow(10, 6));
 exports.MARK_PRICE_PRECISION = new __1.BN(Math.pow(10, 10));
@@ -19,3 +20,4 @@ exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION.div(exports
 exports.PRICE_TO_QUOTE_PRECISION = exports.MARK_PRICE_PRECISION.div(exports.QUOTE_PRECISION);
 exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION.mul(exports.PEG_PRECISION).div(exports.QUOTE_PRECISION); // 10^10
 exports.MARGIN_PRECISION = exports.TEN_THOUSAND;
+exports.BID_ASK_SPREAD_PRECISION = new __1.BN(1000000);

package/lib/idl/clearing_house.json

@@ -1905,6 +1905,36 @@
                 }
             ]
         },
+        {
+            "name": "updateMarketBaseSpread",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "markets",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "marketIndex",
+                    "type": "u64"
+                },
+                {
+                    "name": "baseSpread",
+                    "type": "u16"
+                }
+            ]
+        },
         {
             "name": "updateMarketMinimumBaseAssetTradeSize",
             "accounts": [
@@ -2508,7 +2538,11 @@
                     },
                     {
                         "name": "totalFeePaid",
-                        "type": "u128"
+                        "type": "u64"
+                    },
+                    {
+                        "name": "totalFeeRebate",
+                        "type": "u64"
                     },
                     {
                         "name": "totalTokenDiscount",
@@ -3265,9 +3299,17 @@
                         "name": "minimumBaseAssetTradeSize",
                         "type": "u128"
                     },
+                    {
+                        "name": "baseSpread",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "padding0",
+                        "type": "u16"
+                    },
                     {
                         "name": "padding1",
-                        "type": "u64"
+                        "type": "u32"
                     },
                     {
                         "name": "padding2",
@@ -3331,7 +3373,7 @@
                     },
                     {
                         "name": "fee",
-                        "type": "u128"
+                        "type": "i128"
                     },
                     {
                         "name": "fillerReward",
@@ -3582,10 +3624,10 @@
                     },
                     {
                         "name": "fee",
-                        "type": "u128"
+                        "type": "i128"
                     },
                     {
-                        "name": "referrerReward",
+                        "name": "quoteAssetAmountSurplus",
                         "type": "u128"
                     },
                     {
@@ -3734,7 +3776,7 @@
                     },
                     {
                         "name": "fee",
-                        "type": "u128"
+                        "type": "i128"
                     },
                     {
                         "name": "direction",

package/lib/math/amm.d.ts

@@ -20,7 +20,11 @@ export declare type AssetType = 'quote' | 'base';
  * @param swapDirection
  * @returns quoteAssetReserve and baseAssetReserve after swap. : Precision AMM_RESERVE_PRECISION
  */
-export declare function calculateAmmReservesAfterSwap(amm: AMM, inputAssetType: AssetType, swapAmount: BN, swapDirection: SwapDirection): [BN, BN];
+export declare function calculateAmmReservesAfterSwap(amm: Pick<AMM, 'pegMultiplier' | 'quoteAssetReserve' | 'sqrtK' | 'baseAssetReserve'>, inputAssetType: AssetType, swapAmount: BN, swapDirection: SwapDirection): [BN, BN];
+export declare function calculateSpreadReserves(amm: AMM, direction: PositionDirection): {
+    baseAssetReserve: BN;
+    quoteAssetReserve: BN;
+};
 /**
  * Helper function calculating constant product curve output. Agnostic to whether input asset is quote or base
  *
@@ -63,6 +67,7 @@ export declare function calculateRepegCost(market: Market, marketIndex: BN, newP
  * @returns cost : Precision MARK_PRICE_PRECISION
  */
 export declare function calculateTerminalPrice(market: Market): BN;
-export declare function calculateMaxBaseAssetAmountToTrade(amm: AMM, limit_price: BN): [BN, PositionDirection];
+export declare function calculateMaxBaseAssetAmountToTrade(amm: AMM, limit_price: BN, direction: PositionDirection, useSpread: boolean): [BN, PositionDirection];
 export declare function calculateBudgetedK(market: Market, cost: BN): [BN, BN];
 export declare function calculateBudgetedPeg(market: Market, cost: BN): BN;
+export declare function calculateQuoteAssetAmountSwapped(quoteAssetReserves: BN, pegMultiplier: BN, swapDirection: SwapDirection): BN;

package/lib/math/amm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateBudgetedPeg = exports.calculateBudgetedK = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.calculateRepegCost = exports.calculateAdjustKCost = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = void 0;
+exports.calculateQuoteAssetAmountSwapped = exports.calculateBudgetedPeg = exports.calculateBudgetedK = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.calculateRepegCost = exports.calculateAdjustKCost = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const position_1 = require("./position");
@@ -51,6 +51,28 @@ function calculateAmmReservesAfterSwap(amm, inputAssetType, swapAmount, swapDire
     return [newQuoteAssetReserve, newBaseAssetReserve];
 }
 exports.calculateAmmReservesAfterSwap = calculateAmmReservesAfterSwap;
+function calculateSpreadReserves(amm, direction) {
+    if (amm.baseSpread === 0) {
+        return {
+            baseAssetReserve: amm.baseAssetReserve,
+            quoteAssetReserve: amm.quoteAssetReserve,
+        };
+    }
+    const quoteAsserReserveDelta = amm.quoteAssetReserve.div(numericConstants_1.BID_ASK_SPREAD_PRECISION.div(new anchor_1.BN(amm.baseSpread / 4)));
+    let quoteAssetReserve;
+    if ((0, types_1.isVariant)(direction, 'long')) {
+        quoteAssetReserve = amm.quoteAssetReserve.add(quoteAsserReserveDelta);
+    }
+    else {
+        quoteAssetReserve = amm.quoteAssetReserve.sub(quoteAsserReserveDelta);
+    }
+    const baseAssetReserve = amm.sqrtK.mul(amm.sqrtK).div(quoteAssetReserve);
+    return {
+        baseAssetReserve,
+        quoteAssetReserve,
+    };
+}
+exports.calculateSpreadReserves = calculateSpreadReserves;
 /**
  * Helper function calculating constant product curve output. Agnostic to whether input asset is quote or base
  *
@@ -193,7 +215,7 @@ function calculateTerminalPrice(market) {
     return terminalPrice;
 }
 exports.calculateTerminalPrice = calculateTerminalPrice;
-function calculateMaxBaseAssetAmountToTrade(amm, limit_price) {
+function calculateMaxBaseAssetAmountToTrade(amm, limit_price, direction, useSpread) {
     const invariant = amm.sqrtK.mul(amm.sqrtK);
     const newBaseAssetReserveSquared = invariant
         .mul(numericConstants_1.MARK_PRICE_PRECISION)
@@ -201,15 +223,22 @@ function calculateMaxBaseAssetAmountToTrade(amm, limit_price) {
         .div(limit_price)
         .div(numericConstants_1.PEG_PRECISION);
     const newBaseAssetReserve = (0, __1.squareRootBN)(newBaseAssetReserveSquared);
-    if (newBaseAssetReserve.gt(amm.baseAssetReserve)) {
+    let baseAssetReserveBefore;
+    if (useSpread) {
+        baseAssetReserveBefore = calculateSpreadReserves(amm, direction).baseAssetReserve;
+    }
+    else {
+        baseAssetReserveBefore = amm.baseAssetReserve;
+    }
+    if (newBaseAssetReserve.gt(baseAssetReserveBefore)) {
         return [
-            newBaseAssetReserve.sub(amm.baseAssetReserve),
+            newBaseAssetReserve.sub(baseAssetReserveBefore),
             types_1.PositionDirection.SHORT,
         ];
     }
-    else if (newBaseAssetReserve.lt(amm.baseAssetReserve)) {
+    else if (newBaseAssetReserve.lt(baseAssetReserveBefore)) {
         return [
-            amm.baseAssetReserve.sub(newBaseAssetReserve),
+            baseAssetReserveBefore.sub(newBaseAssetReserve),
             types_1.PositionDirection.LONG,
         ];
     }
@@ -282,3 +311,13 @@ function calculateBudgetedPeg(market, cost) {
     return newPeg;
 }
 exports.calculateBudgetedPeg = calculateBudgetedPeg;
+function calculateQuoteAssetAmountSwapped(quoteAssetReserves, pegMultiplier, swapDirection) {
+    let quoteAssetAmount = quoteAssetReserves
+        .mul(pegMultiplier)
+        .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
+    if ((0, types_1.isVariant)(swapDirection, 'remove')) {
+        quoteAssetAmount = quoteAssetAmount.add(numericConstants_1.ONE);
+    }
+    return quoteAssetAmount;
+}
+exports.calculateQuoteAssetAmountSwapped = calculateQuoteAssetAmountSwapped;

package/lib/math/funding.js

@@ -66,7 +66,9 @@ function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustm
                 .mul(lastOracleTwapWithMantissa)
                 .add(timeSinceLastMarkChange.mul(oraclePrice))
                 .add(oracleInvalidDuration.mul(lastMarkTwapWithMantissa))
-                .div(timeSinceLastMarkChange.add(oracleTwapTimeSinceLastUpdate).add(oracleInvalidDuration));
+                .div(timeSinceLastMarkChange
+                .add(oracleTwapTimeSinceLastUpdate)
+                .add(oracleInvalidDuration));
         }
         const twapSpread = lastMarkTwapWithMantissa.sub(lastOracleTwapWithMantissa);
         const twapSpreadPct = twapSpread

package/lib/math/market.d.ts

@@ -9,5 +9,20 @@ import { OraclePriceData } from '../oracles/types';
  * @return markPrice : Precision MARK_PRICE_PRECISION
  */
 export declare function calculateMarkPrice(market: Market): BN;
+/**
+ * Calculates market bid price
+ *
+ * @param market
+ * @return bidPrice : Precision MARK_PRICE_PRECISION
+ */
+export declare function calculateBidPrice(market: Market): BN;
+/**
+ * Calculates market ask price
+ *
+ * @param market
+ * @return bidPrice : Precision MARK_PRICE_PRECISION
+ */
+export declare function calculateAskPrice(market: Market): BN;
 export declare function calculateNewMarketAfterTrade(baseAssetAmount: BN, direction: PositionDirection, market: Market): Market;
 export declare function calculateMarkOracleSpread(market: Market, oraclePriceData: OraclePriceData): BN;
+export declare function calculateOracleSpread(price: BN, oraclePriceData: OraclePriceData): BN;

package/lib/math/market.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateMarkOracleSpread = exports.calculateNewMarketAfterTrade = exports.calculateMarkPrice = void 0;
+exports.calculateOracleSpread = exports.calculateMarkOracleSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateMarkPrice = void 0;
+const types_1 = require("../types");
 const amm_1 = require("./amm");
 /**
  * Calculates market mark price
@@ -12,6 +13,28 @@ function calculateMarkPrice(market) {
     return (0, amm_1.calculatePrice)(market.amm.baseAssetReserve, market.amm.quoteAssetReserve, market.amm.pegMultiplier);
 }
 exports.calculateMarkPrice = calculateMarkPrice;
+/**
+ * Calculates market bid price
+ *
+ * @param market
+ * @return bidPrice : Precision MARK_PRICE_PRECISION
+ */
+function calculateBidPrice(market) {
+    const { baseAssetReserve, quoteAssetReserve } = (0, amm_1.calculateSpreadReserves)(market.amm, types_1.PositionDirection.SHORT);
+    return (0, amm_1.calculatePrice)(baseAssetReserve, quoteAssetReserve, market.amm.pegMultiplier);
+}
+exports.calculateBidPrice = calculateBidPrice;
+/**
+ * Calculates market ask price
+ *
+ * @param market
+ * @return bidPrice : Precision MARK_PRICE_PRECISION
+ */
+function calculateAskPrice(market) {
+    const { baseAssetReserve, quoteAssetReserve } = (0, amm_1.calculateSpreadReserves)(market.amm, types_1.PositionDirection.LONG);
+    return (0, amm_1.calculatePrice)(baseAssetReserve, quoteAssetReserve, market.amm.pegMultiplier);
+}
+exports.calculateAskPrice = calculateAskPrice;
 function calculateNewMarketAfterTrade(baseAssetAmount, direction, market) {
     const [newQuoteAssetReserve, newBaseAssetReserve] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, 'base', baseAssetAmount.abs(), (0, amm_1.getSwapDirection)('base', direction));
     const newAmm = Object.assign({}, market.amm);
@@ -24,6 +47,10 @@ function calculateNewMarketAfterTrade(baseAssetAmount, direction, market) {
 exports.calculateNewMarketAfterTrade = calculateNewMarketAfterTrade;
 function calculateMarkOracleSpread(market, oraclePriceData) {
     const markPrice = calculateMarkPrice(market);
-    return markPrice.sub(oraclePriceData.price);
+    return calculateOracleSpread(markPrice, oraclePriceData);
 }
 exports.calculateMarkOracleSpread = calculateMarkOracleSpread;
+function calculateOracleSpread(price, oraclePriceData) {
+    return price.sub(oraclePriceData.price);
+}
+exports.calculateOracleSpread = calculateOracleSpread;

package/lib/math/trade.d.ts

@@ -24,11 +24,13 @@ export declare function calculateTradeSlippage(direction: PositionDirection, amo
  * @param direction
  * @param amount
  * @param market
+ * @param inputAssetType
+ * @param useSpread
  * @return
  * 	| 'acquiredBase' =>  positive/negative change in user's base : BN TODO-PRECISION
  * 	| 'acquiredQuote' => positive/negative change in user's quote : BN TODO-PRECISION
  */
-export declare function calculateTradeAcquiredAmounts(direction: PositionDirection, amount: BN, market: Market, inputAssetType?: AssetType): [BN, BN];
+export declare function calculateTradeAcquiredAmounts(direction: PositionDirection, amount: BN, market: Market, inputAssetType?: AssetType, useSpread?: boolean): [BN, BN];
 /**
  * calculateTargetPriceTrade
  * simple function for finding arbitraging trades

package/lib/math/trade.js

@@ -56,21 +56,33 @@ exports.calculateTradeSlippage = calculateTradeSlippage;
  * @param direction
  * @param amount
  * @param market
+ * @param inputAssetType
+ * @param useSpread
  * @return
  * 	| 'acquiredBase' =>  positive/negative change in user's base : BN TODO-PRECISION
  * 	| 'acquiredQuote' => positive/negative change in user's quote : BN TODO-PRECISION
  */
-function calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType = 'quote') {
+function calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType = 'quote', useSpread = true) {
     if (amount.eq(numericConstants_1.ZERO)) {
         return [numericConstants_1.ZERO, numericConstants_1.ZERO];
     }
     const swapDirection = (0, amm_1.getSwapDirection)(inputAssetType, direction);
-    const [newQuoteAssetReserve, newBaseAssetReserve] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, inputAssetType, amount, swapDirection);
-    const acquiredBase = market.amm.baseAssetReserve.sub(newBaseAssetReserve);
-    let acquiredQuote = market.amm.quoteAssetReserve.sub(newQuoteAssetReserve);
-    if (inputAssetType === 'base' && (0, types_1.isVariant)(swapDirection, 'remove')) {
-        acquiredQuote = acquiredQuote.sub(numericConstants_1.ONE);
+    let amm;
+    if (useSpread && market.amm.baseSpread > 0) {
+        const { baseAssetReserve, quoteAssetReserve } = (0, amm_1.calculateSpreadReserves)(market.amm, direction);
+        amm = {
+            baseAssetReserve,
+            quoteAssetReserve,
+            sqrtK: market.amm.sqrtK,
+            pegMultiplier: market.amm.pegMultiplier,
+        };
     }
+    else {
+        amm = market.amm;
+    }
+    const [newQuoteAssetReserve, newBaseAssetReserve] = (0, amm_1.calculateAmmReservesAfterSwap)(amm, inputAssetType, amount, swapDirection);
+    const acquiredBase = amm.baseAssetReserve.sub(newBaseAssetReserve);
+    const acquiredQuote = amm.quoteAssetReserve.sub(newQuoteAssetReserve);
     return [acquiredBase, acquiredQuote];
 }
 exports.calculateTradeAcquiredAmounts = calculateTradeAcquiredAmounts;

package/lib/orders.js

@@ -112,7 +112,7 @@ function calculateAmountToTradeForLimit(market, order, oraclePriceData) {
             limitPrice = floatingPrice;
         }
     }
-    const [maxAmountToTrade, direction] = (0, amm_1.calculateMaxBaseAssetAmountToTrade)(market.amm, limitPrice);
+    const [maxAmountToTrade, direction] = (0, amm_1.calculateMaxBaseAssetAmountToTrade)(market.amm, limitPrice, order.direction, !order.postOnly);
     // Check that directions are the same
     const sameDirection = isSameDirection(direction, order.direction);
     if (!sameDirection) {
@@ -170,18 +170,37 @@ function calculateBaseAssetAmountUserCanExecute(market, order, user) {
     if (quoteAssetAmount.lte(numericConstants_1.ZERO)) {
         return numericConstants_1.ZERO;
     }
-    const baseAssetReservesBefore = market.amm.baseAssetReserve;
-    const [_, baseAssetReservesAfter] = (0, _1.calculateAmmReservesAfterSwap)(market.amm, 'quote', quoteAssetAmount, (0, types_1.isVariant)(order.direction, 'long')
+    const swapDirection = (0, types_1.isVariant)(order.direction, 'long')
         ? types_1.SwapDirection.ADD
-        : types_1.SwapDirection.REMOVE);
-    let baseAssetAmount = baseAssetReservesBefore.sub(baseAssetReservesAfter).abs();
+        : types_1.SwapDirection.REMOVE;
+    const useSpread = !order.postOnly;
+    let amm;
+    if (useSpread) {
+        const { baseAssetReserve, quoteAssetReserve } = (0, _1.calculateSpreadReserves)(market.amm, order.direction);
+        amm = {
+            baseAssetReserve,
+            quoteAssetReserve,
+            sqrtK: market.amm.sqrtK,
+            pegMultiplier: market.amm.pegMultiplier,
+        };
+    }
+    else {
+        amm = market.amm;
+    }
+    const baseAssetReservesBefore = amm.baseAssetReserve;
+    const [_, baseAssetReservesAfter] = (0, _1.calculateAmmReservesAfterSwap)(amm, 'quote', quoteAssetAmount, swapDirection);
+    let baseAssetAmount = baseAssetReservesBefore
+        .sub(baseAssetReservesAfter)
+        .abs();
     if (order.reduceOnly) {
         const position = user.getUserPosition(order.marketIndex) ||
             user.getEmptyPosition(order.marketIndex);
-        if ((0, types_1.isVariant)(order.direction, 'long') && position.baseAssetAmount.gte(numericConstants_1.ZERO)) {
+        if ((0, types_1.isVariant)(order.direction, 'long') &&
+            position.baseAssetAmount.gte(numericConstants_1.ZERO)) {
             baseAssetAmount = numericConstants_1.ZERO;
         }
-        else if ((0, types_1.isVariant)(order.direction, 'short') && position.baseAssetAmount.lte(numericConstants_1.ZERO)) {
+        else if ((0, types_1.isVariant)(order.direction, 'short') &&
+            position.baseAssetAmount.lte(numericConstants_1.ZERO)) {
             baseAssetAmount = numericConstants_1.ZERO;
         }
         else {

package/lib/types.d.ts

@@ -168,7 +168,7 @@ export declare type TradeRecord = {
     markPriceBefore: BN;
     markPriceAfter: BN;
     fee: BN;
-    referrerReward: BN;
+    quoteAssetAmountSurplus: BN;
     refereeDiscount: BN;
     tokenDiscount: BN;
     marketIndex: BN;
@@ -314,6 +314,7 @@ export declare type AMM = {
     minimumQuoteAssetTradeSize: BN;
     minimumBaseAssetTradeSize: BN;
     lastOraclePrice: BN;
+    baseSpread: number;
 };
 export declare type UserPosition = {
     baseAssetAmount: BN;
@@ -332,6 +333,7 @@ export declare type UserAccount = {
     cumulativeDeposits: BN;
     positions: PublicKey;
     totalFeePaid: BN;
+    totalFeeRebate: BN;
     totalTokenDiscount: BN;
     totalReferralReward: BN;
     totalRefereeDiscount: BN;

package/package.json

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

package/src/accounts/pollingClearingHouseAccountSubscriber.ts

@@ -86,13 +86,17 @@ export class PollingClearingHouseAccountSubscriber
 		await this.updateAccountsToPoll();
 		await this.addToAccountLoader();
 		await this.fetch();
-		this.eventEmitter.emit('update');
+		const subscriptionSucceeded = this.didSubscriptionSucceed();
+
+		if (subscriptionSucceeded) {
+			this.eventEmitter.emit('update');
+		}
 
 		this.isSubscribing = false;
-		this.isSubscribed = true;
-		this.subscriptionPromiseResolver(true);
+		this.isSubscribed = subscriptionSucceeded;
+		this.subscriptionPromiseResolver(subscriptionSucceeded);
 
-		return true;
+		return subscriptionSucceeded;
 	}
 
 	async updateAccountsToPoll(): Promise<void> {
@@ -254,6 +258,17 @@ export class PollingClearingHouseAccountSubscriber
 		}
 	}
 
+	didSubscriptionSucceed(): boolean {
+		let success = true;
+		for (const [_, accountToPoll] of this.accountsToPoll) {
+			if (!this[accountToPoll.key]) {
+				success = false;
+				break;
+			}
+		}
+		return success;
+	}
+
 	public async unsubscribe(): Promise<void> {
 		if (!this.isSubscribed) {
 			return;