Merge remote-tracking branch 'origin/master' into data-api

sushi-labs · Aug 7, 2024 · ff46a8c · ff46a8c
2 parents 6d691dc + e0419b1
commit ff46a8c
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 21 deletions.
diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs
@@ -7,7 +7,7 @@ const bundleAnalyzer = withBundleAnalyzer({
   enabled: false && process.env.NODE_ENV !== 'development',
 })
 
-const FURO_URL = 'https://furo.sushi.com'
+const FURO_URL = 'https://pay.sushi.com'
 
 /** @type {import('next').NextConfig} */
 const nextConfig = bundleAnalyzer({
@@ -68,6 +68,16 @@ const nextConfig = bundleAnalyzer({
         permanent: true,
         destination: '/swap?chainId=2046399126',
       },
+      {
+        source: '/furo',
+        permanent: true,
+        destination: `${FURO_URL}`,
+      },
+      {
+        source: '/furo/:path*',
+        permanent: true,
+        destination: `${FURO_URL}/:path*`,
+      },
     ]
   },
   async rewrites() {
@@ -94,14 +104,6 @@ const nextConfig = bundleAnalyzer({
       //   ],
       //   destination: '/pay/:path*',
       // },
-      {
-        source: '/furo',
-        destination: `${FURO_URL}/furo`,
-      },
-      {
-        source: '/furo/:path*',
-        destination: `${FURO_URL}/furo/:path*`,
-      },
     ]
   },
 })

diff --git a/packages/sushi/src/config/subgraph/hosts.ts b/packages/sushi/src/config/subgraph/hosts.ts
@@ -21,7 +21,8 @@ export const GOLDSKY_COMMUNITY_HOST =
   'api.goldsky.com/api/public/project_cl8ylkiw00krx0hvza0qw17vn/subgraphs'
 export const WAGMI_METIS_HOST = 'metis.graph.wagmi.com/subgraphs/name'
 export const WAGMI_KAVA_HOST = 'kava.graph.wagmi.com/subgraphs/name'
-export const METIS_0XGRAPH_HOST = 'metisapi.0xgraph.xyz/subgraphs/name'
+export const METIS_0XGRAPH_HOST =
+  'metisapi.0xgraph.xyz/api/public/fc1ae952-7a36-44ac-9e9b-f46d70cedf7d/subgraphs'
 export const SKALE_HOST =
   'elated-tan-skat-graph.skalenodes.com:8000/subgraphs/name'
 

diff --git a/packages/sushi/src/config/subgraph/subgraphs/sushiswap-v3.ts b/packages/sushi/src/config/subgraph/subgraphs/sushiswap-v3.ts
@@ -29,13 +29,13 @@ export const SUSHISWAP_V3_SUBGRAPH_URL: Record<SushiSwapV3ChainId, string> = {
   [ChainId.LINEA]: `${DECENTRALIZED_HOST_BY_DEPLOYMENT_ID}/QmNZ9ePvxGRDHAEhb7cLsb3AvtCCPJ3qAwh1CDvDn39RMa`,
   [ChainId.SCROLL]: `${DECENTRALIZED_HOST_BY_DEPLOYMENT_ID}/QmR6VP1qoF8nxhtMaGEg9VMmkaTDFqyeM8nJWkakP6nHes`,
   [ChainId.ARBITRUM_NOVA]: `${SUSHI_DEDICATED_GOLDSKY_HOST}/sushi-v3/v3-arbitrum-nova/gn`,
-  [ChainId.THUNDERCORE]: `${THUNDERCORE_HOST}/sushi-v3/v3-thundercore`,
-  [ChainId.CORE]: `${CORE_HOST}/sushi-v3/v3-core-fix`,
+  [ChainId.THUNDERCORE]: `${THUNDERCORE_HOST}/sushi-v3/v3-thundercore-2`,
+  [ChainId.CORE]: `${CORE_HOST}/sushi-v3/v3-core-tvl-fix`,
   [ChainId.KAVA]: `${SUSHI_DEDICATED_GOLDSKY_HOST}/sushi-v3/v3-kava/gn`,
-  [ChainId.METIS]: `${METIS_0XGRAPH_HOST}/sushiswap/v3-metis`,
+  [ChainId.METIS]: `${METIS_0XGRAPH_HOST}/sushi-v3/v3-metis/v0.0.1/gn`,
   [ChainId.BTTC]: `${SUSHI_DEDICATED_GOLDSKY_HOST}/sushi-v3/v3-bttc/gn`,
   [ChainId.FILECOIN]: `${FILECOIN_HOST}/sushiswap/v3-filecoin`,
-  [ChainId.HAQQ]: `${HAQQ_HOST}/sushi/v3-haqq`,
+  [ChainId.HAQQ]: `${HAQQ_HOST}/sushi/v3-haqq-2`,
   [ChainId.ZETACHAIN]: `${SUSHI_GOLDSKY_HOST}/v3-zetachain/1.0.0/gn`,
   [ChainId.BLAST]: `${SUSHI_DEDICATED_GOLDSKY_HOST}/sushiswap/v3-blast/gn`,
   [ChainId.SKALE_EUROPA]: `${SKALE_HOST}/sushi/v3-skale-europa`,

diff --git a/packages/sushi/src/config/wallet.ts b/packages/sushi/src/config/wallet.ts
@@ -0,0 +1,72 @@
+import { ChainId } from '../chain/index.js'
+
+export const MULTISIG_CHAIN_IDS = [
+  ChainId.ARBITRUM,
+  ChainId.AVALANCHE,
+  ChainId.BASE,
+  ChainId.BLAST,
+  ChainId.BOBA,
+  ChainId.BOBA_BNB,
+  ChainId.BSC,
+  ChainId.BTTC,
+  ChainId.CELO,
+  ChainId.CORE,
+  ChainId.ETHEREUM,
+  ChainId.FANTOM,
+  ChainId.FUSE,
+  ChainId.GNOSIS,
+  ChainId.HAQQ,
+  ChainId.HARMONY,
+  ChainId.KAVA,
+  ChainId.LINEA,
+  ChainId.METIS,
+  ChainId.MOONBEAM,
+  ChainId.MOONRIVER,
+  ChainId.OPTIMISM,
+  ChainId.POLYGON,
+  ChainId.POLYGON_ZKEVM,
+  ChainId.ROOTSTOCK,
+  ChainId.SCROLL,
+  ChainId.SKALE_EUROPA,
+  ChainId.TELOS,
+  ChainId.ZETACHAIN,
+] as const
+
+export type MultisigChainId = (typeof MULTISIG_CHAIN_IDS)[number]
+
+export const MULTISIG_ADDRESS: Record<MultisigChainId, `0x${string}`> = {
+  [ChainId.ARBITRUM]: '0x978982772b8e4055B921bf9295c0d74eB36Bc54e',
+  [ChainId.AVALANCHE]: '0x09842Ce338647906B686aBB3B648A6457fbB25DA',
+  [ChainId.BASE]: '0xFcD4e19Dd044cBa929cF1EEfc1C181aE4f5beCe8',
+  [ChainId.BLAST]: '0xbfF76182457256808BD11B0cAFc05C35c9E4aa43',
+  [ChainId.BOBA]: '0x3a131cd0A0F82c9610d7a90bBD4A924B1ccaa38E',
+  [ChainId.BOBA_BNB]: '0xb8f2faca5b2EBcd6Be7B5D9E164962dE9CCc3B76',
+  [ChainId.BSC]: '0xc6fD91aD4919Fd91e2c84077ba648092cB499638',
+  [ChainId.BTTC]: '0x488398D8EfeF84Bd3271f13ae8Eb44Cd2C1eE687',
+  [ChainId.CELO]: '0x751b01Fa14fD9640a1DF9014e2D0f3a03A198b81',
+  [ChainId.CORE]: '0x9ffC84bc9Cf7c85E4E6e2B0aB67BB6c643cA72A2',
+  [ChainId.ETHEREUM]: '0x19B3Eb3Af5D93b77a5619b047De0EED7115A19e7',
+  [ChainId.FANTOM]: '0xF9E7d4c6d36ca311566f46c81E572102A2DC9F52',
+  [ChainId.FUSE]: '0x33b6beb37837459Ee84a1Ffed2C6a4ca22e5F316',
+  [ChainId.GNOSIS]: '0xc375411C6597F692Add6a7a3AD5b3C38626B0F26',
+  [ChainId.HAQQ]: '0x43a3f312c749B5D23Fc9547c39478b83b39362aA',
+  [ChainId.HARMONY]: '0x30af69A3f4a6f266961313Ce0943719dF4A8AA10',
+  [ChainId.KAVA]: '0xb8f2faca5b2EBcd6Be7B5D9E164962dE9CCc3B76',
+  [ChainId.LINEA]: '0x9ffC84bc9Cf7c85E4E6e2B0aB67BB6c643cA72A2',
+  [ChainId.METIS]: '0xb8f2faca5b2EBcd6Be7B5D9E164962dE9CCc3B76',
+  [ChainId.MOONBEAM]: '0x9ffC84bc9Cf7c85E4E6e2B0aB67BB6c643cA72A2',
+  [ChainId.MOONRIVER]: '0x939f7E76cc515cc296dD3ce362D9a52e148A7D5f',
+  [ChainId.OPTIMISM]: '0x1219Bfa3A499548507b4917E33F17439b67A2177',
+  [ChainId.POLYGON]: '0x850a57630A2012B2494779fBc86bBc24F2a7baeF',
+  [ChainId.POLYGON_ZKEVM]: '0x9ffC84bc9Cf7c85E4E6e2B0aB67BB6c643cA72A2',
+  [ChainId.ROOTSTOCK]: '0x9ffC84bc9Cf7c85E4E6e2B0aB67BB6c643cA72A2',
+  [ChainId.SCROLL]: '0x9ffC84bc9Cf7c85E4E6e2B0aB67BB6c643cA72A2',
+  [ChainId.SKALE_EUROPA]: '0xa88a0398C8D8B34Ab3f19CbBAbc2C4F33149Dfa6',
+  [ChainId.TELOS]: '0x72840af61A60B585064c16Ee402B3823366823Cb',
+  [ChainId.ZETACHAIN]: '0xb8f2faca5b2EBcd6Be7B5D9E164962dE9CCc3B76',
+} as const
+
+export const isMultisigChainId = (
+  chainId: ChainId,
+): chainId is MultisigChainId =>
+  MULTISIG_CHAIN_IDS.includes(chainId as MultisigChainId)
diff --git a/packages/ui/src/icons/network/circle/EthereumCircle.tsx b/packages/ui/src/icons/network/circle/EthereumCircle.tsx
@@ -2,12 +2,13 @@ import * as React from 'react'
 
 import { EthereumNaked } from '../naked/EthereumNaked'
 
+import classNames from 'classnames'
 import { IconComponent } from '../../../types'
 
 export const EthereumCircle: IconComponent = (props) => (
   <EthereumNaked
     {...props}
-    className="text-white"
+    className={classNames(props.className, 'text-white')}
     circle={<rect rx={64} width={128} height={128} fill="#627EEA" />}
   />
 )
diff --git a/packages/ui/src/icons/network/circle/GnosisCircle.tsx b/packages/ui/src/icons/network/circle/GnosisCircle.tsx
@@ -2,12 +2,13 @@ import * as React from 'react'
 
 import { GnosisNaked } from '../naked/GnosisNaked'
 
+import classNames from 'classnames'
 import { IconComponent } from '../../../types'
 
 export const GnosisCircle: IconComponent = (props) => (
   <GnosisNaked
     {...props}
-    className="text-gray-700"
+    className={classNames(props.className, 'text-gray-700')}
     circle={<rect width="128" height="128" fill="#d0e2ef" rx="64" />}
   />
 )
diff --git a/packages/ui/src/icons/network/circle/TelosCircle.tsx b/packages/ui/src/icons/network/circle/TelosCircle.tsx
@@ -2,12 +2,13 @@ import * as React from 'react'
 
 import { TelosNaked } from '../naked/TelosNaked'
 
+import classNames from 'classnames'
 import { IconComponent } from '../../../types'
 
 export const TelosCircle: IconComponent = (props) => (
   <TelosNaked
     {...props}
-    className="!text-white"
+    className={classNames(props.className, '!text-white')}
     circle={<rect width={128} height={128} rx={64} fill="#5613FF" />}
   />
 )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml