@pythnetwork/price-pusher 8.3.3 → 9.0.1

package/lib/solana/solana.js

@@ -62,16 +62,18 @@ class SolanaPriceListener extends interface_1.ChainPriceListener {
 exports.SolanaPriceListener = SolanaPriceListener;
 class SolanaPricePusher {
     pythSolanaReceiver;
-    priceServiceConnection;
+    hermesClient;
     logger;
     shardId;
     computeUnitPriceMicroLamports;
-    constructor(pythSolanaReceiver, priceServiceConnection, logger, shardId, computeUnitPriceMicroLamports) {
+    addressLookupTableAccount;
+    constructor(pythSolanaReceiver, hermesClient, logger, shardId, computeUnitPriceMicroLamports, addressLookupTableAccount) {
         this.pythSolanaReceiver = pythSolanaReceiver;
-        this.priceServiceConnection = priceServiceConnection;
+        this.hermesClient = hermesClient;
         this.logger = logger;
         this.shardId = shardId;
         this.computeUnitPriceMicroLamports = computeUnitPriceMicroLamports;
+        this.addressLookupTableAccount = addressLookupTableAccount;
     }
     async updatePriceFeed(priceIds) {
         if (priceIds.length === 0) {
@@ -85,7 +87,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:");
@@ -93,7 +98,7 @@ class SolanaPricePusher {
         }
         const transactionBuilder = this.pythSolanaReceiver.newTransactionBuilder({
             closeUpdateAccounts: true,
-        });
+        }, this.addressLookupTableAccount);
         await transactionBuilder.addUpdatePriceFeed(priceFeedUpdateData, this.shardId);
         const transactions = await transactionBuilder.buildVersionedTransactions({
             computeUnitPriceMicroLamports: this.computeUnitPriceMicroLamports,
@@ -112,7 +117,7 @@ class SolanaPricePusher {
 exports.SolanaPricePusher = SolanaPricePusher;
 class SolanaPricePusherJito {
     pythSolanaReceiver;
-    priceServiceConnection;
+    hermesClient;
     logger;
     shardId;
     defaultJitoTipLamports;
@@ -121,9 +126,10 @@ class SolanaPricePusherJito {
     searcherClient;
     jitoBundleSize;
     updatesPerJitoBundle;
-    constructor(pythSolanaReceiver, priceServiceConnection, logger, shardId, defaultJitoTipLamports, dynamicJitoTips, maxJitoTipLamports, searcherClient, jitoBundleSize, updatesPerJitoBundle) {
+    addressLookupTableAccount;
+    constructor(pythSolanaReceiver, hermesClient, logger, shardId, defaultJitoTipLamports, dynamicJitoTips, maxJitoTipLamports, searcherClient, jitoBundleSize, updatesPerJitoBundle, addressLookupTableAccount) {
         this.pythSolanaReceiver = pythSolanaReceiver;
-        this.priceServiceConnection = priceServiceConnection;
+        this.hermesClient = hermesClient;
         this.logger = logger;
         this.shardId = shardId;
         this.defaultJitoTipLamports = defaultJitoTipLamports;
@@ -132,6 +138,7 @@ class SolanaPricePusherJito {
         this.searcherClient = searcherClient;
         this.jitoBundleSize = jitoBundleSize;
         this.updatesPerJitoBundle = updatesPerJitoBundle;
+        this.addressLookupTableAccount = addressLookupTableAccount;
     }
     async getRecentJitoTipLamports() {
         try {
@@ -160,7 +167,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");
@@ -169,7 +179,7 @@ class SolanaPricePusherJito {
         for (let i = 0; i < priceIds.length; i += this.updatesPerJitoBundle) {
             const transactionBuilder = this.pythSolanaReceiver.newTransactionBuilder({
                 closeUpdateAccounts: true,
-            });
+            }, this.addressLookupTableAccount);
             await transactionBuilder.addUpdatePriceFeed(priceFeedUpdateData.map((x) => {
                 return (0, price_service_sdk_1.sliceAccumulatorUpdateData)(Buffer.from(x, "base64"), i, i + this.updatesPerJitoBundle).toString("base64");
             }), this.shardId);

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;

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

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/sui/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;kBAoBvB,OAAO;yBAOP,OAAO;6BAOP,OAAO;2BAMP,OAAO;8BAOP,OAAO;sBAMP,OAAO;yBAMP,OAAO;;oBAUiB,GAAG;;AAhEpC,wBAoJE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/sui/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;kBAqBvB,OAAO;yBAOP,OAAO;6BAOP,OAAO;2BAMP,OAAO;8BAOP,OAAO;sBAMP,OAAO;yBAMP,OAAO;;oBASiB,GAAG;;AA/DpC,wBAsJE"}

package/lib/sui/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,11 +35,12 @@ const controller_1 = require("../controller");
 const sui_1 = require("./sui");
 const ed25519_1 = require("@mysten/sui/keypairs/ed25519");
 const pino_1 = __importDefault(require("pino"));
+const utils_1 = require("../utils");
 exports.default = {
     command: "sui",
     describe: "Run price pusher for sui. Most of the arguments below are" +
         "network specific, so there's one set of values for mainnet and" +
-        "another for testnet. See config.sui..sample.json for the " +
+        " another for testnet. See config.sui.mainnet.sample.json for the " +
         "appropriate values for your network. ",
     builder: {
         endpoint: {
@@ -91,28 +92,30 @@ exports.default = {
         ...options.pollingFrequency,
         ...options.pushingFrequency,
         ...options.logLevel,
-        ...options.priceServiceConnectionLogLevel,
         ...options.controllerLogLevel,
     },
     handler: async function (argv) {
-        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pushingFrequency, pollingFrequency, pythStateId, wormholeStateId, numGasObjects, ignoreGasObjects, gasBudget, accountIndex, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pushingFrequency, pollingFrequency, pythStateId, wormholeStateId, numGasObjects, ignoreGasObjects, gasBudget, accountIndex, 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 }),
-            priceFeedRequestConfig: {
-                binary: true,
-            },
-        });
+        const hermesClient = new hermes_client_1.HermesClient(priceServiceEndpoint);
         const mnemonic = fs_1.default.readFileSync(mnemonicFile, "utf-8").trim();
         const keypair = ed25519_1.Ed25519Keypair.deriveKeypair(mnemonic, `m/44'/784'/${accountIndex}'/0'/0'`);
         logger.info(`Pushing updates from wallet address: ${keypair
             .getPublicKey()
             .toSuiAddress()}`);
-        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 suiListener = new sui_1.SuiPriceListener(pythStateId, wormholeStateId, endpoint, priceItems, logger.child({ module: "SuiPriceListener" }), { pollingFrequency });
-        const suiPusher = await sui_1.SuiPricePusher.createWithAutomaticGasPool(priceServiceConnection, logger.child({ module: "SuiPricePusher" }), pythStateId, wormholeStateId, endpoint, keypair, gasBudget, numGasObjects, ignoreGasObjects);
+        const suiPusher = await sui_1.SuiPricePusher.createWithAutomaticGasPool(hermesClient, logger.child({ module: "SuiPricePusher" }), pythStateId, wormholeStateId, endpoint, keypair, gasBudget, numGasObjects, ignoreGasObjects);
         const controller = new controller_1.Controller(priceConfigs, pythListener, suiListener, suiPusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },

package/lib/sui/sui.d.ts

@@ -1,10 +1,10 @@
 import { ChainPriceListener, IPricePusher, PriceInfo, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
-import { PriceServiceConnection } from "@pythnetwork/price-service-client";
 import { SuiPythClient } from "@pythnetwork/pyth-sui-js";
 import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519";
 import { SuiClient, SuiObjectRef } from "@mysten/sui/client";
 import { Logger } from "pino";
+import { HermesClient } from "@pythnetwork/hermes-client";
 type ObjectId = string;
 export declare class SuiPriceListener extends ChainPriceListener {
     private pythClient;
@@ -33,11 +33,11 @@ export declare class SuiPricePusher implements IPricePusher {
     private readonly signer;
     private readonly provider;
     private logger;
-    private priceServiceConnection;
+    private hermesClient;
     private gasBudget;
     private gasPool;
     private pythClient;
-    constructor(signer: Ed25519Keypair, provider: SuiClient, logger: Logger, priceServiceConnection: PriceServiceConnection, gasBudget: number, gasPool: SuiObjectRef[], pythClient: SuiPythClient);
+    constructor(signer: Ed25519Keypair, provider: SuiClient, logger: Logger, hermesClient: HermesClient, gasBudget: number, gasPool: SuiObjectRef[], pythClient: SuiPythClient);
     /**
      * getPackageId returns the latest package id that the object belongs to. Use this to
      * fetch the latest package id for a given object id and handle package upgrades automatically.
@@ -50,7 +50,7 @@ export declare class SuiPricePusher implements IPricePusher {
      * Create a price pusher with a pool of `numGasObjects` gas coins that will be used to send transactions.
      * The gas coins of the wallet for the provided keypair will be merged and then evenly split into `numGasObjects`.
      */
-    static createWithAutomaticGasPool(priceServiceConnection: PriceServiceConnection, logger: Logger, pythStateId: string, wormholeStateId: string, endpoint: string, keypair: Ed25519Keypair, gasBudget: number, numGasObjects: number, ignoreGasObjects: string[]): Promise<SuiPricePusher>;
+    static createWithAutomaticGasPool(hermesClient: HermesClient, logger: Logger, pythStateId: string, wormholeStateId: string, endpoint: string, keypair: Ed25519Keypair, gasBudget: number, numGasObjects: number, ignoreGasObjects: string[]): Promise<SuiPricePusher>;
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
     /** Send every transaction in txs in parallel, returning when all transactions have completed. */
     private sendTransactionBlocks;

package/lib/sui/sui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sui.d.ts","sourceRoot":"","sources":["../../src/sui/sui.ts"],"names":[],"mappings":"AAAA,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;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAkB,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAO9B,KAAK,QAAQ,GAAG,MAAM,CAAC;AAGvB,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,MAAM,CAAS;gBAGrB,WAAW,EAAE,QAAQ,EACrB,eAAe,EAAE,QAAQ,EACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAYG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA6C3E;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,YAAW,YAAY;IAE/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;gBAND,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,SAAS,EAC5B,MAAM,EAAE,MAAM,EACd,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,YAAY,EAAE,EACvB,UAAU,EAAE,aAAa;IAGnC;;;;;;OAMG;WACU,YAAY,CACvB,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,QAAQ,CAAC;IAyBpB;;;OAGG;WACU,0BAA0B,CACrC,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EAAE,GACzB,OAAO,CAAC,cAAc,CAAC;IAkCpB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;IA0ChB,iGAAiG;YACnF,qBAAqB;IAInC,sEAAsE;YACxD,oBAAoB;mBAyDb,iBAAiB;mBAsDjB,yBAAyB;mBAgBzB,cAAc;mBAiCd,mBAAmB;mBAwCnB,oBAAoB;CAiE1C"}
+{"version":3,"file":"sui.d.ts","sourceRoot":"","sources":["../../src/sui/sui.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAkB,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM1D,KAAK,QAAQ,GAAG,MAAM,CAAC;AAGvB,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,MAAM,CAAS;gBAGrB,WAAW,EAAE,QAAQ,EACrB,eAAe,EAAE,QAAQ,EACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAYG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA6C3E;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,YAAW,YAAY;IAE/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;gBAND,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,SAAS,EAC5B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,YAAY,EAAE,EACvB,UAAU,EAAE,aAAa;IAGnC;;;;;;OAMG;WACU,YAAY,CACvB,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,QAAQ,CAAC;IAyBpB;;;OAGG;WACU,0BAA0B,CACrC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EAAE,GACzB,OAAO,CAAC,cAAc,CAAC;IAkCpB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;IA6ChB,iGAAiG;YACnF,qBAAqB;IAInC,sEAAsE;YACxD,oBAAoB;mBAyDb,iBAAiB;mBAsDjB,yBAAyB;mBAgBzB,cAAc;mBAiCd,mBAAmB;mBAwCnB,oBAAoB;CAiE1C"}

package/lib/sui/sui.js

@@ -73,15 +73,15 @@ class SuiPricePusher {
     signer;
     provider;
     logger;
-    priceServiceConnection;
+    hermesClient;
     gasBudget;
     gasPool;
     pythClient;
-    constructor(signer, provider, logger, priceServiceConnection, gasBudget, gasPool, pythClient) {
+    constructor(signer, provider, logger, hermesClient, gasBudget, gasPool, pythClient) {
         this.signer = signer;
         this.provider = provider;
         this.logger = logger;
-        this.priceServiceConnection = priceServiceConnection;
+        this.hermesClient = hermesClient;
         this.gasBudget = gasBudget;
         this.gasPool = gasPool;
         this.pythClient = pythClient;
@@ -118,14 +118,14 @@ class SuiPricePusher {
      * Create a price pusher with a pool of `numGasObjects` gas coins that will be used to send transactions.
      * The gas coins of the wallet for the provided keypair will be merged and then evenly split into `numGasObjects`.
      */
-    static async createWithAutomaticGasPool(priceServiceConnection, logger, pythStateId, wormholeStateId, endpoint, keypair, gasBudget, numGasObjects, ignoreGasObjects) {
+    static async createWithAutomaticGasPool(hermesClient, logger, pythStateId, wormholeStateId, endpoint, keypair, gasBudget, numGasObjects, ignoreGasObjects) {
         if (numGasObjects > MAX_NUM_OBJECTS_IN_ARGUMENT) {
             throw new Error(`numGasObjects cannot be greater than ${MAX_NUM_OBJECTS_IN_ARGUMENT} until we implement split chunking`);
         }
         const provider = new client_1.SuiClient({ url: endpoint });
         const gasPool = await SuiPricePusher.initializeGasPool(keypair, provider, numGasObjects, ignoreGasObjects, logger);
         const pythClient = new pyth_sui_js_1.SuiPythClient(provider, pythStateId, wormholeStateId);
-        return new SuiPricePusher(keypair, provider, logger, priceServiceConnection, gasBudget, gasPool, pythClient);
+        return new SuiPricePusher(keypair, provider, logger, hermesClient, gasBudget, gasPool, pythClient);
     }
     async updatePriceFeed(priceIds, pubTimesToPush) {
         if (priceIds.length === 0) {
@@ -141,11 +141,13 @@ class SuiPricePusher {
         const priceIdChunks = chunkArray(priceIds, 3);
         const txBlocks = [];
         await Promise.all(priceIdChunks.map(async (priceIdChunk) => {
-            const vaas = await this.priceServiceConnection.getLatestVaas(priceIdChunk);
-            if (vaas.length !== 1) {
-                throw new Error(`Expected a single VAA for all priceIds ${priceIdChunk} but received ${vaas.length} VAAs: ${vaas}`);
+            const response = await this.hermesClient.getLatestPriceUpdates(priceIdChunk, {
+                encoding: "base64",
+            });
+            if (response.binary.data.length !== 1) {
+                throw new Error(`Expected a single VAA for all priceIds ${priceIdChunk} but received ${response.binary.data.length} VAAs: ${response.binary.data}`);
             }
-            const vaa = vaas[0];
+            const vaa = response.binary.data[0];
             const tx = new transactions_1.Transaction();
             await this.pythClient.updatePriceFeeds(tx, [Buffer.from(vaa, "base64")], priceIdChunk);
             txBlocks.push(tx);

package/lib/ton/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/ton/command.d.ts.map

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

package/lib/ton/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 pyth_price_listener_1 = require("../pyth-price-listener");
 const ton_1 = require("./ton");
 const controller_1 = require("../controller");
 const ton_2 = require("@ton/ton");
 const fs_1 = __importDefault(require("fs"));
 const pino_1 = __importDefault(require("pino"));
+const hermes_client_1 = require("@pythnetwork/hermes-client");
+const utils_1 = require("../utils");
 exports.default = {
     command: "ton",
     describe: "run price pusher for TON",
@@ -59,24 +60,29 @@ 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 client = new ton_2.TonClient({ endpoint });
         const privateKey = fs_1.default.readFileSync(privateKeyFile, "utf8").trim();
         const contractAddress = ton_2.Address.parse(pythContractAddress);
         const provider = client.provider(contractAddress);
         const tonPriceListener = new ton_1.TonPriceListener(provider, contractAddress, priceItems, logger.child({ module: "TonPriceListener" }), { pollingFrequency });
-        const tonPricePusher = new ton_1.TonPricePusher(client, privateKey, contractAddress, priceServiceConnection, logger.child({ module: "TonPricePusher" }));
+        const tonPricePusher = new ton_1.TonPricePusher(client, privateKey, contractAddress, hermesClient, logger.child({ module: "TonPricePusher" }));
         const controller = new controller_1.Controller(priceConfigs, pythListener, tonPriceListener, tonPricePusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         await controller.start();
     },

package/lib/ton/ton.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";
@@ -17,11 +17,11 @@ export declare class TonPricePusher implements IPricePusher {
     private client;
     private privateKey;
     private contractAddress;
-    private priceServiceConnection;
+    private hermesClient;
     private logger;
     private contract;
     private sender;
-    constructor(client: TonClient, privateKey: string, contractAddress: Address, priceServiceConnection: PriceServiceConnection, logger: Logger);
+    constructor(client: TonClient, privateKey: string, contractAddress: Address, hermesClient: HermesClient, logger: Logger);
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
 }
 //# sourceMappingURL=ton.d.ts.map

package/lib/ton/ton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ton.d.ts","sourceRoot":"","sources":["../../src/ton/ton.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,EACL,OAAO,EACP,gBAAgB,EAGhB,SAAS,EAEV,MAAM,UAAU,CAAC;AAOlB,qBAAa,gBAAiB,SAAQ,kBAAkB;IAIpD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,eAAe;IAEvB,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,QAAQ,CAA+B;gBAGrC,QAAQ,EAAE,gBAAgB,EAC1B,eAAe,EAAE,OAAO,EAChC,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAQG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAqB3E;AAED,qBAAa,cAAe,YAAW,YAAY;IAK/C,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IARhB,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,MAAM,CAAS;gBAGb,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,OAAO,EACxB,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM;IAclB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAmCjB"}
+{"version":3,"file":"ton.d.ts","sourceRoot":"","sources":["../../src/ton/ton.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,EACL,OAAO,EACP,gBAAgB,EAGhB,SAAS,EAEV,MAAM,UAAU,CAAC;AAOlB,qBAAa,gBAAiB,SAAQ,kBAAkB;IAIpD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,eAAe;IAEvB,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,QAAQ,CAA+B;gBAGrC,QAAQ,EAAE,gBAAgB,EAC1B,eAAe,EAAE,OAAO,EAChC,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAQG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAqB3E;AAED,qBAAa,cAAe,YAAW,YAAY;IAK/C,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IARhB,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,MAAM,CAAS;gBAGb,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,OAAO,EACxB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM;IAclB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAoCjB"}

package/lib/ton/ton.js

@@ -40,15 +40,15 @@ class TonPricePusher {
     client;
     privateKey;
     contractAddress;
-    priceServiceConnection;
+    hermesClient;
     logger;
     contract;
     sender;
-    constructor(client, privateKey, contractAddress, priceServiceConnection, logger) {
+    constructor(client, privateKey, contractAddress, hermesClient, logger) {
         this.client = client;
         this.privateKey = privateKey;
         this.contractAddress = contractAddress;
-        this.priceServiceConnection = priceServiceConnection;
+        this.hermesClient = hermesClient;
         this.logger = logger;
         this.contract = this.client
             .provider(this.contractAddress)
@@ -69,7 +69,10 @@ class TonPricePusher {
         }
         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/utils.d.ts

@@ -1,4 +1,5 @@
-import { HexString } from "@pythnetwork/price-service-client";
+import { HermesClient, HexString } from "@pythnetwork/hermes-client";
+import { PriceItem } from "./interface";
 export type PctNumber = number;
 export type DurationInSeconds = number;
 export declare const txSpeeds: readonly ["slow", "standard", "fast"];
@@ -11,4 +12,8 @@ export declare const addLeading0x: (id: HexString) => `0x${string}`;
 export declare function isWsEndpoint(endpoint: string): boolean;
 export declare function verifyValidOption<options extends Readonly<Array<any>>, validOption extends options[number]>(option: any, validOptions: options): validOption;
 export declare const assertDefined: <T>(value: T | undefined) => T;
+export declare function filterInvalidPriceItems(hermesClient: HermesClient, priceItems: PriceItem[]): Promise<{
+    existingPriceItems: PriceItem[];
+    invalidPriceItems: PriceItem[];
+}>;
 //# sourceMappingURL=utils.d.ts.map

package/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAC/B,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACvC,eAAO,MAAM,QAAQ,uCAAwC,CAAC;AAC9D,MAAM,MAAM,OAAO,GAAG,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC9C,eAAO,MAAM,iBAAiB,gBAAiB,CAAC;AAChD,MAAM,MAAM,gBAAgB,GAAG,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;AAEhE,wBAAsB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErD;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,SAAS,GAAG,SAAS,CAKxD;AAED,eAAO,MAAM,YAAY,OAAQ,SAAS,KAAG,KAAK,MAAM,EACrB,CAAC;AAKpC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAStD;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,SAAS,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACpC,WAAW,SAAS,OAAO,CAAC,MAAM,CAAC,EACnC,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,GAEf,WAAW,CAK/B;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,CAAC,GAAG,SAAS,KAAG,CAMvD,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAC/B,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACvC,eAAO,MAAM,QAAQ,uCAAwC,CAAC;AAC9D,MAAM,MAAM,OAAO,GAAG,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC9C,eAAO,MAAM,iBAAiB,gBAAiB,CAAC;AAChD,MAAM,MAAM,gBAAgB,GAAG,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;AAEhE,wBAAsB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErD;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,SAAS,GAAG,SAAS,CAKxD;AAED,eAAO,MAAM,YAAY,OAAQ,SAAS,KAAG,KAAK,MAAM,EACrB,CAAC;AAKpC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAStD;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,SAAS,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACpC,WAAW,SAAS,OAAO,CAAC,MAAM,CAAC,EACnC,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,GAEf,WAAW,CAK/B;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,CAAC,GAAG,SAAS,KAAG,CAMvD,CAAC;AAEF,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC;IACT,kBAAkB,EAAE,SAAS,EAAE,CAAC;IAChC,iBAAiB,EAAE,SAAS,EAAE,CAAC;CAChC,CAAC,CAqBD"}

package/lib/utils.js

@@ -5,6 +5,7 @@ exports.sleep = sleep;
 exports.removeLeading0x = removeLeading0x;
 exports.isWsEndpoint = isWsEndpoint;
 exports.verifyValidOption = verifyValidOption;
+exports.filterInvalidPriceItems = filterInvalidPriceItems;
 exports.txSpeeds = ["slow", "standard", "fast"];
 exports.customGasChainIds = [137];
 async function sleep(ms) {
@@ -43,3 +44,18 @@ const assertDefined = (value) => {
     }
 };
 exports.assertDefined = assertDefined;
+async function filterInvalidPriceItems(hermesClient, priceItems) {
+    const priceMetadata = await hermesClient.getPriceFeeds();
+    const allPriceIds = priceMetadata.map((priceMetadata) => priceMetadata.id);
+    // Filter out invalid price ids
+    const { existingPriceItems, invalidPriceItems } = priceItems.reduce((acc, item) => {
+        if (allPriceIds.includes(item.id)) {
+            acc.existingPriceItems.push(item);
+        }
+        else {
+            acc.invalidPriceItems.push(item);
+        }
+        return acc;
+    }, { existingPriceItems: [], invalidPriceItems: [] });
+    return { existingPriceItems, invalidPriceItems };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "8.3.3",
+  "version": "9.0.1",
   "description": "Pyth Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
@@ -24,7 +24,6 @@
     "format": "prettier --write \"src/**/*.ts\"",
     "test:lint": "eslint src/",
     "start": "node lib/index.js",
-    "test": "jest",
     "dev": "ts-node src/index.ts",
     "prepublishOnly": "pnpm run build && pnpm run test:lint",
     "preversion": "pnpm run test:lint",
@@ -61,14 +60,14 @@
     "@injectivelabs/networks": "^1.14.6",
     "@injectivelabs/sdk-ts": "1.10.72",
     "@mysten/sui": "^1.3.0",
-    "@pythnetwork/price-service-client": "1.9.0",
+    "@pythnetwork/hermes-client": "^1.3.1",
     "@pythnetwork/price-service-sdk": "^1.8.0",
     "@pythnetwork/pyth-fuel-js": "1.0.7",
     "@pythnetwork/pyth-sdk-solidity": "4.0.0",
-    "@pythnetwork/pyth-solana-receiver": "0.9.1",
+    "@pythnetwork/pyth-solana-receiver": "0.10.0",
     "@pythnetwork/pyth-sui-js": "2.1.0",
     "@pythnetwork/pyth-ton-js": "0.1.2",
-    "@pythnetwork/solana-utils": "0.4.3",
+    "@pythnetwork/solana-utils": "0.4.4",
     "@solana/web3.js": "^1.93.0",
     "@ton/crypto": "^3.3.0",
     "@ton/ton": "^15.1.0",
@@ -83,5 +82,5 @@
     "yaml": "^2.1.1",
     "yargs": "^17.5.1"
   },
-  "gitHead": "707437af791b9b111f976eb45b958639f90a2e20"
+  "gitHead": "4bd2adacc4d30b0899492026c7071d5d5007bb3b"
 }