taikoxyz · Brechtpd · Feb 13, 2024
diff --git a/packages/protocol/contracts/L1/TaikoData.sol b/packages/protocol/contracts/L1/TaikoData.sol
@@ -73,6 +73,7 @@ library TaikoData {
     }
 
     struct TierProof {
+        address prover;
         uint16 tier;
         bytes data;
     }

diff --git a/packages/protocol/contracts/L1/libs/LibProving.sol b/packages/protocol/contracts/L1/libs/LibProving.sol
@@ -118,7 +118,10 @@ library LibProving {
 
         // The new proof must meet or exceed the minimum tier required by the
         // block or the previous proof; it cannot be on a lower tier.
-        if (proof.tier == 0 || proof.tier < meta.minTier || proof.tier < ts.tier) {
+        if (
+            proof.tier == 0 || proof.tier < meta.minTier || proof.tier < ts.tier
+                || proof.prover == address(0)
+        ) {
             revert L1_INVALID_TIER();
         }
 
@@ -128,7 +131,7 @@ library LibProving {
             ITierProvider(resolver.resolve("tier_provider", false)).getTier(proof.tier);
 
         // Check if this prover is allowed to submit a proof for this block
-        _checkProverPermission(state, blk, ts, tid, tier);
+        _checkProverPermission(state, blk, ts, tid, proof, tier);
 
         // We must verify the proof, and any failure in proof verification will
         // result in a revert.
@@ -153,13 +156,6 @@ library LibProving {
                 IVerifier.Context memory ctx = IVerifier.Context({
                     metaHash: blk.metaHash,
                     blobHash: meta.blobHash,
-                    // TODO(Brecht): Quite limiting this is required to be the same address as
-                    // msg.sender,
-                    // less flexibility on the prover's side for proof generation/proof submission
-                    // using
-                    // multiple accounts.
-                    // Added msgSender to allow the prover to be any address in the future.
-                    prover: msg.sender,
                     msgSender: msg.sender,
                     blockId: blk.blockId,
                     isContesting: isContesting,
@@ -201,7 +197,7 @@ library LibProving {
             emit TransitionProved({
                 blockId: blk.blockId,
                 tran: tran,
-                prover: msg.sender,
+                prover: proof.prover,
                 validityBond: tier.validityBond,
                 tier: proof.tier
             });
@@ -215,22 +211,22 @@ library LibProving {
                 assert(tier.validityBond == 0);
                 assert(ts.validityBond == 0 && ts.contestBond == 0 && ts.contester == address(0));
 
-                ts.prover = msg.sender;
+                ts.prover = proof.prover;
                 ts.blockHash = tran.blockHash;
                 ts.stateRoot = tran.stateRoot;
 
                 emit TransitionProved({
                     blockId: blk.blockId,
                     tran: tran,
-                    prover: msg.sender,
+                    prover: proof.prover,
                     validityBond: 0,
                     tier: proof.tier
                 });
             } else {
                 // Contesting but not on the highest tier
                 if (ts.contester != address(0)) revert L1_ALREADY_CONTESTED();
 
-                // Burn the contest bond from the prover.
+                // Burn the contest bond from the sender.
                 tko.transferFrom(msg.sender, address(this), tier.contestBond);
 
                 // We retain the contest bond within the transition, just in
@@ -382,7 +378,7 @@ library LibProving {
         ts.validityBond = tier.validityBond;
         ts.contestBond = 1; // to save gas
         ts.contester = address(0);
-        ts.prover = msg.sender;
+        ts.prover = proof.prover;
         ts.tier = proof.tier;
 
         if (!sameTransition) {
@@ -397,6 +393,7 @@ library LibProving {
         TaikoData.Block storage blk,
         TaikoData.TransitionState storage ts,
         uint32 tid,
+        TaikoData.TierProof memory proof,
         ITierProvider.Tier memory tier
     )
         private
@@ -407,7 +404,7 @@ library LibProving {
 
         bool inProvingWindow = uint256(ts.timestamp).max(state.slotB.lastUnpausedAt)
             + tier.provingWindow >= block.timestamp;
-        bool isAssignedPover = msg.sender == blk.assignedProver;
+        bool isAssignedPover = proof.prover == blk.assignedProver;
 
         // The assigned prover can only submit the very first transition.
         if (tid == 1 && ts.tier == 0 && inProvingWindow) {

diff --git a/packages/protocol/contracts/verifiers/IVerifier.sol b/packages/protocol/contracts/verifiers/IVerifier.sol
@@ -22,11 +22,10 @@ interface IVerifier {
     struct Context {
         bytes32 metaHash;
         bytes32 blobHash;
-        address prover;
+        address msgSender;
         uint64 blockId;
         bool isContesting;
         bool blobUsed;
-        address msgSender;
     }
 
     function verifyProof(

diff --git a/packages/protocol/contracts/verifiers/PseZkVerifier.sol b/packages/protocol/contracts/verifiers/PseZkVerifier.sol
@@ -85,7 +85,7 @@ contract PseZkVerifier is EssentialContract, IVerifier {
 
         bytes32 instance = calcInstance({
             tran: tran,
-            prover: ctx.prover,
+            prover: proof.prover,
             metaHash: ctx.metaHash,
             txListHash: txListHash,
             pointValue: pointValue

diff --git a/packages/protocol/contracts/verifiers/SgxVerifier.sol b/packages/protocol/contracts/verifiers/SgxVerifier.sol
@@ -152,7 +152,7 @@ contract SgxVerifier is EssentialContract, IVerifier {
         bytes memory signature = Bytes.slice(proof.data, 24);
 
         address oldInstance =
-            ECDSA.recover(getSignedHash(tran, newInstance, ctx.prover, ctx.metaHash), signature);
+            ECDSA.recover(getSignedHash(tran, newInstance, proof.prover, ctx.metaHash), signature);
 
         if (!_isInstanceValid(id, oldInstance)) revert SGX_INVALID_INSTANCE();
         _replaceInstance(id, oldInstance, newInstance);

diff --git a/packages/protocol/test/L1/TaikoL1LibProvingWithTiers.t.sol b/packages/protocol/test/L1/TaikoL1LibProvingWithTiers.t.sol
@@ -794,9 +794,11 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
                     __reserved: [bytes32(0), bytes32(0)]
                 });
 
-                TaikoData.TierProof memory proof;
-                proof.tier = LibTiers.TIER_GUARDIAN;
-                proof.data = bytes.concat(keccak256("RETURN_LIVENESS_BOND"));
+                TaikoData.TierProof memory proof = TaikoData.TierProof({
+                    prover: Carol,
+                    tier: LibTiers.TIER_GUARDIAN,
+                    data: bytes.concat(keccak256("RETURN_LIVENESS_BOND"))
+                });
 
                 uint256 balanceBeforeReimbursement = tko.balanceOf(Bob);
 

diff --git a/packages/protocol/test/L1/TaikoL1TestBase.sol b/packages/protocol/test/L1/TaikoL1TestBase.sol
@@ -250,6 +250,7 @@ abstract contract TaikoL1TestBase is TaikoTest {
             pv.calcInstance(tran, prover, keccak256(abi.encode(meta)), meta.blobHash, 0);
 
         TaikoData.TierProof memory proof;
+        proof.prover = prover;
         proof.tier = tier;
         {
             PseZkVerifier.ZkEvmProof memory zkProof;

diff --git a/packages/protocol/test/verifiers/GuardianVerifier.t.sol b/packages/protocol/test/verifiers/GuardianVerifier.t.sol
@@ -21,7 +21,6 @@ contract TestGuardianVerifier is TaikoL1TestBase {
         IVerifier.Context memory ctx = IVerifier.Context({
             metaHash: bytes32(0),
             blobHash: bytes32(0),
-            prover: address(gp),
             msgSender: address(gp),
             blockId: 10,
             isContesting: false,
@@ -38,7 +37,7 @@ contract TestGuardianVerifier is TaikoL1TestBase {
         });
 
         // TierProof
-        TaikoData.TierProof memory proof = TaikoData.TierProof({ tier: 0, data: "" });
+        TaikoData.TierProof memory proof = TaikoData.TierProof({ prover: Alice, tier: 0, data: "" });
 
         // `verifyProof()`
         gv.verifyProof(ctx, transition, proof);
@@ -50,7 +49,6 @@ contract TestGuardianVerifier is TaikoL1TestBase {
         IVerifier.Context memory ctx = IVerifier.Context({
             metaHash: bytes32(0),
             blobHash: bytes32(0),
-            prover: Alice, // invalid
             msgSender: Alice,
             blockId: 10,
             isContesting: false,
@@ -67,7 +65,11 @@ contract TestGuardianVerifier is TaikoL1TestBase {
         });
 
         // TierProof
-        TaikoData.TierProof memory proof = TaikoData.TierProof({ tier: 0, data: "" });
+        TaikoData.TierProof memory proof = TaikoData.TierProof({
+            prover: Alice, // invalid
+            tier: 0,
+            data: ""
+        });
 
         // `verifyProof()` with invalid ctx.prover
         vm.expectRevert(GuardianVerifier.PERMISSION_DENIED.selector);