@pythnetwork/price-pusher 6.4.2 → 6.5.0

package/README.md

@@ -150,7 +150,7 @@ npm run start -- near \
 docker run public.ecr.aws/pyth-network/xc-price-pusher:v<version> -- <above-arguments>
 ```
 
-[hermes]: https://github.com/pyth-network/pyth-crosschain/tree/main/hermes
+[hermes]: https://github.com/pyth-network/pyth-crosschain/tree/main/apps/hermes
 
 ### Command Line Arguments
 

package/lib/solana/command.d.ts

@@ -1,4 +1,5 @@
 import { Options } from "yargs";
+import { SearcherClient } from "jito-ts/dist/sdk/block-engine/searcher";
 declare const _default: {
     command: string;
     describe: string;
@@ -12,8 +13,13 @@ declare const _default: {
         "keypair-file": Options;
         "shard-id": Options;
         "compute-unit-price-micro-lamports": Options;
+        "jito-endpoint": Options;
+        "jito-keypair-file": Options;
+        "jito-tip-lamports": Options;
+        "jito-bundle-size": Options;
     };
     handler: (argv: any) => void;
 };
 export default _default;
+export declare const onBundleResult: (c: SearcherClient) => void;
 //# sourceMappingURL=command.d.ts.map

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;;;;;;;;;;;;;;;oBA2CL,GAAG;;AA9B9B,wBAqGE"}
+{"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;;;;;;;;;;;;;;;;;;;oBAqDrB,GAAG;;AAnD9B,wBAkJE;AAEF,eAAO,MAAM,cAAc,MAAO,cAAc,SAO/C,CAAC"}

package/lib/solana/command.js

@@ -26,6 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 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");
@@ -37,6 +38,7 @@ const nodewallet_1 = __importDefault(require("@coral-xyz/anchor/dist/cjs/nodewal
 const web3_js_1 = require("@solana/web3.js");
 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");
 exports.default = {
     command: "solana",
     describe: "run price pusher for solana",
@@ -61,6 +63,26 @@ exports.default = {
             type: "number",
             default: 50000,
         },
+        "jito-endpoint": {
+            description: "Jito endpoint",
+            type: "string",
+            optional: true,
+        },
+        "jito-keypair-file": {
+            description: "Path to the jito keypair file (need for grpc authentication)",
+            type: "string",
+            optional: true,
+        },
+        "jito-tip-lamports": {
+            description: "Lamports to tip the jito builder",
+            type: "number",
+            optional: true,
+        },
+        "jito-bundle-size": {
+            description: "Number of transactions in each bundle",
+            type: "number",
+            default: 2,
+        },
         ...options.priceConfigFile,
         ...options.priceServiceEndpoint,
         ...options.pythContractAddress,
@@ -68,7 +90,7 @@ exports.default = {
         ...options.pushingFrequency,
     },
     handler: function (argv) {
-        const { endpoint, keypairFile, shardId, computeUnitPriceMicroLamports, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, } = argv;
+        const { endpoint, keypairFile, shardId, computeUnitPriceMicroLamports, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, jitoEndpoint, jitoKeypairFile, jitoTipLamports, jitoBundleSize, } = argv;
         const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
         const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
             logger: {
@@ -88,9 +110,24 @@ exports.default = {
             wallet,
             pushOracleProgramId: new web3_js_2.PublicKey(pythContractAddress),
         });
-        const solanaPricePusher = new solana_1.SolanaPricePusher(pythSolanaReceiver, priceServiceConnection, shardId, computeUnitPriceMicroLamports);
+        let solanaPricePusher;
+        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, shardId, jitoTipLamports, jitoClient, jitoBundleSize);
+            (0, exports.onBundleResult)(jitoClient);
+        }
+        else {
+            solanaPricePusher = new solana_1.SolanaPricePusher(pythSolanaReceiver, priceServiceConnection, shardId, computeUnitPriceMicroLamports);
+        }
         const solanaPriceListener = new solana_1.SolanaPriceListener(pythSolanaReceiver, shardId, priceItems, { pollingFrequency });
         const controller = new controller_1.Controller(priceConfigs, pythListener, solanaPriceListener, solanaPricePusher, { pushingFrequency });
         controller.start();
     },
 };
+const onBundleResult = (c) => {
+    c.onBundleResult(() => undefined, (e) => {
+        console.log("Error in bundle result: ", e);
+    });
+};
+exports.onBundleResult = onBundleResult;

package/lib/solana/solana.d.ts

@@ -2,6 +2,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 { SearcherClient } from "jito-ts/dist/sdk/block-engine/searcher";
 export declare class SolanaPriceListener extends ChainPriceListener {
     private pythSolanaReceiver;
     private shardId;
@@ -15,7 +16,18 @@ export declare class SolanaPricePusher implements IPricePusher {
     private priceServiceConnection;
     private shardId;
     private computeUnitPriceMicroLamports;
-    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, shardId: number, computeUnitPriceMicroLamports: number);
+    private alreadySending;
+    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, shardId: number, computeUnitPriceMicroLamports: number, alreadySending?: boolean);
+    updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
+}
+export declare class SolanaPricePusherJito implements IPricePusher {
+    private pythSolanaReceiver;
+    private priceServiceConnection;
+    private shardId;
+    private jitoTipLamports;
+    private searcherClient;
+    private jitoBundleSize;
+    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, shardId: number, jitoTipLamports: number, searcherClient: SearcherClient, jitoBundleSize: number);
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
 }
 //# sourceMappingURL=solana.d.ts.map

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;AAE3E,qBAAa,mBAAoB,SAAQ,kBAAkB;IAEvD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,OAAO;gBADP,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,MAAM,EACvB,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA2B3E;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAElD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,6BAA6B;gBAH7B,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,MAAM,EACf,6BAA6B,EAAE,MAAM;IAGzC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAoCjB"}
+{"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,qBAAa,mBAAoB,SAAQ,kBAAkB;IAEvD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,OAAO;gBADP,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,MAAM,EACvB,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA2B3E;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAElD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,6BAA6B;IACrC,OAAO,CAAC,cAAc;gBAJd,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,MAAM,EACf,6BAA6B,EAAE,MAAM,EACrC,cAAc,GAAE,OAAe;IAGnC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CA+CjB;AAED,qBAAa,qBAAsB,YAAW,YAAY;IAEtD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;gBALd,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,MAAM;IAG1B,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAwDjB"}

package/lib/solana/solana.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaPricePusher = exports.SolanaPriceListener = void 0;
+exports.SolanaPricePusherJito = exports.SolanaPricePusher = exports.SolanaPriceListener = void 0;
 const interface_1 = require("../interface");
+const solana_utils_1 = require("@pythnetwork/solana-utils");
 class SolanaPriceListener extends interface_1.ChainPriceListener {
     pythSolanaReceiver;
     shardId;
@@ -38,13 +39,20 @@ class SolanaPricePusher {
     priceServiceConnection;
     shardId;
     computeUnitPriceMicroLamports;
-    constructor(pythSolanaReceiver, priceServiceConnection, shardId, computeUnitPriceMicroLamports) {
+    alreadySending;
+    constructor(pythSolanaReceiver, priceServiceConnection, shardId, computeUnitPriceMicroLamports, alreadySending = false) {
         this.pythSolanaReceiver = pythSolanaReceiver;
         this.priceServiceConnection = priceServiceConnection;
         this.shardId = shardId;
         this.computeUnitPriceMicroLamports = computeUnitPriceMicroLamports;
+        this.alreadySending = alreadySending;
     }
     async updatePriceFeed(priceIds, pubTimesToPush) {
+        if (this.alreadySending) {
+            console.log(new Date(), "updatePriceFeed already in progress");
+            return;
+        }
+        this.alreadySending = true;
         if (priceIds.length === 0) {
             return;
         }
@@ -60,16 +68,68 @@ class SolanaPricePusher {
             closeUpdateAccounts: true,
         });
         await transactionBuilder.addUpdatePriceFeed(priceFeedUpdateData, this.shardId);
+        const transactions = await transactionBuilder.buildVersionedTransactions({
+            computeUnitPriceMicroLamports: this.computeUnitPriceMicroLamports,
+            tightComputeBudget: true,
+        });
         try {
-            await this.pythSolanaReceiver.provider.sendAll(await transactionBuilder.buildVersionedTransactions({
-                computeUnitPriceMicroLamports: this.computeUnitPriceMicroLamports,
-            }), { skipPreflight: true });
+            await (0, solana_utils_1.sendTransactions)(transactions, this.pythSolanaReceiver.connection, this.pythSolanaReceiver.wallet);
             console.log(new Date(), "updatePriceFeed successful");
+            this.alreadySending = false;
         }
         catch (e) {
             console.error(new Date(), "updatePriceFeed failed", e);
+            this.alreadySending = false;
             return;
         }
     }
 }
 exports.SolanaPricePusher = SolanaPricePusher;
+class SolanaPricePusherJito {
+    pythSolanaReceiver;
+    priceServiceConnection;
+    shardId;
+    jitoTipLamports;
+    searcherClient;
+    jitoBundleSize;
+    constructor(pythSolanaReceiver, priceServiceConnection, shardId, jitoTipLamports, searcherClient, jitoBundleSize) {
+        this.pythSolanaReceiver = pythSolanaReceiver;
+        this.priceServiceConnection = priceServiceConnection;
+        this.shardId = shardId;
+        this.jitoTipLamports = jitoTipLamports;
+        this.searcherClient = searcherClient;
+        this.jitoBundleSize = jitoBundleSize;
+    }
+    async updatePriceFeed(priceIds, pubTimesToPush) {
+        let priceFeedUpdateData;
+        try {
+            priceFeedUpdateData = await this.priceServiceConnection.getLatestVaas(priceIds);
+        }
+        catch (e) {
+            console.error(new Date(), "getPriceFeedsUpdateData failed:", e);
+            return;
+        }
+        const transactionBuilder = this.pythSolanaReceiver.newTransactionBuilder({
+            closeUpdateAccounts: false,
+        });
+        await transactionBuilder.addUpdatePriceFeed(priceFeedUpdateData, this.shardId);
+        const transactions = await transactionBuilder.buildVersionedTransactions({
+            jitoTipLamports: this.jitoTipLamports,
+            tightComputeBudget: true,
+            jitoBundleSize: this.jitoBundleSize,
+        });
+        const firstSignature = await (0, solana_utils_1.sendTransactionsJito)(transactions.slice(0, this.jitoBundleSize), this.searcherClient, this.pythSolanaReceiver.wallet);
+        const blockhashResult = await this.pythSolanaReceiver.connection.getLatestBlockhashAndContext({
+            commitment: "confirmed",
+        });
+        await this.pythSolanaReceiver.connection.confirmTransaction({
+            signature: firstSignature,
+            blockhash: blockhashResult.value.blockhash,
+            lastValidBlockHeight: blockhashResult.value.lastValidBlockHeight,
+        }, "confirmed");
+        for (let i = this.jitoBundleSize; i < transactions.length; i += this.jitoBundleSize) {
+            await (0, solana_utils_1.sendTransactionsJito)(transactions.slice(i, i + this.jitoBundleSize), this.searcherClient, this.pythSolanaReceiver.wallet);
+        }
+    }
+}
+exports.SolanaPricePusherJito = SolanaPricePusherJito;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "6.4.2",
+  "version": "6.5.0",
   "description": "Pyth Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
@@ -59,6 +59,7 @@
     "@pythnetwork/pyth-sui-js": "*",
     "@truffle/hdwallet-provider": "^2.1.3",
     "aptos": "^1.8.5",
+    "jito-ts": "^3.0.1",
     "joi": "^17.6.0",
     "near-api-js": "^3.0.2",
     "web3": "^1.8.1",
@@ -66,5 +67,5 @@
     "yaml": "^2.1.1",
     "yargs": "^17.5.1"
   },
-  "gitHead": "62d189e3b5e3cdbbfba04c1ebd677b28f4a6f693"
+  "gitHead": "70c2c8ec4b5092729791f642493072565d953439"
 }