Merge branch 'main' into minor-improvements

thesis · May 10, 2024 · 548a0fc · 548a0fc
2 parents 182bc02 + 330b37c
commit 548a0fc
Show file tree

Hide file tree

Showing 21 changed files with 190 additions and 400 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/solidity/contracts/BitcoinDepositor.sol b/solidity/contracts/BitcoinDepositor.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/solidity/contracts/BitcoinRedeemer.sol b/solidity/contracts/BitcoinRedeemer.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
 
@@ -61,6 +61,9 @@ contract BitcoinRedeemer is Ownable2StepUpgradeable, IReceiveApproval {
     /// Reverts when approveAndCall to tBTC contract fails.
     error ApproveAndCallFailed();
 
+    /// Reverts if the new TBTCVault contract is not tBTC token owner.
+    error NotTbtcTokenOwner();
+
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
         _disableInitializers();
@@ -118,6 +121,10 @@ contract BitcoinRedeemer is Ownable2StepUpgradeable, IReceiveApproval {
             revert ZeroAddress();
         }
 
+        if (newTbtcVault != tbtcToken.owner()) {
+            revert NotTbtcTokenOwner();
+        }
+
         emit TbtcVaultUpdated(tbtcVault, newTbtcVault);
 
         tbtcVault = newTbtcVault;

diff --git a/solidity/contracts/MezoAllocator.sol b/solidity/contracts/MezoAllocator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/solidity/contracts/PausableOwnable.sol b/solidity/contracts/PausableOwnable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";

diff --git a/solidity/contracts/bridge/ITBTCToken.sol b/solidity/contracts/bridge/ITBTCToken.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 /// @title Interface of TBTC token contract.
 /// @notice This interface defines functions of TBTC token contract used by Acre

diff --git a/solidity/contracts/interfaces/IDispatcher.sol b/solidity/contracts/interfaces/IDispatcher.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 /// @title IDispatcher
 /// @notice Interface for the Dispatcher contract.

diff --git a/solidity/contracts/lib/ERC4626Fees.sol b/solidity/contracts/lib/ERC4626Fees.sol
@@ -2,7 +2,7 @@
 
 // Inspired by https://docs.openzeppelin.com/contracts/5.x/erc4626#fees
 
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {ERC4626Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC4626Upgradeable.sol";

diff --git a/solidity/contracts/stBTC.sol b/solidity/contracts/stBTC.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
@@ -357,21 +357,6 @@ contract stBTC is ERC4626Fees, PausableOwnable {
         return convertToAssets(balanceOf(account));
     }
 
-    /// @dev Transfers a `value` amount of tokens from `from` to `to`, or
-    ///      alternatively mints (or burns) if `from` (or `to`) is the zero
-    ///      address. All customizations to transfers, mints, and burns should
-    ///      be done by overriding this function.
-    /// @param from Sender of tokens.
-    /// @param to Receiver of tokens.
-    /// @param value Amount of tokens to transfer.
-    function _update(
-        address from,
-        address to,
-        uint256 value
-    ) internal override whenNotPaused {
-        super._update(from, to, value);
-    }
-
     /// @return Returns entry fee basis point used in deposits.
     function _entryFeeBasisPoints() internal view override returns (uint256) {
         return entryFeeBasisPoints;

diff --git a/solidity/contracts/test/BitcoinDepositorHarness.sol b/solidity/contracts/test/BitcoinDepositorHarness.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /* solhint-disable func-name-mixedcase */
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import {BitcoinDepositor} from "../BitcoinDepositor.sol";
 import {MockBridge, MockTBTCVault} from "@keep-network/tbtc-v2/contracts/test/TestTBTCDepositor.sol";

diff --git a/solidity/contracts/test/MezoPortalStub.sol b/solidity/contracts/test/MezoPortalStub.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/solidity/contracts/test/TestERC20.sol b/solidity/contracts/test/TestERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 

diff --git a/solidity/contracts/test/TestTBTC.sol b/solidity/contracts/test/TestTBTC.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "../bridge/ITBTCToken.sol";

diff --git a/solidity/contracts/test/upgrades/BitcoinDepositorV2.sol b/solidity/contracts/test/upgrades/BitcoinDepositorV2.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/solidity/contracts/test/upgrades/MezoAllocatorV2.sol b/solidity/contracts/test/upgrades/MezoAllocatorV2.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/solidity/contracts/test/upgrades/stBTCV2.sol b/solidity/contracts/test/upgrades/stBTCV2.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 

diff --git a/solidity/contracts/utils/Errors.sol b/solidity/contracts/utils/Errors.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma solidity ^0.8.21;
+pragma solidity 0.8.24;
 
 /// @notice Reverts if a checked address is zero. Used by various contracts.
 error ZeroAddress();
diff --git a/solidity/hardhat.config.ts b/solidity/hardhat.config.ts
@@ -32,7 +32,7 @@ const config: HardhatUserConfig = {
   solidity: {
     compilers: [
       {
-        version: "0.8.21",
+        version: "0.8.24",
         settings: {
           optimizer: {
             enabled: true,

diff --git a/solidity/package.json b/solidity/package.json
@@ -50,7 +50,7 @@
     "dotenv-safer": "^1.0.0",
     "eslint": "^8.54.0",
     "ethers": "^6.8.1",
-    "hardhat": "^2.19.1",
+    "hardhat": "^2.22.3",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-deploy": "^0.11.43",
     "hardhat-gas-reporter": "^1.0.9",

diff --git a/solidity/test/BitcoinRedeemer.test.ts b/solidity/test/BitcoinRedeemer.test.ts
@@ -442,14 +442,24 @@ describe("BitcoinRedeemer", () => {
         })
       })
 
-      context("when a new treasury is an allowed address", () => {
+      context("when a new tbtc vault is not tBTC token owner", () => {
+        it("should revert", async () => {
+          const newTbtcVault = await ethers.Wallet.createRandom().getAddress()
+          await expect(
+            bitcoinRedeemer.connect(governance).updateTbtcVault(newTbtcVault),
+          ).to.be.revertedWithCustomError(bitcoinRedeemer, "NotTbtcTokenOwner")
+        })
+      })
+
+      context("when a new tbtc vault is an allowed address", () => {
         let oldTbtcVault: string
         let newTbtcVault: string
         let tx: ContractTransactionResponse
 
         before(async () => {
           oldTbtcVault = await bitcoinRedeemer.tbtcVault()
           newTbtcVault = await ethers.Wallet.createRandom().getAddress()
+          await tbtc.setOwner(newTbtcVault)
 
           tx = await bitcoinRedeemer
             .connect(governance)

diff --git a/solidity/test/stBTC.test.ts b/solidity/test/stBTC.test.ts
@@ -1868,25 +1868,6 @@ describe("stBTC", () => {
       it("should return 0 when calling maxWithdraw", async () => {
         expect(await stbtc.maxWithdraw(depositor1)).to.be.eq(0)
       })
-
-      it("should pause transfers", async () => {
-        await expect(
-          stbtc.connect(depositor1).transfer(depositor2, amount),
-        ).to.be.revertedWithCustomError(stbtc, "EnforcedPause")
-      })
-
-      it("should pause transfersFrom", async () => {
-        await expect(
-          stbtc
-            .connect(depositor1)
-            .approve(depositor2.address, amount)
-            .then(() =>
-              stbtc
-                .connect(depositor2)
-                .transferFrom(depositor1, depositor2, amount),
-            ),
-        ).to.be.revertedWithCustomError(stbtc, "EnforcedPause")
-      })
     })
   })