Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
ffc6fa8
feat: avalanche integration
amritkumarj Dec 29, 2021
7c8dcfe
Merge branch 'develop' of https://github.com/DhruvJain1122/Maskbook i…
amritkumarj Dec 29, 2021
b51cd47
fix: build fix
amritkumarj Dec 30, 2021
e20bdf8
fix: spell
amritkumarj Dec 30, 2021
2b68c7f
fix: spell
amritkumarj Dec 30, 2021
4b7d925
fix: avalanche
amritkumarj Dec 30, 2021
30ad46e
fix: avalanche
amritkumarj Dec 30, 2021
3d1efb3
fix: hardcorded chain ids
amritkumarj Dec 30, 2021
8873afc
fix: avalanche
amritkumarj Dec 30, 2021
3cfa204
Delete pnpm-lock.yaml
amritkumarj Dec 30, 2021
ce8be4f
fix: lock file
amritkumarj Dec 30, 2021
0c30ff1
fix: changes
amritkumarj Dec 30, 2021
f7e38f4
fix: changes
amritkumarj Dec 30, 2021
4b244a5
fix: plugins update
amritkumarj Dec 30, 2021
de62cbb
fix: lock file
amritkumarj Dec 30, 2021
f839f36
fix: anylatics sushi avalanche
amritkumarj Dec 30, 2021
23e6728
fix: anylatics sushi avalanche
amritkumarj Dec 30, 2021
9433470
refactor: the network name
guanbinrui Dec 30, 2021
e752177
fix: changes
amritkumarj Dec 30, 2021
e160d73
Merge branch 'develop' of https://github.com/DhruvJain1122/Maskbook i…
amritkumarj Dec 30, 2021
3bb4896
Merge branch 'DimensionDev:develop' into develop
amritkumarj Dec 30, 2021
aa77b26
fix: changes
amritkumarj Dec 30, 2021
51751da
Merge branch 'develop' of https://github.com/DhruvJain1122/Maskbook i…
amritkumarj Dec 30, 2021
f67709d
fix: package
amritkumarj Dec 30, 2021
baf4fc2
refactor: revert changes
guanbinrui Dec 30, 2021
166e0a7
fix: package.json
amritkumarj Dec 30, 2021
70cd157
refactor: revoke lock file
guanbinrui Dec 30, 2021
6f346b3
refactor: revoke package.json
guanbinrui Dec 30, 2021
0811a08
Update packages/web3-constants/evm/token.json
amritkumarj Dec 30, 2021
cb812d9
feat: traderjoe exchange
amritkumarj Dec 30, 2021
6eea340
Merge branch 'develop' of https://github.com/DhruvJain1122/Maskbook i…
amritkumarj Dec 30, 2021
ec177a1
fix: traderjoe
amritkumarj Dec 30, 2021
650f595
fix: tradejoe icon size reduce
amritkumarj Dec 30, 2021
12e13bb
Merge branch 'DimensionDev:develop' into develop
amritkumarj Dec 30, 2021
00502c1
fix: lock file
amritkumarj Dec 31, 2021
7a87fe7
fix: token.json
amritkumarj Dec 31, 2021
448cc61
Merge branch 'develop' into develop
amritkumarj Dec 31, 2021
64e3533
Update packages/web3-constants/evm/explorer.json
amritkumarj Dec 31, 2021
aac7df7
Update packages/web3-constants/evm/explorer.json
amritkumarj Dec 31, 2021
22d0d7e
fix: chains.json
amritkumarj Dec 31, 2021
35f8588
Merge branch 'DimensionDev:develop' into develop
amritkumarj Dec 31, 2021
9f66845
fix: init code hash
amritkumarj Dec 31, 2021
0f42c69
fix: token-list
amritkumarj Dec 31, 2021
92c83ef
fix: changes
amritkumarj Dec 31, 2021
bb3ef4a
fix: opensea merge
amritkumarj Dec 31, 2021
ca08fa3
Merge branch 'develop' into develop
amritkumarj Dec 31, 2021
673cd3a
fix: changes
amritkumarj Dec 31, 2021
14b3e88
Merge branch 'DimensionDev:develop' into develop
amritkumarj Dec 31, 2021
bf593d9
fix: merge
amritkumarj Jan 4, 2022
8ac2f25
Merge branch 'develop' of https://github.com/DhruvJain1122/Maskbook i…
amritkumarj Jan 4, 2022
a6c7a9e
fix: maskgrey.tsx
amritkumarj Jan 4, 2022
4baf900
fix: maskgrey
amritkumarj Jan 4, 2022
3bd6537
fix: nftscan
amritkumarj Jan 4, 2022
45c4260
fix: .eslintrc.json
amritkumarj Jan 4, 2022
a75d929
fix: .eslintrc.json
amritkumarj Jan 4, 2022
46a8c51
Merge branch 'DimensionDev:develop' into develop
amritkumarj Jan 5, 2022
761316a
Merge branch 'DimensionDev:develop' into develop
amritkumarj Jan 5, 2022
b63b26c
fix: changes
amritkumarj Jan 5, 2022
659d7ba
Merge branch 'develop' of https://github.com/DhruvJain1122/Maskbook i…
amritkumarj Jan 5, 2022
3bd0dcb
Merge branch 'DimensionDev:develop' into develop
amritkumarj Jan 5, 2022
1fe8782
Merge branch 'develop' into develop
amritkumarj Jan 6, 2022
0d888a1
fix: changes
amritkumarj Jan 6, 2022
03d8ca7
fix: changes
amritkumarj Jan 6, 2022
5fb60a8
Merge branch 'DimensionDev:develop' into develop
amritkumarj Jan 7, 2022
c5cd5ba
fix: avalanache address
amritkumarj Jan 9, 2022
18f901a
fix: tokenlist url
amritkumarj Jan 10, 2022
de23b17
Merge branch 'develop' of https://github.com/DimensionDev/Maskbook in…
amritkumarj Jan 10, 2022
8643601
Merge branch 'DimensionDev-develop' into develop
amritkumarj Jan 10, 2022
dbb2c34
fix: add hook function for uniswapv2
amritkumarj Jan 10, 2022
cd4fd11
fix: changes
amritkumarj Jan 11, 2022
9851d1e
fix: revert change
amritkumarj Jan 12, 2022
410fe4d
Merge branch 'DimensionDev:develop' into develop
amritkumarj Jan 12, 2022
256f061
fix: merge
amritkumarj Jan 17, 2022
878a7ae
feat: ito redpacket
amritkumarj Jan 17, 2022
a191cd2
Merge branch 'DimensionDev:develop' into develop
amritkumarj Jan 18, 2022
805cd80
Merge branch 'develop' into develop
amritkumarj Jan 18, 2022
d827318
fix: merge
amritkumarj Jan 18, 2022
d16e00c
Merge branch 'develop' into develop
amritkumarj Jan 19, 2022
c02c381
fix: change
amritkumarj Jan 19, 2022
fc65253
Merge branch 'develop' of https://github.com/DhruvJain1122/Maskbook i…
amritkumarj Jan 19, 2022
c7b8934
fix: change
amritkumarj Jan 20, 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
5 changes: 5 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
"arbitrum",
"ARETH",
"arweave",
"avalanche",
"AVALANCHE",
"avax",
"AVAX",
"betanet",
"bgcolor",
"bignumber",
Expand Down Expand Up @@ -227,6 +230,8 @@
"timelocked",
"Tokelau",
"tokenid",
"traderjoe",
"TraderJoe",
"Transak",
"Trisolaris",
"twimg",
Expand Down
11 changes: 11 additions & 0 deletions packages/dashboard/src/pages/Labs/components/SwapSettingDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
useXDaiNetworkTradeProvider,
useCeloNetworkTradeProvider,
useFantomNetworkTradeProvider,
useAvalancheNetworkTradeProvider,
useAuroraNetworkTradeProvider,
} from '../../Settings/api'

Expand Down Expand Up @@ -62,6 +63,10 @@ export default function SwapSettingDialog({ open, onClose }: SettingDialogProps)

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

const avalancheOptions = [
{ label: 'TraderJoe', value: TradeProvider.TRADERJOE },
{ label: 'SushiSwap', value: TradeProvider.SUSHISWAP },
]
const auroraOptions = [
{ label: 'DODO', value: TradeProvider.DODO },
{ label: 'WannaSwap', value: TradeProvider.WANNASWAP },
Expand Down Expand Up @@ -113,6 +118,12 @@ export default function SwapSettingDialog({ open, onClose }: SettingDialogProps)
options: fantomOptions,
onChange: (value: string) => Services.Settings.setFantomNetworkTradeProvider(Number.parseInt(value, 10)),
},
{
legend: t.labs_settings_swap_network({ network: 'Avalanche' }),
value: useAvalancheNetworkTradeProvider(),
options: avalancheOptions,
onChange: (value: string) => Services.Settings.setAvalancheNetworkTradeProvider(Number.parseInt(value, 10)),
},
{
legend: t.labs_settings_swap_network({ network: 'Aurora' }),
value: useAuroraNetworkTradeProvider(),
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 @@ -38,6 +38,11 @@ export const [useFantomNetworkTradeProvider] = createGlobalState(
Messages.events.fantomNetworkTradeProviderSettings.on,
)

export const [useAvalancheNetworkTradeProvider] = createGlobalState(
Services.Settings.getAvalancheNetworkTradeProvider,
Messages.events.avalancheNetworkTradeProviderSettings.on,
)

export const [useCeloNetworkTradeProvider] = createGlobalState(
Services.Settings.getCeloNetworkTradeProvider,
Messages.events.celoNetworkTradeProviderSettings.on,
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 @@ -52,6 +52,7 @@ export const Flags = {
arbitrum_enabled: true,
xdai_enabled: true,
fantom_enabled: true,
avalanche_enabled: true,
flow_enabled: true,
celo_enabled: true,
aurora_enabled: true,
Expand Down
1 change: 1 addition & 0 deletions packages/mask/src/components/shared/ApplicationBoard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ const SUPPORTED_CHAIN_ID_LIST = [
ChainId.xDai,
ChainId.Celo,
ChainId.Fantom,
ChainId.Avalanche,
ChainId.Aurora,
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
xdaiNetworkTradeProviderSettings,
celoNetworkTradeProviderSettings,
fantomNetworkTradeProviderSettings,
avalancheNetworkTradeProviderSettings,
auroraNetworkTradeProviderSettings,
} from '../../plugins/Trader/settings'
import { queryMyPersonas } from './IdentityService'
Expand Down Expand Up @@ -79,6 +80,9 @@ export const [getxDaiNetworkTradeProvider, setxDaiNetworkTradeProvider] = create
export const [getCeloNetworkTradeProvider, setCeloNetworkTradeProvider] = create(celoNetworkTradeProviderSettings)

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

export const [getAuroraNetworkTradeProvider, setAuroraNetworkTradeProvider] = create(auroraNetworkTradeProviderSettings)

Expand Down
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 @@ -147,6 +147,16 @@ export const PLUGIN_NETWORKS: Web3Plugin.NetworkDescriptor[] = [
iconColor: 'rgb(73, 169, 166)',
isMainnet: true,
},
{
ID: `${PLUGIN_ID}_avalanche`,
networkSupporterPluginID: PLUGIN_ID,
chainId: ChainId.Avalanche,
type: NetworkType.Avalanche,
name: 'Avalanche',
icon: new URL('./assets/avalanche.png', import.meta.url),
iconColor: 'rgb(73, 169, 166)',
isMainnet: true,
},
{
ID: `${PLUGIN_ID}_aurora`,
networkSupporterPluginID: PLUGIN_ID,
Expand Down
2 changes: 2 additions & 0 deletions packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ const SUPPORTED_CHAIN_ID_LIST = [
ChainId.Arbitrum,
ChainId.xDai,
ChainId.Fantom,
ChainId.Avalanche,
]

export function ClaimAllDialog(props: ClaimAllDialogProps) {
Expand All @@ -228,6 +229,7 @@ export function ClaimAllDialog(props: ClaimAllDialogProps) {
const DialogRef = useRef<HTMLDivElement>(null)
const account = useAccount()
const currentChainId = useChainId()

const {
value: campaignInfos,
loading: loadingAirdrop,
Expand Down
1 change: 1 addition & 0 deletions packages/mask/src/plugins/RedPacket/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const base: Plugin.Shared.Definition = {
ChainId.Arbitrum,
ChainId.xDai,
ChainId.Fantom,
ChainId.Avalanche,
],
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { BalancerIcon } from '../../../../resources/BalancerIcon'
import { BancorIcon } from '../../../../resources/BancorIcon'
import { SashimiSwapIcon } from '../../../../resources/SashimiSwapIcon'
import { SushiSwapIcon } from '../../../../resources/SushiSwapIcon'
import { TraderJoeIcon } from '../../../../resources/TraderJoeIcon'
import { UniswapIcon } from '../../../../resources/UniswapIcon'
import { ZRXIcon } from '../../../../resources/ZRXIcon'
import { DODOIcon } from '../../../../resources/DODOIcon'
Expand Down Expand Up @@ -72,6 +73,8 @@ export function TradeProviderIcon(props: TradeProviderIconProps) {
return <BancorIcon classes={{ root: classes.icon }} />
case TradeProvider.OPENOCEAN:
return <OpenOceanIcon classes={{ root: classes.icon }} />
case TradeProvider.TRADERJOE:
return <TraderJoeIcon classes={{ root: classes.icon }} />
case TradeProvider.TRISOLARIS:
return <TrisolarisIcon classes={{ root: classes.icon }} />
default:
Expand Down
3 changes: 2 additions & 1 deletion packages/mask/src/plugins/Trader/apis/trader/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@ export async function getAvailableTraderProviders(chainId: ChainId) {
return [TradeProvider.SUSHISWAP]
case NetworkType.Fantom:
return [TradeProvider.SUSHISWAP]
case NetworkType.Avalanche:
return [TradeProvider.TRADERJOE, TradeProvider.SUSHISWAP]
case NetworkType.Aurora:
return [TradeProvider.DODO, TradeProvider.WANNASWAP, TradeProvider.TRISOLARIS]
case NetworkType.Boba:
case NetworkType.Fuse:
case NetworkType.Metis:
case NetworkType.Avalanche:
case NetworkType.Optimistic:
console.error('To be implement network: ', networkType)
return []
Expand Down
6 changes: 6 additions & 0 deletions packages/mask/src/plugins/Trader/apis/trending/hotfix.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ const ID_ADDRESS_MAP: {
[NetworkType.Polygon]: {
'8536': '0x2B9E7ccDF0F4e5B24757c1E1a80e311E34Cb10c7', // MASK
},
[NetworkType.Avalanche]: {
'5805': '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7', // AVAX
},
},
[DataProvider.COIN_GECKO]: {
[NetworkType.Ethereum]: {
Expand All @@ -90,6 +93,9 @@ const ID_ADDRESS_MAP: {
[NetworkType.Polygon]: {
'mask-network': '0x2B9E7ccDF0F4e5B24757c1E1a80e311E34Cb10c7', // MASK
},
[NetworkType.Avalanche]: {
'avalanche-2': '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7', // AVAX
},
},
[DataProvider.UNISWAP_INFO]: {},
}
Expand Down
1 change: 1 addition & 0 deletions packages/mask/src/plugins/Trader/constants/0x.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const ZRX_BASE_URL: Record<NetworkType, string> = {
[NetworkType.xDai]: 'https://xdai.api.0x.org/',
[NetworkType.Celo]: 'https://celo.api.0x.org/',
[NetworkType.Fantom]: 'https://fantom.api.0x.org/',
[NetworkType.Avalanche]: 'https://avalanche.api.0x.org/',
[NetworkType.Aurora]: 'https://aurora.api.0x.org/',
[NetworkType.Boba]: '',
[NetworkType.Fuse]: '',
Expand Down
1 change: 1 addition & 0 deletions packages/mask/src/plugins/Trader/constants/dodo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const networkNames: Record<NetworkType, string> = {
[NetworkType.xDai]: 'xdai',
[NetworkType.Celo]: 'celo',
[NetworkType.Fantom]: 'fantom',
[NetworkType.Avalanche]: 'avalanche',
[NetworkType.Aurora]: 'aurora',
[NetworkType.Boba]: '',
[NetworkType.Fuse]: '',
Expand Down
1 change: 1 addition & 0 deletions packages/mask/src/plugins/Trader/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export * from './quickswap'
export * from './pancakeswap'
export * from './dodo'
export * from './bancor'
export * from './traderjoe'
export * from './wannaswap'
export * from './trisolaris'
export type { ERC20TokenCustomizedBase, ERC20AgainstToken } from './types'
1 change: 1 addition & 0 deletions packages/mask/src/plugins/Trader/constants/openocean.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const networkNames: Record<NetworkType, string> = {
[NetworkType.xDai]: 'xdai',
[NetworkType.Celo]: 'celo',
[NetworkType.Fantom]: 'fantom',
[NetworkType.Avalanche]: 'avalanche',
[NetworkType.Aurora]: 'aurora',
[NetworkType.Boba]: '',
[NetworkType.Fuse]: '',
Expand Down
1 change: 1 addition & 0 deletions packages/mask/src/plugins/Trader/constants/sushiswap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ export const SUSHISWAP_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
[ChainId.xDai]: [WNATIVE, USDC, USDT, WBTC].map((x) => x[ChainId.xDai]),
[ChainId.Celo]: [WNATIVE, CUSD, CEUR].map((x) => x[ChainId.Celo]),
[ChainId.Fantom]: [WNATIVE, DAI, USDC, fUSDT, WBTC].map((x) => x[ChainId.Fantom]),
[ChainId.Avalanche]: [WNATIVE, DAI, USDC, WBTC].map((x) => x[ChainId.Avalanche]),
}
5 changes: 5 additions & 0 deletions packages/mask/src/plugins/Trader/constants/trader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ 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 USDTe = createERC20Tokens('USDT_ADDRESS', 'Tether USD', 'USDT.e', 6)
export const DAIe = createERC20Tokens('DAI_ADDRESS', 'Dai Stablecoin', 'DAI.e ', 18)
export const WBTCe = createERC20Tokens('WBTC_ADDRESS', 'Wrapped BTC', 'WBTCe', 18)
export const USDCe = createERC20Tokens('USDC_ADDRESS', ' USD Coin', 'USDCe', 18)

export const WNATIVE = createERC20Tokens(
'WNATIVE_ADDRESS',
Expand All @@ -67,6 +71,7 @@ export const WNATIVE_ONLY: ERC20AgainstToken = {
[ChainId.xDai]: [WNATIVE[ChainId.xDai]],
[ChainId.Celo]: [WNATIVE[ChainId.Celo]],
[ChainId.Fantom]: [WNATIVE[ChainId.Fantom]],
[ChainId.Avalanche]: [WNATIVE[ChainId.Avalanche]],
[ChainId.Aurora]: [WNATIVE[ChainId.Aurora]],
[ChainId.Aurora_Testnet]: [WNATIVE[ChainId.Aurora_Testnet]],
}
Expand Down
15 changes: 15 additions & 0 deletions packages/mask/src/plugins/Trader/constants/traderjoe.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { ChainId } from '@masknet/web3-shared-evm'
import { ETHER, WNATIVE, WBTCe, DAIe, USDTe, USDCe, 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 TRADERJOE_CUSTOM_BASES: ERC20TokenCustomizedBase = {}

export const TRADERJOE_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
...WNATIVE_ONLY,
[ChainId.Avalanche]: [WNATIVE, DAIe, USDTe, USDCe, ETHER, WBTCe].map((x) => x[ChainId.Avalanche]),
}
10 changes: 10 additions & 0 deletions packages/mask/src/plugins/Trader/pipes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export const resolveTradeProviderName = createLookupTableResolver<TradeProvider,
[TradeProvider.PANCAKESWAP]: 'PancakeSwap',
[TradeProvider.DODO]: 'DODO',
[TradeProvider.BANCOR]: 'Bancor',
[TradeProvider.TRADERJOE]: 'TraderJoe',
[TradeProvider.OPENOCEAN]: 'OpenOcean',
[TradeProvider.TRISOLARIS]: 'Trisolaris',
[TradeProvider.WANNASWAP]: 'WannaSwap',
Expand Down Expand Up @@ -87,6 +88,8 @@ export function resolveTradeProviderLink(tradeProvider: TradeProvider, networkTy
return 'https://celo.api.0x.org/'
case NetworkType.Fantom:
return 'https://fantom.api.0x.org/'
case NetworkType.Avalanche:
return 'https://avalanche.api.0x.org/'
case NetworkType.Aurora:
return 'https://aurora.api.0x.org/'
case NetworkType.Boba:
Expand Down Expand Up @@ -114,6 +117,8 @@ export function resolveTradeProviderLink(tradeProvider: TradeProvider, networkTy
return 'https://app.dodoex.io'
case TradeProvider.BANCOR:
return 'https://app.bancor.network/eth/swap'
case TradeProvider.TRADERJOE:
return 'https://traderjoexyz.com/#/trade'
case TradeProvider.OPENOCEAN:
return 'https://openocean.finance/classic'
case TradeProvider.TRISOLARIS:
Expand Down Expand Up @@ -160,6 +165,8 @@ export function resolveTradePairLink(tradeProvider: TradeProvider, address: stri
return `https://analytics-celo.sushi.com/pairs/${address}`
case NetworkType.Fantom:
return `https://analytics-ftm.sushi.com/pairs/${address}`
case NetworkType.Avalanche:
return `https://analytics-avalanche.sushi.com/pairs/${address}`
case NetworkType.Aurora:
return `https://analytics-aurora.sushi.com/pairs/${address}`
case NetworkType.Boba:
Expand Down Expand Up @@ -187,6 +194,8 @@ export function resolveTradePairLink(tradeProvider: TradeProvider, address: stri
case TradeProvider.OPENOCEAN:
// TODO - OpenOcean
return ''
case TradeProvider.TRADERJOE:
return `https://analytics.traderjoexyz.com/pairs/${address}`
case TradeProvider.TRISOLARIS:
// TODO - add Trisolaris Analytics
return ''
Expand Down Expand Up @@ -282,6 +291,7 @@ export const resolveZrxTradePoolName = createLookupTableResolver<ZrxTradePool, s
[ZrxTradePool.UniswapV3]: 'Uniswap V3',
[ZrxTradePool.WaultSwap]: 'WaultSwap',
[ZrxTradePool.xSigma]: 'xSigma',
[ZrxTradePool.TraderJoe]: 'TraderJoe',
[ZrxTradePool.Trisolaris]: 'Trisolaris',
[ZrxTradePool.WannaSwap]: 'WannaSwap',
},
Expand Down
9 changes: 9 additions & 0 deletions packages/mask/src/plugins/Trader/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
xdaiNetworkTradeProviderSettings,
celoNetworkTradeProviderSettings,
fantomNetworkTradeProviderSettings,
avalancheNetworkTradeProviderSettings,
auroraNetworkTradeProviderSettings,
} from './settings'
import { DataProvider, TradeProvider } from '@masknet/public-api'
Expand Down Expand Up @@ -54,6 +55,11 @@ currentChainIdSettings.addListener((chainId: ChainId) => {
if (currentDataProviderSettings.value === DataProvider.UNISWAP_INFO)
currentDataProviderSettings.value = DataProvider.COIN_MARKET_CAP
break
case NetworkType.Avalanche:
currentTradeProviderSettings.value = avalancheNetworkTradeProviderSettings.value
if (currentDataProviderSettings.value === DataProvider.UNISWAP_INFO)
currentDataProviderSettings.value = DataProvider.COIN_MARKET_CAP
break
case NetworkType.Aurora:
currentTradeProviderSettings.value = TradeProvider.DODO
if (currentDataProviderSettings.value === DataProvider.UNISWAP_INFO)
Expand Down Expand Up @@ -96,6 +102,9 @@ currentTradeProviderSettings.addListener((tradeProvider: TradeProvider) => {
case NetworkType.Fantom:
fantomNetworkTradeProviderSettings.value = tradeProvider
break
case NetworkType.Avalanche:
avalancheNetworkTradeProviderSettings.value = tradeProvider
break
case NetworkType.Aurora:
auroraNetworkTradeProviderSettings.value = tradeProvider
break
Expand Down
8 changes: 8 additions & 0 deletions packages/mask/src/plugins/Trader/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ export const fantomNetworkTradeProviderSettings = createGlobalSettings<TradeProv
TradeProvider.SUSHISWAP,
{ primary: () => '' },
)
export const avalancheNetworkTradeProviderSettings = createGlobalSettings<TradeProvider>(
`${PLUGIN_ID}+avalanche+tradeProvider`,
TradeProvider.TRADERJOE,
{ primary: () => '' },
)

export const celoNetworkTradeProviderSettings = createGlobalSettings<TradeProvider>(
`${PLUGIN_ID}+celo+tradeProvider`,
Expand Down Expand Up @@ -110,6 +115,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 openoceanSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvider+openocean`, '')
const traderjoeSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvider+traderjoe`, '')
const trisolarisSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvider+trisolaris`, '')
const wannaswapSettings = createInternalSettings<string>(`${PLUGIN_ID}+tradeProvider+wannaswap`, '')

Expand Down Expand Up @@ -140,6 +146,8 @@ export function getCurrentTradeProviderGeneralSettings(tradeProvider: TradeProvi
return bancorSettings
case TradeProvider.OPENOCEAN:
return openoceanSettings
case TradeProvider.TRADERJOE:
return traderjoeSettings
case TradeProvider.TRISOLARIS:
return trisolarisSettings
case TradeProvider.WANNASWAP:
Expand Down
1 change: 1 addition & 0 deletions packages/mask/src/plugins/Trader/trader/0x/useTrade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export function getNativeTokenLabel(networkType: NetworkType) {
case NetworkType.xDai:
case NetworkType.Celo:
case NetworkType.Fantom:
case NetworkType.Avalanche:
case NetworkType.Aurora:
case NetworkType.Boba:
case NetworkType.Fuse:
Expand Down
Loading