Merge pull request #126 from golemfactory/change-to-pol

Migrate MATIC to POL
golemfactory · Sep 20, 2024 · 92e5427 · 92e5427
2 parents e0e52ca + b62a609
commit 92e5427
Show file tree

Hide file tree

Showing 24 changed files with 11,135 additions and 8,056 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -24,7 +24,7 @@
     "@heroicons/react": "2.0.13",
     "@hotjar/browser": "^1.0.9",
     "@metamask/detect-provider": "^2.0.0",
-    "@ramp-network/ramp-instant-sdk": "^4.0.4",
+    "@ramp-network/ramp-instant-sdk": "^4.0.5",
     "@tanstack/react-query": "^5.26.3",
     "@typechain/ethers-v6": "^0.5.0",
     "@types/lodash": "^4.14.198",
@@ -53,8 +53,8 @@
     "use-query-params": "^2.2.1",
     "usehooks-ts": "^2.15.1",
     "uuid": "^9.0.1",
-    "viem": "^2.9.3",
-    "wagmi": "^2.5.13",
+    "viem": "^2.21.10",
+    "wagmi": "^2.12.12",
     "xstate": "^4.38.2"
   },
   "devDependencies": {

diff --git a/frontend/src/components/molecules/budgetCard/BudgetCard.tsx b/frontend/src/components/molecules/budgetCard/BudgetCard.tsx
@@ -146,7 +146,7 @@ export const BudgetCard = ({
             })}
             <div className="flex flex-col">
               <span className="text-h6 text-primary font-kanit">
-                ≈ {maticCost} MATIC
+                ≈ {maticCost} POL
               </span>
               <span className={`${style.caps10px} flex gap-2 z-40`}>
                 <Trans i18nKey="coversFees" ns="welcome.step" />{' '}

diff --git a/frontend/src/components/molecules/exchangeRate/exchangeRate.tsx b/frontend/src/components/molecules/exchangeRate/exchangeRate.tsx
@@ -7,7 +7,7 @@ export const ExchangeRate = ({
 }) => {
   return (
     <div className="text-body-small-light text-neutral-grey-300 mt-2">
-      {amountIn} MATIC ≈ {amountOut} GLM
+      {amountIn} POL ≈ {amountOut} GLM
     </div>
   )
 }
diff --git a/frontend/src/components/molecules/walletState/walletState.tsx b/frontend/src/components/molecules/walletState/walletState.tsx
@@ -128,7 +128,7 @@ export const WalletState = ({
                 <EthereumIcon className="h-6 inline" />
               )}
 
-              {isMainnet ? 'ETH' : 'MATIC'}
+              {isMainnet ? 'ETH' : 'POL'}
             </div>
             <div className="text-h7">{formatBalance(balance.NATIVE)}</div>
           </div>

diff --git a/frontend/src/components/organisms/manualTestGateway/ManualTestGateway.tsx b/frontend/src/components/organisms/manualTestGateway/ManualTestGateway.tsx
@@ -126,7 +126,7 @@ export const ManualTestGateway = () => {
                 account?.trim() !== `0x${storageTankJSON.address.trim()}`
               )
               if (
-                path !== BalanceCase.NO_GLM_NO_MATIC &&
+                path !== BalanceCase.NO_GLM_NO_POL &&
                 account?.toLocaleLowerCase() !==
                   `0x${storageTankJSON.address.toLocaleLowerCase()}`
               ) {

diff --git a/frontend/src/components/organisms/manualTestGateway/testingPaths.tsx b/frontend/src/components/organisms/manualTestGateway/testingPaths.tsx
@@ -2,30 +2,30 @@ import { BalanceCaseType, BalanceCase } from 'types/path'
 
 type TestingSetupType = {
   glmBalance: number
-  maticBalance: number
+  polBalance: number
   label: string
 }
 
 export const testingSetup: Record<BalanceCaseType, TestingSetupType> = {
   [BalanceCase.NO_GLM]: {
     glmBalance: 0,
-    maticBalance: 15,
+    polBalance: 15,
     label: 'No GLM',
   },
-  [BalanceCase.NO_MATIC]: {
+  [BalanceCase.NO_POL]: {
     glmBalance: 1000,
-    maticBalance: 0,
-    label: 'No MATIC',
+    polBalance: 0,
+    label: 'No POL',
   },
   [BalanceCase.BOTH]: {
     glmBalance: 1000,
-    maticBalance: 15,
-    label: 'Both GLM and MATIC',
+    polBalance: 15,
+    label: 'Both GLM and POL',
   },
-  [BalanceCase.NO_GLM_NO_MATIC]: {
+  [BalanceCase.NO_GLM_NO_POL]: {
     glmBalance: 0,
-    maticBalance: 0,
-    label: 'No GLM and no MATIC',
+    polBalance: 0,
+    label: 'No GLM and no POL',
   },
 }
 
@@ -34,9 +34,9 @@ export const getExpectedBalances = ({
 }: {
   testingPath: BalanceCaseType
 }) => {
-  const { glmBalance, maticBalance } = testingSetup[testingPath]
+  const { glmBalance, polBalance } = testingSetup[testingPath]
   return {
     glm: glmBalance,
-    native: maticBalance,
+    native: polBalance,
   }
 }
diff --git a/frontend/src/components/organisms/onboarding/steps/OnRamp.step.tsx b/frontend/src/components/organisms/onboarding/steps/OnRamp.step.tsx
@@ -23,8 +23,6 @@ import { formatEther } from 'utils/formatEther'
 import { Chain } from 'types/wagmi'
 import { AwaitTransaction } from 'components/molecules/awaitTransaction/AwaitTransaction'
 
-//@ts-ignore
-
 // const log = debug('onboarding:steps:onramp')
 
 TooltipProvider.registerTooltip({
@@ -161,7 +159,6 @@ export const OnRamp = ({
   setPlacement: (x: 'inside' | 'outside') => void
   placement: 'inside' | 'outside'
 }) => {
-  //@ts-ignore
   const { address } = useAccount(true)
   const widgetRef = useRef<RampInstantSDK | null>(null)
   const { chain } = useNetwork(true)
@@ -212,15 +209,14 @@ export const OnRamp = ({
           hostLogoUrl: `${extractBaseURL(window.location.href)}/logo.svg`,
           hostApiKey: import.meta.env.VITE_RAMP_KEY,
           url: import.meta.env.VITE_RAMP_API_URL,
-          swapAsset: 'MATIC_MATIC',
+          swapAsset: import.meta.env.DEV ? 'MATIC_MATIC' : 'MATIC_POL', // TODO: POL is not available on ramp testnet (as of 2024-09-20)
           fiatValue: recommendedAmount.toString(),
           fiatCurrency: 'USD',
           userAddress: address,
           defaultFlow: 'ONRAMP',
           variant: 'embedded-desktop',
           //well ramp is internally inconsistent...
-          //@ts-ignore
-          containerNode: document.getElementById('rampContainer'),
+          containerNode: document.getElementById('rampContainer')!,
         })
 
         //check if there is no widget rendered already

diff --git a/frontend/src/components/organisms/onboarding/steps/SwapTokens.step.tsx b/frontend/src/components/organisms/onboarding/steps/SwapTokens.step.tsx
@@ -81,7 +81,7 @@ const SwapTokensPresentational = ({
                       <Trans i18nKey="swapAmount" ns="swap.step" />
                       <IconInput
                         icon={MaticCoinIcon}
-                        label="MATIC"
+                        label="POL"
                         placeholder={`${amountIn}`}
                         isError={isError}
                         onChange={(e) => {

diff --git a/frontend/src/components/organisms/onboarding/steps/Transfer.step.tsx b/frontend/src/components/organisms/onboarding/steps/Transfer.step.tsx
@@ -126,7 +126,7 @@ const TransferPresentational = ({
                     )}
                     <IconInput
                       icon={
-                        nativeToken === 'MATIC'
+                        nativeToken === 'POL'
                           ? MaticCoinSolidIcon
                           : EthereumIcon
                       }

diff --git a/frontend/src/ethereum/networks/mainnet.ts b/frontend/src/ethereum/networks/mainnet.ts
@@ -7,7 +7,7 @@ export const MAINNET: INetwork = {
   blockExplorerUrls: ['https://polygonscan.com/'],
   nativeCurrency: {
     //@ts-ignore
-    symbol: 'MATIC',
+    symbol: 'POL',
     decimals: 18,
   },
   isProduction: true,

diff --git a/frontend/src/ethereum/networks/mumbai.ts b/frontend/src/ethereum/networks/mumbai.ts
@@ -1,5 +1,6 @@
 import { INetwork, Network } from 'types/ethereum'
 
+// TODO: Mumbai is dead, this can be removed?
 export const MUMBAI: INetwork = {
   chainId: Network.MUMBAI,
   chainName: 'Mumbai Testnet',

diff --git a/frontend/src/ethereum/networks/polygon.ts b/frontend/src/ethereum/networks/polygon.ts
@@ -7,7 +7,7 @@ export const POLYGON: INetwork = {
   blockExplorerUrls: ['https://polygonscan.com/'],
   nativeCurrency: {
     //@ts-ignore
-    symbol: 'MATIC',
+    symbol: 'POL',
     decimals: 18,
   },
   isProduction: true,

diff --git a/frontend/src/ethereum/tokens/matic/mumbai.ts b/frontend/src/ethereum/tokens/matic/mumbai.ts
@@ -2,8 +2,8 @@ import { Token, Network, INativeToken } from 'types/ethereum'
 
 export const maticMumbai: INativeToken = {
   isNative: true,
-  name: 'Matic',
+  name: 'Pol',
   decimals: 18,
-  symbol: Token.MATIC_MUMBAI,
+  symbol: Token.POL_MUMBAI,
   network: Network.MUMBAI,
 }
diff --git a/frontend/src/ethereum/tokens/matic/polygon.ts b/frontend/src/ethereum/tokens/matic/polygon.ts
@@ -4,6 +4,6 @@ export const maticPolygon: INativeToken = {
   isNative: true,
   name: 'Matic',
   decimals: 18,
-  symbol: Token.MATIC_POLYGON,
+  symbol: Token.POL_POLYGON,
   network: Network.POLYGON,
 }