Skip to content
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.

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

Already on GitHub? Sign in to your account

fix(status-page): gas price should use l2provider, add descriptions and tooltips #12490

Merged
merged 6 commits into from
Jan 11, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 47 additions & 0 deletions packages/status-page/src/components/Modal.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<script lang="ts">
export let title: string = null;
export let isOpen: boolean = false;
export let onClose: () => void = null;
export let showXButton: boolean = true;

const onCloseClicked = () => {
isOpen = false;
if (onClose) {
onClose();
}
};
</script>

<svelte:window
on:keydown={function (e) {
if (e.key === "Escape") {
onCloseClicked();
}
}}
/>

<div class="modal bg-black/60" class:modal-open={isOpen}>
<div class="modal-box bg-dark-3">
<h3 class="font-bold text-lg text-center mt-4">{title}</h3>
{#if showXButton}
<div class="modal-action mt-0">
<button
type="button"
class="btn btn-sm btn-circle absolute right-2 top-2 cursor-pointer font-sans text-lg"
on:click={onCloseClicked}
>
&times;
</button>
</div>
{/if}
<div class="modal-body">
<slot />
</div>
</div>
</div>

<style>
.modal {
align-items: center;
}
</style>
23 changes: 22 additions & 1 deletion packages/status-page/src/components/StatusIndicator.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import Loader from "../components/Loader.svelte";
import type Status from "../domain/status";
import { fade } from "svelte/transition";
import Tooltip from "./Tooltip.svelte";
import TooltipModal from "./TooltipModal.svelte";

export let provider: ethers.providers.JsonRpcProvider;
export let contractAddress: string;
Expand All @@ -28,10 +30,14 @@

export let intervalInMs: number = 0;

export let tooltip: string = "";

let interval: NodeJS.Timer;

let statusValue: Status;

let tooltipOpen: boolean = false;

onMount(async () => {
try {
statusValue = await statusFunc(provider, contractAddress);
Expand Down Expand Up @@ -64,7 +70,12 @@
<div
class="rounded-3xl border-2 border-zinc-800 border-solid p-4 min-h-full h-28"
>
<h2 class="font-bold">{header}</h2>
<span class="cursor-pointer float-right"
><Tooltip bind:isOpen={tooltipOpen} /></span
>
<h2 class="font-bold">
{header}
</h2>
{#key statusValue}
{#if statusValue || typeof statusValue === "number"}
<span
Expand All @@ -81,3 +92,13 @@
{/if}
{/key}
</div>

{#if tooltip}
<TooltipModal title={header} bind:isOpen={tooltipOpen}>
<span slot="body">
<p class="text-left">
{tooltip}
</p>
</span>
</TooltipModal>
{/if}
11 changes: 11 additions & 0 deletions packages/status-page/src/components/Tooltip.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<script lang="ts">
import { QuestionMarkCircle } from "svelte-heros-v2";

export let isOpen: boolean = false;
</script>

<QuestionMarkCircle
on:click={() => (isOpen = true)}
size="18"
variation="outline"
/>
17 changes: 17 additions & 0 deletions packages/status-page/src/components/TooltipModal.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<script lang="ts">
import Modal from "./Modal.svelte";

export let title: string;
export let isOpen: boolean = false;
</script>

<Modal {title} bind:isOpen>
<div class="flex h-full min-h-tooltip-modal w-full flex-col justify-between">
<div class="tip-body mb-4 flex-auto">
<slot name="body" />
</div>
<div class="tip-footer self-start">
<slot name="footer" />
</div>
</div>
</Modal>
35 changes: 29 additions & 6 deletions packages/status-page/src/pages/home/Home.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
onClick: (value: Status) => {
window.open(`${l2ExplorerUrl}/block/${value.toString()}`, "_blank");
},
tooltip:
"The most recent Layer 2 Header that has been synchronized with the TaikoL1 smart contract.",
},
{
statusFunc: getLatestSyncedHeader,
Expand All @@ -52,6 +54,8 @@
onClick: (value: Status) => {
window.open(`${l1ExplorerUrl}/block/${value.toString()}`, "_blank");
},
tooltip:
"The most recent Layer 1 Header that has been synchronized with the TaikoL2 smart contract. The headers are synchronized with every L2 block.",
},
// {
// statusFunc: getProposers,
Expand All @@ -75,6 +79,8 @@
if (BigNumber.from(value).gt(4000)) return "red";
return "green";
},
tooltip:
"The current processable transactions in the mempool that have not been added to a block yet.",
},
{
statusFunc: getQueuedTransactions,
Expand All @@ -87,6 +93,8 @@
if (BigNumber.from(value).gt(4000)) return "red";
return "green";
},
tooltip:
"The current transactions in the mempool where the transaction nonce is not in sequence. They are currently non-processable.",
},
{
statusFunc: getIsHalted,
Expand All @@ -99,6 +107,7 @@
if (value.toString() === "true") return "red";
return "green";
},
tooltip: "Whether the Taiko smart contract on Layer 1 has been halted",
cyberhorsey marked this conversation as resolved.
Show resolved Hide resolved
cyberhorsey marked this conversation as resolved.
Show resolved Hide resolved
},
{
statusFunc: getAvailableSlots,
Expand All @@ -111,6 +120,8 @@
if (BigNumber.from(value).eq(0)) return "red";
return "green";
},
tooltip:
"The amount of slots for proposed blocks on the TaikoL1 smart contract. When this number is 0, no blocks can be proposed until a block has been proven.",
},
{
statusFunc: getLastVerifiedBlockId,
Expand All @@ -122,6 +133,8 @@
colorFunc: (value: Status) => {
return "green";
},
tooltip:
"The most recently verified Layer 2 block on the TaikoL1 smart contract.",
},
{
statusFunc: getNextBlockId,
Expand All @@ -133,6 +146,8 @@
colorFunc: (value: Status) => {
return "green";
},
tooltip:
"The ID that the next proposed block on the TaikoL1 smart contract will receive.",
},
{
statusFunc: getPendingBlocks,
Expand All @@ -150,17 +165,20 @@
return "green";
}
},
tooltip:
"The amount of pending proposed blocks that have not been proven on the TaikoL1 smart contract.",
},
{
statusFunc: getGasPrice,
watchStatusFunc: null,
provider: l1Provider,
contractAddress: l1TaikoAddress,
provider: l2Provider,
contractAddress: "",
header: "Gas Price (gwei)",
intervalInMs: 20000,
colorFunc: (value: Status) => {
return "green";
},
tooltip: "The current recommended gas price for a transaction on Layer 2",
cyberhorsey marked this conversation as resolved.
Show resolved Hide resolved
},
];

Expand All @@ -169,21 +187,25 @@
statusIndicators.push({
statusFunc: getBlockFee,
watchStatusFunc: null,
provider: l2Provider,
contractAddress: l2TaikoAddress,
provider: l1Provider,
contractAddress: l1TaikoAddress,
header: "Block Fee",
intervalInMs: 15000,
colorFunc: null,
tooltip:
"The current fee to propose a block to the TaikoL1 smart contract.",
});

statusIndicators.push({
statusFunc: getProofReward,
watchStatusFunc: null,
provider: l2Provider,
contractAddress: l2TaikoAddress,
provider: l1Provider,
contractAddress: l1TaikoAddress,
header: "Proof Reward",
intervalInMs: 15000,
colorFunc: null,
tooltip:
"The current reward for successfully submitting a proof for a proposed block on the TaikoL1 smart contract.",
});
}
});
Expand All @@ -205,6 +227,7 @@
colorFunc={statusIndicator.colorFunc}
onClick={statusIndicator.onClick}
intervalInMs={statusIndicator.intervalInMs}
tooltip={statusIndicator.tooltip}
/>
{/each}
</div>