feat(evm): upgrade wormhole-solidity-sdk to v1.1.0 with gas optimizations

Migrate from wormhole-solidity-sdk v0.1.0 to v1.1.0. Replace
parseAndVerifyVM with client-side CoreBridgeLib.decodeAndVerifyVaaCd,
switch receiveMessage to calldata, use VaaLib.calcVaaDoubleHashCd for
replay protection, inline nttManagerMessageDigest, add constant-time
countSetBits popcount, cache transceiver index in attestation, and
replace ConfigMakers with SDK's CustomConsistencyLib.

receiveMessage gas: avg -21.6%, median -18.1%, max -12.0%.
Deployment size: -14.1%.

Bump NttManager and WormholeTransceiver to v2.1.0 with TS SDK bindings.

Author: dvgui

evm/echidna/FuzzNttManager.sol

@@ -14,7 +14,7 @@ import "./helpers/FuzzingHelpers.sol";
 import "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import "solidity-bytes-utils/BytesLib.sol";
 import "../test/mocks/DummyTransceiver.sol";
-import "wormhole-solidity-sdk/Utils.sol";
+import "wormhole-sdk/Utils.sol";
 
 contract FuzzNttManager is FuzzingHelpers {
     uint64[] queuedOutboundTransfersArray;

evm/foundry.lock

@@ -9,6 +9,6 @@
     "rev": "e0115c4d231910df47ce3b60625ce562fe4af985"
   },
   "lib/wormhole-solidity-sdk": {
-    "rev": "b9e129e65d34827d92fceeed8c87d3ecdfc801d0"
+    "rev": "d80e0f6cd16f281f3f9df435e98e823b4212b2ad"
   }
 }

evm/foundry.toml

@@ -1,8 +1,8 @@
 [profile.default]
-solc_version = "0.8.19"
+solc_version = "0.8.24"
 optimizer = true
 optimizer_runs = 200
-via_ir = false
+via_ir = true
 evm_version = "london"
 src = "src"
 out = "out"

evm/lib/wormhole-solidity-sdk

@@ -0,0 +1,2 @@
+wormhole-solidity-sdk/=lib/wormhole-solidity-sdk/src/
+wormhole-sdk/=lib/wormhole-solidity-sdk/src/

evm/remappings.txt

@@ -9,14 +9,11 @@ import {INttManager} from "../src/interfaces/INttManager.sol";
 import {IWormholeTransceiver} from "../src/interfaces/IWormholeTransceiver.sol";
 import "../src/interfaces/IManagerBase.sol";
 import "openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
+import {ICoreBridge} from "wormhole-sdk/interfaces/ICoreBridge.sol";
 import {NttManager} from "../src/NttManager/NttManager.sol";
 import {NttManagerNoRateLimiting} from "../src/NttManager/NttManagerNoRateLimiting.sol";
 import {NttManagerWethUnwrap} from "../src/NttManager/NttManagerWethUnwrap.sol";
 
-interface IWormhole {
-    function chainId() external view returns (uint16);
-}
-
 contract DeployWormholeNtt is Script, DeployWormholeNttBase {
     function run() public {
         vm.startBroadcast();
@@ -32,7 +29,7 @@ contract DeployWormholeNtt is Script, DeployWormholeNttBase {
             modeUint == 0 ? IManagerBase.Mode.LOCKING : IManagerBase.Mode.BURNING;
         string memory managerVariant = vm.envOr("MANAGER_VARIANT", string("standard"));
 
-        IWormhole wh = IWormhole(wormhole);
+        ICoreBridge wh = ICoreBridge(wormhole);
 
         // sanity check decimals
         (bool success, bytes memory queriedDecimals) =

evm/script/DeployWormholeNtt.s.sol

@@ -14,7 +14,7 @@ import {
     WormholeTransceiver
 } from "../../src/Transceiver/WormholeTransceiver/WormholeTransceiver.sol";
 import {ERC1967Proxy} from "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import {IWormhole} from "wormhole-solidity-sdk/interfaces/IWormhole.sol";
+import {ICoreBridge} from "wormhole-sdk/interfaces/ICoreBridge.sol";
 
 contract DeployWormholeNttBase is ParseNttConfig {
     /// @notice Parameters for deploying NTT contracts
@@ -106,7 +106,7 @@ contract DeployWormholeNttBase is ParseNttConfig {
         WormholeTransceiver transceiverProxy =
             WormholeTransceiver(address(new ERC1967Proxy(address(implementation), "")));
 
-        IWormhole wh = IWormhole(params.wormholeCoreBridge);
+        ICoreBridge wh = ICoreBridge(params.wormholeCoreBridge);
         uint256 messageFee = wh.messageFee();
         // wh transceiver sends a WH_TRANSCEIVER_INIT_PREFIX message
         transceiverProxy.initialize{value: messageFee}();

evm/script/helpers/DeployWormholeNttBase.sol

@@ -6,6 +6,7 @@ import {stdJson} from "forge-std/StdJson.sol";
 
 import "../../src/interfaces/INttManager.sol";
 import "../../src/interfaces/IWormholeTransceiver.sol";
+import {toUniversalAddress, fromUniversalAddress} from "wormhole-sdk/Utils.sol";
 
 contract ParseNttConfig is Script {
     using stdJson for string;
@@ -25,24 +26,6 @@ contract ParseNttConfig is Script {
 
     mapping(uint16 => bool) duplicateChainIds;
 
-    function toUniversalAddress(
-        address evmAddr
-    ) internal pure returns (bytes32 converted) {
-        assembly ("memory-safe") {
-            converted := and(0xffffffffffffffffffffffffffffffffffffffff, evmAddr)
-        }
-    }
-
-    function fromUniversalAddress(
-        bytes32 universalAddr
-    ) internal pure returns (address converted) {
-        require(bytes12(universalAddr) == 0, "Address overflow");
-
-        assembly ("memory-safe") {
-            converted := universalAddr
-        }
-    }
-
     function _parseAndValidateConfigFile(
         uint16 wormholeChainId
     )

evm/script/helpers/ParseNttConfig.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache 2
 pragma solidity >=0.8.8 <0.9.0;
 
-import "wormhole-solidity-sdk/Utils.sol";
-import "wormhole-solidity-sdk/libraries/BytesParsing.sol";
+import "wormhole-sdk/Utils.sol";
+import "wormhole-sdk/libraries/BytesParsing.sol";
 
 import "../libraries/external/OwnableUpgradeable.sol";
 import "../libraries/external/ReentrancyGuardUpgradeable.sol";
@@ -146,16 +146,20 @@ abstract contract ManagerBase is
         bytes32 nttManagerMessageHash =
             TransceiverStructs.nttManagerMessageDigest(sourceChainId, payload);
 
+        // Cache the transceiver index to avoid redundant storage reads.
+        uint8 index = _getTransceiverInfosStorage()[msg.sender].index;
+
         // set the attested flag for this transceiver.
         // NOTE: Attestation is idempotent (bitwise or 1), but we revert
         // anyway to ensure that the client does not continue to initiate calls
         // to receive the same message through the same transceiver.
-        if (transceiverAttestedToMessage(
-                nttManagerMessageHash, _getTransceiverInfosStorage()[msg.sender].index
-            )) {
+        if (transceiverAttestedToMessage(nttManagerMessageHash, index)) {
             revert TransceiverAlreadyAttestedToMessage(nttManagerMessageHash);
         }
-        _setTransceiverAttestedToMessage(nttManagerMessageHash, msg.sender);
+        _setTransceiverAttestedToMessage(nttManagerMessageHash, index);
+
+        // msg.sender is the transceiver address (guaranteed by onlyTransceiver modifier)
+        emit MessageAttestedTo(nttManagerMessageHash, msg.sender, index);
 
         return nttManagerMessageHash;
     }
@@ -430,16 +434,6 @@ abstract contract ManagerBase is
         _getMessageAttestationsStorage()[digest].attestedTransceivers |= uint64(1 << index);
     }
 
-    function _setTransceiverAttestedToMessage(
-        bytes32 digest,
-        address transceiver
-    ) internal {
-        _setTransceiverAttestedToMessage(digest, _getTransceiverInfosStorage()[transceiver].index);
-
-        emit MessageAttestedTo(
-            digest, transceiver, _getTransceiverInfosStorage()[transceiver].index
-        );
-    }
 
     /// @dev Returns the bitmap of attestations from enabled transceivers for a given message.
     function _getMessageAttestations(

evm/src/NttManager/ManagerBase.sol

@@ -4,8 +4,8 @@ pragma solidity >=0.8.8 <0.9.0;
 import "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
 import "openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol";
-import "wormhole-solidity-sdk/Utils.sol";
-import "wormhole-solidity-sdk/libraries/BytesParsing.sol";
+import "wormhole-sdk/Utils.sol";
+import "wormhole-sdk/libraries/BytesParsing.sol";
 
 import "../libraries/RateLimiter.sol";
 
@@ -41,7 +41,7 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
     using TrimmedAmountLib for uint256;
     using TrimmedAmountLib for TrimmedAmount;
 
-    string public constant NTT_MANAGER_VERSION = "2.0.0";
+    string public constant NTT_MANAGER_VERSION = "2.1.0";
 
     // =============== Setup =================================================================
 
@@ -245,7 +245,7 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
         TrimmedAmount nativeTransferAmount =
             (nativeTokenTransfer.amount.untrim(toDecimals)).trim(toDecimals, toDecimals);
 
-        address transferRecipient = fromWormholeFormat(nativeTokenTransfer.to);
+        address transferRecipient = fromUniversalAddress(nativeTokenTransfer.to);
 
         bool enqueued = _enqueueOrConsumeInboundRateLimit(
             digest, sourceChainId, nativeTransferAmount, transferRecipient
@@ -551,7 +551,7 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
         bytes memory encodedNttManagerPayload = TransceiverStructs.encodeNttManagerMessage(
             TransceiverStructs.NttManagerMessage(
                 bytes32(uint256(seq)),
-                toWormholeFormat(sender),
+                toUniversalAddress(sender),
                 TransceiverStructs.encodeNativeTokenTransfer(ntt)
             )
         );
@@ -609,7 +609,7 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
         bytes32 // refundAddress
     ) internal virtual returns (TransceiverStructs.NativeTokenTransfer memory) {
         return TransceiverStructs.NativeTokenTransfer(
-            amount, toWormholeFormat(token), recipient, recipientChain, ""
+            amount, toUniversalAddress(token), recipient, recipientChain, ""
         );
     }