DimensionDev · guanbinrui · Aug 3, 2022 · Dec 24, 2021 · Dec 24, 2021 · Dec 30, 2021
diff --git a/.vscode/schema/constants.json b/.vscode/schema/constants.json
@@ -30,7 +30,10 @@
                 "Matic",
                 "Mumbai",
                 "Arbitrum",
-                "Arbitrum_Rinkeby"
+                "Arbitrum_Rinkeby",
+                "Optimism",
+                "Optimism_Kovan",
+                "Optimism_Goerli"
             ]
         },
         "primitive": {

diff --git a/cspell.json b/cspell.json
@@ -69,6 +69,7 @@
         "dklen",
         "dompurify",
         "ecsign",
+        "elkfinance",
         "endregion",
         "enhanceable",
         "entitlee",
@@ -101,6 +102,8 @@
         "ipfshttp",
         "ittr",
         "jsbi",
+        "jsonml",
+        "jugglerred",
         "juicebox",
         "kdfparams",
         "keccak",
@@ -142,8 +145,11 @@
         "nftrss",
         "nftscan",
         "nums",
+        "oeth",
+        "opensea",
         "openswap",
         "openx",
+        "optimism",
         "overridable",
         "overscan",
         "pageable",
@@ -237,6 +243,7 @@
         "xdai",
         "xlarge",
         "zerion",
+        "zipswap",
         "zora",
         "zubin"
     ],

diff --git a/packages/mask/shared-ui/locales/ko-KR.json b/packages/mask/shared-ui/locales/ko-KR.json
@@ -119,7 +119,6 @@
     "wallet_rename": "월렛 이름 바꾸기",
     "wallet_loading_nft_contract": "NFT 컨트렉트 로딩...",
     "wallet_search_contract_no_result": "검색 포준에 맞추는 결과나 컨트렉트 주소가 없습니다.",
-    "wallet_search_no_result": "결과 없음.",
     "wallet_airdrop_nft_unclaimed_title": "수령하지 않는 NFT 에어드랍:",
     "plugin_airdrop_nft_start_time": "시작 시간: {{date}}",
     "plugin_airdrop_nft_end_time": "종료 시간: {{date}}",

diff --git a/packages/mask/shared-ui/locales/qya-AA.json b/packages/mask/shared-ui/locales/qya-AA.json
@@ -207,7 +207,6 @@
     "wallet_rename": "crwdns4489:0crwdne4489:0",
     "wallet_loading_nft_contract": "crwdns8135:0crwdne8135:0",
     "wallet_search_contract_no_result": "crwdns8137:0crwdne8137:0",
-    "wallet_search_no_result": "crwdns8139:0crwdne8139:0",
     "wallet_confirm_with_password": "crwdns10141:0crwdne10141:0",
     "wallet_airdrop_nft_unclaimed_title": "crwdns8093:0crwdne8093:0",
     "plugin_external_unknown_plugin": "crwdns10143:0crwdne10143:0",

diff --git a/packages/mask/shared-ui/locales/zh-CN.json b/packages/mask/shared-ui/locales/zh-CN.json
@@ -163,7 +163,6 @@
     "wallet_rename": "重新命名钱包",
     "wallet_loading_nft_contract": "正在加载 NFT 合约...",
     "wallet_search_contract_no_result": "没有结果或合同地址不符合查询标准。",
-    "wallet_search_no_result": "没有任何结果。",
     "wallet_confirm_with_password": "使用密码确认",
     "wallet_airdrop_nft_unclaimed_title": "未认领的NFT Airdrop：",
     "plugin_external_unknown_plugin": "发现新的未知Mask插件，您想要加载它们吗？",

diff --git a/packages/mask/shared-ui/locales/zh-TW.json b/packages/mask/shared-ui/locales/zh-TW.json
@@ -98,7 +98,6 @@
     "wallet_name": "錢包名稱",
     "wallet_rename": "重新命名錢包",
     "wallet_loading_nft_contract": "加載NFT合約中...",
-    "wallet_search_no_result": "無結果",
     "wallet_confirm_with_password": "確認密碼",
     "wallet_airdrop_nft_unclaimed_title": "尚未認領的NFT空投",
     "plugin_external_loader_search_holder": "搜尋外部插件",

diff --git a/packages/mask/shared/flags.ts b/packages/mask/shared/flags.ts
@@ -30,6 +30,7 @@ export const Flags = {
     polygon_enabled: true,
     arbitrum_enabled: true,
     xdai_enabled: true,
+    Optimism_enabled: true,
     avalanche_enabled: true,
     fantom_enabled: true,
     celo_enabled: true,

diff --git a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/index.tsx b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/index.tsx
@@ -1,19 +1,15 @@
 import { useMemo } from 'react'
-import { ChainId } from '@masknet/web3-shared-evm'
 import { usePostInfoDetails, Plugin, usePluginWrapper, PluginId } from '@masknet/plugin-infra/content-script'
-import { useChainId } from '@masknet/plugin-infra/web3'
-import { NetworkPluginID } from '@masknet/web3-shared-base'
 import { extractTextFromTypedMessage } from '@masknet/typed-message'
 import { parseURL } from '@masknet/shared-base'
 import { GitcoinIcon } from '@masknet/icons'
-import { PreviewCard } from './PreviewCard'
 import { Trans } from 'react-i18next'
 import { base } from '../base'
-import { PLUGIN_NAME, PLUGIN_META_KEY } from '../constants'
+import { PLUGIN_META_KEY, PLUGIN_NAME } from '../constants'
 import { DonateDialog } from './DonateDialog'
+import { PreviewCard } from './PreviewCard'
 
 const isGitcoin = (x: string): boolean => /^https:\/\/gitcoin.co\/grants\/\d+/.test(x)
-const isGitCoinSupported = (chainId: ChainId) => [ChainId.Mainnet, ChainId.Matic].includes(chainId)
 
 const sns: Plugin.SNSAdaptor.Definition = {
     ...base,
@@ -60,7 +56,6 @@ const sns: Plugin.SNSAdaptor.Definition = {
 
 function Renderer(props: React.PropsWithChildren<{ url: string }>) {
     const [id = ''] = props.url.match(/\d+/) ?? []
-    const chainId = useChainId(NetworkPluginID.PLUGIN_EVM)
     usePluginWrapper(true)
     return <PreviewCard id={id} />
 }

diff --git a/packages/mask/src/plugins/NextID/base.ts b/packages/mask/src/plugins/NextID/base.ts
@@ -31,6 +31,7 @@ export const base: Plugin.Shared.Definition = {
                     ChainId.Fantom,
                     ChainId.Harmony,
                     ChainId.Conflux,
+                    ChainId.Optimism,
                 ],
             },
             [NetworkPluginID.PLUGIN_FLOW]: { supportedChainIds: [] },

diff --git a/packages/mask/src/plugins/Pets/base.tsx b/packages/mask/src/plugins/Pets/base.tsx
@@ -25,6 +25,7 @@ export const base: Plugin.Shared.Definition = {
                     ChainId.Avalanche,
                     ChainId.Aurora,
                     ChainId.Conflux,
+                    ChainId.Optimism,
                 ],
             },
         },

diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftList.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftList.tsx
@@ -3,9 +3,9 @@ import { ChainId, formatTokenId, SchemaType } from '@masknet/web3-shared-evm'
 import { List, ListItem, ListProps, Typography } from '@mui/material'
 import classnames from 'classnames'
 import { FC, HTMLProps, useState } from 'react'
-import { useI18N } from '../../../utils'
 import { NFTCardStyledAssetPlayer } from '@masknet/shared'
 import type { NonFungibleTokenContract } from '@masknet/web3-shared-base'
+import { useI18N } from '../locales'
 
 const useStyles = makeStyles()((theme) => {
     const smallQuery = `@media (max-width: ${theme.breakpoints.values.sm}px)`
@@ -100,7 +100,7 @@ interface NftItemProps extends HTMLProps<HTMLDivElement> {
 }
 
 export const NftItem: FC<NftItemProps> = ({ contract, tokenId, className, claimed, renderOrder, ...rest }) => {
-    const { t } = useI18N()
+    const t = useI18N()
     const { classes } = useStyles()
     const [name, setName] = useState(formatTokenId(tokenId, 2))
 
@@ -117,7 +117,7 @@ export const NftItem: FC<NftItemProps> = ({ contract, tokenId, className, claime
                 setERC721TokenName={setName}
             />
             <Typography className={classes.name}>{name}</Typography>
-            {claimed && <Typography className={classes.claimedBadge}>{t('plugin_red_packet_claimed')}</Typography>}
+            {claimed && <Typography className={classes.claimedBadge}>{t.claimed()}</Typography>}
         </div>
     )
 }

diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx
@@ -248,7 +248,7 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) {
                             <Typography variant="body1" className={classNames(classes.info, classes.message)}>
                                 {t.history_total_amount({
                                     amount: formatBalance(history.total, historyToken?.decimals, 6),
-                                    symbol: historyToken?.symbol,
+                                    symbol: historyToken?.symbol!,
                                 })}
                             </Typography>
                             <Typography variant="body1" className={classNames(classes.info, classes.message)}>
@@ -328,7 +328,7 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) {
                                         historyToken?.decimals,
                                         6,
                                     ),
-                                    symbol: historyToken?.symbol,
+                                    symbol: historyToken?.symbol!,
                                 }}
                             />
                         </Typography>

diff --git a/packages/mask/src/plugins/RedPacket/base.ts b/packages/mask/src/plugins/RedPacket/base.ts
@@ -28,6 +28,7 @@ export const base: Plugin.Shared.Definition = {
                     ChainId.Arbitrum,
                     ChainId.xDai,
                     ChainId.Fantom,
+                    ChainId.Optimism,
                     ChainId.Avalanche,
                     ChainId.Aurora,
                     ChainId.Harmony,

diff --git a/packages/mask/src/plugins/Savings/base.ts b/packages/mask/src/plugins/Savings/base.ts
@@ -28,6 +28,7 @@ export const base: Plugin.Shared.Definition = {
                     ChainId.Aurora,
                     ChainId.Avalanche,
                     ChainId.Fantom,
+                    ChainId.Optimism,
                     ChainId.Harmony,
                 ],
             },

diff --git a/packages/mask/src/plugins/Trader/apis/trader/index.ts b/packages/mask/src/plugins/Trader/apis/trader/index.ts
@@ -18,6 +18,7 @@ export async function getAvailableTraderProviders(chainId: ChainId) {
                 TradeProvider.BANCOR,
                 TradeProvider.OPENOCEAN,
                 TradeProvider.MDEX,
+                TradeProvider.ELKFINANCE,
             ]
         case NetworkType.Polygon:
             return [
@@ -28,6 +29,7 @@ export async function getAvailableTraderProviders(chainId: ChainId) {
                 TradeProvider.ZRX,
                 TradeProvider.OPENOCEAN,
                 TradeProvider.TRISOLARIS,
+                TradeProvider.ELKFINANCE,
             ]
         case NetworkType.Binance:
             return [
@@ -37,19 +39,32 @@ export async function getAvailableTraderProviders(chainId: ChainId) {
                 TradeProvider.ZRX,
                 TradeProvider.OPENOCEAN,
                 TradeProvider.MDEX,
+                TradeProvider.ELKFINANCE,
             ]
         case NetworkType.Arbitrum:
-            return [TradeProvider.UNISWAP_V3, TradeProvider.OPENOCEAN, TradeProvider.DODO]
+            return [TradeProvider.UNISWAP_V3, TradeProvider.OPENOCEAN, TradeProvider.ELKFINANCE, TradeProvider.DODO]
         case NetworkType.xDai:
-            return [TradeProvider.SUSHISWAP, TradeProvider.OPENOCEAN]
+            return [TradeProvider.SUSHISWAP, TradeProvider.ELKFINANCE, TradeProvider.OPENOCEAN]
         case NetworkType.Avalanche:
-            return [TradeProvider.SUSHISWAP, TradeProvider.OPENOCEAN, TradeProvider.TRADERJOE, TradeProvider.PANGOLIN]
-        case NetworkType.xDai:
-            return [TradeProvider.SUSHISWAP, TradeProvider.OPENOCEAN]
+            return [
+                TradeProvider.SUSHISWAP,
+                TradeProvider.ELKFINANCE,
+                TradeProvider.OPENOCEAN,
+                TradeProvider.TRADERJOE,
+                TradeProvider.PANGOLIN,
+            ]
         case NetworkType.Celo:
             return [TradeProvider.SUSHISWAP]
         case NetworkType.Fantom:
             return [TradeProvider.SUSHISWAP]
+        case NetworkType.Optimism:
+            return [
+                TradeProvider.UNISWAP_V3,
+                TradeProvider.SUSHISWAP,
+                TradeProvider.JUGGLERRED,
+                TradeProvider.ELKFINANCE,
+                TradeProvider.ZIPSWAP,
+            ]
         case NetworkType.Aurora:
             return [TradeProvider.DODO, TradeProvider.WANNASWAP, TradeProvider.TRISOLARIS]
         case NetworkType.Harmony:
@@ -58,11 +73,11 @@ export async function getAvailableTraderProviders(chainId: ChainId) {
                 TradeProvider.VENOMSWAP,
                 TradeProvider.OPENSWAP,
                 TradeProvider.DEFIKINGDOMS,
+                TradeProvider.ELKFINANCE,
             ]
         case NetworkType.Boba:
         case NetworkType.Fuse:
         case NetworkType.Metis:
-        case NetworkType.Optimistic:
         case NetworkType.Conflux:
             console.error('To be implement network: ', networkType)
             return []

diff --git a/packages/mask/src/plugins/Trader/base.ts b/packages/mask/src/plugins/Trader/base.ts
@@ -24,6 +24,7 @@ export const base: Plugin.Shared.Definition<ChainId> = {
                     ChainId.Aurora,
                     ChainId.Avalanche,
                     ChainId.Fantom,
+                    ChainId.Optimism,
                     ChainId.Harmony,
                 ],
             },

diff --git a/packages/mask/src/plugins/Trader/constants/0x.ts b/packages/mask/src/plugins/Trader/constants/0x.ts
@@ -6,14 +6,15 @@ export const ZRX_BASE_URL: Record<NetworkType, string> = {
     [NetworkType.Polygon]: 'https://polygon.api.0x.org/',
     [NetworkType.Arbitrum]: 'https://arbitrum.api.0x.org/',
     [NetworkType.xDai]: 'https://xdai.api.0x.org/',
+    [NetworkType.Optimism]: 'https://Optimism.api.0x.org/',
     [NetworkType.Avalanche]: 'https://avalanche.api.0x.org/',
     [NetworkType.Celo]: 'https://celo.api.0x.org/',
     [NetworkType.Fantom]: 'https://fantom.api.0x.org/',
     [NetworkType.Aurora]: 'https://aurora.api.0x.org/',
     [NetworkType.Boba]: '',
     [NetworkType.Fuse]: '',
     [NetworkType.Metis]: '',
-    [NetworkType.Optimistic]: '',
+    [NetworkType.Optimism]: '',
     [NetworkType.Harmony]: '',
     [NetworkType.Conflux]: '',
 }

diff --git a/packages/mask/src/plugins/Trader/constants/dodo.ts b/packages/mask/src/plugins/Trader/constants/dodo.ts
@@ -8,14 +8,15 @@ export const networkNames: Record<NetworkType, string> = {
     [NetworkType.Polygon]: 'matic',
     [NetworkType.Arbitrum]: 'arbitrum',
     [NetworkType.xDai]: 'xdai',
+    [NetworkType.Optimism]: 'Optimism',
     [NetworkType.Avalanche]: 'avalanche',
     [NetworkType.Celo]: 'celo',
     [NetworkType.Fantom]: 'fantom',
     [NetworkType.Aurora]: 'aurora',
     [NetworkType.Boba]: '',
     [NetworkType.Fuse]: '',
     [NetworkType.Metis]: '',
-    [NetworkType.Optimistic]: '',
+    [NetworkType.Optimism]: '',
     [NetworkType.Harmony]: 'harmony',
     [NetworkType.Conflux]: '',
 }
diff --git a/packages/mask/src/plugins/Trader/constants/elkfinance.ts b/packages/mask/src/plugins/Trader/constants/elkfinance.ts
@@ -0,0 +1,37 @@
+import {
+    ChainId,
+    DAI,
+    RUNE,
+    USDC,
+    USDT,
+    fUSDT,
+    WBTC,
+    WNATIVE,
+    WNATIVE_ONLY,
+    NFTX,
+    STETH,
+    BUSD,
+    BTCB,
+    ELK,
+} 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 ELKFINANCE_CUSTOM_BASES: ERC20TokenCustomizedBase = {}
+
+export const ELKFINANCE_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
+    ...WNATIVE_ONLY,
+    [ChainId.Mainnet]: [WNATIVE, DAI, USDC, USDT, WBTC, RUNE, NFTX, STETH, ELK].map((x) => x[ChainId.Mainnet]),
+    [ChainId.Matic]: [WNATIVE, USDC, WBTC, DAI, USDT, ELK].map((x) => x[ChainId.Matic]),
+    [ChainId.BSC]: [WNATIVE, DAI, BUSD, USDC, USDT, BTCB, ELK].map((x) => x[ChainId.BSC]),
+    [ChainId.xDai]: [WNATIVE, USDC, USDT, WBTC, ELK].map((x) => x[ChainId.xDai]),
+    [ChainId.Fantom]: [WNATIVE, DAI, USDC, fUSDT, WBTC, ELK].map((x) => x[ChainId.Fantom]),
+    [ChainId.Avalanche]: [WNATIVE, DAI, USDC, WBTC, USDT, ELK].map((x) => x[ChainId.Avalanche]),
+    [ChainId.Harmony]: [WNATIVE, DAI, USDC, WBTC, USDT, ELK].map((x) => x[ChainId.Harmony]),
+    [ChainId.Optimism]: [WNATIVE, DAI, USDC, WBTC, USDT, ELK].map((x) => x[ChainId.Optimism]),
+    [ChainId.Arbitrum]: [WNATIVE, DAI, USDC, WBTC, USDT, ELK].map((x) => x[ChainId.Arbitrum]),
+}
diff --git a/packages/mask/src/plugins/Trader/constants/index.ts b/packages/mask/src/plugins/Trader/constants/index.ts
@@ -13,8 +13,11 @@ export * from './traderjoe'
 export * from './pangolindex'
 export * from './wannaswap'
 export * from './trisolaris'
+export * from './jugglerred'
 export * from './venomswap'
 export * from './openswap'
 export * from './mdex'
 export * from './defikingdoms'
+export * from './elkfinance'
+export * from './zipswap'
 export type { ERC20TokenCustomizedBase, ERC20AgainstToken } from './types'
diff --git a/packages/mask/src/plugins/Trader/constants/jugglerred.ts b/packages/mask/src/plugins/Trader/constants/jugglerred.ts
@@ -0,0 +1,14 @@
+import { ChainId, DAI, USDC, USDT, WBTC, 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 JUGGLERRED_CUSTOM_BASES: ERC20TokenCustomizedBase = {}
+
+export const JUGGLERRED_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
+    ...WNATIVE_ONLY,
+    [ChainId.Optimism]: [WNATIVE, DAI, USDC, USDT, WBTC].map((x) => x[ChainId.Optimism]),
+    [ChainId.Optimism_Kovan]: [WNATIVE, DAI, USDC, USDT, WBTC].map((x) => x[ChainId.Optimism_Kovan]),
+}
diff --git a/packages/mask/src/plugins/Trader/constants/openocean.ts b/packages/mask/src/plugins/Trader/constants/openocean.ts
@@ -15,7 +15,8 @@ export const networkNames: Record<NetworkType, string> = {
     [NetworkType.Boba]: '',
     [NetworkType.Fuse]: '',
     [NetworkType.Metis]: '',
-    [NetworkType.Optimistic]: '',
+    [NetworkType.Optimism]: 'Optimism',
+    [NetworkType.Optimism]: '',
     [NetworkType.Harmony]: '',
     [NetworkType.Conflux]: '',
 }
diff --git a/packages/mask/src/plugins/Trader/constants/sushiswap.ts b/packages/mask/src/plugins/Trader/constants/sushiswap.ts
@@ -34,4 +34,5 @@ export const SUSHISWAP_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
     [ChainId.Fantom]: [WNATIVE, DAI, USDC, fUSDT, WBTC].map((x) => x[ChainId.Fantom]),
     [ChainId.Avalanche]: [WNATIVE, DAI, USDC, WBTC, USDT].map((x) => x[ChainId.Avalanche]),
     [ChainId.Harmony]: [WNATIVE, DAI, USDC, WBTC, USDT].map((x) => x[ChainId.Harmony]),
+    [ChainId.Optimism]: [WNATIVE, DAI, USDC, WBTC, USDT].map((x) => x[ChainId.Optimism]),
 }