Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add svg route #3424

Merged
merged 5 commits into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/rest-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@ethersproject/providers": "^5.7.2",
"@ethersproject/units": "5.7.0",
"@synapsecns/sdk-router": "^0.11.7",
"@synapsecns/synapse-constants": "^1.8.3",
"bignumber": "^1.1.0",
"dotenv": "^16.4.5",
"ethers": "5.7.2",
Expand All @@ -31,6 +32,7 @@
"http-proxy-middleware": "^3.0.3",
"jest": "^29.7.0",
"lodash": "^4.17.21",
"node-fetch": "^3.3.2",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider removing node-fetch dependency

Since the project requires Node.js >=18.17.0 (which has built-in fetch API), we could remove the node-fetch dependency and use the native fetch instead. This would reduce the package size and simplify dependencies.

-    "node-fetch": "^3.3.2",

"supertest": "^6.3.3",
"typescript": "^4.8.3",
"winston": "^3.14.2"
Expand Down
53 changes: 53 additions & 0 deletions packages/rest-api/src/routes/addressIconRoute.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import express from 'express'
import { BRIDGABLE_TOKENS, Token } from '@synapsecns/synapse-constants'
import fetch from 'cross-fetch'

Check failure on line 3 in packages/rest-api/src/routes/addressIconRoute.ts

View workflow job for this annotation

GitHub Actions / lint

'cross-fetch' should be listed in the project's dependencies. Run 'npm i -S cross-fetch' to add it

const router: express.Router = express.Router()

router.get('/:chainId/:address.svg', async (req, res) => {
const chainId = parseInt(req.params.chainId, 10)
const address = req.params.address.toLowerCase()
Comment on lines +7 to +9
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add input validation for chainId and address parameters

The current implementation lacks validation for:

  1. chainId (could be NaN)
  2. address format (should be a valid hex string)

This could lead to unnecessary processing of invalid requests.

 router.get('/:chainId/:address.svg', async (req, res) => {
   const chainId = parseInt(req.params.chainId, 10)
+  if (isNaN(chainId)) {
+    res.status(400).json({ error: 'Invalid chainId' })
+    return
+  }
   const address = req.params.address.toLowerCase()
+  if (!/^0x[a-f0-9]{40}$/i.test(address)) {
+    res.status(400).json({ error: 'Invalid address format' })
+    return
+  }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
router.get('/:chainId/:address.svg', async (req, res) => {
const chainId = parseInt(req.params.chainId, 10)
const address = req.params.address.toLowerCase()
router.get('/:chainId/:address.svg', async (req, res) => {
const chainId = parseInt(req.params.chainId, 10)
if (isNaN(chainId)) {
res.status(400).json({ error: 'Invalid chainId' })
return
}
const address = req.params.address.toLowerCase()
if (!/^0x[a-f0-9]{40}$/i.test(address)) {
res.status(400).json({ error: 'Invalid address format' })
return
}


// Find the token with matching address on the specified chain
const token = Object.values(BRIDGABLE_TOKENS[chainId] || []).find(
(t): t is Token =>
typeof t === 'object' &&
t !== null &&
'addresses' in t &&
Object.entries(t.addresses).some(([chain, addr]) => {
const matches =
parseInt(chain, 10) === chainId && addr.toLowerCase() === address
return matches
})
)
Comment on lines +11 to +22
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Extract token lookup logic and optimize performance

The token lookup logic is complex and could benefit from:

  1. Extraction into a separate function for better maintainability
  2. Direct object lookup instead of array operations
+const findToken = (chainId: number, address: string): Token | undefined => {
+  const chainTokens = BRIDGABLE_TOKENS[chainId]
+  if (!chainTokens) return undefined
+  
+  return Object.values(chainTokens).find(
+    (t): t is Token =>
+      typeof t === 'object' &&
+      t !== null &&
+      'addresses' in t &&
+      Object.entries(t.addresses).some(([chain, addr]) =>
+        parseInt(chain, 10) === chainId && addr.toLowerCase() === address
+      )
+  )
+}
+
 router.get('/:chainId/:address.svg', async (req, res) => {
   const chainId = parseInt(req.params.chainId, 10)
   const address = req.params.address.toLowerCase()

-  const token = Object.values(BRIDGABLE_TOKENS[chainId] || []).find(
-    (t): t is Token =>
-      typeof t === 'object' &&
-      t !== null &&
-      'addresses' in t &&
-      Object.entries(t.addresses).some(([chain, addr]) => {
-        const matches =
-          parseInt(chain, 10) === chainId && addr.toLowerCase() === address
-        return matches
-      })
-  )
+  const token = findToken(chainId, address)
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
// Find the token with matching address on the specified chain
const token = Object.values(BRIDGABLE_TOKENS[chainId] || []).find(
(t): t is Token =>
typeof t === 'object' &&
t !== null &&
'addresses' in t &&
Object.entries(t.addresses).some(([chain, addr]) => {
const matches =
parseInt(chain, 10) === chainId && addr.toLowerCase() === address
return matches
})
)
const findToken = (chainId: number, address: string): Token | undefined => {
const chainTokens = BRIDGABLE_TOKENS[chainId]
if (!chainTokens) return undefined
return Object.values(chainTokens).find(
(t): t is Token =>
typeof t === 'object' &&
t !== null &&
'addresses' in t &&
Object.entries(t.addresses).some(([chain, addr]) =>
parseInt(chain, 10) === chainId && addr.toLowerCase() === address
)
)
}
// Find the token with matching address on the specified chain
const token = findToken(chainId, address)


if (!token || !token.icon) {
console.log('Token not found or no icon:', { token })
res.status(404).json({ error: 'Token icon not found' })
return
}

try {
// Fetch the image from the URL
const response = await fetch(token.icon)
if (!response.ok) {
throw new Error(`Failed to fetch image: ${response.statusText}`)
}

const buffer = await response.arrayBuffer()

// Set cache headers (cache for 1 week)
res.set({
'Cache-Control': 'public, max-age=604800',
'Content-Type': response.headers.get('content-type') || 'image/svg+xml',
})

res.send(Buffer.from(buffer))
} catch (error) {
console.error('Error fetching token icon:', error)
res.status(500).json({ error: 'Failed to fetch token icon' })
}
return
})
Comment on lines +30 to +51
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add timeout and security measures for external requests

The external fetch operation needs additional safety measures:

  1. Request timeout
  2. URL validation
  3. Response size limits
+const isValidIconUrl = (url: string): boolean => {
+  try {
+    const parsed = new URL(url)
+    return ['http:', 'https:'].includes(parsed.protocol)
+  } catch {
+    return false
+  }
+}

 try {
+    if (!isValidIconUrl(token.icon)) {
+      throw new Error('Invalid icon URL')
+    }
+
+    const controller = new AbortController()
+    const timeout = setTimeout(() => controller.abort(), 5000)
+
-    const response = await fetch(token.icon)
+    const response = await fetch(token.icon, {
+      signal: controller.signal,
+      headers: {
+        'Accept': 'image/svg+xml,image/*'
+      }
+    })
+    clearTimeout(timeout)

     if (!response.ok) {
       throw new Error(`Failed to fetch image: ${response.statusText}`)
     }

+    const contentLength = response.headers.get('content-length')
+    if (contentLength && parseInt(contentLength, 10) > 1024 * 1024) {
+      throw new Error('Icon file too large')
+    }

     const buffer = await response.arrayBuffer()
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
try {
// Fetch the image from the URL
const response = await fetch(token.icon)
if (!response.ok) {
throw new Error(`Failed to fetch image: ${response.statusText}`)
}
const buffer = await response.arrayBuffer()
// Set cache headers (cache for 1 week)
res.set({
'Cache-Control': 'public, max-age=604800',
'Content-Type': response.headers.get('content-type') || 'image/svg+xml',
})
res.send(Buffer.from(buffer))
} catch (error) {
console.error('Error fetching token icon:', error)
res.status(500).json({ error: 'Failed to fetch token icon' })
}
return
})
try {
if (!isValidIconUrl(token.icon)) {
throw new Error('Invalid icon URL')
}
const controller = new AbortController()
const timeout = setTimeout(() => controller.abort(), 5000)
const response = await fetch(token.icon, {
signal: controller.signal,
headers: {
'Accept': 'image/svg+xml,image/*'
}
})
clearTimeout(timeout)
if (!response.ok) {
throw new Error(`Failed to fetch image: ${response.statusText}`)
}
const contentLength = response.headers.get('content-length')
if (contentLength && parseInt(contentLength, 10) > 1024 * 1024) {
throw new Error('Icon file too large')
}
const buffer = await response.arrayBuffer()
// Set cache headers (cache for 1 week)
res.set({
'Cache-Control': 'public, max-age=604800',
'Content-Type': response.headers.get('content-type') || 'image/svg+xml',
})
res.send(Buffer.from(buffer))
} catch (error) {
console.error('Error fetching token icon:', error)
res.status(500).json({ error: 'Failed to fetch token icon' })
}
return
})


export default router
44 changes: 44 additions & 0 deletions packages/rest-api/src/routes/chainIconRoute.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import express from 'express'
import { CHAINS, Chain } from '@synapsecns/synapse-constants'
import fetch from 'cross-fetch'

Check failure on line 3 in packages/rest-api/src/routes/chainIconRoute.ts

View workflow job for this annotation

GitHub Actions / lint

'cross-fetch' should be listed in the project's dependencies. Run 'npm i -S cross-fetch' to add it

const router: express.Router = express.Router()

router.get('/:chainId.svg', async (req, res) => {
const chainId = parseInt(req.params.chainId, 10)

// Find the chain with matching ID
const chain = Object.values(CHAINS).find(
(c): c is Chain =>
typeof c === 'object' && c !== null && 'id' in c && c.id === chainId,

Check warning on line 13 in packages/rest-api/src/routes/chainIconRoute.ts

View workflow job for this annotation

GitHub Actions / lint

Delete `,`
)

if (!chain || !chain.chainImg) {
res.status(404).json({ error: 'Chain icon not found' })
return
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Enhance input validation and type safety

While the chain validation is good, consider these improvements:

  1. Add input validation for chainId format before parsing
  2. Replace the type assertion with a proper type guard function

Consider this implementation:

 router.get('/:chainId.svg', async (req, res) => {
+  if (!/^\d+$/.test(req.params.chainId)) {
+    res.status(400).json({ error: 'Invalid chain ID format' })
+    return
+  }
   const chainId = parseInt(req.params.chainId, 10)
 
-  // Find the chain with matching ID
-  const chain = Object.values(CHAINS).find(
-    (c): c is Chain =>
-      typeof c === 'object' && c !== null && 'id' in c && c.id === chainId,
-  )
+  const isChain = (c: unknown): c is Chain =>
+    typeof c === 'object' && c !== null && 'id' in c && 'chainImg' in c
+
+  const chain = Object.values(CHAINS).find(isChain)

Committable suggestion skipped: line range outside the PR's diff.


try {
// Fetch the image from the URL
const response = await fetch(chain.chainImg)
if (!response.ok) {
throw new Error(`Failed to fetch image: ${response.statusText}`)
}

const buffer = await response.arrayBuffer()

// Set cache headers (cache for 1 week)
res.set({
'Cache-Control': 'public, max-age=604800',
'Content-Type': response.headers.get('content-type') || 'image/svg+xml',
})

res.send(Buffer.from(buffer))
} catch (error) {
console.error('Error fetching chain icon:', error)
res.status(500).json({ error: 'Failed to fetch chain icon' })
}
return
})
Comment on lines +37 to +42
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve error handling and logging

The error handling could be enhanced:

  1. The return statement after try-catch is unnecessary
  2. Error logging should be structured and sanitized
  3. Different error types should have different status codes

Apply these improvements:

-  } catch (error) {
-    console.error('Error fetching chain icon:', error)
-    res.status(500).json({ error: 'Failed to fetch chain icon' })
-  }
-  return
+  } catch (error) {
+    // Sanitize error message
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error'
+    
+    // Log structured error
+    console.error({
+      error: 'Failed to fetch chain icon',
+      chainId,
+      message: errorMessage,
+      timestamp: new Date().toISOString()
+    })
+    
+    // Return appropriate status code
+    if (errorMessage.includes('Invalid URL') || errorMessage.includes('Invalid content type')) {
+      res.status(400).json({ error: 'Invalid chain icon configuration' })
+    } else if (error instanceof Error && error.name === 'AbortError') {
+      res.status(504).json({ error: 'Chain icon fetch timeout' })
+    } else {
+      res.status(500).json({ error: 'Failed to fetch chain icon' })
+    }
+  }

Committable suggestion skipped: line range outside the PR's diff.


export default router
4 changes: 4 additions & 0 deletions packages/rest-api/src/routes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import destinationTxRoute from './destinationTxRoute'
import tokenListRoute from './tokenListRoute'
import destinationTokensRoute from './destinationTokensRoute'
import bridgeLimitsRoute from './bridgeLimitsRoute'
import chainIconRoute from './chainIconRoute'
import addressIconRoute from './addressIconRoute'

const router: express.Router = express.Router()

Expand All @@ -25,5 +27,7 @@ router.use('/bridgeTxStatus', bridgeTxStatusRoute)
router.use('/destinationTx', destinationTxRoute)
router.use('/tokenList', tokenListRoute)
router.use('/destinationTokens', destinationTokensRoute)
router.use('/chainIcon', chainIconRoute)
router.use('/tokenIcon', addressIconRoute)

export default router
50 changes: 37 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15671,6 +15671,11 @@ data-uri-to-buffer@^2.0.0:
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.2.tgz#d296973d5a4897a5dbe31716d118211921f04770"
integrity sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==

data-uri-to-buffer@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==

data-urls@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
Expand Down Expand Up @@ -18757,12 +18762,7 @@ fd-slicer@~1.1.0:
dependencies:
pend "~1.2.0"

fdir@^6.2.0:
version "6.4.2"
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==

fdir@^6.4.2:
fdir@^6.2.0, fdir@^6.4.2:
version "6.4.2"
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==
Expand All @@ -18779,6 +18779,14 @@ feed@^4.2.2:
dependencies:
xml-js "^1.6.11"

fetch-blob@^3.1.2, fetch-blob@^3.1.4:
version "3.2.0"
resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9"
integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==
dependencies:
node-domexception "^1.0.0"
web-streams-polyfill "^3.0.3"

fetch-retry@^5.0.2:
version "5.0.6"
resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.6.tgz#17d0bc90423405b7a88b74355bf364acd2a7fa56"
Expand Down Expand Up @@ -19180,6 +19188,13 @@ format@^0.2.0:
resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
integrity sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==

formdata-polyfill@^4.0.10:
version "4.0.10"
resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
dependencies:
fetch-blob "^3.1.2"

formidable@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.1.2.tgz#fa973a2bec150e4ce7cac15589d7a25fc30ebd89"
Expand Down Expand Up @@ -26676,6 +26691,11 @@ node-dir@^0.1.10:
dependencies:
minimatch "^3.0.2"

node-domexception@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==

node-emoji@^1.10.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c"
Expand Down Expand Up @@ -26726,6 +26746,15 @@ node-fetch@^2.0.0, node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7:
dependencies:
whatwg-url "^5.0.0"

node-fetch@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b"
integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==
dependencies:
data-uri-to-buffer "^4.0.0"
fetch-blob "^3.1.4"
formdata-polyfill "^4.0.10"

node-forge@^1, node-forge@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
Expand Down Expand Up @@ -36073,7 +36102,7 @@ web-namespaces@^2.0.0:
resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.1.tgz#1010ff7c650eccb2592cebeeaf9a1b253fd40692"
integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==

web-streams-polyfill@^3.2.1:
web-streams-polyfill@^3.0.3, web-streams-polyfill@^3.2.1:
version "3.3.3"
resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b"
integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
Expand Down Expand Up @@ -37610,12 +37639,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.0.0-1.tgz#8c3029b3ee2028306d5bcf396980623115ff8d18"
integrity sha512-W7h5dEhywMKenDJh2iX/LABkbFnBxasD27oyXWDS/feDsxiw0dD5ncXdYXgkvAsXIY2MpW/ZKkr9IU30DBdMNQ==

yaml@^2.3.1, yaml@^2.3.4:
version "2.6.0"
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.0.tgz#14059ad9d0b1680d0f04d3a60fe00f3a857303c3"
integrity sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==

yaml@^2.6.0:
yaml@^2.3.1, yaml@^2.3.4, yaml@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.0.tgz#14059ad9d0b1680d0f04d3a60fe00f3a857303c3"
integrity sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==
Expand Down
Loading