Merge branch 'develop' into staging

Author: miguelmota

Diff for: .github/workflows/publishable-packages.yml

@@ -15,8 +15,26 @@ on:
         value: ${{ jobs.publishable-packages.outputs.publishable-packages }}
 
 jobs:
+  check-env-files:
+    name: Check for .env files
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Check for .env files
+        id: check-env-files
+        run: |
+          echo "Checking for .env files recursively, excluding node_modules..."
+          if find . -path './node_modules' -prune -o -type f -name '*.env' -print | grep '.env'; then
+            echo "Error: .env files are detected in the repository. Aborting."
+            exit 1
+          fi
+        shell: bash
+
   publishable-packages:
     runs-on: ubuntu-latest
+    needs: check-env-files
     outputs:
       publishable-packages: ${{ steps.publishable-packages.outputs.publishable_packages }}
     steps:
@@ -39,32 +57,32 @@ jobs:
         # Extract changed directories from output, removing the 'package/' prefix
         # Example: packages/hop-node,packages/v2-explorer-backend,packages/frontend
         modified_dirs="${{ steps.modified-dirs.outputs.all_changed_files }}"
-    
+
         # Read input package names, compare with modified directories
         # Example: packages/hop-node,packages/v2-explorer-backend
         IFS=":"
         read -a input_packages <<< "${{ inputs.package-names }}"
         publishable_packages=""
-    
+
         for package in "${input_packages[@]}"; do
           package_path="packages/$package"
-    
+
           # Skip packages not modified
           if [[ $modified_dirs != *"$package_path"* ]]; then
             continue
           fi
-    
+
           # On the production branch, publish only if there's a version change
           if [ "${{ github.ref_name }}" == "production" ]; then
             version_changed=$(git diff HEAD^ HEAD -- "${package_path}/package.json" | grep '"version":' || true)
             if [ -z "$version_changed" ]; then
               continue
             fi
           fi
-    
+
           publishable_packages+="$package,"
         done
-    
+
         # Strip the trailing comma
         # Example: packages/hop-node,packages/v2-explorer-backend
         publishable_packages="${publishable_packages%,}"

Diff for: packages/explorer-backend/scripts/refresh_pending.js

@@ -1,26 +1,32 @@
+require('dotenv').config()
 const wait = require('wait')
 
+const rateLimitToken = process.env.RATE_LIMIT_TOKEN
+const token = process.argv[2] ?? ''
+console.log('rateLimitToken set', !!rateLimitToken)
+console.log('token', token)
+
 async function main () {
   let page = 0
   while (true) {
     page++
     if (page === 2) {
       break
     }
-    const url0 = `https://explorer-api.hop.exchange/v1/transfers?page=${page}&bonded=pending`
+    const url0 = `https://explorer-api.hop.exchange/v1/transfers?page=${page}&bonded=pending&rate_limit_token=${rateLimitToken}&token=${token}`
     const response0 = await fetch(url0)
     const json0 = await response0.json()
     const transferIds = json0.data.map(transfer => transfer.transferId)
     console.log(transferIds.length)
     for (const transferId of transferIds) {
-      const url = `https://explorer-api.hop.exchange/v1/transfers?transferId=${transferId}&refresh=true`
+      const url = `https://explorer-api.hop.exchange/v1/transfers?transferId=${transferId}&refresh=true&rate_limit_token=${rateLimitToken}`
 
       console.log(url)
 
       const response = await fetch(url)
       const data = await response.json()
       // console.log(data)
-      await wait(3000)
+      await wait(100)
     }
   }
 }

Diff for: packages/explorer-backend/scripts/select_transferIds_console.js

@@ -0,0 +1,3 @@
+copy(Array.from(document.querySelectorAll('.transferId a'))
+    .map(element => element.getAttribute('data-clipboard-text')).filter(Boolean)
+    .join(','))

Diff for: packages/explorer-backend/src/TransferStats.ts

@@ -167,6 +167,7 @@ export class TransferStats {
 
         this.trackRecentTransferBonds({ lookbackMinutes: 30, pollIntervalMs: 2 * 60 * 1000 }),
         this.trackRecentTransferBonds({ lookbackMinutes: 240, pollIntervalMs: 60 * 60 * 1000, initialDelayMs: 20 * 60 * 1000 }),
+        this.trackRecentTransferBonds({ lookbackMinutes: 960, pollIntervalMs: 2 * 60 * 60 * 1000, initialDelayMs: 30 * 60 * 1000 }),
 
         this.trackDailyTransfers({ days: this.days, offsetDays: this.offsetDays })
       ]

Diff for: packages/explorer-backend/src/config.ts

@@ -10,6 +10,7 @@ export const isGoerli = network === 'goerli'
 export const port = Number(process.env.PORT || 8000)
 export const ipRateLimitReqPerSec = Number(process.env.IP_RATE_LIMIT_REQ_PER_SEC || 100)
 export const ipRateLimitWindowMs = Number(process.env.IP_RATE_LIMIT_WINDOW_MS || 1 * 1000)
+export const rateLimitToken = process.env.RATE_LIMIT_TOKEN || ''
 export const postgresConfig = {
   user: process.env.POSTGRES_USER,
   host: process.env.POSTGRES_HOST,

Diff for: packages/explorer-backend/src/rateLimit.ts

@@ -1,5 +1,5 @@
 import rateLimit from 'express-rate-limit'
-import { ipRateLimitReqPerSec, ipRateLimitWindowMs } from './config'
+import { ipRateLimitReqPerSec, ipRateLimitWindowMs, rateLimitToken } from './config'
 
 export const ipRateLimitMiddleware = rateLimit({
   windowMs: ipRateLimitWindowMs,
@@ -8,5 +8,16 @@ export const ipRateLimitMiddleware = rateLimit({
   keyGenerator: (req: any) => {
     // console.log('ip:', req.ip, req.url)
     return req.ip
+  },
+  skip: (req) => {
+    if (!rateLimitToken) {
+      return false
+    }
+
+    if (!req.query.rate_limit_token) {
+      return false
+    }
+
+    return req.query.rate_limit_token === rateLimitToken
   }
 })

Diff for: packages/explorer-backend/src/theGraph.ts

@@ -589,7 +589,7 @@ export async function fetchTransferFromL1CompletedsByRecipient (chain: string, r
     const data = await queryFetch(url, query, {
       recipient
     })
-    let events = data.events || []
+    const events = data.events || []
 
     return events
   } catch (err) {

Diff for: packages/explorer-backend/src/utils/getSlugFromChainId.ts

@@ -1,4 +1,4 @@
-import { network, networks } from '../config'
+import { networks } from '../config'
 
 const getSlugFromChainIdMap:any = {}
 

Diff for: packages/explorer-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hop-protocol/explorer-frontend",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "author": "Authereum Labs, Inc.",
   "license": "MIT",
   "private": true,

Diff for: packages/explorer-frontend/pages/index.tsx

@@ -1353,7 +1353,7 @@ const Index: NextPage = (props: any) => {
                               </Tooltip>
                               {(x.timestamp < (Date.now()/1000) - (24 * 60 * 60)) && (
                                 <Box ml={2}>
-                                <Link href={`${appBaseUrl}/#/withdraw?transferId=${x.transferId}`} target="_blank" rel="noreferrer noopener">Withdraw</Link>
+                                <Link href={`${appBaseUrl}/#/withdraw?transferId=${x.token === 'USDC' ? x.transactionHash : x.transferId}`} target="_blank" rel="noreferrer noopener">Withdraw</Link>
                                 </Box>
                               )}
                             </span>
@@ -1364,7 +1364,7 @@ const Index: NextPage = (props: any) => {
                                 <span>Pending</span>
                                 {(x.timestamp < (Date.now()/1000) - (24 * 60 * 60)) && (
                                   <Box ml={2}>
-                                  <Link href={`${appBaseUrl}/#/withdraw?transferId=${x.transferId}`} target="_blank" rel="noreferrer noopener">Withdraw ↗</Link>
+                                  <Link href={`${appBaseUrl}/#/withdraw?transferId=${x.token === 'USDC' ? x.transactionHash : x.transferId}`} target="_blank" rel="noreferrer noopener">Withdraw ↗</Link>
                                   </Box>
                                 )}
                               </span>

Diff for: packages/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hop-protocol/frontend",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "Hop Protocol Frontend",
   "author": "Authereum Labs, Inc.",
   "license": "MIT",

Diff for: packages/frontend/public/commit-transfers/index.html

@@ -0,0 +1 @@
+<script>window.location.href='../#/commit-transfers'+window.location.search</script>

Diff for: packages/frontend/src/AppRoutes.tsx

@@ -12,6 +12,7 @@ const Convert = lazy(() => import(/* webpackChunkName: "Convert" */ '#pages/Conv
 const Stats = lazy(() => import(/* webpackChunkName: "Stats" */ '#pages/Stats/index.js'))
 const Withdraw = lazy(() => import(/* webpackChunkName: "Withdraw" */ '#pages/Withdraw/index.js'))
 const Relay = lazy(() => import(/* webpackChunkName: "Relay" */ '#pages/Relay/index.js'))
+const CommitTransfers = lazy(() => import(/* webpackChunkName: "CommitTransfers" */ '#pages/CommitTransfers/index.js'))
 const Faucet = lazy(() => import(/* webpackChunkName: "Faucet" */ '#pages/Faucet/index.js'))
 const Health = lazy(() => import(/* webpackChunkName: "Health" */ '#pages/Health/index.js'))
 const Rewards = lazy(() => import(/* webpackChunkName: "Rewards" */ '#pages/Rewards/index.js'))
@@ -61,6 +62,7 @@ const AppRoutes: FC = () => {
                   <Route path="/rewards" element={<Rewards />} />
                   <Route path="/withdraw" element={<Withdraw />} />
                   <Route path="/relay" element={<Relay />} />
+                  <Route path="/commit-transfers" element={<CommitTransfers />} />
                   <Route path="/health" element={<Health />} />
                   <Route path="/faucet" element={<Faucet />} />
                   <Route path="/claim/*" element={<Claim />} />