@drift-labs/sdk 0.1.36-master.1 → 0.1.36-master.4

package/src/math/amm.ts

@@ -98,6 +98,22 @@ export function calculateAmmReservesAfterSwap(
 	return [newQuoteAssetReserve, newBaseAssetReserve];
 }
 
+export function calculateSpread(
+	amm: AMM,
+	direction: PositionDirection
+): number {
+	let spread;
+
+	// future logic
+	if (isVariant(direction, 'long')) {
+		spread = amm.baseSpread;
+	} else {
+		spread = amm.baseSpread;
+	}
+
+	return spread;
+}
+
 export function calculateSpreadReserves(
 	amm: AMM,
 	direction: PositionDirection
@@ -105,7 +121,9 @@ export function calculateSpreadReserves(
 	baseAssetReserve: BN;
 	quoteAssetReserve: BN;
 } {
-	if (amm.baseSpread === 0) {
+	const spread = calculateSpread(amm, direction);
+
+	if (spread === 0) {
 		return {
 			baseAssetReserve: amm.baseAssetReserve,
 			quoteAssetReserve: amm.quoteAssetReserve,
@@ -113,7 +131,7 @@ export function calculateSpreadReserves(
 	}
 
 	const quoteAsserReserveDelta = amm.quoteAssetReserve.div(
-		BID_ASK_SPREAD_PRECISION.div(new BN(amm.baseSpread / 4))
+		BID_ASK_SPREAD_PRECISION.div(new BN(spread / 4))
 	);
 
 	let quoteAssetReserve;

package/src/math/state.ts

@@ -0,0 +1,14 @@
+import { StateAccount } from '../types';
+
+/**
+ * Get the clearing house percent fee charged on notional of taking trades
+ *
+ * @param state
+ * @returns Precision : basis points (bps)
+ */
+export function getExchangeFee(state: StateAccount): number {
+	const exchangeFee =
+		state.feeStructure.feeNumerator.toNumber() /
+		state.feeStructure.feeDenominator.toNumber();
+	return exchangeFee;
+}

package/src/mockUSDCFaucet.ts

@@ -1,5 +1,5 @@
 import * as anchor from '@project-serum/anchor';
-import { Idl, Program, Provider } from '@project-serum/anchor';
+import { AnchorProvider, Idl, Program } from '@project-serum/anchor';
 import {
 	AccountInfo,
 	ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -25,7 +25,7 @@ export class MockUSDCFaucet {
 	connection: Connection;
 	wallet: IWallet;
 	public program: Program;
-	provider: Provider;
+	provider: AnchorProvider;
 	opts?: ConfirmOptions;
 
 	public constructor(
@@ -36,8 +36,8 @@ export class MockUSDCFaucet {
 	) {
 		this.connection = connection;
 		this.wallet = wallet;
-		this.opts = opts || Provider.defaultOptions();
-		const provider = new Provider(connection, wallet, this.opts);
+		this.opts = opts || AnchorProvider.defaultOptions();
+		const provider = new AnchorProvider(connection, wallet, this.opts);
 		this.provider = provider;
 		this.program = new Program(mockUSDCFaucetIDL as Idl, programId, provider);
 	}
@@ -140,7 +140,7 @@ export class MockUSDCFaucet {
 				amount
 			);
 		const tx = new Transaction().add(createAssociatedAccountIx).add(mintToTx);
-		const txSig = await this.program.provider.send(tx, [], this.opts);
+		const txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
 		return [associatedTokenPublicKey, txSig];
 	}
 

package/src/oracles/switchboardClient.ts

@@ -4,7 +4,7 @@ import {
 } from '@switchboard-xyz/switchboard-v2';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import { DriftEnv } from '../config';
-import { BN, Provider, Program, Idl } from '@project-serum/anchor';
+import { BN, Program, Idl, AnchorProvider } from '@project-serum/anchor';
 import { MARK_PRICE_PRECISION, TEN } from '../constants/numericConstants';
 import { OracleClient, OraclePriceData } from './types';
 import { Wallet } from '../wallet';
@@ -74,7 +74,7 @@ async function getSwitchboardProgram(
 	const DEFAULT_KEYPAIR = Keypair.fromSeed(new Uint8Array(32).fill(1));
 	const programId = getSwitchboardPid(env);
 	const wallet = new Wallet(DEFAULT_KEYPAIR);
-	const provider = new Provider(connection, wallet, {});
+	const provider = new AnchorProvider(connection, wallet, {});
 
 	return new Program(switchboardV2Idl as Idl, programId, provider);
 }

package/src/tx/defaultTxSender.ts

@@ -5,12 +5,12 @@ import {
 	Transaction,
 	TransactionSignature,
 } from '@solana/web3.js';
-import { Provider } from '@project-serum/anchor';
+import { AnchorProvider } from '@project-serum/anchor';
 
 export class DefaultTxSender implements TxSender {
-	provider: Provider;
+	provider: AnchorProvider;
 
-	public constructor(provider: Provider) {
+	public constructor(provider: AnchorProvider) {
 		this.provider = provider;
 	}
 
@@ -19,6 +19,6 @@ export class DefaultTxSender implements TxSender {
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions
 	): Promise<TransactionSignature> {
-		return this.provider.send(tx, additionalSigners, opts);
+		return this.provider.sendAndConfirm(tx, additionalSigners, opts);
 	}
 }

package/src/tx/retryTxSender.ts

@@ -10,7 +10,7 @@ import {
 	TransactionSignature,
 	Connection,
 } from '@solana/web3.js';
-import { Provider } from '@project-serum/anchor';
+import { AnchorProvider } from '@project-serum/anchor';
 import assert from 'assert';
 import bs58 from 'bs58';
 
@@ -22,13 +22,13 @@ type ResolveReference = {
 };
 
 export class RetryTxSender implements TxSender {
-	provider: Provider;
+	provider: AnchorProvider;
 	timeout: number;
 	retrySleep: number;
 	additionalConnections: Connection[];
 
 	public constructor(
-		provider: Provider,
+		provider: AnchorProvider,
 		timeout?: number,
 		retrySleep?: number,
 		additionalConnections = new Array<Connection>()