Skip to content

fix: cache nowSeconds() and handle negative BigInt in format functions #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sertug17 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: cache nowSeconds() and handle negative BigInt in format functions #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/commands/sessions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,7 @@ function sessionItem(record: ChannelRecord) {
record.accepted_cumulative > 0n ? record.accepted_cumulative : record.cumulative_amount;
const remaining = record.deposit > spent ? record.deposit - spent : 0n;
const status = sessionStatus(record);
const now = nowSeconds();
return {
channel_id: record.channel_id,
network: record.network,
Expand All @@ -670,7 +671,7 @@ function sessionItem(record: ChannelRecord) {
...(status === "closing" || status === "finalizable"
? {
remaining_secs:
record.grace_ready_at > nowSeconds() ? record.grace_ready_at - nowSeconds() : 0,
record.grace_ready_at > now ? record.grace_ready_at - now : 0,
}
: {}),
created_at: formatUnixTimestamp(record.created_at),
Expand Down
27 changes: 18 additions & 9 deletions src/shared/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,29 @@ export function formatMicroUnits(value: string) {
}

export function formatTokenUnits(value: bigint, decimals: number) {
const negative = value < 0n;
const abs = negative ? -value : value;
const divisor = 10n ** BigInt(decimals);
const whole = value / divisor;
const fractional = value % divisor;
if (decimals === 0) return whole.toString();
if (fractional === 0n) return `${whole}.${"0".repeat(decimals)}`;
return `${whole}.${fractional.toString().padStart(decimals, "0")}`;
const whole = abs / divisor;
const fractional = abs % divisor;
const formatted =
decimals === 0
? whole.toString()
: fractional === 0n
? `${whole}.${"0".repeat(decimals)}`
: `${whole}.${fractional.toString().padStart(decimals, "0")}`;
return negative ? `-${formatted}` : formatted;
}

export function formatCreditBalance(rawBalance: bigint) {
const negative = rawBalance < 0n;
const abs = negative ? -rawBalance : rawBalance;
const divisor = 10_000n;
const whole = rawBalance / divisor;
const fractional = rawBalance % divisor;
if (fractional === 0n) return whole.toString();
return `${whole}.${fractional.toString().padStart(4, "0")}`;
const whole = abs / divisor;
const fractional = abs % divisor;
const formatted =
fractional === 0n ? whole.toString() : `${whole}.${fractional.toString().padStart(4, "0")}`;
return negative ? `-${formatted}` : formatted;
}

export function isChannelId(value: string) {
Expand Down