Pass endpoint instruction to quote delivery price (#128)

* Pass endpoint instruction to quote delivery price

* Fix IntegrationRelayer tests

Author: nik-suri

src/Endpoint.sol

@@ -19,7 +19,10 @@ abstract contract Endpoint is PausableOwnable {
         EndpointStructs.ManagerMessage memory payload
     ) internal virtual;
 
-    function _quoteDeliveryPrice(uint16 targetChain) internal view virtual returns (uint256);
+    function _quoteDeliveryPrice(
+        uint16 targetChain,
+        EndpointStructs.EndpointInstruction memory endpointInstruction
+    ) internal view virtual returns (uint256);
 
     /// @notice pause the endpoint
     function _pauseEndpoint() internal {

src/EndpointAndManager.sol

@@ -38,14 +38,12 @@ abstract contract EndpointAndManager is Endpoint, Manager, Implementation {
         _upgrade(newImplementation);
     }
 
-    function quoteDeliveryPrice(uint16 recipientChain)
-        public
-        view
-        override
-        returns (uint256[] memory)
-    {
+    function quoteDeliveryPrice(
+        uint16 recipientChain,
+        EndpointStructs.EndpointInstruction[] memory endpointInstructions
+    ) public view override returns (uint256[] memory) {
         uint256[] memory quotes = new uint256[](1);
-        quotes[0] = _quoteDeliveryPrice(recipientChain);
+        quotes[0] = _quoteDeliveryPrice(recipientChain, endpointInstructions[0]);
         return quotes;
     }
 

src/EndpointStandalone.sol

@@ -73,8 +73,11 @@ abstract contract EndpointStandalone is
         _sendMessage(recipientChain, msg.value, msg.sender, instruction, managerMessage);
     }
 
-    function quoteDeliveryPrice(uint16 targetChain) external view override returns (uint256) {
-        return _quoteDeliveryPrice(targetChain);
+    function quoteDeliveryPrice(
+        uint16 targetChain,
+        EndpointStructs.EndpointInstruction memory instruction
+    ) external view override returns (uint256) {
+        return _quoteDeliveryPrice(targetChain, instruction);
     }
 
     function _deliverToManager(

src/Manager.sol

@@ -116,11 +116,10 @@ abstract contract Manager is
 
     /// @dev This will either cross-call or internal call, depending on whether the contract is standalone or not.
     ///      This method should return an array of delivery prices corresponding to each endpoint.
-    function quoteDeliveryPrice(uint16 recipientChain)
-        public
-        view
-        virtual
-        returns (uint256[] memory);
+    function quoteDeliveryPrice(
+        uint16 recipientChain,
+        EndpointStructs.EndpointInstruction[] memory endpointInstructions
+    ) public view virtual returns (uint256[] memory);
 
     /// @dev This will either cross-call or internal call, depending on whether the contract is standalone or not.
     function _sendMessageToEndpoints(
@@ -384,7 +383,11 @@ abstract contract Manager is
         address sender,
         bytes memory endpointInstructions
     ) internal returns (uint64 msgSequence) {
-        uint256[] memory priceQuotes = quoteDeliveryPrice(recipientChain);
+        // parse and reorganize the endpoint instructions based on index
+        EndpointStructs.EndpointInstruction[] memory sortedInstructions = EndpointStructs
+            .sortEndpointInstructions(EndpointStructs.parseEndpointInstructions(endpointInstructions));
+
+        uint256[] memory priceQuotes = quoteDeliveryPrice(recipientChain, sortedInstructions);
         {
             // check up front that msg.value will cover the delivery price
             uint256 totalPriceQuote = arraySum(priceQuotes);
@@ -412,10 +415,6 @@ abstract contract Manager is
             )
         );
 
-        // parse and reorganize the endpoint instructions based on index
-        EndpointStructs.EndpointInstruction[] memory sortedInstructions = EndpointStructs
-            .sortEndpointInstructions(EndpointStructs.parseEndpointInstructions(endpointInstructions));
-
         // send the message
         _sendMessageToEndpoints(
             recipientChain, priceQuotes, sortedInstructions, encodedManagerPayload

src/ManagerStandalone.sol

@@ -137,17 +137,19 @@ contract ManagerStandalone is IManagerStandalone, Manager, Implementation {
         emit EndpointRemoved(endpoint, _threshold.num);
     }
 
-    function quoteDeliveryPrice(uint16 recipientChain)
-        public
-        view
-        override
-        returns (uint256[] memory)
-    {
+    function quoteDeliveryPrice(
+        uint16 recipientChain,
+        EndpointStructs.EndpointInstruction[] memory endpointInstructions
+    ) public view override returns (uint256[] memory) {
         address[] storage _enabledEndpoints = _getEnabledEndpointsStorage();
+        mapping(address => EndpointInfo) storage endpointInfos = _getEndpointInfosStorage();
+
         uint256[] memory priceQuotes = new uint256[](_enabledEndpoints.length);
         for (uint256 i = 0; i < _enabledEndpoints.length; i++) {
-            uint256 endpointPriceQuote =
-                IEndpointStandalone(_enabledEndpoints[i]).quoteDeliveryPrice(recipientChain);
+            address endpointAddr = _enabledEndpoints[i];
+            uint8 registeredEndpointIndex = endpointInfos[endpointAddr].index;
+            uint256 endpointPriceQuote = IEndpointStandalone(_enabledEndpoints[i])
+                .quoteDeliveryPrice(recipientChain, endpointInstructions[registeredEndpointIndex]);
             priceQuotes[i] = endpointPriceQuote;
         }
         return priceQuotes;

src/WormholeEndpoint.sol

@@ -2,12 +2,12 @@
 pragma solidity >=0.8.8 <0.9.0;
 
 import "wormhole-solidity-sdk/WormholeRelayerSDK.sol";
+import "wormhole-solidity-sdk/libraries/BytesParsing.sol";
+import "wormhole-solidity-sdk/interfaces/IWormhole.sol";
 
 import "./libraries/EndpointHelpers.sol";
-import "./interfaces/IWormhole.sol";
 import "./interfaces/IWormholeEndpoint.sol";
 import "./Endpoint.sol";
-import "wormhole-solidity-sdk/libraries/BytesParsing.sol";
 
 abstract contract WormholeEndpoint is Endpoint, IWormholeEndpoint, IWormholeReceiver {
     using BytesParsing for bytes;
@@ -111,12 +111,17 @@ abstract contract WormholeEndpoint is Endpoint, IWormholeEndpoint, IWormholeRece
         return isWormholeRelayingEnabled(chainId) && isWormholeEvmChain(chainId);
     }
 
-    function _quoteDeliveryPrice(uint16 targetChain)
-        internal
-        view
-        override
-        returns (uint256 nativePriceQuote)
-    {
+    function _quoteDeliveryPrice(
+        uint16 targetChain,
+        EndpointStructs.EndpointInstruction memory instruction
+    ) internal view override returns (uint256 nativePriceQuote) {
+        // Check the special instruction up front to see if we should skip sending via a relayer
+        WormholeEndpointInstruction memory weIns =
+            parseWormholeEndpointInstruction(instruction.payload);
+        if (weIns.shouldSkipRelayerSend) {
+            return 0;
+        }
+
         if (checkInvalidRelayingConfig(targetChain)) {
             revert InvalidRelayingConfig(targetChain);
         }

src/interfaces/IEndpointStandalone.sol

@@ -8,7 +8,10 @@ interface IEndpointStandalone {
     error CannotRenounceEndpointOwnership(address currentOwner);
     error CannotTransferEndpointOwnership(address currentOwner, address newOwner);
 
-    function quoteDeliveryPrice(uint16 recipientChain) external view returns (uint256);
+    function quoteDeliveryPrice(
+        uint16 recipientChain,
+        EndpointStructs.EndpointInstruction memory instruction
+    ) external view returns (uint256);
 
     function sendMessage(
         uint16 recipientChain,

src/interfaces/IManager.sol

@@ -2,6 +2,7 @@
 pragma solidity >=0.8.8 <0.9.0;
 
 import "../libraries/NormalizedAmount.sol";
+import "../libraries/EndpointStructs.sol";
 
 interface IManager {
     error DeliveryPaymentTooLow(uint256 requiredPayment, uint256 providedPayment);
@@ -42,7 +43,10 @@ interface IManager {
 
     function setInboundLimit(uint256 limit, uint16 chainId) external;
 
-    function quoteDeliveryPrice(uint16 recipientChain) external view returns (uint256[] memory);
+    function quoteDeliveryPrice(
+        uint16 recipientChain,
+        EndpointStructs.EndpointInstruction[] memory endpointInstructions
+    ) external view returns (uint256[] memory);
 
     function nextMessageSequence() external view returns (uint64);