Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a6f1626
feat(Metis): add Netswap dex
developerfred Dec 27, 2021
865f5fe
Merge remote-tracking branch 'upstream/develop' into feat/MetisNetwork
developerfred Dec 29, 2021
f4c396e
chore(component): remove networkIcon component
developerfred Dec 30, 2021
c032fa4
Merge remote-tracking branch 'upstream/develop' into feat/MetisNetwork
developerfred Dec 30, 2021
727531b
Merge remote-tracking branch 'upstream/develop' into feat/MetisNetwork
developerfred Dec 30, 2021
d6b1d30
chore(svg): remove unecessary files
developerfred Dec 30, 2021
fbdbe3a
chore(netswap): remove id
developerfred Dec 30, 2021
148c687
Merge remote-tracking branch 'upstream/develop' into feat/MetisNetwork
developerfred Jan 1, 2022
beb9173
feat(Metis): add Tethys DEX
developerfred Jan 1, 2022
cbd00e4
Merge remote-tracking branch 'origin/develop' into feat/MetisNetwork
developerfred Jan 4, 2022
f2a55fc
feat(Metis): update integration matis
developerfred Jan 5, 2022
1749ada
feat(Metis): add balanceChecker on Metis_Stardust (testnet)
developerfred Jan 5, 2022
7cf75e6
Merge branch 'develop' into feat/MetisNetwork
developerfred Jan 6, 2022
3b1f8c8
Merge branch 'develop' into feat/MetisNetwork
developerfred Jan 6, 2022
c298ce4
feat(metis): add Stardust mask contract address
developerfred Jan 6, 2022
05cafcb
Merge branch 'develop' into feat/MetisNetwork
developerfred Jan 10, 2022
ebbc574
feat(metis): add balanceChekcer contract mainnet
developerfred Jan 12, 2022
6ee530f
feat(metis): update code
developerfred Jan 12, 2022
0159635
chore(metis): fixed tokens trader plugin
developerfred Jan 13, 2022
ad98edd
Merge remote-tracking branch 'upstream/develop' into feat/MetisNetwork
developerfred Jan 13, 2022
f37d680
chore(metis): disable sushiswap on metis
developerfred Jan 13, 2022
a2cae70
Merge branch 'develop' into feat/MetisNetwork
developerfred Jan 17, 2022
aacd6f2
Merge branch 'develop' into feat/MetisNetwork
developerfred Jan 18, 2022
9f82b9d
Merge branch 'develop' into feat/MetisNetwork
developerfred Jan 22, 2022
4dff2f2
Merge branch 'develop' into feat/MetisNetwork
developerfred Jan 25, 2022
e5b6287
Merge branch 'develop' into feat/MetisNetwork
developerfred Jan 26, 2022
31c5388
Merge branch 'develop' into feat/MetisNetwork
developerfred Jan 29, 2022
18fcc27
feat(Metis): enable Metis on ITO base
developerfred Jan 29, 2022
cd14f7b
Merge branch 'develop' into feat/MetisNetwork
developerfred Feb 8, 2022
9fc2086
chore(metis): change multicall address
developerfred Feb 8, 2022
9c43e0e
Merge branch 'develop' into feat/MetisNetwork
developerfred Mar 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 64 additions & 43 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,53 +12,17 @@
"*.snap"
],
"words": [
"AMPL",
"Adai",
"Amountstate",
"Ampleforth",
"ARETH",
"Bolivarian",
"Bouvet",
"Burkina",
"CAIP",
"Caicos",
"Celo",
"Checksummed",
"Cunha",
"Cura",
"DHEDGE",
"Darussalam",
"ECID",
"Eustatius",
"Exchangetoken",
"Faso",
"Futuna",
"IDBP",
"IHDR",
"Kitts",
"Leste",
"Maarten",
"Marino",
"Maskbook",
"Mastdon",
"Mayen",
"Merkle",
"Mutex",
"Plurinational",
"Polkadot",
"Pooltogether",
"Rhonin",
"Rica",
"Sint",
"Tokelau",
"Transak",
"Vcent",
"Viet",
"aave",
"Adai",
"addrs",
"Amountstate",
"ampl",
"AMPL",
"Ampleforth",
"anchorme",
"apikey",
"arbitrum",
"ARETH",
"arweave",
"bgcolor",
"bignumber",
Expand All @@ -67,9 +31,17 @@
"blockie",
"blockies",
"bluebar",
"Bolivarian",
"Bouvet",
"builtins",
"Burkina",
"Caicos",
"CAIP",
"canonify",
"cashtag",
"Celo",
"Checksummed",
"Choudhary",
"cipherparams",
"ciphertext",
"clearfix",
Expand All @@ -78,40 +50,56 @@
"commentid",
"consolas",
"contenteditable",
"contrib",
"contribs",
"cooldown",
"counterparty",
"crwdne",
"Cunha",
"Cura",
"d'Ivoire",
"Darussalam",
"datas",
"debank",
"denorm",
"describedby",
"deserialization",
"destory",
"dfyn",
"DHEDGE",
"dimensiondev",
"dklen",
"dompurify",
"ECID",
"ecsign",
"elec",
"encryptedmsg",
"endregion",
"ethersproject",
"Eustatius",
"everytime",
"Exchangetoken",
"Faso",
"fbid",
"filelist",
"fileservice",
"formating",
"fullfilled",
"furucombo",
"Futuna",
"gasnow",
"geckoview",
"gltf",
"goodghosting",
"Görli",
"gundb",
"hashmasks",
"hexlify",
"holoflows",
"iconbar",
"IDBP",
"ifclaimed",
"IHDR",
"imagebitmap",
"immer",
"importmap",
Expand All @@ -120,27 +108,40 @@
"ipfs",
"ipfsurl",
"ittr",
"jailbroken",
"jsbi",
"jsonml",
"kdfparams",
"keccak",
"Kitts",
"kred",
"labelledby",
"languagedetector",
"lemy",
"Leste",
"linkedin",
"linkswap",
"locationchange",
"lowercased",
"Maarten",
"macbinary",
"majeure",
"Marino",
"Maskbook",
"maskbookjsonrpc",
"maskface",
"masknet",
"masknetwork",
"masknightly",
"masktext",
"Mastdon",
"Mayen",
"Merkle",
"messagepack",
"metas",
"metaverse",
"millify",
"misoperation",
"monofont",
"monospace",
"mooniswap",
Expand All @@ -150,18 +151,26 @@
"mskc",
"multicall",
"multihop",
"Mutex",
"NETSWAP",
"newsfeed",
"NFTRSS",
"nftscan",
"nowallet",
"nums",
"opensea",
"overridable",
"overscan",
"Pageable",
"pagelet",
"pancakeswap",
"pathnames",
"perma",
"pid",
"pids",
"Plurinational",
"Polkadot",
"Pooltogether",
"popper",
"popperjs",
"porportion",
Expand All @@ -170,7 +179,6 @@
"promi",
"proxied",
"pushstate",
"unstyled",
"pvtsutils",
"qrcode",
"quickswap",
Expand All @@ -180,14 +188,20 @@
"redpacket",
"replacestate",
"repost",
"resizer",
"Rhonin",
"Rica",
"rindexed",
"rpid",
"rpids",
"sablier",
"sashimiswap",
"scroller",
"secp",
"Serializers",
"shink",
"Sint",
"solana",
"steelblue",
"steganographic",
"steganography",
Expand All @@ -196,13 +210,17 @@
"superrare",
"sushiswap",
"swappable",
"Swither",
"tabindex",
"tablist",
"testid",
"textbox",
"thegraph",
"timelock",
"timelocked",
"Tokelau",
"tokenid",
"Transak",
"twimg",
"txid",
"typechain",
Expand All @@ -211,9 +229,12 @@
"unencrypted",
"unreviewed",
"unstake",
"unstyled",
"untrusted",
"urlcat",
"usermenu",
"Vcent",
"Viet",
"viewbox",
"visualcompletion",
"walletconnect",
Expand Down
12 changes: 12 additions & 0 deletions packages/dashboard/src/pages/Labs/components/SwapSettingDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
useArbitrumNetworkTradeProvider,
useXDaiNetworkTradeProvider,
useCeloNetworkTradeProvider,
useMetisNetworkTradeProvider,
useFantomNetworkTradeProvider,
} from '../../Settings/api'

Expand Down Expand Up @@ -52,6 +53,11 @@ export default function SwapSettingDialog({ open, onClose }: SettingDialogProps)

const celoOptions = [{ label: 'SushiSwap', value: TradeProvider.SUSHISWAP }]

const metisOptions = [
{ label: 'SushiSwap', value: TradeProvider.SUSHISWAP },
{ label: 'NetSwap', value: TradeProvider.NETSWAP },
]

const t = useDashboardI18N()

const items = [
Expand Down Expand Up @@ -91,6 +97,12 @@ export default function SwapSettingDialog({ open, onClose }: SettingDialogProps)
options: celoOptions,
onChange: (value: string) => Services.Settings.setCeloNetworkTradeProvider(Number.parseInt(value, 10)),
},
{
legend: t.labs_settings_swap_network({ network: 'Metis' }),
value: useMetisNetworkTradeProvider(),
options: metisOptions,
onChange: (value: string) => Services.Settings.setMetisNetworkTradeProvider(Number.parseInt(value, 10)),
},
{
legend: t.labs_settings_swap_network({ network: 'Fantom' }),
value: useFantomNetworkTradeProvider(),
Expand Down
5 changes: 5 additions & 0 deletions packages/dashboard/src/pages/Settings/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ export const [useCeloNetworkTradeProvider] = createGlobalState(
Messages.events.celoNetworkTradeProviderSettings.on,
)

export const [useMetisNetworkTradeProvider] = createGlobalState(
Services.Settings.getMetisNetworkTradeProvider,
Messages.events.metisNetworkTradeProviderSettings.on,
)

const BASE_RUL = 'https://vaalh28dbi.execute-api.ap-east-1.amazonaws.com/api'

interface BackupBaseRequest {
Expand Down
1 change: 1 addition & 0 deletions packages/mask/shared/flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const Flags = {
fantom_enabled: true,
flow_enabled: true,
celo_enabled: true,
metis_enabled: true,
nft_airdrop_enabled: false,

//#region Functionality missing / broken
Expand Down
2 changes: 2 additions & 0 deletions packages/mask/src/components/shared/ApplicationBoard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ export function ApplicationBoard({ secondEntries, secondEntryChainTabs }: MaskAp
ChainId.Arbitrum,
ChainId.xDai,
ChainId.Celo,
ChainId.Metis,
ChainId.Fantom,
],
),
Expand Down Expand Up @@ -315,6 +316,7 @@ export function ApplicationBoard({ secondEntries, secondEntryChainTabs }: MaskAp
ChainId.Arbitrum,
ChainId.xDai,
ChainId.Celo,
ChainId.Metis,
ChainId.Fantom,
],
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
arbitrumNetworkTradeProviderSettings,
xdaiNetworkTradeProviderSettings,
celoNetworkTradeProviderSettings,
metisNetworkTradeProviderSettings,
fantomNetworkTradeProviderSettings,
} from '../../plugins/Trader/settings'
import { queryMyPersonas } from './IdentityService'
Expand Down Expand Up @@ -77,6 +78,8 @@ export const [getxDaiNetworkTradeProvider, setxDaiNetworkTradeProvider] = create

export const [getCeloNetworkTradeProvider, setCeloNetworkTradeProvider] = create(celoNetworkTradeProviderSettings)

export const [getMetisNetworkTradeProvider, setMetisNetworkTradeProvider] = create(metisNetworkTradeProviderSettings)

export const [getFantomNetworkTradeProvider, setFantomNetworkTradeProvider] = create(fantomNetworkTradeProviderSettings)

export const [getCurrentSelectedWalletProvider, setCurrentSelectedWalletProvider] = create(currentProviderSettings)
Expand Down
24 changes: 24 additions & 0 deletions packages/mask/src/plugins/EVM/assets/logo_white.016a0880.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/mask/src/plugins/EVM/assets/metis.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions packages/mask/src/plugins/EVM/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,16 @@ export const PLUGIN_NETWORKS: Web3Plugin.NetworkDescriptor[] = [
iconColor: 'rgb(53, 208, 127)',
isMainnet: true,
},
{
ID: `${PLUGIN_ID}_metis`,
networkSupporterPluginID: PLUGIN_ID,
chainId: ChainId.Metis,
type: NetworkType.Metis,
name: 'Metis',
icon: new URL('./assets/metis.png', import.meta.url),
iconColor: 'rgb(2, 223, 206)',
isMainnet: true,
},
{
ID: `${PLUGIN_ID}_fantom`,
networkSupporterPluginID: PLUGIN_ID,
Expand Down
Loading