gRelayer: make relayprovider calls safe (#2822)

* gRelayer-make-relay-provider-calls-safe

* gRelayer-remove-unnecessary-code

* gRelayer: attempt 1 at getting under contract size

* gRelayer: uer contract size limit

* forge fmt

* gRelayer: Address nits in PR

Author: derpy-duck

ethereum/contracts/interfaces/relayer/IForwardWrapper.sol

@@ -13,8 +13,10 @@ interface IForwardWrapper {
         bytes[] memory signedVaas
     ) external payable returns (bool callToTargetContractSucceeded, uint256 transactionFeeRefundAmount);
 
-    function safeRelayProviderSupportsChain(IRelayProvider relayProvider, uint16 chainId)
-        external
-        view
-        returns (bool isSupported);
+    function getValuesFromRelayProvider(
+        address providerAddress,
+        uint16 sourceChain,
+        uint16 targetChain,
+        uint256 receiverValuePlusOverhead
+    ) external view returns (address rewardAddress, uint256 maximumBudget, uint256 receiverValueTarget);
 }

ethereum/contracts/interfaces/relayer/IWormholeRelayerInternalStructs.sol

@@ -53,7 +53,7 @@ interface IWormholeRelayerInternalStructs {
 
     struct DeliveryInternalVariables {
         uint256 preGas;
-        uint256 postGas; 
+        uint256 postGas;
         bool callToInstructionExecutorSucceeded;
         bytes callToInstructionExecutorData;
         uint256 transactionFeeRefundAmount;
@@ -64,5 +64,4 @@ interface IWormholeRelayerInternalStructs {
         bytes additionalStatusInfo;
         bytes overridesInfo;
     }
-
 }

ethereum/contracts/relayer/coreRelayer/CoreRelayer.sol

@@ -390,7 +390,7 @@ abstract contract CoreRelayer is CoreRelayerDelivery {
         // and applies a multiplier of '1 + (buffer / denominator)'
         (uint16 buffer, uint16 denominator) = provider.getAssetConversionBuffer(targetChain);
         receiverValue = assetConversionHelper(
-            targetChain, targetAmount, chainId(), uint256(0) + denominator + buffer, denominator, true, provider
+            targetChain, targetAmount, chainId(), uint256(denominator) + buffer, denominator, true, provider
         );
     }
 

ethereum/contracts/relayer/coreRelayer/CoreRelayerDelivery.sol

@@ -262,7 +262,7 @@ contract CoreRelayerLibrary is CoreRelayerState, ERC1967Upgrade {
     }
 
     function truncateReturnData(bytes memory returnData) internal pure returns (bytes memory returnDataTruncated) {
-        if(returnData.length <= 124) {
+        if (returnData.length <= 124) {
             returnDataTruncated = returnData;
         } else {
             returnDataTruncated = returnData.slice(0, 124);

ethereum/contracts/relayer/coreRelayer/CoreRelayerLibrary.sol

@@ -515,7 +515,7 @@ abstract contract CoreRelayerMessages is CoreRelayerGetters {
         index += 32;
 
         output.targetChain = encoded.toUint16(index);
-        index+=2;
+        index += 2;
 
         output.executionParameters.version = 1;
         index += 1;

ethereum/contracts/relayer/coreRelayer/CoreRelayerMessages.sol

@@ -4,12 +4,9 @@ pragma solidity ^0.8.0;
 
 import "../../interfaces/relayer/IWormholeReceiver.sol";
 import "../../interfaces/IWormhole.sol";
-import "../../interfaces/relayer/IRelayProvider.sol";
 import "../../interfaces/relayer/IForwardInstructionViewer.sol";
 import "../../interfaces/relayer/IWormholeRelayerInternalStructs.sol";
 import "../../interfaces/relayer/IForwardWrapper.sol";
-import "../../interfaces/relayer/IWormholeReceiver.sol";
-import "../../interfaces/relayer/IRelayProvider.sol";
 import {CoreRelayerLibrary} from "../coreRelayer/CoreRelayerLibrary.sol";
 
 contract ForwardWrapper is CoreRelayerLibrary {
@@ -31,18 +28,21 @@ contract ForwardWrapper is CoreRelayerLibrary {
         // Calls the 'receiveWormholeMessages' endpoint on the contract 'instruction.targetAddress'
         // (with the gas limit and value specified in instruction, and 'encodedVMs' as the input)
         bytes memory returnData;
-        (callToTargetContractSucceeded, returnData) = forwardInstructionViewer.fromWormholeFormat(instruction.targetAddress).call{
-            gas: instruction.executionParameters.gasLimit,
-            value: instruction.receiverValueTarget
-        }(abi.encodeWithSelector(IWormholeReceiver.receiveWormholeMessages.selector, data, signedVaas));
+        (callToTargetContractSucceeded, returnData) = forwardInstructionViewer.fromWormholeFormat(
+            instruction.targetAddress
+        ).call{gas: instruction.executionParameters.gasLimit, value: instruction.receiverValueTarget}(
+            abi.encodeWithSelector(IWormholeReceiver.receiveWormholeMessages.selector, data, signedVaas)
+        );
 
         uint256 postGas = gasleft();
 
         returnDataTruncated = callToTargetContractSucceeded ? bytes("") : truncateReturnData(returnData);
         // Calculate the amount of gas used in the call (upperbounding at the gas limit, which shouldn't have been exceeded)
-        gasUsed = uint32((preGas - postGas) > instruction.executionParameters.gasLimit
-            ? instruction.executionParameters.gasLimit
-            : (preGas - postGas));
+        gasUsed = uint32(
+            (preGas - postGas) > instruction.executionParameters.gasLimit
+                ? instruction.executionParameters.gasLimit
+                : (preGas - postGas)
+        );
 
         // Calculate the amount of maxTransactionFee to refund (multiply the maximum refund by the fraction of gas unused)
         uint256 transactionFeeRefundAmount = (instruction.executionParameters.gasLimit - gasUsed)
@@ -68,11 +68,25 @@ contract ForwardWrapper is CoreRelayerLibrary {
         }
     }
 
-    function safeRelayProviderSupportsChain(IRelayProvider relayProvider, uint16 chainId)
-        external
-        view
-        returns (bool isSupported)
-    {
-        return relayProvider.isChainSupported(chainId);
+    function getValuesFromRelayProvider(
+        address providerAddress,
+        uint16 sourceChain,
+        uint16 targetChain,
+        uint256 receiverValuePlusOverhead
+    ) public view returns (address rewardAddress, uint256 maximumBudget, uint256 receiverValueTarget) {
+        IRelayProvider relayProvider = IRelayProvider(providerAddress);
+        require(relayProvider.isChainSupported(targetChain));
+        uint256 deliveryOverhead = relayProvider.quoteDeliveryOverhead(targetChain);
+        rewardAddress = relayProvider.getRewardAddress();
+        maximumBudget = relayProvider.quoteMaximumBudget(targetChain);
+        uint256 srcNativeCurrencyPrice = relayProvider.quoteAssetPrice(sourceChain);
+        uint256 dstNativeCurrencyPrice = relayProvider.quoteAssetPrice(targetChain);
+        (uint16 buffer, uint16 denominator) = relayProvider.getAssetConversionBuffer(targetChain);
+        receiverValueTarget = receiverValuePlusOverhead > deliveryOverhead
+            ? (
+                (receiverValuePlusOverhead - deliveryOverhead) * srcNativeCurrencyPrice * denominator
+                    / (dstNativeCurrencyPrice * (uint256(0) + denominator + buffer))
+            )
+            : 0;
     }
 }

ethereum/contracts/relayer/coreRelayer/ForwardWrapper.sol

@@ -980,6 +980,7 @@ contract WormholeRelayerTests is Test {
             refundSource = (amountToGetInRefundTarget - target.relayProvider.quoteDeliveryOverhead(1))
                 * feeParams.targetNativePrice * 100 / (uint256(1) * feeParams.sourceNativePrice * 105);
         }
+
         assertTrue(
             refundSource == source.refundAddress.balance - refundAddressBalance, "Refund wasn't the correct amount"
         );
@@ -1054,12 +1055,12 @@ contract WormholeRelayerTests is Test {
                 - ((amountToGetInRefundTarget + feeParams.wormholeFeeOnTarget - receiverValueTargetActual)) * actualGasLimit
                     / maximumRefund
         );
-
         uint256 refundSource = 0;
         if (amountToGetInRefundTarget > target.relayProvider.quoteDeliveryOverhead(1)) {
             refundSource = (amountToGetInRefundTarget - target.relayProvider.quoteDeliveryOverhead(1))
                 * feeParams.targetNativePrice * 100 / (uint256(1) * feeParams.sourceNativePrice * 105);
         }
+
         assertTrue(
             refundSource == source.refundAddress.balance - refundAddressBalance, "Refund wasn't the correct amount"
         );