feat(price_pusher): use retry send transaction logic in pusher (#1438)

* Checkpoint

* Nits

* Nits

* fix: type

* Bump pusher version

Author: guibescos

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "6.4.2",
+  "version": "6.4.3",
   "description": "Pyth Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",

price_pusher/package.json

@@ -7,6 +7,7 @@ import {
 } from "../interface";
 import { DurationInSeconds } from "../utils";
 import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { sendTransactions } from "@pythnetwork/solana-utils";
 
 export class SolanaPriceListener extends ChainPriceListener {
   constructor(
@@ -54,13 +55,19 @@ export class SolanaPricePusher implements IPricePusher {
     private pythSolanaReceiver: PythSolanaReceiver,
     private priceServiceConnection: PriceServiceConnection,
     private shardId: number,
-    private computeUnitPriceMicroLamports: number
+    private computeUnitPriceMicroLamports: number,
+    private alreadySending: boolean = false
   ) {}
 
   async updatePriceFeed(
     priceIds: string[],
     pubTimesToPush: number[]
   ): Promise<void> {
+    if (this.alreadySending) {
+      console.log(new Date(), "updatePriceFeed already in progress");
+      return;
+    }
+    this.alreadySending = true;
     if (priceIds.length === 0) {
       return;
     }
@@ -83,16 +90,22 @@ export class SolanaPricePusher implements IPricePusher {
       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 sendTransactions(
+        transactions,
+        this.pythSolanaReceiver.connection,
+        this.pythSolanaReceiver.wallet
       );
       console.log(new Date(), "updatePriceFeed successful");
+      this.alreadySending = false;
     } catch (e: any) {
       console.error(new Date(), "updatePriceFeed failed", e);
+      this.alreadySending = false;
       return;
     }
   }

price_pusher/src/solana/solana.ts

@@ -28,11 +28,13 @@ import {
   parsePriceFeedMessage,
 } from "@pythnetwork/price-service-sdk";
 import {
+  INIT_ENCODED_VAA_COMPUTE_BUDGET,
   POST_UPDATE_ATOMIC_COMPUTE_BUDGET,
   POST_UPDATE_COMPUTE_BUDGET,
+  UPDATE_PRICE_FEED_COMPUTE_BUDGET,
   VERIFY_ENCODED_VAA_COMPUTE_BUDGET,
 } from "./compute_budget";
-import { Wallet } from "@coral-xyz/anchor/dist/cjs/provider";
+import { Wallet } from "@coral-xyz/anchor";
 import {
   buildEncodedVaaCreateInstruction,
   buildWriteEncodedVaaWithSplitInstructions,
@@ -464,6 +466,7 @@ export class PythSolanaReceiver {
         })
         .instruction(),
       signers: [],
+      computeUnits: INIT_ENCODED_VAA_COMPUTE_BUDGET,
     });
 
     postInstructions.push(
@@ -634,7 +637,7 @@ export class PythSolanaReceiver {
             })
             .instruction(),
           signers: [],
-          computeUnits: POST_UPDATE_COMPUTE_BUDGET,
+          computeUnits: UPDATE_PRICE_FEED_COMPUTE_BUDGET,
         });
 
         priceFeedIdToPriceUpdateAccount[

target_chains/solana/sdk/js/pyth_solana_receiver/src/PythSolanaReceiver.ts

@@ -10,3 +10,15 @@ export const POST_UPDATE_ATOMIC_COMPUTE_BUDGET = 170000;
  * A hard-coded budget for the compute units required for the `postUpdate` instruction in the Pyth Solana Receiver program.
  */
 export const POST_UPDATE_COMPUTE_BUDGET = 35000;
+/**
+ * A hard-coded budget for the compute units required for the `updatePriceFeed` instruction in the Pyth Push Oracle program.
+ */
+export const UPDATE_PRICE_FEED_COMPUTE_BUDGET = 190000;
+/**
+ * A hard-coded budget for the compute units required for the `initEncodedVaa` instruction in the Wormhole program.
+ */
+export const INIT_ENCODED_VAA_COMPUTE_BUDGET = 3000;
+/**
+ * A hard-coded budget for the compute units required for the `writeEncodedVaa` instruction in the Wormhole program.
+ */
+export const WRITE_ENCODED_VAA_COMPUTE_BUDGET = 3000;

target_chains/solana/sdk/js/pyth_solana_receiver/src/compute_budget.ts

@@ -2,6 +2,7 @@ import { Keypair, PublicKey } from "@solana/web3.js";
 import { WormholeCoreBridgeSolana } from "./idl/wormhole_core_bridge_solana";
 import { Program } from "@coral-xyz/anchor";
 import { InstructionWithEphemeralSigners } from "@pythnetwork/solana-utils";
+import { WRITE_ENCODED_VAA_COMPUTE_BUDGET } from "./compute_budget";
 
 /**
  * Get the index of the guardian set that signed a VAA
@@ -111,6 +112,7 @@ export async function buildWriteEncodedVaaWithSplitInstructions(
         })
         .instruction(),
       signers: [],
+      computeUnits: WRITE_ENCODED_VAA_COMPUTE_BUDGET,
     },
     {
       instruction: await wormhole.methods
@@ -123,6 +125,7 @@ export async function buildWriteEncodedVaaWithSplitInstructions(
         })
         .instruction(),
       signers: [],
+      computeUnits: WRITE_ENCODED_VAA_COMPUTE_BUDGET,
     },
   ];
 }

target_chains/solana/sdk/js/pyth_solana_receiver/src/vaa.ts

@@ -378,7 +378,7 @@ export async function sendTransactions(
   const signatures: string[] = [];
 
   // Signing logic for versioned transactions is different from legacy transactions
-  for (const transaction of transactions) {
+  for (const [index, transaction] of transactions.entries()) {
     const signers = transaction.signers;
     let tx = transaction.tx;
 
@@ -439,7 +439,11 @@ export async function sendTransactions(
           break;
         }
         console.log(
-          "Retrying transaction: ",
+          "Retrying transaction ",
+          index,
+          " of ",
+          transactions.length - 1,
+          " with signature: ",
           txSignature,
           " Retry count: ",
           retryCount