[price-pusher] refactor index page

price_pusher/package.json

@@ -47,8 +47,7 @@
   },
   "dependencies": {
     "@injectivelabs/sdk-ts": "^1.0.457",
-    "@pythnetwork/price-service-client": "*",
-    "@pythnetwork/pyth-evm-js": "^1.1.0",
+    "@pythnetwork/pyth-common-js": "^1.4.0",
     "@pythnetwork/pyth-sdk-solidity": "^2.2.0",
     "@truffle/hdwallet-provider": "^2.1.3",
     "joi": "^17.6.0",

price_pusher/src/controller.ts

@@ -1,4 +1,4 @@
-import { UnixTimestamp } from "@pythnetwork/pyth-evm-js";
+import { UnixTimestamp } from "@pythnetwork/pyth-common-js";
 import { DurationInSeconds, sleep } from "./utils";
 import { ChainPricePusher, IPriceListener } from "./interface";
 import { PriceConfig, shouldUpdate } from "./price-config";
@@ -18,6 +18,10 @@ export class Controller {
   }
 
   async start() {
+    // start the listeners
+    await this.sourcePriceListener.start();
+    await this.targetPriceListener.start();
+
     for (;;) {
       const pricesToPush: PriceConfig[] = [];
       const pubTimesToPush: UnixTimestamp[] = [];

price_pusher/src/evm.ts

@@ -1,8 +1,3 @@
-import {
-  EvmPriceServiceConnection,
-  HexString,
-  UnixTimestamp,
-} from "@pythnetwork/pyth-evm-js";
 import { Contract, EventData } from "web3-eth-contract";
 import { PriceConfig } from "./price-config";
 import { ChainPricePusher, PriceInfo, ChainPriceListener } from "./interface";
@@ -13,6 +8,11 @@ import HDWalletProvider from "@truffle/hdwallet-provider";
 import { Provider } from "web3/providers";
 import Web3 from "web3";
 import { isWsEndpoint } from "./utils";
+import {
+  PriceServiceConnection,
+  HexString,
+  UnixTimestamp,
+} from "@pythnetwork/pyth-common-js";
 
 export class EvmPriceListener extends ChainPriceListener {
   private pythContractFactory: PythContractFactory;
@@ -116,7 +116,7 @@ export class EvmPriceListener extends ChainPriceListener {
 
 export class EvmPricePusher implements ChainPricePusher {
   constructor(
-    private connection: EvmPriceServiceConnection,
+    private connection: PriceServiceConnection,
     private pythContract: Contract
   ) {}
   // The pubTimes are passed here to use the values that triggered the push.
@@ -135,7 +135,7 @@ export class EvmPricePusher implements ChainPricePusher {
 
     const priceIdsWith0x = priceIds.map((priceId) => addLeading0x(priceId));
 
-    const priceFeedUpdateData = await this.connection.getPriceFeedsUpdateData(
+    const priceFeedUpdateData = await this.getPriceFeedsUpdateData(
       priceIdsWith0x
     );
 
@@ -198,6 +198,15 @@ export class EvmPricePusher implements ChainPricePusher {
         throw err;
       });
   }
+
+  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")
+    );
+  }
 }
 
 export class PythContractFactory {