feat(pyth): update getTwapUpdateFee to accept updateData and calculate fees based on the number of updates

Author: cctdaniel

target_chains/ethereum/contracts/contracts/pyth/Pyth.sol

@@ -120,11 +120,35 @@ abstract contract Pyth is
         return getTotalFee(totalNumUpdates);
     }
 
-    function getTwapUpdateFee() public view override returns (uint feeAmount) {
-        // In the accumulator update data a single update can contain
-        // up to 255 messages and we charge a singleUpdateFee per each
-        // message
-        return singleUpdateFeeInWei() + transactionFeeInWei();
+    function getTwapUpdateFee(
+        bytes[] calldata updateData
+    ) public view override returns (uint feeAmount) {
+        uint totalNumUpdates = 0;
+        // For TWAP updates, updateData is always length 2 (start and end points),
+        // but each VAA can contain multiple price feeds. We only need to count
+        // the number of updates in the first VAA since both VAAs will have the
+        // same number of price feeds.
+        if (
+            updateData[0].length > 4 &&
+            UnsafeCalldataBytesLib.toUint32(updateData[0], 0) ==
+            ACCUMULATOR_MAGIC
+        ) {
+            (
+                uint offset,
+                UpdateType updateType
+            ) = extractUpdateTypeFromAccumulatorHeader(updateData[0]);
+            if (updateType != UpdateType.WormholeMerkle) {
+                revert PythErrors.InvalidUpdateData();
+            }
+            totalNumUpdates += parseWormholeMerkleHeaderNumUpdates(
+                updateData[0],
+                offset
+            );
+        } else {
+            revert PythErrors.InvalidUpdateData();
+        }
+
+        return getTotalFee(totalNumUpdates);
     }
 
     // This is an overwrite of the same method in AbstractPyth.sol
@@ -461,7 +485,7 @@ abstract contract Pyth is
             revert PythErrors.InvalidUpdateData();
         }
 
-        uint requiredFee = getTwapUpdateFee();
+        uint requiredFee = getTwapUpdateFee(updateData);
         if (msg.value < requiredFee) revert PythErrors.InsufficientFee();
 
         // Process start update data

target_chains/ethereum/contracts/forge-test/Pyth.t.sol

@@ -533,7 +533,7 @@ contract PythTest is Test, WormholeTestUtils, PythTestUtils {
             )
         );
 
-        uint updateFee = pyth.getTwapUpdateFee();
+        uint updateFee = pyth.getTwapUpdateFee(updateData);
 
         // Parse the TWAP updates
         PythStructs.TwapPriceFeed[] memory twapPriceFeeds = pyth
@@ -613,7 +613,7 @@ contract PythTest is Test, WormholeTestUtils, PythTestUtils {
             )
         );
 
-        uint updateFee = pyth.getTwapUpdateFee();
+        uint updateFee = pyth.getTwapUpdateFee(updateData);
 
         vm.expectRevert(PythErrors.InvalidTwapUpdateDataSet.selector);
         pyth.parseTwapPriceFeedUpdates{value: updateFee}(updateData, priceIds);
@@ -664,7 +664,7 @@ contract PythTest is Test, WormholeTestUtils, PythTestUtils {
             )
         );
 
-        uint updateFee = pyth.getTwapUpdateFee();
+        uint updateFee = pyth.getTwapUpdateFee(updateData);
 
         vm.expectRevert(PythErrors.InvalidTwapUpdateDataSet.selector);
         pyth.parseTwapPriceFeedUpdates{value: updateFee}(updateData, priceIds);
@@ -711,7 +711,7 @@ contract PythTest is Test, WormholeTestUtils, PythTestUtils {
             )
         );
 
-        uint updateFee = pyth.getTwapUpdateFee();
+        uint updateFee = pyth.getTwapUpdateFee(updateData);
 
         vm.expectRevert(PythErrors.InvalidTwapUpdateDataSet.selector);
         pyth.parseTwapPriceFeedUpdates{value: updateFee}(updateData, priceIds);
@@ -758,7 +758,7 @@ contract PythTest is Test, WormholeTestUtils, PythTestUtils {
             )
         );
 
-        uint updateFee = pyth.getTwapUpdateFee();
+        uint updateFee = pyth.getTwapUpdateFee(updateData);
 
         vm.expectRevert(PythErrors.InvalidTwapUpdateData.selector);
         pyth.parseTwapPriceFeedUpdates{value: updateFee}(updateData, priceIds);
@@ -800,7 +800,7 @@ contract PythTest is Test, WormholeTestUtils, PythTestUtils {
             )
         );
 
-        uint updateFee = pyth.getTwapUpdateFee();
+        uint updateFee = pyth.getTwapUpdateFee(updateData);
 
         vm.expectRevert(PythErrors.InsufficientFee.selector);
         pyth.parseTwapPriceFeedUpdates{value: updateFee - 1}(
@@ -849,7 +849,7 @@ contract PythTest is Test, WormholeTestUtils, PythTestUtils {
             config
         );
 
-        uint updateFee = pyth.getTwapUpdateFee();
+        uint updateFee = pyth.getTwapUpdateFee(updateData);
 
         // Parse the TWAP updates
         PythStructs.TwapPriceFeed[] memory twapPriceFeeds = pyth
@@ -924,7 +924,7 @@ contract PythTest is Test, WormholeTestUtils, PythTestUtils {
             config
         );
 
-        uint updateFee = pyth.getTwapUpdateFee();
+        uint updateFee = pyth.getTwapUpdateFee(updateData);
 
         vm.expectRevert(PythErrors.InvalidUpdateData.selector);
         pyth.parseTwapPriceFeedUpdates{value: updateFee}(updateData, priceIds);
@@ -976,7 +976,7 @@ contract PythTest is Test, WormholeTestUtils, PythTestUtils {
             config
         );
 
-        uint updateFee = pyth.getTwapUpdateFee();
+        uint updateFee = pyth.getTwapUpdateFee(updateData);
 
         // Should revert because one of the requested price IDs is not found in the updates
         vm.expectRevert(PythErrors.PriceFeedNotFoundWithinRange.selector);

target_chains/ethereum/sdk/solidity/IPyth.sol

@@ -95,8 +95,11 @@ interface IPyth is IPythEvents {
     ) external view returns (uint feeAmount);
 
     /// @notice Returns the required fee to update a TWAP price.
+    /// @param updateData Array of price update data.
     /// @return feeAmount The required fee in Wei.
-    function getTwapUpdateFee() external view returns (uint feeAmount);
+    function getTwapUpdateFee(
+        bytes[] calldata updateData
+    ) external view returns (uint feeAmount);
 
     /// @notice Parse `updateData` and return price feeds of the given `priceIds` if they are all published
     /// within `minPublishTime` and `maxPublishTime`.

target_chains/ethereum/sdk/solidity/MockPyth.sol

@@ -80,8 +80,10 @@ contract MockPyth is AbstractPyth {
         return singleUpdateFeeInWei * updateData.length;
     }
 
-    function getTwapUpdateFee() public view override returns (uint feeAmount) {
-        return singleUpdateFeeInWei;
+    function getTwapUpdateFee(
+        bytes[] calldata updateData
+    ) public view override returns (uint feeAmount) {
+        return singleUpdateFeeInWei * updateData.length;
     }
 
     function parsePriceFeedUpdatesInternal(

target_chains/ethereum/sdk/solidity/abis/AbstractPyth.json

@@ -345,7 +345,13 @@
     "type": "function"
   },
   {
-    "inputs": [],
+    "inputs": [
+      {
+        "internalType": "bytes[]",
+        "name": "updateData",
+        "type": "bytes[]"
+      }
+    ],
     "name": "getTwapUpdateFee",
     "outputs": [
       {

target_chains/ethereum/sdk/solidity/abis/IPyth.json

@@ -248,7 +248,13 @@
     "type": "function"
   },
   {
-    "inputs": [],
+    "inputs": [
+      {
+        "internalType": "bytes[]",
+        "name": "updateData",
+        "type": "bytes[]"
+      }
+    ],
     "name": "getTwapUpdateFee",
     "outputs": [
       {

target_chains/ethereum/sdk/solidity/abis/MockPyth.json

@@ -484,7 +484,13 @@
     "type": "function"
   },
   {
-    "inputs": [],
+    "inputs": [
+      {
+        "internalType": "bytes[]",
+        "name": "updateData",
+        "type": "bytes[]"
+      }
+    ],
     "name": "getTwapUpdateFee",
     "outputs": [
       {