V5 upgrade

package.json

@@ -13,7 +13,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@airswap/libraries": "4.3.6",
+    "@airswap/libraries": "5.0.1",
     "@akkafinance/web3-react-bitkeep": "^1.0.0",
     "@coinbase/wallet-sdk": "^3.7.2",
     "@craco/craco": "^6.2.0",

public/locales/en/translation.json

@@ -180,7 +180,7 @@
     "takeOtc": "Take",
     "takeQuote": "Complete Swap",
     "thisOrderIsForADifferentTaker": "This order is for a different taker",
-    "thisOrderIsForAnotherChain": "This order is for the {{chainName}} chain",
+    "thisOrderIsForAnotherChain": "This order is for {{chainName}}",
     "thisOrderWasForADifferentTaker": "This order was for a different taker",
     "to": "To",
     "tokenInfoNotFound": "Token info not found",
@@ -215,6 +215,7 @@
     "nonceAlreadyUsed": "Nonce has been already used or cancelled",
     "senderAllowanceLow": "Sender (taker) has not approved the required amount",
     "senderBalanceLow": "Sender (taker) does not have the required balance",
+    "signatureInvalid": "Invalid signature",
     "signerAllowanceLow": "Signer (maker) has not approved the required amount",
     "signerBalanceLow": "Signer (maker) does not have the required balance",
     "swapFail": "The swap would fail for the following reasons.",

src/components/@widgets/OrderDetailWidget/hooks/useTakerTokenInfo.tsx

@@ -1,11 +1,9 @@
 import { useEffect, useState } from "react";
 
 import { TokenInfo } from "@airswap/utils";
-import { Web3Provider } from "@ethersproject/providers";
+import { Web3Provider, JsonRpcProvider } from "@ethersproject/providers";
 import { useWeb3React } from "@web3-react/core";
 
-import { getDefaultProvider } from "ethers";
-
 import { useAppDispatch, useAppSelector } from "../../../../app/hooks";
 import { getAllTokensFromLocalStorage } from "../../../../features/metadata/metadataApi";
 import {
@@ -65,7 +63,8 @@ const useTakerTokenInfo = (
     const callScrapeToken = async () => {
       setIsCallScrapeTokenLoading(true);
 
-      const lib = library || getDefaultProvider(getRpcUrl(activeOrder.chainId));
+      const lib =
+        library || new JsonRpcProvider(getRpcUrl(activeOrder.chainId));
 
       if (lib) {
         const result = await scrapeToken(address, lib);

src/components/ErrorList/helpers/index.ts

@@ -4,6 +4,13 @@ import { AppError, AppErrorType } from "../../../errors/appError";
 import { ErrorListItemProps } from "../subcomponents/ErrorListItem/ErrorListItem";
 
 export const getAppErrorTranslation = (error: AppError): ErrorListItemProps => {
+  if (error.type === AppErrorType.signatureInvalid) {
+    return {
+      title: AppErrorType.signatureInvalid,
+      text: i18n.t("validatorErrors.signatureInvalid"),
+    };
+  }
+
   if (error.type === AppErrorType.expiryPassed) {
     return {
       title: AppErrorType.expiryPassed,

src/entities/Server/ServerService.ts

@@ -1,30 +1,10 @@
-import { Server, RegistryV3, Registry } from "@airswap/libraries";
+import { Server, Registry } from "@airswap/libraries";
 import { ProtocolIds } from "@airswap/utils";
 import { BaseProvider } from "@ethersproject/providers";
 
 import { REGISTRY_SERVER_RESPONSE_TIME_MS } from "../../constants/configParams";
 import { isServer } from "./ServerHelpers";
 
-export const getVersionedRegistryServers = (
-  provider: BaseProvider,
-  chainId: number,
-  protocol: ProtocolIds,
-  quoteToken: string,
-  baseToken: string
-): Promise<Server[]> => {
-  if (RegistryV3.addresses[chainId]) {
-    return RegistryV3.getServers(provider, chainId, quoteToken, baseToken);
-  }
-
-  return Registry.getServers(
-    provider,
-    chainId,
-    protocol,
-    quoteToken,
-    baseToken
-  );
-};
-
 export const getRegistryServers = async (
   provider: BaseProvider,
   chainId: number,
@@ -34,13 +14,7 @@ export const getRegistryServers = async (
 ): Promise<Server[]> => {
   try {
     const response = await Promise.race([
-      getVersionedRegistryServers(
-        provider,
-        chainId,
-        protocol,
-        quoteToken,
-        baseToken
-      ),
+      Registry.getServers(provider, chainId, protocol, quoteToken, baseToken),
       new Promise((_, reject) =>
         setTimeout(
           () => reject(new Error("Timeout")),

src/features/orders/ordersHelpers.ts

@@ -229,7 +229,7 @@ export async function check(
     : errors;
 
   if (filteredErrors.length) {
-    console.error("check returned errors", errors);
+    console.error("check returned errors", filteredErrors);
   }
 
   return filteredErrors.map((error) => transformSwapErrorToAppError(error));

src/features/transactions/helpers/getOrdersFromLogs.ts

@@ -62,7 +62,9 @@ export const getOrdersFromLogs = async (
         hash: swapLog.transactionHash,
         order,
         swap,
-        timestamp: blocks[index].timestamp * 1000,
+        timestamp: blocks[index]?.timestamp
+          ? blocks[index].timestamp * 1000
+          : 0,
       };
     })
   );

src/features/transactions/hooks/useLatestSwapFromEvents.ts

@@ -34,12 +34,6 @@ const useLatestSwapFromEvents = (
       const handleSwapEvent = async (
         nonce: BigNumber,
         signerAddress: string,
-        a: string,
-        b: number,
-        c: number,
-        d: string,
-        e: string,
-        f: number,
         swapEvent: Event
       ) => {
         const receipt = await swapEvent.getTransactionReceipt();

src/helpers/createSwapSignature.ts

@@ -8,8 +8,6 @@ import { JsonRpcSigner } from "@ethersproject/providers/src.ts/json-rpc-provider
 import { AppError } from "../errors/appError";
 import transformUnknownErrorToAppError from "../errors/transformUnknownErrorToAppError";
 
-const SWAP_ERC20_VERSION = "4";
-
 export const createOrderERC20Signature = (
   unsignedOrder: UnsignedOrderERC20,
   signer: JsonRpcSigner,
@@ -23,8 +21,7 @@ export const createOrderERC20Signature = (
         // @ts-ignore
         signer,
         swapContract,
-        chainId,
-        SWAP_ERC20_VERSION
+        chainId
       );
       resolve(signature);
     } catch (error: unknown) {

src/helpers/ethers.ts

@@ -18,20 +18,6 @@ export const clearedCachedLibrary = (): void => {
   cachedLibrary = {};
 };
 
-export const getRpcUrl = (chainId: number): string | undefined => {
-  const rpcUrl = rpcUrls[chainId];
-
-  if (!rpcUrl) {
-    console.error(
-      `No rpc url found for chainId ${chainId}, did you setup your .env correctly?`
-    );
-
-    return undefined;
-  }
-
-  return rpcUrl;
-};
-
 export const getTransactionReceiptMined = (
   transactionHash: string,
   provider: Web3Provider

src/helpers/getContractEvents.ts

@@ -76,7 +76,7 @@ export const getContractEvents = (
 
         if (!blockLimit) {
           console.error(
-            "[getContractQueryFilter]: Error when getting logs, but no block limit could be found",
+            `[getContractQueryFilter]: Error when getting logs (${startBlock} to ${endBlock}) but no block limit could be found`,
             error
           );