cleanup

AztecProtocol · Oct 1, 2024 · a4d67ef · a4d67ef
1 parent 9a93591
commit a4d67ef
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 199 deletions.
diff --git a/l1-contracts/src/core/ProofCommitmentEscrow.sol b/l1-contracts/src/core/ProofCommitmentEscrow.sol
@@ -13,11 +13,6 @@ import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
 contract ProofCommitmentEscrow is IProofCommitmentEscrow {
   using SafeERC20 for IERC20;
 
-  struct Stake {
-    uint256 amount;
-    address prover;
-  }
-
   struct WithdrawRequest {
     uint256 amount;
     Timestamp executableAt;
@@ -29,7 +24,6 @@ contract ProofCommitmentEscrow is IProofCommitmentEscrow {
   mapping(address => uint256) public deposits;
   mapping(address => WithdrawRequest) public withdrawRequests;
   IERC20 public immutable token;
-  Stake public stake;
 
   modifier onlyRollup() {
     require(msg.sender == ROLLUP, Errors.ProofCommitmentEscrow__NotOwner(msg.sender));
@@ -103,9 +97,8 @@ contract ProofCommitmentEscrow is IProofCommitmentEscrow {
    *          The prover must have sufficient balance
    *          The prover's balance will be reduced by the bond amount
    */
-  function stakeBond(uint256 _amount, address _prover) external override onlyRollup {
+  function stakeBond(address _prover, uint256 _amount) external override onlyRollup {
     deposits[_prover] -= _amount;
-    stake = Stake({amount: _amount, prover: _prover});
 
     emit StakeBond(_prover, _amount);
   }
@@ -115,9 +108,10 @@ contract ProofCommitmentEscrow is IProofCommitmentEscrow {
    *
    * @dev     Only callable by the owner
    */
-  function unstakeBond() external override onlyRollup {
-    deposits[stake.prover] += stake.amount;
-    delete stake;
+  function unstakeBond(address _prover, uint256 _amount) external override onlyRollup {
+    deposits[_prover] += _amount;
+
+    emit UnstakeBond(_prover, _amount);
   }
 
   /**

diff --git a/l1-contracts/src/core/Rollup.sol b/l1-contracts/src/core/Rollup.sol
@@ -117,16 +117,6 @@ contract Rollup is EIP712("Aztec Rollup", "1"), Leonidas, IRollup, ITestRollup {
     return _hashTypedDataV4(EpochProofQuoteLib.hash(quote));
   }
 
-  function verifySignedQuote(EpochProofQuoteLib.SignedEpochProofQuote memory signedQuote)
-    public
-    view
-    override(IRollup)
-  {
-    bytes32 digest = quoteToDigest(signedQuote.quote);
-    address recoveredSigner = ECDSA.recover(digest, SignatureLib.toBytes(signedQuote.signature));
-    require(recoveredSigner == signedQuote.quote.prover);
-  }
-
   /**
    * @notice  Prune the pending chain up to the last proven block
    *
@@ -358,7 +348,7 @@ contract Rollup is EIP712("Aztec Rollup", "1"), Leonidas, IRollup, ITestRollup {
     // We don't currently unstake,
     // but we will as part of https://github.com/AztecProtocol/aztec-packages/issues/8652.
     // Blocked on submitting epoch proofs to this contract.
-    PROOF_COMMITMENT_ESCROW.stakeBond(_quote.quote.bondAmount, _quote.quote.prover);
+    PROOF_COMMITMENT_ESCROW.stakeBond(_quote.quote.prover, _quote.quote.bondAmount);
 
     proofClaim = DataStructures.EpochProofClaim({
       epochToProve: epochToProve,
@@ -586,7 +576,7 @@ contract Rollup is EIP712("Aztec Rollup", "1"), Leonidas, IRollup, ITestRollup {
     view
     override(IRollup)
   {
-    verifySignedQuote(_quote);
+    SignatureLib.verify(_quote.signature, _quote.quote.prover, quoteToDigest(_quote.quote));
 
     Slot currentSlot = getCurrentSlot();
     address currentProposer = getCurrentProposer();

diff --git a/l1-contracts/src/core/interfaces/IProofCommitmentEscrow.sol b/l1-contracts/src/core/interfaces/IProofCommitmentEscrow.sol
@@ -9,12 +9,12 @@ interface IProofCommitmentEscrow {
   event StartWithdraw(address indexed withdrawer, uint256 amount, Timestamp executableAt);
   event ExecuteWithdraw(address indexed withdrawer, uint256 amount);
   event StakeBond(address indexed prover, uint256 amount);
-  event UnstakeBond(address indexed prover);
+  event UnstakeBond(address indexed prover, uint256 amount);
 
   function deposit(uint256 _amount) external;
   function startWithdraw(uint256 _amount) external;
   function executeWithdraw() external;
-  function stakeBond(uint256 _bondAmount, address _prover) external;
-  function unstakeBond() external;
+  function stakeBond(address _prover, uint256 _amount) external;
+  function unstakeBond(address _prover, uint256 _amount) external;
   function minBalanceAtTime(Timestamp _timestamp, address _prover) external view returns (uint256);
 }
diff --git a/l1-contracts/src/core/interfaces/IRollup.sol b/l1-contracts/src/core/interfaces/IRollup.sol
@@ -96,9 +96,6 @@ interface IRollup {
     external
     view
     returns (bytes32);
-  function verifySignedQuote(EpochProofQuoteLib.SignedEpochProofQuote calldata _quote)
-    external
-    view;
 
   function archive() external view returns (bytes32);
   function archiveAt(uint256 _blockNumber) external view returns (bytes32);

diff --git a/l1-contracts/src/mock/MockProofCommitmentEscrow.sol b/l1-contracts/src/mock/MockProofCommitmentEscrow.sol
@@ -18,11 +18,11 @@ contract MockProofCommitmentEscrow is IProofCommitmentEscrow {
     // do nothing
   }
 
-  function unstakeBond() external override {
+  function unstakeBond(address _prover, uint256 _amount) external override {
     // do nothing
   }
 
-  function stakeBond(uint256 _amount, address _prover) external override {
+  function stakeBond(address _prover, uint256 _amount) external override {
     // do nothing
   }