Merge branch 'main' into s2-badges-remigrate-fix

taikoxyz · Dec 16, 2024 · 16783c3 · 16783c3
2 parents 5b0a77c + a095c69
commit 16783c3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/protocol/contracts/layer1/hekla/HeklaTaikoToken.sol b/packages/protocol/contracts/layer1/hekla/HeklaTaikoToken.sol
@@ -83,6 +83,16 @@ contract HeklaTaikoToken is EssentialContract, ERC20SnapshotUpgradeable, ERC20Vo
         return super.transferFrom(_from, _to, _amount);
     }
 
+    function clock() public view override returns (uint48) {
+        return SafeCastUpgradeable.toUint48(block.timestamp);
+    }
+
+    // solhint-disable-next-line func-name-mixedcase
+    function CLOCK_MODE() public pure override returns (string memory) {
+        // See https://eips.ethereum.org/EIPS/eip-6372
+        return "mode=timestamp";
+    }
+
     function name() public pure override returns (string memory) {
         return "Taiko Token";
     }

diff --git a/packages/protocol/deployments/hekla-contract-logs.md b/packages/protocol/deployments/hekla-contract-logs.md
@@ -21,12 +21,13 @@
 ### taiko_token
 
 - proxy: `0x6490E12d480549D333499236fF2Ba6676C296011`
-- impl: `0x01BB2fD6D80942CE95B43c1322530fe690F2bc0e`
+- impl: `0xD826bb700EAEdD6E83C32681f95a35Ac7F290104`
 - owner: `0x1D2D1bb9D180541E88a6a682aCf3f61c1605B190`
 - logs:
   - deployed on Mar 29, 2024 at commit `b341a68d5`
   - upgraded on Jun 18, 2024, added `batchTransfer` method.
   - transferred ownership on Jul 8, 2024
+  - upgraded on Dec 16, 2024 at commit `ccc9500`
 
 ### signal_service