From d4b1929f6b364f304db757c238a07bdc15e6c8ce Mon Sep 17 00:00:00 2001
From: Nelson Taveras <4562733+nvtaveras@users.noreply.github.com>
Date: Wed, 6 Mar 2024 22:01:51 +0100
Subject: [PATCH] feat: add native USDC to Baklava

---
 src/config/exchanges.ts                       | 25 +++++++++++++++++++
 src/config/tokens.ts                          | 18 +++++++++----
 src/images/tokens/TokenIcon.tsx               | 10 +++++---
 src/images/tokens/USDC.svg                    |  6 ++++-
 src/images/tokens/{EUROC.svg => axlEUROC.svg} |  0
 src/images/tokens/axlUSDC.svg                 |  1 +
 6 files changed, 50 insertions(+), 10 deletions(-)
 rename src/images/tokens/{EUROC.svg => axlEUROC.svg} (100%)
 create mode 100644 src/images/tokens/axlUSDC.svg

diff --git a/src/config/exchanges.ts b/src/config/exchanges.ts
index bc96c5d..e028e0f 100644
--- a/src/config/exchanges.ts
+++ b/src/config/exchanges.ts
@@ -154,7 +154,32 @@ export const BaklavaExchanges: Exchange[] = [
       '0x6f90ac394b1F45290d3023e4Ba0203005cAF2A4B',
     ],
   },
+  {
+    providerAddr: '0xFF9a3da00F42839CD6D33AD7adf50bCc97B41411',
+    id: '0xd8573fd7c4151f38cde9b2349a26a6bb03be4b3791105bc625731ad2d71c54ba',
+    assets: [
+      '0x62492A644A588FD904270BeD06ad52B9abfEA1aE',
+      '0xB407D37d76c417B6343310D42611FCA106B2abB8',
+    ],
+  },
+  {
+    providerAddr: '0xFF9a3da00F42839CD6D33AD7adf50bCc97B41411',
+    id: '0x3839dd748e34fa87f5cd928e10d3e0ecafd9230ac9932c6cb2b0d5a358b72618',
+    assets: [
+      '0xf9ecE301247aD2CE21894941830A2470f4E774ca',
+      '0xB407D37d76c417B6343310D42611FCA106B2abB8',
+    ],
+  },
+  {
+    providerAddr: '0xFF9a3da00F42839CD6D33AD7adf50bCc97B41411',
+    id: '0xbfd96ed0ed5098d2b2bff8b9d8423dc47001fccf2391ee6e532618ef79c12075',
+    assets: [
+      '0x6a0EEf2bed4C30Dc2CB42fe6c5f01F80f7EF16d1',
+      '0xB407D37d76c417B6343310D42611FCA106B2abB8',
+    ],
+  },
 ]
+
 export const CeloExchanges: Exchange[] = [
   {
     providerAddr: '0x22d9db95E6Ae61c104A7B6F6C78D7993B94ec901',
diff --git a/src/config/tokens.ts b/src/config/tokens.ts
index d47d703..ed05149 100644
--- a/src/config/tokens.ts
+++ b/src/config/tokens.ts
@@ -20,6 +20,7 @@ export enum TokenId {
   cUSD = 'cUSD',
   cEUR = 'cEUR',
   cREAL = 'cREAL',
+  USDC = 'USDC',
   axlUSDC = 'axlUSDC',
   axlEUROC = 'axlEUROC',
   eXOF = 'eXOF',
@@ -57,6 +58,13 @@ export const cREAL: Token = Object.freeze({
   color: Color.celoGreen,
   decimals: 18,
 })
+export const USDC: Token = Object.freeze({
+  id: TokenId.USDC,
+  symbol: TokenId.USDC,
+  name: 'USDC',
+  color: Color.usdcBlue,
+  decimals: 6,
+})
 export const axlUSDC: Token = Object.freeze({
   id: TokenId.axlUSDC,
   symbol: TokenId.axlUSDC,
@@ -76,7 +84,7 @@ export const eXOF: Token = Object.freeze({
   id: TokenId.eXOF,
   symbol: TokenId.eXOF,
   name: 'eXOF',
-  color: Color.usdcBlue, // TODO: Change to EUROC
+  color: Color.usdcBlue,
   decimals: 18,
 })
 
@@ -85,6 +93,7 @@ export const Tokens: Record<TokenId, Token> = {
   cUSD,
   cEUR,
   cREAL,
+  USDC,
   axlUSDC,
   axlEUROC,
   eXOF,
@@ -96,6 +105,7 @@ export const TokenAddresses: Record<ChainId, Record<TokenId, Address>> = Object.
     [TokenId.cUSD]: '0x874069Fa1Eb16D44d622F2e0Ca25eeA172369bC1',
     [TokenId.cEUR]: '0x10c892A6EC43a53E45D0B916B4b7D383B1b78C0F',
     [TokenId.cREAL]: '0xE4D517785D091D3c54818832dB6094bcc2744545',
+    [TokenId.USDC]: '',
     [TokenId.axlUSDC]: '0x87D61dA3d668797786D73BC674F053f87111570d',
     [TokenId.axlEUROC]: '0x6e673502c5b55F3169657C004e5797fFE5be6653',
     [TokenId.eXOF]: '0xB0FA15e002516d0301884059c0aaC0F0C72b019D',
@@ -105,6 +115,7 @@ export const TokenAddresses: Record<ChainId, Record<TokenId, Address>> = Object.
     [TokenId.cUSD]: '0x62492A644A588FD904270BeD06ad52B9abfEA1aE',
     [TokenId.cEUR]: '0xf9ecE301247aD2CE21894941830A2470f4E774ca',
     [TokenId.cREAL]: '0x6a0EEf2bed4C30Dc2CB42fe6c5f01F80f7EF16d1',
+    [TokenId.USDC]: '0xB407D37d76c417B6343310D42611FCA106B2abB8',
     [TokenId.axlUSDC]: '0xD4079B322c392D6b196f90AA4c439fC2C16d6770',
     [TokenId.axlEUROC]: '0x6f90ac394b1F45290d3023e4Ba0203005cAF2A4B',
     [TokenId.eXOF]: '0x64c1D812673E93Bc036AdC3D547d9950696DA5Af',
@@ -114,16 +125,13 @@ export const TokenAddresses: Record<ChainId, Record<TokenId, Address>> = Object.
     [TokenId.cUSD]: '0x765DE816845861e75A25fCA122bb6898B8B1282a',
     [TokenId.cEUR]: '0xD8763CBa276a3738E6DE85b4b3bF5FDed6D6cA73',
     [TokenId.cREAL]: '0xe8537a3d056DA446677B9E9d6c5dB704EaAb4787',
+    [TokenId.USDC]: '',
     [TokenId.axlUSDC]: '0xEB466342C4d449BC9f53A865D5Cb90586f405215',
     [TokenId.axlEUROC]: '0x061cc5a2C863E0C1Cb404006D559dB18A34C762d',
     [TokenId.eXOF]: '0x73F93dcc49cB8A239e2032663e9475dd5ef29A08',
   },
 })
 
-export function isUSDCVariant(tokenId: string) {
-  return USDCVariantIds.includes(tokenId as TokenId)
-}
-
 export function isNativeToken(tokenId: string) {
   return Object.keys(Tokens).includes(tokenId)
 }
diff --git a/src/images/tokens/TokenIcon.tsx b/src/images/tokens/TokenIcon.tsx
index 04295df..944ad6a 100644
--- a/src/images/tokens/TokenIcon.tsx
+++ b/src/images/tokens/TokenIcon.tsx
@@ -1,9 +1,10 @@
 import Image from 'next/image'
 import { memo } from 'react'
-import { Token, TokenId, isUSDCVariant } from 'src/config/tokens'
+import { Token, TokenId } from 'src/config/tokens'
 import CeloIcon from 'src/images/tokens/CELO.svg'
-import EUROCIcon from 'src/images/tokens/EUROC.svg'
 import USDCIcon from 'src/images/tokens/USDC.svg'
+import axlEUROCIcon from 'src/images/tokens/axlEUROC.svg'
+import axlUSDCIcon from 'src/images/tokens/axlUSDC.svg'
 import cEURIcon from 'src/images/tokens/cEUR.svg'
 import cREALIcon from 'src/images/tokens/cREAL.svg'
 import cUSDIcon from 'src/images/tokens/cUSD.svg'
@@ -34,8 +35,9 @@ function _TokenIcon({ token, size = 'm' }: Props) {
   else if (token?.id === TokenId.cUSD) imgSrc = cUSDIcon
   else if (token?.id === TokenId.cEUR) imgSrc = cEURIcon
   else if (token?.id === TokenId.cREAL) imgSrc = cREALIcon
-  else if (isUSDCVariant(token?.id)) imgSrc = USDCIcon
-  else if (token?.id === TokenId.axlEUROC) imgSrc = EUROCIcon
+  else if (token?.id === TokenId.USDC) imgSrc = USDCIcon
+  else if (token?.id === TokenId.axlUSDC) imgSrc = axlUSDCIcon
+  else if (token?.id === TokenId.axlEUROC) imgSrc = axlEUROCIcon
   else if (token?.id === TokenId.eXOF) imgSrc = eXOFIcon
 
   if (imgSrc) {
diff --git a/src/images/tokens/USDC.svg b/src/images/tokens/USDC.svg
index 14f4677..5dfea92 100644
--- a/src/images/tokens/USDC.svg
+++ b/src/images/tokens/USDC.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38.25 38.25"><defs><filter id="a" data-name="drop-shadow-1" filterUnits="userSpaceOnUse"><feOffset/><feGaussianBlur result="e" stdDeviation=".08"/><feFlood flood-color="#000" flood-opacity=".13"/><feComposite in2="e" operator="in"/><feComposite in="SourceGraphic"/></filter><filter id="b" data-name="drop-shadow-2" filterUnits="userSpaceOnUse"><feOffset/><feGaussianBlur result="g" stdDeviation=".08"/><feFlood flood-color="#000" flood-opacity=".13"/><feComposite in2="g" operator="in"/><feComposite in="SourceGraphic"/></filter><filter id="c" data-name="drop-shadow-3" filterUnits="userSpaceOnUse"><feOffset/><feGaussianBlur result="i" stdDeviation=".08"/><feFlood flood-color="#000" flood-opacity=".13"/><feComposite in2="i" operator="in"/><feComposite in="SourceGraphic"/></filter><filter id="d" data-name="drop-shadow-4" filterUnits="userSpaceOnUse"><feOffset/><feGaussianBlur result="k" stdDeviation=".08"/><feFlood flood-color="#000" flood-opacity=".13"/><feComposite in2="k" operator="in"/><feComposite in="SourceGraphic"/></filter></defs><g data-name="Layer 1"><path fill="#2775ca" d="M19 38c10.53 0 19-8.47 19-19S29.53 0 19 0 0 8.47 0 19s8.47 19 19 19Z"/><path fill="#fff" d="M24.23 22c0-2.76-1.67-3.71-5-4.1-2.37-.33-2.84-.96-2.84-2.07s.79-1.82 2.37-1.82c1.43 0 2.22.48 2.61 1.66.08.24.32.4.56.4h1.27c.31 0 .55-.24.55-.55v-.08a3.96 3.96 0 0 0-3.56-3.25v-1.9c0-.32-.24-.55-.64-.63h-1.18c-.32 0-.56.24-.64.63v1.82c-2.37.32-3.88 1.9-3.88 3.88 0 2.61 1.59 3.64 4.91 4.04 2.22.4 2.93.87 2.93 2.14s-1.1 2.13-2.61 2.13c-2.06 0-2.77-.87-3-2.06-.09-.31-.32-.47-.56-.47h-1.35a.54.54 0 0 0-.55.55v.08c.31 1.98 1.58 3.4 4.2 3.8v1.9c0 .32.23.56.63.64h1.18c.32 0 .56-.24.64-.64v-1.9c2.37-.4 3.96-2.06 3.96-4.2Z"/><path fill="#fff" d="M14.96 30.32a11.79 11.79 0 0 1-7.04-15.2 11.71 11.71 0 0 1 7.04-7.04c.32-.16.48-.4.48-.8v-1.1c0-.32-.16-.56-.48-.64a14.22 14.22 0 0 0-9.58 17.97 14.24 14.24 0 0 0 9.27 9.27c.31.15.63 0 .7-.32.09-.08.09-.16.09-.32v-1.1c0-.24-.24-.56-.48-.72Zm8.4-24.7c-.32-.16-.64 0-.72.32-.08.08-.08.16-.08.31v1.11c0 .32.24.64.48.8a11.79 11.79 0 0 1 7.04 15.2 11.71 11.71 0 0 1-7.04 7.04c-.32.16-.48.4-.48.8v1.1c0 .32.16.55.48.63.08 0 .23 0 .31-.08a14.22 14.22 0 0 0 9.27-17.89 14.36 14.36 0 0 0-9.27-9.34Z"/><circle cx="32.29" cy="32.29" r="5.71" fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width=".5"/><path d="m32.72 31.72 2.23-2.21-.85-.84-1.8 1.8-1.81-1.8-.84.84 2.22 2.21a.6.6 0 0 0 .85 0Z" filter="url(#a)"/><path d="m35.94 34.09-1.8-1.8 1.8-1.8-.84-.83-2.23 2.21a.6.6 0 0 0 0 .84l2.23 2.22.84-.84Z" filter="url(#b)"/><path d="m32.3 34.13 1.8 1.8.84-.85-2.22-2.21a.6.6 0 0 0-.85 0l-2.23 2.21.85.84 1.8-1.8Z" filter="url(#c)"/><path d="M31.72 32.72a.6.6 0 0 0 0-.84l-2.23-2.22-.84.84 1.8 1.8-1.8 1.79.84.84 2.23-2.21Z" filter="url(#d)"/></g></svg>
\ No newline at end of file
+<svg data-name="86977684-12db-4850-8f30-233a7c267d11" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 2000">
+  <path d="M1000 2000c554.17 0 1000-445.83 1000-1000S1554.17 0 1000 0 0 445.83 0 1000s445.83 1000 1000 1000z" fill="#2775ca"/>
+  <path d="M1275 1158.33c0-145.83-87.5-195.83-262.5-216.66-125-16.67-150-50-150-108.34s41.67-95.83 125-95.83c75 0 116.67 25 137.5 87.5 4.17 12.5 16.67 20.83 29.17 20.83h66.66c16.67 0 29.17-12.5 29.17-29.16v-4.17c-16.67-91.67-91.67-162.5-187.5-170.83v-100c0-16.67-12.5-29.17-33.33-33.34h-62.5c-16.67 0-29.17 12.5-33.34 33.34v95.83c-125 16.67-204.16 100-204.16 204.17 0 137.5 83.33 191.66 258.33 212.5 116.67 20.83 154.17 45.83 154.17 112.5s-58.34 112.5-137.5 112.5c-108.34 0-145.84-45.84-158.34-108.34-4.16-16.66-16.66-25-29.16-25h-70.84c-16.66 0-29.16 12.5-29.16 29.17v4.17c16.66 104.16 83.33 179.16 220.83 200v100c0 16.66 12.5 29.16 33.33 33.33h62.5c16.67 0 29.17-12.5 33.34-33.33v-100c125-20.84 208.33-108.34 208.33-220.84z" fill="#fff"/>
+  <path d="M787.5 1595.83c-325-116.66-491.67-479.16-370.83-800 62.5-175 200-308.33 370.83-370.83 16.67-8.33 25-20.83 25-41.67V325c0-16.67-8.33-29.17-25-33.33-4.17 0-12.5 0-16.67 4.16-395.83 125-612.5 545.84-487.5 941.67 75 233.33 254.17 412.5 487.5 487.5 16.67 8.33 33.34 0 37.5-16.67 4.17-4.16 4.17-8.33 4.17-16.66v-58.34c0-12.5-12.5-29.16-25-37.5zM1229.17 295.83c-16.67-8.33-33.34 0-37.5 16.67-4.17 4.17-4.17 8.33-4.17 16.67v58.33c0 16.67 12.5 33.33 25 41.67 325 116.66 491.67 479.16 370.83 800-62.5 175-200 308.33-370.83 370.83-16.67 8.33-25 20.83-25 41.67V1700c0 16.67 8.33 29.17 25 33.33 4.17 0 12.5 0 16.67-4.16 395.83-125 612.5-545.84 487.5-941.67-75-237.5-258.34-416.67-487.5-491.67z" fill="#fff"/>
+</svg>
diff --git a/src/images/tokens/EUROC.svg b/src/images/tokens/axlEUROC.svg
similarity index 100%
rename from src/images/tokens/EUROC.svg
rename to src/images/tokens/axlEUROC.svg
diff --git a/src/images/tokens/axlUSDC.svg b/src/images/tokens/axlUSDC.svg
new file mode 100644
index 0000000..14f4677
--- /dev/null
+++ b/src/images/tokens/axlUSDC.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38.25 38.25"><defs><filter id="a" data-name="drop-shadow-1" filterUnits="userSpaceOnUse"><feOffset/><feGaussianBlur result="e" stdDeviation=".08"/><feFlood flood-color="#000" flood-opacity=".13"/><feComposite in2="e" operator="in"/><feComposite in="SourceGraphic"/></filter><filter id="b" data-name="drop-shadow-2" filterUnits="userSpaceOnUse"><feOffset/><feGaussianBlur result="g" stdDeviation=".08"/><feFlood flood-color="#000" flood-opacity=".13"/><feComposite in2="g" operator="in"/><feComposite in="SourceGraphic"/></filter><filter id="c" data-name="drop-shadow-3" filterUnits="userSpaceOnUse"><feOffset/><feGaussianBlur result="i" stdDeviation=".08"/><feFlood flood-color="#000" flood-opacity=".13"/><feComposite in2="i" operator="in"/><feComposite in="SourceGraphic"/></filter><filter id="d" data-name="drop-shadow-4" filterUnits="userSpaceOnUse"><feOffset/><feGaussianBlur result="k" stdDeviation=".08"/><feFlood flood-color="#000" flood-opacity=".13"/><feComposite in2="k" operator="in"/><feComposite in="SourceGraphic"/></filter></defs><g data-name="Layer 1"><path fill="#2775ca" d="M19 38c10.53 0 19-8.47 19-19S29.53 0 19 0 0 8.47 0 19s8.47 19 19 19Z"/><path fill="#fff" d="M24.23 22c0-2.76-1.67-3.71-5-4.1-2.37-.33-2.84-.96-2.84-2.07s.79-1.82 2.37-1.82c1.43 0 2.22.48 2.61 1.66.08.24.32.4.56.4h1.27c.31 0 .55-.24.55-.55v-.08a3.96 3.96 0 0 0-3.56-3.25v-1.9c0-.32-.24-.55-.64-.63h-1.18c-.32 0-.56.24-.64.63v1.82c-2.37.32-3.88 1.9-3.88 3.88 0 2.61 1.59 3.64 4.91 4.04 2.22.4 2.93.87 2.93 2.14s-1.1 2.13-2.61 2.13c-2.06 0-2.77-.87-3-2.06-.09-.31-.32-.47-.56-.47h-1.35a.54.54 0 0 0-.55.55v.08c.31 1.98 1.58 3.4 4.2 3.8v1.9c0 .32.23.56.63.64h1.18c.32 0 .56-.24.64-.64v-1.9c2.37-.4 3.96-2.06 3.96-4.2Z"/><path fill="#fff" d="M14.96 30.32a11.79 11.79 0 0 1-7.04-15.2 11.71 11.71 0 0 1 7.04-7.04c.32-.16.48-.4.48-.8v-1.1c0-.32-.16-.56-.48-.64a14.22 14.22 0 0 0-9.58 17.97 14.24 14.24 0 0 0 9.27 9.27c.31.15.63 0 .7-.32.09-.08.09-.16.09-.32v-1.1c0-.24-.24-.56-.48-.72Zm8.4-24.7c-.32-.16-.64 0-.72.32-.08.08-.08.16-.08.31v1.11c0 .32.24.64.48.8a11.79 11.79 0 0 1 7.04 15.2 11.71 11.71 0 0 1-7.04 7.04c-.32.16-.48.4-.48.8v1.1c0 .32.16.55.48.63.08 0 .23 0 .31-.08a14.22 14.22 0 0 0 9.27-17.89 14.36 14.36 0 0 0-9.27-9.34Z"/><circle cx="32.29" cy="32.29" r="5.71" fill="#fff" stroke="#000" stroke-miterlimit="10" stroke-width=".5"/><path d="m32.72 31.72 2.23-2.21-.85-.84-1.8 1.8-1.81-1.8-.84.84 2.22 2.21a.6.6 0 0 0 .85 0Z" filter="url(#a)"/><path d="m35.94 34.09-1.8-1.8 1.8-1.8-.84-.83-2.23 2.21a.6.6 0 0 0 0 .84l2.23 2.22.84-.84Z" filter="url(#b)"/><path d="m32.3 34.13 1.8 1.8.84-.85-2.22-2.21a.6.6 0 0 0-.85 0l-2.23 2.21.85.84 1.8-1.8Z" filter="url(#c)"/><path d="M31.72 32.72a.6.6 0 0 0 0-.84l-2.23-2.22-.84.84 1.8 1.8-1.8 1.79.84.84 2.23-2.21Z" filter="url(#d)"/></g></svg>
\ No newline at end of file