Skip to content

Commit

Permalink
Merge branch 'master' of github.com-unbreakablery:sushiswap/sushiswap…
Browse files Browse the repository at this point in the history 
…-interface into feat/stop-loss-with-autonomy-bot
  • Loading branch information
@unbreakablery
unbreakablery committed Aug 11, 2022
2 parents 3dda0ca + 9f708b2 commit c2ba3a0
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 53 deletions.
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,17 @@
"@sentry/nextjs": "^7.0.0",
"@sentry/react": "^7.0.0",
"@sentry/tracing": "^7.0.0",
"@sushiswap/bentobox-sdk": "1.0.0-canary.112",
"@sushiswap/bentobox-sdk": "1.0.0-canary.113",
"@sushiswap/chainlink-whitelist": "0.2.8",
"@sushiswap/core": "^2.0.0-canary.1",
"@sushiswap/core-sdk": "1.0.0-canary.131",
"@sushiswap/kashi-sdk": "1.0.0-canary.103",
"@sushiswap/core-sdk": "1.0.0-canary.132",
"@sushiswap/kashi-sdk": "1.0.0-canary.104",
"@sushiswap/limit-order-pair-list": "0.2.17",
"@sushiswap/limit-order-sdk": "1.0.0-canary.112",
"@sushiswap/limit-order-sdk": "1.0.0-canary.113",
"@sushiswap/miso": "1.0.0-canary.47",
"@sushiswap/miso-sdk": "1.0.0-canary.101",
"@sushiswap/miso-sdk": "1.0.0-canary.102",
"@sushiswap/trident": "^1.0.0-canary.40",
"@sushiswap/trident-sdk": "1.0.0-canary.140",
"@sushiswap/trident-sdk": "1.0.0-canary.141",
"@testing-library/jest-dom": "^5.14.0",
"@testing-library/react": "^12.1.0",
"@transak/transak-sdk": "^1.0.31",
Expand Down
15 changes: 8 additions & 7 deletions src/components/CurrencyLogo/CurrencyLogo.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ export const getCurrencyLogoUrls = (currency: Currency): string[] => {
const urls: string[] = []

if (currency.chainId in BLOCKCHAIN) {
urls.push(
// @ts-ignore TYPE NEEDS FIXING
`https://raw.githubusercontent.com/sushiswap/logos/main/network/${BLOCKCHAIN[currency.chainId]}/${
currency.wrapped.address
}.jpg`
)

urls.push(
`https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/network/${
// @ts-ignore TYPE NEEDS FIXING
BLOCKCHAIN[currency.chainId]
}/${currency.wrapped.address}.jpg`
)

urls.push(
// @ts-ignore TYPE NEEDS FIXING
`https://raw.githubusercontent.com/sushiswap/logos/main/network/${BLOCKCHAIN[currency.chainId]}/${
currency.wrapped.address
}.jpg`
)

urls.push(
// @ts-ignore TYPE NEEDS FIXING
`https://raw.githubusercontent.com/sushiswap/assets/master/blockchains/${BLOCKCHAIN[currency.chainId]}/assets/${
Expand Down Expand Up @@ -139,6 +139,7 @@ const CurrencyLogo: FunctionComponent<CurrencyLogoProps> = ({ currency, size = '

if (currency?.isToken) {
const defaultUrls = [...getCurrencyLogoUrls(currency)]
// console.log({ defaultUrls })

if (currency instanceof WrappedTokenInfo) {
return [...uriLocations, ...defaultUrls, UNKNOWN_ICON]
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/useMenu.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ const useMenu: UseMenu = () => {
menu.push(analyticsMenu)
}

if (account) {
if (account && chainId !== ChainId.ARBITRUM_NOVA) {
const portfolio = {
key: 'portfolio',
title: i18n._(t`Portfolio`),
Expand Down
3 changes: 2 additions & 1 deletion src/config/networks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const Telos = 'https://raw.githubusercontent.com/sushiswap/icons/master/network/
const Optimism = 'https://raw.githubusercontent.com/sushiswap/list/master/logos/network-logos/optimism.jpg'
const Kava = 'https://raw.githubusercontent.com/sushiswap/icons/master/network/kava.svg'
const Metis = 'https://raw.githubusercontent.com/sushiswap/icons/master/network/metis.svg'
const ArbitrumNova = 'https://raw.githubusercontent.com/sushiswap/icons/master/network/arbitrum-nova.svg'

export const NETWORK_ICON: Record<number, string> = {
[ChainId.ETHEREUM]: Mainnet,
Expand Down Expand Up @@ -58,7 +59,7 @@ export const NETWORK_ICON: Record<number, string> = {
[ChainId.OPTIMISM]: Optimism,
[ChainId.KAVA]: Kava,
[ChainId.METIS]: Metis,
[ChainId.ARBITRUM_NOVA]: Arbitrum,
[ChainId.ARBITRUM_NOVA]: ArbitrumNova,
}

export const NETWORK_LABEL: Record<number, string> = {
Expand Down
2 changes: 2 additions & 0 deletions src/config/routing.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,8 @@ export const COMMON_BASES: ChainTokenList = {
ARBITRUM_NOVA.USDT,
ARBITRUM_NOVA.DAI,
ARBITRUM_NOVA.WBTC,
ARBITRUM_NOVA.MOON,
ARBITRUM_NOVA.BRICK,
],
}

Expand Down
12 changes: 11 additions & 1 deletion src/config/tokens/arbitrum-nova.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const WBTC = new Token(
)
export const USDT = new Token(
ChainId.ARBITRUM_NOVA,
'0x52484E1ab2e2B22420a25c20FA49E173a26202Cd',
'0xeD9d63a96c27f87B07115b56b2e3572827f21646',
8,
'USDT',
'Tether USD'
Expand All @@ -28,3 +28,13 @@ export const DAI = new Token(
'DAI',
'Dai Stablecoin'
)

export const MOON = new Token(ChainId.ARBITRUM_NOVA, '0x0057Ac2d777797d31CD3f8f13bF5e927571D6Ad0', 18, 'MOON', 'Moons')

export const BRICK = new Token(
ChainId.ARBITRUM_NOVA,
'0x6DcB98f460457fe4952e12779Ba852F82eCC62C1',
18,
'BRICK',
'Bricks'
)
5 changes: 3 additions & 2 deletions src/functions/cloudinary.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ type CloudinaryFetchProps = { src: string; width?: number; height?: number; qual
type ClodunaryImageLoader = (resolverProps: CloudinaryFetchProps) => string

export const cloudinaryLoader: ClodunaryImageLoader = ({ src, width, height }: CloudinaryFetchProps) => {
return `https://res.cloudinary.com/sushi-cdn/image/fetch/${width ? `w_${width},` : ''}${
return `https://res.cloudinary.com/sushi-cdn/image/fetch/f_auto,fl_sanitize,q_auto,${width ? `w_${width}` : ''}${
height ? `h_${height},` : ''
}f_auto,q_auto,fl_sanitize/${normalizeUrl(src)}`
}/${normalizeUrl(src)}`
}
// f_auto,fl_sanitize,q_auto,w_32
2 changes: 1 addition & 1 deletion src/modals/NetworkModal/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export const SUPPORTED_NETWORKS: Record<
symbol: 'ETH',
decimals: 18,
},
rpcUrls: ['https://nova.arbitrum.io/rpc '],
rpcUrls: ['https://a4ba.arbitrum.io/rpc'],
blockExplorerUrls: ['https://nova-explorer.arbitrum.io/'],
},
}
Expand Down
68 changes: 34 additions & 34 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3025,22 +3025,22 @@
magic-string "^0.25.0"
string.prototype.matchall "^4.0.6"

"@sushiswap/[email protected].112":
version "1.0.0-canary.112"
resolved "https://registry.yarnpkg.com/@sushiswap/bentobox-sdk/-/bentobox-sdk-1.0.0-canary.112.tgz#0e0713b906ce5e0d572afa832aaa540ae911874a"
integrity sha512-4Lf3agdgfBbu38WnXM8tZIuMi+xGe/rblkEMc7D+SpctOgmOW7EvkqnkOg3CpLBd9h4GdE4HEU4R5r/MxLRDXQ==
"@sushiswap/[email protected].113":
version "1.0.0-canary.113"
resolved "https://registry.yarnpkg.com/@sushiswap/bentobox-sdk/-/bentobox-sdk-1.0.0-canary.113.tgz#8038d771d58f8ac1b5e8690ece54603190dd7808"
integrity sha512-Ynp2hpzEwPIsweRohM0k7dgXlGJOaOyg1jVgzxse+x85/zzh1rhTL7w6nYHlHlHlMprsEYYT7OJaIV83rbaXfA==
dependencies:
"@sushiswap/core-sdk" "1.0.0-canary.131"
"@sushiswap/core-sdk" "1.0.0-canary.132"

"@sushiswap/[email protected]":
version "0.2.8"
resolved "https://registry.yarnpkg.com/@sushiswap/chainlink-whitelist/-/chainlink-whitelist-0.2.8.tgz#832dc80963b890a2eb02aaaf11ea8b57b2b7dde0"
integrity sha512-YhhGfF/smND4jUdVWuTr3e9Np08zLyxrOfbQ6GkAhmrld4lWBs2sk4TV6oWSBWPbuUb3A2mw203uCnbMHpSoXw==

"@sushiswap/[email protected].131":
version "1.0.0-canary.131"
resolved "https://registry.yarnpkg.com/@sushiswap/core-sdk/-/core-sdk-1.0.0-canary.131.tgz#36ae064863985c0b1a41dc2c99e0a99149bfd42e"
integrity sha512-pkfDoDrLFUYlDDOscnj1hRsmSMLTkH2aj15NYBifIclg8ABKqhoyD1StEfK5NpkrdwgUhx7jkU3lzLXg3vCT6g==
"@sushiswap/[email protected].132":
version "1.0.0-canary.132"
resolved "https://registry.yarnpkg.com/@sushiswap/core-sdk/-/core-sdk-1.0.0-canary.132.tgz#8456bbdc8cfff4f48b136bced944e7468923d4ba"
integrity sha512-qgZ/GMW37xaApFlDGqU/kMl8t4q55x8jo7eRIeK0BQheYmaoVZ+zNZxVS41RIG0BG09jxh8URxqWDrJDMFALHw==
dependencies:
"@ethersproject/address" "^5.4.0"
"@ethersproject/bignumber" "^5.4.0"
Expand All @@ -3063,24 +3063,24 @@
resolved "https://registry.yarnpkg.com/@sushiswap/default-token-list/-/default-token-list-28.2.0.tgz#c9690bbc74ced90c98d41a49957f88dc840839ff"
integrity sha512-g+YYRj7U2hPqKHddnBPqaeUdG7V66B9+NwfyzxD99JV+1P1jCGALwhUasEWrzHV/8QyVqnrtuJmn8bMM15XkQQ==

"@sushiswap/[email protected].103":
version "1.0.0-canary.103"
resolved "https://registry.yarnpkg.com/@sushiswap/kashi-sdk/-/kashi-sdk-1.0.0-canary.103.tgz#a164aec05dd50f8f709ce23d68cb6428a15b8d75"
integrity sha512-7x5zhKdpAnp0jMHVhOOkAXGlDXVOOQy6I7oq6DhyoDx3LpEEiHQLrvp9Cl/NS7XlEK1o3VJqOGSyRaWBmlsOtQ==
"@sushiswap/[email protected].104":
version "1.0.0-canary.104"
resolved "https://registry.yarnpkg.com/@sushiswap/kashi-sdk/-/kashi-sdk-1.0.0-canary.104.tgz#865fd39ff35cacfd350e4e8e687660e0874a4dc4"
integrity sha512-NcuUqm752T7D7oevwCS6B7W0Via0Yv2XlLySHm9aI7PwGH0ZBlz/VD+qxYum1ETkD6kiy2iNhrLTQySCx9/prA==
dependencies:
"@ethersproject/abi" "^5.4.0"
"@ethersproject/contracts" "^5.4.0"
"@sushiswap/bentobox-sdk" "1.0.0-canary.112"
"@sushiswap/bentobox-sdk" "1.0.0-canary.113"

"@sushiswap/[email protected]":
version "0.2.17"
resolved "https://registry.yarnpkg.com/@sushiswap/limit-order-pair-list/-/limit-order-pair-list-0.2.17.tgz#0f0b1fb2d4f2425056e76673cb3c3c7011dacfcb"
integrity sha512-j5ewnBO2kEH1s3/dXPS8+qaFO/rM83H6DMP9Zy/Uh76Ub+wjRC4EqQEuhPlrAgQvqSTNX4hbPByD7x/OMzINuw==

"@sushiswap/[email protected].112":
version "1.0.0-canary.112"
resolved "https://registry.yarnpkg.com/@sushiswap/limit-order-sdk/-/limit-order-sdk-1.0.0-canary.112.tgz#92bb09bc158955badd46c1fc754f5f2b2c8ec0a0"
integrity sha512-NInqgW30T4ZRVR/6Deo+9c0UAIDYxdD/vyyA3RWdmbSaPAeWaAjf/SvETvcZSlZEw8O2CwIZ7WMTiixt+9ky9w==
"@sushiswap/[email protected].113":
version "1.0.0-canary.113"
resolved "https://registry.yarnpkg.com/@sushiswap/limit-order-sdk/-/limit-order-sdk-1.0.0-canary.113.tgz#bff9f36b49d9be5d196b0f79070bb420d7ca9069"
integrity sha512-apyLRfmY3Bhfj1MsLDliHNdxhTeiDAcc8Mc3PXv5L+d6/kBvbPg3jm5DjOB2/EXNEN2ZdKOck7sLXlpZICIg+A==
dependencies:
"@ethersproject/abi" "^5.4.0"
"@ethersproject/abstract-signer" "^5.4.0"
Expand All @@ -3089,37 +3089,37 @@
"@ethersproject/experimental" "^5.4.0"
"@ethersproject/signing-key" "^5.4.0"
"@ethersproject/transactions" "^5.4.0"
"@sushiswap/core-sdk" "1.0.0-canary.131"
"@sushiswap/core-sdk" "1.0.0-canary.132"
eip-712 "^0.4.0"
isomorphic-unfetch "^3.0.0"

"@sushiswap/[email protected].101":
version "1.0.0-canary.101"
resolved "https://registry.yarnpkg.com/@sushiswap/miso-sdk/-/miso-sdk-1.0.0-canary.101.tgz#efd2444d860ecb6bbe9759cf31d9f5a2138f1619"
integrity sha512-fYhM9gMxPniWkmPalLrGLQfRtMwJozz1QK0f/tG18b1SWUmByCoGU9AAh5btlnVRE3JZ+A5aw9SSAu+TSKmbuw==
"@sushiswap/[email protected].102":
version "1.0.0-canary.102"
resolved "https://registry.yarnpkg.com/@sushiswap/miso-sdk/-/miso-sdk-1.0.0-canary.102.tgz#c12e4185c161053afb7ebaf480c53fbf57630320"
integrity sha512-BVS1oPf1G8XuGu4102THxNxO46fIS7N7Au+NdXW9OwVRfGdwDm/m2h//OgAgINn6VSQJ22v6XPeGboI7F3qZ7g==

"@sushiswap/[email protected]":
version "1.0.0-canary.47"
resolved "https://registry.yarnpkg.com/@sushiswap/miso/-/miso-1.0.0-canary.47.tgz#743f7f57ce28e796b93262eec2ea429942fa2e74"
integrity sha512-bEDm9ZDE8jh1A+edGnYYH8dTNHytel7sk6k8EKS42Xw0szrjghWMq7HbOQ3PXrMFj2ChDOz/g6G3DZ0JrJasGA==

"@sushiswap/[email protected].115":
version "1.0.0-canary.115"
resolved "https://registry.yarnpkg.com/@sushiswap/tines/-/tines-1.0.0-canary.115.tgz#b721097481e8096b6c4bbcf76f977e872555b19b"
integrity sha512-t7RaYqFrMB7X2LMM+69mkXPcwYE23nYhvNeo+ag8SUbGwZq8TdesWaYSl1r/kAXwBdfYyL2lpM2lLnyGzeBkGw==
"@sushiswap/[email protected].116":
version "1.0.0-canary.116"
resolved "https://registry.yarnpkg.com/@sushiswap/tines/-/tines-1.0.0-canary.116.tgz#aa5c002cd84d9304102aba49f84f78575345eef5"
integrity sha512-I4o6O4raHBoDBd6qHk4M5T+bbLI7h93+XMjFr3LTMdjtVpk8PnILhb2KoDfkeShH3XR30seKDBAyhYhDcMUJLg==
dependencies:
"@ethersproject/bignumber" "^5.4.0"
"@sushiswap/core-sdk" "1.0.0-canary.131"
"@sushiswap/core-sdk" "1.0.0-canary.132"

"@sushiswap/[email protected].140":
version "1.0.0-canary.140"
resolved "https://registry.yarnpkg.com/@sushiswap/trident-sdk/-/trident-sdk-1.0.0-canary.140.tgz#e69b0b91e2f38ea8ba57c54c8791561331aba98b"
integrity sha512-c/UxBmQ2XhklYo/kGfK2otrOKfEgh/rKaqyugiwzVf41QM+VdL9K7tn1/XNRV28x3u93X/oOPbt+rYiICfIpKA==
"@sushiswap/[email protected].141":
version "1.0.0-canary.141"
resolved "https://registry.yarnpkg.com/@sushiswap/trident-sdk/-/trident-sdk-1.0.0-canary.141.tgz#34e36380b73f8f02c1518bb7b22f215f5a0787cf"
integrity sha512-a4pTrcXYpKa6mk7TNXmMV7+pvwP0jMmXwR8WwJpAjGICSX1Dcrrjsjbm3Zd9wJhxyTrfIR+cvYbNlca7pQqFXA==
dependencies:
"@ethersproject/abi" "^5.4.0"
"@ethersproject/bignumber" "^5.4.0"
"@sushiswap/core-sdk" "1.0.0-canary.131"
"@sushiswap/tines" "1.0.0-canary.115"
"@sushiswap/core-sdk" "1.0.0-canary.132"
"@sushiswap/tines" "1.0.0-canary.116"
"@sushiswap/trident" "1.0.0-canary.40"
tiny-invariant "^1.1.0"
trident-preview "npm:@sushiswap/[email protected]"
Expand Down

0 comments on commit c2ba3a0

Please sign in to comment.