@drift-labs/sdk 0.2.0-master.36 → 0.2.0-master.38

package/src/clearingHouse.ts

@@ -86,7 +86,7 @@ type RemainingAccountParams = {
 	writablePerpMarketIndexes?: number[];
 	writableSpotMarketIndexes?: number[];
 	readablePerpMarketIndex?: number;
-	readableSpotMarketIndex?: number;
+	readableSpotMarketIndexes?: number[];
 	useMarketLastSlotCache?: boolean;
 };
 
@@ -108,7 +108,8 @@ export class ClearingHouse {
 	eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
 	_isSubscribed = false;
 	txSender: TxSender;
-	marketLastSlotCache = new Map<number, number>();
+	perpMarketLastSlotCache = new Map<number, number>();
+	spotMarketLastSlotCache = new Map<number, number>();
 	authority: PublicKey;
 
 	public get isSubscribed() {
@@ -664,11 +665,14 @@ export class ClearingHouse {
 			this.getRemainingAccountMapsForUsers(params.userAccounts);
 
 		if (params.useMarketLastSlotCache) {
-			const lastUserPositionsSlot = this.getUserAccountAndSlot()?.slot;
-			for (const [marketIndex, slot] of this.marketLastSlotCache.entries()) {
+			const lastUserSlot = this.getUserAccountAndSlot()?.slot;
+			for (const [
+				marketIndex,
+				slot,
+			] of this.perpMarketLastSlotCache.entries()) {
 				// if cache has more recent slot than user positions account slot, add market to remaining accounts
 				// otherwise remove from slot
-				if (slot > lastUserPositionsSlot) {
+				if (slot > lastUserSlot) {
 					const marketAccount = this.getPerpMarketAccount(marketIndex);
 					perpMarketAccountMap.set(marketIndex, {
 						pubkey: marketAccount.pubkey,
@@ -681,7 +685,32 @@ export class ClearingHouse {
 						isWritable: false,
 					});
 				} else {
-					this.marketLastSlotCache.delete(marketIndex);
+					this.perpMarketLastSlotCache.delete(marketIndex);
+				}
+			}
+
+			for (const [
+				marketIndex,
+				slot,
+			] of this.spotMarketLastSlotCache.entries()) {
+				// if cache has more recent slot than user positions account slot, add market to remaining accounts
+				// otherwise remove from slot
+				if (slot > lastUserSlot) {
+					const marketAccount = this.getSpotMarketAccount(marketIndex);
+					spotMarketAccountMap.set(marketIndex, {
+						pubkey: marketAccount.pubkey,
+						isSigner: false,
+						isWritable: false,
+					});
+					if (!marketAccount.oracle.equals(PublicKey.default)) {
+						oracleAccountMap.set(marketAccount.oracle.toString(), {
+							pubkey: marketAccount.oracle,
+							isSigner: false,
+							isWritable: false,
+						});
+					}
+				} else {
+					this.spotMarketLastSlotCache.delete(marketIndex);
 				}
 			}
 		}
@@ -720,21 +749,23 @@ export class ClearingHouse {
 			}
 		}
 
-		if (params.readableSpotMarketIndex !== undefined) {
-			const spotMarketAccount = this.getSpotMarketAccount(
-				params.readableSpotMarketIndex
-			);
-			spotMarketAccountMap.set(params.readableSpotMarketIndex, {
-				pubkey: spotMarketAccount.pubkey,
-				isSigner: false,
-				isWritable: false,
-			});
-			if (spotMarketAccount.marketIndex !== 0) {
-				oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
-					pubkey: spotMarketAccount.oracle,
+		if (params.readableSpotMarketIndexes !== undefined) {
+			for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
+				const spotMarketAccount = this.getSpotMarketAccount(
+					readableSpotMarketIndex
+				);
+				spotMarketAccountMap.set(readableSpotMarketIndex, {
+					pubkey: spotMarketAccount.pubkey,
 					isSigner: false,
 					isWritable: false,
 				});
+				if (spotMarketAccount.marketIndex !== 0) {
+					oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+						pubkey: spotMarketAccount.oracle,
+						isSigner: false,
+						isWritable: false,
+					});
+				}
 			}
 		}
 
@@ -793,6 +824,17 @@ export class ClearingHouse {
 							isWritable: false,
 						});
 					}
+
+					if (
+						!spotPosition.openAsks.eq(ZERO) ||
+						!spotPosition.openBids.eq(ZERO)
+					) {
+						spotMarketAccountMap.set(spotPosition.marketIndex, {
+							pubkey: this.getQuoteSpotMarketAccount().pubkey,
+							isSigner: false,
+							isWritable: false,
+						});
+					}
 				}
 			}
 			for (const position of userAccount.perpPositions) {
@@ -894,11 +936,12 @@ export class ClearingHouse {
 			);
 		}
 
-		const { txSig } = await this.txSender.send(
+		const { txSig, slot } = await this.txSender.send(
 			tx,
 			additionalSigners,
 			this.opts
 		);
+		this.spotMarketLastSlotCache.set(marketIndex, slot);
 		return txSig;
 	}
 
@@ -1119,12 +1162,12 @@ export class ClearingHouse {
 			);
 		}
 
-		const { txSig } = await this.txSender.send(
+		const { txSig, slot } = await this.txSender.send(
 			tx,
 			additionalSigners,
 			this.opts
 		);
-
+		this.spotMarketLastSlotCache.set(marketIndex, slot);
 		return [txSig, userAccountPublicKey];
 	}
 
@@ -1242,11 +1285,12 @@ export class ClearingHouse {
 			);
 		}
 
-		const { txSig } = await this.txSender.send(
+		const { txSig, slot } = await this.txSender.send(
 			tx,
 			additionalSigners,
 			this.opts
 		);
+		this.spotMarketLastSlotCache.set(marketIndex, slot);
 		return txSig;
 	}
 
@@ -1262,6 +1306,7 @@ export class ClearingHouse {
 			userAccounts: [this.getUserAccount()],
 			useMarketLastSlotCache: true,
 			writableSpotMarketIndexes: [marketIndex],
+			readableSpotMarketIndexes: [QUOTE_SPOT_MARKET_INDEX],
 		});
 
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -1293,7 +1338,7 @@ export class ClearingHouse {
 		fromSubAccountId: number,
 		toSubAccountId: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
 				await this.getTransferDepositIx(
 					amount,
@@ -1305,6 +1350,12 @@ export class ClearingHouse {
 			[],
 			this.opts
 		);
+		if (
+			fromSubAccountId === this.activeSubAccountId ||
+			toSubAccountId === this.activeSubAccountId
+		) {
+			this.spotMarketLastSlotCache.set(marketIndex, slot);
+		}
 		return txSig;
 	}
 
@@ -1356,6 +1407,7 @@ export class ClearingHouse {
 				toUser,
 				userStats: this.getUserStatsAccountPublicKey(),
 				state: await this.getStatePublicKey(),
+				spotMarketVault: this.getQuoteSpotMarketAccount().vault,
 			},
 			remainingAccounts,
 		});
@@ -1530,7 +1582,7 @@ export class ClearingHouse {
 			[],
 			this.opts
 		);
-		this.marketLastSlotCache.set(marketIndex, slot);
+		this.perpMarketLastSlotCache.set(marketIndex, slot);
 		return txSig;
 	}
 
@@ -1619,7 +1671,7 @@ export class ClearingHouse {
 			true
 		);
 
-		this.marketLastSlotCache.set(orderParams.marketIndex, slot);
+		this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
 
 		return { txSig, signedFillTx };
 	}
@@ -1632,7 +1684,7 @@ export class ClearingHouse {
 			[],
 			this.opts
 		);
-		this.marketLastSlotCache.set(orderParams.marketIndex, slot);
+		this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
 		return txSig;
 	}
 
@@ -1993,11 +2045,13 @@ export class ClearingHouse {
 	public async placeSpotOrder(
 		orderParams: OptionalOrderParams
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(await this.getPlaceSpotOrderIx(orderParams)),
 			[],
 			this.opts
 		);
+		this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
+		this.spotMarketLastSlotCache.set(QUOTE_SPOT_MARKET_INDEX, slot);
 		return txSig;
 	}
 
@@ -2010,7 +2064,10 @@ export class ClearingHouse {
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [this.getUserAccount()],
 			useMarketLastSlotCache: true,
-			readableSpotMarketIndex: orderParams.marketIndex,
+			readableSpotMarketIndexes: [
+				orderParams.marketIndex,
+				QUOTE_SPOT_MARKET_INDEX,
+			],
 		});
 
 		return await this.program.instruction.placeSpotOrder(orderParams, {
@@ -2109,13 +2166,11 @@ export class ClearingHouse {
 		const orderId = order.orderId;
 		const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
 
-		if (fulfillmentConfig) {
-			this.addSerumRemainingAccounts(
-				marketIndex,
-				remainingAccounts,
-				fulfillmentConfig
-			);
-		}
+		this.addSpotFulfillmentAccounts(
+			marketIndex,
+			remainingAccounts,
+			fulfillmentConfig
+		);
 
 		return await this.program.instruction.fillSpotOrder(
 			orderId,
@@ -2135,6 +2190,31 @@ export class ClearingHouse {
 		);
 	}
 
+	addSpotFulfillmentAccounts(
+		marketIndex: number,
+		remainingAccounts: AccountMeta[],
+		fulfillmentConfig?: SerumV3FulfillmentConfigAccount
+	) {
+		if (fulfillmentConfig) {
+			this.addSerumRemainingAccounts(
+				marketIndex,
+				remainingAccounts,
+				fulfillmentConfig
+			);
+		} else {
+			remainingAccounts.push({
+				pubkey: this.getSpotMarketAccount(marketIndex).vault,
+				isWritable: false,
+				isSigner: false,
+			});
+			remainingAccounts.push({
+				pubkey: this.getQuoteSpotMarketAccount().vault,
+				isWritable: false,
+				isSigner: false,
+			});
+		}
+	}
+
 	addSerumRemainingAccounts(
 		marketIndex: number,
 		remainingAccounts: AccountMeta[],
@@ -2291,7 +2371,7 @@ export class ClearingHouse {
 			[],
 			this.opts
 		);
-		this.marketLastSlotCache.set(orderParams.marketIndex, slot);
+		this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
 		return txSig;
 	}
 
@@ -2374,7 +2454,7 @@ export class ClearingHouse {
 			this.opts
 		);
 
-		this.marketLastSlotCache.set(orderParams.marketIndex, slot);
+		this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
 
 		return txSig;
 	}
@@ -2431,7 +2511,7 @@ export class ClearingHouse {
 		makerInfo?: MakerInfo,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
 				await this.getPlaceAndTakeSpotOrderIx(
 					orderParams,
@@ -2443,6 +2523,8 @@ export class ClearingHouse {
 			[],
 			this.opts
 		);
+		this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
+		this.spotMarketLastSlotCache.set(QUOTE_SPOT_MARKET_INDEX, slot);
 		return txSig;
 	}
 
@@ -2497,13 +2579,11 @@ export class ClearingHouse {
 			});
 		}
 
-		if (fulfillmentConfig) {
-			this.addSerumRemainingAccounts(
-				orderParams.marketIndex,
-				remainingAccounts,
-				fulfillmentConfig
-			);
-		}
+		this.addSpotFulfillmentAccounts(
+			orderParams.marketIndex,
+			remainingAccounts,
+			fulfillmentConfig
+		);
 
 		return await this.program.instruction.placeAndTakeSpotOrder(
 			orderParams,
@@ -2524,26 +2604,30 @@ export class ClearingHouse {
 	public async placeAndMakeSpotOrder(
 		orderParams: OptionalOrderParams,
 		takerInfo: TakerInfo,
+		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
 				await this.getPlaceAndMakeSpotOrderIx(
 					orderParams,
 					takerInfo,
+					fulfillmentConfig,
 					referrerInfo
 				)
 			),
 			[],
 			this.opts
 		);
-
+		this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
+		this.spotMarketLastSlotCache.set(QUOTE_SPOT_MARKET_INDEX, slot);
 		return txSig;
 	}
 
 	public async getPlaceAndMakeSpotOrderIx(
 		orderParams: OptionalOrderParams,
 		takerInfo: TakerInfo,
+		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionInstruction> {
 		orderParams = this.getOrderParams(orderParams, MarketType.SPOT);
@@ -2572,10 +2656,17 @@ export class ClearingHouse {
 			});
 		}
 
+		this.addSpotFulfillmentAccounts(
+			orderParams.marketIndex,
+			remainingAccounts,
+			fulfillmentConfig
+		);
+
 		const takerOrderId = takerInfo.order.orderId;
 		return await this.program.instruction.placeAndMakeSpotOrder(
 			orderParams,
 			takerOrderId,
+			fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -2614,6 +2705,66 @@ export class ClearingHouse {
 		});
 	}
 
+	/**
+	 * Modifies an open order by closing it and replacing it with a new order.
+	 * @param orderId: The open order to modify
+	 * @param newBaseAmount: The new base amount for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+	 * @param newLimitPice: The new limit price for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+	 * @param newOraclePriceOffset: The new oracle price offset for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+	 * @returns
+	 */
+	public async modifyPerpOrder(
+		orderId: number,
+		newBaseAmount?: BN,
+		newLimitPrice?: BN,
+		newOraclePriceOffset?: number
+	): Promise<TransactionSignature> {
+		if (!newBaseAmount && !newLimitPrice && !newOraclePriceOffset) {
+			throw new Error(
+				`Must provide newBaseAmount or newLimitPrice or newOraclePriceOffset to modify order`
+			);
+		}
+
+		const openOrder = this.getUser().getOrder(orderId);
+		if (!openOrder) {
+			throw new Error(`No open order with id ${orderId.toString()}`);
+		}
+		const cancelOrderIx = await this.getCancelOrderIx(orderId);
+
+		const newOrderParams: OptionalOrderParams = {
+			orderType: openOrder.orderType,
+			marketType: openOrder.marketType,
+			direction: openOrder.direction,
+			baseAssetAmount: newBaseAmount || openOrder.baseAssetAmount,
+			price: newLimitPrice || openOrder.price,
+			marketIndex: openOrder.marketIndex,
+			reduceOnly: openOrder.reduceOnly,
+			postOnly: openOrder.postOnly,
+			immediateOrCancel: openOrder.immediateOrCancel,
+			triggerPrice: openOrder.triggerPrice,
+			triggerCondition: openOrder.triggerCondition,
+			oraclePriceOffset: newOraclePriceOffset || openOrder.oraclePriceOffset,
+			auctionDuration: openOrder.auctionDuration,
+			maxTs: openOrder.maxTs,
+			auctionStartPrice: openOrder.auctionStartPrice,
+			auctionEndPrice: openOrder.auctionEndPrice,
+		};
+		const placeOrderIx = await this.getPlacePerpOrderIx(newOrderParams);
+
+		const tx = new Transaction();
+		tx.add(
+			ComputeBudgetProgram.requestUnits({
+				units: 1_000_000,
+				additionalFee: 0,
+			})
+		);
+		tx.add(cancelOrderIx);
+		tx.add(placeOrderIx);
+		const { txSig, slot } = await this.txSender.send(tx, [], this.opts);
+		this.perpMarketLastSlotCache.set(newOrderParams.marketIndex, slot);
+		return txSig;
+	}
+
 	public async settlePNLs(
 		users: {
 			settleeUserAccountPublicKey: PublicKey;
@@ -2680,6 +2831,7 @@ export class ClearingHouse {
 				state: await this.getStatePublicKey(),
 				authority: this.wallet.publicKey,
 				user: settleeUserAccountPublicKey,
+				spotMarketVault: this.getQuoteSpotMarketAccount().vault,
 			},
 			remainingAccounts: remainingAccounts,
 		});
@@ -2689,7 +2841,8 @@ export class ClearingHouse {
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount,
 		marketIndex: number,
-		maxBaseAssetAmount: BN
+		maxBaseAssetAmount: BN,
+		limitPrice?: BN
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
@@ -2697,13 +2850,14 @@ export class ClearingHouse {
 					userAccountPublicKey,
 					userAccount,
 					marketIndex,
-					maxBaseAssetAmount
+					maxBaseAssetAmount,
+					limitPrice
 				)
 			),
 			[],
 			this.opts
 		);
-		this.marketLastSlotCache.set(marketIndex, slot);
+		this.perpMarketLastSlotCache.set(marketIndex, slot);
 		return txSig;
 	}
 
@@ -2711,7 +2865,8 @@ export class ClearingHouse {
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount,
 		marketIndex: number,
-		maxBaseAssetAmount: BN
+		maxBaseAssetAmount: BN,
+		limitPrice?: BN
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
@@ -2730,6 +2885,7 @@ export class ClearingHouse {
 		return await this.program.instruction.liquidatePerp(
 			marketIndex,
 			maxBaseAssetAmount,
+			limitPrice ?? null,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -2751,7 +2907,7 @@ export class ClearingHouse {
 		liabilityMarketIndex: number,
 		maxLiabilityTransfer: BN
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
 				await this.getLiquidateSpotIx(
 					userAccountPublicKey,
@@ -2764,6 +2920,8 @@ export class ClearingHouse {
 			[],
 			this.opts
 		);
+		this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
+		this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
 		return txSig;
 	}
 
@@ -2826,7 +2984,8 @@ export class ClearingHouse {
 			[],
 			this.opts
 		);
-		this.marketLastSlotCache.set(perpMarketIndex, slot);
+		this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
+		this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
 		return txSig;
 	}
 
@@ -2889,7 +3048,8 @@ export class ClearingHouse {
 			[],
 			this.opts
 		);
-		this.marketLastSlotCache.set(perpMarketIndex, slot);
+		this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
+		this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
 		return txSig;
 	}
 

package/src/clearingHouseUser.ts

@@ -143,6 +143,7 @@ export class ClearingHouseUser {
 			marketIndex,
 			quoteAssetAmount: ZERO,
 			quoteEntryAmount: ZERO,
+			quoteBreakEvenAmount: ZERO,
 			openOrders: 0,
 			openBids: ZERO,
 			openAsks: ZERO,
@@ -213,7 +214,7 @@ export class ClearingHouseUser {
 	 */
 	public getLPBidAsks(marketIndex: number): [BN, BN] {
 		const position = this.getUserPosition(marketIndex);
-		if (position.lpShares.eq(ZERO)) {
+		if (position === undefined || position.lpShares.eq(ZERO)) {
 			return [ZERO, ZERO];
 		}
 
@@ -773,30 +774,12 @@ export class ClearingHouseUser {
 						settledPosition.baseAssetAmount.add(dustBaa);
 					perpPosition.quoteAssetAmount = settledPosition.quoteAssetAmount;
 
-					// open orders
-					let openAsks;
-					if (market.amm.maxBaseAssetReserve > market.amm.baseAssetReserve) {
-						openAsks = market.amm.maxBaseAssetReserve
-							.sub(market.amm.baseAssetReserve)
-							.mul(perpPosition.lpShares)
-							.div(market.amm.sqrtK)
-							.mul(new BN(-1));
-					} else {
-						openAsks = ZERO;
-					}
-
-					let openBids;
-					if (market.amm.minBaseAssetReserve < market.amm.baseAssetReserve) {
-						openBids = market.amm.baseAssetReserve
-							.sub(market.amm.minBaseAssetReserve)
-							.mul(perpPosition.lpShares)
-							.div(market.amm.sqrtK);
-					} else {
-						openBids = ZERO;
-					}
+					const [totalOpenBids, totalOpenAsks] = this.getPerpBidAsks(
+						market.marketIndex
+					);
 
-					perpPosition.openAsks = perpPosition.openAsks.add(openAsks);
-					perpPosition.openBids = perpPosition.openBids.add(openBids);
+					perpPosition.openAsks = totalOpenAsks;
+					perpPosition.openBids = totalOpenBids;
 				}
 
 				let valuationPrice = this.getOracleDataForPerpMarket(
@@ -1118,6 +1101,7 @@ export class ClearingHouseUser {
 			remainderBaseAssetAmount: 0,
 			quoteAssetAmount: new BN(0),
 			lastCumulativeFundingRate: ZERO,
+			quoteBreakEvenAmount: new BN(0),
 			quoteEntryAmount: new BN(0),
 			openOrders: 0,
 			openBids: new BN(0),
@@ -1487,7 +1471,7 @@ export class ClearingHouseUser {
 
 		const amountWithdrawable = freeCollateral
 			.mul(MARGIN_PRECISION)
-			.div(spotMarket.initialAssetWeight)
+			.div(new BN(spotMarket.initialAssetWeight))
 			.mul(PRICE_PRECISION)
 			.div(oracleData.price)
 			.mul(precisionIncrease);
@@ -1526,7 +1510,7 @@ export class ClearingHouseUser {
 
 			const maxLiabilityAllowed = freeCollatAfterWithdraw
 				.mul(MARGIN_PRECISION)
-				.div(spotMarket.initialLiabilityWeight)
+				.div(new BN(spotMarket.initialLiabilityWeight))
 				.mul(PRICE_PRECISION)
 				.div(oracleData.price)
 				.mul(precisionIncrease);

package/src/config.ts

@@ -29,7 +29,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: 'BJG3o4CURrokB7huNyiHptYepAtHXj4YfefJiPgzUULV',
+		CLEARING_HOUSE_PROGRAM_ID: 'jAEeKs9twxAJmXZHqS2p459xW7FMDjoyvuqthRo9qGS',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
 		V2_ALPHA_TICKET_MINT_ADDRESS:

package/src/factory/bigNum.ts

@@ -9,6 +9,11 @@ export class BigNum {
 	static delim = '.';
 	static spacer = ',';
 
+	public static setLocale(locale: string): void {
+		BigNum.delim = (1.1).toLocaleString(locale).slice(1, 2) || '.';
+		BigNum.spacer = (1000).toLocaleString(locale).slice(1, 2) || ',';
+	}
+
 	constructor(
 		val: BN | number | string,
 		precisionVal: BN | number | string = new BN(0)
@@ -566,7 +571,21 @@ export class BigNum {
 	 * @returns
 	 */
 	public toNum() {
-		return parseFloat(this.print());
+		let printedValue = this.print();
+
+		// Must convert any non-US delimiters and spacers to US format before using parseFloat
+		if (BigNum.delim !== '.' || BigNum.spacer !== ',') {
+			printedValue = printedValue
+				.split('')
+				.map((char) => {
+					if (char === BigNum.delim) return '.';
+					if (char === BigNum.spacer) return ',';
+					return char;
+				})
+				.join('');
+		}
+
+		return parseFloat(printedValue);
 	}
 
 	static fromJSON(json: { val: string; precision: string }) {
@@ -599,12 +618,16 @@ export class BigNum {
 	static fromPrint(val: string, precisionShift?: BN): BigNum {
 		// Handle empty number edge cases
 		if (!val) return BigNum.from(ZERO, precisionShift);
-		if (!val.replace(BigNum.delim, ''))
+		if (!val.replace(BigNum.delim, '')) {
 			return BigNum.from(ZERO, precisionShift);
+		}
 
-		const [leftSide, rightSide] = val.split(BigNum.delim);
+		const sides = val.split(BigNum.delim);
+		const rightSide = sides[1];
+		const leftSide = sides[0].replace(/\D/g, '');
+		const bnInput = `${leftSide ?? ''}${rightSide ?? ''}`;
 
-		const rawBn = new BN(`${leftSide ?? ''}${rightSide ?? ''}`);
+		const rawBn = new BN(bnInput);
 
 		const rightSideLength = rightSide?.length ?? 0;