[eth] Some contract improvements (#356)

Author: ali-behjati

ethereum/contracts/pyth/Pyth.sol

@@ -57,9 +57,8 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
     }
 
     function updatePriceFeeds(bytes[] calldata updateData) public override payable {
-        uint requiredFee = getUpdateFee(updateData.length);
+        uint requiredFee = getUpdateFee(updateData);
         require(msg.value >= requiredFee, "insufficient paid fee amount");
-        payable(msg.sender).transfer(msg.value - requiredFee);
 
         for(uint i = 0; i < updateData.length; i++) {
             updatePriceBatchFromVm(updateData[i]);
@@ -68,10 +67,15 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
         emit UpdatePriceFeeds(msg.sender, updateData.length, requiredFee);
     }
 
-    function getUpdateFee(uint updateDataSize) public override view returns (uint feeAmount) {
+    /// This method is deprecated, please use the `getUpdateFee(bytes[])` instead.
+    function getUpdateFee(uint updateDataSize) public view returns (uint feeAmount) {
         return singleUpdateFeeInWei() * updateDataSize;
     }
 
+    function getUpdateFee(bytes[] calldata updateData) public override view returns (uint feeAmount) {
+        return singleUpdateFeeInWei() * updateData.length;
+    }
+
     function createNewPriceInfo(PythInternalStructs.PriceAttestation memory pa) private view returns (PythInternalStructs.PriceInfo memory info) {
         info.attestationTime = pa.attestationTime;
         info.arrivalTime = block.timestamp;

ethereum/package-lock.json

@@ -30,7 +30,7 @@
     "@certusone/wormhole-sdk-wasm": "^0.0.1",
     "@openzeppelin/contracts": "^4.5.0",
     "@openzeppelin/contracts-upgradeable": "^4.5.2",
-    "@pythnetwork/pyth-sdk-solidity": "^1.0.1",
+    "@pythnetwork/pyth-sdk-solidity": "^2.0.0",
     "@pythnetwork/xc-governance-sdk": "file:../third_party/pyth/xc-governance-sdk-js",
     "dotenv": "^10.0.0",
     "elliptic": "^6.5.2",

ethereum/package.json

@@ -435,7 +435,7 @@ contract("Pyth", function () {
         let rawBatch2 = generateRawBatchAttestation(ts + 5, ts + 10, 1338);
 
         // Getting the fee from the contract
-        let feeInWei = await this.pythProxy.getUpdateFee(2);
+        let feeInWei = await this.pythProxy.methods["getUpdateFee(bytes[])"]([rawBatch1, rawBatch2]);
         assert.equal(feeInWei, 20);
 
         // When a smaller fee is payed it reverts
@@ -464,7 +464,7 @@ contract("Pyth", function () {
         let rawBatch2 = generateRawBatchAttestation(ts + 5, ts + 10, 1338);
 
         // Getting the fee from the contract
-        let feeInWei = await this.pythProxy.getUpdateFee(2);
+        let feeInWei = await this.pythProxy.methods["getUpdateFee(bytes[])"]([rawBatch1, rawBatch2]);
         assert.equal(feeInWei, 20);
 
         const receipt = await updatePriceFeeds(this.pythProxy, [rawBatch1, rawBatch2], feeInWei);
@@ -493,16 +493,16 @@ contract("Pyth", function () {
         let rawBatch1 = generateRawBatchAttestation(ts - 5, ts, 1337);
         let rawBatch2 = generateRawBatchAttestation(ts + 5, ts + 10, 1338);
 
-        // Getting the fee from the contract
-        let feeInWei = await this.pythProxy.getUpdateFee(2);
+        // Paying the fee works and extra fee is not paid back.
+        let feeInWei = await this.pythProxy.methods["getUpdateFee(bytes[])"]([rawBatch1, rawBatch2]);
         assert.equal(feeInWei, 20);
 
         const receipt = await updatePriceFeeds(this.pythProxy, [rawBatch1, rawBatch2], feeInWei + 10);
         expectEvent(receipt, 'UpdatePriceFeeds', {
             fee: feeInWei
         });
         const pythBalance = await web3.eth.getBalance(this.pythProxy.address);
-        assert.equal(pythBalance, feeInWei);
+        assert.equal(pythBalance, feeInWei + 10);
     });
 
     it("should cache price updates", async function () {

ethereum/test/pyth.js

@@ -45,10 +45,11 @@ export class EvmRelay implements Relay {
         ? await this.queryMany(priceIds)
         : null;
 
-      const updateFee = await this.p2wContract.getUpdateFee(1);
+      const updateData = ["0x" + signedVAAs[i]];
+      const updateFee = await this.p2wContract["getUpdateFee(bytes[])"](updateData);
 
       let tx = this.p2wContract
-        .updatePriceFeeds(["0x" + signedVAAs[i]], { gasLimit: 2000000, value: updateFee })
+        .updatePriceFeeds(updateData, { gasLimit: 2000000, value: updateFee })
         .then(async (pending) => {
           let receipt = await pending.wait();
           logger.info(