Add effectiveTimestamp support for legacy network

skalenetwork · Dec 20, 2023 · 84d0672 · 84d0672
1 parent aac4be6
commit 84d0672
Show file tree

Hide file tree

Showing 7 changed files with 247 additions and 15 deletions.
diff --git a/src/App.scss b/src/App.scss
@@ -242,7 +242,7 @@ body::-webkit-scrollbar {
 .br__tile {
   height: 150px;
   border-radius: 25px !important;
-  border: 1px solid #171616 !important
+  border: 1px solid #171616 !important;
 }
 
 .pageCard {
@@ -369,7 +369,7 @@ body::-webkit-scrollbar {
   text-transform: none !important;
   color: #ffffffe6 !important;
   padding: 6px 10px 6px 12px !important;
-  font-size: 0.75rem !important;
+  font-size: 0.7rem !important;
   min-width: 55px;
 
   width: 100%;

diff --git a/src/components/Paymaster.tsx b/src/components/Paymaster.tsx
@@ -87,7 +87,7 @@ export default function Paymaster(props: { mpc: MetaportCore; name: string }) {
   }, [sklToken, address])
 
   async function loadPaymasterInfo() {
-    const info = await getPaymasterInfo(paymaster, props.name)
+    const info = await getPaymasterInfo(paymaster, props.name, network)
     let skl = sklToken
     if (skl === undefined) {
       skl = new Contract(info.skaleToken, ERC_ABIS.erc20.abi, paymaster.runner)

diff --git a/src/components/PricingInfo.tsx b/src/components/PricingInfo.tsx
@@ -44,8 +44,14 @@ export default function PricingInfo(props: { info: PaymasterInfo }) {
   const chainPriceUsd = fromWei(props.info.schainPricePerMonth, DEFAULT_ERC20_DECIMALS)
   const chainPriceSkl = divideBigInts(props.info.schainPricePerMonth, props.info.oneSklPrice)
 
-  const untilDueDateDays = daysBetweenNowAndTimestamp(props.info.schain.paidUntil)
-  const untilDueDateMonths = monthsBetweenNowAndTimestamp(props.info.schain.paidUntil)
+  const untilDueDateDays = daysBetweenNowAndTimestamp(
+    props.info.schain.paidUntil,
+    props.info.effectiveTimestamp
+  )
+  const untilDueDateMonths = monthsBetweenNowAndTimestamp(
+    props.info.schain.paidUntil,
+    props.info.effectiveTimestamp
+  )
   const dueDateStatus = getDueDateStatus(untilDueDateDays)
   const dueDateText = untilDueDateDays < 0 ? 'Payment overdue' : 'Paid for'
 

diff --git a/src/components/Topup.tsx b/src/components/Topup.tsx
@@ -67,7 +67,10 @@ export default function Topup(props: {
   const balanceOk = props.tokenBalance >= totalPriceWei
   const topupBtnText = balanceOk ? 'Top-up chain' : 'Insufficient funds'
 
-  const untilDueDateMonths = monthsBetweenNowAndTimestamp(props.info.schain.paidUntil)
+  const untilDueDateMonths = monthsBetweenNowAndTimestamp(
+    props.info.schain.paidUntil,
+    props.info.effectiveTimestamp
+  )
   const maxTopupPeriod = Number(props.info.maxReplenishmentPeriod) - untilDueDateMonths
 
   return (

diff --git a/src/core/paymaster.ts b/src/core/paymaster.ts
@@ -33,6 +33,7 @@ export interface PaymasterInfo {
     name: string
     paidUntil: bigint
   }
+  effectiveTimestamp?: bigint
 }
 
 export type DueDateStatus = 'primary' | 'warning' | 'error' | 'success'
@@ -74,7 +75,8 @@ export function initPaymaster(mpc: MetaportCore): Contract {
 
 export async function getPaymasterInfo(
   paymaster: Contract,
-  targetChainName: string
+  targetChainName: string,
+  skaleNetwork: interfaces.SkaleNetwork
 ): Promise<PaymasterInfo> {
   const rawData = await Promise.all([
     paymaster.maxReplenishmentPeriod(),
@@ -83,6 +85,12 @@ export async function getPaymasterInfo(
     paymaster.skaleToken(),
     paymaster.schains(id(targetChainName))
   ])
+
+  let effectiveTimestamp
+  if (skaleNetwork === 'legacy') {
+    effectiveTimestamp = await paymaster.effectiveTimestamp()
+  }
+
   return {
     maxReplenishmentPeriod: rawData[0],
     oneSklPrice: rawData[1],
@@ -91,7 +99,8 @@ export async function getPaymasterInfo(
     schain: {
       name: rawData[4][1],
       paidUntil: rawData[4][2]
-    }
+    },
+    effectiveTimestamp
   }
 }
 

diff --git a/src/core/timeHelper.ts b/src/core/timeHelper.ts
@@ -43,16 +43,17 @@ export function monthsBetweenTimestamps(from: bigint, to: bigint): number {
   return Math.round(diffInDays / AVG_MONTH_LENGTH)
 }
 
-export function getCurrentTsBigInt(): bigint {
+export function getCurrentTsBigInt(customCurrentTs?: bigint): bigint {
+  if (customCurrentTs !== undefined && customCurrentTs !== null) return customCurrentTs
   return BigInt(Math.round(new Date().getTime() / 1000))
 }
 
-export function daysBetweenNowAndTimestamp(timestamp: bigint): number {
-  return daysBetweenTimestamps(getCurrentTsBigInt(), timestamp)
+export function daysBetweenNowAndTimestamp(timestamp: bigint, customCurrentTs?: bigint): number {
+  return daysBetweenTimestamps(getCurrentTsBigInt(customCurrentTs), timestamp)
 }
 
-export function monthsBetweenNowAndTimestamp(timestamp: bigint): number {
-  return monthsBetweenTimestamps(getCurrentTsBigInt(), timestamp)
+export function monthsBetweenNowAndTimestamp(timestamp: bigint, customCurrentTs?: bigint): number {
+  return monthsBetweenTimestamps(getCurrentTsBigInt(customCurrentTs), timestamp)
 }
 
 export function calculateElapsedPercentage(