revert provenat

taikoxyz · Feb 8, 2023 · b8d6f94 · b8d6f94
1 parent 376a45b
commit b8d6f94
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/packages/protocol/contracts/L1/TaikoData.sol b/packages/protocol/contracts/L1/TaikoData.sol
@@ -101,7 +101,7 @@ library TaikoData {
         // the proof time moving average, note that for each block, only the
         // first proof's time is considered.
         uint64 avgProofTime;
-        uint64 lastProvenAt;
+        uint64 __reservedC1;
         // Reserved
         uint256[42] __gap;
     }

diff --git a/packages/protocol/contracts/L1/libs/LibProving.sol b/packages/protocol/contracts/L1/libs/LibProving.sol
@@ -365,8 +365,6 @@ library LibProving {
 
         fc.provers.push(prover);
 
-        state.lastProvenAt = uint64(block.timestamp);
-
         emit BlockProven({
             id: target.id,
             parentHash: parentHash,

diff --git a/packages/protocol/contracts/L1/libs/LibUtils.sol b/packages/protocol/contracts/L1/libs/LibUtils.sol
@@ -30,7 +30,6 @@ library LibUtils {
         uint64 latestVerifiedHeight;
         uint64 latestVerifiedId;
         uint64 avgProofTime;
-        uint64 lastProvenAt;
     }
     event Halted(bool halted);
 
@@ -75,8 +74,7 @@ library LibUtils {
                 avgBlockTime: state.avgBlockTime,
                 latestVerifiedHeight: state.latestVerifiedHeight,
                 latestVerifiedId: state.latestVerifiedId,
-                avgProofTime: state.avgProofTime,
-                lastProvenAt: state.lastProvenAt
+                avgProofTime: state.avgProofTime
             });
     }
 

diff --git a/packages/status-page/src/pages/home/Home.svelte b/packages/status-page/src/pages/home/Home.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { BigNumber, ethers } from "ethers";
+  import { BigNumber, Contract, ethers } from "ethers";
   import { getLatestSyncedHeader } from "../../utils/getLatestSyncedHeader";
   import StatusIndicator from "../../components/StatusIndicator.svelte";
   import { watchHeaderSynced } from "../../utils/watchHeaderSynced";
@@ -15,9 +15,9 @@
   import { onMount } from "svelte";
   import { getProofReward } from "../../utils/getProofReward";
   import type { Status, StatusIndicatorProp } from "../../domain/status";
-  import { getConfig } from "../../utils/getConfig";
   import { getStateVariables } from "../../utils/getStateVariables";
   import { truncateString } from "../../utils/truncateString";
+  import TaikoL1 from "../../constants/abi/TaikoL1";
 
   export let l1Provider: ethers.providers.JsonRpcProvider;
   export let l1TaikoAddress: string;
@@ -233,13 +233,18 @@
         provider: l1Provider,
         contractAddress: l1TaikoAddress,
         header: "Latest Proof",
-        intervalInMs: 5 * 1000,
-        statusFunc: async (
+        intervalInMs: 0,
+        status: "0",
+        watchStatusFunc: async (
           provider: ethers.providers.JsonRpcProvider,
-          address: string
+          address: string,
+          onEvent: (value: Status) => void
         ) => {
-          const stateVars = await getStateVariables(provider, address);
-          return new Date(stateVars.lastProvenAt.toNumber() * 1000).toString();
+          const contract = new Contract(address, TaikoL1, provider);
+          contract.on("BlockProven", (id, parentHash, blockHash, timestamp) => {
+            console.log("block proven", timestamp);
+            onEvent(new Date(timestamp).toString());
+          });
         },
         colorFunc: function (status: Status) {
           return "green"; // todo: whats green, yellow, red?