fix(protocol): reward non-assigned prover 7/8 liveness bond (#18132)

taikoxyz · Sep 18, 2024 · 505c42d · 505c42d
1 parent f514e5a
commit 505c42d
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 16 deletions.
diff --git a/packages/protocol/contracts/layer1/based/LibProving.sol b/packages/protocol/contracts/layer1/based/LibProving.sol
@@ -540,6 +540,11 @@ library LibProving {
                             _state, _local.assignedProver, _local.blockId, _local.meta.livenessBond
                         );
                     }
+                } else {
+                    // Reward a majority of liveness bond to the actual prover
+                    unchecked {
+                        reward += _rewardAfterFriction(_local.livenessBond);
+                    }
                 }
             }
         }

diff --git a/packages/protocol/test/layer1/based/TaikoL1TestGroup1.t.sol b/packages/protocol/test/layer1/based/TaikoL1TestGroup1.t.sol
@@ -119,7 +119,6 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {
         printBlockAndTrans(0);
 
         giveEthAndTko(Alice, 10_000 ether, 1000 ether);
-
         giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
         ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
 
@@ -178,7 +177,10 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {
 
             provenAt = ts.timestamp;
 
-            assertEq(totalTkoBalance(tko, L1, Taylor), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                totalTkoBalance(tko, L1, Taylor),
+                10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
         }
 
         console2.log("====== Verify block");
@@ -202,7 +204,7 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {
             assertEq(ts.timestamp, provenAt);
 
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
-            assertEq(totalTkoBalance(tko, L1, Taylor), 10_000 ether);
+            assertEq(totalTkoBalance(tko, L1, Taylor), 10_000 ether + livenessBond * 7 / 8);
         }
     }
 
@@ -354,17 +356,16 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - L1.getConfig().livenessBond);
         }
     }
+
     // Test summary:
     // 1. Alice proposes a block,
     // 2. Alice proves the block outside the proving window, using the correct parent hash.
     // 3. Alice's proof is used to verify the block.
-
     function test_taikoL1_group_1_case_6() external {
         vm.warp(1_000_000);
         printBlockAndTrans(0);
 
         giveEthAndTko(Alice, 10_000 ether, 1000 ether);
-
         giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
         ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
 
@@ -424,7 +425,8 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {
             provenAt = ts.timestamp;
 
             assertEq(
-                totalTkoBalance(tko, L1, Alice), 10_000 ether - tierOp.validityBond - livenessBond
+                totalTkoBalance(tko, L1, Alice),
+                10_000 ether - tierOp.validityBond - livenessBond / 8
             );
         }
 
@@ -448,7 +450,7 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {
             assertEq(ts.validityBond, tierOp.validityBond);
             assertEq(ts.timestamp, provenAt);
 
-            assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
+            assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond / 8);
         }
     }
 

diff --git a/packages/protocol/test/layer1/based/TaikoL1TestGroup3.t.sol b/packages/protocol/test/layer1/based/TaikoL1TestGroup3.t.sol
@@ -58,7 +58,10 @@ contract TaikoL1TestGroup3 is TaikoL1TestGroupBase {
             assertEq(ts.timestamp, block.timestamp);
 
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
-            assertEq(totalTkoBalance(tko, L1, James), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                totalTkoBalance(tko, L1, James),
+                10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
             assertEq(totalTkoBalance(tko, L1, Taylor), 10_000 ether - tierOp.contestBond);
         }
 
@@ -166,7 +169,10 @@ contract TaikoL1TestGroup3 is TaikoL1TestGroupBase {
             assertEq(ts.timestamp, block.timestamp);
 
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
-            assertEq(totalTkoBalance(tko, L1, James), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                totalTkoBalance(tko, L1, James),
+                10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
             assertEq(totalTkoBalance(tko, L1, Taylor), 10_000 ether - tierOp.contestBond);
         }
 
@@ -191,7 +197,10 @@ contract TaikoL1TestGroup3 is TaikoL1TestGroupBase {
             assertEq(ts.timestamp, block.timestamp);
 
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
-            assertEq(totalTkoBalance(tko, L1, James), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                totalTkoBalance(tko, L1, James),
+                10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
 
             uint256 quarterReward = tierOp.validityBond * 7 / 8 / 4;
             assertEq(totalTkoBalance(tko, L1, Taylor), 10_000 ether + quarterReward * 3);
@@ -223,7 +232,10 @@ contract TaikoL1TestGroup3 is TaikoL1TestGroupBase {
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
 
             uint256 quarterReward = tierOp.validityBond * 7 / 8 / 4;
-            assertEq(totalTkoBalance(tko, L1, James), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                totalTkoBalance(tko, L1, James),
+                10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
             assertEq(totalTkoBalance(tko, L1, Taylor), 10_000 ether + quarterReward * 3);
             assertEq(totalTkoBalance(tko, L1, William), 10_000 ether + quarterReward);
         }

diff --git a/packages/protocol/test/layer1/based/TaikoL1TestGroup4.t.sol b/packages/protocol/test/layer1/based/TaikoL1TestGroup4.t.sol
@@ -133,7 +133,9 @@ contract TaikoL1TestGroup4 is TaikoL1TestGroupBase {
             assertEq(ts.timestamp, block.timestamp);
 
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
-            assertEq(tko.balanceOf(David), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                tko.balanceOf(David), 10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
             assertEq(
                 tko.balanceOf(Taylor),
                 10_000 ether - tierSgx.validityBond + tierOp.validityBond * 7 / 8

diff --git a/packages/protocol/test/layer1/based/TaikoL1TestGroup5.t.sol b/packages/protocol/test/layer1/based/TaikoL1TestGroup5.t.sol
@@ -268,7 +268,9 @@ contract TaikoL1TestGroup5 is TaikoL1TestGroupBase {
             assertEq(ts.timestamp, block.timestamp);
 
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
-            assertEq(tko.balanceOf(David), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                tko.balanceOf(David), 10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
             assertEq(totalTkoBalance(tko, L1, William), 10_000 ether);
         }
 
@@ -290,7 +292,9 @@ contract TaikoL1TestGroup5 is TaikoL1TestGroupBase {
             assertEq(ts.prover, address(gp));
 
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
-            assertEq(tko.balanceOf(David), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                tko.balanceOf(David), 10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
             assertEq(totalTkoBalance(tko, L1, William), 10_000 ether);
         }
     }

diff --git a/packages/protocol/test/layer1/based/TaikoL1TestGroup9.t.sol b/packages/protocol/test/layer1/based/TaikoL1TestGroup9.t.sol
@@ -295,7 +295,10 @@ contract TaikoL1TestGroup5 is TaikoL1TestGroupBase {
             assertEq(ts.timestamp, block.timestamp);
 
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
-            assertEq(totalTkoBalance(tko, L1, Carol), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                totalTkoBalance(tko, L1, Carol),
+                10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
             assertEq(totalTkoBalance(tko, L1, William), 10_000 ether);
         }
 
@@ -318,7 +321,10 @@ contract TaikoL1TestGroup5 is TaikoL1TestGroupBase {
             assertEq(ts.prover, address(gp));
 
             assertEq(totalTkoBalance(tko, L1, Alice), 10_000 ether - livenessBond);
-            assertEq(totalTkoBalance(tko, L1, Carol), 10_000 ether - tierOp.validityBond);
+            assertEq(
+                totalTkoBalance(tko, L1, Carol),
+                10_000 ether - tierOp.validityBond + livenessBond * 7 / 8
+            );
             assertEq(totalTkoBalance(tko, L1, William), 10_000 ether);
         }
     }