@symmetry-hq/temp-v3-sdk 0.0.39 → 0.0.40

package/dist/src/constants.d.ts

@@ -20,3 +20,4 @@ export declare const MAX_SUPPORTED_TOKENS_PER_BASKET: number;
 export declare const MAX_ORACLES_PER_TOKEN: number;
 export declare const MAX_EXTRA_DATA_PER_ORACLE: number;
 export declare const LUT_EXTEND_BATCH_SIZE = 20;
+export declare const UPDATE_TOKEN_PRICES_MAX_ACCOUNTS = 50;

package/dist/src/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LUT_EXTEND_BATCH_SIZE = exports.MAX_EXTRA_DATA_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = exports.MAX_SUPPORTED_TOKENS_PER_BASKET = exports.USDC_DECIMALS = exports.WSOL_DECIMALS = exports.HUNDRED_PERCENT_BPS = exports.X64 = exports.MAX_TRANSFER_TOKENS = exports.MAX_MANAGERS_PER_BASKET = exports.INTENT_TASK_DATA_SIZE = exports.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT = exports.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT = exports.MINTS = exports.RENT_SYSVAR_ID = exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = exports.METADATA_PROGRAM_ID = exports.BASKETS_V3_PROGRAM_ID = exports.PRIORITY_FEE = exports.COMPUTE_UNITS = void 0;
+exports.UPDATE_TOKEN_PRICES_MAX_ACCOUNTS = exports.LUT_EXTEND_BATCH_SIZE = exports.MAX_EXTRA_DATA_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = exports.MAX_SUPPORTED_TOKENS_PER_BASKET = exports.USDC_DECIMALS = exports.WSOL_DECIMALS = exports.HUNDRED_PERCENT_BPS = exports.X64 = exports.MAX_TRANSFER_TOKENS = exports.MAX_MANAGERS_PER_BASKET = exports.INTENT_TASK_DATA_SIZE = exports.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT = exports.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT = exports.MINTS = exports.RENT_SYSVAR_ID = exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = exports.METADATA_PROGRAM_ID = exports.BASKETS_V3_PROGRAM_ID = exports.PRIORITY_FEE = exports.COMPUTE_UNITS = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 exports.COMPUTE_UNITS = 1000000;
@@ -35,3 +35,4 @@ exports.MAX_SUPPORTED_TOKENS_PER_BASKET = 100;
 exports.MAX_ORACLES_PER_TOKEN = 4;
 exports.MAX_EXTRA_DATA_PER_ORACLE = 4;
 exports.LUT_EXTEND_BATCH_SIZE = 20;
+exports.UPDATE_TOKEN_PRICES_MAX_ACCOUNTS = 50;

package/dist/src/index.d.ts

@@ -131,6 +131,17 @@ export declare class SymmetryCore {
         basket: string;
         rebalance_intent: string;
     }): Promise<TxPayloadBatchSequence>;
+    /**
+     * Build update token prices transactions.
+     * For pyth oracle accounts, fetches feed IDs, builds vaa [create init encode], [write verify],
+     * [update feed], [close vaa] instructions. For all tokens, builds [update token prices] instructions.
+     * and returns TxPayloadBatchSequence ready for signAndSendTxPayloadBatchSequence.
+     * Batch layout:
+     *   batch 0: [ [vaa1CreateInitEncodeIxs], [vaa2CreateInitEncodeIxs], ... ]
+     *   batch 1: [ [vaa1WriteVerifyIxs], [vaa2WriteVerifyIxs], ... ]
+     *   batch 2: [ [updateFeed1], [updateFeed2], ... ]
+     *   batch 3: [ [updateTokenPrices], [...], [closeVaa1Ix, closeVaa2Ix, ...]]
+     */
     updateTokenPricesTx(params: {
         keeper: string;
         basket: string;

package/dist/src/index.js

@@ -37,10 +37,12 @@ const fraction_1 = require("./layouts/fraction");
 const intent_1 = require("./layouts/intents/intent");
 Object.defineProperty(exports, "TaskType", { enumerable: true, get: function () { return intent_1.TaskType; } });
 const rebalanceIntent_2 = require("./layouts/intents/rebalanceIntent");
+const oracle_1 = require("./layouts/oracle");
 const basket_1 = require("./states/basket");
 const config_1 = require("./states/config");
 const intent_2 = require("./states/intents/intent");
 const rebalanceIntent_3 = require("./states/intents/rebalanceIntent");
+const pythOracle_1 = require("./states/oracles/pythOracle");
 const txUtils_1 = require("./txUtils");
 class SymmetryCore {
     constructor(params) {
@@ -860,30 +862,47 @@ class SymmetryCore {
             return txPayloadBatchSequence;
         });
     }
+    /**
+     * Build update token prices transactions.
+     * For pyth oracle accounts, fetches feed IDs, builds vaa [create init encode], [write verify],
+     * [update feed], [close vaa] instructions. For all tokens, builds [update token prices] instructions.
+     * and returns TxPayloadBatchSequence ready for signAndSendTxPayloadBatchSequence.
+     * Batch layout:
+     *   batch 0: [ [vaa1CreateInitEncodeIxs], [vaa2CreateInitEncodeIxs], ... ]
+     *   batch 1: [ [vaa1WriteVerifyIxs], [vaa2WriteVerifyIxs], ... ]
+     *   batch 2: [ [updateFeed1], [updateFeed2], ... ]
+     *   batch 3: [ [updateTokenPrices], [...], [closeVaa1Ix, closeVaa2Ix, ...]]
+     */
     updateTokenPricesTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let keeper = new web3_js_1.PublicKey(params.keeper);
             let rebalanceIntent = new web3_js_1.PublicKey(params.rebalance_intent);
             let basketRebalanceIntent = (0, pda_1.getRebalanceIntentPda)(new web3_js_1.PublicKey(params.basket), new web3_js_1.PublicKey(params.basket));
             let basket = yield this.fetchBasket(params.basket);
-            let ixs = [];
-            let batchSize = 7;
-            for (let batchStart = 0; batchStart < basket.numTokens; batchStart += batchSize) {
+            let pythPriceFeeds = [];
+            let updateTokenPricesIxs = [];
+            for (let startIndex = 0; startIndex < basket.numTokens; startIndex++) {
                 let allKeys = [];
                 let tokenIndices = [];
-                for (let i = batchStart; i < basket.numTokens && i < batchStart + batchSize; i++) {
-                    tokenIndices.push(i);
-                    let agg = basket.composition[i].oracleAggregator;
+                for (let endIndex = startIndex; endIndex < basket.numTokens; endIndex++) {
+                    let numAccounts = basket.composition[endIndex].oracleAggregator.oracles
+                        .slice(0, basket.composition[endIndex].oracleAggregator.numOracles)
+                        .reduce((acc, oracle) => acc + oracle.oracleSettings.numRequiredAccounts, 0);
+                    if (allKeys.length + numAccounts > constants_1.UPDATE_TOKEN_PRICES_MAX_ACCOUNTS)
+                        break;
+                    if (tokenIndices.length == 20)
+                        break;
+                    startIndex = endIndex;
+                    tokenIndices.push(endIndex);
+                    let agg = basket.composition[endIndex].oracleAggregator;
                     for (let i = 0; i < agg.numOracles; i++) {
-                        const oracleData = agg.oracles[i];
+                        const oracleData = agg.oracles[endIndex];
                         for (let j = 0; j < oracleData.oracleSettings.numRequiredAccounts; j++) {
                             const lutId = oracleData.accountsToLoadLutIds[j];
                             const lutIdx = oracleData.accountsToLoadLutIndices[j];
-                            if (lutId === 0 && lutIdx === 0)
-                                continue;
-                            if (!basket.lutPubkeys)
-                                continue;
                             allKeys.push(basket.lutPubkeys[lutId].state.addresses[lutIdx]);
+                            if (oracleData.oracleSettings.oracleType === oracle_1.OracleType.Pyth)
+                                pythPriceFeeds.push(basket.lutPubkeys[lutId].state.addresses[lutIdx]);
                         }
                     }
                 }
@@ -891,7 +910,7 @@ class SymmetryCore {
                     tokenIndices.push(0);
                 // TODO: in last instruction we should include performance fee accounts
                 let performanceFees = basket.settings.fees.hostPerformanceFeeBps + basket.settings.fees.creatorPerformanceFeeBps + basket.settings.fees.managersPerformanceFeeBps;
-                ixs.push((0, priceUpdate_1.updateTokenPricesIx)({
+                updateTokenPricesIxs.push((0, priceUpdate_1.updateTokenPricesIx)({
                     keeper: keeper,
                     basket: basket.ownAddress,
                     rebalanceIntent: rebalanceIntent,
@@ -903,16 +922,67 @@ class SymmetryCore {
                     basketMint: performanceFees > 0 ? basket.mint : undefined,
                 }));
             }
-            let txBatchData = { batches: [ixs.map(ix => ({
-                        payer: keeper,
-                        instructions: [
-                            ix,
-                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
-                            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
-                        ],
-                        lookupTables: [basket.lookupTables.active[0], basket.lookupTables.active[1]],
-                    }))] };
+            let feedIds = yield (0, pythOracle_1.fetchFeedIdsFromAccounts)(this.sdkParams.connection, pythPriceFeeds);
+            const { vaaCreateInitEncodeIxs, vaaWriteVerifyIxs, updateFeedIxs, closeVaaIxs } = yield (0, pythOracle_1.buildPythPriceFeedUpdateIxs)(keeper, feedIds.feedIds);
+            let txBatchData = { batches: [
+                    [
+                        ...vaaCreateInitEncodeIxs.map(ixs => ({
+                            payer: keeper,
+                            instructions: [
+                                ...ixs.ixs,
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        })),
+                    ],
+                    [
+                        ...vaaWriteVerifyIxs.map(ixs => ({
+                            payer: keeper,
+                            instructions: [
+                                ...ixs,
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        })),
+                    ],
+                    [
+                        ...updateFeedIxs.map(ix => ({
+                            payer: keeper,
+                            instructions: [
+                                ix,
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        })),
+                    ],
+                    [
+                        ...updateTokenPricesIxs.map(ix => ({
+                            payer: keeper,
+                            instructions: [
+                                ix,
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [basket.lookupTables.active[0], basket.lookupTables.active[1]],
+                        })),
+                        {
+                            payer: keeper,
+                            instructions: [
+                                ...closeVaaIxs,
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        }
+                    ],
+                ] };
             let versionedTxs = yield (0, txUtils_1.prepareVersionedTxs)(this.sdkParams.connection, txBatchData);
+            for (let [txId, vaaCreateInitEncodeIx] of vaaCreateInitEncodeIxs.entries()) {
+                versionedTxs.batches[0][txId].sign([vaaCreateInitEncodeIx.signer]);
+            }
             let txPayloadBatchSequence = (0, txUtils_1.prepareTxPayloadBatchSequence)(txBatchData, versionedTxs);
             return txPayloadBatchSequence;
         });

package/dist/src/states/oracles/pythOracle.d.ts

@@ -1,7 +1,8 @@
 import { BN } from '@coral-xyz/anchor';
 import { HermesClient } from '@pythnetwork/hermes-client';
-import { AccountInfo, Connection, Keypair, PublicKey, Signer, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
+import { AccountInfo, Connection, Keypair, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { OracleSettings } from '../../layouts/oracle';
+import { TxBatchData } from '../../txUtils';
 import { OraclePrice } from './oracle';
 export type VerificationLevel = {
     kind: 'Partial';
@@ -49,22 +50,6 @@ export declare function parseAccumulatorUpdateData(data: Buffer): {
         proof: number[][];
     }[];
 };
-/**
- * Build instructions to update Pyth price feed accounts (full verification)
- */
-export declare function buildPythPriceFeedUpdateInstructions(connection: Connection, payer: PublicKey, priceFeedIds: string[], shardId?: number, hermesClient?: HermesClient): Promise<PythUpdateResult>;
-export declare const DEFAULT_COMPUTE_BUDGET_UNITS = 200000;
-/**
- * The maximum size of a Solana transaction, leaving some room for the compute budget instructions.
- */
-export declare const PACKET_DATA_SIZE_WITH_ROOM_FOR_COMPUTE_BUDGET: number;
-/**
- * The maximum number of transactions in a Jito bundle.
- */
-export declare const JITO_BUNDLE_SIZE = 5;
-export declare const DEFAULT_PRIORITY_FEE_CONFIG: {
-    computeUnitPriceMicroLamports: number;
-};
 /**
  * Get the size of a transaction that would contain the provided array of instructions
  */
@@ -75,84 +60,44 @@ export declare function getSizeOfTransaction(instructions: TransactionInstructio
 }): number;
 /** Get the size of n in bytes when serialized as a CompressedU16 */
 export declare function getSizeOfCompressedU16(n: number): number;
+export interface InstructionBatch {
+    instructions: TransactionInstruction[];
+    signers: Keypair[];
+    computeUnits: number;
+}
 /**
- * This class batches instructions into transactions efficiently.
+ * Fetch Pyth price accounts from RPC and extract feed IDs
  */
-export declare class TransactionBuilder {
-    private payer;
-    private connection;
-    private addressLookupTable?;
-    private transactionInstructions;
-    constructor(payer: PublicKey, connection: Connection, addressLookupTable?: {
-        state: {
-            addresses: PublicKey[];
-        };
-    } | undefined);
-    addInstruction(args: {
-        instruction: TransactionInstruction;
-        signers: Signer[];
-        computeUnits?: number;
-    }): void;
-    addInstructions(instructions: {
-        instruction: TransactionInstruction;
-        signers: Signer[];
-        computeUnits?: number;
-    }[]): void;
-    buildVersionedTransactions(args: {
-        computeUnitPriceMicroLamports?: number;
-        tightComputeBudget?: boolean;
-        jitoTipLamports?: number;
-    }): Promise<{
-        tx: VersionedTransaction;
-        signers: Signer[];
-    }[]>;
-    buildLegacyTransactions(args: {
-        computeUnitPriceMicroLamports?: number;
-        tightComputeBudget?: boolean;
-        jitoTipLamports?: number;
-    }): {
-        tx: Transaction;
-        signers: Signer[];
-    }[];
-    static batchIntoLegacyTransactions(instructions: TransactionInstruction[], priorityFeeConfig: {
-        computeUnitPriceMicroLamports?: number;
-        tightComputeBudget?: boolean;
-        jitoTipLamports?: number;
-    }): Transaction[];
-    static batchIntoVersionedTransactions(payer: PublicKey, connection: Connection, instructions: {
-        instruction: TransactionInstruction;
-        signers: Signer[];
-        computeUnits?: number;
-    }[], priorityFeeConfig: {
-        computeUnitPriceMicroLamports?: number;
-        tightComputeBudget?: boolean;
-        jitoTipLamports?: number;
-    }, addressLookupTable?: {
-        state: {
-            addresses: PublicKey[];
-        };
-    }): Promise<{
-        tx: VersionedTransaction;
-        signers: Signer[];
-    }[]>;
-    static addPriorityFee(transaction: Transaction, priorityFeeConfig: {
-        computeUnitPriceMicroLamports?: number;
-        tightComputeBudget?: boolean;
-        jitoTipLamports?: number;
-    }): void;
+export declare function fetchFeedIdsFromAccounts(connection: Connection, priceAccounts: PublicKey[]): Promise<{
+    feedIds: string[];
+    feedIdToAccount: Map<string, PublicKey>;
+}>;
+export interface PythUpdateTxResult {
+    txBatchData: TxBatchData;
+    /** Keypairs that must sign their respective transactions before sending */
+    extraSigners: Map<number, Keypair[]>;
 }
-export declare const isVersionedTransaction: (tx: Transaction | VersionedTransaction) => tx is VersionedTransaction;
 /**
- * Send a set of transactions to the network (with retries), using a plain Signer for the payer
+ * Build Pyth price feed update as TxBatchData compatible with SDK txUtils.
+ *
+ * TxBatchData.batches layout:
+ *   batch 0 (sequential): [createAccount + initEncodedVaa + writeVaa_part1]
+ *   batch 1 (sequential): [writeVaa_part2 + verifyEncodedVaa]
+ *   batch 2 (parallel):   [updateFeed_0], [updateFeed_1], ... [updateFeed_N-2]
+ *   batch 3 (sequential): [updateFeed_last + closeEncodedVaa]
+ *
+ * Transactions within each batch are sent in parallel by sendVersionedTxs.
+ * Batches are sent sequentially.
  */
-export declare function sendTransactions(transactions: {
-    tx: Transaction | VersionedTransaction;
-    signers?: Signer[];
-}[], connection: Connection, payer: Signer, maxRetries?: number): Promise<string[]>;
-export declare function buildPythPriceFeedUpdateTxs(connection: Connection, payer: PublicKey, priceFeedIds: string[], shardId?: number, computeUnitPriceMicroLamports?: number, hermesClient?: HermesClient): Promise<{
-    tx: VersionedTransaction;
-    signers: Signer[];
-}[]>;
+export declare function buildPythPriceFeedUpdateIxs(payer: PublicKey, priceFeedIds: string[], defaultShardId?: number, hermesClient?: HermesClient): Promise<{
+    vaaCreateInitEncodeIxs: {
+        ixs: TransactionInstruction[];
+        signer: Keypair;
+    }[];
+    vaaWriteVerifyIxs: TransactionInstruction[][];
+    updateFeedIxs: TransactionInstruction[];
+    closeVaaIxs: TransactionInstruction[];
+}>;
 export declare class PriceFeedMessage {
     feedId: Buffer;
     price: BN;
@@ -174,6 +119,14 @@ export declare class PriceFeedMessage {
     });
     static decode(buf: Buffer, offset?: number): [PriceFeedMessage, number];
 }
+export declare class PythState {
+    writeAuthority: PublicKey;
+    verificationLevel: VerificationLevel;
+    priceMessage: PriceFeedMessage;
+    postedSlot: BN;
+    constructor(writeAuthority: PublicKey, verificationLevel: VerificationLevel, priceMessage: PriceFeedMessage, postedSlot: BN);
+    static decode(buf: Buffer, offset?: number): [PythState, number];
+}
 export declare class PythOracle {
     static fetch(oracleParams: OracleSettings, accountInfos: AccountInfo<Buffer>[], solPrice?: OraclePrice, usdPrice?: OraclePrice): OraclePrice;
 }