@pythnetwork/price-pusher 8.3.3 → 9.0.1

package/README.md

@@ -203,8 +203,7 @@ human-readable logs, you can pipe the output of the program to `pino-pretty`. Se
 
 You can configure the log level of some of the modules of the price pusher as well. The available modules are PriceServiceConnection, which
 is responsible for connecting to the Hermes price service, and Controller, which is responsible for checking the prices from the Hermes
-and the on-chain Pyth contract and deciding whether to push a new price. You can configure the log level of these modules by passing the
-`--price-service-connection-log-level` and `--controller-log-level` arguments, respectively.
+and the on-chain Pyth contract and deciding whether to push a new price. You can configure the log level of these modules by passing the `--controller-log-level` arguments, respectively.
 
 ### Example
 

package/lib/aptos/aptos.d.ts

@@ -1,6 +1,6 @@
 import { ChainPriceListener, IPricePusher, PriceInfo, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
-import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { HermesClient } from "@pythnetwork/hermes-client";
 import { Logger } from "pino";
 export declare class AptosPriceListener extends ChainPriceListener {
     private pythModule;
@@ -23,7 +23,7 @@ export declare const APTOS_ACCOUNT_HD_PATH = "m/44'/637'/0'/0'/0'";
  * land all of their pushed updates on-chain.
  */
 export declare class AptosPricePusher implements IPricePusher {
-    private priceServiceConnection;
+    private hermesClient;
     private logger;
     private pythContractAddress;
     private endpoint;
@@ -31,7 +31,7 @@ export declare class AptosPricePusher implements IPricePusher {
     private overrideGasPriceMultiplier;
     private lastSequenceNumber;
     private sequenceNumberLocked;
-    constructor(priceServiceConnection: PriceServiceConnection, logger: Logger, pythContractAddress: string, endpoint: string, mnemonic: string, overrideGasPriceMultiplier: number);
+    constructor(hermesClient: HermesClient, logger: Logger, pythContractAddress: string, endpoint: string, mnemonic: string, overrideGasPriceMultiplier: number);
     /**
      * Gets price update data which then can be submitted to the Pyth contract to update the prices.
      * This will throw an axios error if there is a network problem or the price service returns a non-ok response (e.g: Invalid price ids)

package/lib/aptos/aptos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aptos.d.ts","sourceRoot":"","sources":["../../src/aptos/aptos.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,qBAAa,kBAAmB,SAAQ,kBAAkB;IAEtD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,MAAM;gBAHN,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EACxB,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA6C3E;AAGD,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAE3D;;;;;;;;;GASG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IAOjD,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,0BAA0B;IAVpC,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,oBAAoB,CAAU;gBAG5B,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,0BAA0B,EAAE,MAAM;IAK5C;;;;;;OAMG;IACG,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAQhE,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YA+DF,8BAA8B;YAwB9B,wBAAwB;CA+BvC"}
+{"version":3,"file":"aptos.d.ts","sourceRoot":"","sources":["../../src/aptos/aptos.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,qBAAa,kBAAmB,SAAQ,kBAAkB;IAEtD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,MAAM;gBAHN,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EACxB,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA6C3E;AAGD,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAE3D;;;;;;;;;GASG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IAOjD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,0BAA0B;IAVpC,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,oBAAoB,CAAU;gBAG5B,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,0BAA0B,EAAE,MAAM;IAK5C;;;;;;OAMG;IACG,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAShE,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YA+DF,8BAA8B;YAwB9B,wBAAwB;CA+BvC"}

package/lib/aptos/aptos.js

@@ -56,7 +56,7 @@ exports.APTOS_ACCOUNT_HD_PATH = "m/44'/637'/0'/0'/0'";
  * land all of their pushed updates on-chain.
  */
 class AptosPricePusher {
-    priceServiceConnection;
+    hermesClient;
     logger;
     pythContractAddress;
     endpoint;
@@ -66,8 +66,8 @@ class AptosPricePusher {
     lastSequenceNumber;
     // If true, we are trying to fetch the most recent sequence number from the blockchain.
     sequenceNumberLocked;
-    constructor(priceServiceConnection, logger, pythContractAddress, endpoint, mnemonic, overrideGasPriceMultiplier) {
-        this.priceServiceConnection = priceServiceConnection;
+    constructor(hermesClient, logger, pythContractAddress, endpoint, mnemonic, overrideGasPriceMultiplier) {
+        this.hermesClient = hermesClient;
         this.logger = logger;
         this.pythContractAddress = pythContractAddress;
         this.endpoint = endpoint;
@@ -83,9 +83,10 @@ class AptosPricePusher {
      * @returns Array of price update data.
      */
     async getPriceFeedsUpdateData(priceIds) {
-        // Fetch the latest price feed update VAAs from the price service
-        const latestVaas = await this.priceServiceConnection.getLatestVaas(priceIds);
-        return latestVaas.map((vaa) => Array.from(Buffer.from(vaa, "base64")));
+        const response = await this.hermesClient.getLatestPriceUpdates(priceIds, {
+            encoding: "base64",
+        });
+        return response.binary.data.map((data) => Array.from(Buffer.from(data, "base64")));
     }
     async updatePriceFeed(priceIds, pubTimesToPush) {
         if (priceIds.length === 0) {
@@ -164,7 +165,7 @@ class AptosPricePusher {
                     return this.lastSequenceNumber;
                 }
                 catch (e) {
-                    throw new Error("Failed to retrieve sequence number");
+                    throw new Error("Failed to retrieve sequence number" + e);
                 }
                 finally {
                     this.sequenceNumberLocked = false;

package/lib/aptos/command.d.ts

@@ -4,7 +4,6 @@ declare const _default: {
     describe: string;
     builder: {
         "controller-log-level": Options;
-        "price-service-connection-log-level": Options;
         "log-level": Options;
         "pushing-frequency": Options;
         "polling-frequency": Options;
@@ -15,7 +14,7 @@ declare const _default: {
         endpoint: Options;
         "override-gas-price-multiplier": Options;
     };
-    handler: (argv: any) => void;
+    handler: (argv: any) => Promise<void>;
 };
 export default _default;
 //# sourceMappingURL=command.d.ts.map

package/lib/aptos/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/aptos/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;kBAoBvB,OAAO;yCAOP,OAAO;;oBAWW,GAAG;;AA7B9B,wBAqGE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/aptos/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;kBAoBvB,OAAO;yCAOP,OAAO;;oBAUiB,GAAG;;AA5BpC,wBAyGE"}

package/lib/aptos/command.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const price_service_client_1 = require("@pythnetwork/price-service-client");
+const hermes_client_1 = require("@pythnetwork/hermes-client");
 const options = __importStar(require("../options"));
 const price_config_1 = require("../price-config");
 const fs_1 = __importDefault(require("fs"));
@@ -35,6 +35,7 @@ const controller_1 = require("../controller");
 const aptos_1 = require("./aptos");
 const aptos_2 = require("aptos");
 const pino_1 = __importDefault(require("pino"));
+const utils_1 = require("../utils");
 exports.default = {
     command: "aptos",
     describe: "run price pusher for aptos",
@@ -59,24 +60,29 @@ exports.default = {
         ...options.pollingFrequency,
         ...options.pushingFrequency,
         ...options.logLevel,
-        ...options.priceServiceConnectionLogLevel,
         ...options.controllerLogLevel,
     },
-    handler: function (argv) {
+    handler: async function (argv) {
         // FIXME: type checks for this
-        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, overrideGasPriceMultiplier, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, overrideGasPriceMultiplier, logLevel, controllerLogLevel, } = argv;
         const logger = (0, pino_1.default)({ level: logLevel });
         const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
-        const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
-            logger: logger.child({ module: "PriceServiceConnection" }, { level: priceServiceConnectionLogLevel }),
-        });
+        const hermesClient = new hermes_client_1.HermesClient(priceServiceEndpoint);
         const mnemonic = fs_1.default.readFileSync(mnemonicFile, "utf-8").trim();
         const account = aptos_2.AptosAccount.fromDerivePath(aptos_1.APTOS_ACCOUNT_HD_PATH, mnemonic);
         logger.info(`Pushing from account address: ${account.address()}`);
-        const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
-        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems, logger.child({ module: "PythPriceListener" }));
+        let priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
+        // Better to filter out invalid price items before creating the pyth listener
+        const { existingPriceItems, invalidPriceItems } = await (0, utils_1.filterInvalidPriceItems)(hermesClient, priceItems);
+        if (invalidPriceItems.length > 0) {
+            logger.error(`Invalid price id submitted for: ${invalidPriceItems
+                .map(({ alias }) => alias)
+                .join(", ")}`);
+        }
+        priceItems = existingPriceItems;
+        const pythListener = new pyth_price_listener_1.PythPriceListener(hermesClient, priceItems, logger.child({ module: "PythPriceListener" }));
         const aptosListener = new aptos_1.AptosPriceListener(pythContractAddress, endpoint, priceItems, logger.child({ module: "AptosPriceListener" }), { pollingFrequency });
-        const aptosPusher = new aptos_1.AptosPricePusher(priceServiceConnection, logger.child({ module: "AptosPricePusher" }), pythContractAddress, endpoint, mnemonic, overrideGasPriceMultiplier);
+        const aptosPusher = new aptos_1.AptosPricePusher(hermesClient, logger.child({ module: "AptosPricePusher" }), pythContractAddress, endpoint, mnemonic, overrideGasPriceMultiplier);
         const controller = new controller_1.Controller(priceConfigs, pythListener, aptosListener, aptosPusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },

package/lib/evm/command.d.ts

@@ -4,7 +4,6 @@ declare const _default: {
     describe: string;
     builder: {
         "controller-log-level": Options;
-        "price-service-connection-log-level": Options;
         "log-level": Options;
         "pushing-frequency": Options;
         "polling-frequency": Options;

package/lib/evm/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/evm/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;kBAyBvB,OAAO;8BAMP,OAAO;oBAMP,OAAO;yCAUP,OAAO;6CAQP,OAAO;qBAKP,OAAO;iCASP,OAAO;;oBAWiB,GAAG;;AApEpC,wBAkKE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/evm/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;kBAyBvB,OAAO;8BAMP,OAAO;oBAMP,OAAO;yCAUP,OAAO;6CAQP,OAAO;qBAKP,OAAO;iCASP,OAAO;;oBAUiB,GAAG;;AAnEpC,wBAyKE"}

package/lib/evm/command.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const price_service_client_1 = require("@pythnetwork/price-service-client");
+const hermes_client_1 = require("@pythnetwork/hermes-client");
 const fs_1 = __importDefault(require("fs"));
 const options = __importStar(require("../options"));
 const price_config_1 = require("../price-config");
@@ -97,20 +97,28 @@ exports.default = {
         ...options.pollingFrequency,
         ...options.pushingFrequency,
         ...options.logLevel,
-        ...options.priceServiceConnectionLogLevel,
         ...options.controllerLogLevel,
     },
     handler: async function (argv) {
         // FIXME: type checks for this
-        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, customGasStation, txSpeed, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, gasLimit, updateFeeMultiplier, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
-        const logger = (0, pino_1.default)({ level: logLevel });
-        const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
-        const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
-            logger: logger.child({ module: "PriceServiceConnection" }, { level: priceServiceConnectionLogLevel }),
+        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, customGasStation, txSpeed, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, gasLimit, updateFeeMultiplier, logLevel, controllerLogLevel, } = argv;
+        console.log("***** priceServiceEndpoint *****", priceServiceEndpoint);
+        const logger = (0, pino_1.default)({
+            level: logLevel,
         });
+        const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
+        const hermesClient = new hermes_client_1.HermesClient(priceServiceEndpoint);
         const mnemonic = fs_1.default.readFileSync(mnemonicFile, "utf-8").trim();
-        const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
-        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems, logger.child({ module: "PythPriceListener" }));
+        let priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
+        // Better to filter out invalid price items before creating the pyth listener
+        const { existingPriceItems, invalidPriceItems } = await (0, utils_1.filterInvalidPriceItems)(hermesClient, priceItems);
+        if (invalidPriceItems.length > 0) {
+            logger.error(`Invalid price id submitted for: ${invalidPriceItems
+                .map(({ alias }) => alias)
+                .join(", ")}`);
+        }
+        priceItems = existingPriceItems;
+        const pythListener = new pyth_price_listener_1.PythPriceListener(hermesClient, priceItems, logger.child({ module: "PythPriceListener" }));
         const client = await (0, super_wallet_1.createClient)(endpoint, mnemonic);
         const pythContract = (0, pyth_contract_1.createPythContract)(client, pythContractAddress);
         logger.info(`Pushing updates from wallet address: ${client.account.address}`);
@@ -122,7 +130,7 @@ exports.default = {
             pollingFrequency,
         });
         const gasStation = (0, custom_gas_station_1.getCustomGasStation)(logger.child({ module: "CustomGasStation" }), customGasStation, txSpeed);
-        const evmPusher = new evm_1.EvmPricePusher(priceServiceConnection, client, pythContract, logger.child({ module: "EvmPricePusher" }), overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, gasStation);
+        const evmPusher = new evm_1.EvmPricePusher(hermesClient, client, pythContract, logger.child({ module: "EvmPricePusher" }), overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, gasStation);
         const controller = new controller_1.Controller(priceConfigs, pythListener, evmListener, evmPusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },

package/lib/evm/evm.d.ts

@@ -1,7 +1,7 @@
 import { IPricePusher, PriceInfo, ChainPriceListener, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
 import { Logger } from "pino";
-import { PriceServiceConnection, HexString, UnixTimestamp } from "@pythnetwork/price-service-client";
+import { HermesClient, HexString, UnixTimestamp } from "@pythnetwork/hermes-client";
 import { CustomGasStation } from "./custom-gas-station";
 import { PythContract } from "./pyth-contract";
 import { SuperWalletClient } from "./super-wallet";
@@ -18,7 +18,7 @@ export declare class EvmPriceListener extends ChainPriceListener {
     getOnChainPriceInfo(priceId: HexString): Promise<PriceInfo | undefined>;
 }
 export declare class EvmPricePusher implements IPricePusher {
-    private connection;
+    private hermesClient;
     private client;
     private pythContract;
     private logger;
@@ -29,7 +29,7 @@ export declare class EvmPricePusher implements IPricePusher {
     private customGasStation?;
     private pusherAddress;
     private lastPushAttempt;
-    constructor(connection: PriceServiceConnection, client: SuperWalletClient, pythContract: PythContract, logger: Logger, overrideGasPriceMultiplier: number, overrideGasPriceMultiplierCap: number, updateFeeMultiplier: number, gasLimit?: number | undefined, customGasStation?: CustomGasStation | undefined);
+    constructor(hermesClient: HermesClient, client: SuperWalletClient, pythContract: PythContract, logger: Logger, overrideGasPriceMultiplier: number, overrideGasPriceMultiplierCap: number, updateFeeMultiplier: number, gasLimit?: number | undefined, customGasStation?: CustomGasStation | undefined);
     updatePriceFeed(priceIds: string[], pubTimesToPush: UnixTimestamp[]): Promise<void>;
     private waitForTransactionReceipt;
     private getPriceFeedsUpdateData;

package/lib/evm/evm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../src/evm/evm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,iBAAiB,EAElB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EACL,sBAAsB,EACtB,SAAS,EACT,aAAa,EACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAaxD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,qBAAa,gBAAiB,SAAQ,kBAAkB;IAEpD,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;gBAHN,YAAY,EAAE,YAAY,EAClC,UAAU,EAAE,SAAS,EAAE,EACf,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAUG,KAAK;YAeG,aAAa;IAO3B,OAAO,CAAC,iBAAiB;IAuBnB,mBAAmB,CACvB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAuBlC;AAED,qBAAa,cAAe,YAAW,YAAY;IAK/C,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,0BAA0B;IAClC,OAAO,CAAC,6BAA6B;IACrC,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,gBAAgB,CAAC;IAZ3B,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,eAAe,CAA0B;gBAGvC,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,0BAA0B,EAAE,MAAM,EAClC,6BAA6B,EAAE,MAAM,EACrC,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,CAAC,EAAE,MAAM,YAAA,EACjB,gBAAgB,CAAC,EAAE,gBAAgB,YAAA;IASvC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,aAAa,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC;YA2OF,yBAAyB;YAuBzB,uBAAuB;CAQtC"}
+{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../src/evm/evm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,iBAAiB,EAElB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EACL,YAAY,EACZ,SAAS,EACT,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAaxD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,qBAAa,gBAAiB,SAAQ,kBAAkB;IAEpD,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;gBAHN,YAAY,EAAE,YAAY,EAClC,UAAU,EAAE,SAAS,EAAE,EACf,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAUG,KAAK;YAeG,aAAa;IAO3B,OAAO,CAAC,iBAAiB;IAuBnB,mBAAmB,CACvB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAuBlC;AAED,qBAAa,cAAe,YAAW,YAAY;IAK/C,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,0BAA0B;IAClC,OAAO,CAAC,6BAA6B;IACrC,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,gBAAgB,CAAC;IAZ3B,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,eAAe,CAA0B;gBAGvC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,0BAA0B,EAAE,MAAM,EAClC,6BAA6B,EAAE,MAAM,EACrC,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,CAAC,EAAE,MAAM,YAAA,EACjB,gBAAgB,CAAC,EAAE,gBAAgB,YAAA;IASvC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,aAAa,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC;YA+OF,yBAAyB;YAuBzB,uBAAuB;CAStC"}

package/lib/evm/evm.js

@@ -66,7 +66,7 @@ class EvmPriceListener extends interface_1.ChainPriceListener {
 }
 exports.EvmPriceListener = EvmPriceListener;
 class EvmPricePusher {
-    connection;
+    hermesClient;
     client;
     pythContract;
     logger;
@@ -77,8 +77,8 @@ class EvmPricePusher {
     customGasStation;
     pusherAddress;
     lastPushAttempt;
-    constructor(connection, client, pythContract, logger, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, customGasStation) {
-        this.connection = connection;
+    constructor(hermesClient, client, pythContract, logger, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, customGasStation) {
+        this.hermesClient = hermesClient;
         this.client = client;
         this.pythContract = pythContract;
         this.logger = logger;
@@ -100,12 +100,12 @@ class EvmPricePusher {
         }
         if (priceIds.length !== pubTimesToPush.length)
             throw new Error("Invalid arguments");
-        const priceIdsWith0x = priceIds.map((priceId) => (0, utils_1.addLeading0x)(priceId));
-        const priceFeedUpdateData = (await this.getPriceFeedsUpdateData(priceIdsWith0x));
+        const priceFeedUpdateData = (await this.getPriceFeedsUpdateData(priceIds));
+        const priceFeedUpdateDataWith0x = priceFeedUpdateData.map((data) => (0, utils_1.addLeading0x)(data));
         let updateFee;
         try {
             updateFee = await this.pythContract.read.getUpdateFee([
-                priceFeedUpdateData,
+                priceFeedUpdateDataWith0x,
             ]);
             updateFee = BigInt(Math.round(Number(updateFee) * (this.updateFeeMultiplier || 1)));
             this.logger.debug(`Update fee: ${updateFee}`);
@@ -144,8 +144,9 @@ class EvmPricePusher {
         const txNonce = lastExecutedNonce + 1;
         this.logger.debug(`Using gas price: ${gasPrice} and nonce: ${txNonce}`);
         const pubTimesToPushParam = pubTimesToPush.map((pubTime) => BigInt(pubTime));
+        const priceIdsWith0x = priceIds.map((priceId) => (0, utils_1.addLeading0x)(priceId));
         try {
-            const { request } = await this.pythContract.simulate.updatePriceFeedsIfNecessary([priceFeedUpdateData, priceIdsWith0x, pubTimesToPushParam], {
+            const { request } = await this.pythContract.simulate.updatePriceFeedsIfNecessary([priceFeedUpdateDataWith0x, priceIdsWith0x, pubTimesToPushParam], {
                 value: updateFee,
                 gasPrice: BigInt(Math.ceil(gasPrice)),
                 nonce: txNonce,
@@ -256,8 +257,11 @@ class EvmPricePusher {
         }
     }
     async getPriceFeedsUpdateData(priceIds) {
-        const latestVaas = await this.connection.getLatestVaas(priceIds);
-        return latestVaas.map((vaa) => "0x" + Buffer.from(vaa, "base64").toString("hex"));
+        const response = await this.hermesClient.getLatestPriceUpdates(priceIds, {
+            encoding: "hex",
+            ignoreInvalidPriceIds: true,
+        });
+        return response.binary.data;
     }
 }
 exports.EvmPricePusher = EvmPricePusher;

package/lib/fuel/command.d.ts

@@ -4,7 +4,6 @@ declare const _default: {
     describe: string;
     builder: {
         "controller-log-level": Options;
-        "price-service-connection-log-level": Options;
         "log-level": Options;
         "polling-frequency": Options;
         "pushing-frequency": Options;

package/lib/fuel/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/fuel/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;kBAmBvB,OAAO;4BAKP,OAAO;iCAKP,OAAO;;oBASiB,GAAG;;AA3BpC,wBA6FE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/fuel/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;kBAmBvB,OAAO;4BAKP,OAAO;iCAKP,OAAO;;oBAQiB,GAAG;;AA1BpC,wBAiGE"}

package/lib/fuel/command.js

@@ -28,13 +28,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const options = __importStar(require("../options"));
 const price_config_1 = require("../price-config");
-const price_service_client_1 = require("@pythnetwork/price-service-client");
+const hermes_client_1 = require("@pythnetwork/hermes-client");
 const pyth_price_listener_1 = require("../pyth-price-listener");
 const fuel_1 = require("./fuel");
 const controller_1 = require("../controller");
 const fuels_1 = require("fuels");
 const fs_1 = __importDefault(require("fs"));
 const pino_1 = __importDefault(require("pino"));
+const utils_1 = require("../utils");
 exports.default = {
     command: "fuel",
     describe: "run price pusher for Fuel",
@@ -59,23 +60,28 @@ exports.default = {
         ...options.pushingFrequency,
         ...options.pollingFrequency,
         ...options.logLevel,
-        ...options.priceServiceConnectionLogLevel,
         ...options.controllerLogLevel,
     },
     handler: async function (argv) {
-        const { endpoint, privateKeyFile, pythContractAddress, priceConfigFile, priceServiceEndpoint, pushingFrequency, pollingFrequency, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+        const { endpoint, privateKeyFile, pythContractAddress, priceConfigFile, priceServiceEndpoint, pushingFrequency, pollingFrequency, logLevel, controllerLogLevel, } = argv;
         const logger = (0, pino_1.default)({ level: logLevel });
         const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
-        const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
-            logger: logger.child({ module: "PriceServiceConnection" }, { level: priceServiceConnectionLogLevel }),
-        });
-        const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
-        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems, logger.child({ module: "PythPriceListener" }));
+        const hermesClient = new hermes_client_1.HermesClient(priceServiceEndpoint);
+        let priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
+        // Better to filter out invalid price items before creating the pyth listener
+        const { existingPriceItems, invalidPriceItems } = await (0, utils_1.filterInvalidPriceItems)(hermesClient, priceItems);
+        if (invalidPriceItems.length > 0) {
+            logger.error(`Invalid price id submitted for: ${invalidPriceItems
+                .map(({ alias }) => alias)
+                .join(", ")}`);
+        }
+        priceItems = existingPriceItems;
+        const pythListener = new pyth_price_listener_1.PythPriceListener(hermesClient, priceItems, logger.child({ module: "PythPriceListener" }));
         const provider = await fuels_1.Provider.create(endpoint);
         const privateKey = fs_1.default.readFileSync(privateKeyFile, "utf8").trim();
         const wallet = fuels_1.Wallet.fromPrivateKey(privateKey, provider);
         const fuelPriceListener = new fuel_1.FuelPriceListener(provider, pythContractAddress, priceItems, logger.child({ module: "FuelPriceListener" }), { pollingFrequency });
-        const fuelPricePusher = new fuel_1.FuelPricePusher(wallet, pythContractAddress, priceServiceConnection, logger.child({ module: "FuelPricePusher" }));
+        const fuelPricePusher = new fuel_1.FuelPricePusher(wallet, pythContractAddress, hermesClient, logger.child({ module: "FuelPricePusher" }));
         const controller = new controller_1.Controller(priceConfigs, pythListener, fuelPriceListener, fuelPricePusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         await controller.start();
     },

package/lib/fuel/fuel.d.ts

@@ -1,4 +1,4 @@
-import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { HermesClient } from "@pythnetwork/hermes-client";
 import { ChainPriceListener, IPricePusher, PriceInfo, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
 import { Logger } from "pino";
@@ -16,10 +16,10 @@ export declare class FuelPriceListener extends ChainPriceListener {
 export declare class FuelPricePusher implements IPricePusher {
     private wallet;
     private pythContractId;
-    private priceServiceConnection;
+    private hermesClient;
     private logger;
     private contract;
-    constructor(wallet: Wallet, pythContractId: string, priceServiceConnection: PriceServiceConnection, logger: Logger);
+    constructor(wallet: Wallet, pythContractId: string, hermesClient: HermesClient, logger: Logger);
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
 }
 //# sourceMappingURL=fuel.d.ts.map

package/lib/fuel/fuel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fuel.d.ts","sourceRoot":"","sources":["../../src/fuel/fuel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAgB,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAA+B,MAAM,EAAM,MAAM,OAAO,CAAC;AAc1E,qBAAa,iBAAkB,SAAQ,kBAAkB;IAIrD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,cAAc;IAEtB,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,QAAQ,CAAW;gBAGjB,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,MAAM,EAC9B,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAUG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA6B3E;AAED,qBAAa,eAAgB,YAAW,YAAY;IAIhD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,QAAQ,CAAW;gBAGjB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM;IASlB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAuCjB"}
+{"version":3,"file":"fuel.d.ts","sourceRoot":"","sources":["../../src/fuel/fuel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAgB,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAA+B,MAAM,EAAM,MAAM,OAAO,CAAC;AAc1E,qBAAa,iBAAkB,SAAQ,kBAAkB;IAIrD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,cAAc;IAEtB,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,QAAQ,CAAW;gBAGjB,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,MAAM,EAC9B,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAUG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA6B3E;AAED,qBAAa,eAAgB,YAAW,YAAY;IAIhD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,QAAQ,CAAW;gBAGjB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM;IASlB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAsCjB"}

package/lib/fuel/fuel.js

@@ -52,13 +52,13 @@ exports.FuelPriceListener = FuelPriceListener;
 class FuelPricePusher {
     wallet;
     pythContractId;
-    priceServiceConnection;
+    hermesClient;
     logger;
     contract;
-    constructor(wallet, pythContractId, priceServiceConnection, logger) {
+    constructor(wallet, pythContractId, hermesClient, logger) {
         this.wallet = wallet;
         this.pythContractId = pythContractId;
-        this.priceServiceConnection = priceServiceConnection;
+        this.hermesClient = hermesClient;
         this.logger = logger;
         this.contract = new fuels_1.Contract(this.pythContractId, pyth_fuel_js_1.PYTH_CONTRACT_ABI, this.wallet);
     }
@@ -70,13 +70,16 @@ class FuelPricePusher {
         }
         let priceFeedUpdateData;
         try {
-            priceFeedUpdateData = await this.priceServiceConnection.getLatestVaas(priceIds);
+            const response = await this.hermesClient.getLatestPriceUpdates(priceIds, {
+                encoding: "base64",
+            });
+            priceFeedUpdateData = response.binary.data;
         }
         catch (err) {
             this.logger.error(err, "getPriceFeedsUpdateData failed");
             return;
         }
-        const updateData = priceFeedUpdateData.map((data) => (0, fuels_1.arrayify)(Buffer.from(data, "base64")));
+        const updateData = priceFeedUpdateData.map((data) => (0, fuels_1.arrayify)(data));
         try {
             const updateFee = await this.contract.functions
                 .update_fee(updateData)

package/lib/injective/command.d.ts

@@ -4,7 +4,6 @@ declare const _default: {
     describe: string;
     builder: {
         "controller-log-level": Options;
-        "price-service-connection-log-level": Options;
         "log-level": Options;
         "pushing-frequency": Options;
         "polling-frequency": Options;
@@ -17,7 +16,7 @@ declare const _default: {
         "gas-price": Options;
         "gas-multiplier": Options;
     };
-    handler: (argv: any) => void;
+    handler: (argv: any) => Promise<void>;
 };
 export default _default;
 //# sourceMappingURL=command.d.ts.map

package/lib/injective/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/injective/command.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;yBAevB,OAAO;iBAKP,OAAO;qBAIP,OAAO;0BAIP,OAAO;;oBAWW,GAAG;;AAnC9B,wBAgHE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/injective/command.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;yBAevB,OAAO;iBAKP,OAAO;qBAIP,OAAO;0BAIP,OAAO;;oBAUiB,GAAG;;AAlCpC,wBAoHE"}

package/lib/injective/command.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const price_service_client_1 = require("@pythnetwork/price-service-client");
+const hermes_client_1 = require("@pythnetwork/hermes-client");
 const options = __importStar(require("../options"));
 const price_config_1 = require("../price-config");
 const fs_1 = __importDefault(require("fs"));
@@ -35,6 +35,7 @@ const pyth_price_listener_1 = require("../pyth-price-listener");
 const controller_1 = require("../controller");
 const networks_1 = require("@injectivelabs/networks");
 const pino_1 = __importDefault(require("pino"));
+const utils_1 = require("../utils");
 exports.default = {
     command: "injective",
     describe: "run price pusher for injective",
@@ -66,27 +67,32 @@ exports.default = {
         ...options.pollingFrequency,
         ...options.pushingFrequency,
         ...options.logLevel,
-        ...options.priceServiceConnectionLogLevel,
         ...options.controllerLogLevel,
     },
-    handler: function (argv) {
+    handler: async function (argv) {
         // FIXME: type checks for this
-        const { gasPrice, gasMultiplier, grpcEndpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, network, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+        const { gasPrice, gasMultiplier, grpcEndpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, network, logLevel, controllerLogLevel, } = argv;
         const logger = (0, pino_1.default)({ level: logLevel });
         if (network !== "testnet" && network !== "mainnet") {
             throw new Error("Please specify network. One of [testnet, mainnet]");
         }
         const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
-        const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
-            logger: logger.child({ module: "PriceServiceConnection" }, { level: priceServiceConnectionLogLevel }),
-        });
+        const hermesClient = new hermes_client_1.HermesClient(priceServiceEndpoint);
         const mnemonic = fs_1.default.readFileSync(mnemonicFile, "utf-8").trim();
-        const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
-        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems, logger.child({ module: "PythPriceListener" }));
+        let priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
+        // Better to filter out invalid price items before creating the pyth listener
+        const { existingPriceItems, invalidPriceItems } = await (0, utils_1.filterInvalidPriceItems)(hermesClient, priceItems);
+        if (invalidPriceItems.length > 0) {
+            logger.error(`Invalid price id submitted for: ${invalidPriceItems
+                .map(({ alias }) => alias)
+                .join(", ")}`);
+        }
+        priceItems = existingPriceItems;
+        const pythListener = new pyth_price_listener_1.PythPriceListener(hermesClient, priceItems, logger.child({ module: "PythPriceListener" }));
         const injectiveListener = new injective_1.InjectivePriceListener(pythContractAddress, grpcEndpoint, priceItems, logger.child({ module: "InjectivePriceListener" }), {
             pollingFrequency,
         });
-        const injectivePusher = new injective_1.InjectivePricePusher(priceServiceConnection, pythContractAddress, grpcEndpoint, logger.child({ module: "InjectivePricePusher" }), mnemonic, {
+        const injectivePusher = new injective_1.InjectivePricePusher(hermesClient, pythContractAddress, grpcEndpoint, logger.child({ module: "InjectivePricePusher" }), mnemonic, {
             chainId: (0, networks_1.getNetworkInfo)(network).chainId,
             gasPrice,
             gasMultiplier,

package/lib/injective/injective.d.ts

@@ -1,4 +1,4 @@
-import { HexString, PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { HexString, HermesClient } from "@pythnetwork/hermes-client";
 import { IPricePusher, PriceInfo, ChainPriceListener, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
 import { Logger } from "pino";
@@ -17,14 +17,14 @@ type InjectiveConfig = {
     gasPrice: number;
 };
 export declare class InjectivePricePusher implements IPricePusher {
-    private priceServiceConnection;
+    private hermesClient;
     private pythContractAddress;
     private grpcEndpoint;
     private logger;
     private wallet;
     private chainConfig;
     private account;
-    constructor(priceServiceConnection: PriceServiceConnection, pythContractAddress: string, grpcEndpoint: string, logger: Logger, mnemonic: string, chainConfig?: Partial<InjectiveConfig>);
+    constructor(hermesClient: HermesClient, pythContractAddress: string, grpcEndpoint: string, logger: Logger, mnemonic: string, chainConfig?: Partial<InjectiveConfig>);
     private injectiveAddress;
     private signAndBroadcastMsg;
     getPriceFeedUpdateObject(priceIds: string[]): Promise<any>;

package/lib/injective/injective.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"injective.d.ts","sourceRoot":"","sources":["../../src/injective/injective.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,sBAAsB,EACvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAW7C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAyB9B,qBAAa,sBAAuB,SAAQ,kBAAkB;IAE1D,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,MAAM;gBAHN,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EAC5B,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CACvB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA4BlC;AAED,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AACF,qBAAa,oBAAqB,YAAW,YAAY;IAMrD,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IARhB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,OAAO,CAAwB;gBAG7B,sBAAsB,EAAE,sBAAsB,EAC9C,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC;IAWxC,OAAO,CAAC,gBAAgB;YAIV,mBAAmB;IAkE3B,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAU1D,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAiEjB"}
+{"version":3,"file":"injective.d.ts","sourceRoot":"","sources":["../../src/injective/injective.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAW7C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAyB9B,qBAAa,sBAAuB,SAAQ,kBAAkB;IAE1D,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,MAAM;gBAHN,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EAC5B,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CACvB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA4BlC;AAED,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AACF,qBAAa,oBAAqB,YAAW,YAAY;IAMrD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IARhB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,OAAO,CAAwB;gBAG7B,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC;IAWxC,OAAO,CAAC,gBAAgB;YAIV,mBAAmB;IAkE3B,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAa1D,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAiEjB"}