Upgradeability for TeleporterUpgradeable and TeleporterOwnerUpgradeable

.gitmodules

@@ -11,3 +11,6 @@
 [submodule "contracts/lib/subnet-evm"]
 	path = contracts/lib/subnet-evm
 	url = https://github.com/ava-labs/subnet-evm
+[submodule "contracts/lib/openzeppelin-contracts-upgradeable"]
+	path = contracts/lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

contracts/remappings.txt

@@ -1,4 +1,5 @@
 @avalabs/[email protected]/=lib/subnet-evm/contracts/
 @openzeppelin/[email protected]=lib/openzeppelin-contracts/contracts/
+@openzeppelin/[email protected]=lib/openzeppelin-contracts-upgradeable/contracts/
 @teleporter/=src/Teleporter/
-@mocks/=src/Mocks/
+@mocks/=src/Mocks/

contracts/src/Teleporter/tests/TestMessenger.sol

@@ -9,7 +9,8 @@ import {TeleporterMessageInput, TeleporterFeeInfo} from "@teleporter/ITeleporter
 import {SafeERC20TransferFrom, SafeERC20} from "@teleporter/SafeERC20TransferFrom.sol";
 import {TeleporterOwnerUpgradeable} from "@teleporter/upgrades/TeleporterOwnerUpgradeable.sol";
 import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
-import {ReentrancyGuard} from "@openzeppelin/[email protected]/security/ReentrancyGuard.sol";
+import {ReentrancyGuardUpgradeable} from
+    "@openzeppelin/[email protected]/security/ReentrancyGuardUpgradeable.sol";
 
 /**
  * THIS IS AN EXAMPLE CONTRACT THAT USES UN-AUDITED CODE.
@@ -20,7 +21,7 @@ import {ReentrancyGuard} from "@openzeppelin/[email protected]/security/Reentrancy
  * @dev TestMessenger is test fixture contract that exercises sending and receiving
  * messages cross chain.
  */
-contract TestMessenger is ReentrancyGuard, TeleporterOwnerUpgradeable {
+contract TestMessenger is ReentrancyGuardUpgradeable, TeleporterOwnerUpgradeable {
     using SafeERC20 for IERC20;
 
     // Messages sent to this contract.
@@ -50,10 +51,10 @@ contract TestMessenger is ReentrancyGuard, TeleporterOwnerUpgradeable {
         bytes32 indexed sourceBlockchainID, address indexed originSenderAddress, string message
     );
 
-    constructor(
-        address teleporterRegistryAddress,
-        address teleporterManager
-    ) TeleporterOwnerUpgradeable(teleporterRegistryAddress, teleporterManager) {}
+    constructor(address teleporterRegistryAddress, address teleporterManager) {
+        __ReentrancyGuard_init();
+        __TeleporterOwnerUpgradeable_init(teleporterRegistryAddress, teleporterManager);
+    }
 
     /**
      * @dev Sends a message to another chain.

contracts/src/Teleporter/upgrades/TeleporterOwnerUpgradeable.sol

@@ -6,19 +6,22 @@
 pragma solidity 0.8.18;
 
 import {TeleporterUpgradeable} from "./TeleporterUpgradeable.sol";
-import {Ownable} from "@openzeppelin/[email protected]/access/Ownable.sol";
+import {OwnableUpgradeable} from
+    "@openzeppelin/[email protected]/access/OwnableUpgradeable.sol";
 
 /**
  * @dev Contract that inherits {TeleporterUpgradeable} and allows
  * only owners of the contract to update the minimum Teleporter version.
  *
  * @custom:security-contact https://github.com/ava-labs/teleporter/blob/main/SECURITY.md
  */
-abstract contract TeleporterOwnerUpgradeable is TeleporterUpgradeable, Ownable {
-    constructor(
+abstract contract TeleporterOwnerUpgradeable is TeleporterUpgradeable, OwnableUpgradeable {
+    function __TeleporterOwnerUpgradeable_init(
         address teleporterRegistryAddress,
         address initialOwner
-    ) TeleporterUpgradeable(teleporterRegistryAddress) {
+    ) internal onlyInitializing {
+        __TeleporterUpgradeable_init(teleporterRegistryAddress);
+        __Ownable_init();
         transferOwnership(initialOwner);
     }
 

contracts/src/Teleporter/upgrades/TeleporterUpgradeable.sol

@@ -8,8 +8,10 @@ pragma solidity 0.8.18;
 import {TeleporterRegistry} from "./TeleporterRegistry.sol";
 import {ITeleporterReceiver} from "../ITeleporterReceiver.sol";
 import {ITeleporterMessenger, TeleporterMessageInput} from "../ITeleporterMessenger.sol";
-import {Context} from "@openzeppelin/[email protected]/utils/Context.sol";
-import {ReentrancyGuard} from "@openzeppelin/[email protected]/security/ReentrancyGuard.sol";
+import {ContextUpgradeable} from
+    "@openzeppelin/[email protected]/utils/ContextUpgradeable.sol";
+import {ReentrancyGuardUpgradeable} from
+    "@openzeppelin/[email protected]/security/ReentrancyGuardUpgradeable.sol";
 import {SafeERC20} from "@openzeppelin/[email protected]/token/ERC20/utils/SafeERC20.sol";
 import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
 
@@ -23,11 +25,15 @@ import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
  *
  * @custom:security-contact https://github.com/ava-labs/teleporter/blob/main/SECURITY.md
  */
-abstract contract TeleporterUpgradeable is Context, ITeleporterReceiver, ReentrancyGuard {
+abstract contract TeleporterUpgradeable is
+    ContextUpgradeable,
+    ITeleporterReceiver,
+    ReentrancyGuardUpgradeable
+{
     using SafeERC20 for IERC20;
 
     // The Teleporter registry contract manages different Teleporter contract versions.
-    TeleporterRegistry public immutable teleporterRegistry;
+    TeleporterRegistry public teleporterRegistry;
     /**
      * @dev A mapping that keeps track of paused Teleporter addresses.
      */
@@ -60,7 +66,11 @@ abstract contract TeleporterUpgradeable is Context, ITeleporterReceiver, Reentra
      * @dev Initializes the {TeleporterUpgradeable} contract by getting `teleporterRegistry`
      * instance and setting `_minTeleporterVersion`.
      */
-    constructor(address teleporterRegistryAddress) {
+    function __TeleporterUpgradeable_init(address teleporterRegistryAddress)
+        internal
+        onlyInitializing
+    {
+        __ReentrancyGuard_init();
         require(
             teleporterRegistryAddress != address(0),
             "TeleporterUpgradeable: zero teleporter registry address"