@reyaxyz/common 0.115.0 → 0.117.0

package/src/transactions/executeTransaction.ts

@@ -2,6 +2,9 @@ import { JsonRpcSigner, Signer } from 'ethers';
 import { ReyaChainId } from '../types';
 import { ContractType, getAddress } from './contractAddresses';
 import { getGasBuffer } from './txHelpers';
+import { abi } from './abis/Errors.json';
+import { ErrorDecoder } from 'ethers-decode-error';
+import type { DecodedError } from 'ethers-decode-error';
 
 export type Transaction = {
   from: string;
@@ -9,6 +12,7 @@ export type Transaction = {
   data: string;
   value?: string;
 };
+const errorDecoder = ErrorDecoder.create([abi]);
 
 export async function estimateGas(
   signer: Signer | JsonRpcSigner,
@@ -43,11 +47,12 @@ export async function estimateGas(
     const gasEstimate = await signer.estimateGas(tx);
     gasLimit = getGasBuffer(gasEstimate);
   } catch (error) {
-    // sentry error & thorw
+    const decodedError = await errorDecoder.decode(error);
+    const reason = customReasonMapper(decodedError);
     console.error(
-      `Error simulating transaction account address ${accountAddress} ${error}`,
+      `Error simulating transaction account address ${accountAddress} reason ${decodedError?.name} ${decodedError} ${error}`,
     );
-    throw new Error('Error executing transaction'); // @todo introduce error parsing
+    throw new Error(reason);
   }
 
   if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {
@@ -83,3 +88,20 @@ export async function executeTransaction(
     throw new Error('Transaction Execution Error');
   }
 }
+const customReasonMapper = ({ name, reason }: DecodedError): string => {
+  switch (name) {
+    case 'SignatureInvalid':
+      return `Invalid signature. Please refresh page and try again`;
+    case 'StalePriceDetected':
+      return `Price not updated, please try again a bit later`;
+    case 'SmallOrderSize':
+      return `Order size below minimum`;
+    case 'DustyOrderSize':
+      return `Order amount is not divisible by trade size spacing`;
+    case 'AccountBelowIM':
+      return `Account below required margin`;
+    default:
+      // This handles the non-custom errors
+      return reason ?? 'Error executing transaction';
+  }
+};

package/src/types.ts

@@ -636,6 +636,7 @@ export type TokenInfo = {
   minDepositAmount: number;
   minWithdrawAmount: number;
   minTransferAmount: number;
+  whitelistedWalletOnly?: boolean;
 };
 
 // --- TOS ----

package/src/utils/consts.ts

@@ -2,3 +2,5 @@ export const MAX_UINT128 = 2 ** 128 - 1;
 export const API_TIMEOUT: number = 2500;
 
 export const CHANNEL_NAME: string = 'redis-pub-sub';
+
+export const WHITELISTED_WALLETS = ['some_id'];

package/src/utils/index.ts

@@ -5,3 +5,4 @@ export * from './retry';
 export * from './timestamp';
 export * from './token';
 export * from './task-wrapper';
+export * from './whitelisted-wallets';

package/src/utils/token-info.ts

@@ -39,6 +39,14 @@ export const TOKEN_INFO: Record<ReyaChainId | MoneyInOutChainId, TokenInfo[]> =
         ...defaultTokenThresholds,
         minWithdrawAmount: 28,
       },
+      {
+        name: 'WETH',
+        address: '0xc123b7aeb9d2b2e8a035217d5c29e317c91842e2',
+        decimals: 18,
+        isRUSDUnderlying: false,
+        whitelistedWalletOnly: true,
+        ...defaultTokenThresholds,
+      },
     ],
     [MoneyInOutChainId.opMainnet]: [
       {
@@ -49,6 +57,14 @@ export const TOKEN_INFO: Record<ReyaChainId | MoneyInOutChainId, TokenInfo[]> =
         ...defaultTokenThresholds,
         minWithdrawAmount: 10,
       },
+      {
+        name: 'WETH',
+        address: '0xc123b7aeb9d2b2e8a035217d5c29e317c91842e2',
+        decimals: 18,
+        isRUSDUnderlying: false,
+        whitelistedWalletOnly: true,
+        ...defaultTokenThresholds,
+      },
     ],
     [MoneyInOutChainId.polygonMainnet]: [
       {
@@ -59,6 +75,14 @@ export const TOKEN_INFO: Record<ReyaChainId | MoneyInOutChainId, TokenInfo[]> =
         ...defaultTokenThresholds,
         minWithdrawAmount: 10,
       },
+      {
+        name: 'WETH',
+        address: '0xc123b7aeb9d2b2e8a035217d5c29e317c91842e2',
+        decimals: 18,
+        isRUSDUnderlying: false,
+        whitelistedWalletOnly: true,
+        ...defaultTokenThresholds,
+      },
     ],
     [MoneyInOutChainId.arbitrumOne]: [
       {
@@ -69,6 +93,14 @@ export const TOKEN_INFO: Record<ReyaChainId | MoneyInOutChainId, TokenInfo[]> =
         ...defaultTokenThresholds,
         minWithdrawAmount: 10,
       },
+      {
+        name: 'WETH',
+        address: '0xc123b7aeb9d2b2e8a035217d5c29e317c91842e2',
+        decimals: 18,
+        isRUSDUnderlying: false,
+        whitelistedWalletOnly: true,
+        ...defaultTokenThresholds,
+      },
     ],
     [MoneyInOutChainId.baseMainnet]: [
       {
@@ -79,6 +111,14 @@ export const TOKEN_INFO: Record<ReyaChainId | MoneyInOutChainId, TokenInfo[]> =
         ...defaultTokenThresholds,
         minWithdrawAmount: 10,
       },
+      {
+        name: 'WETH',
+        address: '0xc123b7aeb9d2b2e8a035217d5c29e317c91842e2',
+        decimals: 18,
+        isRUSDUnderlying: false,
+        whitelistedWalletOnly: true,
+        ...defaultTokenThresholds,
+      },
     ],
 
     /* ------------------------------------------------------ */

package/src/utils/whitelisted-wallets.ts

@@ -0,0 +1,4 @@
+import { WHITELISTED_WALLETS } from './consts';
+
+export const getIsWalletWhitelisted = (walletAddress: string) =>
+  WHITELISTED_WALLETS.includes(walletAddress);