Add useful static

pyth-network · Feb 28, 2024 · 5926166 · 5926166
1 parent 4b0094a
commit 5926166
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/target_chains/solana/sdk/js/pyth_solana_receiver/package.json b/target_chains/solana/sdk/js/pyth_solana_receiver/package.json
@@ -17,7 +17,6 @@
     "access": "public"
   },
   "scripts": {
-    "test": "jest",
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\"",
     "lint": "eslint src/",

diff --git a/target_chains/solana/sdk/js/pyth_solana_receiver/src/PythSolanaReceiver.ts b/target_chains/solana/sdk/js/pyth_solana_receiver/src/PythSolanaReceiver.ts
@@ -82,22 +82,21 @@ export class PythSolanaReceiver {
     ) => Promise<InstructionWithEphemeralSigners[]>,
     priorityFeeConfig?: PriorityFeeConfig
   ): Promise<{ tx: VersionedTransaction; signers: Signer[] }[]> {
-    const builder = new TransactionBuilder(
-      this.wallet.publicKey,
-      this.connection
-    );
-
     const {
-      postInstructions: instructions,
+      postInstructions,
       priceFeedIdToPriceUpdateAccount: priceFeedIdToPriceUpdateAccount,
       cleanupInstructions,
     } = await this.buildPostPriceUpdateInstructions(priceUpdateDataArray);
-    builder.addInstructions(instructions);
-    builder.addInstructions(
-      await getInstructions(priceFeedIdToPriceUpdateAccount)
+    return TransactionBuilder.batchIntoVersionedTransactions(
+      this.wallet.publicKey,
+      this.connection,
+      [
+        ...postInstructions,
+        ...(await getInstructions(priceFeedIdToPriceUpdateAccount)),
+        ...cleanupInstructions,
+      ],
+      priorityFeeConfig ?? {}
     );
-    builder.addInstructions(cleanupInstructions);
-    return builder.getVersionedTransactions(priorityFeeConfig ?? {});
   }
 
   async withPartiallyVerifiedPriceUpdate(
@@ -107,21 +106,21 @@ export class PythSolanaReceiver {
     ) => Promise<InstructionWithEphemeralSigners[]>,
     priorityFeeConfig?: PriorityFeeConfig
   ): Promise<{ tx: VersionedTransaction; signers: Signer[] }[]> {
-    const builder = new TransactionBuilder(
-      this.wallet.publicKey,
-      this.connection
-    );
     const {
-      postInstructions: instructions,
+      postInstructions,
       priceFeedIdToPriceUpdateAccount,
       cleanupInstructions,
     } = await this.buildPostPriceUpdateAtomicInstructions(priceUpdateDataArray);
-    builder.addInstructions(instructions);
-    builder.addInstructions(
-      await getInstructions(priceFeedIdToPriceUpdateAccount)
+    return TransactionBuilder.batchIntoVersionedTransactions(
+      this.wallet.publicKey,
+      this.connection,
+      [
+        ...postInstructions,
+        ...(await getInstructions(priceFeedIdToPriceUpdateAccount)),
+        ...cleanupInstructions,
+      ],
+      priorityFeeConfig ?? {}
     );
-    builder.addInstructions(cleanupInstructions);
-    return builder.getVersionedTransactions(priorityFeeConfig ?? {});
   }
 
   async buildPostPriceUpdateAtomicInstructions(

diff --git a/target_chains/solana/sdk/js/pyth_solana_receiver/src/index.ts b/target_chains/solana/sdk/js/pyth_solana_receiver/src/index.ts
@@ -1 +1,2 @@
 export { PythSolanaReceiver } from "./PythSolanaReceiver";
+export { TransactionBuilder } from "@pythnetwork/solana-utils";
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export { PythSolanaReceiver } from "./PythSolanaReceiver";
		export { TransactionBuilder } from "@pythnetwork/solana-utils";