feat(protocol): add a new tier B_TIER_GUARDIAN_MINORITY (#16790)

taikoxyz · Apr 22, 2024 · cab4071 · cab4071
1 parent 8e12210
commit cab4071
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/packages/protocol/contracts/L1/tiers/ITierProvider.sol b/packages/protocol/contracts/L1/tiers/ITierProvider.sol
@@ -44,6 +44,9 @@ library LibTiers {
     /// @notice SGX + ZKVM tier ID.
     uint16 public constant TIER_SGX_ZKVM = 300;
 
-    /// @notice Guardian tier ID.
+    /// @notice Guardian tier ID with minority approval.
+    uint16 public constant TIER_GUARDIAN_MINORITY = 900;
+
+    /// @notice Guardian tier ID with majority approval.
     uint16 public constant TIER_GUARDIAN = 1000;
 }
diff --git a/packages/protocol/contracts/L1/tiers/TierProviderV2.sol b/packages/protocol/contracts/L1/tiers/TierProviderV2.sol
@@ -41,6 +41,17 @@ contract TierProviderV2 is EssentialContract, ITierProvider {
             });
         }
 
+        if (_tierId == LibTiers.TIER_GUARDIAN_MINORITY) {
+            return ITierProvider.Tier({
+                verifierName: LibStrings.B_TIER_GUARDIAN_MINORITY,
+                validityBond: 500 ether, // TKO
+                contestBond: 3280 ether, // =500TKO * 6.5625
+                cooldownWindow: 60, //1 hours
+                provingWindow: 2880, // 48 hours
+                maxBlocksToVerifyPerProof: 16
+            });
+        }
+
         if (_tierId == LibTiers.TIER_GUARDIAN) {
             return ITierProvider.Tier({
                 verifierName: LibStrings.B_TIER_GUARDIAN,
@@ -57,10 +68,11 @@ contract TierProviderV2 is EssentialContract, ITierProvider {
 
     /// @inheritdoc ITierProvider
     function getTierIds() public pure override returns (uint16[] memory tiers_) {
-        tiers_ = new uint16[](3);
+        tiers_ = new uint16[](4);
         tiers_[0] = LibTiers.TIER_SGX;
         tiers_[1] = LibTiers.TIER_SGX_ZKVM;
-        tiers_[2] = LibTiers.TIER_GUARDIAN;
+        tiers_[2] = LibTiers.TIER_GUARDIAN_MINORITY;
+        tiers_[3] = LibTiers.TIER_GUARDIAN;
     }
 
     /// @inheritdoc ITierProvider

diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol
@@ -327,18 +327,31 @@ contract DeployOnL1 is DeployCapability {
             registerTo: rollupAddressManager
         });
 
+        address guardianProverImpl = address(new GuardianProver());
+
+        address guardianProverMinority = deployProxy({
+            name: "guardian_prover_minority",
+            impl: guardianProverImpl,
+            data: abi.encodeCall(GuardianProver.init, (address(0), rollupAddressManager)),
+            registerTo: rollupAddressManager
+        });
+
         address guardianProver = deployProxy({
             name: "guardian_prover",
-            impl: address(new GuardianProver()),
+            impl: guardianProverImpl,
             data: abi.encodeCall(GuardianProver.init, (address(0), rollupAddressManager)),
             registerTo: rollupAddressManager
         });
 
+        register(rollupAddressManager, "tier_guardian_minority", guardianProverMinority);
         register(rollupAddressManager, "tier_guardian", guardianProver);
 
         address[] memory guardians = vm.envAddress("GUARDIAN_PROVERS", ",");
-        uint8 minGuardians = uint8(vm.envUint("MIN_GUARDIANS"));
-        GuardianProver(guardianProver).setGuardians(guardians, minGuardians);
+
+        GuardianProver(guardianProverMinority).setGuardians(guardians, 1);
+        GuardianProver(guardianProverMinority).transferOwnership(timelock);
+
+        GuardianProver(guardianProver).setGuardians(guardians, uint8(vm.envUint("MIN_GUARDIANS")));
         GuardianProver(guardianProver).transferOwnership(timelock);
 
         // No need to proxy these, because they are 3rd party. If we want to modify, we simply