From d3fe3ede5f010fe0a4a0e2336e0ccb3aae165f77 Mon Sep 17 00:00:00 2001 From: toniocodo Date: Tue, 7 Nov 2023 09:19:02 +0100 Subject: [PATCH] feat: update WOUSD and WOETH symbol casing --- apps/oeth/src/components/Topnav.tsx | 2 +- apps/ousd/src/components/Topnav.tsx | 2 +- libs/oeth/swap/src/actions/unwrapWOETH.ts | 26 +++++++++---------- libs/oeth/swap/src/actions/wrapOETH.ts | 22 ++++++++-------- libs/oeth/swap/src/constants.ts | 4 +-- libs/ousd/swap/src/actions/unwrapWOUSD.ts | 26 +++++++++---------- libs/ousd/swap/src/actions/wrapOUSD.ts | 24 ++++++++--------- libs/ousd/swap/src/constants.ts | 6 ++--- .../files/tokens/{WOETH.svg => wOETH.svg} | 0 .../files/tokens/{WOUSD.svg => wOUSD.svg} | 0 .../shared/contracts/src/network.mainnet.json | 2 +- libs/shared/contracts/src/tokens.ts | 12 ++++----- libs/shared/contracts/src/whales.ts | 4 +-- libs/shared/providers/src/prices/constants.ts | 4 +-- libs/shared/providers/src/prices/hooks.ts | 24 ++++++++--------- libs/shared/providers/src/prices/types.ts | 4 +-- 16 files changed, 81 insertions(+), 81 deletions(-) rename libs/shared/assets/files/tokens/{WOETH.svg => wOETH.svg} (100%) rename libs/shared/assets/files/tokens/{WOUSD.svg => wOUSD.svg} (100%) diff --git a/apps/oeth/src/components/Topnav.tsx b/apps/oeth/src/components/Topnav.tsx index d5efbbea4..52069e8dd 100644 --- a/apps/oeth/src/components/Topnav.tsx +++ b/apps/oeth/src/components/Topnav.tsx @@ -206,7 +206,7 @@ export function Topnav(props: BoxProps) { setAnchor={setAccountModalAnchor} balanceTokens={[ tokens.mainnet.OETH, - tokens.mainnet.WOETH, + tokens.mainnet.wOETH, tokens.mainnet.WETH, tokens.mainnet.rETH, tokens.mainnet.frxETH, diff --git a/apps/ousd/src/components/Topnav.tsx b/apps/ousd/src/components/Topnav.tsx index a922f9e32..8bfe505f5 100644 --- a/apps/ousd/src/components/Topnav.tsx +++ b/apps/ousd/src/components/Topnav.tsx @@ -206,7 +206,7 @@ export function Topnav(props: BoxProps) { setAnchor={setAccountModalAnchor} balanceTokens={[ tokens.mainnet.OUSD, - tokens.mainnet.WOUSD, + tokens.mainnet.wOUSD, tokens.mainnet.USDT, tokens.mainnet.DAI, tokens.mainnet.USDC, diff --git a/libs/oeth/swap/src/actions/unwrapWOETH.ts b/libs/oeth/swap/src/actions/unwrapWOETH.ts index d9cb8786a..5a01f7185 100644 --- a/libs/oeth/swap/src/actions/unwrapWOETH.ts +++ b/libs/oeth/swap/src/actions/unwrapWOETH.ts @@ -25,8 +25,8 @@ const estimateAmount: EstimateAmount = async ({ amountIn }) => { } const data = await readContract({ - address: tokens.mainnet.WOETH.address, - abi: tokens.mainnet.WOETH.abi, + address: tokens.mainnet.wOETH.address, + abi: tokens.mainnet.wOETH.abi, functionName: 'convertToAssets', args: [amountIn], }); @@ -48,8 +48,8 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { if (!isNilOrEmpty(address)) { try { gasEstimate = await publicClient.estimateContractGas({ - address: tokens.mainnet.WOETH.address, - abi: tokens.mainnet.WOETH.abi, + address: tokens.mainnet.wOETH.address, + abi: tokens.mainnet.wOETH.abi, functionName: 'redeem', args: [amountIn, address, address], account: address, @@ -61,11 +61,11 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { try { gasEstimate = await publicClient.estimateContractGas({ - address: tokens.mainnet.WOETH.address, - abi: tokens.mainnet.WOETH.abi, + address: tokens.mainnet.wOETH.address, + abi: tokens.mainnet.wOETH.abi, functionName: 'redeem', - args: [amountIn, whales.mainnet.WOETH, whales.mainnet.WOETH], - account: whales.mainnet.WOETH, + args: [amountIn, whales.mainnet.wOETH, whales.mainnet.wOETH], + account: whales.mainnet.wOETH, }); } catch { gasEstimate = 21000n; @@ -75,12 +75,12 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { }; const allowance: Allowance = async () => { - // Unwrap WOETH does not require approval + // Unwrap wOETH does not require approval return maxUint256; }; const estimateApprovalGas: EstimateApprovalGas = async () => { - // Unwrap WOETH does not require approval + // Unwrap wOETH does not require approval return 0n; }; @@ -123,7 +123,7 @@ const estimateRoute: EstimateRoute = async ({ }; const approve: Approve = async () => { - // Unwrap WOETH does not require approval + // Unwrap wOETH does not require approval return null; }; @@ -135,8 +135,8 @@ const swap: Swap = async ({ amountIn }) => { } const { request } = await prepareWriteContract({ - address: tokens.mainnet.WOETH.address, - abi: tokens.mainnet.WOETH.abi, + address: tokens.mainnet.wOETH.address, + abi: tokens.mainnet.wOETH.abi, functionName: 'redeem', args: [amountIn, address, address], }); diff --git a/libs/oeth/swap/src/actions/wrapOETH.ts b/libs/oeth/swap/src/actions/wrapOETH.ts index 5e4513831..9ff1c2ce8 100644 --- a/libs/oeth/swap/src/actions/wrapOETH.ts +++ b/libs/oeth/swap/src/actions/wrapOETH.ts @@ -26,8 +26,8 @@ const estimateAmount: EstimateAmount = async ({ amountIn }) => { } const data = await readContract({ - address: tokens.mainnet.WOETH.address, - abi: tokens.mainnet.WOETH.abi, + address: tokens.mainnet.wOETH.address, + abi: tokens.mainnet.wOETH.abi, functionName: 'convertToShares', args: [amountIn], }); @@ -49,8 +49,8 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { if (!isNilOrEmpty(address)) { try { gasEstimate = await publicClient.estimateContractGas({ - address: tokens.mainnet.WOETH.address, - abi: tokens.mainnet.WOETH.abi, + address: tokens.mainnet.wOETH.address, + abi: tokens.mainnet.wOETH.abi, functionName: 'deposit', args: [amountIn, address], account: address, @@ -62,8 +62,8 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { try { gasEstimate = await publicClient.estimateContractGas({ - address: tokens.mainnet.WOETH.address, - abi: tokens.mainnet.WOETH.abi, + address: tokens.mainnet.wOETH.address, + abi: tokens.mainnet.wOETH.abi, functionName: 'deposit', args: [amountIn, whales.mainnet.OETH], account: whales.mainnet.OETH, @@ -86,7 +86,7 @@ const allowance: Allowance = async ({ tokenIn }) => { address: tokenIn.address, abi: erc20ABI, functionName: 'allowance', - args: [address, tokens.mainnet.WOETH.address], + args: [address, tokens.mainnet.wOETH.address], }); return allowance; @@ -110,7 +110,7 @@ const estimateApprovalGas: EstimateApprovalGas = async ({ address: tokenIn.address, abi: erc20ABI, functionName: 'approve', - args: [tokens.mainnet.WOETH.address, amountIn], + args: [tokens.mainnet.wOETH.address, amountIn], account: address, }); } catch { @@ -163,7 +163,7 @@ const approve: Approve = async ({ tokenIn, tokenOut, amountIn, curve }) => { address: tokenIn.address, abi: erc20ABI, functionName: 'approve', - args: [tokens.mainnet.WOETH.address, amountIn], + args: [tokens.mainnet.wOETH.address, amountIn], }); const { hash } = await writeContract(request); @@ -184,8 +184,8 @@ const swap: Swap = async ({ tokenIn, tokenOut, amountIn }) => { } const { request } = await prepareWriteContract({ - address: tokens.mainnet.WOETH.address, - abi: tokens.mainnet.WOETH.abi, + address: tokens.mainnet.wOETH.address, + abi: tokens.mainnet.wOETH.abi, functionName: 'deposit', args: [amountIn, address], }); diff --git a/libs/oeth/swap/src/constants.ts b/libs/oeth/swap/src/constants.ts index 72e0b7f28..6f1b44455 100644 --- a/libs/oeth/swap/src/constants.ts +++ b/libs/oeth/swap/src/constants.ts @@ -102,12 +102,12 @@ export const swapRoutes: SwapRoute[] = [ // Wrap { tokenIn: tokens.mainnet.OETH, - tokenOut: tokens.mainnet.WOETH, + tokenOut: tokens.mainnet.wOETH, action: 'wrap-oeth', }, // Unwrap { - tokenIn: tokens.mainnet.WOETH, + tokenIn: tokens.mainnet.wOETH, tokenOut: tokens.mainnet.OETH, action: 'unwrap-woeth', }, diff --git a/libs/ousd/swap/src/actions/unwrapWOUSD.ts b/libs/ousd/swap/src/actions/unwrapWOUSD.ts index d294ba222..369d63322 100644 --- a/libs/ousd/swap/src/actions/unwrapWOUSD.ts +++ b/libs/ousd/swap/src/actions/unwrapWOUSD.ts @@ -25,8 +25,8 @@ const estimateAmount: EstimateAmount = async ({ amountIn }) => { } const data = await readContract({ - address: tokens.mainnet.WOUSD.address, - abi: tokens.mainnet.WOUSD.abi, + address: tokens.mainnet.wOUSD.address, + abi: tokens.mainnet.wOUSD.abi, functionName: 'convertToAssets', args: [amountIn], }); @@ -48,8 +48,8 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { if (!isNilOrEmpty(address)) { try { gasEstimate = await publicClient.estimateContractGas({ - address: tokens.mainnet.WOUSD.address, - abi: tokens.mainnet.WOUSD.abi, + address: tokens.mainnet.wOUSD.address, + abi: tokens.mainnet.wOUSD.abi, functionName: 'redeem', args: [amountIn, address, address], account: address, @@ -61,11 +61,11 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { try { gasEstimate = await publicClient.estimateContractGas({ - address: tokens.mainnet.WOUSD.address, - abi: tokens.mainnet.WOUSD.abi, + address: tokens.mainnet.wOUSD.address, + abi: tokens.mainnet.wOUSD.abi, functionName: 'redeem', - args: [amountIn, whales.mainnet.WOUSD, whales.mainnet.WOUSD], - account: whales.mainnet.WOUSD, + args: [amountIn, whales.mainnet.wOUSD, whales.mainnet.wOUSD], + account: whales.mainnet.wOUSD, }); } catch { gasEstimate = 21000n; @@ -75,12 +75,12 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { }; const allowance: Allowance = async () => { - // Unwrap WOUSD does not require approval + // Unwrap wOUSD does not require approval return maxUint256; }; const estimateApprovalGas: EstimateApprovalGas = async () => { - // Unwrap WOUSD does not require approval + // Unwrap wOUSD does not require approval return 0n; }; @@ -123,7 +123,7 @@ const estimateRoute: EstimateRoute = async ({ }; const approve: Approve = async () => { - // Unwrap WOUSD does not require approval + // Unwrap wOUSD does not require approval return null; }; @@ -135,8 +135,8 @@ const swap: Swap = async ({ amountIn }) => { } const { request } = await prepareWriteContract({ - address: tokens.mainnet.WOUSD.address, - abi: tokens.mainnet.WOUSD.abi, + address: tokens.mainnet.wOUSD.address, + abi: tokens.mainnet.wOUSD.abi, functionName: 'redeem', args: [amountIn, address, address], }); diff --git a/libs/ousd/swap/src/actions/wrapOUSD.ts b/libs/ousd/swap/src/actions/wrapOUSD.ts index 623a1029a..be1bebac2 100644 --- a/libs/ousd/swap/src/actions/wrapOUSD.ts +++ b/libs/ousd/swap/src/actions/wrapOUSD.ts @@ -26,8 +26,8 @@ const estimateAmount: EstimateAmount = async ({ amountIn }) => { } const data = await readContract({ - address: tokens.mainnet.WOUSD.address, - abi: tokens.mainnet.WOUSD.abi, + address: tokens.mainnet.wOUSD.address, + abi: tokens.mainnet.wOUSD.abi, functionName: 'convertToShares', args: [amountIn], }); @@ -49,8 +49,8 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { if (!isNilOrEmpty(address)) { try { gasEstimate = await publicClient.estimateContractGas({ - address: tokens.mainnet.WOUSD.address, - abi: tokens.mainnet.WOUSD.abi, + address: tokens.mainnet.wOUSD.address, + abi: tokens.mainnet.wOUSD.abi, functionName: 'deposit', args: [amountIn, address], account: address, @@ -62,8 +62,8 @@ const estimateGas: EstimateGas = async ({ amountIn }) => { try { gasEstimate = await publicClient.estimateContractGas({ - address: tokens.mainnet.WOUSD.address, - abi: tokens.mainnet.WOUSD.abi, + address: tokens.mainnet.wOUSD.address, + abi: tokens.mainnet.wOUSD.abi, functionName: 'deposit', args: [amountIn, whales.mainnet.OETH], account: whales.mainnet.OETH, @@ -86,7 +86,7 @@ const allowance: Allowance = async ({ tokenIn }) => { address: tokenIn.address, abi: tokenIn.abi, functionName: 'allowance', - args: [address, tokens.mainnet.WOUSD.address], + args: [address, tokens.mainnet.wOUSD.address], }); return allowance as unknown as bigint; @@ -110,7 +110,7 @@ const estimateApprovalGas: EstimateApprovalGas = async ({ address: tokenIn.address, abi: erc20ABI, functionName: 'approve', - args: [tokens.mainnet.WOUSD.address, amountIn], + args: [tokens.mainnet.wOUSD.address, amountIn], account: address, }); } catch { @@ -163,7 +163,7 @@ const approve: Approve = async ({ tokenIn, tokenOut, amountIn, curve }) => { address: tokenIn.address, abi: tokenIn.abi, functionName: 'approve', - args: [tokens.mainnet.WOUSD.address, amountIn], + args: [tokens.mainnet.wOUSD.address, amountIn], }); const { hash } = await writeContract(request); @@ -180,12 +180,12 @@ const swap: Swap = async ({ tokenIn, tokenOut, amountIn }) => { const approved = await allowance({ tokenIn, tokenOut }); if (approved < amountIn) { - throw new Error(`WOUSD is not approved`); + throw new Error(`wOUSD is not approved`); } const { request } = await prepareWriteContract({ - address: tokens.mainnet.WOUSD.address, - abi: tokens.mainnet.WOUSD.abi, + address: tokens.mainnet.wOUSD.address, + abi: tokens.mainnet.wOUSD.abi, functionName: 'deposit', args: [amountIn, address], }); diff --git a/libs/ousd/swap/src/constants.ts b/libs/ousd/swap/src/constants.ts index fb683cac3..23a8fea09 100644 --- a/libs/ousd/swap/src/constants.ts +++ b/libs/ousd/swap/src/constants.ts @@ -182,12 +182,12 @@ export const swapRoutes: SwapRoute[] = [ // Wrap OUSD { tokenIn: tokens.mainnet.OUSD, - tokenOut: tokens.mainnet.WOUSD, + tokenOut: tokens.mainnet.wOUSD, action: 'wrap-ousd', }, - // Unwrap WOUSD + // Unwrap wOUSD { - tokenIn: tokens.mainnet.WOUSD, + tokenIn: tokens.mainnet.wOUSD, tokenOut: tokens.mainnet.OUSD, action: 'unwrap-wousd', }, diff --git a/libs/shared/assets/files/tokens/WOETH.svg b/libs/shared/assets/files/tokens/wOETH.svg similarity index 100% rename from libs/shared/assets/files/tokens/WOETH.svg rename to libs/shared/assets/files/tokens/wOETH.svg diff --git a/libs/shared/assets/files/tokens/WOUSD.svg b/libs/shared/assets/files/tokens/wOUSD.svg similarity index 100% rename from libs/shared/assets/files/tokens/WOUSD.svg rename to libs/shared/assets/files/tokens/wOUSD.svg diff --git a/libs/shared/contracts/src/network.mainnet.json b/libs/shared/contracts/src/network.mainnet.json index 45a4b2a25..8519ebf0f 100644 --- a/libs/shared/contracts/src/network.mainnet.json +++ b/libs/shared/contracts/src/network.mainnet.json @@ -26944,7 +26944,7 @@ } ] }, - "WOETH": { + "wOETH": { "address": "0x9C5a92AaA2A4373D6bd20F7b45cdEb7A13f9AA79", "abi": [ { diff --git a/libs/shared/contracts/src/tokens.ts b/libs/shared/contracts/src/tokens.ts index 4a0fe1e2c..f65cee7a1 100644 --- a/libs/shared/contracts/src/tokens.ts +++ b/libs/shared/contracts/src/tokens.ts @@ -138,23 +138,23 @@ export const tokens = { decimals: 18, symbol: 'WETH', }, - WOETH: { + wOETH: { address: '0xDcEe70654261AF21C44c093C300eD3Bb97b78192', chainId: mainnet.id, abi: WOETHABI, name: 'Wrapped Origin Ether', - icon: '/images/tokens/WOETH.svg', + icon: '/images/tokens/wOETH.svg', decimals: 18, - symbol: 'WOETH', + symbol: 'wOETH', }, - WOUSD: { + wOUSD: { address: '0xD2af830E8CBdFed6CC11Bab697bB25496ed6FA62', chainId: mainnet.id, abi: WrappedOusdABI, name: 'WrappedOrigin Dollar', - icon: '/images/tokens/WOUSD.svg', + icon: '/images/tokens/wOUSD.svg', decimals: 18, - symbol: 'WOUSD', + symbol: 'wOUSD', }, }, } as const; diff --git a/libs/shared/contracts/src/whales.ts b/libs/shared/contracts/src/whales.ts index f2672ba81..24813113b 100644 --- a/libs/shared/contracts/src/whales.ts +++ b/libs/shared/contracts/src/whales.ts @@ -3,8 +3,8 @@ export const whales = { mainnet: { OETH: '0x94B17476A93b3262d87B9a326965D1E91f9c13E7', - WOETH: '0xC460B0b6c9b578A4Cb93F99A691e16dB96Ee5833', + wOETH: '0xC460B0b6c9b578A4Cb93F99A691e16dB96Ee5833', OUSD: '0x70fCE97d671E81080CA3ab4cc7A59aAc2E117137', - WOUSD: '0x3dD413Fd4D03b1d8fD2C9Ed34553F7DeC3B26F5C', + wOUSD: '0x3dD413Fd4D03b1d8fD2C9Ed34553F7DeC3B26F5C', }, } as const; diff --git a/libs/shared/providers/src/prices/constants.ts b/libs/shared/providers/src/prices/constants.ts index de668b595..f9038f4b9 100644 --- a/libs/shared/providers/src/prices/constants.ts +++ b/libs/shared/providers/src/prices/constants.ts @@ -9,9 +9,9 @@ export const coingeckoTokenIds: Record = { USDC: 'usd-coin', USDT: 'tether', OETH: 'origin-ether', - WOETH: 'origin-ether', + wOETH: 'origin-ether', OUSD: 'origin-dollar', - WOUSD: 'origin-dollar', + wOUSD: 'origin-dollar', stETH: 'staked-ether', rETH: 'rocket-pool-eth', frxETH: 'frax-ether', diff --git a/libs/shared/providers/src/prices/hooks.ts b/libs/shared/providers/src/prices/hooks.ts index 23b7dba40..2d12e3b2d 100644 --- a/libs/shared/providers/src/prices/hooks.ts +++ b/libs/shared/providers/src/prices/hooks.ts @@ -53,16 +53,16 @@ export const usePrices = ( functionName: 'latestRoundData', })), { - address: toks.mainnet.WOETH.address, - abi: toks.mainnet.WOETH.abi, + address: toks.mainnet.wOETH.address, + abi: toks.mainnet.wOETH.abi, functionName: 'previewRedeem', - args: [parseUnits('1', toks.mainnet.WOETH.decimals)], + args: [parseUnits('1', toks.mainnet.wOETH.decimals)], }, { - address: toks.mainnet.WOUSD.address, - abi: toks.mainnet.WOUSD.abi, + address: toks.mainnet.wOUSD.address, + abi: toks.mainnet.wOUSD.abi, functionName: 'previewRedeem', - args: [parseUnits('1', toks.mainnet.WOUSD.decimals)], + args: [parseUnits('1', toks.mainnet.wOUSD.decimals)], }, { address: toks.mainnet.sfrxETH.address, @@ -102,15 +102,15 @@ export const usePrices = ( const rETH = +formatUnits(multi?.[7]?.result?.[1] ?? 0n, toks.mainnet.ETH.decimals) * ETH; - const WOETH = + const wOETH = +formatUnits( (multi?.[8]?.result as unknown as bigint) ?? 0n, - toks.mainnet.WOETH.decimals, + toks.mainnet.wOETH.decimals, ) * OETH; - const WOUSD = + const wOUSD = +formatUnits( (multi?.[9]?.result as unknown as bigint) ?? 0n, - toks.mainnet.WOUSD.decimals, + toks.mainnet.wOUSD.decimals, ) * OUSD; const sfrxETH = +formatUnits( @@ -127,8 +127,8 @@ export const usePrices = ( frxETH, stETH, rETH, - WOETH, - WOUSD, + wOETH, + wOUSD, sfrxETH, WETH, OETH, diff --git a/libs/shared/providers/src/prices/types.ts b/libs/shared/providers/src/prices/types.ts index 4ba18542d..caed22955 100644 --- a/libs/shared/providers/src/prices/types.ts +++ b/libs/shared/providers/src/prices/types.ts @@ -11,5 +11,5 @@ export type SupportedToken = | 'USDC' | 'USDT' | 'WETH' - | 'WOETH' - | 'WOUSD'; + | 'wOETH' + | 'wOUSD';