fix: add configurable treasuryId, set tighter vaa split, improve examples

Author: tejasbadadare

target_chains/solana/sdk/js/pyth_solana_receiver/examples/post_price_update.ts

@@ -26,7 +26,18 @@ async function main() {
     `Sending transactions from account: ${keypair.publicKey.toBase58()}`
   );
   const wallet = new Wallet(keypair);
-  const pythSolanaReceiver = new PythSolanaReceiver({ connection, wallet });
+  // Optionally use an account lookup table to reduce tx sizes.
+  const addressLookupTableAccount = new PublicKey(
+    "5DNCErWQFBdvCxWQXaC1mrEFsvL3ftrzZ2gVZWNybaSX"
+  );
+  // Use a stable treasury ID of 0, since its address is indexed in the address lookup table.
+  // This is a tx size optimization and is optional. If not provided, a random treasury account will be used.
+  const treasuryId = 1;
+  const pythSolanaReceiver = new PythSolanaReceiver({
+    connection,
+    wallet,
+    treasuryId,
+  });
 
   // Get the price update from hermes
   const priceUpdateData = await getPriceUpdateData();
@@ -35,9 +46,15 @@ async function main() {
   // If closeUpdateAccounts = true, the builder will automatically generate instructions to close the ephemeral price update accounts
   // at the end of the transaction. Closing the accounts will reclaim their rent.
   // The example is using closeUpdateAccounts = false so you can easily look up the price update account in an explorer.
-  const transactionBuilder = pythSolanaReceiver.newTransactionBuilder({
-    closeUpdateAccounts: false,
-  });
+  const lookupTableAccount =
+    (await connection.getAddressLookupTable(addressLookupTableAccount)).value ??
+    undefined;
+  const transactionBuilder = pythSolanaReceiver.newTransactionBuilder(
+    {
+      closeUpdateAccounts: false,
+    },
+    lookupTableAccount
+  );
   // Post the price updates to ephemeral accounts, one per price feed.
   await transactionBuilder.addPostPriceUpdates(priceUpdateData);
   console.log(

target_chains/solana/sdk/js/pyth_solana_receiver/examples/update_price_feed.ts

@@ -13,11 +13,6 @@ const ETH_PRICE_FEED_ID =
   "0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace";
 const PRICE_FEED_IDS = [SOL_PRICE_FEED_ID, ETH_PRICE_FEED_ID];
 
-// Optionally use an account lookup table to reduce tx sizes
-const addressLookupTableAccount = new PublicKey(
-  "5DNCErWQFBdvCxWQXaC1mrEFsvL3ftrzZ2gVZWNybaSX"
-);
-
 let keypairFile = "";
 if (process.env["SOLANA_KEYPAIR"]) {
   keypairFile = process.env["SOLANA_KEYPAIR"];
@@ -32,11 +27,23 @@ async function main() {
     `Sending transactions from account: ${keypair.publicKey.toBase58()}`
   );
   const wallet = new Wallet(keypair);
-  const pythSolanaReceiver = new PythSolanaReceiver({ connection, wallet });
+
+  // Optionally use an account lookup table to reduce tx sizes.
+  const addressLookupTableAccount = new PublicKey(
+    "5DNCErWQFBdvCxWQXaC1mrEFsvL3ftrzZ2gVZWNybaSX"
+  );
+  // Use a stable treasury ID of 0, since its address is indexed in the address lookup table.
+  // This is a tx size optimization and is optional. If not provided, a random treasury account will be used.
+  const treasuryId = 1;
+  const pythSolanaReceiver = new PythSolanaReceiver({
+    connection,
+    wallet,
+    treasuryId,
+  });
 
   // Get the price update from hermes
   const priceUpdateData = await getPriceUpdateData(PRICE_FEED_IDS);
-  // console.log(`Posting price update: ${priceUpdateData}`);
+  console.log(`Posting price update: ${priceUpdateData}`);
 
   // The shard indicates which set of price feed accounts you wish to update.
   const shardId = 1;

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

@@ -436,20 +436,29 @@ export class PythSolanaReceiver {
   readonly receiver: Program<PythSolanaReceiverProgram>;
   readonly wormhole: Program<WormholeCoreBridgeSolana>;
   readonly pushOracle: Program<PythPushOracle>;
-
+  readonly treasuryId?: number;
   constructor({
     connection,
     wallet,
     wormholeProgramId = DEFAULT_WORMHOLE_PROGRAM_ID,
     receiverProgramId = DEFAULT_RECEIVER_PROGRAM_ID,
     pushOracleProgramId = DEFAULT_PUSH_ORACLE_PROGRAM_ID,
+    treasuryId = undefined,
   }: {
     connection: Connection;
     wallet: Wallet;
     wormholeProgramId?: PublicKey;
     receiverProgramId?: PublicKey;
     pushOracleProgramId?: PublicKey;
+    // Optionally provide a treasuryId to always use a specific treasury account.
+    // This can be useful when using an ALT to reduce tx size.
+    // If not provided, treasury accounts will be randomly selected.
+    treasuryId?: number;
   }) {
+    if (treasuryId !== undefined && (treasuryId < 0 || treasuryId > 255)) {
+      throw new Error("treasuryId must be between 0 and 255");
+    }
+
     this.connection = connection;
     this.wallet = wallet;
     this.provider = new AnchorProvider(this.connection, this.wallet, {
@@ -470,16 +479,17 @@ export class PythSolanaReceiver {
       pushOracleProgramId,
       this.provider
     );
+    this.treasuryId = treasuryId;
   }
 
   /**
    * Get a new transaction builder to build transactions that interact with the Pyth Solana Receiver program and consume price updates
    */
   newTransactionBuilder(
     config: PythTransactionBuilderConfig,
-    address_lookup_account?: AddressLookupTableAccount
+    addressLookupAccount?: AddressLookupTableAccount
   ): PythTransactionBuilder {
-    return new PythTransactionBuilder(this, config, address_lookup_account);
+    return new PythTransactionBuilder(this, config, addressLookupAccount);
   }
 
   /**
@@ -504,7 +514,7 @@ export class PythSolanaReceiver {
     const priceFeedIdToPriceUpdateAccount: Record<string, PublicKey> = {};
     const closeInstructions: InstructionWithEphemeralSigners[] = [];
 
-    const treasuryId = DEFAULT_TREASURY_ID;
+    const treasuryId = this.treasuryId ?? getRandomTreasuryId();
 
     for (const priceUpdateData of priceUpdateDataArray) {
       const accumulatorUpdateData = parseAccumulatorUpdateData(
@@ -572,7 +582,7 @@ export class PythSolanaReceiver {
     const priceFeedIdToPriceUpdateAccount: Record<string, PublicKey> = {};
     const closeInstructions: InstructionWithEphemeralSigners[] = [];
 
-    const treasuryId = getRandomTreasuryId();
+    const treasuryId = this.treasuryId ?? getRandomTreasuryId();
 
     for (const priceUpdateData of priceUpdateDataArray) {
       const accumulatorUpdateData = parseAccumulatorUpdateData(
@@ -643,7 +653,7 @@ export class PythSolanaReceiver {
     const priceFeedIdToTwapUpdateAccount: Record<string, PublicKey> = {};
     const closeInstructions: InstructionWithEphemeralSigners[] = [];
 
-    const treasuryId = getRandomTreasuryId();
+    const treasuryId = this.treasuryId ?? getRandomTreasuryId();
 
     if (twapUpdateDataArray.length !== 2) {
       throw new Error(
@@ -737,7 +747,7 @@ export class PythSolanaReceiver {
     const priceFeedIdToPriceUpdateAccount: Record<string, PublicKey> = {};
     const closeInstructions: InstructionWithEphemeralSigners[] = [];
 
-    const treasuryId = DEFAULT_TREASURY_ID;
+    const treasuryId = this.treasuryId ?? getRandomTreasuryId();
 
     for (const priceUpdateData of priceUpdateDataArray) {
       const accumulatorUpdateData = parseAccumulatorUpdateData(

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

@@ -46,7 +46,7 @@ export const VAA_START = 46;
  * `initEncodedVaa` and `writeEncodedVaa` in a single Solana transaction, while using an address lookup table.
  * This way, the packing of the instructions to post an encoded vaa is more efficient.
  */
-export const VAA_SPLIT_INDEX = 700;
+export const VAA_SPLIT_INDEX = 721;
 
 /**
  * Trim the number of signatures of a VAA.