fixup! Replaced explicit warp contract in TeleporterMessenger to use an interface

Author: batconjurer

abi-bindings/go/teleporter/TeleporterMessenger/TeleporterMessenger.go

@@ -181,12 +181,6 @@ interface ITeleporterMessenger {
      */
     function receiveCrossChainMessage(uint32 messageIndex, address relayerRewardAddress) external;
 
-    /**
-     * @notice Receives an inter-chain message, and marks the `relayerRewardAddress` for fee reward for a successful delivery.
-     *
-     */
-    function receiveInterChainMessage(ICMMessage calldata icmMessage, address relayerRewardAddress) external;
-
     /**
      * @notice Retries the execution of a previously delivered message by verifying the payload matches
      * the hash of the payload originally delivered, and calling the destination address again.

avalanche/contracts/teleporter/ITeleporterMessenger.sol

@@ -22,6 +22,6 @@ interface IWarpExt is IWarpMessenger {
      * @return message A verified Warp message.
      */
     function getVerifiedICMMessage(
-        ICMMessage calldata icmMessag3
+        ICMMessage calldata icmMessage
     ) external view returns (WarpMessage memory message);
 }

avalanche/contracts/teleporter/IWarpExt.sol

@@ -272,26 +272,7 @@ contract TeleporterMessenger is ITeleporterMessenger, ReentrancyGuards, Initiali
         );
         _processWarpMessage(warpMessage, relayerRewardAddress);
     }
-
-    /**
-     * @dev Emits a {ReceiveCrossChainMessage} event.
-     * Receives a Warp message as a byte payload and processes it.
-     * Re-entrancy is explicitly disallowed between receiving functions. One message is not able to receive another message.
-     * Requirements:
-     *
-     * - Valid warp message is decoded from the payload
-     *
-     * @inheritdoc ITeleporterMessenger
-     */
-    function receiveInterChainMessage(
-        ICMMessage calldata icmMessage,
-        address relayerRewardAddress
-    ) external receiverNonReentrant {
-        WarpMessage memory warpMessage =
-            _warpMessenger.getVerifiedICMMessage(icmMessage);
-        _processWarpMessage(warpMessage, relayerRewardAddress);
-    }
-
+    
     /**
      * @dev A Teleporter message has an associated `requiredGasLimit` that is used to execute the message.
      * If the `requiredGasLimit` is too low, then the message execution will fail. This method allows
@@ -672,45 +653,16 @@ contract TeleporterMessenger is ITeleporterMessenger, ReentrancyGuards, Initiali
         TeleporterMessageInput memory messageInput,
         TeleporterMessageReceipt[] memory receipts
     ) private returns (bytes32) {
-
-        (bytes32 messageID, TeleporterMessage memory teleporterMessage, TeleporterFeeInfo memory  adjustedFeeInfo)
-            = _prepareTeleporterMessage(messageInput, receipts);
-
-        bytes memory teleporterMessageBytes = abi.encode(teleporterMessage);
-        sentMessageInfo[messageID] = SentMessageInfo({
-            messageHash: keccak256(teleporterMessageBytes),
-            feeInfo: adjustedFeeInfo
-        });
-
-        emit SendCrossChainMessage(
-            messageID, messageInput.destinationBlockchainID, teleporterMessage, adjustedFeeInfo
-        );
-
-        // Submit the message to the AWM precompile.
-        _warpMessenger.sendWarpMessage(teleporterMessageBytes);
-
-        return messageID;
-    }
-
-
-    /**
-     * @dev Helper function that assempbles the actual telepoter message and associated
-     * metadata (message id, fee info)
-     */
-    function _prepareTeleporterMessage(
-        TeleporterMessageInput memory messageInput,
-        TeleporterMessageReceipt[] memory receipts
-    ) private returns (bytes32 messageID, TeleporterMessage memory teleporterMessage, TeleporterFeeInfo memory ) {
         // If the blockchain ID has yet to be initialized, do so now.
         bytes32 blockchainID_ = initializeBlockchainID();
 
         // Get the message ID to use for this message by incrementing it.
         uint256 messageNonce_ = ++messageNonce;
-        messageID =
+        bytes32 messageID =
             calculateMessageID(blockchainID_, messageInput.destinationBlockchainID, messageNonce_);
 
         // Construct and serialize the message.
-        teleporterMessage = TeleporterMessage({
+        TeleporterMessage memory teleporterMessage = TeleporterMessage({
             messageNonce: messageNonce_,
             originSenderAddress: msg.sender,
             destinationBlockchainID: messageInput.destinationBlockchainID,
@@ -720,7 +672,7 @@ contract TeleporterMessenger is ITeleporterMessenger, ReentrancyGuards, Initiali
             receipts: receipts,
             message: messageInput.message
         });
-
+        bytes memory teleporterMessageBytes = abi.encode(teleporterMessage);
 
         // If the fee amount is non-zero, transfer the asset into control of this TeleporterMessenger contract instance.
         // The fee is allowed to be 0 because it's possible for someone to run their own relayer and deliver their own messages,
@@ -745,8 +697,19 @@ contract TeleporterMessenger is ITeleporterMessenger, ReentrancyGuards, Initiali
             feeTokenAddress: messageInput.feeInfo.feeTokenAddress,
             amount: adjustedFeeAmount
         });
+        sentMessageInfo[messageID] = SentMessageInfo({
+            messageHash: keccak256(teleporterMessageBytes),
+            feeInfo: adjustedFeeInfo
+        });
 
-        return (messageID, teleporterMessage, adjustedFeeInfo);
+        emit SendCrossChainMessage(
+            messageID, messageInput.destinationBlockchainID, teleporterMessage, adjustedFeeInfo
+        );
+
+        // Submit the message to the AWM precompile.
+        _warpMessenger.sendWarpMessage(teleporterMessageBytes);
+
+        return messageID;
     }
 
     /**