From fb64b9a754ce1c397c5a0c1d457defa719573609 Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 16 Mar 2024 19:38:40 -0400 Subject: [PATCH] mirror chart fixes, still broken --- src/charts/jBars.js | 17 +++++++++++------ src/version.js | 7 +++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/charts/jBars.js b/src/charts/jBars.js index ec458e9..16a58fe 100644 --- a/src/charts/jBars.js +++ b/src/charts/jBars.js @@ -1,5 +1,5 @@ -import {useOrderStore, useStore} from "@/store/store.js"; -import {metadata} from "@/version.js"; +import {useStore} from "@/store/store.js"; +import {metadataMap} from "@/version.js"; const file_res = ['1m', '3m', '5m', '10m', '15m', '30m', '1H', '2H', '4H', '8H', '12H', '1D', '2D', '3D', '1W',]; const supported_res = ['1', '3', '5', '10', '15', '30', '60', '120', '240', '480', '720', '1D', '2D', '3D', '1W',]; @@ -43,8 +43,8 @@ export async function jBars (symbolInfo, contract, from, to, res) { console.log("fromDate:", fromDate.toUTCString()); console.log("toDate: ", toDate.toUTCString()); - contract = "0xC31E54c7a869B9FcBEcc14363CF510d1c41fa443"; - // const contract = "0xC6962004f452bE9203591991D15f6b388e09E8D0"; + // contract = "0xC31E54c7a869B9FcBEcc14363CF510d1c41fa443"; + // contract = "0xC6962004f452bE9203591991D15f6b388e09E8D0"; const daily_res = ['1', '3', '5', '10', '15', '30']; const single_res = ['1W']; @@ -85,7 +85,12 @@ export async function jBars (symbolInfo, contract, from, to, res) { let baseURL = "https://alpha.dexorder.trade/ohlc/" let chainId = useStore().chainId - const meta = metadata.p[contract] + const meta = metadataMap[contract] + if (meta===undefined) { + console.log('warning: no symbol', contract) + return [bars, {noData:true}] + } + // console.log('metadata', contract, metadataMap, meta) let inverted = symbolInfo.inverted if (meta.x?.data) { baseURL = meta.x.data.uri @@ -94,7 +99,7 @@ export async function jBars (symbolInfo, contract, from, to, res) { inverted ^= meta.x.data.inverted } - let url = `${baseURL}/${chainId}/${contract}/${fres}${yrdir}/${contract}-${fres}${yrmo}${date}.json`; + let url = `${baseURL}${chainId}/${contract}/${fres}${yrdir}/${contract}-${fres}${yrmo}${date}.json`; let response = await fetch(url); if (response.ok) { diff --git a/src/version.js b/src/version.js index fd3b544..37f43e6 100644 --- a/src/version.js +++ b/src/version.js @@ -17,3 +17,10 @@ export const version = await versionPromise console.log('version', version) export const metadata = await metadataPromise console.log('metadata', metadata) + +export const metadataMap = {} +for (const poolMeta of metadata.p) + metadataMap[poolMeta.a] = poolMeta +for (const tokenMeta of metadata.t) + metadataMap[tokenMeta.a] = tokenMeta +console.log('metadataMap', metadataMap) \ No newline at end of file