@pythnetwork/price-pusher 7.0.0 → 7.0.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Pyth Contributors.
+Copyright 2024 Pyth Data Association.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/solana/command.d.ts

@@ -21,6 +21,7 @@ declare const _default: {
         "jito-keypair-file": Options;
         "jito-tip-lamports": Options;
         "jito-bundle-size": Options;
+        "updates-per-jito-bundle": Options;
     };
     handler: (argv: any) => 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;;;;;;;;;;;;;;;;;;;;;;oBAwDH,GAAG;;AAtD9B,wBA2JE;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;AAgBhC,OAAO,EACL,cAAc,EAEf,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;oBA6DH,GAAG;;AA3D9B,wBAkKE;AAEF,eAAO,MAAM,cAAc,MAAO,cAAc,UAAU,MAAM,SAO/D,CAAC"}

package/lib/solana/command.js

@@ -84,6 +84,11 @@ exports.default = {
             type: "number",
             default: 2,
         },
+        "updates-per-jito-bundle": {
+            description: "Number of transactions in each bundle",
+            type: "number",
+            default: 6,
+        },
         ...options.priceConfigFile,
         ...options.priceServiceEndpoint,
         ...options.pythContractAddress,
@@ -94,7 +99,7 @@ exports.default = {
         ...options.controllerLogLevel,
     },
     handler: function (argv) {
-        const { endpoint, keypairFile, shardId, computeUnitPriceMicroLamports, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, jitoEndpoint, jitoKeypairFile, jitoTipLamports, jitoBundleSize, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+        const { endpoint, keypairFile, shardId, computeUnitPriceMicroLamports, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, jitoEndpoint, jitoKeypairFile, jitoTipLamports, jitoBundleSize, updatesPerJitoBundle, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
         const logger = (0, pino_1.default)({ level: logLevel });
         const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
         const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
@@ -112,7 +117,7 @@ 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, jitoClient, jitoBundleSize);
+            solanaPricePusher = new solana_1.SolanaPricePusherJito(pythSolanaReceiver, priceServiceConnection, logger.child({ module: "SolanaPricePusherJito" }), shardId, jitoTipLamports, jitoClient, jitoBundleSize, updatesPerJitoBundle);
             (0, exports.onBundleResult)(jitoClient, logger.child({ module: "JitoClient" }));
         }
         else {

package/lib/solana/solana.d.ts

@@ -32,7 +32,8 @@ export declare class SolanaPricePusherJito implements IPricePusher {
     private jitoTipLamports;
     private searcherClient;
     private jitoBundleSize;
-    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, logger: Logger, shardId: number, jitoTipLamports: number, searcherClient: SearcherClient, jitoBundleSize: number);
+    private updatesPerJitoBundle;
+    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, logger: Logger, shardId: number, jitoTipLamports: number, searcherClient: SearcherClient, jitoBundleSize: number, updatesPerJitoBundle: 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;AAK3E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,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;IAUnB,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,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,eAAe,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC;CAwCjB;AAID,qBAAa,qBAAsB,YAAW,YAAY;IAEtD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;gBANd,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,MAAM;IAG1B,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,eAAe,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC;CAuCjB"}
+{"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;AAE9B,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;IAUnB,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,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,eAAe,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC;CA+CjB;AAED,qBAAa,qBAAsB,YAAW,YAAY;IAEtD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,oBAAoB;gBAPpB,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,MAAM,EACtB,oBAAoB,EAAE,MAAM;IAGhC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,eAAe,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC;CAuCjB"}

package/lib/solana/solana.js

@@ -69,9 +69,15 @@ class SolanaPricePusher {
         if (priceIds.length === 0) {
             return;
         }
+        const shuffledPriceIds = priceIds
+            .map((x) => {
+            return { element: x, key: Math.random() };
+        })
+            .sort((a, b) => a.key - b.key)
+            .map((x) => x.element);
         let priceFeedUpdateData;
         try {
-            priceFeedUpdateData = await this.priceServiceConnection.getLatestVaas(priceIds);
+            priceFeedUpdateData = await this.priceServiceConnection.getLatestVaas(shuffledPriceIds);
         }
         catch (err) {
             this.logger.error(err, "getPriceFeedsUpdateData failed:");
@@ -96,7 +102,6 @@ class SolanaPricePusher {
     }
 }
 exports.SolanaPricePusher = SolanaPricePusher;
-const UPDATES_PER_JITO_BUNDLE = 7;
 class SolanaPricePusherJito {
     pythSolanaReceiver;
     priceServiceConnection;
@@ -105,7 +110,8 @@ class SolanaPricePusherJito {
     jitoTipLamports;
     searcherClient;
     jitoBundleSize;
-    constructor(pythSolanaReceiver, priceServiceConnection, logger, shardId, jitoTipLamports, searcherClient, jitoBundleSize) {
+    updatesPerJitoBundle;
+    constructor(pythSolanaReceiver, priceServiceConnection, logger, shardId, jitoTipLamports, searcherClient, jitoBundleSize, updatesPerJitoBundle) {
         this.pythSolanaReceiver = pythSolanaReceiver;
         this.priceServiceConnection = priceServiceConnection;
         this.logger = logger;
@@ -113,6 +119,7 @@ class SolanaPricePusherJito {
         this.jitoTipLamports = jitoTipLamports;
         this.searcherClient = searcherClient;
         this.jitoBundleSize = jitoBundleSize;
+        this.updatesPerJitoBundle = updatesPerJitoBundle;
     }
     async updatePriceFeed(priceIds, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -125,12 +132,12 @@ class SolanaPricePusherJito {
             this.logger.error(err, "getPriceFeedsUpdateData failed");
             return;
         }
-        for (let i = 0; i < priceIds.length; i += UPDATES_PER_JITO_BUNDLE) {
+        for (let i = 0; i < priceIds.length; i += this.updatesPerJitoBundle) {
             const transactionBuilder = this.pythSolanaReceiver.newTransactionBuilder({
                 closeUpdateAccounts: true,
             });
             await transactionBuilder.addUpdatePriceFeed(priceFeedUpdateData.map((x) => {
-                return (0, price_service_sdk_1.sliceAccumulatorUpdateData)(Buffer.from(x, "base64"), i, i + UPDATES_PER_JITO_BUNDLE).toString("base64");
+                return (0, price_service_sdk_1.sliceAccumulatorUpdateData)(Buffer.from(x, "base64"), i, i + this.updatesPerJitoBundle).toString("base64");
             }), this.shardId);
             const transactions = await transactionBuilder.buildVersionedTransactions({
                 jitoTipLamports: this.jitoTipLamports,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Pyth Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
@@ -62,7 +62,7 @@
     "@pythnetwork/pyth-sdk-solidity": "3.1.0",
     "@pythnetwork/pyth-solana-receiver": "0.8.0",
     "@pythnetwork/pyth-sui-js": "2.0.0",
-    "@pythnetwork/solana-utils": "0.4.1",
+    "@pythnetwork/solana-utils": "0.4.2",
     "@solana/web3.js": "^1.93.0",
     "@truffle/hdwallet-provider": "^2.1.3",
     "@types/pino": "^7.0.5",
@@ -77,5 +77,5 @@
     "yaml": "^2.1.1",
     "yargs": "^17.5.1"
   },
-  "gitHead": "05dc9c8e06b9643bb365db494e67cac843d7b90a"
+  "gitHead": "0db40907504579f2d8b6520fcbfb2e952c3ab170"
 }