Various bugfixes

Author: aubBrooks919

js/src/ids.ts

@@ -2,7 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 
 // Devnet
 export const DEX_ID = new PublicKey(
-  "FCLTih6H1jMuxZSmJ13u5DnpUU7BuT8MV4By2VftggCQ"
+  "HEHEVQNZMTmjUt3CUKdddqHWa4dtXqA9QUsi7QptCCHj"
 );
 
 export const SRM_MINT = new PublicKey(

js/src/openOrders.ts

@@ -168,11 +168,7 @@ export class OpenOrders {
       programId
     );
 
-    const userAccount = await UserAccount.retrieve(
-      connection,
-      address,
-      marketState
-    );
+    const userAccount = await UserAccount.retrieve(connection, address);
 
     return new OpenOrders(
       address,

js/tests/all.test.ts

@@ -72,21 +72,21 @@ jest.setTimeout(50_000_000);
 //   );
 // });
 
-test("Simple Trade (baseCurrencyMultiplier != 1)", async () => {
-  await simpleTrade(
-    connection,
-    feePayer,
-    6,
-    6,
-    20_000,
-    30_000,
-    1,
-    6,
-    2,
-    new BN(10),
-    new BN(5)
-  );
-});
+// test("Simple Trade (baseCurrencyMultiplier != 1)", async () => {
+//   await simpleTrade(
+//     connection,
+//     feePayer,
+//     6,
+//     6,
+//     20_000,
+//     30_000,
+//     1,
+//     6,
+//     2,
+//     new BN(10),
+//     new BN(5)
+//   );
+// });
 
 // test("Orderbook (6, 6)", async () => {
 //   await orderbookTest(connection, feePayer, 6, 6, 100, 1_000, 1, 100, 2);

js/tests/create-market.ts

@@ -24,6 +24,7 @@ export const createMarketTest = async (
     6,
     6
   );
+  console.log("Created context");
 
   let marketObj = await MarketState.retrieve(connection, marketKey);
   const now = new Date().getTime() / 1_000;

js/tests/simple-trade.ts

@@ -47,7 +47,7 @@ export const simpleTrade = async (
    */
 
   const tickSize = new BN(random(0, maxTickSize) * 2 ** 32);
-  const minBaseOrderSize = new BN(1);
+  const minBaseOrderSize = baseCurrencyMultiplier || new BN(1);
   const { marketKey, base, quote, Alice, Bob } = await createContext(
     connection,
     feePayer,
@@ -172,9 +172,13 @@ export const simpleTrade = async (
 
   console.log(tx);
   const executionPrice = computeFp32Price(market, bobPrice);
-  const takerFee = computeTakerFee(new BN(bobSize).mul(executionPrice).shrn(32))
-    .mul(market.quoteCurrencyMultiplier)
-    .div(market.baseCurrencyMultiplier);
+  const takerFee = computeTakerFee(
+    new BN(bobSize)
+      .mul(executionPrice)
+      .shrn(32)
+      .mul(market.quoteCurrencyMultiplier)
+      .div(market.baseCurrencyMultiplier)
+  );
   const orderPrice = computeFp32Price(market, alicePrice);
 
   /**

js/tests/swap.ts

@@ -144,10 +144,12 @@ export const swapTest = async (
 
   const executionPrice = computeFp32Price(market, swapPrice);
   const takerFees = computeTakerFee(
-    new BN(swapSize).mul(executionPrice).shrn(32)
-  )
-    .mul(market.quoteCurrencyMultiplier)
-    .div(market.baseCurrencyMultiplier);
+    new BN(swapSize)
+      .mul(executionPrice)
+      .shrn(32)
+      .mul(market.quoteCurrencyMultiplier)
+      .div(market.baseCurrencyMultiplier)
+  );
 
   /**
    * Check market state

program/src/processor/sweep_fees.rs

@@ -151,10 +151,7 @@ pub(crate) fn process(program_id: &Pubkey, accounts: &[AccountInfo]) -> ProgramR
         accounts.destination_token_account.key,
         accounts.market_signer.key,
         &[],
-        market_state
-            .accumulated_fees
-            .checked_mul(market_state.quote_currency_multiplier)
-            .unwrap(),
+        market_state.accumulated_fees,
     )?;
 
     invoke_signed(