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.

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

fix(status-page): change bootnode to regular provider for peers, add a transition and min height #12336

Merged
merged 4 commits into from
Jan 10, 2023
Merged

fix(status-page): change bootnode to regular provider for peers, add a transition and min height #12336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce93377
Transition + taiko node
cyberhorsey Jan 10, 2023
169d71e
rm bootnode url
cyberhorsey Jan 10, 2023
aba91b3
rm indicators and loading concept
cyberhorsey Jan 10, 2023
ef1a648
fade
cyberhorsey Jan 10, 2023
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
1 change: 0 additions & 1 deletion packages/status-page/.default.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ VITE_L1_RPC_URL="https://l1rpc.a1.taiko.xyz"
VITE_L2_RPC_URL="https://l2rpc.a1.taiko.xyz"
VITE_TAIKO_L2_ADDRESS="0x0000777700000000000000000000000000000001"
VITE_TAIKO_L1_ADDRESS="0x7B3AF414448ba906f02a1CA307C56c4ADFF27ce7"
VITE_L2_BOOTNODE_URL="http://104.198.208.154:8545"
VITE_TOKENOMICS_ENABLED=false
VITE_L1_EXPLORER_URL="https://l1explorer.a1.taiko.xyz"
VITE_L2_EXPLORER_URL="https://l2explorer.a1.taiko.xyz"
1 change: 0 additions & 1 deletion packages/status-page/src/App.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
l1TaikoAddress: import.meta.env.VITE_TAIKO_L1_ADDRESS,
l2Provider: l2Provider,
l2TaikoAddress: import.meta.env.VITE_TAIKO_L2_ADDRESS,
l2BootnodeProvider: l2BootnodeProvider,
isTokenomicsEnabled: import.meta.env.VITE_TOKENOMICS_ENABLED,
l1ExplorerUrl: import.meta.env.VITE_L1_EXPLORER_URL,
l2ExplorerUrl: import.meta.env.VITE_L2_EXPLORER_URL,
Expand Down
38 changes: 18 additions & 20 deletions packages/status-page/src/components/StatusIndicator.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { onDestroy, onMount } from "svelte";
import Loader from "../components/Loader.svelte";
import type Status from "../domain/status";
import { fade } from "svelte/transition";

export let provider: ethers.providers.JsonRpcProvider;
export let contractAddress: string;
Expand Down Expand Up @@ -31,16 +32,11 @@

let statusValue: Status;

let loading: boolean = false;

onMount(async () => {
try {
loading = true;
statusValue = await statusFunc(provider, contractAddress);
} catch (e) {
console.error(e);
} finally {
loading = false;
}

if (watchStatusFunc) {
Expand All @@ -52,12 +48,9 @@
if (intervalInMs !== 0) {
interval = setInterval(async () => {
try {
loading = true;
statusValue = await statusFunc(provider, contractAddress);
} catch (e) {
console.error(e);
} finally {
loading = false;
}
}, intervalInMs);
}
Expand All @@ -68,18 +61,23 @@
});
</script>

<div class="rounded-3xl border-2 border-zinc-800 border-solid p-4">
<div
class="rounded-3xl border-2 border-zinc-800 border-solid p-4 min-h-full h-28"
>
<h2 class="font-bold">{header}</h2>
{#if loading}
<Loader />
{:else if statusValue || typeof statusValue === "number"}
<span
class={onClick ? "cursor-pointer" : ""}
on:click={() => onClick(statusValue)}
>
<span class={colorFunc(statusValue)}>
{displayStatusValue(statusValue)}
{#key statusValue}
{#if statusValue || typeof statusValue === "number"}
<span
transition:fade
class="pt-2 inline-block align-bottom {onClick ? 'cursor-pointer' : ''}"
on:click={() => onClick(statusValue)}
>
<span class={colorFunc(statusValue)}>
{displayStatusValue(statusValue)}
</span>
</span>
</span>
{/if}
{:else}
<Loader />
{/if}
{/key}
</div>
13 changes: 0 additions & 13 deletions packages/status-page/src/pages/home/Home.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import { getLastVerifiedBlockId } from "../../utils/getLastVerifiedBlockId";
import { getNextBlockId } from "../../utils/getNextBlockId";
import { getGasPrice } from "../../utils/getGasPrice";
import { getPeerCount } from "../../utils/getPeerCount";
import { getQueuedTransactions } from "../../utils/getQueuedTransactions";
import { onMount } from "svelte";
import { getProofReward } from "../../utils/getProofReward";
Expand All @@ -21,7 +20,6 @@
export let l1TaikoAddress: string;
export let l2Provider: ethers.providers.JsonRpcProvider;
export let l2TaikoAddress: string;
export let l2BootnodeProvider: ethers.providers.JsonRpcProvider;
export let isTokenomicsEnabled: boolean = false;
export let l1ExplorerUrl: string;
export let l2ExplorerUrl: string;
Expand Down Expand Up @@ -164,17 +162,6 @@
return "green";
},
},
{
statusFunc: getPeerCount,
watchStatusFunc: null,
provider: l2BootnodeProvider,
contractAddress: "",
header: "Peers",
intervalInMs: 60000,
colorFunc: (value: Status) => {
return "green";
},
},
];

onMount(() => {
Expand Down
9 changes: 0 additions & 9 deletions packages/status-page/src/utils/getPeerCount.ts
View file
Open in desktop

This file was deleted.