Merge pull request #132 from compolabs/feat/1471-update-contracts

[1471] Next version of smart contracts

Author: EchoDex

package.json

@@ -15,7 +15,7 @@
     "pnpm": ">=9.7.0"
   },
   "dependencies": {
-    "@compolabs/spark-orderbook-ts-sdk": "^1.6.6",
+    "@compolabs/spark-orderbook-ts-sdk": "^1.8.6",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@fuels/connectors": "^0.9.1",

pnpm-lock.yaml

@@ -4,7 +4,7 @@ export default function getConfig() {
   return {
     name: "download-config",
     async buildStart() {
-      const url = "https://raw.githubusercontent.com/compolabs/spark-frontend-config/main/config.json";
+      const url = "https://raw.githubusercontent.com/compolabs/spark-frontend-config/main/config-dev.json";
       const res = await fetch(url);
       const json = await res.json();
 

script/getConfig.ts

@@ -2,10 +2,9 @@ import SparkOrderBookSdk, {
   GetActiveOrdersParams,
   Order,
   OrderType,
-  UserMarketBalance,
   WriteTransactionResponse,
 } from "@compolabs/spark-orderbook-ts-sdk";
-import { Account, B256Address, Bech32Address } from "fuels";
+import { Account, B256Address } from "fuels";
 import { makeObservable } from "mobx";
 import { Nullable } from "tsdef";
 
@@ -102,12 +101,24 @@ export class FuelNetwork {
     return this.orderbookSdk.createOrder(...params);
   };
 
+  createSpotOrderWithDeposit = async (
+    ...params: Parameters<typeof this.orderbookSdk.createOrderWithDeposit>
+  ): Promise<WriteTransactionResponse> => {
+    return this.orderbookSdk.createOrderWithDeposit(...params);
+  };
+
   swapTokens = async (
     ...params: Parameters<typeof this.orderbookSdk.fulfillOrderMany>
   ): Promise<WriteTransactionResponse> => {
     return this.orderbookSdk.fulfillOrderMany(...params);
   };
 
+  fulfillOrderManyWithDeposit = async (
+    ...params: Parameters<typeof this.orderbookSdk.fulfillOrderManyWithDeposit>
+  ): Promise<WriteTransactionResponse> => {
+    return this.orderbookSdk.fulfillOrderManyWithDeposit(...params);
+  };
+
   cancelSpotOrder = async (
     ...params: Parameters<typeof this.orderbookSdk.cancelOrder>
   ): Promise<WriteTransactionResponse> => {
@@ -119,13 +130,14 @@ export class FuelNetwork {
   };
 
   withdrawSpotBalance = async (
-    ...params: Parameters<typeof this.orderbookSdk.withdraw>
+    ...params: Parameters<typeof this.orderbookSdk.withdrawAssets>
   ): Promise<WriteTransactionResponse> => {
-    return this.orderbookSdk.withdraw(...params);
+    return this.orderbookSdk.withdrawAssets(...params);
   };
 
-  withdrawSpotBalanceAll = async (...params: Parameters<typeof this.orderbookSdk.withdrawAll>): Promise<void> => {
-    await this.orderbookSdk.withdrawAll(...params);
+  withdrawSpotBalanceAll = async (...params: Parameters<typeof this.orderbookSdk.withdrawAllAssets>): Promise<void> => {
+    console.log("params", params);
+    await this.orderbookSdk.withdrawAllAssets(...params);
   };
 
   depositSpotBalance = async (
@@ -178,11 +190,31 @@ export class FuelNetwork {
     };
   };
 
-  fetchSpotMatcherFee = async (): Promise<number> => {
+  fetchSpotMatcherFee = async () => {
     return this.orderbookSdk.fetchMatcherFee();
   };
 
-  fetchSpotUserMarketBalance = async (accountAddress: Bech32Address): Promise<UserMarketBalance> => {
-    return this.orderbookSdk.fetchUserMarketBalance(accountAddress);
+  fetchSpotProtocolFee = async () => {
+    return this.orderbookSdk.fetchProtocolFee();
+  };
+
+  fetchSpotProtocolFeeForUser = async (...params: Parameters<typeof this.orderbookSdk.fetchProtocolFeeForUser>) => {
+    return this.orderbookSdk.fetchProtocolFeeForUser(...params);
+  };
+
+  fetchSpotProtocolFeeAmountForUser = async (
+    ...params: Parameters<typeof this.orderbookSdk.fetchProtocolFeeAmountForUser>
+  ) => {
+    return this.orderbookSdk.fetchProtocolFeeAmountForUser(...params);
+  };
+
+  fetchSpotUserMarketBalance = async (...params: Parameters<typeof this.orderbookSdk.fetchUserMarketBalance>) => {
+    return this.orderbookSdk.fetchUserMarketBalance(...params);
+  };
+
+  fetchUserMarketBalanceByContracts = async (
+    ...params: Parameters<typeof this.orderbookSdk.fetchUserMarketBalanceByContracts>
+  ) => {
+    return this.orderbookSdk.fetchUserMarketBalanceByContracts(...params);
   };
 }

src/assets/icons/arrowDown.svg

@@ -68,6 +68,15 @@ const Header: React.FC = observer(() => {
         </SmartFlex>
         <SmartFlex center="y" gap="8px">
           {renderWallet()}
+          <ButtonStyled
+            data-onboarding="assets-mobile"
+            fitContent
+            onClick={() => quickAssetsStore.setQuickAssets(true)}
+          >
+            <SmartFlex>
+              <DataBase />
+            </SmartFlex>
+          </ButtonStyled>
           <MenuContainer data-onboarding="menu-mobile" onClick={toggleMenu}>
             <Menu />
           </MenuContainer>
@@ -104,7 +113,6 @@ const Header: React.FC = observer(() => {
   return (
     <Root>
       {media.mobile ? renderMobile() : renderDesktop()}
-
       <MobileMenu
         isOpen={isMobileMenuOpen}
         onAccountClick={openAccountInfo}
@@ -133,6 +141,12 @@ const Root = styled(SmartFlex)`
   }
 `;
 
+const ButtonStyled = styled(Button)`
+  padding: 5px;
+  width: 34px;
+  height: 34px;
+`;
+
 const Divider = styled.div`
   margin: 0 16px;
   width: 1px;

src/assets/icons/lightning.svg

@@ -50,9 +50,6 @@ const MobileMenu: React.FC<IProps> = observer(({ isOpen, onAccountClick, onWalle
         </Container>
         <SizedBox height={8} />
         <FooterContainer gap="8px" column>
-          <Button data-onboarding="assets-mobile" onClick={() => quickAssetsStore.setQuickAssets(true)}>
-            ASSETS
-          </Button>
           {renderWalletAddressButton()}
         </FooterContainer>
       </Body>

src/blockchain/FuelNetwork.ts

@@ -21,7 +21,7 @@ export const RadioButton: React.FC<Props> = ({ label, value, isSelected, onChang
     <Root key={value}>
       <StyledInput checked={isSelected} type="radio" value={value} onChange={handleClick} />
       <StyledRadio checked={isSelected} />
-      <Text color={theme.colors.textPrimary} type={TEXT_TYPES.BUTTON_SECONDARY}>
+      <Text color={theme.colors.textPrimary} type={TEXT_TYPES.BODY_NEW}>
         {label}
       </Text>
     </Root>

src/components/Header/Header.tsx

@@ -24,10 +24,16 @@ export interface IAssetBlock {
     assetId: string;
   };
   styleToken?: CSSProperties;
+  type?: "rounded" | "square";
 }
 
 const AssetBlock: React.FC<IAssetBlock> = observer(
-  ({ styleToken, options: { showBalance = "balance", showNullBalance = true, isShowBalance = true }, token }) => {
+  ({
+    styleToken,
+    options: { showBalance = "balance", showNullBalance = true, isShowBalance = true },
+    token,
+    type = "square",
+  }) => {
     if (!token?.asset?.priceFeed) return <></>;
     const { oracleStore } = useStores();
     const price = BN.formatUnits(oracleStore.getTokenIndexPrice(token.asset.priceFeed), DEFAULT_DECIMALS);
@@ -38,7 +44,7 @@ const AssetBlock: React.FC<IAssetBlock> = observer(
         <SmartFlex alignItems="center" gap="10px">
           <TokenIcon src={token.asset.logo} />
           <div>
-            <Text type={TEXT_TYPES.BUTTON} primary>
+            <Text type={type === "rounded" ? TEXT_TYPES.H_NEW : TEXT_TYPES.BUTTON} primary>
               {token.asset.symbol}
             </Text>
             {isShowBalance && <Text type={TEXT_TYPES.BODY}>{token.asset.name}</Text>}