feat(Metis): add Tethys DEX

developerfred · developerfred · commit beb917354fa2 · 2022-01-01T19:16:54.000Z
diff --git a/cspell.json b/cspell.json
@@ -111,6 +111,7 @@
         "jailbroken",
         "jsbi",
         "jsonml",
+        "juicebox",
         "kdfparams",
         "keccak",
         "Kitts",
@@ -153,6 +154,7 @@
         "multihop",
         "Mutex",
         "NETSWAP",
+        "NETT",
         "newsfeed",
         "NFTRSS",
         "nftscan",
@@ -248,29 +250,7 @@
         "xlarge",
         "xlink",
         "zerion",
-        "Zubin",
-        "Choudhary",
-        "macbinary",
-        "Choudhary",
-        "counterparty",
-        "jailbroken",
-        "misoperation",
-        "majeure",
-        "Serializers",
-        "Swither",
-        "nftscan",
-        "apikey",
-        "tokenid",
-        "NFTRSS",
-        "solana",
-        "Görli",
-        "resizer",
-        "Pageable",
-        "metaverse",
-        "hexlify",
-        "contribs",
-        "contrib",
-        "juicebox"
+        "Zubin"
     ],
     "ignoreWords": [
         "cryptopunks",
diff --git a/packages/dashboard/src/pages/Labs/components/SwapSettingDialog.tsx b/packages/dashboard/src/pages/Labs/components/SwapSettingDialog.tsx
@@ -65,6 +65,7 @@ export default function SwapSettingDialog({ open, onClose }: SettingDialogProps)
     const metisOptions = [
         { label: 'SushiSwap', value: TradeProvider.SUSHISWAP },
         { label: 'NetSwap', value: TradeProvider.NETSWAP },
+        { label: 'Tethys', value: TradeProvider.TETHYS },
     ]
 
     const t = useDashboardI18N()
diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeProviderIcon.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeProviderIcon.tsx
@@ -14,6 +14,7 @@ import { resolveTradeProviderName } from '../../pipes'
 
 const quickswapIcon = new URL('../../../../resources/quickswap.png', import.meta.url).toString()
 const pancakeswapIcon = new URL('../../../../resources/pancakeswap.png', import.meta.url).toString()
+const tethysIcon = new URL('../../../../resources/tethys.png', import.meta.url).toString()
 
 const useStyles = makeStyles()((theme) => ({
     icon: {
@@ -57,6 +58,14 @@ export function TradeProviderIcon(props: TradeProviderIconProps) {
                     className={classes.icon}
                 />
             )
+        case TradeProvider.TETHYS:
+            return (
+                <img
+                    src={tethysIcon}
+                    alt={resolveTradeProviderName(TradeProvider.PANCAKESWAP)}
+                    className={classes.icon}
+                />
+            )
         case TradeProvider.DODO:
             return <DODOIcon classes={{ root: classes.icon }} />
         case TradeProvider.BANCOR:
diff --git a/packages/mask/src/plugins/Trader/constants/index.ts b/packages/mask/src/plugins/Trader/constants/index.ts
@@ -10,4 +10,5 @@ export * from './pancakeswap'
 export * from './dodo'
 export * from './bancor'
 export * from './netswap'
+export * from './tethys'
 export type { ERC20TokenCustomizedBase, ERC20AgainstToken } from './types'
diff --git a/packages/mask/src/plugins/Trader/constants/netswap.ts b/packages/mask/src/plugins/Trader/constants/netswap.ts
@@ -1,37 +1,14 @@
 import { ChainId } from '@masknet/web3-shared-evm'
-import {
-    DAI,
-    MSKA,
-    MSKB,
-    MSKC,
-    RUNE,
-    USDC,
-    USDT,
-    WBTC,
-    WNATIVE,
-    WNATIVE_ONLY,
-    NFTX,
-    STETH,
-    BUSD,
-    BTCB,
-    CUSD,
-    CEUR,
-} from './trader'
+import { USDC, USDT, WNATIVE, NETT, WNATIVE_ONLY } from './trader'
 import type { ERC20AgainstToken, ERC20TokenCustomizedBase } from './types'
 
 /**
  * Some tokens can only be swapped via certain pairs,
  * so we override the list of bases that are considered for these tokens.
  */
-export const SUSHISWAP_CUSTOM_BASES: ERC20TokenCustomizedBase = {}
+export const NETSWAP_CUSTOM_BASES: ERC20TokenCustomizedBase = {}
 
-export const SUSHISWAP_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
+export const NETSWAP_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
     ...WNATIVE_ONLY,
-    [ChainId.Mainnet]: [WNATIVE, DAI, USDC, USDT, WBTC, RUNE, NFTX, STETH].map((x) => x[ChainId.Mainnet]),
-    [ChainId.Rinkeby]: [WNATIVE, MSKA, MSKB, MSKC].map((x) => x[ChainId.Rinkeby]),
-    [ChainId.Matic]: [WNATIVE, USDC, WBTC, DAI, USDT].map((x) => x[ChainId.Matic]),
-    [ChainId.BSC]: [WNATIVE, DAI, BUSD, USDC, USDT, BTCB].map((x) => x[ChainId.BSC]),
-    [ChainId.xDai]: [WNATIVE, USDC, USDT, WBTC].map((x) => x[ChainId.xDai]),
-    [ChainId.Celo]: [WNATIVE, CUSD, CEUR].map((x) => x[ChainId.Celo]),
-    [ChainId.Metis]: [WNATIVE, CUSD, CEUR].map((x) => x[ChainId.Metis]),
+    [ChainId.Metis]: [WNATIVE, USDC, USDT, NETT].map((x) => x[ChainId.Metis]),
 }
diff --git a/packages/mask/src/plugins/Trader/constants/openocean.ts b/packages/mask/src/plugins/Trader/constants/openocean.ts
@@ -10,4 +10,5 @@ export const networkNames: Record<NetworkType, string> = {
     [NetworkType.xDai]: 'xdai',
     [NetworkType.Celo]: 'celo',
     [NetworkType.Fantom]: 'fantom',
+    [NetworkType.Metis]: 'metis',
 }
diff --git a/packages/mask/src/plugins/Trader/constants/tethys.ts b/packages/mask/src/plugins/Trader/constants/tethys.ts
@@ -0,0 +1,14 @@
+import { ChainId } from '@masknet/web3-shared-evm'
+import { USDC, USDT, TETHYS, METIS, WNATIVE, WNATIVE_ONLY } from './trader'
+import type { ERC20AgainstToken, ERC20TokenCustomizedBase } from './types'
+
+/**
+ * Some tokens can only be swapped via certain pairs,
+ * so we override the list of bases that are considered for these tokens.
+ */
+export const TETHYS_CUSTOM_BASES: ERC20TokenCustomizedBase = {}
+
+export const TETHYS_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
+    ...WNATIVE_ONLY,
+    [ChainId.Metis]: [WNATIVE, METIS, USDC, USDT, TETHYS].map((x) => x[ChainId.Metis]),
+}
diff --git a/packages/mask/src/plugins/Trader/constants/trader.ts b/packages/mask/src/plugins/Trader/constants/trader.ts
@@ -43,6 +43,9 @@ export const NFTX = createERC20Tokens('NFTX_ADDRESS', 'NFTX', 'NFTX', 18)
 export const STETH = createERC20Tokens('stETH_ADDRESS', 'stakedETH', 'stETH', 18)
 export const CUSD = createERC20Tokens('cUSD_ADDRESS', 'Celo Dollar', 'cUSD', 18)
 export const CEUR = createERC20Tokens('cEUR_ADDRESS', 'Celo Euro', 'cEUR', 18)
+export const NETT = createERC20Tokens('NETT_ADDRESS', 'Netswap Token', 'NETT', 18)
+export const METIS = createERC20Tokens('METIS_ADDRESS', 'Metis Token', 'METIS', 18)
+export const TETHYS = createERC20Tokens('TETHYS_ADDRESS', 'Tethys', 'TETHYS', 18)
 
 export const WNATIVE = createERC20Tokens(
     'WNATIVE_ADDRESS',
diff --git a/packages/mask/src/plugins/Trader/pipes.ts b/packages/mask/src/plugins/Trader/pipes.ts
@@ -58,6 +58,7 @@ export const resolveTradeProviderName = createLookupTableResolver<TradeProvider,
         [TradeProvider.BANCOR]: 'Bancor',
         [TradeProvider.NETSWAP]: 'NetSwap',
         [TradeProvider.OPENOCEAN]: 'OpenOcean',
+        [TradeProvider.TETHYS]: 'Tethys',
     },
     (tradeProvider) => {
         throw new Error(`Unknown provider type: ${tradeProvider}`)
@@ -110,6 +111,8 @@ export function resolveTradeProviderLink(tradeProvider: TradeProvider, networkTy
             return 'https://netswap.io/#/swap'
         case TradeProvider.OPENOCEAN:
             return 'https://openocean.finance/classic'
+        case TradeProvider.TETHYS:
+            return 'http://tethys.finance'
         default:
             unreachable(tradeProvider)
     }
@@ -172,6 +175,9 @@ export function resolveTradePairLink(tradeProvider: TradeProvider, address: stri
         case TradeProvider.OPENOCEAN:
             // TODO - OpenOcean
             return ``
+        case TradeProvider.TETHYS:
+            // TODO - OpenOcean
+            return ``
         default:
             unreachable(tradeProvider)
     }
@@ -262,6 +268,7 @@ export const resolveZrxTradePoolName = createLookupTableResolver<ZrxTradePool, s
         [ZrxTradePool.WaultSwap]: 'WaultSwap',
         [ZrxTradePool.xSigma]: 'xSigma',
         [ZrxTradePool.NetSwap]: 'NetSwap',
+        [ZrxTradePool.Tethys]: 'NetSwap',
     },
     'Unknown',
 )
diff --git a/packages/mask/src/plugins/Trader/settings.ts b/packages/mask/src/plugins/Trader/settings.ts
@@ -110,6 +110,7 @@ const balancerSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvi
 const dodoSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvider+dodo`, '')
 const bancorSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvider+bancor`, '')
 const netswapSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvider+netswap`, '')
+const tethysSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvider+tethys`, '')
 const openoceanSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvider+openocean`, '')
 
 /**
@@ -139,6 +140,8 @@ export function getCurrentTradeProviderGeneralSettings(tradeProvider: TradeProvi
             return bancorSettings
         case TradeProvider.NETSWAP:
             return netswapSettings
+        case TradeProvider.TETHYS:
+            return tethysSettings
         case TradeProvider.OPENOCEAN:
             return openoceanSettings
         default:
diff --git a/packages/mask/src/plugins/Trader/trader/useGetTradeContext.ts b/packages/mask/src/plugins/Trader/trader/useGetTradeContext.ts
@@ -15,6 +15,8 @@ import {
     UNISWAP_CUSTOM_BASES,
     NETSWAP_BASE_AGAINST_TOKENS,
     NETSWAP_CUSTOM_BASES,
+    TETHYS_BASE_AGAINST_TOKENS,
+    TETHYS_CUSTOM_BASES,
 } from '../constants'
 import { unreachable } from '@dimensiondev/kit'
 import { TargetChainIdContext } from './useTargetChainIdContext'
@@ -96,6 +98,30 @@ export function useGetTradeContext(tradeProvider?: TradeProvider) {
                     ADDITIONAL_TOKENS: {},
                     CUSTOM_TOKENS: PANCAKESWAP_CUSTOM_BASES,
                 }
+            case TradeProvider.NETSWAP:
+                return {
+                    TYPE: tradeProvider,
+                    IS_UNISWAP_V2_LIKE: true,
+                    GRAPH_API: getTraderConstants(chainId).NETSWAP_THEGRAPH,
+                    INIT_CODE_HASH: getTraderConstants(chainId).NETSWAP_INIT_CODE_HASH,
+                    ROUTER_CONTRACT_ADDRESS: getTraderConstants(chainId).NETSWAP_ROUTER_ADDRESS,
+                    FACTORY_CONTRACT_ADDRESS: getTraderConstants(chainId).NETSWAP_FACTORY_ADDRESS,
+                    AGAINST_TOKENS: NETSWAP_BASE_AGAINST_TOKENS,
+                    ADDITIONAL_TOKENS: {},
+                    CUSTOM_TOKENS: NETSWAP_CUSTOM_BASES,
+                }
+            case TradeProvider.TETHYS:
+                return {
+                    TYPE: tradeProvider,
+                    IS_UNISWAP_V2_LIKE: true,
+                    GRAPH_API: getTraderConstants(chainId).TETHYS_THEGRAPH,
+                    INIT_CODE_HASH: getTraderConstants(chainId).TETHYS_INIT_CODE_HASH,
+                    ROUTER_CONTRACT_ADDRESS: getTraderConstants(chainId).TETHYS_ROUTER_ADDRESS,
+                    FACTORY_CONTRACT_ADDRESS: getTraderConstants(chainId).TETHYS_FACTORY_ADDRESS,
+                    AGAINST_TOKENS: TETHYS_BASE_AGAINST_TOKENS,
+                    ADDITIONAL_TOKENS: {},
+                    CUSTOM_TOKENS: TETHYS_CUSTOM_BASES,
+                }
             case TradeProvider.ZRX:
                 return {
                     TYPE: tradeProvider,
@@ -115,18 +141,6 @@ export function useGetTradeContext(tradeProvider?: TradeProvider) {
                     TYPE: tradeProvider,
                     ROUTER_CONTRACT_ADDRESS: getTraderConstants(chainId).BANCOR_EXCHANGE_PROXY_ADDRESS,
                 }
-            case TradeProvider.NETSWAP:
-                return {
-                    TYPE: tradeProvider,
-                    IS_UNISWAP_V2_LIKE: true,
-                    GRAPH_API: getTraderConstants(chainId).NETSWAP_THEGRAPH,
-                    INIT_CODE_HASH: getTraderConstants(chainId).NETSWAP_INIT_CODE_HASH,
-                    ROUTER_CONTRACT_ADDRESS: getTraderConstants(chainId).NETSWAP_ROUTER_ADDRESS,
-                    FACTORY_CONTRACT_ADDRESS: getTraderConstants(chainId).NETSWAP_FACTORY_ADDRESS,
-                    AGAINST_TOKENS: NETSWAP_BASE_AGAINST_TOKENS,
-                    ADDITIONAL_TOKENS: {},
-                    CUSTOM_TOKENS: NETSWAP_CUSTOM_BASES,
-                }
             case TradeProvider.OPENOCEAN:
                 return {
                     TYPE: tradeProvider,
diff --git a/packages/mask/src/plugins/Trader/trader/useTradeCallback.ts b/packages/mask/src/plugins/Trader/trader/useTradeCallback.ts
@@ -106,6 +106,8 @@ export function useTradeCallback(
             return bancor
         case TradeProvider.NETSWAP:
             return uniswapV2Like
+        case TradeProvider.TETHYS:
+            return uniswapV2Like
         case TradeProvider.OPENOCEAN:
             return openocean
         default:
diff --git a/packages/mask/src/plugins/Trader/trader/useTradeContext.ts b/packages/mask/src/plugins/Trader/trader/useTradeContext.ts
@@ -15,6 +15,8 @@ import {
     UNISWAP_CUSTOM_BASES,
     NETSWAP_BASE_AGAINST_TOKENS,
     NETSWAP_CUSTOM_BASES,
+    TETHYS_CUSTOM_BASES,
+    TETHYS_BASE_AGAINST_TOKENS,
 } from '../constants'
 import type { TradeContext as TradeContext_ } from '../types'
 import { TargetChainIdContext } from './useTargetChainIdContext'
@@ -109,6 +111,18 @@ export function useTradeContext(tradeProvider: TradeProvider) {
                     ADDITIONAL_TOKENS: {},
                     CUSTOM_TOKENS: NETSWAP_CUSTOM_BASES,
                 }
+            case TradeProvider.TETHYS:
+                return {
+                    TYPE: tradeProvider,
+                    IS_UNISWAP_V2_LIKE: true,
+                    GRAPH_API: getTraderConstants(chainId).TETHYS_THEGRAPH,
+                    INIT_CODE_HASH: getTraderConstants(chainId).TETHYS_INIT_CODE_HASH,
+                    ROUTER_CONTRACT_ADDRESS: getTraderConstants(chainId).TETHYS_ROUTER_ADDRESS,
+                    FACTORY_CONTRACT_ADDRESS: getTraderConstants(chainId).TETHYS_FACTORY_ADDRESS,
+                    AGAINST_TOKENS: TETHYS_BASE_AGAINST_TOKENS,
+                    ADDITIONAL_TOKENS: {},
+                    CUSTOM_TOKENS: TETHYS_CUSTOM_BASES,
+                }
             case TradeProvider.ZRX:
                 return {
                     TYPE: tradeProvider,
diff --git a/packages/mask/src/plugins/Trader/types/trader.ts b/packages/mask/src/plugins/Trader/types/trader.ts
@@ -67,6 +67,7 @@ export enum ZrxTradePool {
     WaultSwap = 'WaultSwap',
     xSigma = 'xSigma',
     NetSwap = 'NetSwap',
+    Tethys = 'Tethys',
 }
 
 export interface TradeComputed<T = unknown> {
diff --git a/packages/mask/src/resources/TethysIcon.tsx b/packages/mask/src/resources/TethysIcon.tsx
@@ -0,0 +1,36 @@
+import { SvgIconProps, SvgIcon } from '@mui/material'
+
+const svg = (
+    <svg width="111" height="91" xmlns="http://www.w3.org/2000/svg">
+        <g fillRule="nonzero" fill="none">
+            <g fill="#FFF">
+                <path d="M109.174.74 81.382 46.642l-21-16.064L104.66.658l.136-.086a4.002 4.002 0 0 1 4.378.167ZM25.2 4.6l10.182 39.03L2.504 89.134a4 4 0 0 1-1.375-4.163L22.776 7.23l.05-.16A3.995 3.995 0 0 1 25.2 4.6Z" />
+                <path d="M27.692 4.487a4 4 0 0 1 1.412.719l52.278 41.437-46-3.012L25.2 4.6a3.982 3.982 0 0 1 2.493-.114Z" />
+                <path d="m35.382 43.63 21 15.06L7.11 89.397a4.002 4.002 0 0 1-4.607-.264l32.88-45.501ZM109.172.742a4.029 4.029 0 0 1 1.624 3.955L98.008 79.322l-.528 3.08a3.996 3.996 0 0 1-2.317 2.98l-13.78-38.74 27.789-45.9Z" />
+                <path d="m35.382 43.63 46 3.013L95.163 85.38a4 4 0 0 1-3.993-.432L35.382 43.632Z" />
+            </g>
+            <path
+                d="M109.174.74 81.382 46.642l-21-16.064L104.66.658l.136-.086a4.002 4.002 0 0 1 4.378.167Z"
+                fill="#3D9EFF"
+            />
+            <path
+                d="m25.2 4.6 10.182 39.03L2.504 89.134a4 4 0 0 1-1.375-4.163L22.776 7.23l.05-.16A3.995 3.995 0 0 1 25.2 4.6Z"
+                fill="#0647D5"
+            />
+            <path
+                d="M27.692 4.487a4 4 0 0 1 1.412.719l52.278 41.437-46-3.012L25.2 4.6a3.982 3.982 0 0 1 2.493-.114Z"
+                fill="#1667F6"
+            />
+            <path d="m35.382 43.63 21 15.06L7.11 89.397a4.002 4.002 0 0 1-4.607-.264l32.88-45.501Z" fill="#002392" />
+            <path
+                d="M109.172.742a4.029 4.029 0 0 1 1.624 3.955L98.008 79.322l-.528 3.08a3.996 3.996 0 0 1-2.317 2.98l-13.78-38.74 27.789-45.9Z"
+                fill="#2E8EFF"
+            />
+            <path d="m35.382 43.63 46 3.013L95.163 85.38a4 4 0 0 1-3.993-.432L35.382 43.632Z" fill="#2179FF" />
+        </g>
+    </svg>
+)
+
+export function TethysIcon(props: SvgIconProps) {
+    return <SvgIcon {...props}>{svg}</SvgIcon>
+}
diff --git a/packages/mask/src/resources/tethys.png b/packages/mask/src/resources/tethys.png
diff --git a/packages/public-api/src/web.ts b/packages/public-api/src/web.ts
@@ -215,6 +215,7 @@ export enum TradeProvider {
     BANCOR = 9,
     NETSWAP = 11,
     OPENOCEAN = 10,
+    TETHYS = 12,
 }
 /** Supported language settings */
 export enum LanguageOptions {
diff --git a/packages/web3-constants/evm/token.json b/packages/web3-constants/evm/token.json
@@ -787,7 +787,25 @@
         "Arbitrum_Rinkeby": "",
         "xDai": "",
         "Celo": "",
-        "Metis": "00xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000",
+        "Metis": "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000",
+        "Metis_Stardust": "",
+        "Fantom": ""
+    },
+    "TETHYS_ADDRESS": {
+        "Mainnet": "",
+        "Ropsten": "",
+        "Rinkeby": "",
+        "Kovan": "",
+        "Gorli": "",
+        "BSC": "",
+        "BSCT": "",
+        "Matic": "",
+        "Mumbai": "",
+        "Arbitrum": "",
+        "Arbitrum_Rinkeby": "",
+        "xDai": "",
+        "Celo": "",
+        "Metis": "0x69fdb77064ec5c84FA2F21072973eB28441F43F3",
         "Metis_Stardust": "",
         "Fantom": ""
     },
diff --git a/packages/web3-constants/evm/trader.json b/packages/web3-constants/evm/trader.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ export default function SwapSettingDialog({ open, onClose }: SettingDialogProps)`
`65`	`65`	`const metisOptions = [`
`66`	`66`	`{ label: 'SushiSwap', value: TradeProvider.SUSHISWAP },`
`67`	`67`	`{ label: 'NetSwap', value: TradeProvider.NETSWAP },`
	`68`	`+ { label: 'Tethys', value: TradeProvider.TETHYS },`
`68`	`69`	`]`
`69`	`70`
`70`	`71`	`const t = useDashboardI18N()`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@ export const networkNames: Record<NetworkType, string> = {`
`10`	`10`	`[NetworkType.xDai]: 'xdai',`
`11`	`11`	`[NetworkType.Celo]: 'celo',`
`12`	`12`	`[NetworkType.Fantom]: 'fantom',`
	`13`	`+ [NetworkType.Metis]: 'metis',`
`13`	`14`	`}`