Merge pull request #186 from lc-labs/chore/naked-ftokens

Remove wrapped assets for fTokens
reserve-protocol · Oct 2, 2023 · 94f2275 · 94f2275
2 parents 3e8c327 + efcf8fc
commit 94f2275
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 32 deletions.
diff --git a/scripts/data/mainnet-collaterals.json b/scripts/data/mainnet-collaterals.json
@@ -28,10 +28,10 @@
     "EURT": "0xEBD07CE38e2f46031c982136012472A4D24AE070",
     "wstETH": "0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C",
     "rETH": "0x1103851D1FCDD3f88096fbed812c8FF01949cF9d",
-    "fUSDC": "0x1FFA5955D64Ee32cB1BF7104167b81bb085b0c8d",
-    "fUSDT": "0xF73EB45d83AC86f8a6F75a6252ca1a59a9A3aED3",
-    "fDAI": "0xE1fcCf8e23713Ed0497ED1a0E6Ae2b19ED443eCd",
-    "fFRAX": "0x8b06c065b4b44B310442d4ee98777BF7a1EBC6E3",
+    "fUSDC": "0x3C0a9143063Fc306F7D3cBB923ff4879d70Cf1EA",
+    "fUSDT": "0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A",
+    "fDAI": "0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875",
+    "fFRAX": "0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92",
     "cUSDCv3": "0x85b256e9051B781A0BC0A987857AD6166C94040a",
     "cvx3Pool": "0x62C394620f674e85768a7618a6C202baE7fB8Dd1",
     "cvxeUSDFRAXBP": "0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122",
@@ -75,10 +75,10 @@
     "EURT": "0xC581b735A1688071A1746c968e0798D642EDE491",
     "wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
     "rETH": "0xae78736Cd615f374D3085123A210448E74Fc6393",
-    "fUSDC": "0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9",
-    "fUSDT": "0x2837f952c1FD773B3Ce02631A90f95E4b9ce2cF7",
-    "fDAI": "0x714341800AD1913B5FCCBFd5d136553Ad1C314d6",
-    "fFRAX": "0x55590a1Bf90fbf7352A46c4af652A231AA5CbF13",
+    "fUSDC": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5",
+    "fUSDT": "0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7",
+    "fDAI": "0xe2bA8693cE7474900A045757fe0efCa900F6530b",
+    "fFRAX": "0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B",
     "cUSDCv3": "0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab",
     "cvx3Pool": "0xaBd7E7a5C846eD497681a590feBED99e7157B6a3",
     "cvxeUSDFRAXBP": "0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5",

diff --git a/src/utils/plugins/data/mainnet.json b/src/utils/plugins/data/mainnet.json
@@ -336,67 +336,67 @@
     "rewardTokens": []
   },
   {
-    "address": "0x1FFA5955D64Ee32cB1BF7104167b81bb085b0c8d",
-    "erc20": "0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9",
+    "address": "0x3C0a9143063Fc306F7D3cBB923ff4879d70Cf1EA",
+    "erc20": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5",
     "chainlinkFeed": "0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6",
     "delayUntilDefault": "86400",
     "maxTradeVolume": "1000000",
     "oracleTimeout": 86460,
     "targetName": "USD",
     "version": "3.0.0",
-    "symbol": "fUSDC-VAULT",
+    "symbol": "fUSDC",
     "decimals": 8,
     "protocol": "FLUX",
-    "underlyingAddress": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5",
-    "underlyingToken": "fUSDC",
+    "underlyingAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    "underlyingToken": "USDC",
     "rewardTokens": []
   },
   {
-    "address": "0xF73EB45d83AC86f8a6F75a6252ca1a59a9A3aED3",
-    "erc20": "0x2837f952c1FD773B3Ce02631A90f95E4b9ce2cF7",
+    "address": "0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A",
+    "erc20": "0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7",
     "chainlinkFeed": "0x3E7d1eAB13ad0104d2750B8863b489D65364e32D",
     "delayUntilDefault": "86400",
     "maxTradeVolume": "1000000",
     "oracleTimeout": 86460,
     "targetName": "USD",
     "version": "3.0.0",
-    "symbol": "fUSDT-VAULT",
+    "symbol": "fUSDT",
     "decimals": 8,
     "protocol": "FLUX",
-    "underlyingAddress": "0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7",
-    "underlyingToken": "fUSDT",
+    "underlyingAddress": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+    "underlyingToken": "USDT",
     "rewardTokens": []
   },
   {
-    "address": "0xE1fcCf8e23713Ed0497ED1a0E6Ae2b19ED443eCd",
-    "erc20": "0x714341800AD1913B5FCCBFd5d136553Ad1C314d6",
+    "address": "0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875",
+    "erc20": "0xe2bA8693cE7474900A045757fe0efCa900F6530b",
     "chainlinkFeed": "0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9",
     "delayUntilDefault": "86400",
     "maxTradeVolume": "1000000",
     "oracleTimeout": 3660,
     "targetName": "USD",
     "version": "3.0.0",
-    "symbol": "fDAI-VAULT",
+    "symbol": "fDAI",
     "decimals": 8,
     "protocol": "FLUX",
-    "underlyingAddress": "0xe2bA8693cE7474900A045757fe0efCa900F6530b",
-    "underlyingToken": "fDAI",
+    "underlyingAddress": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+    "underlyingToken": "DAI",
     "rewardTokens": []
   },
   {
-    "address": "0x8b06c065b4b44B310442d4ee98777BF7a1EBC6E3",
-    "erc20": "0x55590a1Bf90fbf7352A46c4af652A231AA5CbF13",
+    "address": "0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92",
+    "erc20": "0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B",
     "chainlinkFeed": "0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD",
     "delayUntilDefault": "86400",
     "maxTradeVolume": "1000000",
     "oracleTimeout": 3660,
     "targetName": "USD",
     "version": "3.0.0",
-    "symbol": "fFRAX-VAULT",
+    "symbol": "fFRAX",
     "decimals": 8,
     "protocol": "FLUX",
-    "underlyingAddress": "0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B",
-    "underlyingToken": "fFRAX",
+    "underlyingAddress": "0x853d955aCEf822Db058eb8505911ED77F175b99e",
+    "underlyingToken": "FRAX",
     "rewardTokens": []
   },
   {

diff --git a/src/views/overview/components/PriceChart.tsx b/src/views/overview/components/PriceChart.tsx
@@ -26,7 +26,10 @@ const hourlyPriceQuery = gql`
 const dailyPriceQuery = gql`
   query getTokenDailyPrice($id: String!, $fromTime: Int!) {
     token(id: $id) {
-      snapshots: dailyTokenSnapshot(where: { timestamp_gte: $fromTime }) {
+      snapshots: dailyTokenSnapshot(
+        first: 1000
+        where: { timestamp_gte: $fromTime }
+      ) {
         timestamp
         priceUSD
       }

diff --git a/src/views/overview/components/StakingChart.tsx b/src/views/overview/components/StakingChart.tsx
@@ -27,7 +27,10 @@ const hourlyPriceQuery = gql`
 const dailyPriceQuery = gql`
   query getTokenDailyPrice($id: String!, $fromTime: Int!) {
     rtoken(id: $id) {
-      snapshots: dailySnapshots(where: { timestamp_gte: $fromTime }) {
+      snapshots: dailySnapshots(
+        first: 1000
+        where: { timestamp_gte: $fromTime }
+      ) {
         timestamp
         rsrStaked
       }

diff --git a/src/views/overview/components/SupplyChart.tsx b/src/views/overview/components/SupplyChart.tsx
@@ -27,7 +27,10 @@ const hourlyPriceQuery = gql`
 const dailyPriceQuery = gql`
   query getTokenDailyPrice($id: String!, $fromTime: Int!) {
     token(id: $id) {
-      snapshots: dailyTokenSnapshot(where: { timestamp_gte: $fromTime }) {
+      snapshots: dailyTokenSnapshot(
+        first: 1000
+        where: { timestamp_gte: $fromTime }
+      ) {
         timestamp
         supply: dailyTotalSupply
       }

diff --git a/src/views/staking/components/overview/ExchangeRate.tsx b/src/views/staking/components/overview/ExchangeRate.tsx
@@ -14,7 +14,10 @@ import { TIME_RANGES } from 'utils/constants'
 const query = gql`
   query getRTokenExchangeRate($id: String!, $fromTime: Int!) {
     rtoken(id: $id) {
-      snapshots: dailySnapshots(where: { timestamp_gte: $fromTime }) {
+      snapshots: dailySnapshots(
+        first: 1000
+        where: { timestamp_gte: $fromTime }
+      ) {
         timestamp
         rsrExchangeRate
       }