Merge branch 'prover_tests' of github.com:taikochain/taiko-mono into …

…prover_tests
taikoxyz · Jan 26, 2023 · 4422317 · 4422317
2 parents cf12914 + 5942f88
commit 4422317
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/protocol.yml b/.github/workflows/protocol.yml
@@ -32,9 +32,9 @@ jobs:
         working-directory: ./packages/protocol
         run: pnpm test:integration
 
-      - name: protocol - Tokenomics Tests
-        working-directory: ./packages/protocol
-        run: pnpm test:tokenomics
+      # - name: protocol - Tokenomics Tests
+      #   working-directory: ./packages/protocol
+      #   run: pnpm test:tokenomics
 
       - name: protocol - Test Coverage
         working-directory: ./packages/protocol

diff --git a/packages/protocol/contracts/L2/TaikoL2.sol b/packages/protocol/contracts/L2/TaikoL2.sol
@@ -27,7 +27,7 @@ contract TaikoL2 is AddressResolver, ReentrancyGuard, IHeaderSync {
     mapping(uint256 => bytes32) private l2Hashes;
     mapping(uint256 => bytes32) private l1Hashes;
     bytes32 public publicInputHash;
-    bytes32 public latestSyncedHeader;
+    uint256 public latestSyncedL1Height;
 
     uint256[46] private __gap;
 
@@ -79,8 +79,8 @@ contract TaikoL2 is AddressResolver, ReentrancyGuard, IHeaderSync {
             _checkPublicInputs();
         }
 
+        latestSyncedL1Height = l1Height;
         l1Hashes[l1Height] = l1Hash;
-        latestSyncedHeader = l1Hash;
         emit HeaderSynced(block.number, l1Height, l1Hash);
     }
 
@@ -140,7 +140,7 @@ contract TaikoL2 is AddressResolver, ReentrancyGuard, IHeaderSync {
     }
 
     function getLatestSyncedHeader() public view override returns (bytes32) {
-        return latestSyncedHeader;
+        return l1Hashes[latestSyncedL1Height];
     }
 
     function getBlockHash(uint256 number) public view returns (bytes32) {