Handle new tvl/tvs service

Author: GusevPM

pages/stats/[metric].vue

@@ -248,12 +248,13 @@ const fetchData = async () => {
 			fetchTVL({ slug: "celestia", period: selectedTimeframe.value.timeframe }),
 		])
 
-		tvsData.forEach(d => {
+		supplyData.forEach(d => {
 			let res = {}
+			const tvsValue = parseFloat(tvsData.find(s => s.time === d.time)?.close || 0)
 			res.time = d.time
-			res.supply = parseFloat(supplyData.find(s => s.time === d.time)?.value) || 0
-			res.rollupTvl = parseFloat(d.close) - res.supply
-			res.value = parseFloat(d.close)
+			res.supply = parseFloat(d.value) || 0
+			res.rollupTvl = tvsValue - res.supply
+			res.value = tvsValue
 
 			data.push(res)
 		})

services/api/rollup.js

@@ -1,5 +1,5 @@
 /** Services */
-import { githubServiceURL, tvlServiceURL, tvlServiceURL_new, useServerURL } from "@/services/config"
+import { githubServiceURL, tvlServiceURL, useServerURL } from "@/services/config"
 
 export const fetchRollups = async ({ categories, type, tags, limit, offset, sort, sort_by }) => {
 	try {
@@ -121,7 +121,7 @@ export const fetchRollupsDailyStats = async ({ limit, offset, sort, sort_by }) =
 
 export const fetchRollupTVL = async ({ dataSource, slug, period, from, to }) => {
 	try {
-		const url = new URL(`${tvlServiceURL_new}/tvl/${dataSource}/${slug}/${period}`)
+		const url = new URL(`${tvlServiceURL}/tvl/${dataSource}/${slug}/${period}`)
 
 		if (from) url.searchParams.append("from", from)
 		if (to) url.searchParams.append("to", to)

services/api/stats.js

@@ -69,13 +69,16 @@ export const fetchTVL = async ({ slug, period, from, to }) => {
 	try {
 		let url = ""
 
-		if (period) {
+		if (slug !== "celestia") {
 			url = new URL(`${tvlServiceURL}/tvl/${slug}/${period}`)
 
 			if (from) url.searchParams.append("from", from)
 			if (to) url.searchParams.append("to", to)
 		} else {
-			url = new URL(`${tvlServiceURL}/tvl`)
+			url = new URL(`${tvlServiceURL}/supply/${period}`)
+
+			if (from) url.searchParams.append("from", from)
+			if (to) url.searchParams.append("to", to)
 		}
 
 		const data = await $fetch(url.href)

services/config.js

@@ -123,8 +123,7 @@ export const getStartChainDate = () => {
 
 export const blockscoutURL = "https://celestia-l2-router.k8s-dev.blockscout.com/api/v1/celestia/l2BatchMetadata"
 export const nodeStatsURL = "https://node-stats.celenium.io/v1"
-export const tvlServiceURL = "https://tvl.celenium.io/v1"
-export const tvlServiceURL_new = "https://tvl-new.celenium.io/v1"
+export const tvlServiceURL = "https://tvl-new.celenium.io/v1"
 export const githubServiceURL = "https://github.celenium.io/v1"
 export const quoteServiceURL = "https://quote.celenium.io/v1"
 export const faucetURL = {