Merge pull request #64 from compolabs/feat/1113-new-orderbook-contract

[1113] Connecting new sdk with updated order book contract

Author: EchoDex

package.json

@@ -11,7 +11,7 @@
     "deploy": "gh-pages -d build"
   },
   "dependencies": {
-    "@compolabs/spark-orderbook-ts-sdk": "1.2.4",
+    "@compolabs/spark-orderbook-ts-sdk": "1.3.3-beta",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@fuels/connectors": "^0.6.0",

pnpm-lock.yaml

@@ -10,9 +10,9 @@ import { usePrivateKeyAsAuth } from "./hooks/usePrivateKeyAsAuth";
 import UnderConstruction from "./screens/Errors/UnderConstruction";
 import Faucet from "./screens/Faucet";
 import TradeScreen from "./screens/TradeScreen";
-import { isProduction, ROUTES } from "./constants";
+import { ROUTES } from "./constants";
 
-const isUnderConstruction = isProduction;
+const isUnderConstruction = false;
 
 const App: React.FC = observer(() => {
   usePrivateKeyAsAuth();

src/App.tsx

@@ -1,4 +1,12 @@
-import Spark from "@compolabs/spark-orderbook-ts-sdk";
+import SparkOrderBookSdk, {
+  AssetType,
+  CreateOrderParams,
+  DepositParams,
+  GetMatchOrderEventsParams,
+  GetOrdersParams,
+  OrderType,
+  WriteTransactionResponse,
+} from "@compolabs/spark-orderbook-ts-sdk";
 import { makeObservable } from "mobx";
 import { Nullable } from "tsdef";
 
@@ -17,7 +25,6 @@ import {
   TOKENS_LIST,
 } from "./constants";
 import {
-  FetchOrdersParams,
   FetchTradesParams,
   MarketCreateEvent,
   PerpMaxAbsPositionSize,
@@ -30,14 +37,14 @@ export class FuelNetwork {
   private static instance: Nullable<FuelNetwork> = null;
 
   private walletManager = new WalletManager();
-  private sdk: Spark;
+  private orderbookSdk: SparkOrderBookSdk;
 
   public network = NETWORKS[0];
 
   private constructor() {
     makeObservable(this.walletManager);
 
-    this.sdk = new Spark({
+    this.orderbookSdk = new SparkOrderBookSdk({
       networkUrl: NETWORKS[0].url,
       contractAddresses: CONTRACT_ADDRESSES,
       indexerApiUrl: INDEXER_URL,
@@ -68,6 +75,7 @@ export class FuelNetwork {
     return this.walletManager.wallet;
   };
 
+  // TODO: Fix for mobile wallets connected to desktop
   getIsExternalWallet = () => false;
 
   getTokenList = (): Token[] => {
@@ -84,34 +92,46 @@ export class FuelNetwork {
 
   setWallet = async (account: string, wallet?: any): Promise<void> => {
     await this.walletManager.setWallet(account, wallet);
-    this.sdk.setActiveWallet(this.walletManager.wallet ?? undefined);
+    this.orderbookSdk.setActiveWallet((this.walletManager.wallet as any) ?? undefined);
   };
 
   connectWalletByPrivateKey = async (privateKey: string): Promise<void> => {
-    await this.walletManager.connectByPrivateKey(privateKey, await this.sdk.getProvider());
-    this.sdk.setActiveWallet(this.walletManager.wallet ?? undefined);
+    await this.walletManager.connectByPrivateKey(privateKey, (await this.orderbookSdk.getProvider()) as any);
+    this.orderbookSdk.setActiveWallet((this.walletManager.wallet as any) ?? undefined);
   };
 
   disconnectWallet = (): void => {
     this.walletManager.disconnect();
-    this.sdk.setActiveWallet(this.walletManager.wallet ?? undefined);
+    this.orderbookSdk.setActiveWallet((this.walletManager.wallet as any) ?? undefined);
   };
 
   addAssetToWallet = async (assetId: string): Promise<void> => {
     await this.walletManager.addAsset(assetId);
   };
 
-  createSpotOrder = async (assetAddress: string, size: string, price: string): Promise<any> => {
-    const baseToken = this.getTokenByAssetId(assetAddress);
-    const baseAsset = this.getAssetFromToken(baseToken);
-    const quoteToken = this.getTokenBySymbol("USDC");
-    const quoteAsset = this.getAssetFromToken(quoteToken);
+  createSpotOrder = async (deposit: DepositParams, order: CreateOrderParams): Promise<WriteTransactionResponse> => {
+    // const token = this.getTokenByAssetId(assetAddress);
+    // const asset = this.getAssetFromToken(token);
 
-    return this.sdk.createSpotOrder(baseAsset, quoteAsset, size, price);
+    return this.orderbookSdk.createOrder(deposit, order);
   };
 
-  cancelSpotOrder = async (orderId: string): Promise<void> => {
-    await this.sdk.cancelSpotOrder(orderId);
+  cancelSpotOrder = async (order: SpotMarketOrder): Promise<void> => {
+    const withdrawAmount = order.orderType === OrderType.Buy ? order.currentQuoteAmount : order.currentAmount;
+    const assetType = order.orderType === OrderType.Buy ? AssetType.Quote : AssetType.Base;
+
+    console.log({
+      amount: withdrawAmount.toString(),
+      assetType: assetType,
+    });
+
+    await this.orderbookSdk.cancelOrder(
+      {
+        amount: withdrawAmount.toString(),
+        assetType: assetType,
+      },
+      order.id,
+    );
   };
 
   mintToken = async (assetAddress: string): Promise<void> => {
@@ -120,7 +140,7 @@ export class FuelNetwork {
 
     const amount = FAUCET_AMOUNTS[token.symbol].toString();
 
-    await this.sdk.mintToken(asset, amount);
+    await this.orderbookSdk.mintToken(asset, amount);
   };
 
   depositPerpCollateral = async (assetAddress: string, amount: string): Promise<void> => {
@@ -167,30 +187,49 @@ export class FuelNetwork {
   };
 
   fetchSpotMarkets = async (limit: number): Promise<MarketCreateEvent[]> => {
-    return this.sdk.fetchSpotMarkets(limit);
+    return this.orderbookSdk.fetchMarkets(limit);
   };
 
   fetchSpotMarketPrice = async (baseTokenAddress: string): Promise<BN> => {
     const token = this.getTokenByAssetId(baseTokenAddress);
     const asset = this.getAssetFromToken(token);
 
-    return this.sdk.fetchSpotMarketPrice(asset);
+    return this.orderbookSdk.fetchMarketPrice(asset);
   };
 
-  fetchSpotOrders = async (params: FetchOrdersParams): Promise<SpotMarketOrder[]> => {
-    const orders = await this.sdk.fetchSpotOrders(params);
+  fetchSpotOrders = async (params: GetOrdersParams): Promise<SpotMarketOrder[]> => {
+    const orders = await this.orderbookSdk.fetchOrders(params);
 
-    return orders.map((obj) => new SpotMarketOrder(obj));
+    return orders.map(
+      (order) =>
+        new SpotMarketOrder({
+          ...order,
+          quoteAssetId: TOKENS_BY_SYMBOL.USDC.assetId,
+        }),
+    );
   };
 
-  fetchSpotTrades = async (params: FetchTradesParams): Promise<SpotMarketTrade[]> => {
-    const trades = await this.sdk.fetchSpotTrades(params);
+  fetchSpotTrades = async (params: GetMatchOrderEventsParams): Promise<SpotMarketTrade[]> => {
+    const trades = await this.orderbookSdk.getMatchOrderEvents(params);
 
-    return trades.map((obj) => new SpotMarketTrade({ ...obj, userAddress: params.trader }));
+    return trades.map(
+      (trade) =>
+        new SpotMarketTrade({
+          ...trade,
+          user: this.getAddress() ?? "",
+          quoteAssetId: TOKENS_BY_SYMBOL.USDC.assetId,
+        }),
+    );
   };
 
   fetchSpotVolume = async (): Promise<SpotMarketVolume> => {
-    return this.sdk.fetchSpotVolume();
+    const data = await this.orderbookSdk.fetchVolume();
+
+    return {
+      low: new BN(data.low24h),
+      high: new BN(data.high24h),
+      volume: new BN(data.volume24h),
+    };
   };
 
   matchPerpOrders = async (order1: string, order2: string): Promise<unknown> => {

src/blockchain/FuelNetwork.ts

@@ -6,8 +6,8 @@ import { Token } from "@src/entity/Token";
 
 import TOKENS_JSON from "./tokens.json";
 
-export const CONTRACT_ADDRESSES: any = {
-  spotMarket: "0x4a2ce054e3e94155f7092f7365b212f7f45105b74819c623744ebcc5d065c6ac",
+export const CONTRACT_ADDRESSES = {
+  market: "0x08ca18ed550d6229f001641d43aac58e00f9eb7e25c9bea6d33716af61e43b2a",
   tokenFactory: "0x3141a3f11e3f784364d57860e3a4dcf9b73d42e23fd49038773cefb09c633348",
   pyth: "0x3cd5005f23321c8ae0ccfa98fb07d9a5ff325c483f21d2d9540d6897007600c9",
 };
@@ -43,7 +43,7 @@ export const TOKENS_BY_ASSET_ID: Record<string, Token> = TOKENS_LIST.reduce(
   {},
 );
 
-export const INDEXER_URL = "https://indexer.bigdevenergy.link/22318a2/v1/graphql";
+export const INDEXER_URL = "https://indexer.bigdevenergy.link/67b693c/v1/graphql";
 // export const INDEXER_URL = "http://localhost:8080/v1/graphql";
 // export const INDEXER_URL = "https://envio-orderbook-indexer.spark-defi.com/v1/graphql";
 export const PYTH_URL = "https://hermes.pyth.network";

src/blockchain/constants.ts

@@ -1,17 +1,17 @@
 import BN from "@src/utils/BN";
 
-export type FetchOrdersParams<T = string> = {
-  baseToken: T;
-  limit: number;
-  trader?: T;
-  type?: "BUY" | "SELL";
-  isActive?: boolean;
-};
+// export type FetchOrdersParams = {
+//   baseToken: string;
+//   limit: number;
+//   trader?: string;
+//   type?: "BUY" | "SELL";
+//   isActive?: boolean;
+// };
 
-export type FetchTradesParams<T = string> = {
-  baseToken: T;
+export type FetchTradesParams = {
   limit: number;
-  trader?: T;
+  asset?: string;
+  user?: string;
 };
 
 export type MarketCreateEvent = {