Merge branch 'main' into fix_driver_p2p_sync

taikoxyz · May 21, 2024 · d95a447 · d95a447
2 parents da14dc3 + 293618e
commit d95a447
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 34 deletions.
diff --git a/.github/workflows/blobstorage.yml b/.github/workflows/blobstorage.yml
@@ -5,6 +5,9 @@ on:
     branches: [main]
     paths:
       - "packages/blobstorage/**"
+  pull_request:
+    paths:
+      - "packages/blobstorage/**"
 
 jobs:
   test-blobstorage:

diff --git a/.github/workflows/bridge-ui.yml b/.github/workflows/bridge-ui.yml
@@ -2,13 +2,11 @@ name: Bridge UI CI/CD
 
 on:
   push:
-    branches-ignore:
-      - main
-      - release-please-*
-    paths:
-      - "packages/bridge-ui/**"
     tags:
       - "bridge-ui-v*"
+  pull_request:
+    paths:
+      - "packages/bridge-ui/**"
 
 jobs:
   build-and-test:

diff --git a/.github/workflows/eventindexer.yml b/.github/workflows/eventindexer.yml
@@ -3,6 +3,9 @@ name: Eventindexer
 on:
   push:
     branches: [main]
+    paths:
+      - "packages/eventindexer/**"
+  pull_request:
     paths:
       - "packages/eventindexer/**"
       - "go.mod"

diff --git a/.github/workflows/guardian-prover-health-check-ui.yml b/.github/workflows/guardian-prover-health-check-ui.yml
@@ -2,8 +2,9 @@ name: Guardians UI CI/CD
 
 on:
   push:
-    branches-ignore:
-      - release-please-*
+    tags:
+      - "bridge-ui-v*"
+  pull_request:
     paths:
       - "packages/guardian-prover-health-check-ui/**"
 
@@ -37,7 +38,7 @@ jobs:
       vercel_token: ${{ secrets.VERCEL_TOKEN }}
 
   deploy_guardians-ui_hekla_production:
-    if: ${{ github.ref_name == 'main' && contains(github.ref, 'refs/tags/guardians-ui-') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/guardians-ui-v') }}
     needs: build-and-test
     uses: ./.github/workflows/repo--vercel-deploy.yml
     with:

diff --git a/.github/workflows/guardian-prover-health-check.yml b/.github/workflows/guardian-prover-health-check.yml
@@ -3,6 +3,9 @@ name: Guardians Health Check
 on:
   push:
     branches: [main]
+    paths:
+      - "packages/guardian-prover-health-check/**"
+  pull_request:
     paths:
       - "packages/guardian-prover-health-check/**"
       - "go.mod"

diff --git a/.github/workflows/relayer.yml b/.github/workflows/relayer.yml
@@ -3,6 +3,9 @@ name: Relayer
 on:
   push:
     branches: [main]
+    paths:
+      - "packages/relayer/**"
+  pull_request:
     paths:
       - "packages/relayer/**"
       - "go.mod"

diff --git a/.github/workflows/repo--validate-pr-title.yml b/.github/workflows/repo--validate-pr-title.yml
@@ -40,8 +40,7 @@ jobs:
             guardian-prover-health-check-ui
             protocol
             relayer
-            taikoon
-            snaefell-ui
+            nfts
             ui-lib
             taiko-client
             supplementary-contracts

diff --git a/.github/workflows/snaefell-ui.yml b/.github/workflows/snaefell-ui.yml
@@ -2,10 +2,8 @@ name: Snaefell UI CI/CD
 
 on:
   push:
-    branches-ignore:
-      - release-please-*
-    paths:
-      - "packages/snaefell-ui/**"
+    tags:
+      - "snaefull-ui-v*"
   pull_request:
     paths:
       - "packages/snaefell-ui/**"
@@ -28,7 +26,7 @@ jobs:
       vercel_token: ${{ secrets.VERCEL_TOKEN }}
 
   deploy_snaefell-ui_mainnet_production:
-    if: ${{ github.ref_name == 'main' && contains(github.ref, 'refs/tags/snaefell-ui-') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/snaefull-ui-v') }}
     needs: build-and-test
     uses: ./.github/workflows/repo--vercel-deploy.yml
     with:

diff --git a/.github/workflows/taiko-client--test.yml b/.github/workflows/taiko-client--test.yml
@@ -3,6 +3,9 @@ name: "CI"
 on:
   push:
     branches: [main]
+    paths:
+      - "packages/taiko-client/**"
+  pull_request:
     paths:
       - "packages/taiko-client/**"
       - "go.mod"

diff --git a/.github/workflows/taikoon-ui.yml b/.github/workflows/taikoon-ui.yml
@@ -2,8 +2,9 @@ name: Taikoon UI CI/CD
 
 on:
   push:
-    branches-ignore:
-      - release-please-*
+    tags:
+      - "taikoon-ui-v*"
+  pull_request:
     paths:
       - "packages/taikoon-ui/**"
 
@@ -25,7 +26,7 @@ jobs:
       vercel_token: ${{ secrets.VERCEL_TOKEN }}
 
   deploy_taikoon-ui_mainnet_production:
-    if: ${{ github.ref_name == 'main' && contains(github.ref, 'refs/tags/taikoon-ui-') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/taikoon-ui-v') }}
     needs: build-and-test
     uses: ./.github/workflows/repo--vercel-deploy.yml
     with:

diff --git a/packages/protocol/contracts/L1/libs/LibUtils.sol b/packages/protocol/contracts/L1/libs/LibUtils.sol
@@ -33,7 +33,6 @@ library LibUtils {
         view
         returns (TaikoData.TransitionState storage)
     {
-        _checkBlockId(_state, _blockId);
         (TaikoData.Block storage blk, uint64 slot) = getBlock(_state, _config, _blockId);
 
         uint32 tid = getTransitionId(_state, blk, slot, _parentHash);
@@ -59,7 +58,6 @@ library LibUtils {
         view
         returns (TaikoData.TransitionState storage)
     {
-        _checkBlockId(_state, _blockId);
         (TaikoData.Block storage blk, uint64 slot) = getBlock(_state, _config, _blockId);
 
         if (_tid == 0 || _tid >= blk.nextTransitionId) revert L1_TRANSITION_NOT_FOUND();
@@ -81,9 +79,7 @@ library LibUtils {
     {
         slot_ = _blockId % _config.blockRingBufferSize;
         blk_ = _state.blocks[slot_];
-        if (blk_.blockId != _blockId) {
-            revert L1_INVALID_BLOCK_ID();
-        }
+        if (blk_.blockId != _blockId) revert L1_INVALID_BLOCK_ID();
     }
 
     /// @dev Retrieves the ID of the transition with a given parentHash.
@@ -121,11 +117,4 @@ library LibUtils {
             return block.timestamp >= deadline;
         }
     }
-
-    function _checkBlockId(TaikoData.State storage _state, uint64 _blockId) private view {
-        TaikoData.SlotB memory b = _state.slotB;
-        if (_blockId < b.lastVerifiedBlockId || _blockId >= b.numBlocks) {
-            revert L1_INVALID_BLOCK_ID();
-        }
-    }
 }
diff --git a/packages/protocol/deployments/mainnet-contract-logs.md b/packages/protocol/deployments/mainnet-contract-logs.md
@@ -167,6 +167,8 @@
   - deployed on May 1, 2024 @commit `56dddf2b6`
   - Upgraded from `0x99Ba70E62cab0cB983e66F72330fBDDC11d85501` to `0x9fBBedBBcBb753E7214BE08381efE10d89D712fE` @commit `b90b932` @tx`0x416560cd96dc75ccffebe889e8d1ab3e08b33f814dc4a2bf7c6f9555071d1f6f`
   - `Init2()` called and reset block hash to `0411D9F84A525864E0A7E8BB51667D49C6BF73820AF9E4BC76EA66ADB6BE8903` @tx `0x7311fee56f87294e336393b55939489bc1e810c402f304013475d04c90ca32a9`
+- todo:
+  - upgrade the implementation again
 
 #### assignment_hook
 

diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol
@@ -22,6 +22,7 @@ import "../contracts/automata-attestation/AutomataDcapV3Attestation.sol";
 import "../contracts/automata-attestation/utils/SigVerifyLib.sol";
 import "../contracts/automata-attestation/lib/PEMCertChainLib.sol";
 import "../contracts/verifiers/SgxVerifier.sol";
+import "../contracts/team/proving/ProverSet.sol";
 import "../test/common/erc20/FreeMintERC20.sol";
 import "../test/common/erc20/MayFailFreeMintERC20.sol";
 import "../test/L1/TestTierProvider.sol";
@@ -273,7 +274,8 @@ contract DeployOnL1 is DeployCapability {
         deployProxy({
             name: "assignment_hook",
             impl: address(new AssignmentHook()),
-            data: abi.encodeCall(AssignmentHook.init, (owner, rollupAddressManager))
+            data: abi.encodeCall(AssignmentHook.init, (owner, rollupAddressManager)),
+            registerTo: rollupAddressManager
         });
 
         deployProxy({
@@ -301,7 +303,11 @@ contract DeployOnL1 is DeployCapability {
 
         register(rollupAddressManager, "tier_guardian_minority", guardianProverMinority);
         register(rollupAddressManager, "tier_guardian", guardianProver);
-        register(rollupAddressManager, "tier_provider", address(new TestTierProvider()));
+        register(
+            rollupAddressManager,
+            "tier_provider",
+            address(deployTierProvider(vm.envString("TIER_PROVIDER")))
+        );
 
         address[] memory guardians = vm.envAddress("GUARDIAN_PROVERS", ",");
 
@@ -333,6 +339,14 @@ contract DeployOnL1 is DeployCapability {
         console2.log("SigVerifyLib", address(sigVerifyLib));
         console2.log("PemCertChainLib", address(pemCertChainLib));
         console2.log("AutomataDcapVaAttestation", automataProxy);
+
+        deployProxy({
+            name: "prover_set",
+            impl: address(new ProverSet()),
+            data: abi.encodeCall(
+                ProverSet.init, (owner, vm.envAddress("PROVER_SET_ADMIN"), rollupAddressManager)
+            )
+        });
     }
 
     function deployTierProvider(string memory tierProviderName) private returns (address) {

diff --git a/packages/protocol/script/test_deploy_on_l1.sh b/packages/protocol/script/test_deploy_on_l1.sh
@@ -11,6 +11,7 @@ GUARDIAN_PROVERS="0x1000777700000000000000000000000000000001,0x10007777000000000
 TAIKO_L2_ADDRESS=0x1000777700000000000000000000000000000001 \
 L2_SIGNAL_SERVICE=0x1000777700000000000000000000000000000007 \
 CONTRACT_OWNER=0x60997970C51812dc3A010C7d01b50e0d17dc79C8 \
+PROVER_SET_ADMIN=0x60997970C51812dc3A010C7d01b50e0d17dc79C8 \
 TAIKO_TOKEN_PREMINT_RECIPIENT=0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 \
 TAIKO_TOKEN_NAME="Taiko Token Katla" \
 TAIKO_TOKEN_SYMBOL=TTKOk \

diff --git a/packages/taiko-client/driver/chain_syncer/beaconsync/syncer.go b/packages/taiko-client/driver/chain_syncer/beaconsync/syncer.go
@@ -81,7 +81,7 @@ func (s *Syncer) TriggerBeaconSync(verifyBlockID uint64) error {
 	if err != nil {
 		return err
 	}
-	if fcRes.PayloadStatus.Status != engine.SYNCING {
+	if fcRes.PayloadStatus.Status == engine.INVALID {
 		return fmt.Errorf("unexpected ForkchoiceUpdate response status: %s", fcRes.PayloadStatus.Status)
 	}
 

diff --git a/packages/taikoon-ui/package.json b/packages/taikoon-ui/package.json
@@ -15,7 +15,7 @@
     "test:integration": "playwright test",
     "test:unit": "vitest",
     "start": "npm run generate:abi && vite dev --open",
-    "generate:abi": "cd ../taikoon && pnpm compile && cd - && wagmi generate"
+    "generate:abi": "cd ../nfts && pnpm compile && cd - && wagmi generate"
   },
   "devDependencies": {
     "@chromatic-com/storybook": "^1.3.1",