Merge branch 'staging' of github.com:hop-protocol/hop into production

Author: shanefontaine

.github/workflows/ui-deploy.yml

@@ -68,6 +68,8 @@ jobs:
           REACT_APP_BLOCKLIST_ENABLED: ${{ vars.REACT_APP_BLOCKLIST_ENABLED }}
           REACT_APP_BNC_DAPP_ID: ${{ secrets.REACT_APP_BNC_DAPP_ID }}
           REACT_APP_GIT_SHA: ${{ github.sha }}
+          REACT_APP_ENABLE_SOCKET: ${{ vars.REACT_APP_ENABLE_SOCKET }}
+          REACT_APP_ENABLE_LIFI: ${{ vars.REACT_APP_ENABLE_LIFI }}
         run: pnpm --filter frontend... build
 
       - name: Write commit file

README.md

@@ -30,6 +30,12 @@ pnpm install
 pnpm build
 ```
 
+Clean node_modules and build artifacts
+
+```sh
+pnpm clean
+```
+
 #### Guidelines for using PNPM workspaces
 
 All commands should be run from the root of the monorepo.

packages/api/README.md

@@ -116,19 +116,19 @@ Example response
 Install dependencies
 
 ```sh
-npm install
+pnpm install
 ```
 
 Start server
 
 ```sh
-npm start
+pnpm start
 ```
 
 Build
 
 ```sh
-npm run build
+pnpm run build
 ```
 
 Available environment variables:

packages/explorer-backend/README.md

@@ -4,20 +4,37 @@
 
 ## Development
 
+Install
+
+```sh
+pnpm install
+```
+
+Watch
+
 ```sh
-npm run dev
+pnpm run dev
 ```
 
 Serve
 
+First run Postgres in seperate terminal:
+
+```sh
+cd scripts/
+./postgres_dev.sh
+```
+
+Then run the server
+
 ```sh
-npm start
+pnpm start
 ```
 
 Build
 
 ```sh
-npm run build
+pnpm run build
 ```
 
 Docker build

packages/explorer-frontend/README.md

@@ -8,25 +8,47 @@ This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next
 
 [https://explorer.hop.exchange/](https://explorer.hop.exchange/)
 
-## Environment variables
+## Getting Started
+
+First, run the development server:
+
+```bash
+pnpm run dev
+```
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+## Development
+
+Install
 
 ```sh
-# (optional) specify tokens/chains to display on dropdowns
-NEXT_PUBLIC_ENABLED_TOKENS=USDC,USDT,DAI,MATIC,ETH,WBTC,HOP,SNX,sUSD,rETH,MAGIC
-NEXT_PUBLIC_ENABLED_CHAINS=ethereum,gnosis,polygon,arbitrum,optimism,nova,base,linea
+pnpm install
 ```
 
-## Getting Started
+Run dev server, connects to live API
 
-First, run the development server:
+```bash
+pnpm run dev
+```
+
+Run dev server, connects to local API from explorer-backend repo
 
 ```bash
-npm run dev
-# or
-yarn dev
+pnpm run dev:local
 ```
 
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+Build
+
+```sh
+pnpm build
+```
+
+Run built server
+
+```sh
+pnpm start
+```
 
 You can start editing the page by modifying `pages/index.tsx`. The page auto-updates as you edit the file.
 

packages/frontend/README.md

@@ -31,7 +31,11 @@ PUBLIC_URL=.
 REACT_APP_IPFS_BUILD=true
 REACT_APP_ENABLED_CHAINS=ethereum,polygon,gnosis,optimism,arbitrum
 REACT_APP_ENABLED_TOKENS=ETH,USDC,USDT,DAI
+REACT_APP_DEPRECATED_POOLS=USDC.e,MAGIC
 REACT_APP_NETWORK=goerli
+
+REACT_APP_ENABLE_SOCKET=false
+REACT_APP_ENABLE_LIFI=false
 ```
 
 To disable certain routes, use this environment variable, for example this disables gnosis→anyDestination anyToken route and optimism→arbitrum USDC route:
@@ -46,12 +50,14 @@ Build distribution build:
 pnpm build
 ```
 
+Allowed environment variable need be configured in `vite.config.ts` and in at the root `.github/workflows/ui-deploy.yml` for the build to work correctly.
+
 ## Deployments
 
 | Branch       | Network | URL                                                  | Release  | Description                                 |
 | ------------ | ------- | ---------------------------------------------------- | -------- | ------------------------------------------- |
 | `production` | mainnet | [app.hop.exchange](https://app.hop.exchange)         | Stable   | Production mainnet environment              |
-| `mainnet`    | mainnet | [mainnet.hop.exchange](https://mainnet.hop.exchange) | Beta     | Mainnet pre-release environment             |
-| `preprod`    | mainnet | [preprod.hop.exchange](https://preprod.hop.exchange) | Beta     | Alternative mainnet pre-release environment |
-| `develop`    | mainnet | [dev.hop.exchange](https://dev.hop.exchange)         | Unstable | Unstable mainnet staging environment        |
-| `goerli`     | kovan   | [goerli.hop.exchange](https://goerli.hop.exchange)   | Stable   | Goerli staging environment                  |
+| `staging`    | mainnet | [mainnet.hop.exchange](https://mainnet.hop.exchange) | Beta     | Mainnet pre-release environment             |
+| (deprecated) `preprod`    | mainnet | [preprod.hop.exchange](https://preprod.hop.exchange) | Beta     | Alternative mainnet pre-release environment |
+| (deprecated) `develop`    | mainnet | [dev.hop.exchange](https://dev.hop.exchange)         | Unstable | Unstable mainnet staging environment        |
+| (deprecated) `goerli`     | goerli | [goerli.hop.exchange](https://goerli.hop.exchange)   | Stable   | Goerli staging environment                  |

packages/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hop-protocol/frontend",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "Hop Protocol Frontend",
   "author": "Authereum Labs, Inc.",
   "license": "MIT",
@@ -20,13 +20,19 @@
     "deploy:local": "git stash && yarn build && yarn deploy"
   },
   "dependencies": {
+    "@arbitrum/sdk": "4.0.3",
+    "@consensys/linea-sdk": "0.1.6",
     "@emotion/react": "11.10.5",
     "@emotion/styled": "11.11.0",
+    "@eth-optimism/sdk": "3.3.2",
     "@ethersproject/abi": "5.7.0",
     "@ethersproject/providers": "5.7.2",
     "@gnosis.pm/safe-apps-react-sdk": "4.6.2",
     "@gnosis.pm/safe-apps-sdk": "7.8.0",
     "@hop-protocol/sdk": "workspace:*",
+    "@maticnetwork/maticjs": "3.5.0",
+    "@maticnetwork/maticjs-ethers": "1.0.3",
+    "@maticnetwork/maticjs-pos-zkevm": "npm:@maticnetwork/[email protected]",
     "@mui/icons-material": "5.15.6",
     "@mui/lab": "5.0.0-alpha.162",
     "@mui/material": "5.15.6",
@@ -69,13 +75,7 @@
     "use-async-memo": "1.2.4",
     "usehooks-ts": "2.9.1",
     "vite-plugin-svgr": "4.2.0",
-    "web-vitals": "0.2.4",
-    "@arbitrum/sdk": "3.4.1",
-    "@eth-optimism/sdk": "3.3.2",
-    "@maticnetwork/maticjs": "3.5.0",
-    "@maticnetwork/maticjs-ethers": "1.0.3",
-    "@maticnetwork/maticjs-pos-zkevm": "npm:@maticnetwork/[email protected]",
-    "@consensys/linea-sdk": "0.1.6"
+    "web-vitals": "0.2.4"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "5.17.0",

packages/frontend/src/components/Header/TxPill.tsx

@@ -1,5 +1,4 @@
 import Box from '@mui/material/Box'
-import CircularProgress from '@mui/material/CircularProgress'
 import React, { useEffect, useState } from 'react'
 import { Circle } from '#components/ui/Circle.js'
 import { Icon } from '#components/ui/Icon.js'
@@ -28,6 +27,8 @@ const useStyles = makeStyles(theme => ({
   },
 }))
 
+const showPendingTxs = true
+
 export const TxPill = () => {
   const { accountDetails, txHistory } = useApp()
   const transactions = txHistory?.transactions
@@ -52,9 +53,9 @@ export const TxPill = () => {
 
   return (
     <div className={styles.root}>
-      {numPendingTxs > 0 ? (
+      {showPendingTxs && numPendingTxs > 0 ? (
         <StyledButton flat onClick={handleClick}>
-          {numPendingTxs > 3 ? "3+" : numPendingTxs} Pending <CircularProgress size={18} className={styles.spinner} />
+          {numPendingTxs > 3 ? "3+" : numPendingTxs} Pending
         </StyledButton>
       ) : (
         <StyledButton

packages/frontend/src/config/config.ts

@@ -120,3 +120,6 @@ for (const chain in WaitConfirmations) {
 export { rpcProviderOverrides }
 
 export const walletConnectProjectId = '651b16cdb6b0f490f68e0c4c5f5c35ce' // This is is meant to be public
+
+export const enableSocket = process.env.REACT_APP_ENABLE_SOCKET === 'true'
+export const enableLifi = process.env.REACT_APP_ENABLE_LIFI === 'true'

packages/frontend/src/contexts/AppContext/AppContext.tsx

@@ -9,7 +9,7 @@ import useTxHistory, { TxHistory } from '#contexts/AppContext/useTxHistory.js'
 import { AccountDetails, useAccountDetails } from '#contexts/AppContext/useAccountDetails.js'
 import { Hop, HopBridge } from '@hop-protocol/sdk'
 import { TxConfirm, useTxConfirm } from '#contexts/AppContext/useTxConfirm.js'
-import { blocklist, reactAppNetwork, rpcProviderOverrides } from '#config/index.js'
+import { blocklist, reactAppNetwork, rpcProviderOverrides, enableSocket, enableLifi } from '#config/index.js'
 import { allNetworks as networks } from '#config/networks.js'
 import { useTheme } from '@mui/styles'
 import { useWeb3Context } from '#contexts/Web3Context.js'
@@ -41,7 +41,9 @@ const AppContextProvider: FC<{ children: ReactNode }> = ({ children }) => {
       blocklist,
       chainProviders: {
         ...rpcProviderOverrides,
-      }
+      },
+      enableSocket,
+      enableLifi
     })
     return hop
   }, [provider])