Merge branch 'main' into soulbound-snaefell

taikoxyz · May 27, 2024 · b69090c · b69090c
2 parents e98b78c + 742c009
commit b69090c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
   "packages/branding": "0.4.0",
   "packages/bridge-ui": "2.11.0",
-  "packages/docs-site": "1.5.0",
+  "packages/docs-site": "1.6.0",
   "packages/eventindexer": "0.13.0",
   "packages/fork-diff": "0.5.0",
   "packages/guardian-prover-health-check": "0.1.0",

diff --git a/packages/docs-site/CHANGELOG.md b/packages/docs-site/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.6.0](https://github.com/taikoxyz/taiko-mono/compare/docs-site-v1.5.0...docs-site-v1.6.0) (2024-05-27)
+
+
+### Features
+
+* **docs-site:** update working on what is taiko ([#17371](https://github.com/taikoxyz/taiko-mono/issues/17371)) ([72a72bd](https://github.com/taikoxyz/taiko-mono/commit/72a72bd4f37b7c6f9761e175a371e0d46abd5169))
+
 ## [1.5.0](https://github.com/taikoxyz/taiko-mono/compare/docs-site-v1.4.1...docs-site-v1.5.0) (2024-05-27)
 
 

diff --git a/packages/docs-site/package.json b/packages/docs-site/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docs-site",
   "type": "module",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",

diff --git a/packages/docs-site/src/content/docs/core-concepts/what-is-taiko.md b/packages/docs-site/src/content/docs/core-concepts/what-is-taiko.md
@@ -5,7 +5,7 @@ description: Core concept page for "What is Taiko?".
 
 Ethereum is too expensive. We believe in Ethereum's core properties (e.g., censorship-resistant, permissionless, secure). We also believe that rollups should **extend** (not augment) these properties.
 
-Thus, we are building a [based rollup](/core-concepts/based-sequencing) which makes Ethereum cheaper while maintaining its properties:
+Taiko is a [based rollup](/core-concepts/based-sequencing) which makes Ethereum cheaper while maintaining its properties:
 
 - [Based contestable rollup](/core-concepts/contestable-rollups): A configurable rollup to reduce transaction fees on Ethereum.
 - [Based booster rollup](/core-concepts/booster-rollups): An innovative approach to **native L1 scaling**.
@@ -29,10 +29,8 @@ Taiko is a **fully open source, permissionless, Ethereum-equivalent ZK-Rollup**.
 
 ### Frontends
 
-- [Bridge UI](https://bridge.hekla.taiko.xyz)
-- [Blockscout block explorer](https://explorer.hekla.taiko.xyz)
-- [Network + Guardian Prover status page](https://status.taiko.xyz)
-- [Fork of Uniswap v3 UI](https://swap.hekla.taiko.xyz)
+- [Bridge UI](https://bridge.taiko.xyz)
+- [Network status page](https://status.taiko.xyz)
 - [Main homepage](https://taiko.xyz) + [this documentation site](https://docs.taiko.xyz)
 - [Geth fork diff page](https://geth.taiko.xyz)
 
@@ -55,5 +53,5 @@ Taiko is a **fully open source, permissionless, Ethereum-equivalent ZK-Rollup**.
 - [Taiko protocol smart contracts](https://github.com/taikoxyz/taiko-mono)
 - [Taiko geth](https://github.com/taikoxyz/taiko-geth)
 - [Taiko client](https://github.com/taikoxyz/taiko-client)
-- [Raiko client](https://github.com/taikoxyz/raiko)
+- [Raiko](https://github.com/taikoxyz/raiko)
 - [Simple taiko node](https://github.com/taikoxyz/simple-taiko-node)
diff --git a/packages/protocol/contracts/L1/libs/LibProving.sol b/packages/protocol/contracts/L1/libs/LibProving.sol
@@ -21,6 +21,7 @@ library LibProving {
     struct Local {
         TaikoData.SlotB b;
         ITierProvider.Tier tier;
+        ITierProvider.Tier minTier;
         bytes32 metaHash;
         address assignedProver;
         uint64 slot;
@@ -152,11 +153,17 @@ library LibProving {
 
         // Retrieve the tier configurations. If the tier is not supported, the
         // subsequent action will result in a revert.
-        local.tier =
-            ITierProvider(_resolver.resolve(LibStrings.B_TIER_PROVIDER, false)).getTier(_proof.tier);
+        ITierProvider tierProvider =
+            ITierProvider(_resolver.resolve(LibStrings.B_TIER_PROVIDER, false));
 
-        local.inProvingWindow =
-            !LibUtils.isPostDeadline(ts.timestamp, local.b.lastUnpausedAt, local.tier.provingWindow);
+        local.tier = tierProvider.getTier(_proof.tier);
+        local.minTier = tierProvider.getTier(_meta.minTier);
+
+        local.inProvingWindow = !LibUtils.isPostDeadline({
+            _tsTimestamp: ts.timestamp,
+            _lastUnpausedAt: local.b.lastUnpausedAt,
+            _windowMinutes: local.minTier.provingWindow
+        });
 
         // Checks if only the assigned prover is permissioned to prove the block.
         // The guardian prover is granted exclusive permission to prove only the first