Merge pull request #396 from compolabs/feat/blockchain-refactor

feat: blockchain refactor

Author: EchoDex

.eslintrc.cjs

@@ -60,12 +60,13 @@ module.exports = {
           // Packages. `react` related packages come first.
           ["^react", "^@?\\w"],
           ["^@compolabs"],
+          ["^(@blockchain)(/.*|$)"],
           ["^(@themes|@components)(/.*|$)"],
           ["^(@assets)(/.*|$)"],
           ["^(@stores|@hooks)(/.*|$)"],
           ["^(@screens)(/.*|$)"],
           ["^(@utils|@constants)(/.*|$)"],
-          ["^(@blockchain|@entity)(/.*|$)"],
+          ["^(@entity)(/.*|$)"],
           ["^(@src)(/.*|$)"],
           ["^\\u0000"],
           // Parent imports. Put `..` last.

package.json

@@ -107,7 +107,7 @@
       "last 1 safari version"
     ]
   },
-  "packageManager": "pnpm@10.6.3+sha512.bb45e34d50a9a76e858a95837301bfb6bd6d35aea2c5d52094fa497a467c43f5c440103ce2511e9e0a2f89c3d6071baac3358fc68ac6fb75e2ceb3d2736065e6",
+  "packageManager": "pnpm@10.7.0+sha512.6b865ad4b62a1d9842b61d674a393903b871d9244954f652b8842c2b553c72176b278f64c463e52d40fff8aba385c235c8c9ecf5cc7de4fd78b8bb6d49633ab6",
   "pnpm": {
     "overrides": {}
   }

src/blockchain/Blockchain.ts

@@ -0,0 +1,20 @@
+import { Nullable } from "tsdef";
+
+import { FuelNetwork } from "./fuel/FuelNetwork";
+
+export class Blockchain {
+  private static instance: Nullable<Blockchain> = null;
+
+  sdk: FuelNetwork;
+
+  private constructor() {
+    this.sdk = FuelNetwork.getInstance();
+  }
+
+  public static getInstance(): Blockchain {
+    if (!Blockchain.instance) {
+      Blockchain.instance = new Blockchain();
+    }
+    return Blockchain.instance;
+  }
+}

src/blockchain/FuelNetwork.ts renamed to src/blockchain/fuel/FuelNetwork.ts

@@ -1,9 +1,10 @@
-import { Account, B256Address } from "fuels";
 import { makeObservable } from "mobx";
 import { Nullable } from "tsdef";
 
 import SparkOrderBookSdk, { BN, OrderType, WriteTransactionResponse } from "@compolabs/spark-orderbook-ts-sdk";
 
+import { Account, B256Address } from "@blockchain/fuel/types/fuels";
+
 import { CONFIG } from "@utils/getConfig";
 
 import { Token } from "@entity";

src/blockchain/WalletManager.ts renamed to src/blockchain/fuel/WalletManager.ts

@@ -1,11 +1,21 @@
-import { Account, B256Address, Fuel, Provider, Wallet, WalletLocked, WalletUnlocked } from "fuels";
 import { makeAutoObservable } from "mobx";
 import { Nullable } from "tsdef";
 
+import {
+  Account,
+  B256Address,
+  Fuel,
+  Provider,
+  Wallet,
+  WalletLocked,
+  WalletUnlocked,
+} from "@blockchain/fuel/types/fuels";
+
 import { FUEL_CONFIG } from "@constants";
 import { CONFIG } from "@utils/getConfig";
 
-import { NETWORK_ERROR, NetworkError } from "./NetworkError";
+import { NETWORK_ERROR, NetworkError } from "../NetworkError";
+
 import { Balances } from "./types";
 
 export class WalletManager {

src/blockchain/fuel/types/fuels.ts

@@ -0,0 +1 @@
+export * from "fuels";

src/blockchain/types/index.ts renamed to src/blockchain/fuel/types/index.ts

@@ -1,5 +1,7 @@
 import { BN } from "@compolabs/spark-orderbook-ts-sdk";
 
+export * from "@compolabs/spark-orderbook-ts-sdk";
+
 export type FetchTradesParams = {
   limit: number;
   asset?: string;

src/blockchain/index.ts

@@ -1 +1 @@
-export * from "./FuelNetwork";
+export * from "./Blockchain";

src/components/CompressedNumber.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from "react";
 
-import { BN } from "@compolabs/spark-orderbook-ts-sdk";
+import { BN } from "@blockchain/fuel/types";
 
 import { SmartFlex } from "./SmartFlex";
 import Text from "./Text";

src/components/Modal/AccountInfoSheet.tsx

@@ -2,7 +2,8 @@ import React from "react";
 import styled from "@emotion/styled";
 import copy from "copy-to-clipboard";
 
-import { BN } from "@compolabs/spark-orderbook-ts-sdk";
+import { Blockchain } from "@blockchain";
+import { BN } from "@blockchain/fuel/types";
 
 import copyIcon from "@assets/icons/copy.svg";
 import linkIcon from "@assets/icons/link.svg";
@@ -13,8 +14,6 @@ import { useStores } from "@stores";
 
 import { getExplorerLinkByAddress } from "@utils/getExplorerLink";
 
-import { FuelNetwork } from "@blockchain";
-
 import Divider from "../Divider";
 import Sheet from "../Sheet";
 import { SmartFlex } from "../SmartFlex";
@@ -29,11 +28,11 @@ const AccountInfoSheet: React.FC<Props> = ({ isOpen, onClose }) => {
   const { disconnect } = useWallet();
   const { accountStore, notificationStore, balanceStore } = useStores();
 
-  const bcNetwork = FuelNetwork.getInstance();
+  const bcNetwork = Blockchain.getInstance();
 
   const ethBalance = BN.formatUnits(
-    balanceStore.getWalletBalance(bcNetwork!.getTokenBySymbol("ETH").assetId) ?? BN.ZERO,
-    bcNetwork?.getTokenBySymbol("ETH").decimals,
+    balanceStore.getWalletBalance(bcNetwork.sdk.getTokenBySymbol("ETH").assetId) ?? BN.ZERO,
+    bcNetwork.sdk.getTokenBySymbol("ETH").decimals,
   )?.toFormat(4);
 
   const handleAddressCopy = () => {
@@ -80,7 +79,7 @@ const AccountInfoSheet: React.FC<Props> = ({ isOpen, onClose }) => {
     <Sheet isOpen={isOpen} header onClose={onClose}>
       <SmartFlex column>
         <TokenContainer center="y" gap="8px">
-          <Icon alt="ETH" src={bcNetwork?.getTokenBySymbol("ETH").logo} />
+          <Icon alt="ETH" src={bcNetwork.sdk.getTokenBySymbol("ETH").logo} />
           <Text type="H" primary>{`${ethBalance} ETH`}</Text>
         </TokenContainer>
         <Divider />