Merge remote-tracking branch 'upstream/develop' into feat/integration-boba-network

developerfred · developerfred · commit 23ae59582cc1 · 2022-03-21T07:20:16.000Z
diff --git a/cspell.json b/cspell.json
@@ -13,6 +13,7 @@
         "pnpm-lock.yaml"
     ],
     "words": [
+        "jugglerred",
         "aave",
         "adai",
         "addrs",
@@ -116,6 +117,7 @@
         "jailbroken",
         "jsbi",
         "jsonml",
+        "jugglered",
         "juicebox",
         "kdfparams",
         "keccak",
@@ -142,6 +144,7 @@
         "masktext",
         "mastdon",
         "mayen",
+        "mdex",
         "merkel",
         "merkle",
         "metas",
@@ -167,6 +170,7 @@
         "ongswap",
         "oolongswap",
         "opensea",
+        "optmistic",
         "overridable",
         "overscan",
         "pageable",
diff --git a/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx b/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx
@@ -5,7 +5,6 @@ import {
     ChainId,
     ERC721ContractDetailed,
     ERC721TokenDetailed,
-    formatEthereumAddress,
     isSameAddress,
     NonFungibleAssetProvider,
     SocketState,
@@ -22,6 +21,7 @@ import { WalletMessages } from '@masknet/plugin-wallet'
 import { CollectionIcon } from './CollectionIcon'
 import { uniqBy } from 'lodash-unified'
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
+import { ReverseAddress } from '@masknet/shared'
 
 export const CollectibleContext = createContext<{
     collectiblesRetry: () => void
@@ -301,7 +301,7 @@ export function CollectionList({
                                 className={classes.button}
                                 variant="outlined"
                                 size="small">
-                                {formatEthereumAddress(addressName.label, 5)}
+                                <ReverseAddress address={addressName.resolvedAddress} addressSize={5} />
                                 <KeyboardArrowDownIcon />
                             </Button>
                         </Box>
@@ -330,7 +330,7 @@ export function CollectionList({
                 </Stack>
                 <Box display="flex" alignItems="center" justifyContent="flex-end" flexWrap="wrap">
                     <Button onClick={onSelectAddress} className={classes.button} variant="outlined" size="small">
-                        {formatEthereumAddress(addressName.label, 5)}
+                        <ReverseAddress address={addressName.resolvedAddress} addressSize={5} />
                         <KeyboardArrowDownIcon />
                     </Button>
                 </Box>
diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx
@@ -17,6 +17,7 @@ import { EthereumChainBoundary } from '../../../web3/UI/EthereumChainBoundary'
 import { AddNFT } from './AddNFT'
 import { NFTImage } from './NFTImage'
 import { useAccount, useWeb3State } from '@masknet/plugin-infra'
+import { ReverseAddress } from '@masknet/shared'
 
 const useStyles = makeStyles()((theme) => ({
     root: {},
@@ -142,7 +143,7 @@ export function NFTAvatar(props: NFTAvatarProps) {
                     </Typography>
                     {account ? (
                         <Typography variant="body1" color="textPrimary" className={classes.account}>
-                            {t('nft_wallet_label')}: {Utils?.formatAddress?.(account, 4) || account}
+                            {t('nft_wallet_label')}: <ReverseAddress address={account} addressSize={4} />
                             {!hideWallet ? (
                                 <Button
                                     variant="text"
diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/NFTPage.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/NFTPage.tsx
@@ -4,7 +4,7 @@ import { MenuItem } from '@mui/material'
 import type { AddressName } from '@masknet/web3-shared-evm'
 import { CollectionList } from '../../../extension/options-page/DashboardComponents/CollectibleList'
 import { first, uniqBy } from 'lodash-unified'
-import { formatEthereumAddress } from '@masknet/web3-shared-evm'
+import { ReverseAddress } from '@masknet/shared'
 
 const useStyles = makeStyles()((theme) => ({
     root: {
@@ -71,7 +71,7 @@ export function NFTPage(props: NFTPageProps) {
                 {uniqBy(addressNames ?? [], (x) => x.resolvedAddress.toLowerCase()).map((x) => {
                     return (
                         <MenuItem key={x.resolvedAddress} value={x.resolvedAddress} onClick={() => onSelect(x)}>
-                            {formatEthereumAddress(x.label, 5)}
+                            <ReverseAddress address={x.resolvedAddress} addressSize={5} />
                         </MenuItem>
                     )
                 })}
diff --git a/packages/mask/src/plugins/Trader/apis/trader/index.ts b/packages/mask/src/plugins/Trader/apis/trader/index.ts
@@ -17,6 +17,7 @@ export async function getAvailableTraderProviders(chainId: ChainId) {
                 TradeProvider.DODO,
                 TradeProvider.BANCOR,
                 TradeProvider.OPENOCEAN,
+                TradeProvider.MDEX,
             ]
         case NetworkType.Polygon:
             return [
@@ -35,6 +36,7 @@ export async function getAvailableTraderProviders(chainId: ChainId) {
                 TradeProvider.DODO,
                 TradeProvider.ZRX,
                 TradeProvider.OPENOCEAN,
+                TradeProvider.MDEX,
             ]
         case NetworkType.Arbitrum:
             return [TradeProvider.UNISWAP_V3, TradeProvider.OPENOCEAN, TradeProvider.DODO]
diff --git a/packages/mask/src/plugins/Trader/constants/index.ts b/packages/mask/src/plugins/Trader/constants/index.ts
@@ -16,4 +16,5 @@ export * from './traderjoe'
 export * from './pangolindex'
 export * from './wannaswap'
 export * from './trisolaris'
+export * from './mdex'
 export type { ERC20TokenCustomizedBase, ERC20AgainstToken } from './types'
diff --git a/packages/mask/src/plugins/Trader/constants/mdex.ts b/packages/mask/src/plugins/Trader/constants/mdex.ts
@@ -0,0 +1,14 @@
+import { ChainId, DAI, USDC, USDT, WNATIVE, WNATIVE_ONLY } from '@masknet/web3-shared-evm'
+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 MDEX_CUSTOM_BASES: ERC20TokenCustomizedBase = {}
+
+export const MDEX_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
+    ...WNATIVE_ONLY,
+    [ChainId.Mainnet]: [WNATIVE, DAI, USDC, USDT].map((x) => x[ChainId.Mainnet]),
+    [ChainId.BSC]: [WNATIVE, DAI, USDC, USDT].map((x) => x[ChainId.BSC]),
+}
diff --git a/packages/mask/src/plugins/Trader/pipes.ts b/packages/mask/src/plugins/Trader/pipes.ts
@@ -43,6 +43,7 @@ export const resolveTradeProviderName = createLookupTableResolver<TradeProvider,
         [TradeProvider.PANGOLIN]: 'PangolinDex',
         [TradeProvider.TRISOLARIS]: 'Trisolaris',
         [TradeProvider.WANNASWAP]: 'WannaSwap',
+        [TradeProvider.MDEX]: 'Mdex',
     },
     (tradeProvider) => {
         throw new Error(`Unknown provider type: ${tradeProvider}`)
diff --git a/packages/mask/src/plugins/Trader/trader/useAllTradeComputed.ts b/packages/mask/src/plugins/Trader/trader/useAllTradeComputed.ts
@@ -218,6 +218,12 @@ export function useAllTradeComputed(
         trader: senpaiswap,
         traderEstimateGas: senpaiswapEstimateGas,
     } = useUniswapV2Like(tradeProviders, TradeProvider.SENPAISWAP, inputAmount_, inputToken, outputToken)
+    // Mdex
+    const {
+        trader_: mdex_,
+        trader: mdex,
+        traderEstimateGas: mdexEstimateGas,
+    } = useUniswapV2Like(tradeProviders, TradeProvider.MDEX, inputAmount_, inputToken, outputToken)
 
     const allTradeResult = [
         { provider: TradeProvider.UNISWAP_V2, ...uniswapV2_, value: uniswapV2, gas: uniswapV2EstimateGas },
@@ -238,6 +244,7 @@ export function useAllTradeComputed(
         { provider: TradeProvider.OOLONGSWAP, ...oolongswap_, value: oolongswap, gas: oolongswapEstimateGas },
         { provider: TradeProvider.SWAPPERCHAN, ...swapperchan_, value: swapperchan, gas: swapperchanEstimateGas },
         { provider: TradeProvider.SENPAISWAP, ...senpaiswap_, value: senpaiswap, gas: senpaiswapEstimateGas },
+        { provider: TradeProvider.MDEX, ...mdex_, value: mdex, gas: mdexEstimateGas },
     ]
 
     return nativeToken_.value
diff --git a/packages/mask/src/plugins/Trader/trader/useGetTradeContext.ts b/packages/mask/src/plugins/Trader/trader/useGetTradeContext.ts
@@ -27,6 +27,8 @@ import {
     WANNASWAP_CUSTOM_BASES,
     TRISOLARIS_BASE_AGAINST_TOKENS,
     TRISOLARIS_CUSTOM_BASES,
+    MDEX_BASE_AGAINST_TOKENS,
+    MDEX_CUSTOM_BASES,
 } from '../constants'
 import { unreachable } from '@dimensiondev/kit'
 import { TargetChainIdContext } from './useTargetChainIdContext'
@@ -192,6 +194,18 @@ export function useGetTradeContext(tradeProvider?: TradeProvider) {
                     ADDITIONAL_TOKENS: {},
                     CUSTOM_TOKENS: TRISOLARIS_CUSTOM_BASES,
                 }
+            case TradeProvider.MDEX:
+                return {
+                    TYPE: tradeProvider,
+                    IS_UNISWAP_V2_LIKE: true,
+                    GRAPH_API: DEX_TRADE.MDEX_THEGRAPH,
+                    INIT_CODE_HASH: DEX_TRADE.MDEX_INIT_CODE_HASH,
+                    ROUTER_CONTRACT_ADDRESS: DEX_TRADE.MDEX_ROUTER_ADDRESS,
+                    FACTORY_CONTRACT_ADDRESS: DEX_TRADE.MDEX_FACTORY_ADDRESS,
+                    AGAINST_TOKENS: MDEX_BASE_AGAINST_TOKENS,
+                    ADDITIONAL_TOKENS: {},
+                    CUSTOM_TOKENS: MDEX_CUSTOM_BASES,
+                }
             case TradeProvider.ZRX:
                 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 uniswapV2Like
         case TradeProvider.TRISOLARIS:
             return uniswapV2Like
+        case TradeProvider.MDEX:
+            return uniswapV2Like
         case TradeProvider.ZRX:
             return zrx
         case TradeProvider.BALANCER:
diff --git a/packages/mask/src/plugins/Trader/trader/useTradeContext.ts b/packages/mask/src/plugins/Trader/trader/useTradeContext.ts
@@ -27,6 +27,8 @@ import {
     WANNASWAP_CUSTOM_BASES,
     TRISOLARIS_CUSTOM_BASES,
     TRISOLARIS_BASE_AGAINST_TOKENS,
+    MDEX_CUSTOM_BASES,
+    MDEX_BASE_AGAINST_TOKENS,
 } from '../constants'
 import type { TradeContext as TradeContext_ } from '../types'
 import { TargetChainIdContext } from './useTargetChainIdContext'
@@ -170,6 +172,18 @@ export function useTradeContext(tradeProvider: TradeProvider) {
                     ADDITIONAL_TOKENS: {},
                     CUSTOM_TOKENS: TRISOLARIS_CUSTOM_BASES,
                 }
+            case TradeProvider.MDEX:
+                return {
+                    TYPE: tradeProvider,
+                    IS_UNISWAP_V2_LIKE: true,
+                    GRAPH_API: DEX_TRADE.MDEX_THEGRAPH,
+                    INIT_CODE_HASH: DEX_TRADE.MDEX_INIT_CODE_HASH,
+                    ROUTER_CONTRACT_ADDRESS: DEX_TRADE.MDEX_ROUTER_ADDRESS,
+                    FACTORY_CONTRACT_ADDRESS: DEX_TRADE.MDEX_FACTORY_ADDRESS,
+                    AGAINST_TOKENS: MDEX_BASE_AGAINST_TOKENS,
+                    ADDITIONAL_TOKENS: {},
+                    CUSTOM_TOKENS: MDEX_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
@@ -78,6 +78,7 @@ export enum ZrxTradePool {
     PangolinDex = 'PangolinDex',
     Trisolaris = 'Trisolaris',
     WannaSwap = 'WannaSwap',
+    Mdex = 'Mdex',
 }
 
 export interface TradeComputed<T = unknown> {
diff --git a/packages/public-api/src/web.ts b/packages/public-api/src/web.ts
@@ -216,9 +216,10 @@ export enum TradeProvider {
     TRISOLARIS = 12,
     TRADERJOE = 13,
     PANGOLIN = 14,
-    OOLONGSWAP = 15,
-    SWAPPERCHAN = 16,
-    SENPAISWAP = 17,
+    MDEX = 15,
+    OOLONGSWAP = 16,
+    SWAPPERCHAN = 17,
+    SENPAISWAP = 18,
 }
 /** Supported language settings */
 export enum LanguageOptions {
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -5,6 +5,7 @@
   "dependencies": {
     "@dimensiondev/holoflows-kit": "^0.9.0-20210902104757-7c3d0d0",
     "@masknet/icons": "workspace:*",
+    "@masknet/plugin-infra": "workspace:*",
     "@masknet/shared-base": "workspace:*",
     "@masknet/theme": "workspace:*",
     "@masknet/web3-shared-base": "workspace:*",
diff --git a/packages/shared/src/UI/components/ReverseAddress/index.tsx b/packages/shared/src/UI/components/ReverseAddress/index.tsx
@@ -0,0 +1,18 @@
+import { memo } from 'react'
+import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra'
+
+interface ReverseAddressProps {
+    address: string
+    pluginId?: NetworkPluginID
+    domainSize?: number
+    addressSize?: number
+}
+
+export const ReverseAddress = memo<ReverseAddressProps>(({ address, pluginId, domainSize, addressSize }) => {
+    const { value: domain } = useReverseAddress(address, pluginId)
+    const { Utils } = useWeb3State(pluginId)
+
+    if (!domain || !Utils?.formatDomainName) return <>{Utils?.formatAddress?.(address, addressSize) ?? address}</>
+
+    return <>{Utils.formatDomainName(domain, domainSize)}</>
+})
diff --git a/packages/shared/src/UI/components/index.ts b/packages/shared/src/UI/components/index.ts
@@ -12,3 +12,4 @@ export * from './AddressViewer'
 export * from './I18NextProviderHMR'
 export * from './AssetPlayer'
 export * from './NFTCardStyledAssetPlayer'
+export * from './ReverseAddress'
diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json
@@ -10,6 +10,8 @@
     { "path": "../web3-shared/evm" },
     { "path": "../theme" },
     { "path": "../shared-base" },
-    { "path": "../icons" }
+    { "path": "../shared-base-ui" },
+    { "path": "../icons" },
+    { "path": "../plugin-infra" }
   ]
 }
diff --git a/packages/web3-constants/evm/artblocks.json b/packages/web3-constants/evm/artblocks.json
@@ -12,6 +12,8 @@
         "Arbitrum": "",
         "Arbitrum_Rinkeby": "",
         "xDai": "",
+        "Boba": "",
+        "Boba_Rinkeby": "",
         "Avalanche": "",
         "Avalanche_Fuji": "",
         "Celo": "",
diff --git a/packages/web3-constants/evm/trader.json b/packages/web3-constants/evm/trader.json
@@ -1384,5 +1384,93 @@
         "Fantom": "",
         "Aurora": "0x754e1d90e536e4c1df81b7f030f47b4ca80c87120e145c294f098c83a6cb5ace",
         "Aurora_Testnet": ""
+    },
+    "MDEX_ROUTER_ADDRESS": {
+        "Mainnet": "0x74119c3bca85bEA0538A62319a79b4a372590B47",
+        "Ropsten": "",
+        "Rinkeby": "",
+        "Kovan": "",
+        "Gorli": "",
+        "BSC": "0x0384E9ad329396C3A6A401243Ca71633B2bC4333",
+        "BSCT": "",
+        "Matic": "",
+        "Mumbai": "",
+        "Arbitrum": "",
+        "Arbitrum_Rinkeby": "",
+        "xDai": "",
+        "Boba": "",
+        "Boba_Rinkeby": "",
+        "Avalanche": "",
+        "Avalanche_Fuji": "",
+        "Celo": "",
+        "Fantom": "",
+        "Aurora": "",
+        "Aurora_Testnet": ""
+    },
+    "MDEX_FACTORY_ADDRESS": {
+        "Mainnet": "0x7DAe51BD3E3376B8c7c4900E9107f12Be3AF1bA8",
+        "Ropsten": "",
+        "Rinkeby": "",
+        "Kovan": "",
+        "Gorli": "",
+        "BSC": "0x3CD1C46068dAEa5Ebb0d3f55F6915B10648062B8",
+        "BSCT": "",
+        "Matic": "",
+        "Mumbai": "",
+        "Arbitrum": "",
+        "Arbitrum_Rinkeby": "",
+        "xDai": "",
+        "Boba": "",
+        "Boba_Rinkeby": "",
+        "Avalanche": "",
+        "Avalanche_Fuji": "",
+        "Celo": "",
+        "Fantom": "",
+        "Aurora": "",
+        "Aurora_Testnet": ""
+    },
+    "MDEX_THEGRAPH": {
+        "Mainnet": "",
+        "Ropsten": "",
+        "Rinkeby": "",
+        "Kovan": "",
+        "Gorli": "",
+        "BSC": "",
+        "BSCT": "",
+        "Matic": "",
+        "Mumbai": "",
+        "Arbitrum": "",
+        "Arbitrum_Rinkeby": "",
+        "xDai": "",
+        "Boba": "",
+        "Boba_Rinkeby": "",
+        "Avalanche": "",
+        "Avalanche_Fuji": "",
+        "Celo": "",
+        "Fantom": "",
+        "Aurora": "",
+        "Aurora_Testnet": ""
+    },
+    "MDEX_INIT_CODE_HASH": {
+        "Mainnet": "0x8ecc069c645df696f2ca5116ab459c5c2889f299e73c1b208aaa3cdd7d110b16",
+        "Ropsten": "",
+        "Rinkeby": "",
+        "Kovan": "",
+        "Gorli": "",
+        "BSC": "0x0d994d996174b05cfc7bed897dc1b20b4c458fc8d64fe98bc78b3c64a6b4d093",
+        "BSCT": "",
+        "Matic": "",
+        "Mumbai": "",
+        "Arbitrum": "",
+        "Arbitrum_Rinkeby": "",
+        "xDai": "",
+        "Boba": "",
+        "Boba_Rinkeby": "",
+        "Avalanche": "",
+        "Avalanche_Fuji": "",
+        "Celo": "",
+        "Fantom": "",
+        "Aurora": "",
+        "Aurora_Testnet": ""
     }
 }
diff --git a/packages/web3-providers/src/rarible/index.ts b/packages/web3-providers/src/rarible/index.ts
diff --git a/packages/web3-providers/src/rarible/types.ts b/packages/web3-providers/src/rarible/types.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
