Add test for verifier

Author: danimhr

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

@@ -139,7 +139,8 @@ contract PythWormholeMerkleAccumulatorTest is Test, PythTestUtils {
     }
 
     function createWormholeMerkleUpdateData(
-        PriceFeedMessage[] memory priceFeedMessages
+        PriceFeedMessage[] memory priceFeedMessages,
+        Signer signer
     ) internal returns (bytes[] memory updateData, uint updateFee) {
         updateData = new bytes[](1);
 
@@ -150,11 +151,29 @@ contract PythWormholeMerkleAccumulatorTest is Test, PythTestUtils {
 
         depth += getRandUint8() % 3;
 
-        updateData[0] = generateWhMerkleUpdate(priceFeedMessages, depth, 1);
+        uint8 numSigners = 1;
+        if (signer == Signer.Wormhole)
+            numSigners = _wormholeTestUtils.getTotalSigners();
+        if (signer == Signer.Verifier)
+            numSigners = _verifierTestUtils.getTotalSigners();
+
+        updateData[0] = generateWhMerkleUpdate(
+            priceFeedMessages,
+            depth,
+            numSigners,
+            signer
+        );
 
         updateFee = pyth.getUpdateFee(updateData);
     }
 
+    function createWormholeMerkleUpdateData(
+        PriceFeedMessage[] memory priceFeedMessages
+    ) internal returns (bytes[] memory updateData, uint updateFee) {
+        return
+            createWormholeMerkleUpdateData(priceFeedMessages, Signer.Wormhole);
+    }
+
     /// @notice This method creates a forward compatible wormhole update data by using a newer minor version,
     /// setting a trailing header size and generating additional trailing header data of size `trailingHeaderSize`
     function createFowardCompatibleWormholeMerkleUpdateData(
@@ -1145,4 +1164,59 @@ contract PythWormholeMerkleAccumulatorTest is Test, PythTestUtils {
             assertPriceFeedMessageStored(priceFeedMessages[i]);
         }
     }
+
+    /// Testing update price feeds method using wormhole merkle update type.
+    function testUpdatePriceFeedWithWormholeMerkleAndVerifierSignerWorks(
+        uint seed
+    ) public {
+        setRandSeed(seed);
+        setVerifier(address(pyth), 10);
+
+        uint numPriceFeeds = (getRandUint() % 10) + 1;
+        PriceFeedMessage[]
+            memory priceFeedMessages = generateRandomPriceFeedMessage(
+                numPriceFeeds
+            );
+        (
+            bytes[] memory updateData,
+            uint updateFee
+        ) = createWormholeMerkleUpdateData(priceFeedMessages, Signer.Verifier);
+
+        pyth.updatePriceFeeds{value: updateFee}(updateData);
+
+        for (uint i = 0; i < numPriceFeeds; i++) {
+            assertPriceFeedMessageStored(priceFeedMessages[i]);
+        }
+
+        // Update the prices again with the same data should work
+        pyth.updatePriceFeeds{value: updateFee}(updateData);
+
+        for (uint i = 0; i < numPriceFeeds; i++) {
+            assertPriceFeedMessageStored(priceFeedMessages[i]);
+        }
+
+        // Update the prices again with updated data should update the prices
+        for (uint i = 0; i < numPriceFeeds; i++) {
+            priceFeedMessages[i].price = getRandInt64();
+            priceFeedMessages[i].conf = getRandUint64();
+            priceFeedMessages[i].expo = getRandInt32();
+
+            // Increase the publish time if it is not causing an overflow
+            if (priceFeedMessages[i].publishTime != type(uint64).max) {
+                priceFeedMessages[i].publishTime += 1;
+            }
+            priceFeedMessages[i].emaPrice = getRandInt64();
+            priceFeedMessages[i].emaConf = getRandUint64();
+        }
+
+        (updateData, updateFee) = createWormholeMerkleUpdateData(
+            priceFeedMessages
+        );
+
+        pyth.updatePriceFeeds{value: updateFee}(updateData);
+
+        for (uint i = 0; i < numPriceFeeds; i++) {
+            assertPriceFeedMessageStored(priceFeedMessages[i]);
+        }
+    }
 }

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

@@ -134,7 +134,8 @@ contract PythTest is Test, PythTestUtils {
 
             updateData[i / batchSize] = generateWhMerkleUpdateWithSource(
                 batchMessages,
-                config
+                config,
+                Signer.Wormhole
             );
         }
 

target_chains/ethereum/contracts/forge-test/utils/PythTestUtils.t.sol

@@ -17,7 +17,6 @@ import "@pythnetwork/pyth-sdk-solidity/IPyth.sol";
 import "@pythnetwork/pyth-sdk-solidity/PythUtils.sol";
 
 import "forge-std/Test.sol";
-import "forge-std/console.sol";
 import "./RandTestUtils.t.sol";
 import "./WormholeTestUtils.t.sol";
 
@@ -213,7 +212,8 @@ abstract contract PythTestUtils is
 
     function generateWhMerkleUpdateWithSource(
         PriceFeedMessage[] memory priceFeedMessages,
-        MerkleUpdateConfig memory config
+        MerkleUpdateConfig memory config,
+        Signer signer
     ) internal returns (bytes memory whMerkleUpdateData) {
         bytes[] memory encodedPriceFeedMessages = encodePriceFeedMessages(
             priceFeedMessages
@@ -237,7 +237,7 @@ abstract contract PythTestUtils is
             0,
             wormholePayload,
             config.numSigners,
-            Signer.Wormhole
+            signer
         );
 
         if (config.brokenVaa) {
@@ -249,16 +249,17 @@ abstract contract PythTestUtils is
             );
         }
 
+        uint256 priceFeedMessageLength = priceFeedMessages.length;
         whMerkleUpdateData = abi.encodePacked(
             uint32(0x504e4155), // PythAccumulator.ACCUMULATOR_MAGIC
             uint8(1), // major version
             uint8(0), // minor version
             uint8(1), // trailing header size
-            uint8(0), // Signer
+            uint8(signer), // Signer
             uint8(PythAccumulator.UpdateType.WormholeMerkle),
             uint16(wormholeMerkleVaa.length),
             wormholeMerkleVaa,
-            uint8(priceFeedMessages.length)
+            uint8(priceFeedMessageLength)
         );
 
         for (uint i = 0; i < priceFeedMessages.length; i++) {
@@ -334,7 +335,8 @@ abstract contract PythTestUtils is
     function generateWhMerkleUpdate(
         PriceFeedMessage[] memory priceFeedMessages,
         uint8 depth,
-        uint8 numSigners
+        uint8 numSigners,
+        Signer signer
     ) internal returns (bytes memory whMerkleUpdateData) {
         whMerkleUpdateData = generateWhMerkleUpdateWithSource(
             priceFeedMessages,
@@ -344,7 +346,21 @@ abstract contract PythTestUtils is
                 SOURCE_EMITTER_CHAIN_ID,
                 SOURCE_EMITTER_ADDRESS,
                 false
-            )
+            ),
+            signer
+        );
+    }
+
+    function generateWhMerkleUpdate(
+        PriceFeedMessage[] memory priceFeedMessages,
+        uint8 depth,
+        uint8 numSigners
+    ) internal returns (bytes memory whMerkleUpdateData) {
+        whMerkleUpdateData = generateWhMerkleUpdate(
+            priceFeedMessages,
+            depth,
+            numSigners,
+            Signer.Wormhole
         );
     }