@pythnetwork/price-pusher 8.3.2 → 9.0.0

package/lib/injective/injective.js

@@ -39,15 +39,15 @@ class InjectivePriceListener extends interface_1.ChainPriceListener {
 }
 exports.InjectivePriceListener = InjectivePriceListener;
 class InjectivePricePusher {
-    priceServiceConnection;
+    hermesClient;
     pythContractAddress;
     grpcEndpoint;
     logger;
     wallet;
     chainConfig;
     account = null;
-    constructor(priceServiceConnection, pythContractAddress, grpcEndpoint, logger, mnemonic, chainConfig) {
-        this.priceServiceConnection = priceServiceConnection;
+    constructor(hermesClient, pythContractAddress, grpcEndpoint, logger, mnemonic, chainConfig) {
+        this.hermesClient = hermesClient;
         this.pythContractAddress = pythContractAddress;
         this.grpcEndpoint = grpcEndpoint;
         this.logger = logger;
@@ -116,7 +116,10 @@ class InjectivePricePusher {
         }
     }
     async getPriceFeedUpdateObject(priceIds) {
-        const vaas = await this.priceServiceConnection.getLatestVaas(priceIds);
+        const response = await this.hermesClient.getLatestPriceUpdates(priceIds, {
+            encoding: "base64",
+        });
+        const vaas = response.binary.data;
         return {
             update_price_feeds: {
                 data: vaas,

package/lib/interface.d.ts

@@ -1,4 +1,4 @@
-import { HexString, UnixTimestamp } from "@pythnetwork/price-service-client";
+import { HexString, UnixTimestamp } from "@pythnetwork/hermes-client";
 import { DurationInSeconds } from "./utils";
 export type PriceItem = {
     id: HexString;

package/lib/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,SAAS,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,aAAa,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,cAAc;IAE7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;CAC5D;AAED,8BAAsB,kBAAmB,YAAW,cAAc;IAK9D,OAAO,CAAC,gBAAgB;IACxB,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE;IALnC,OAAO,CAAC,eAAe,CAA4B;IACnD,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAGvC,gBAAgB,EAAE,iBAAiB,EACjC,UAAU,EAAE,SAAS,EAAE;IAQ7B,KAAK;YAMG,UAAU;IASxB,SAAS,CAAC,qBAAqB,CAC7B,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,SAAS;IAkB1B,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI1D,QAAQ,CAAC,mBAAmB,CAC1B,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,eAAe,CACb,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,aAAa,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,SAAS,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,aAAa,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,cAAc;IAE7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;CAC5D;AAED,8BAAsB,kBAAmB,YAAW,cAAc;IAK9D,OAAO,CAAC,gBAAgB;IACxB,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE;IALnC,OAAO,CAAC,eAAe,CAA4B;IACnD,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAGvC,gBAAgB,EAAE,iBAAiB,EACjC,UAAU,EAAE,SAAS,EAAE;IAQ7B,KAAK;YAMG,UAAU;IASxB,SAAS,CAAC,qBAAqB,CAC7B,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,SAAS;IAkB1B,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI1D,QAAQ,CAAC,mBAAmB,CAC1B,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,eAAe,CACb,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,aAAa,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB"}

package/lib/near/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;
@@ -16,7 +15,7 @@ declare const _default: {
         "account-id": Options;
         "private-key-path": Options;
     };
-    handler: (argv: any) => void;
+    handler: (argv: any) => Promise<void>;
 };
 export default _default;
 //# sourceMappingURL=command.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/near/command.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;oBAsCL,GAAG;;AAlC9B,wBA0GE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/near/command.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;oBAcvB,OAAO;iBAKP,OAAO;sBAKP,OAAO;4BAKP,OAAO;;oBASiB,GAAG;;AAjCpC,wBA8GE"}

package/lib/near/command.js

@@ -26,13 +26,14 @@ 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 pyth_price_listener_1 = require("../pyth-price-listener");
 const controller_1 = require("../controller");
 const near_1 = require("./near");
 const pino_1 = __importDefault(require("pino"));
+const utils_1 = require("../utils");
 exports.default = {
     command: "near",
     describe: "run price pusher for near",
@@ -63,24 +64,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 { nodeUrl, network, accountId, privateKeyPath, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+        const { nodeUrl, network, accountId, privateKeyPath, priceConfigFile, priceServiceEndpoint, pythContractAddress, 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);
+        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);
         const nearAccount = new near_1.NearAccount(network, accountId, nodeUrl, privateKeyPath, pythContractAddress);
         const nearListener = new near_1.NearPriceListener(nearAccount, priceItems, logger.child({ module: "NearPriceListener" }), {
             pollingFrequency,
         });
-        const nearPusher = new near_1.NearPricePusher(nearAccount, priceServiceConnection, logger.child({ module: "NearPricePusher" }));
+        const nearPusher = new near_1.NearPricePusher(nearAccount, hermesClient, logger.child({ module: "NearPricePusher" }));
         const controller = new controller_1.Controller(priceConfigs, pythListener, nearListener, nearPusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },

package/lib/near/near.d.ts

@@ -1,5 +1,5 @@
 import { IPricePusher, PriceInfo, ChainPriceListener, PriceItem } from "../interface";
-import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { HermesClient } from "@pythnetwork/hermes-client";
 import { DurationInSeconds } from "../utils";
 import { FinalExecutionOutcome } from "near-api-js/lib/providers/provider";
 import { Logger } from "pino";
@@ -13,9 +13,9 @@ export declare class NearPriceListener extends ChainPriceListener {
 }
 export declare class NearPricePusher implements IPricePusher {
     private account;
-    private connection;
+    private hermesClient;
     private logger;
-    constructor(account: NearAccount, connection: PriceServiceConnection, logger: Logger);
+    constructor(account: NearAccount, hermesClient: HermesClient, logger: Logger);
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
     private getPriceFeedsUpdateData;
 }

package/lib/near/near.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"near.d.ts","sourceRoot":"","sources":["../../src/near/near.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,sBAAsB,EAEvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,OAAO,EAGL,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,qBAAa,iBAAkB,SAAQ,kBAAkB;IAErD,OAAO,CAAC,OAAO;IAEf,OAAO,CAAC,MAAM;gBAFN,OAAO,EAAE,WAAW,EAC5B,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;CAwB3E;AAED,qBAAa,eAAgB,YAAW,YAAY;IAEhD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;gBAFN,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,MAAM;IAGlB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YA0DF,uBAAuB;CAMtC;AAED,qBAAa,WAAW;IAQpB,OAAO,CAAC,aAAa;IAPvB,OAAO,CAAC,OAAO,CAAU;gBAGvB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,GAAG,SAAS,EAC1B,aAAa,EAAE,MAAM;IAWzB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAU7C,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAUhD,gBAAgB,CACpB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,qBAAqB,CAAC;IAYjC,OAAO,CAAC,aAAa;CAkCtB"}
+{"version":3,"file":"near.d.ts","sourceRoot":"","sources":["../../src/near/near.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAa,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,OAAO,EAGL,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,qBAAa,iBAAkB,SAAQ,kBAAkB;IAErD,OAAO,CAAC,OAAO;IAEf,OAAO,CAAC,MAAM;gBAFN,OAAO,EAAE,WAAW,EAC5B,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;CAwB3E;AAED,qBAAa,eAAgB,YAAW,YAAY;IAEhD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;gBAFN,OAAO,EAAE,WAAW,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM;IAGlB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YA0DF,uBAAuB;CAQtC;AAED,qBAAa,WAAW;IAQpB,OAAO,CAAC,aAAa;IAPvB,OAAO,CAAC,OAAO,CAAU;gBAGvB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,GAAG,SAAS,EAC1B,aAAa,EAAE,MAAM;IAWzB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAU7C,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAUhD,gBAAgB,CACpB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,qBAAqB,CAAC;IAYjC,OAAO,CAAC,aAAa;CAkCtB"}

package/lib/near/near.js

@@ -42,11 +42,11 @@ class NearPriceListener extends interface_1.ChainPriceListener {
 exports.NearPriceListener = NearPriceListener;
 class NearPricePusher {
     account;
-    connection;
+    hermesClient;
     logger;
-    constructor(account, connection, logger) {
+    constructor(account, hermesClient, logger) {
         this.account = account;
-        this.connection = connection;
+        this.hermesClient = hermesClient;
         this.logger = logger;
     }
     async updatePriceFeed(priceIds, pubTimesToPush) {
@@ -96,8 +96,10 @@ class NearPricePusher {
         }
     }
     async getPriceFeedsUpdateData(priceIds) {
-        const latestVaas = await this.connection.getLatestVaas(priceIds);
-        return latestVaas.map((vaa) => Buffer.from(vaa, "base64").toString("hex"));
+        const response = await this.hermesClient.getLatestPriceUpdates(priceIds, {
+            encoding: "base64",
+        });
+        return response.binary.data;
     }
 }
 exports.NearPricePusher = NearPricePusher;

package/lib/options.d.ts

@@ -20,9 +20,6 @@ export declare const mnemonicFile: {
 export declare const logLevel: {
     "log-level": Options;
 };
-export declare const priceServiceConnectionLogLevel: {
-    "price-service-connection-log-level": Options;
-};
 export declare const controllerLogLevel: {
     "controller-log-level": Options;
 };

package/lib/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,eAAO,MAAM,oBAAoB;;CAOhC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;CAQ/B,CAAC;AAEF,eAAO,MAAM,eAAe;;CAM3B,CAAC;AAEF,eAAO,MAAM,gBAAgB;;CAQ5B,CAAC;AAEF,eAAO,MAAM,gBAAgB;;CAU5B,CAAC;AAEF,eAAO,MAAM,YAAY;;CAMxB,CAAC;AAEF,eAAO,MAAM,QAAQ;;CAQpB,CAAC;AAEF,eAAO,MAAM,8BAA8B;;CAQ1C,CAAC;AAEF,eAAO,MAAM,kBAAkB;;CAQ9B,CAAC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,eAAO,MAAM,oBAAoB;8BAM1B,OAAO;CACb,CAAC;AAEF,eAAO,MAAM,mBAAmB;6BAOzB,OAAO;CACb,CAAC;AAEF,eAAO,MAAM,eAAe;yBAKrB,OAAO;CACb,CAAC;AAEF,eAAO,MAAM,gBAAgB;yBAOtB,OAAO;CACb,CAAC;AAEF,eAAO,MAAM,gBAAgB;yBAStB,OAAO;CACb,CAAC;AAEF,eAAO,MAAM,YAAY;qBAKlB,OAAO;CACb,CAAC;AAEF,eAAO,MAAM,QAAQ;iBAOd,OAAO;CACb,CAAC;AAEF,eAAO,MAAM,kBAAkB;4BAOxB,OAAO;CACb,CAAC"}

package/lib/options.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.controllerLogLevel = exports.priceServiceConnectionLogLevel = exports.logLevel = exports.mnemonicFile = exports.pushingFrequency = exports.pollingFrequency = exports.priceConfigFile = exports.pythContractAddress = exports.priceServiceEndpoint = void 0;
+exports.controllerLogLevel = exports.logLevel = exports.mnemonicFile = exports.pushingFrequency = exports.pollingFrequency = exports.priceConfigFile = exports.pythContractAddress = exports.priceServiceEndpoint = void 0;
 exports.priceServiceEndpoint = {
     "price-service-endpoint": {
-        description: "Endpoint URL for the price service. e.g: https://endpoint/example",
+        description: "Endpoint URL for the hermes client. e.g: https://endpoint/example",
         type: "string",
         required: true,
     },
@@ -57,15 +57,6 @@ exports.logLevel = {
         choices: ["trace", "debug", "info", "warn", "error"],
     },
 };
-exports.priceServiceConnectionLogLevel = {
-    "price-service-connection-log-level": {
-        description: "Log level for the price service connection.",
-        type: "string",
-        required: false,
-        default: "warn",
-        choices: ["trace", "debug", "info", "warn", "error"],
-    },
-};
 exports.controllerLogLevel = {
     "controller-log-level": {
         description: "Log level for the controller.",

package/lib/price-config.d.ts

@@ -1,4 +1,4 @@
-import { HexString } from "@pythnetwork/price-service-client";
+import { HexString } from "@pythnetwork/hermes-client";
 import { Logger } from "pino";
 import { DurationInSeconds, PctNumber } from "./utils";
 import { PriceInfo } from "./interface";

package/lib/price-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"price-config.d.ts","sourceRoot":"","sources":["../src/price-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAI9D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAmB,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAuBxC,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,SAAS,CAAC;IACd,cAAc,EAAE,iBAAiB,CAAC;IAClC,cAAc,EAAE,SAAS,CAAC;IAC1B,eAAe,EAAE,SAAS,CAAC;IAU3B,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,yBAAyB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACzD,yBAAyB,EAAE,SAAS,GAAG,SAAS,CAAC;IACjD,0BAA0B,EAAE,SAAS,GAAG,SAAS,CAAC;CACnD,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAuB/D;AAED,oBAAY,eAAe;IAEzB,GAAG,IAAA;IAEH,KAAK,IAAA;IAEL,EAAE,IAAA;CACH;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,SAAS,GAAG,SAAS,EACxC,iBAAiB,EAAE,SAAS,GAAG,SAAS,EACxC,MAAM,EAAE,MAAM,GACb,eAAe,CAkEjB"}
+{"version":3,"file":"price-config.d.ts","sourceRoot":"","sources":["../src/price-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAmB,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAuBxC,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,SAAS,CAAC;IACd,cAAc,EAAE,iBAAiB,CAAC;IAClC,cAAc,EAAE,SAAS,CAAC;IAC1B,eAAe,EAAE,SAAS,CAAC;IAU3B,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,yBAAyB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACzD,yBAAyB,EAAE,SAAS,GAAG,SAAS,CAAC;IACjD,0BAA0B,EAAE,SAAS,GAAG,SAAS,CAAC;CACnD,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAuB/D;AAED,oBAAY,eAAe;IAEzB,GAAG,IAAA;IAEH,KAAK,IAAA;IAEL,EAAE,IAAA;CACH;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,SAAS,GAAG,SAAS,EACxC,iBAAiB,EAAE,SAAS,GAAG,SAAS,EACxC,MAAM,EAAE,MAAM,GACb,eAAe,CAkEjB"}

package/lib/price-config.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldUpdate = exports.UpdateCondition = exports.readPriceConfigFile = void 0;
+exports.UpdateCondition = void 0;
+exports.readPriceConfigFile = readPriceConfigFile;
+exports.shouldUpdate = shouldUpdate;
 const joi_1 = __importDefault(require("joi"));
 const yaml_1 = __importDefault(require("yaml"));
 const fs_1 = __importDefault(require("fs"));
@@ -47,7 +49,6 @@ function readPriceConfigFile(path) {
         return priceConfig;
     });
 }
-exports.readPriceConfigFile = readPriceConfigFile;
 var UpdateCondition;
 (function (UpdateCondition) {
     // This price feed must be updated
@@ -106,4 +107,3 @@ function shouldUpdate(priceConfig, sourceLatestPrice, targetLatestPrice, logger)
         return UpdateCondition.NO;
     }
 }
-exports.shouldUpdate = shouldUpdate;

package/lib/pyth-price-listener.d.ts

@@ -1,16 +1,17 @@
-import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { HexString, HermesClient } from "@pythnetwork/hermes-client";
 import { PriceInfo, IPriceListener, PriceItem } from "./interface";
 import { Logger } from "pino";
 export declare class PythPriceListener implements IPriceListener {
-    private connection;
+    private hermesClient;
     private priceIds;
     private priceIdToAlias;
     private latestPriceInfo;
     private logger;
     private lastUpdated;
-    constructor(connection: PriceServiceConnection, priceItems: PriceItem[], logger: Logger);
+    private healthCheckInterval?;
+    constructor(hermesClient: HermesClient, priceItems: PriceItem[], logger: Logger);
     start(): Promise<void>;
-    private onNewPriceFeed;
-    getLatestPriceInfo(priceId: string): PriceInfo | undefined;
+    getLatestPriceInfo(priceId: HexString): PriceInfo | undefined;
+    cleanup(): void;
 }
 //# sourceMappingURL=pyth-price-listener.d.ts.map

package/lib/pyth-price-listener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pyth-price-listener.d.ts","sourceRoot":"","sources":["../src/pyth-price-listener.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,sBAAsB,EACvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,qBAAa,iBAAkB,YAAW,cAAc;IACtD,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,WAAW,CAA4B;gBAG7C,UAAU,EAAE,sBAAsB,EAClC,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,MAAM;IAaV,KAAK;IA8BX,OAAO,CAAC,cAAc;IAuBtB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;CAG3D"}
+{"version":3,"file":"pyth-price-listener.d.ts","sourceRoot":"","sources":["../src/pyth-price-listener.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,YAAY,EAEb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,qBAAa,iBAAkB,YAAW,cAAc;IACtD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,mBAAmB,CAAC,CAAiB;gBAG3C,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,MAAM;IAaV,KAAK;IAsDX,kBAAkB,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS;IAI7D,OAAO;CAKR"}

package/lib/pyth-price-listener.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PythPriceListener = void 0;
 class PythPriceListener {
-    connection;
+    hermesClient;
     priceIds;
     priceIdToAlias;
     latestPriceInfo;
     logger;
     lastUpdated;
-    constructor(connection, priceItems, logger) {
-        this.connection = connection;
+    healthCheckInterval;
+    constructor(hermesClient, priceItems, logger) {
+        this.hermesClient = hermesClient;
         this.priceIds = priceItems.map((priceItem) => priceItem.id);
         this.priceIdToAlias = new Map(priceItems.map((priceItem) => [priceItem.id, priceItem.alias]));
         this.latestPriceInfo = new Map();
@@ -18,44 +19,50 @@ class PythPriceListener {
     // This method should be awaited on and once it finishes it has the latest value
     // for the given price feeds (if they exist).
     async start() {
-        this.connection.subscribePriceFeedUpdates(this.priceIds, this.onNewPriceFeed.bind(this));
-        const priceFeeds = await this.connection.getLatestPriceFeeds(this.priceIds);
-        priceFeeds?.forEach((priceFeed) => {
-            // Getting unchecked because although it might be old
-            // but might not be there on the target chain.
-            const latestAvailablePrice = priceFeed.getPriceUnchecked();
-            this.latestPriceInfo.set(priceFeed.id, {
-                price: latestAvailablePrice.price,
-                conf: latestAvailablePrice.conf,
-                publishTime: latestAvailablePrice.publishTime,
-            });
+        const eventSource = await this.hermesClient.getPriceUpdatesStream(this.priceIds, {
+            parsed: true,
+            ignoreInvalidPriceIds: true,
         });
-        // Check health of the price feeds 5 second. If the price feeds are not updating
-        // for more than 30s, throw an error.
-        setInterval(() => {
+        eventSource.onmessage = (event) => {
+            const priceUpdates = JSON.parse(event.data);
+            priceUpdates.parsed?.forEach((priceUpdate) => {
+                this.logger.debug(`Received new price feed update from Pyth price service: ${this.priceIdToAlias.get(priceUpdate.id)} ${priceUpdate.id}`);
+                // Consider price to be currently available if it is not older than 60s
+                const currentPrice = Date.now() / 1000 - priceUpdate.price.publish_time > 60
+                    ? undefined
+                    : priceUpdate.price;
+                if (currentPrice === undefined) {
+                    this.logger.debug("Price is older than 60s, skipping");
+                    return;
+                }
+                const priceInfo = {
+                    conf: currentPrice.conf,
+                    price: currentPrice.price,
+                    publishTime: currentPrice.publish_time,
+                };
+                this.latestPriceInfo.set(priceUpdate.id, priceInfo);
+                this.lastUpdated = Date.now();
+            });
+        };
+        eventSource.onerror = (error) => {
+            console.error("Error receiving updates from Hermes:", error);
+            eventSource.close();
+        };
+        // Store health check interval reference
+        this.healthCheckInterval = setInterval(() => {
             if (this.lastUpdated === undefined ||
                 this.lastUpdated < Date.now() - 30 * 1000) {
                 throw new Error("Hermes Price feeds are not updating.");
             }
         }, 5000);
     }
-    onNewPriceFeed(priceFeed) {
-        this.logger.debug(`Received new price feed update from Pyth price service: ${this.priceIdToAlias.get(priceFeed.id)} ${priceFeed.id}`);
-        // Consider price to be currently available if it is not older than 60s
-        const currentPrice = priceFeed.getPriceNoOlderThan(60);
-        if (currentPrice === undefined) {
-            return;
-        }
-        const priceInfo = {
-            conf: currentPrice.conf,
-            price: currentPrice.price,
-            publishTime: currentPrice.publishTime,
-        };
-        this.latestPriceInfo.set(priceFeed.id, priceInfo);
-        this.lastUpdated = Date.now();
-    }
     getLatestPriceInfo(priceId) {
         return this.latestPriceInfo.get(priceId);
     }
+    cleanup() {
+        if (this.healthCheckInterval) {
+            clearInterval(this.healthCheckInterval);
+        }
+    }
 }
 exports.PythPriceListener = PythPriceListener;

package/lib/solana/command.d.ts

@@ -6,7 +6,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;
@@ -25,7 +24,7 @@ declare const _default: {
         "jito-bundle-size": Options;
         "updates-per-jito-bundle": Options;
     };
-    handler: (argv: any) => void;
+    handler: (argv: any) => Promise<void>;
 };
 export default _default;
 export declare const onBundleResult: (c: SearcherClient, logger: Logger) => void;

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

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/solana/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAgBhC,OAAO,EACL,cAAc,EAEf,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;oBAuEH,GAAG;;AArE9B,wBAgLE;AAEF,eAAO,MAAM,cAAc,MAAO,cAAc,UAAU,MAAM,SAO/D,CAAC"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/solana/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAehC,OAAO,EACL,cAAc,EAEf,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;;;;;;;;;;;;kBAWrB,OAAO;wBAKP,OAAO;oBAKP,OAAO;6CAKP,OAAO;yBAKP,OAAO;6BAMP,OAAO;6BAKP,OAAO;6BAKP,OAAO;iCAKP,OAAO;4BAKP,OAAO;mCAKP,OAAO;;oBASiB,GAAG;;AApEpC,wBAoLE;AAEF,eAAO,MAAM,cAAc,MAAO,cAAc,UAAU,MAAM,SAO/D,CAAC"}

package/lib/solana/command.js

@@ -29,7 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.onBundleResult = void 0;
 const options = __importStar(require("../options"));
 const price_config_1 = require("../price-config");
-const price_service_client_1 = require("@pythnetwork/price-service-client");
 const pyth_price_listener_1 = require("../pyth-price-listener");
 const solana_1 = require("./solana");
 const controller_1 = require("../controller");
@@ -40,6 +39,8 @@ const fs_1 = __importDefault(require("fs"));
 const web3_js_2 = require("@solana/web3.js");
 const searcher_1 = require("jito-ts/dist/sdk/block-engine/searcher");
 const pino_1 = __importDefault(require("pino"));
+const hermes_client_1 = require("@pythnetwork/hermes-client");
+const utils_1 = require("../utils");
 exports.default = {
     command: "solana",
     describe: "run price pusher for solana",
@@ -90,12 +91,12 @@ exports.default = {
             default: web3_js_1.LAMPORTS_PER_SOL / 100,
         },
         "jito-bundle-size": {
-            description: "Number of transactions in each bundle",
+            description: "Number of transactions in each Jito bundle",
             type: "number",
-            default: 2,
+            default: 5,
         },
         "updates-per-jito-bundle": {
-            description: "Number of transactions in each bundle",
+            description: "Number of price updates in each Jito bundle",
             type: "number",
             default: 6,
         },
@@ -105,18 +106,23 @@ exports.default = {
         ...options.pollingFrequency,
         ...options.pushingFrequency,
         ...options.logLevel,
-        ...options.priceServiceConnectionLogLevel,
         ...options.controllerLogLevel,
     },
-    handler: function (argv) {
-        const { endpoint, keypairFile, shardId, computeUnitPriceMicroLamports, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, jitoEndpoint, jitoKeypairFile, jitoTipLamports, dynamicJitoTips, maxJitoTipLamports, jitoBundleSize, updatesPerJitoBundle, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+    handler: async function (argv) {
+        const { endpoint, keypairFile, shardId, computeUnitPriceMicroLamports, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, jitoEndpoint, jitoKeypairFile, jitoTipLamports, dynamicJitoTips, maxJitoTipLamports, jitoBundleSize, updatesPerJitoBundle, 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 wallet = new nodewallet_1.default(web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(fs_1.default.readFileSync(keypairFile, "ascii")))));
         const pythSolanaReceiver = new pyth_solana_receiver_1.PythSolanaReceiver({
             connection: new web3_js_1.Connection(endpoint, "processed"),
@@ -127,11 +133,11 @@ exports.default = {
         if (jitoTipLamports) {
             const jitoKeypair = web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(fs_1.default.readFileSync(jitoKeypairFile, "ascii"))));
             const jitoClient = (0, searcher_1.searcherClient)(jitoEndpoint, jitoKeypair);
-            solanaPricePusher = new solana_1.SolanaPricePusherJito(pythSolanaReceiver, priceServiceConnection, logger.child({ module: "SolanaPricePusherJito" }), shardId, jitoTipLamports, dynamicJitoTips, maxJitoTipLamports, jitoClient, jitoBundleSize, updatesPerJitoBundle);
+            solanaPricePusher = new solana_1.SolanaPricePusherJito(pythSolanaReceiver, hermesClient, logger.child({ module: "SolanaPricePusherJito" }), shardId, jitoTipLamports, dynamicJitoTips, maxJitoTipLamports, jitoClient, jitoBundleSize, updatesPerJitoBundle);
             (0, exports.onBundleResult)(jitoClient, logger.child({ module: "JitoClient" }));
         }
         else {
-            solanaPricePusher = new solana_1.SolanaPricePusher(pythSolanaReceiver, priceServiceConnection, logger.child({ module: "SolanaPricePusher" }), shardId, computeUnitPriceMicroLamports);
+            solanaPricePusher = new solana_1.SolanaPricePusher(pythSolanaReceiver, hermesClient, logger.child({ module: "SolanaPricePusher" }), shardId, computeUnitPriceMicroLamports);
         }
         const solanaPriceListener = new solana_1.SolanaPriceListener(pythSolanaReceiver, shardId, priceItems, logger.child({ module: "SolanaPriceListener" }), { pollingFrequency });
         const controller = new controller_1.Controller(priceConfigs, pythListener, solanaPriceListener, solanaPricePusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });

package/lib/solana/solana.d.ts

@@ -1,7 +1,7 @@
 import { PythSolanaReceiver } from "@pythnetwork/pyth-solana-receiver";
 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 { SearcherClient } from "jito-ts/dist/sdk/block-engine/searcher";
 import { Logger } from "pino";
 export declare class SolanaPriceListener extends ChainPriceListener {
@@ -17,16 +17,16 @@ export declare class SolanaPriceListener extends ChainPriceListener {
 }
 export declare class SolanaPricePusher implements IPricePusher {
     private pythSolanaReceiver;
-    private priceServiceConnection;
+    private hermesClient;
     private logger;
     private shardId;
     private computeUnitPriceMicroLamports;
-    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, logger: Logger, shardId: number, computeUnitPriceMicroLamports: number);
+    constructor(pythSolanaReceiver: PythSolanaReceiver, hermesClient: HermesClient, logger: Logger, shardId: number, computeUnitPriceMicroLamports: number);
     updatePriceFeed(priceIds: string[]): Promise<void>;
 }
 export declare class SolanaPricePusherJito implements IPricePusher {
     private pythSolanaReceiver;
-    private priceServiceConnection;
+    private hermesClient;
     private logger;
     private shardId;
     private defaultJitoTipLamports;
@@ -35,7 +35,7 @@ export declare class SolanaPricePusherJito implements IPricePusher {
     private searcherClient;
     private jitoBundleSize;
     private updatesPerJitoBundle;
-    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, logger: Logger, shardId: number, defaultJitoTipLamports: number, dynamicJitoTips: boolean, maxJitoTipLamports: number, searcherClient: SearcherClient, jitoBundleSize: number, updatesPerJitoBundle: number);
+    constructor(pythSolanaReceiver: PythSolanaReceiver, hermesClient: HermesClient, logger: Logger, shardId: number, defaultJitoTipLamports: number, dynamicJitoTips: boolean, maxJitoTipLamports: number, searcherClient: SearcherClient, jitoBundleSize: number, updatesPerJitoBundle: number);
     getRecentJitoTipLamports(): Promise<number | undefined>;
     private sleep;
     updatePriceFeed(priceIds: string[]): Promise<void>;

package/lib/solana/solana.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/solana/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAK3E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAK9B,qBAAa,mBAAoB,SAAQ,kBAAkB;IAEvD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,OAAO;IAEf,OAAO,CAAC,MAAM;gBAHN,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,MAAM,EACvB,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;YAOW,WAAW;IAuBnB,KAAK;IAOL,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA0B3E;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAElD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,6BAA6B;gBAJ7B,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,6BAA6B,EAAE,MAAM;IAGzC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA+CzD;AAED,qBAAa,qBAAsB,YAAW,YAAY;IAEtD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,oBAAoB;gBATpB,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAC9B,eAAe,EAAE,OAAO,EACxB,kBAAkB,EAAE,MAAM,EAC1B,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,MAAM,EACtB,oBAAoB,EAAE,MAAM;IAGhC,wBAAwB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAsB/C,KAAK;IAIb,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAqEzD"}
+{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/solana/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK1D,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAK9B,qBAAa,mBAAoB,SAAQ,kBAAkB;IAEvD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,OAAO;IAEf,OAAO,CAAC,MAAM;gBAHN,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,MAAM,EACvB,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;YAOW,WAAW;IAuBnB,KAAK;IAOL,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA0B3E;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAElD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,6BAA6B;gBAJ7B,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,6BAA6B,EAAE,MAAM;IAGzC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAmDzD;AAED,qBAAa,qBAAsB,YAAW,YAAY;IAEtD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,oBAAoB;gBATpB,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAC9B,eAAe,EAAE,OAAO,EACxB,kBAAkB,EAAE,MAAM,EAC1B,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,MAAM,EACtB,oBAAoB,EAAE,MAAM;IAGhC,wBAAwB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAsB/C,KAAK;IAIb,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAsEzD"}

package/lib/solana/solana.js

@@ -62,13 +62,13 @@ class SolanaPriceListener extends interface_1.ChainPriceListener {
 exports.SolanaPriceListener = SolanaPriceListener;
 class SolanaPricePusher {
     pythSolanaReceiver;
-    priceServiceConnection;
+    hermesClient;
     logger;
     shardId;
     computeUnitPriceMicroLamports;
-    constructor(pythSolanaReceiver, priceServiceConnection, logger, shardId, computeUnitPriceMicroLamports) {
+    constructor(pythSolanaReceiver, hermesClient, logger, shardId, computeUnitPriceMicroLamports) {
         this.pythSolanaReceiver = pythSolanaReceiver;
-        this.priceServiceConnection = priceServiceConnection;
+        this.hermesClient = hermesClient;
         this.logger = logger;
         this.shardId = shardId;
         this.computeUnitPriceMicroLamports = computeUnitPriceMicroLamports;
@@ -85,7 +85,10 @@ class SolanaPricePusher {
             .map((x) => x.element);
         let priceFeedUpdateData;
         try {
-            priceFeedUpdateData = await this.priceServiceConnection.getLatestVaas(shuffledPriceIds);
+            const response = await this.hermesClient.getLatestPriceUpdates(shuffledPriceIds, {
+                encoding: "base64",
+            });
+            priceFeedUpdateData = response.binary.data;
         }
         catch (err) {
             this.logger.error(err, "getPriceFeedsUpdateData failed:");
@@ -112,7 +115,7 @@ class SolanaPricePusher {
 exports.SolanaPricePusher = SolanaPricePusher;
 class SolanaPricePusherJito {
     pythSolanaReceiver;
-    priceServiceConnection;
+    hermesClient;
     logger;
     shardId;
     defaultJitoTipLamports;
@@ -121,9 +124,9 @@ class SolanaPricePusherJito {
     searcherClient;
     jitoBundleSize;
     updatesPerJitoBundle;
-    constructor(pythSolanaReceiver, priceServiceConnection, logger, shardId, defaultJitoTipLamports, dynamicJitoTips, maxJitoTipLamports, searcherClient, jitoBundleSize, updatesPerJitoBundle) {
+    constructor(pythSolanaReceiver, hermesClient, logger, shardId, defaultJitoTipLamports, dynamicJitoTips, maxJitoTipLamports, searcherClient, jitoBundleSize, updatesPerJitoBundle) {
         this.pythSolanaReceiver = pythSolanaReceiver;
-        this.priceServiceConnection = priceServiceConnection;
+        this.hermesClient = hermesClient;
         this.logger = logger;
         this.shardId = shardId;
         this.defaultJitoTipLamports = defaultJitoTipLamports;
@@ -160,7 +163,10 @@ class SolanaPricePusherJito {
         this.logger.info({ cappedJitoTip }, "using jito tip of");
         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");

package/lib/sui/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;