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

sushi-labs · Aug 2, 2024 · 794fd51 · 794fd51
2 parents eaafa66 + 96dea53
commit 794fd51
Show file tree

Hide file tree

Showing 604 changed files with 32,749 additions and 28,177 deletions.
diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
@@ -7,7 +7,7 @@ runs:
     - name: Set up pnpm
       uses: pnpm/action-setup@v4
       with:
-        version: 8.15.8
+        version: 9.4.0
 
     - name: Set up node
       uses: actions/setup-node@v4

diff --git a/.github/workflows/apps-web-e2e.yml b/.github/workflows/apps-web-e2e.yml
@@ -33,7 +33,7 @@ jobs:
         block-number: [55359656]
         chain-id: [137]
         node-version: [20]
-        pnpm-version: [8.15.8]
+        pnpm-version: [9.4.0]
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
@@ -72,7 +72,6 @@ jobs:
           EDGE_CONFIG: ${{ secrets.EDGE_CONFIG }}
           NEXT_PUBLIC_APP_ENV: 'test'
           NEXT_PUBLIC_CHAIN_ID: ${{ matrix.chain-id }}
-          NEXT_PUBLIC_API_BASE_URL: 'https://mock-swap-api'
           NEXT_TELEMETRY_DISABLED: 1
 
       - name: Upload test results

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,12 +28,12 @@ jobs:
 
       - uses: pnpm/action-setup@v4
         with:
-          version: 8.15.8
+          version: 9.4.0
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           cache: 'pnpm'
 
       - name: Install dependencies

diff --git a/apis/extractor/package.json b/apis/extractor/package.json
@@ -30,14 +30,14 @@
   "dependencies": {
     "@sentry/node": "7.110.0",
     "@sushiswap/extractor": "workspace:*",
-    "@wagmi/core": "2.10.6",
+    "@wagmi/core": "2.13.1",
     "cors": "2.8.5",
     "dotenv": "16.3.1",
     "express": "4.18.2",
     "sushi": "workspace:*",
-    "viem": "2.10.11",
-    "wagmi": "2.9.12",
-    "zod": "3.21.4"
+    "viem": "2.18.6",
+    "wagmi": "2.12.2",
+    "zod": "3.23.8"
   },
   "devDependencies": {
     "@tsconfig/node20": "20.1.4",

diff --git a/apis/router/package.json b/apis/router/package.json
@@ -31,14 +31,14 @@
   "dependencies": {
     "@sentry/node": "7.110.0",
     "@sushiswap/extractor": "workspace:*",
-    "@wagmi/core": "2.10.6",
+    "@wagmi/core": "2.13.1",
     "cors": "2.8.5",
     "dotenv": "16.3.1",
     "express": "4.18.2",
     "sushi": "workspace:*",
-    "viem": "2.10.11",
-    "wagmi": "2.9.12",
-    "zod": "3.21.4"
+    "viem": "2.18.6",
+    "wagmi": "2.12.2",
+    "zod": "3.23.8"
   },
   "devDependencies": {
     "@tsconfig/node20": "20.1.4",

diff --git a/apis/token-list/package.json b/apis/token-list/package.json
@@ -16,6 +16,6 @@
     "@tsconfig/esm": "1.0.4",
     "@tsconfig/strictest": "2.0.2",
     "typescript": "5.4.5",
-    "vercel": "32.5.3"
+    "vercel": "35.2.1"
   }
 }
diff --git a/apis/tokens/lib/api.ts b/apis/tokens/lib/api.ts
@@ -18,7 +18,6 @@ export async function getToken(chainId: number, address: string) {
   //     name: tokenFromList.name,
   //     symbol: tokenFromList.symbol,
   //     decimals: tokenFromList.decimals,
-  //     isCommon: false,
   //   }
   // }
 
@@ -31,8 +30,6 @@ export async function getToken(chainId: number, address: string) {
         name: true,
         symbol: true,
         decimals: true,
-        isCommon: true,
-        isFeeOnTransfer: true,
         status: true,
       },
       where: {
@@ -57,7 +54,6 @@ export async function getToken(chainId: number, address: string) {
         name: tokenFromContract.name,
         symbol: tokenFromContract.symbol,
         decimals: tokenFromContract.decimals,
-        isCommon: false,
       }
     } else {
       throw new Error('Token not found')
@@ -108,8 +104,6 @@ export async function getTokensByChainId(chainId: number) {
       name: true,
       symbol: true,
       decimals: true,
-      isCommon: true,
-      isFeeOnTransfer: true,
     },
     where: {
       AND: {
@@ -132,8 +126,6 @@ export async function getTokens() {
       name: true,
       symbol: true,
       decimals: true,
-      isCommon: true,
-      isFeeOnTransfer: true,
     },
     where: {
       AND: {
@@ -155,8 +147,6 @@ export async function getPopularTokens(chainId: number) {
       name: true,
       symbol: true,
       decimals: true,
-      isCommon: true,
-      isFeeOnTransfer: true,
       pools0: {
         select: {
           liquidityUSD: true,
@@ -197,8 +187,6 @@ export async function getPopularTokens(chainId: number) {
         name: token.name,
         symbol: token.symbol,
         decimals: token.decimals,
-        isCommon: token.isCommon,
-        isFeeOnTransfer: token.isFeeOnTransfer,
         liquidityUSD: Number(liquidity.toFixed(0)),
       }
     })
@@ -218,12 +206,9 @@ export async function getCommonTokens(chainId: number) {
       name: true,
       symbol: true,
       decimals: true,
-      isCommon: true,
-      isFeeOnTransfer: true,
     },
     where: {
       chainId,
-      isCommon: true,
       status: 'APPROVED',
     },
   })
@@ -242,8 +227,6 @@ export async function getTokensByAddress(address: string) {
       name: true,
       symbol: true,
       decimals: true,
-      isCommon: true,
-      isFeeOnTransfer: true,
       status: true,
     },
     where: {

diff --git a/apis/tokens/package.json b/apis/tokens/package.json
@@ -30,19 +30,19 @@
     "@sushiswap/wagmi-config": "workspace:*",
     "@upstash/redis": "1.22.1",
     "@vercel/node": "3.0.9",
-    "@wagmi/core": "2.10.6",
+    "@wagmi/core": "2.13.1",
     "drizzle-orm": "^0.29.5",
     "postgres": "^3.4.3",
     "sushi": "workspace:*",
-    "viem": "2.10.11",
-    "zod": "3.21.4"
+    "viem": "2.18.6",
+    "zod": "3.23.8"
   },
   "devDependencies": {
     "@sushiswap/jest-config": "workspace:*",
     "@tsconfig/esm": "1.0.4",
     "@tsconfig/strictest": "2.0.2",
     "@types/node": "20",
     "typescript": "5.4.5",
-    "vercel": "32.5.3"
+    "vercel": "35.2.1"
   }
 }
diff --git a/apis/tokens/tsconfig.json b/apis/tokens/tsconfig.json
@@ -9,4 +9,4 @@
     "module": "es2022",
     "moduleResolution": "bundler"
   }
-}
+}
diff --git a/apps/aptos/.env.example b/apps/aptos/.env.example
diff --git a/apps/aptos/.eslintrc.js b/apps/aptos/.eslintrc.js
diff --git a/apps/aptos/README.md b/apps/aptos/README.md
diff --git a/apps/aptos/app/layout.tsx b/apps/aptos/app/layout.tsx
diff --git a/apps/aptos/app/swap/providers.tsx b/apps/aptos/app/swap/providers.tsx
diff --git a/apps/aptos/next.config.mjs b/apps/aptos/next.config.mjs
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ @@
         "module": "es2022",
         "moduleResolution": "bundler"
       }
-    }
+    }