Merge pull request #43 from pyth-network:abehjati/update-interface

Update packages according to pyth-sdk-solidity v1 interface

Author: ali-behjati

pyth-evm-js/README.md

@@ -75,13 +75,14 @@ contract SomeContract {
         pyth = IPyth(pythContract);
     }
 
-    function doSomething(uint someArg, string memory otherArg, bytes[] memory priceUpdateData) public {
+    function doSomething(uint someArg, string memory otherArg, bytes[] memory priceUpdateData) public payable {
         // Update the prices to be set to the latest values
-        pyth.updatePriceFeeds(priceUpdateData);
+        uint fee = pyth.getUpdateFee(priceUpdateData.length);
+        pyth.updatePriceFeeds{value: fee}(priceUpdateData);
 
         // Doing other things that uses prices
         bytes32 priceId = 0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b;
-        PythStructs.Price currentPrice = pyth.getCurrentPrice(priceId);
+        PythStructs.Price price = pyth.getPrice(priceId);
     }
 }
 ```

pyth-evm-js/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/pyth-evm-js",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Pyth Network EVM Utils in JS",
   "homepage": "https://pyth.network",
   "author": {
@@ -30,6 +30,7 @@
   ],
   "license": "Apache-2.0",
   "devDependencies": {
+    "@pythnetwork/pyth-sdk-solidity": "^1.0.1",
     "@truffle/hdwallet-provider": "^2.0.8",
     "@types/ethereum-protocol": "^1.0.2",
     "@types/jest": "^27.4.1",

pyth-evm-js/package.json

@@ -4,6 +4,7 @@ import { hideBin } from "yargs/helpers";
 
 import { EvmPriceServiceConnection, CONTRACT_ADDR } from "../index";
 import HDWalletProvider from "@truffle/hdwallet-provider";
+import PythInterfaceAbi from "@pythnetwork/pyth-sdk-solidity/abis/IPyth.json";
 
 const argv = yargs(hideBin(process.argv))
   .option("network", {
@@ -84,22 +85,6 @@ if (CONFIG[argv.network] !== undefined) {
   pythContractAddr = argv.pythContract;
 }
 
-const pythRelayAbi = [
-  {
-    inputs: [
-      {
-        internalType: "bytes[]",
-        name: "updateData",
-        type: "bytes[]",
-      },
-    ],
-    name: "updatePriceFeeds",
-    outputs: [],
-    stateMutability: "nonpayable" as const,
-    type: "function" as const,
-  },
-];
-
 const connection = new EvmPriceServiceConnection(argv.endpoint);
 
 async function run() {
@@ -121,9 +106,13 @@ async function run() {
   );
   console.log(priceFeedUpdateData);
 
-  const pythContract = new web3.eth.Contract(pythRelayAbi, pythContractAddr, {
-    from: provider.getAddress(0),
-  });
+  const pythContract = new web3.eth.Contract(
+    PythInterfaceAbi as any,
+    pythContractAddr,
+    {
+      from: provider.getAddress(0),
+    }
+  );
 
   pythContract.methods
     .updatePriceFeeds(priceFeedUpdateData)

pyth-evm-js/src/examples/EvmRelay.ts

@@ -5,7 +5,8 @@
     "declaration": true,
     "outDir": "./lib",
     "strict": true,
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "resolveJsonModule": true
   },
   "include": ["src"],
   "exclude": ["node_modules", "**/__tests__/*"]

pyth-evm-js/tsconfig.json

@@ -1,6 +1,6 @@
 services:
   spy:
-    image: ghcr.io/wormhole-foundation/guardiand:v2.8.10.1
+    image: ghcr.io/wormhole-foundation/guardiand:v2.10.3
     command:
       - "spy"
       - "--nodeKey"

pyth-evm-price-pusher/docker-compose.mainnet.sampleyaml renamed to pyth-evm-price-pusher/docker-compose.mainnet.sample.yaml

@@ -1,6 +1,6 @@
 services:
   spy:
-    image: ghcr.io/wormhole-foundation/guardiand:v2.8.10.1
+    image: ghcr.io/wormhole-foundation/guardiand:v2.10.3
     command:
       - "spy"
       - "--nodeKey"

pyth-evm-price-pusher/docker-compose.testnet.sample.yaml

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/pyth-evm-price-pusher",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Pyth EVM Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@pythnetwork/pyth-evm-js": "^0.5.0",
-    "@pythnetwork/pyth-sdk-solidity": "^0.5.2",
+    "@pythnetwork/pyth-sdk-solidity": "^1.0.1",
     "@truffle/hdwallet-provider": "^2.0.8",
     "joi": "^17.6.0",
     "web3": "^1.5.3",

pyth-evm-price-pusher/package-lock.json

@@ -121,40 +121,21 @@ export class EvmPriceListener implements PriceListener {
   async getOnChainPriceInfo(
     priceId: HexString
   ): Promise<PriceInfo | undefined> {
-    let priceFeedRaw;
+    let priceRaw;
     try {
-      priceFeedRaw = await this.pythContract.methods
-        .queryPriceFeed(addLeading0x(priceId))
+      priceRaw = await this.pythContract.methods
+        .getPriceUnsafe(addLeading0x(priceId))
         .call();
     } catch (e) {
       console.error(`Getting on-chain price for ${priceId} failed. Error:`);
       console.error(e);
       return undefined;
     }
 
-    const priceFeed = new PriceFeed({
-      id: removeLeading0x(priceFeedRaw.id),
-      productId: removeLeading0x(priceFeedRaw.productId),
-      price: priceFeedRaw.price,
-      conf: priceFeedRaw.conf,
-      expo: Number(priceFeedRaw.expo),
-      status: statusNumberToEnum(Number(priceFeedRaw.status)),
-      maxNumPublishers: Number(priceFeedRaw.maxNumPublishers),
-      numPublishers: Number(priceFeedRaw.numPublishers),
-      emaPrice: priceFeedRaw.emaPrice,
-      emaConf: priceFeedRaw.emaConf,
-      publishTime: Number(priceFeedRaw.publishTime),
-      prevPrice: priceFeedRaw.prevPrice,
-      prevConf: priceFeedRaw.prevConf,
-      prevPublishTime: Number(priceFeedRaw.prevPublishTime),
-    });
-
-    const latestAvailablePrice = priceFeed.getLatestAvailablePriceUnchecked();
-
     return {
-      conf: latestAvailablePrice[0].conf,
-      price: latestAvailablePrice[0].price,
-      publishTime: latestAvailablePrice[1],
+      conf: priceRaw.conf,
+      price: priceRaw.price,
+      publishTime: priceRaw.publishTime,
     };
   }
 }