feat(layer2): integrate moonriver and sushiswap dex

cspell.json

@@ -46,6 +46,7 @@
         "caip",
         "canonify",
         "cashtag",
+        "cbtc",
         "celo",
         "checksummed",
         "choudhary",
@@ -154,6 +155,8 @@
         "monofont",
         "monospace",
         "mooniswap",
+        "moonriver",
+        "movr",
         "msgpack",
         "mska",
         "mskb",
@@ -215,6 +218,7 @@
         "signup",
         "sint",
         "solana",
+        "solarbeam",
         "sollet",
         "steelblue",
         "steganographic",

packages/mask/shared/flags.ts

@@ -54,6 +54,7 @@ export const Flags = {
     xdai_enabled: true,
     avalanche_enabled: true,
     fantom_enabled: true,
+    moonriver_enabled: true,
     flow_enabled: true,
     celo_enabled: true,
     aurora_enabled: true,

packages/mask/src/components/shared/ApplicationBoard.tsx

@@ -111,6 +111,7 @@ const SUPPORTED_CHAIN_ID_LIST = [
     ChainId.Fantom,
     ChainId.Aurora,
     ChainId.Avalanche,
+    ChainId.Moonriver,
 ]
 
 export interface MaskAppEntry {

packages/mask/src/plugins/EVM/constants.ts

@@ -147,6 +147,16 @@ export const PLUGIN_NETWORKS: Web3Plugin.NetworkDescriptor[] = [
         iconColor: 'rgb(73, 169, 166)',
         isMainnet: true,
     },
+    {
+        ID: `${PLUGIN_ID}_moonriver`,
+        networkSupporterPluginID: PLUGIN_ID,
+        chainId: ChainId.Moonriver,
+        type: NetworkType.Moonriver,
+        name: 'Moonriver',
+        icon: new URL('./assets/moonriver.png', import.meta.url),
+        iconColor: 'rgb(242, 183, 5)',
+        isMainnet: true,
+    },
     {
         ID: `${PLUGIN_ID}_avalanche`,
         networkSupporterPluginID: PLUGIN_ID,

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.SOLARBEAM,
                 TradeProvider.MDEX,
             ]
         case NetworkType.Polygon:
@@ -28,6 +29,7 @@ export async function getAvailableTraderProviders(chainId: ChainId) {
                 TradeProvider.ZRX,
                 TradeProvider.OPENOCEAN,
                 TradeProvider.TRISOLARIS,
+                TradeProvider.SOLARBEAM,
             ]
         case NetworkType.Binance:
             return [
@@ -36,22 +38,25 @@ export async function getAvailableTraderProviders(chainId: ChainId) {
                 TradeProvider.DODO,
                 TradeProvider.ZRX,
                 TradeProvider.OPENOCEAN,
+                TradeProvider.SOLARBEAM,
                 TradeProvider.MDEX,
             ]
         case NetworkType.Arbitrum:
             return [TradeProvider.UNISWAP_V3, TradeProvider.OPENOCEAN, TradeProvider.DODO]
         case NetworkType.xDai:
-            return [TradeProvider.SUSHISWAP, TradeProvider.OPENOCEAN]
+            return [TradeProvider.SUSHISWAP, TradeProvider.OPENOCEAN, TradeProvider.SOLARBEAM]
         case NetworkType.Avalanche:
             return [TradeProvider.SUSHISWAP, TradeProvider.OPENOCEAN, TradeProvider.TRADERJOE, TradeProvider.PANGOLIN]
         case NetworkType.xDai:
             return [TradeProvider.SUSHISWAP, TradeProvider.OPENOCEAN]
         case NetworkType.Celo:
-            return [TradeProvider.SUSHISWAP]
+            return [TradeProvider.SUSHISWAP, TradeProvider.SOLARBEAM]
         case NetworkType.Fantom:
             return [TradeProvider.SUSHISWAP]
         case NetworkType.Aurora:
             return [TradeProvider.DODO, TradeProvider.WANNASWAP, TradeProvider.TRISOLARIS]
+        case NetworkType.Moonriver:
+            return [TradeProvider.DODO, TradeProvider.SOLARBEAM, TradeProvider.SUSHISWAP, TradeProvider.HUCKLEBERRY]
         case NetworkType.Boba:
         case NetworkType.Fuse:
         case NetworkType.Metis:

packages/mask/src/plugins/Trader/base.ts

@@ -23,6 +23,7 @@ export const base: Plugin.Shared.Definition = {
                     ChainId.Aurora,
                     ChainId.Avalanche,
                     ChainId.Fantom,
+                    ChainId.Moonriver,
                 ],
             },
         },

packages/mask/src/plugins/Trader/constants/0x.ts

@@ -9,6 +9,7 @@ export const ZRX_BASE_URL: Record<NetworkType, string> = {
     [NetworkType.Avalanche]: 'https://avalanche.api.0x.org/',
     [NetworkType.Celo]: 'https://celo.api.0x.org/',
     [NetworkType.Fantom]: 'https://fantom.api.0x.org/',
+    [NetworkType.Moonriver]: 'https://moonriver.api.0x.org/',
     [NetworkType.Aurora]: 'https://aurora.api.0x.org/',
     [NetworkType.Boba]: '',
     [NetworkType.Fuse]: '',

packages/mask/src/plugins/Trader/constants/dodo.ts

@@ -11,6 +11,7 @@ export const networkNames: Record<NetworkType, string> = {
     [NetworkType.Avalanche]: 'avalanche',
     [NetworkType.Celo]: 'celo',
     [NetworkType.Fantom]: 'fantom',
+    [NetworkType.Moonriver]: 'moonriver',
     [NetworkType.Aurora]: 'aurora',
     [NetworkType.Boba]: '',
     [NetworkType.Fuse]: '',

packages/mask/src/plugins/Trader/constants/huckleberry.ts

@@ -0,0 +1,13 @@
+import { ChainId, DAI, USDC, 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 HUCKLEBERRY_CUSTOM_BASES: ERC20TokenCustomizedBase = {}
+
+export const HUCKLEBERRY_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
+    ...WNATIVE_ONLY,
+    [ChainId.Moonriver]: [WNATIVE, DAI, USDC].map((x) => x[ChainId.Moonriver]),
+}

packages/mask/src/plugins/Trader/constants/index.ts

@@ -13,5 +13,7 @@ export * from './traderjoe'
 export * from './pangolindex'
 export * from './wannaswap'
 export * from './trisolaris'
+export * from './solarbeam'
+export * from './huckleberry'
 export * from './mdex'
 export type { ERC20TokenCustomizedBase, ERC20AgainstToken } from './types'

packages/mask/src/plugins/Trader/constants/openocean.ts

@@ -10,6 +10,7 @@ export const networkNames: Record<NetworkType, string> = {
     [NetworkType.xDai]: 'xdai',
     [NetworkType.Celo]: 'celo',
     [NetworkType.Fantom]: 'fantom',
+    [NetworkType.Moonriver]: 'moonriver',
     [NetworkType.Avalanche]: 'avalanche',
     [NetworkType.Aurora]: 'aurora',
     [NetworkType.Boba]: '',

packages/mask/src/plugins/Trader/constants/solarbeam.ts

@@ -0,0 +1,38 @@
+import {
+    ChainId,
+    DAI,
+    RUNE,
+    USDC,
+    USDT,
+    WBTC,
+    WNATIVE,
+    WNATIVE_ONLY,
+    NFTX,
+    STETH,
+    BUSD,
+    BTCB,
+    CUSD,
+    CEUR,
+    mcEUR,
+    mCELO,
+    mCUSD,
+    SOLAR,
+} 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 SOLARBEAM_CUSTOM_BASES: ERC20TokenCustomizedBase = {}
+
+export const SOLARBEAM_BASE_AGAINST_TOKENS: ERC20AgainstToken = {
+    ...WNATIVE_ONLY,
+    [ChainId.Mainnet]: [WNATIVE, DAI, USDC, USDT, WBTC, RUNE, NFTX, STETH].map((x) => x[ChainId.Mainnet]),
+    [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, mcEUR, mCELO, mCUSD].map((x) => x[ChainId.Celo]),
+    [ChainId.Fantom]: [WNATIVE, DAI, USDC, WBTC].map((x) => x[ChainId.Fantom]),
+    [ChainId.Moonriver]: [WNATIVE, DAI, USDC, SOLAR, BUSD].map((x) => x[ChainId.Moonriver]),
+}

packages/mask/src/plugins/Trader/constants/sushiswap.ts

@@ -36,5 +36,6 @@ 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.Moonriver]: [WNATIVE, DAI, USDC, WBTC].map((x) => x[ChainId.Moonriver]),
     [ChainId.Avalanche]: [WNATIVE, DAI, USDC, WBTC, USDT].map((x) => x[ChainId.Avalanche]),
 }

packages/mask/src/plugins/Trader/helpers/uniswap.ts

@@ -106,7 +106,7 @@ export function uniswapPriceTo(price: Price<Currency, Currency>) {
 
 export function uniswapTokenTo(token: Token) {
     return {
-        type: ['eth', 'matic', 'bnb'].includes(token.name?.toLowerCase() ?? '')
+        type: ['eth', 'matic', 'bnb', 'movr'].includes(token.name?.toLowerCase() ?? '')
             ? EthereumTokenType.Native
             : EthereumTokenType.ERC20,
         name: token.name,

packages/mask/src/plugins/Trader/pipes.ts

@@ -40,6 +40,8 @@ export const resolveTradeProviderName = createLookupTableResolver<TradeProvider,
         [TradeProvider.PANGOLIN]: 'PangolinDex',
         [TradeProvider.TRISOLARIS]: 'Trisolaris',
         [TradeProvider.WANNASWAP]: 'WannaSwap',
+        [TradeProvider.SOLARBEAM]: 'Solarbeam',
+        [TradeProvider.HUCKLEBERRY]: 'HuckleBerry',
         [TradeProvider.MDEX]: 'Mdex',
     },
     (tradeProvider) => {

packages/mask/src/plugins/Trader/trader/0x/useTrade.ts

@@ -28,6 +28,7 @@ export function getNativeTokenLabel(networkType: NetworkType) {
         case NetworkType.xDai:
         case NetworkType.Celo:
         case NetworkType.Fantom:
+        case NetworkType.Moonriver:
         case NetworkType.Aurora:
         case NetworkType.Boba:
         case NetworkType.Fuse:

packages/mask/src/plugins/Trader/trader/useAllTradeComputed.ts

@@ -198,6 +198,20 @@ export function useAllTradeComputed(
         traderEstimateGas: wannaSwapEstimateGas,
     } = useUniswapV2Like(tradeProviders, TradeProvider.WANNASWAP, inputAmount_, inputToken, outputToken)
 
+    // Solarbeam
+    const {
+        trader_: solarbeam_,
+        trader: solarbeam,
+        traderEstimateGas: solarbeamEstimateGas,
+    } = useUniswapV2Like(tradeProviders, TradeProvider.SOLARBEAM, inputAmount_, inputToken, outputToken)
+
+    // Huckleberry
+    const {
+        trader_: huckleberry_,
+        trader: huckleberry,
+        traderEstimateGas: huckleberryEstimateGas,
+    } = useUniswapV2Like(tradeProviders, TradeProvider.HUCKLEBERRY, inputAmount_, inputToken, outputToken)
+
     // Mdex
     const {
         trader_: mdex_,
@@ -221,6 +235,8 @@ export function useAllTradeComputed(
         { provider: TradeProvider.OPENOCEAN, ...openocean_, value: openocean, gas: openoceanSwapEstimateGas },
         { provider: TradeProvider.WANNASWAP, ...wannaswap_, value: wannaswap, gas: wannaSwapEstimateGas },
         { provider: TradeProvider.TRISOLARIS, ...trisolaris_, value: trisolaris, gas: trisolarisEstimateGas },
+        { provider: TradeProvider.SOLARBEAM, ...solarbeam_, value: solarbeam, gas: solarbeamEstimateGas },
+        { provider: TradeProvider.HUCKLEBERRY, ...huckleberry_, value: huckleberry, gas: huckleberryEstimateGas },
         { provider: TradeProvider.MDEX, ...mdex_, value: mdex, gas: mdexEstimateGas },
     ]
 

packages/mask/src/plugins/Trader/trader/useGetTradeContext.ts

@@ -21,6 +21,10 @@ import {
     WANNASWAP_CUSTOM_BASES,
     TRISOLARIS_BASE_AGAINST_TOKENS,
     TRISOLARIS_CUSTOM_BASES,
+    SOLARBEAM_BASE_AGAINST_TOKENS,
+    SOLARBEAM_CUSTOM_BASES,
+    HUCKLEBERRY_BASE_AGAINST_TOKENS,
+    HUCKLEBERRY_CUSTOM_BASES,
     MDEX_BASE_AGAINST_TOKENS,
     MDEX_CUSTOM_BASES,
 } from '../constants'
@@ -152,6 +156,30 @@ export function useGetTradeContext(tradeProvider?: TradeProvider) {
                     ADDITIONAL_TOKENS: {},
                     CUSTOM_TOKENS: TRISOLARIS_CUSTOM_BASES,
                 }
+            case TradeProvider.SOLARBEAM:
+                return {
+                    TYPE: tradeProvider,
+                    IS_UNISWAP_V2_LIKE: true,
+                    GRAPH_API: DEX_TRADE.SOLARBEAM_THEGRAPH,
+                    INIT_CODE_HASH: DEX_TRADE.SOLARBEAM_INIT_CODE_HASH,
+                    ROUTER_CONTRACT_ADDRESS: DEX_TRADE.SOLARBEAM_ROUTER_ADDRESS,
+                    FACTORY_CONTRACT_ADDRESS: DEX_TRADE.SOLARBEAM_FACTORY_ADDRESS,
+                    AGAINST_TOKENS: SOLARBEAM_BASE_AGAINST_TOKENS,
+                    ADDITIONAL_TOKENS: {},
+                    CUSTOM_TOKENS: SOLARBEAM_CUSTOM_BASES,
+                }
+            case TradeProvider.HUCKLEBERRY:
+                return {
+                    TYPE: tradeProvider,
+                    IS_UNISWAP_V2_LIKE: true,
+                    GRAPH_API: DEX_TRADE.HUCKLEBERRY_THEGRAPH,
+                    INIT_CODE_HASH: DEX_TRADE.HUCKLEBERRY_INIT_CODE_HASH,
+                    ROUTER_CONTRACT_ADDRESS: DEX_TRADE.HUCKLEBERRY_ROUTER_ADDRESS,
+                    FACTORY_CONTRACT_ADDRESS: DEX_TRADE.HUCKLEBERRY_FACTORY_ADDRESS,
+                    AGAINST_TOKENS: HUCKLEBERRY_BASE_AGAINST_TOKENS,
+                    ADDITIONAL_TOKENS: {},
+                    CUSTOM_TOKENS: HUCKLEBERRY_CUSTOM_BASES,
+                }
             case TradeProvider.MDEX:
                 return {
                     TYPE: tradeProvider,

packages/mask/src/plugins/Trader/trader/useTradeCallback.ts

@@ -100,6 +100,10 @@ export function useTradeCallback(
             return uniswapV2Like
         case TradeProvider.TRISOLARIS:
             return uniswapV2Like
+        case TradeProvider.SOLARBEAM:
+            return uniswapV2Like
+        case TradeProvider.HUCKLEBERRY:
+            return uniswapV2Like
         case TradeProvider.MDEX:
             return uniswapV2Like
         case TradeProvider.ZRX:

packages/mask/src/plugins/Trader/trader/useTradeContext.ts

@@ -21,6 +21,10 @@ import {
     WANNASWAP_CUSTOM_BASES,
     TRISOLARIS_CUSTOM_BASES,
     TRISOLARIS_BASE_AGAINST_TOKENS,
+    SOLARBEAM_CUSTOM_BASES,
+    SOLARBEAM_BASE_AGAINST_TOKENS,
+    HUCKLEBERRY_CUSTOM_BASES,
+    HUCKLEBERRY_BASE_AGAINST_TOKENS,
     MDEX_CUSTOM_BASES,
     MDEX_BASE_AGAINST_TOKENS,
 } from '../constants'
@@ -31,6 +35,7 @@ export const TradeContext = createContext<TradeContext_ | null>(null)
 
 export function useTradeContext(tradeProvider: TradeProvider) {
     const { targetChainId: chainId } = TargetChainIdContext.useContainer()
+    const DEX_TRADE = getTraderConstants(chainId)
     return useMemo<TradeContext_>(() => {
         const DEX_TRADE = getTraderConstants(chainId)
         switch (tradeProvider) {
@@ -130,6 +135,30 @@ export function useTradeContext(tradeProvider: TradeProvider) {
                     ADDITIONAL_TOKENS: {},
                     CUSTOM_TOKENS: TRISOLARIS_CUSTOM_BASES,
                 }
+            case TradeProvider.SOLARBEAM:
+                return {
+                    TYPE: tradeProvider,
+                    IS_UNISWAP_V2_LIKE: true,
+                    GRAPH_API: DEX_TRADE.SOLARBEAM_THEGRAPH,
+                    INIT_CODE_HASH: DEX_TRADE.SOLARBEAM_INIT_CODE_HASH,
+                    ROUTER_CONTRACT_ADDRESS: DEX_TRADE.SOLARBEAM_ROUTER_ADDRESS,
+                    FACTORY_CONTRACT_ADDRESS: DEX_TRADE.SOLARBEAM_FACTORY_ADDRESS,
+                    AGAINST_TOKENS: SOLARBEAM_BASE_AGAINST_TOKENS,
+                    ADDITIONAL_TOKENS: {},
+                    CUSTOM_TOKENS: SOLARBEAM_CUSTOM_BASES,
+                }
+            case TradeProvider.HUCKLEBERRY:
+                return {
+                    TYPE: tradeProvider,
+                    IS_UNISWAP_V2_LIKE: true,
+                    GRAPH_API: DEX_TRADE.HUCKLEBERRY_THEGRAPH,
+                    INIT_CODE_HASH: DEX_TRADE.HUCKLEBERRY_INIT_CODE_HASH,
+                    ROUTER_CONTRACT_ADDRESS: DEX_TRADE.HUCKLEBERRY_ROUTER_ADDRESS,
+                    FACTORY_CONTRACT_ADDRESS: DEX_TRADE.HUCKLEBERRY_FACTORY_ADDRESS,
+                    AGAINST_TOKENS: HUCKLEBERRY_BASE_AGAINST_TOKENS,
+                    ADDITIONAL_TOKENS: {},
+                    CUSTOM_TOKENS: HUCKLEBERRY_CUSTOM_BASES,
+                }
             case TradeProvider.MDEX:
                 return {
                     TYPE: tradeProvider,

packages/mask/src/plugins/Trader/types/trader.ts

@@ -75,6 +75,8 @@ export enum ZrxTradePool {
     PangolinDex = 'PangolinDex',
     Trisolaris = 'Trisolaris',
     WannaSwap = 'WannaSwap',
+    Solarbeam = 'Solarbeam',
+    Huckleberry = 'Huckleberry',
     Mdex = 'Mdex',
 }
 

packages/mask/src/plugins/Wallet/services/account.ts

@@ -126,6 +126,7 @@ export async function getSupportedNetworks() {
         Flags.xdai_enabled ? NetworkType.xDai : undefined,
         Flags.celo_enabled ? NetworkType.Celo : undefined,
         Flags.fantom_enabled ? NetworkType.Fantom : undefined,
+        Flags.moonriver_enabled ? NetworkType.Moonriver : undefined,
         Flags.avalanche_enabled ? NetworkType.Avalanche : undefined,
         Flags.aurora_enabled ? NetworkType.Aurora : undefined,
     ].filter(Boolean) as NetworkType[]

packages/public-api/src/web.ts

@@ -186,6 +186,7 @@ export enum NetworkType {
     xDai = 'xDai',
     Celo = 'Celo',
     Fantom = 'Fantom',
+    Moonriver = 'Moonriver',
     Aurora = 'Aurora',
     Avalanche = 'Avalanche',
     Boba = 'Boba',
@@ -217,6 +218,8 @@ export enum TradeProvider {
     TRADERJOE = 13,
     PANGOLIN = 14,
     MDEX = 15,
+    SOLARBEAM = 16,
+    HUCKLEBERRY = 17,
 }
 /** Supported language settings */
 export enum LanguageOptions {