@keep-network/tbtc-v2 1.6.0-dev.20 → 1.6.0-dev.22

package/contracts/integrator/AbstractTBTCDepositor.sol

@@ -96,14 +96,6 @@ abstract contract AbstractTBTCDepositor {
     // slither-disable-next-line unused-state
     uint256[47] private __gap;
 
-    event DepositInitialized(uint256 indexed depositKey, uint32 initializedAt);
-
-    event DepositFinalized(
-        uint256 indexed depositKey,
-        uint256 tbtcAmount,
-        uint32 finalizedAt
-    );
-
     /// @notice Initializes the contract. MUST BE CALLED from the child
     ///         contract initializer.
     // slither-disable-next-line dead-code
@@ -150,12 +142,6 @@ abstract contract AbstractTBTCDepositor {
             reveal.fundingOutputIndex
         );
 
-        emit DepositInitialized(
-            depositKey,
-            /* solhint-disable-next-line not-rely-on-time */
-            uint32(block.timestamp)
-        );
-
         // The Bridge does not allow to reveal the same deposit twice and
         // revealed deposits stay there forever. The transaction will revert
         // if the deposit has already been revealed so, there is no need to do
@@ -166,7 +152,7 @@ abstract contract AbstractTBTCDepositor {
     }
 
     /// @notice Finalizes a deposit by calculating the amount of TBTC minted
-    ///         for the deposit
+    ///         for the deposit.
     /// @param depositKey Deposit key identifying the deposit.
     /// @return initialDepositAmount Amount of funding transaction deposit. In
     ///         TBTC token decimals precision.
@@ -211,14 +197,6 @@ abstract contract AbstractTBTCDepositor {
 
         tbtcAmount = _calculateTbtcAmount(deposit.amount, deposit.treasuryFee);
 
-        // slither-disable-next-line reentrancy-events
-        emit DepositFinalized(
-            depositKey,
-            tbtcAmount,
-            /* solhint-disable-next-line not-rely-on-time */
-            uint32(block.timestamp)
-        );
-
         extraData = deposit.extraData;
     }
 

package/contracts/test/TestTBTCDepositor.sol

@@ -8,6 +8,8 @@ import "../integrator/AbstractTBTCDepositor.sol";
 import "../integrator/IBridge.sol";
 import "../integrator/ITBTCVault.sol";
 
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
 contract TestTBTCDepositor is AbstractTBTCDepositor {
     event InitializeDepositReturned(uint256 depositKey);
 
@@ -168,7 +170,10 @@ contract MockTBTCVault is ITBTCVault {
         return (request.requestedAt, request.finalizedAt);
     }
 
-    function createOptimisticMintingRequest(uint256 depositKey) external {
+    /// @dev The function is virtual to allow other projects using this mock
+    ///      for AbtractTBTCDepositor-based contract tests to add any custom
+    ///      logic needed.
+    function createOptimisticMintingRequest(uint256 depositKey) public virtual {
         require(
             _requests[depositKey].requestedAt == 0,
             "Request already exists"
@@ -177,7 +182,13 @@ contract MockTBTCVault is ITBTCVault {
         _requests[depositKey].requestedAt = uint64(block.timestamp);
     }
 
-    function finalizeOptimisticMintingRequest(uint256 depositKey) public {
+    /// @dev The function is virtual to allow other projects using this mock
+    ///      for AbtractTBTCDepositor-based contract tests to add any custom
+    ///      logic needed.
+    function finalizeOptimisticMintingRequest(uint256 depositKey)
+        public
+        virtual
+    {
         require(
             _requests[depositKey].requestedAt != 0,
             "Request does not exist"