Skip to content
This repository was archived by the owner on May 18, 2023. It is now read-only.

Commit 84ebae2

Browse files
matthewlilleymatthewlilley
committed
chore: prepare for merge
1 parent 39682cc commit 84ebae2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+4398
-3203
lines changed

‎next-env.d.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// <reference types="next" />
2-
/// <reference types="next/types/global" />
32
/// <reference types="next/image-types/global" />
43

54
// NOTE: This file should not be edited

‎next.config.js

+15-27
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ const nextConfig = {
4949
async redirects() {
5050
return [
5151
{
52-
source: '/analytics',
53-
destination: '/analytics/dashboard',
52+
source: '/',
53+
destination: '/swap',
5454
permanent: true,
5555
},
5656
]
@@ -63,61 +63,49 @@ const nextConfig = {
6363
},
6464
{
6565
source: '/add/:token*',
66-
destination: '/exchange/add/:token*',
66+
destination: '/legacy/add/:token*',
6767
},
6868
{
6969
source: '/remove/:token*',
70-
destination: '/exchange/remove/:token*',
70+
destination: '/legacy/remove/:token*',
7171
},
7272
{
7373
source: '/create/:token*',
74-
destination: '/exchange/add/:token*',
74+
destination: '/legacy/add/:token*',
7575
},
7676
{
7777
source: '/swap',
78-
destination: '/trident/swap',
78+
destination: '/legacy/swap',
7979
},
8080
{
8181
source: '/swap/:token*',
82-
destination: '/exchange/swap/:token*',
82+
destination: '/legacy/swap/:token*',
8383
},
8484
{
8585
source: '/limit-order',
86-
destination: '/exchange/limit-order',
86+
destination: '/legacy/limit-order',
8787
},
8888
{
8989
source: '/limit-order/:token*',
90-
destination: '/exchange/limit-order/:token*',
90+
destination: '/legacy/limit-order/:token*',
9191
},
9292
{
9393
source: '/open-order',
94-
destination: '/exchange/open-order',
94+
destination: '/legacy/open-order',
9595
},
9696
{
9797
source: '/pool',
98-
destination: '/exchange/pool',
98+
destination: '/legacy/pool',
9999
},
100100
{
101101
source: '/find',
102-
destination: '/exchange/find',
103-
},
104-
// Kashi
105-
{
106-
source: '/borrow',
107-
destination: '/kashi/borrow',
108-
},
109-
{
110-
source: '/borrow/:token*',
111-
destination: '/kashi/borrow/:token*',
112-
},
113-
{
114-
source: '/lend',
115-
destination: '/kashi/lend',
102+
destination: '/legacy/find',
116103
},
117104
{
118-
source: '/lend/:token*',
119-
destination: '/kashi/lend/:token*',
105+
source: '/migrate',
106+
destination: '/legacy/migrate',
120107
},
108+
// Kashi
121109
{
122110
source: '/me',
123111
destination: '/user',

‎package.json

+14-10
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"devDependencies": {
4040
"@binance-chain/bsc-connector": "^1.0.0",
4141
"@chainsafe/dappeteer": "^2.2.0",
42+
"@clover-network/clover-connector": "^1.0.0",
4243
"@commitlint/cli": "^13.0.0",
4344
"@commitlint/config-conventional": "^13.0.0",
4445
"@ethersproject/abi": "^5.4.0",
@@ -77,18 +78,20 @@
7778
"@storybook/addon-links": "^6.3.0",
7879
"@storybook/addon-postcss": "^2.0.0",
7980
"@storybook/react": "^6.3.0",
80-
"@sushiswap/bentobox-sdk": "1.0.0-canary.5",
81-
"@sushiswap/chainlink-whitelist": "0.2.5",
81+
"@sushiswap/bentobox-sdk": "1.0.0-canary.12",
82+
"@sushiswap/chainlink-whitelist": "0.2.8",
8283
"@sushiswap/core": "^2.0.0-canary.1",
83-
"@sushiswap/core-sdk": "1.0.0-canary.29",
84-
"@sushiswap/default-token-list": "18.10.0",
84+
"@sushiswap/core-sdk": "1.0.0-canary.31",
85+
"@sushiswap/default-token-list": "21.0.0",
86+
"@sushiswap/kashi-sdk": "1.0.0-canary.8",
8587
"@sushiswap/limit-order-pair-list": "0.2.2",
86-
"@sushiswap/limit-order-sdk": "1.0.0-canary.18",
87-
"@sushiswap/miso": "^1.0.0-canary.5",
88-
"@sushiswap/sdk": "5.0.0-canary.109",
89-
"@sushiswap/tines": "^1.0.0-canary.11",
88+
"@sushiswap/limit-order-sdk": "1.0.0-canary.19",
89+
"@sushiswap/miso": "1.0.0-canary.5",
90+
"@sushiswap/miso-sdk": "1.0.0-canary.8",
91+
"@sushiswap/sdk": "5.0.0-canary.116",
92+
"@sushiswap/tines": "1.0.0-canary.13",
9093
"@sushiswap/trident": "^1.0.0-canary.28",
91-
"@sushiswap/trident-sdk": "^1.0.0-canary.37",
94+
"@sushiswap/trident-sdk": "1.0.0-canary.41",
9295
"@tailwindcss/jit": "^0.1.18",
9396
"@testing-library/jest-dom": "^5.14.0",
9497
"@testing-library/react": "^12.1.0",
@@ -100,7 +103,7 @@
100103
"@types/react": "^17.0.11",
101104
"@typescript-eslint/eslint-plugin": "^5.2.0",
102105
"@typescript-eslint/parser": "^5.2.0",
103-
"@uniswap/token-lists": "1.0.0-beta.24",
106+
"@uniswap/token-lists": "1.0.0-beta.27",
104107
"@visx/axis": "^2.1.0",
105108
"@visx/brush": "^2.1.0",
106109
"@visx/gradient": "^2.1.0",
@@ -134,6 +137,7 @@
134137
"eslint-config-next": "^11.1.0",
135138
"eslint-plugin-simple-import-sort": "^7.0.0",
136139
"eslint-plugin-unused-imports": "^1.1.5",
140+
"eth-permit": "^0.2.1",
137141
"fast-json-stable-stringify": "^2.1.0",
138142
"fuse.js": "^6.4.6",
139143
"graphql": "^15.5.3",

‎public/images/wallets/clover.svg

+3
Loading

‎src/components/Header/DesktopNav.tsx

+8
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,14 @@ export const DesktopNav: FC<DesktopNavProps> = ({ mobileMenuOpen }) => {
112112
</a>
113113
</NavLink>
114114
)}
115+
116+
{chainId && featureEnabled(Feature.MISO, chainId) && (
117+
<NavLink href="/miso">
118+
<a id="launch-nav-link" className={NAV_BASE_CLASS}>
119+
{i18n._(t`Launch`)}
120+
</a>
121+
</NavLink>
122+
)}
115123
</div>
116124
</div>
117125
<div className="flex items-center justify-end gap-2">

‎src/config/farms.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { AddressMap, ChainId } from '@sushiswap/core-sdk'
2+
3+
export const OLD_FARMS: AddressMap = {
4+
[ChainId.CELO]: '0x0769fd68dFb93167989C6f7254cd0D766Fb2841F',
5+
}

‎src/config/oracles/chainlink/mappings/arbitrum.ts

+32
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,38 @@ const ARBITRUM_CHAINLINK_MAPPING = {
4747
fromDecimals: 18,
4848
toDecimals: 8,
4949
},
50+
// DAI / USD
51+
'0xc5C8E77B397E531B8EC06BFb0048328B30E9eCfB': {
52+
from: '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
53+
to: '0x0000000000000000000000000000000000000001',
54+
decimals: 8,
55+
fromDecimals: 18,
56+
toDecimals: 8,
57+
},
58+
// MIM / USD
59+
'0x87121F6c9A9F6E90E59591E4Cf4804873f54A95b': {
60+
from: '0xFEa7a6a0B346362BF88A9e4A88416B77a57D6c2A',
61+
to: '0x0000000000000000000000000000000000000001',
62+
decimals: 8,
63+
fromDecimals: 18,
64+
toDecimals: 8,
65+
},
66+
// SPELL / USD
67+
'0x383b3624478124697BEF675F07cA37570b73992f': {
68+
from: '0x3E6648C5a70A150A88bCE65F4aD4d506Fe15d2AF',
69+
to: '0x0000000000000000000000000000000000000001',
70+
decimals: 8,
71+
fromDecimals: 18,
72+
toDecimals: 8,
73+
},
74+
// SUSHI / USD
75+
'0xb2A8BA74cbca38508BA1632761b56C897060147C': {
76+
from: '0xd4d42F0b6DEF4CE0383636770eF773390d85c61A',
77+
to: '0x0000000000000000000000000000000000000001',
78+
decimals: 8,
79+
fromDecimals: 18,
80+
toDecimals: 8,
81+
},
5082
}
5183

5284
export default ARBITRUM_CHAINLINK_MAPPING

‎src/config/oracles/chainlink/mappings/avalanche.ts

+40
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,46 @@ const AVALANCHE_CHAINLINK_MAPPING = {
6363
fromDecimals: 6,
6464
toDecimals: 8,
6565
},
66+
// JOE / USD
67+
'0x02D35d3a8aC3e1626d3eE09A78Dd87286F5E8e3a': {
68+
from: '0x6e84a6216eA6dACC71eE8E6b0a5B7322EEbC0fDd',
69+
to: '0x0000000000000000000000000000000000000001',
70+
decimals: 8,
71+
fromDecimals: 18,
72+
toDecimals: 8,
73+
},
74+
// xJOE / USD
75+
'0x64e1E895866B3126f8f2E2912B475FDB35b2F315': {
76+
from: '0x57319d41F71E81F3c65F2a47CA4e001EbAFd4F33',
77+
to: '0x0000000000000000000000000000000000000001',
78+
decimals: 8,
79+
fromDecimals: 18,
80+
toDecimals: 8,
81+
},
82+
// MIM / USD
83+
'0x54EdAB30a7134A16a54218AE64C73e1DAf48a8Fb': {
84+
from: '0x130966628846BFd36ff31a822705796e8cb8C18D',
85+
to: '0x0000000000000000000000000000000000000001',
86+
decimals: 8,
87+
fromDecimals: 18,
88+
toDecimals: 8,
89+
},
90+
// SPELL / USD
91+
'0x4F3ddF9378a4865cf4f28BE51E10AECb83B7daeE': {
92+
from: '0xCE1bFFBD5374Dac86a2893119683F4911a2F7814',
93+
to: '0x0000000000000000000000000000000000000001',
94+
decimals: 8,
95+
fromDecimals: 18,
96+
toDecimals: 8,
97+
},
98+
// SUSHI / USD
99+
'0x449A373A090d8A1e5F74c63Ef831Ceff39E94563': {
100+
from: '0x37B608519F91f70F2EeB0e5Ed9AF4061722e4F76',
101+
to: '0x0000000000000000000000000000000000000001',
102+
decimals: 8,
103+
fromDecimals: 18,
104+
toDecimals: 8,
105+
},
66106
}
67107

68108
export default AVALANCHE_CHAINLINK_MAPPING

‎src/config/oracles/chainlink/mappings/mainnet.ts

+8
Original file line numberDiff line numberDiff line change
@@ -1295,6 +1295,14 @@ const MAINNET_CHAINLINK_MAPPING = {
12951295
fromDecimals: 18,
12961296
toDecimals: 8,
12971297
},
1298+
// wOHM / ETH (Not Chainlink)
1299+
'0x95655B72D76370e3daE5f60768F2B96AC62ec568': {
1300+
from: '0xCa76543Cf381ebBB277bE79574059e32108e3E65',
1301+
to: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
1302+
decimals: 18,
1303+
fromDecimals: 18,
1304+
toDecimals: 18,
1305+
},
12981306
}
12991307

13001308
export default MAINNET_CHAINLINK_MAPPING

‎src/config/routing.ts

-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ export const COMMON_BASES: ChainTokenList = {
240240
ETHEREUM.USDC,
241241
ETHEREUM.USDT,
242242
ETHEREUM.WBTC,
243-
ETHEREUM.OHM_V1,
244243
ETHEREUM.OHM_V2,
245244
ETHEREUM.MIM,
246245
ETHEREUM.SPELL,

‎src/config/tokens/arbitrum.ts

+10
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,13 @@ export const SPELL = new Token(
2727
'SPELL',
2828
'Spell Token'
2929
)
30+
31+
export const gOHM = new Token(
32+
ChainId.ARBITRUM,
33+
'0x8D9bA570D6cb60C7e3e0F31343Efe75AB8E65FB1',
34+
18,
35+
'gOHM',
36+
'Governance OHM'
37+
)
38+
39+
export const MAGIC = new Token(ChainId.ARBITRUM, '0x539bdE0d7Dbd336b79148AA742883198BBF60342', 18, 'MAGIC', 'MAGIC')

‎src/config/tokens/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
export * as ARBITRUM_TOKENS from './arbitrum'
12
export * from './ethereum'
2-
export * as ARBITRUM_TOKENS from './ethereum'
3+
export * as MATIC_TOKENS from './matic'

‎src/config/tokens/matic.ts

+2
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ export const MIM = new Token(
2929
'Magic Internet Money'
3030
)
3131
export const ICE = new Token(ChainId.MATIC, '0x4e1581f01046eFDd7a1a2CDB0F82cdd7F71F2E59', 18, 'ICE', 'IceToken')
32+
33+
export const gOHM = new Token(ChainId.MATIC, '0xd8cA34fd379d9ca3C6Ee3b3905678320F5b45195', 18, 'gOHM', 'Governance OHM')

‎src/config/wallets.ts

+13
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,17 @@ export const SUPPORTED_WALLETS: { [key: string]: WalletInfo } = {
177177
color: '#F0B90B',
178178
mobile: true,
179179
},
180+
Clover: {
181+
connector: async () => {
182+
const CloverConnector = (await import('@clover-network/clover-connector')).CloverConnector
183+
return new CloverConnector({
184+
supportedChainIds: [1],
185+
})
186+
},
187+
name: 'Clover',
188+
iconName: 'clover.svg',
189+
description: 'Login using Clover hosted wallet',
190+
href: null,
191+
color: '#269964',
192+
},
180193
}

0 commit comments

Comments
 (0)