Feat: Wrapped M bridging

.github/example-native-token-transfers.diff

@@ -0,0 +1,13 @@
+diff --git a/evm/src/NttManager/NttManager.sol b/evm/src/NttManager/NttManager.sol
+index 7ac021b..60e4aee 100644
+--- a/evm/src/NttManager/NttManager.sol
++++ b/evm/src/NttManager/NttManager.sol
+@@ -383,7 +383,7 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
+         bytes32 refundAddress,
+         bool shouldQueue,
+         bytes memory transceiverInstructions
+-    ) internal returns (uint64) {
++    ) internal virtual returns (uint64) {
+         if (amount == 0) {
+             revert ZeroAmount();
+         }

.github/workflows/coverage.yml

@@ -17,6 +17,11 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Apply patch
+        run: |
+          cd lib/example-native-token-transfers
+          git apply ../../.github/example-native-token-transfers.diff
+
       - name: Setup Node
         uses: actions/setup-node@v4
 

.github/workflows/test-fork.yml

@@ -17,6 +17,11 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Apply patch
+        run: |
+          cd lib/example-native-token-transfers
+          git apply ../../.github/example-native-token-transfers.diff
+
       - name: Setup Node
         uses: actions/setup-node@v4
 

.github/workflows/test-gas.yml

@@ -17,6 +17,11 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Apply patch
+        run: |
+          cd lib/example-native-token-transfers
+          git apply ../../.github/example-native-token-transfers.diff
+
       - name: Setup Node
         uses: actions/setup-node@v4
 

.github/workflows/test-sizes.yml

@@ -17,6 +17,11 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Apply patch
+        run: |
+          cd lib/example-native-token-transfers
+          git apply ../../.github/example-native-token-transfers.diff
+
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 

foundry.toml

@@ -16,7 +16,7 @@ via_ir = false
 [profile.production]
 build_info = true
 optimizer = true
-optimizer_runs = 800
+optimizer_runs = 1500
 sizes = true
 via_ir = true
 

src/HubPortal.sol

@@ -20,9 +20,6 @@ import { TypeConverter } from "./libs/TypeConverter.sol";
 contract HubPortal is IHubPortal, Portal {
     using TypeConverter for address;
 
-    /// @dev Use only standard WormholeTransceiver with relaying enabled
-    bytes public constant DEFAULT_TRANSCEIVER_INSTRUCTIONS = new bytes(1);
-
     /* ============ Variables ============ */
 
     /// @inheritdoc IHubPortal
@@ -54,7 +51,7 @@ contract HubPortal is IHubPortal, Portal {
     ) external payable returns (bytes32 messageId_) {
         uint128 index_ = _currentIndex();
         bytes memory payload_ = PayloadEncoder.encodeIndex(index_, destinationChainId_);
-        messageId_ = _sendMessage(destinationChainId_, refundAddress_, payload_);
+        messageId_ = _sendCustomMessage(destinationChainId_, refundAddress_, payload_);
 
         emit MTokenIndexSent(destinationChainId_, messageId_, index_);
     }
@@ -67,7 +64,7 @@ contract HubPortal is IHubPortal, Portal {
     ) external payable returns (bytes32 messageId_) {
         bytes32 value_ = IRegistrarLike(registrar).get(key_);
         bytes memory payload_ = PayloadEncoder.encodeKey(key_, value_, destinationChainId_);
-        messageId_ = _sendMessage(destinationChainId_, refundAddress_, payload_);
+        messageId_ = _sendCustomMessage(destinationChainId_, refundAddress_, payload_);
 
         emit RegistrarKeySent(destinationChainId_, messageId_, key_, value_);
     }
@@ -81,7 +78,7 @@ contract HubPortal is IHubPortal, Portal {
     ) external payable returns (bytes32 messageId_) {
         bool status_ = IRegistrarLike(registrar).listContains(listName_, account_);
         bytes memory payload_ = PayloadEncoder.encodeListUpdate(listName_, account_, status_, destinationChainId_);
-        messageId_ = _sendMessage(destinationChainId_, refundAddress_, payload_);
+        messageId_ = _sendCustomMessage(destinationChainId_, refundAddress_, payload_);
 
         emit RegistrarListStatusSent(destinationChainId_, messageId_, listName_, account_, status_);
     }
@@ -118,43 +115,28 @@ contract HubPortal is IHubPortal, Portal {
      * @param amount_    The amount of M Token to unlock to the recipient.
      */
     function _mintOrUnlock(address recipient_, uint256 amount_, uint128) internal override {
-        IERC20(mToken()).transfer(recipient_, amount_);
+        if (recipient_ != address(this)) {
+            IERC20(mToken()).transfer(recipient_, amount_);
+        }
     }
 
-    /// @notice Sends a generic message to the destination chain.
-    /// @dev    The implementation is adapted from `NttManager` `_transfer` function.
-    function _sendMessage(
+    /// @dev Sends a custom (not a transfer) message to the destination chain.
+    function _sendCustomMessage(
         uint16 destinationChainId_,
         bytes32 refundAddress_,
         bytes memory payload_
     ) private returns (bytes32 messageId_) {
         if (refundAddress_ == bytes32(0)) revert InvalidRefundAddress();
 
-        (
-            address[] memory enabledTransceivers_,
-            TransceiverStructs.TransceiverInstruction[] memory instructions_,
-            uint256[] memory priceQuotes_,
-
-        ) = _prepareForTransfer(destinationChainId_, DEFAULT_TRANSCEIVER_INSTRUCTIONS);
-
         TransceiverStructs.NttManagerMessage memory message_ = TransceiverStructs.NttManagerMessage(
             bytes32(uint256(_useMessageSequence())),
             msg.sender.toBytes32(),
             payload_
         );
 
-        // send the message
-        _sendMessageToTransceivers(
-            destinationChainId_,
-            refundAddress_,
-            _getPeersStorage()[destinationChainId_].peerAddress,
-            priceQuotes_,
-            instructions_,
-            enabledTransceivers_,
-            TransceiverStructs.encodeNttManagerMessage(message_)
-        );
+        _sendMessage(destinationChainId_, refundAddress_, message_);
 
-        return TransceiverStructs.nttManagerMessageDigest(chainId, message_);
+        messageId_ = TransceiverStructs.nttManagerMessageDigest(chainId, message_);
     }
 
     /* ============ Internal View/Pure Functions ============ */