SAVEPOINT

.github/workflows/e2e.yml

@@ -13,11 +13,10 @@ on:
   workflow_dispatch:
 
 env:
-  CI: true
   NODE_OPTIONS: --max-old-space-size=8192
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-  TURBO_FORCE: false
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -48,8 +47,6 @@ jobs:
         env:
           ANVIL_FORK_URL: ${{ secrets.ANVIL_FORK_URL }}
           ANVIL_BLOCK_NUMBER: ${{ matrix.block-number }}
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          REDIS_URL: ${{ secrets.REDIS_URL }}
           EDGE_CONFIG: ${{ secrets.EDGE_CONFIG }}
           NEXT_PUBLIC_APP_ENV: 'test'
           NEXT_PUBLIC_CHAIN_ID: ${{ matrix.chain-id }}

.github/workflows/verify.yml

@@ -3,6 +3,7 @@ on:
   workflow_call:
   workflow_dispatch:
 env:
+  NODE_OPTIONS: --max-old-space-size=8192
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
 

.gitignore

@@ -28,6 +28,9 @@ yarn-debug.log*
 yarn-error.log*
 .pnpm-debug.log*
 
+# env
+.env
+
 # local env files
 .env.local
 .env.development.local
@@ -43,74 +46,28 @@ yarn-error.log*
 # vercel
 .vercel
 
-# env
-.env
-skaffold.env
-
-# mesh
-.mesh
-
-# graphql
-.graphclient
-
-# typechain
-typechain
-
-# exports
-exports
-
-# cache
-cache
-
 # generated
 generated
 
-# artifacts
-artifacts
-
-# artifacts zk
-artifacts-zk
-
-# cache zk
-cache-zk
-
-# workers
-**/public/sw.js
-**/public/workbox-*.js
-**/public/worker-*.js
-**/public/sw.js.map
-**/public/workbox-*.js.map
-**/public/worker-*.js.map
-
-# prisma
-
-# screenshots
-screenshots
-
 # playwright
 playwright-report
 test-results
 
 # Sentry
 .sentryclirc
 
-test-results/
-results/
-
 # typescript
 *.tsbuildinfo
 next-env.d.ts
 
 # storybook
 storybook-static
 
-# tines snapshots
-test/snapshots/
-
 # Sentry Config File
 .env.sentry-build-plugin
 
 # npm lock file (we use pnpm)
 package-lock.json
+
 # yarn lock file (we use pnpm)
 yarn.lock

.vscode/settings.json

@@ -32,8 +32,6 @@
     "editor.defaultFormatter": "biomejs.biome",
     "editor.formatOnSave": true
   },
-  "typescript.tsdk": "apps/web/node_modules/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true,
   "[typescript]": {
     "editor.defaultFormatter": "biomejs.biome",
     "editor.formatOnSave": true
@@ -50,9 +48,6 @@
     "editor.defaultFormatter": "biomejs.biome",
     "editor.formatOnSave": true
   },
-  "[solidity]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
   "yaml.schemas": {
     "https://www.artillery.io/schema.json": [
       "file:///home/feedme/sushi/sushiswap/apis/router/test/load.yml"

apps/README.md

@@ -1,3 +1,8 @@
 # Apps
 
-...
+The `apps` directory contains all the code for the different applications that are part of the project. Each application is a separate directory with its own `README.md` file.
+
+## [Web](web/README.md)
+## [Mobile](mobile/README.md)
+## [Extension](extension/README.md)
+## [Desktop](desktop/README.md)

apps/web/next.config.mjs

@@ -1,8 +1,7 @@
+import withBundleAnalyzer from '@next/bundle-analyzer'
 import { withSentryConfig } from '@sentry/nextjs'
 import defaultNextConfig from '@sushiswap/nextjs-config'
-import { withAxiom } from 'next-axiom'
 
-import withBundleAnalyzer from '@next/bundle-analyzer'
 const bundleAnalyzer = withBundleAnalyzer({
   enabled: false && process.env.NODE_ENV !== 'development',
 })
@@ -95,15 +94,12 @@ const nextConfig = bundleAnalyzer({
   },
 })
 
-export default withAxiom(withSentryConfig(nextConfig), {
+export default withSentryConfig(nextConfig, {
   // For all available options, see:
   // https://github.com/getsentry/sentry-webpack-plugin#options
 
-  org: process.env.SENTRY_ORG,
-  project: process.env.SENTRY_PROJECT,
-
-  // An auth token is required for uploading source maps.
-  authToken: process.env.SENTRY_AUTH_TOKEN,
+  org: 'sushi-j9',
+  project: 'web',
 
   // Only print logs for uploading source maps in CI
   silent: !process.env.CI,
@@ -114,6 +110,11 @@ export default withAxiom(withSentryConfig(nextConfig), {
   // Upload a larger set of source maps for prettier stack traces (increases build time)
   widenClientFileUpload: true,
 
+  // Automatically annotate React components to show their full name in breadcrumbs and session replay
+  reactComponentAnnotation: {
+    enabled: true,
+  },
+
   // Route browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers.
   // This can increase your server load as well as your hosting bill.
   // Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client-
@@ -124,15 +125,14 @@ export default withAxiom(withSentryConfig(nextConfig), {
   hideSourceMaps: true,
 
   // Automatically tree-shake Sentry logger statements to reduce bundle size
-  disableLogger: process.NODE_ENV === 'production',
+  disableLogger: true,
 
   // Enables automatic instrumentation of Vercel Cron Monitors. (Does not yet work with App Router route handlers.)
   // See the following for more information:
   // https://docs.sentry.io/product/crons/
   // https://vercel.com/docs/cron-jobs
   automaticVercelMonitors: true,
 
-  unstable_sentryWebpackPluginOptions: {
-    applicationKey: 'web',
-  },
+  // Disables Sentry's telemetry features
+  telemetry: false,
 })

apps/web/package.json

@@ -74,7 +74,6 @@
     "ms": "2.1.3",
     "nanoid": "4.0.0",
     "next": "14.2.11",
-    "next-axiom": "1.5.0",
     "next-themes": "0.2.1",
     "octokit": "2.1.0",
     "petra-plugin-wallet-adapter": "0.4.5",

apps/web/sentry.client.config.ts

@@ -5,41 +5,11 @@
 import * as Sentry from '@sentry/nextjs'
 
 Sentry.init({
-  dsn: 'https://28c197e66594eea8cf3014697e6fc0d3@o960777.ingest.us.sentry.io/4507941516410880',
+  dsn: 'https://76d7b33cc5bf60055e9ecc86faab0c64@o960777.ingest.us.sentry.io/4508045239320576',
 
-  enabled: process.env.NEXT_PUBLIC_APP_ENV !== 'test',
-
-  // Adjust this value in production, or use tracesSampler for greater control
+  // Define how likely traces are sampled. Adjust this value in production, or use tracesSampler for greater control.
   tracesSampleRate: 1,
 
   // Setting this option to true will print useful information to the console while you're setting up Sentry.
   debug: false,
-
-  replaysOnErrorSampleRate: 1.0,
-
-  // This sets the sample rate to be 10%. You may want this to be 100% while
-  // in development and sample at a lower rate in production
-  replaysSessionSampleRate: 0.1,
-
-  // You can remove this option if you're not planning to use the Sentry Session Replay feature:
-  integrations: [
-    Sentry.thirdPartyErrorFilterIntegration({
-      // Specify the application keys that you specified in the Sentry bundler plugin
-      filterKeys: ['web'],
-
-      // Defines how to handle errors that contain third party stack frames.
-      // Possible values are:
-      // - 'drop-error-if-contains-third-party-frames'
-      // - 'drop-error-if-exclusively-contains-third-party-frames'
-      // - 'apply-tag-if-contains-third-party-frames'
-      // - 'apply-tag-if-exclusively-contains-third-party-frames'
-      behaviour: 'apply-tag-if-contains-third-party-frames',
-    }),
-    Sentry.replayIntegration({
-      // Additional Replay configuration goes in here, for example:
-      maskAllText: false,
-      maskAllInputs: false,
-      blockAllMedia: false,
-    }),
-  ],
 })

apps/web/sentry.edge.config.ts

@@ -6,11 +6,9 @@
 import * as Sentry from '@sentry/nextjs'
 
 Sentry.init({
-  dsn: 'https://28c197e66594eea8cf3014697e6fc0d3@o960777.ingest.us.sentry.io/4507941516410880',
+  dsn: 'https://76d7b33cc5bf60055e9ecc86faab0c64@o960777.ingest.us.sentry.io/4508045239320576',
 
-  enabled: process.env.NEXT_PUBLIC_APP_ENV !== 'test',
-
-  // Adjust this value in production, or use tracesSampler for greater control
+  // Define how likely traces are sampled. Adjust this value in production, or use tracesSampler for greater control.
   tracesSampleRate: 1,
 
   // Setting this option to true will print useful information to the console while you're setting up Sentry.

apps/web/sentry.server.config.ts

@@ -5,16 +5,11 @@
 import * as Sentry from '@sentry/nextjs'
 
 Sentry.init({
-  dsn: 'https://28c197e66594eea8cf3014697e6fc0d3@o960777.ingest.us.sentry.io/4507941516410880',
+  dsn: 'https://76d7b33cc5bf60055e9ecc86faab0c64@o960777.ingest.us.sentry.io/4508045239320576',
 
-  enabled: process.env.NEXT_PUBLIC_APP_ENV !== 'test',
-
-  // Adjust this value in production, or use tracesSampler for greater control
+  // Define how likely traces are sampled. Adjust this value in production, or use tracesSampler for greater control.
   tracesSampleRate: 1,
 
   // Setting this option to true will print useful information to the console while you're setting up Sentry.
   debug: false,
-
-  // Uncomment the line below to enable Spotlight (https://spotlightjs.com)
-  // spotlight: process.env.NODE_ENV === 'development',
 })

apps/web/src/app/(evm)/(trade)/error.tsx

@@ -7,25 +7,16 @@ import {
   classNames,
   typographyVariants,
 } from '@sushiswap/ui'
-
-import { useLogger } from 'next-axiom'
 import { useEffect } from 'react'
 
 export default function SwapError({
   error,
   reset,
 }: { error: Error & { digest?: string }; reset: () => void }) {
-  const log = useLogger()
-
   useEffect(() => {
     // Capture the error and send it to Sentry
     Sentry.captureException(error)
   }, [error])
-
-  useEffect(() => {
-    // Log the error to an error reporting service
-    log.error('swap page error', error)
-  }, [log, error])
   return (
     <>
       <h1

apps/web/src/app/(non-evm)/aptos/pool/ui/pools/tables/pools/cells/pool-name-cell.tsx

@@ -2,8 +2,8 @@ import { Badge, TooltipContent } from '@sushiswap/ui'
 import { Tooltip, TooltipProvider, TooltipTrigger } from '@sushiswap/ui'
 import { AptosCircle } from '@sushiswap/ui/icons/network/circle/AptosCircle'
 import React, { FC } from 'react'
-import { ProtocolBadge } from 'src/ui/pool/PoolNameCell'
-import { SushiSwapProtocol, formatNumber } from 'sushi'
+// import { ProtocolBadge } from 'src/ui/pool/PoolNameCell'
+import { formatNumber } from 'sushi'
 import { CurrencyIcon } from '~aptos/(common)/ui/currency/currency-icon'
 import { CurrencyIconList } from '~aptos/(common)/ui/currency/currency-icon-list'
 import { TopPool } from '~aptos/pool/lib/use-top-pools'

apps/web/src/app/api/sentry-example-api/route.ts

@@ -0,0 +1,10 @@
+import { NextResponse } from 'next/server'
+
+export const dynamic = 'force-dynamic'
+
+// A faulty API route to test Sentry's error monitoring
+export function GET() {
+  throw new Error('Sentry Example API Route Error')
+  // biome-ignore lint/correctness/noUnreachable: test route
+  return NextResponse.json({ data: 'Testing Sentry Error...' })
+}