Merge branch 'next' into feat/oeth-withdrawal

OriginProtocol · Aug 2, 2024 · 085c19b · 085c19b
2 parents cfafdf9 + 6c04717
commit 085c19b
Show file tree

Hide file tree

Showing 13 changed files with 160 additions and 129 deletions.
diff --git a/libs/defi/oeth/src/bridge/hooks/useCcipTxParams.ts b/libs/defi/oeth/src/bridge/hooks/useCcipTxParams.ts
@@ -65,10 +65,10 @@ export const useCcipTxParams = ({
 
         const exchangeRate = await queryClient
           .fetchQuery({
-            queryKey: useTokenPrices.getKey(['wOETH_ETH']),
+            queryKey: useTokenPrices.getKey(['1:wOETH_1:ETH']),
             queryFn: useTokenPrices.fetcher(config),
           })
-          .then((r) => r['wOETH_ETH']);
+          .then((r) => r['1:wOETH_1:ETH']);
 
         return {
           path: 'zap-eth-oeth-woeth-ccip',

diff --git a/libs/defi/oeth/src/portfolio/components/StatsCard.tsx b/libs/defi/oeth/src/portfolio/components/StatsCard.tsx
@@ -83,7 +83,7 @@ export const WoethStats = (props: CardProps) => {
   const { formatAmount } = useFormat();
   const { isConnected } = useAccount();
   const { data: price, isLoading: isPriceLoading } =
-    useTokenPrice('wOETH_OETH');
+    useTokenPrice('1:wOETH_1:OETH');
   const { data: bals, isLoading: isBalsLoading } = useWatchBalances({
     tokens: [tokens.mainnet.wOETH, tokens.arbitrum.wOETH],
   });

diff --git a/libs/oeth/ccip/src/hooks/useCcipTxParams.ts b/libs/oeth/ccip/src/hooks/useCcipTxParams.ts
@@ -65,10 +65,10 @@ export const useCcipTxParams = ({
 
         const exchangeRate = await queryClient
           .fetchQuery({
-            queryKey: useTokenPrices.getKey(['wOETH_ETH']),
+            queryKey: useTokenPrices.getKey(['1:wOETH_1:ETH']),
             queryFn: useTokenPrices.fetcher(config),
           })
-          .then((r) => r['wOETH_ETH']);
+          .then((r) => r['1:wOETH_1:ETH']);
 
         return {
           path: 'zap-eth-oeth-woeth-ccip',

diff --git a/libs/oeth/history/src/components/woeth/HistoryHeader.tsx b/libs/oeth/history/src/components/woeth/HistoryHeader.tsx
@@ -16,7 +16,7 @@ export function HistoryHeader() {
   const { formatAmount } = useFormat();
   const { isConnected } = useAccount();
 
-  const exchangeRate = useTokenPrice('wOETH_OETH');
+  const exchangeRate = useTokenPrice('1:wOETH_1:OETH');
   const woethBalances = useWatchBalances({
     tokens: [tokens.mainnet.wOETH, tokens.arbitrum.wOETH],
   });

diff --git a/libs/prime/restake/src/components/PastClaimsCard.tsx b/libs/prime/restake/src/components/PastClaimsCard.tsx
@@ -19,7 +19,8 @@ export const PastClaimsCard = (props: CardProps) => {
   const intl = useIntl();
   const { address, isConnected } = useAccount();
   const match = useMatch('/restake/claim');
-  const { data: price, isLoading: isPriceLoading } = useTokenPrice('OETH_USD');
+  const { data: price, isLoading: isPriceLoading } =
+    useTokenPrice('1:OETH_USD');
   const { data: withdrawals, isLoading: iswithdrawalsLoading } =
     useUserWithdrawalsQuery(
       { address: address ?? ZERO_ADDRESS },

diff --git a/libs/prime/restake/src/views/ClaimView.tsx b/libs/prime/restake/src/views/ClaimView.tsx
@@ -83,7 +83,8 @@ const ClaimCard = ({ request, ...rest }: ClaimCardProps) => {
   const { formatAmount } = useFormat();
   const queryClient = useQueryClient();
   const { data: blockNumber } = useBlockNumber({ watch: true });
-  const { data: price, isLoading: isPriceLoading } = useTokenPrice('OETH_USD');
+  const { data: price, isLoading: isPriceLoading } =
+    useTokenPrice('1:OETH_USD');
   const { params, callbacks, gasPrice } = useTxButton({
     params: {
       contract: contracts.mainnet.lrtDepositPool,

diff --git a/libs/shared/contracts/src/tokens.ts b/libs/shared/contracts/src/tokens.ts
@@ -42,6 +42,15 @@ export const tokens = {
       decimals: 18,
       symbol: 'ETHx',
     },
+    FRAX: {
+      id: '1:FRAX',
+      address: '0x853d955aCEf822Db058eb8505911ED77F175b99e',
+      chainId: mainnet.id,
+      abi: erc20Abi,
+      name: 'Frax',
+      decimals: 18,
+      symbol: 'frxETH',
+    },
     frxETH: {
       id: '1:frxETH',
       address: '0x5E8422345238F34275888049021821E8E08CAa1f',
@@ -215,6 +224,15 @@ export const tokens = {
       decimals: 18,
       symbol: 'ETH',
     },
+    WETH: {
+      id: '42161:WETH',
+      address: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
+      chainId: arbitrum.id,
+      abi: erc20Abi,
+      name: 'Wrapped Ether',
+      decimals: 18,
+      symbol: 'WETH',
+    },
     wOETH: {
       id: '42161:wOETH',
       address: '0xD8724322f44E5c58D7A815F542036fb17DbbF839',

diff --git a/libs/shared/providers/src/gas/hooks.ts b/libs/shared/providers/src/gas/hooks.ts
@@ -38,7 +38,7 @@ const fetcher: (
   async ({ queryKey: [, gasAmount, chainId] }) => {
     const [price, data] = await Promise.all([
       queryClient.fetchQuery({
-        queryKey: useTokenPrice.getKey('ETH_USD'),
+        queryKey: useTokenPrice.getKey('1:ETH_USD'),
         queryFn: useTokenPrice.fetcher(config, queryClient),
       }),
       estimateFeesPerGas(config, { chainId }),