update-2

Author: aditya520

apps/price_pusher/src/__tests__/pyth-price-listener.test.ts

@@ -1,10 +1,10 @@
 import { PythPriceListener } from "../pyth-price-listener";
-import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { HermesClient } from "@pythnetwork/hermes-client";
 import { Logger } from "pino";
 
 describe("PythPriceListener", () => {
   let logger: Logger;
-  let connection: PriceServiceConnection;
+  let connection: HermesClient;
   let listener: PythPriceListener;
   let originalConsoleError: typeof console.error;
 
@@ -20,12 +20,10 @@ describe("PythPriceListener", () => {
     } as unknown as Logger;
 
     // Use real Hermes beta endpoint for testing
-    connection = new PriceServiceConnection("https://hermes.pyth.network");
+    connection = new HermesClient("https://hermes.pyth.network");
   });
 
   afterEach(() => {
-    // Clean up websocket connection
-    connection.closeWebSocket();
     // Clean up health check interval
     if (listener) {
       listener.cleanup();

apps/price_pusher/src/evm/command.ts

@@ -1,4 +1,4 @@
-import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { HermesClient } from "@pythnetwork/hermes-client";
 import fs from "fs";
 import { Options } from "yargs";
 import * as options from "../options";
@@ -85,7 +85,7 @@ export default {
     const {
       endpoint,
       priceConfigFile,
-      priceServiceEndpoint,
+      hermesEndpoint,
       mnemonicFile,
       pythContractAddress,
       pushingFrequency,
@@ -97,29 +97,20 @@ export default {
       gasLimit,
       updateFeeMultiplier,
       logLevel,
-      priceServiceConnectionLogLevel,
       controllerLogLevel,
     } = argv;
 
     const logger = pino({ level: logLevel });
 
     const priceConfigs = readPriceConfigFile(priceConfigFile);
-    const priceServiceConnection = new PriceServiceConnection(
-      priceServiceEndpoint,
-      {
-        logger: logger.child(
-          { module: "PriceServiceConnection" },
-          { level: priceServiceConnectionLogLevel }
-        ),
-      }
-    );
+    const hermesClient = new HermesClient(hermesEndpoint);
 
     const mnemonic = fs.readFileSync(mnemonicFile, "utf-8").trim();
 
     const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
 
     const pythListener = new PythPriceListener(
-      priceServiceConnection,
+      hermesClient,
       priceItems,
       logger.child({ module: "PythPriceListener" })
     );
@@ -152,7 +143,7 @@ export default {
       txSpeed
     );
     const evmPusher = new EvmPricePusher(
-      priceServiceConnection,
+      hermesClient,
       client,
       pythContract,
       logger.child({ module: "EvmPricePusher" }),

apps/price_pusher/src/evm/evm.ts

@@ -13,10 +13,10 @@ import {
 import { PythAbi } from "./pyth-abi";
 import { Logger } from "pino";
 import {
-  PriceServiceConnection,
+  HermesClient,
   HexString,
   UnixTimestamp,
-} from "@pythnetwork/price-service-client";
+} from "@pythnetwork/hermes-client";
 import { CustomGasStation } from "./custom-gas-station";
 import { PushAttempt } from "../common";
 import {
@@ -128,7 +128,7 @@ export class EvmPricePusher implements IPricePusher {
   private lastPushAttempt: PushAttempt | undefined;
 
   constructor(
-    private connection: PriceServiceConnection,
+    private connection: HermesClient,
     private client: SuperWalletClient,
     private pythContract: PythContract,
     private logger: Logger,
@@ -156,10 +156,9 @@ export class EvmPricePusher implements IPricePusher {
     if (priceIds.length !== pubTimesToPush.length)
       throw new Error("Invalid arguments");
 
-    const priceIdsWith0x = priceIds.map((priceId) => addLeading0x(priceId));
 
     const priceFeedUpdateData = (await this.getPriceFeedsUpdateData(
-      priceIdsWith0x
+      priceIds
     )) as `0x${string}`[];
 
     let updateFee;
@@ -227,6 +226,8 @@ export class EvmPricePusher implements IPricePusher {
       BigInt(pubTime)
     );
 
+    const priceIdsWith0x = priceIds.map((priceId) => addLeading0x(priceId));
+
     try {
       const { request } =
         await this.pythContract.simulate.updatePriceFeedsIfNecessary(
@@ -409,9 +410,10 @@ export class EvmPricePusher implements IPricePusher {
   private async getPriceFeedsUpdateData(
     priceIds: HexString[]
   ): Promise<string[]> {
-    const latestVaas = await this.connection.getLatestVaas(priceIds);
-    return latestVaas.map(
-      (vaa) => "0x" + Buffer.from(vaa, "base64").toString("hex")
-    );
+    const response = await this.connection.getLatestPriceUpdates(priceIds, {
+      encoding: "hex",
+      ignoreInvalidPriceIds: true,
+    });
+    return response.binary.data;
   }
 }

apps/price_pusher/src/pyth-price-listener.ts

@@ -1,11 +1,9 @@
 import {
   HexString,
   HermesClient,
-  PriceUpdate,
 } from "@pythnetwork/hermes-client";
 import { PriceInfo, IPriceListener, PriceItem } from "./interface";
 import { Logger } from "pino";
-import { PriceFeed } from "@pythnetwork/price-service-sdk";
 
 type TimestampInMs = number & { readonly _: unique symbol };
 

apps/price_pusher/src/utils.ts

@@ -1,4 +1,4 @@
-import { HexString } from "@pythnetwork/price-service-client";
+import { HexString } from "@pythnetwork/hermes-client";
 
 export type PctNumber = number;
 export type DurationInSeconds = number;