Merge branch 'main' into handle_reorg

taikoxyz · May 31, 2023 · bc14fff · bc14fff
2 parents 5cf4791 + 85cc830
commit bc14fff
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 21 deletions.
diff --git a/.github/workflows/openai-review.yml b/.github/workflows/openai-review.yml
@@ -23,6 +23,7 @@ jobs:
           PATCH_PR: ${{ github.event.pull_request.number }}
           PATCH_REPO: ${{ github.repository }}
       - id: review
+        if: contains(github.event.issue.labels.*.name, 'chatGPT review')
         uses: taikoxyz/openai-review-action@main
         with:
           GIT_COMMIT_HASH: ${{ github.event.pull_request.head.sha }}

diff --git a/packages/status-page/src/components/StatusIndicator.svelte b/packages/status-page/src/components/StatusIndicator.svelte
@@ -58,6 +58,9 @@
     }
 
     if (watchStatusFunc) {
+      if (!statusFunc) {
+        statusValue = "Waiting for event...";
+      }
       cancelFunc = watchStatusFunc(
         provider,
         contractAddress,

diff --git a/packages/status-page/src/domain/status.ts b/packages/status-page/src/domain/status.ts
@@ -11,7 +11,7 @@ type StatusIndicatorProp = {
     provider: ethers.providers.JsonRpcProvider,
     contractAddress: string,
     onEvent: (value: Status) => void
-  ) => () => void;
+  ) => Promise<() => void>;
   provider: ethers.providers.JsonRpcProvider;
   contractAddress: string;
   header: string;

diff --git a/packages/status-page/src/utils/buildStatusIndicators.ts b/packages/status-page/src/utils/buildStatusIndicators.ts
@@ -319,29 +319,55 @@ export async function buildStatusIndicators(
           TaikoL1,
           provider
         );
-        const averageProofTime = await getAverageProofTime(
-          config.eventIndexerApiUrl
+        const latestBlockNumber = await provider.getBlockNumber();
+        const eventFilter = contract.filters.BlockVerified();
+        const events = await contract.queryFilter(
+          eventFilter,
+          latestBlockNumber - 200,
+          latestBlockNumber
         );
-        const fee = await contract.getProofReward(Number(averageProofTime));
-        return `${ethers.utils.formatUnits(fee, decimals)} ${
-          import.meta.env.VITE_FEE_TOKEN_SYMBOL ?? "TKO"
-        }`;
+
+        if (!events || events.length === 0) {
+          return `0 TKO`;
+        }
+
+        const event = events[events.length - 1].args as any as {
+          reward: BigNumber;
+        };
+
+        return `${ethers.utils.formatUnits(
+          event.reward.toString(),
+          decimals
+        )} TKO`;
+      },
+      watchStatusFunc: async (
+        provider: ethers.providers.JsonRpcProvider,
+        address: string,
+        onEvent: (value: Status) => void
+      ) => {
+        const contract = new Contract(address, TaikoL1, provider);
+        const listener = (id, blockHash, reward, ...args) => {
+          onEvent(
+            `${ethers.utils.formatUnits(reward.toString(), decimals)} TKO`
+          );
+        };
+        contract.on("BlockVerified", listener);
+
+        return () => contract.off("BlockVerified", listener);
       },
-      watchStatusFunc: null,
       provider: config.l1Provider,
       contractAddress: config.l1TaikoAddress,
-      header: "Proof Reward",
-      intervalInMs: 15000,
+      header: "Latest Proof Reward",
+      intervalInMs: 0,
       colorFunc: function (status: Status) {
         return "green"; // todo: whats green, yellow, red?
       },
-      tooltip:
-        "The current reward for successfully submitting a proof for a proposed block on the TaikoL1 smart contract, given the proof time is equal to average proof time.",
+      tooltip: "The most recent proof reward, updated on block being verified.",
     });
     indicators.push({
       provider: config.l1Provider,
       contractAddress: config.l1TaikoAddress,
-      header: "Latest Proof",
+      header: "Latest Proof Time",
       intervalInMs: 0,
       status: "0",
       watchStatusFunc: async (
@@ -350,31 +376,78 @@ export async function buildStatusIndicators(
         onEvent: (value: Status) => void
       ) => {
         const contract = new Contract(address, TaikoL1, provider);
-        const listener = (
+        const listener = async (
           id,
           parentHash,
           blockHash,
           signalRoot,
           prover,
-          provenAt,
-          ...args
+          parentGasUsed,
+          event
         ) => {
-          // ignore oracle prover
           if (
-            prover.toLowerCase() !== config.oracleProverAddress.toLowerCase()
+            prover.toLowerCase() !== config.oracleProverAddress.toLowerCase() &&
+            prover.toLowerCase() !== config.systemProverAddress.toLowerCase()
           ) {
-            onEvent(new Date(provenAt).toTimeString());
+            const proposedBlock = await contract.getBlock(id);
+            const block = await event.getBlock();
+            const proofTime =
+              block.timestamp - proposedBlock._proposedAt.toNumber();
+
+            onEvent(`${proofTime} seconds`);
           }
         };
         contract.on("BlockProven", listener);
 
-        return () => contract.off("BlockProven", listener);
+        return () => {
+          contract.off("BlockProven", listener);
+        };
       },
       colorFunc: function (status: Status) {
         return "green"; // todo: whats green, yellow, red?
       },
       tooltip: "The most recent block proof submitted on TaikoL1 contract.",
     });
+    indicators.push({
+      provider: config.l1Provider,
+      contractAddress: config.l1TaikoAddress,
+      header: "Latest System Proof",
+      intervalInMs: 0,
+      status: "0",
+      watchStatusFunc: async (
+        provider: ethers.providers.JsonRpcProvider,
+        address: string,
+        onEvent: (value: Status) => void
+      ) => {
+        const contract = new Contract(address, TaikoL1, provider);
+        const listener = async (
+          id,
+          parentHash,
+          blockHash,
+          signalRoot,
+          prover,
+          parentGasUsed,
+          event
+        ) => {
+          if (
+            prover.toLowerCase() === config.systemProverAddress.toLowerCase()
+          ) {
+            const block = await event.getBlock();
+
+            onEvent(`${new Date(block.timestamp * 1000).toUTCString()}`);
+          }
+        };
+        contract.on("BlockProven", listener);
+
+        return () => {
+          contract.off("BlockProven", listener);
+        };
+      },
+      colorFunc: function (status: Status) {
+        return "green"; // todo: whats green, yellow, red?
+      },
+      tooltip: "The timestamp of the latest system proof",
+    });
 
     indicators.push({
       provider: config.l1Provider,

diff --git a/packages/status-page/src/utils/initConfig.ts b/packages/status-page/src/utils/initConfig.ts
@@ -30,7 +30,10 @@ export function initConfig(layer: Layer) {
   const feeTokenSymbol = import.meta.env.VITE_FEE_TOKEN_SYMBOL || "TKO";
   const oracleProverAddress =
     import.meta.env.ORACLE_PROVER_ADDRESS ||
-    "0x1567CDAb5F7a69154e61A16D8Ff5eE6A3e991b39";
+    "0x0000000000000000000000000000000000000000";
+  const systemProverAddress =
+    import.meta.env.SYSTEM_PROVER_ADDRESS ||
+    "0x0000000000000000000000000000000000000001";
   const eventIndexerApiUrl =
     layer === Layer.Two
       ? import.meta.env.VITE_L2_EVENT_INDEXER_API_URL
@@ -46,5 +49,6 @@ export function initConfig(layer: Layer) {
     feeTokenSymbol,
     oracleProverAddress,
     eventIndexerApiUrl,
+    systemProverAddress,
   };
 }