Teleporter registry upgrade

.gitignore

@@ -13,6 +13,7 @@ subnetGenesis_*
 vars.sh
 NETWORK_READY
 NETWORK_RUNNING
+.awm-relayer-storage/
 
 # Raw Contract Deployment Transaction
 UniversalTeleporterDeployerTransaction.txt

contracts/src/.solhint.json

@@ -16,7 +16,6 @@
                 "strict": true
             }
         ],
-        "reason-string": ["off"],
         "ordering": "warn",
         "immutable-vars-naming": [
             "warn",

contracts/src/CrossChainApplications/ERC20Bridge/ERC20Bridge.sol

@@ -14,6 +14,7 @@ import "@subnet-evm-contracts/interfaces/IWarpMessenger.sol";
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
+import "../../Teleporter/TeleporterRegistry.sol";
 
 struct TokenID {
     bytes32 chainID;
@@ -44,8 +45,9 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         0x0200000000000000000000000000000000000005;
     bytes32 public immutable currentChainID;
 
-    // Used for sending an receiving Teleporter messages.
-    ITeleporterMessenger public immutable teleporterMessenger;
+    // Used for sending and receiving Teleporter messages.
+    TeleporterRegistry public immutable teleporterRegistry;
+    uint256 internal _minTeleporterVersion;
 
     // Tracks which bridge tokens have been submitted to be created other bridge instances.
     // (destinationChainID, destinationBridgeAddress) -> nativeTokenContract -> tokenCreationSubmitted
@@ -79,24 +81,28 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
     error CannotBridgeWrappedToken(address nativeTokenAddress);
     error InsufficientAdjustedAmount(uint256 adjustedAmount, uint256 feeAmount);
     error InsufficientTotalAmount(uint256 totalAmount, uint256 feeAmount);
-    error InsufficientWrappedTokenBalance(uint256 currentBalance, uint256 requestAmount);
+    error InsufficientWrappedTokenBalance(
+        uint256 currentBalance,
+        uint256 requestAmount
+    );
     error InvalidAction();
     error InvalidBridgeTokenAddress();
     error InvalidDestinationBridgeAddress();
     error InvalidRecipientAddress();
-    error InvalidTeleporterMessengerAddress();
+    error InvalidTeleporterRegistryAddress();
     error Unauthorized();
 
     /**
      * @dev Initializes the Teleporter messenger used for sending and receiving messages,
      * and initializes the current chain ID.
      */
-    constructor(address teleporterMessengerAddress) {
-        if (teleporterMessengerAddress == address(0)) {
-            revert InvalidTeleporterMessengerAddress();
+    constructor(address teleporterRegistryAddress) {
+        if (teleporterRegistryAddress == address(0)) {
+            revert InvalidTeleporterRegistryAddress();
         }
 
-        teleporterMessenger = ITeleporterMessenger(teleporterMessengerAddress);
+        teleporterRegistry = TeleporterRegistry(teleporterRegistryAddress);
+        _minTeleporterVersion = teleporterRegistry.getLatestVersion();
         currentChainID = WarpMessenger(WARP_PRECOMPILE_ADDRESS)
             .getBlockchainID();
     }
@@ -144,7 +150,10 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
             // is not a "fee/burn on transfer" token, since it was deployed by this
             // contract itself.
             if (totalAmount <= primaryFeeAmount + secondaryFeeAmount) {
-                revert InsufficientTotalAmount(totalAmount, primaryFeeAmount + secondaryFeeAmount);
+                revert InsufficientTotalAmount(
+                    totalAmount,
+                    primaryFeeAmount + secondaryFeeAmount
+                );
             }
 
             return
@@ -162,9 +171,11 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         }
 
         // Otherwise, this is a token "native" to this chain.
-        if (!submittedBridgeTokenCreations[destinationChainID][
-            destinationBridgeAddress
-        ][tokenContractAddress]) {
+        if (
+            !submittedBridgeTokenCreations[destinationChainID][
+                destinationBridgeAddress
+            ][tokenContractAddress]
+        ) {
             revert InvalidBridgeTokenAddress();
         }
 
@@ -214,6 +225,8 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         if (destinationBridgeAddress == address(0)) {
             revert InvalidDestinationBridgeAddress();
         }
+        ITeleporterMessenger teleporterMessenger = teleporterRegistry
+            .getLatestTeleporter();
 
         // For non-zero fee amounts, transfer the fee into the control of this contract first, and then
         // allow the Teleporter contract to spend it.
@@ -274,8 +287,11 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         address nativeBridgeAddress,
         bytes calldata message
     ) external {
-        // Only allow the Teleporter messenger to deliver messages.
-        if (msg.sender != address(teleporterMessenger)) {
+        // Only allow Teleporter messengers above the minimum version to deliver messages.
+        if (
+            teleporterRegistry.getAddressToVersion(msg.sender) <
+            _minTeleporterVersion
+        ) {
             revert Unauthorized();
         }
 
@@ -341,6 +357,10 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         }
     }
 
+    function updateMinTeleporterVersion() external {
+        _minTeleporterVersion = teleporterRegistry.getLatestVersion();
+    }
+
     /**
      * @dev Encodes the parameters for the Create action to be decoded and executed on the destination.
      */
@@ -408,6 +428,9 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
      * @dev Teleporter message receiver for creating a new bridge token on this chain.
      *
      * Emits a {CreateBridgeToken} event.
+     *
+     * Note: This function is only called within `receiveTeleporterMessage`, which can only be
+     * called by the Teleporter messenger.
      */
     function _createBridgeToken(
         bytes32 nativeChainID,
@@ -418,9 +441,11 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         uint8 nativeDecimals
     ) private {
         // Check that the bridge token doesn't already exist.
-        if (nativeToWrappedTokens[nativeChainID][nativeBridgeAddress][
-            nativeContractAddress
-        ] != address(0)) {
+        if (
+            nativeToWrappedTokens[nativeChainID][nativeBridgeAddress][
+                nativeContractAddress
+            ] != address(0)
+        ) {
             revert BridgeTokenAlreadyExists(
                 nativeToWrappedTokens[nativeChainID][nativeBridgeAddress][
                     nativeContractAddress
@@ -456,6 +481,9 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
      * @dev Teleporter message receiver for minting of an existing bridge token on this chain.
      *
      * Emits a {MintBridgeTokens} event.
+     *
+     * Note: This function is only called within `receiveTeleporterMessage`, which can only be
+     * called by the Teleporter messenger.
      */
     function _mintBridgeTokens(
         bytes32 nativeChainID,
@@ -464,11 +492,6 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         address recipient,
         uint256 amount
     ) private nonReentrant {
-        // Only allow the Teleporter messenger to deliver messages.
-        if (msg.sender != address(teleporterMessenger)) {
-            revert Unauthorized();
-        }
-
         // The recipient cannot be the zero address.
         if (recipient == address(0)) {
             revert InvalidRecipientAddress();
@@ -493,6 +516,9 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
     /**
      * @dev Teleporter message receiver for handling bridge tokens transfers back from another chain
      * and optionally routing them to a different third chain.
+     *
+     * Note: This function is only called within `receiveTeleporterMessage`, which can only be
+     * called by the Teleporter messenger.
      */
     function _transferBridgeTokens(
         bytes32 sourceChainID,
@@ -504,11 +530,6 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         uint256 totalAmount,
         uint256 secondaryFeeAmount
     ) private nonReentrant {
-        // Only allow the teleporter messenger to deliver messages.
-        if (msg.sender != address(teleporterMessenger)) {
-            revert Unauthorized();
-        }
-
         // Neither the recipient nor the destination bridge can be the zero address.
         if (recipient == address(0)) {
             revert InvalidRecipientAddress();
@@ -591,6 +612,8 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         if (destinationChainID == currentChainID) {
             revert CannotBridgeTokenWithinSameChain();
         }
+        ITeleporterMessenger teleporterMessenger = teleporterRegistry
+            .getLatestTeleporter();
 
         // Allow the Teleporter messenger to spend the fee amount.
         if (feeAmount > 0) {
@@ -647,6 +670,9 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
     function _processWrappedTokenTransfer(
         WrappedTokenTransferInfo memory wrappedTransferInfo
     ) private {
+        ITeleporterMessenger teleporterMessenger = teleporterRegistry
+            .getLatestTeleporter();
+
         // If necessary, transfer the primary fee amount to this contract and approve the
         // Teleporter messenger to spend it when the first message back to the native subnet
         // is submitted. The secondary fee amount is then handled by the native subnet when
@@ -684,7 +710,10 @@ contract ERC20Bridge is IERC20Bridge, ITeleporterReceiver, ReentrancyGuard {
         bytes32 nativeChainID = bridgeToken.nativeChainID();
         address nativeBridgeAddress = bridgeToken.nativeBridge();
         if (wrappedTransferInfo.destinationChainID == nativeChainID) {
-            if (wrappedTransferInfo.destinationBridgeAddress != nativeBridgeAddress) {
+            if (
+                wrappedTransferInfo.destinationBridgeAddress !=
+                nativeBridgeAddress
+            ) {
                 revert InvalidDestinationBridgeAddress();
             }
         }

contracts/src/CrossChainApplications/ERC20Bridge/tests/ERC20BridgeTests.t.sol

@@ -12,6 +12,8 @@ import "../../../Mocks/UnitTestMockERC20.sol";
 contract ERC20BridgeTest is Test {
     address public constant MOCK_TELEPORTER_MESSENGER_ADDRESS =
         0x644E5b7c5D4Bc8073732CEa72c66e0BB90dFC00f;
+    address public constant MOCK_TELEPORTER_REGISTRY_ADDRESS =
+        0xf9FA4a0c696b659328DDaaBCB46Ae4eBFC9e68e4;
     address public constant WARP_PRECOMPILE_ADDRESS =
         address(0x0200000000000000000000000000000000000005);
     bytes32 private constant _MOCK_BLOCKCHAIN_ID = bytes32(uint256(123456));
@@ -65,11 +67,60 @@ contract ERC20BridgeTest is Test {
             abi.encodeWithSelector(WarpMessenger.getBlockchainID.selector),
             abi.encode(_MOCK_BLOCKCHAIN_ID)
         );
+        vm.expectCall(
+            WARP_PRECOMPILE_ADDRESS,
+            abi.encodeWithSelector(WarpMessenger.getBlockchainID.selector)
+        );
+
+        initMockTeleporterRegistry();
+
+        vm.expectCall(
+            MOCK_TELEPORTER_REGISTRY_ADDRESS,
+            abi.encodeWithSelector(
+                WarpProtocolRegistry.getLatestVersion.selector
+            )
+        );
 
-        erc20Bridge = new ERC20Bridge(MOCK_TELEPORTER_MESSENGER_ADDRESS);
+        erc20Bridge = new ERC20Bridge(MOCK_TELEPORTER_REGISTRY_ADDRESS);
         mockERC20 = new UnitTestMockERC20();
     }
 
+    function initMockTeleporterRegistry() internal {
+        vm.mockCall(
+            MOCK_TELEPORTER_REGISTRY_ADDRESS,
+            abi.encodeWithSelector(
+                WarpProtocolRegistry.getLatestVersion.selector
+            ),
+            abi.encode(1)
+        );
+
+        vm.mockCall(
+            MOCK_TELEPORTER_REGISTRY_ADDRESS,
+            abi.encodeWithSelector(
+                TeleporterRegistry.getAddressToVersion.selector,
+                (MOCK_TELEPORTER_MESSENGER_ADDRESS)
+            ),
+            abi.encode(1)
+        );
+
+        vm.mockCall(
+            MOCK_TELEPORTER_REGISTRY_ADDRESS,
+            abi.encodeWithSelector(
+                WarpProtocolRegistry.getVersionToAddress.selector,
+                (1)
+            ),
+            abi.encode(MOCK_TELEPORTER_MESSENGER_ADDRESS)
+        );
+
+        vm.mockCall(
+            MOCK_TELEPORTER_REGISTRY_ADDRESS,
+            abi.encodeWithSelector(
+                TeleporterRegistry.getLatestTeleporter.selector
+            ),
+            abi.encode(ITeleporterMessenger(MOCK_TELEPORTER_MESSENGER_ADDRESS))
+        );
+    }
+
     function testSameChainID() public {
         vm.expectRevert(ERC20Bridge.CannotBridgeTokenWithinSameChain.selector);
         erc20Bridge.bridgeTokens({
@@ -90,9 +141,13 @@ contract ERC20BridgeTest is Test {
             _DEFAULT_OTHER_BRIDGE_ADDRESS,
             address(mockERC20)
         );
-        vm.expectRevert(abi.encodePacked(
-            ERC20Bridge.InsufficientAdjustedAmount.selector,
-            uint256(130), uint256(130)));
+        vm.expectRevert(
+            abi.encodePacked(
+                ERC20Bridge.InsufficientAdjustedAmount.selector,
+                uint256(130),
+                uint256(130)
+            )
+        );
         erc20Bridge.bridgeTokens({
             destinationChainID: _DEFAULT_OTHER_CHAIN_ID,
             destinationBridgeAddress: _DEFAULT_OTHER_BRIDGE_ADDRESS,
@@ -115,9 +170,13 @@ contract ERC20BridgeTest is Test {
             contractNonce: 1
         });
 
-        vm.expectRevert(abi.encodePacked(
-            ERC20Bridge.InsufficientTotalAmount.selector,
-            uint256(130), uint256(130)));
+        vm.expectRevert(
+            abi.encodePacked(
+                ERC20Bridge.InsufficientTotalAmount.selector,
+                uint256(130),
+                uint256(130)
+            )
+        );
         erc20Bridge.bridgeTokens({
             destinationChainID: _DEFAULT_OTHER_CHAIN_ID,
             destinationBridgeAddress: _DEFAULT_OTHER_BRIDGE_ADDRESS,
@@ -494,9 +553,13 @@ contract ERC20BridgeTest is Test {
             address(mockERC20)
         );
 
-        vm.expectRevert(abi.encodePacked(
-            ERC20Bridge.InsufficientAdjustedAmount.selector,
-            uint256(totalAmount - tokenFeeOnTransferAmount), uint256(bridgeFeeAmount)));
+        vm.expectRevert(
+            abi.encodePacked(
+                ERC20Bridge.InsufficientAdjustedAmount.selector,
+                uint256(totalAmount - tokenFeeOnTransferAmount),
+                uint256(bridgeFeeAmount)
+            )
+        );
         erc20Bridge.bridgeTokens({
             destinationChainID: _DEFAULT_OTHER_CHAIN_ID,
             destinationBridgeAddress: _DEFAULT_OTHER_BRIDGE_ADDRESS,