From e1d3b33cda37a24b7f9fd9c78b69a5ce64c5c6ff Mon Sep 17 00:00:00 2001 From: 0xbarbs <0xbarbs@proton.me> Date: Fri, 2 Jun 2023 14:20:46 +0100 Subject: [PATCH] fix: overdue calculation and blocktime for v2 networks --- src/hooks/useBlockTime.js | 11 +++++++++-- src/hooks/useLastRepayData.js | 11 +++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/hooks/useBlockTime.js b/src/hooks/useBlockTime.js index 1417a035..3917b9eb 100644 --- a/src/hooks/useBlockTime.js +++ b/src/hooks/useBlockTime.js @@ -4,6 +4,7 @@ import { useProvider } from "wagmi"; import { useEffect, useState } from "react"; import { format } from "date-fns"; import { ZERO } from "constants"; +import { getVersion, Versions } from "providers/Version"; dayjs.extend(relativeTime); @@ -16,8 +17,14 @@ export function useBlockTime(blockNumber, chainId, dateFormat = "dd LLL yyyy") { useEffect(() => { const load = async () => { if (!blockNumber.eq(ZERO)) { - const block = await provider.getBlock(Number(blockNumber.toString())); - setTimestamp(block.timestamp * 1000); + const blockNum = Number(blockNumber.toString()); + + if (getVersion(chainId) === Versions.V2) { + setTimestamp(blockNum * 1000); + } else { + const block = await provider.getBlock(blockNum); + setTimestamp(block.timestamp * 1000); + } } }; provider && load(); diff --git a/src/hooks/useLastRepayData.js b/src/hooks/useLastRepayData.js index 1efad222..a3c20af0 100644 --- a/src/hooks/useLastRepayData.js +++ b/src/hooks/useLastRepayData.js @@ -1,5 +1,5 @@ import { useProtocol } from "providers/ProtocolData"; -import { BlockSpeed, ZERO } from "constants"; +import { ZERO } from "constants"; import { useNetwork } from "wagmi"; import { mainnet, arbitrum } from "wagmi/chains"; import { useBlockTime } from "hooks/useBlockTime"; @@ -25,17 +25,16 @@ export function useLastRepayData(lastRepay) { const { data: protocol } = useProtocol(); const { chain: connectedChain } = useNetwork(); - const { overdueBlocks = ZERO } = protocol; + const { overdueBlocks = ZERO, overdueTime = ZERO } = protocol; // For arbitrum we use mainnet to correctly calculate repays as it uses - const chainId = - connectedChain.id === arbitrum.id ? mainnet.id : connectedChain.id; + const chainId = connectedChain.id === arbitrum.id ? mainnet.id : connectedChain.id; const today = new Date(); const lastRepayData = useBlockTime(lastRepay, chainId); - const overdueInMilliseconds = overdueBlocks - .mul(BlockSpeed[chainId]) + const overdueInMilliseconds = (overdueBlocks.eq(ZERO) ? overdueTime : overdueBlocks) + .mul(1000) .toNumber(); const paymentDueTimestamp =