@symmetry-hq/sdk 1.0.12 → 1.0.13

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

@@ -20,5 +20,5 @@ export declare class PriceAggregator {
     minOraclesThresh: number;
     confMultiplier: Fraction;
     constructor(numOracles: number, oracles: OracleData[], minConfBps: number, confThreshBps: number, minOraclesThresh: number, confMultiplier: Fraction);
-    static fetch(oracleAggregator: OracleAggregator, lutAccounts: AddressLookupTableAccount[], accountInfoMap: Map<string, AccountInfo<Buffer> | null>, solPrice: OraclePrice, usdPrice: OraclePrice, pythPriceOverrides?: Map<string, OraclePrice>): OraclePrice;
+    static fetch(oracleAggregator: OracleAggregator, lutAccounts: AddressLookupTableAccount[], accountInfoMap: Map<string, AccountInfo<Buffer> | null>, wsolPrice: OraclePrice, usdcPrice: OraclePrice, pythPriceOverrides?: Map<string, OraclePrice>): OraclePrice;
 }

package/dist/src/states/oracles/oracle.js

@@ -54,7 +54,7 @@ class PriceAggregator {
         if (!(0 <= this.minOraclesThresh && this.minOraclesThresh <= constants_2.U32_MAX.toNumber()))
             throw new Error(`Minimum number of oracles must be between 0 and ${constants_2.U32_MAX}`);
     }
-    static fetch(oracleAggregator, lutAccounts, accountInfoMap, solPrice, usdPrice, pythPriceOverrides) {
+    static fetch(oracleAggregator, lutAccounts, accountInfoMap, wsolPrice, usdcPrice, pythPriceOverrides) {
         let validated = true;
         const agg = oracleAggregator;
         const oracleResults = [];
@@ -62,15 +62,11 @@ class PriceAggregator {
             const oracleData = agg.oracles[i];
             const settings = oracleData.oracleSettings;
             let loadedAccounts = [];
-            let firstLoadedPubkey;
             for (let j = 0; j < settings.numRequiredAccounts; j++) {
                 const lutId = oracleData.accountsToLoadLutIds[j];
                 const lutIdx = oracleData.accountsToLoadLutIndices[j];
                 const pubkey = lutAccounts[lutId].state.addresses[lutIdx];
                 const account = accountInfoMap.get(pubkey.toBase58());
-                if (!firstLoadedPubkey) {
-                    firstLoadedPubkey = pubkey;
-                }
                 // @ts-ignore
                 loadedAccounts.push(account);
             }
@@ -95,17 +91,16 @@ class PriceAggregator {
             let result = (() => {
                 switch (settings.oracleType) {
                     case oracle_1.OracleType.Pyth:
-                        if (firstLoadedPubkey) {
-                            const override = pythPriceOverrides === null || pythPriceOverrides === void 0 ? void 0 : pythPriceOverrides.get(firstLoadedPubkey.toBase58());
-                            if (override) {
-                                return override;
-                            }
-                        }
-                        return pythOracle_1.PythOracle.fetch(settings, loadedAccounts, solPrice, usdPrice);
+                        const lutId = oracleData.accountsToLoadLutIds[0];
+                        const lutIdx = oracleData.accountsToLoadLutIndices[0];
+                        const pubkey = lutAccounts[lutId].state.addresses[lutIdx];
+                        const override = pythPriceOverrides === null || pythPriceOverrides === void 0 ? void 0 : pythPriceOverrides.get(pubkey.toBase58());
+                        const price = pythOracle_1.PythOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
+                        return (override ? override : price);
                     case oracle_1.OracleType.RaydiumClmm:
-                        return raydiumClmmOracle_1.RaydiumCLMMOracle.fetch(settings, loadedAccounts, solPrice, usdPrice);
+                        return raydiumClmmOracle_1.RaydiumCLMMOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
                     case oracle_1.OracleType.RaydiumCpmm:
-                        return raydiumCpmmOracle_1.RaydiumCPMMOracle.fetch(settings, loadedAccounts, solPrice, usdPrice);
+                        return raydiumCpmmOracle_1.RaydiumCPMMOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
                     default:
                         throw new Error(`Invalid oracle type: ${settings.oracleType}`);
                 }

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

@@ -14,7 +14,7 @@ export interface HermesPythPriceData {
     emaConf?: string | number;
 }
 export declare function fetchHermesPythPrices(priceFeedIds: string[]): Promise<Map<string, HermesPythPriceData>>;
-export declare function buildPythOraclePriceFromHermesPriceData(oracleParams: OracleSettings, priceData: HermesPythPriceData, solPrice: OraclePrice, usdPrice: OraclePrice): OraclePrice;
+export declare function buildPythOraclePriceFromHermesPriceData(oracleParams: OracleSettings, priceData: HermesPythPriceData, wsolPrice: OraclePrice, usdcPrice: OraclePrice): OraclePrice;
 export type VerificationLevel = {
     kind: 'Partial';
     numSignatures: number;
@@ -38,6 +38,10 @@ export interface InstructionWithSigners {
     signers: Keypair[];
     computeUnits?: number;
 }
+/**
+ * Build closeEncodedVaa instruction
+ */
+export declare function buildCloseEncodedVaaInstruction(writeAuthority: PublicKey, encodedVaa: PublicKey, wormholeProgramId?: PublicKey): TransactionInstruction;
 export interface PythUpdateResult {
     postInstructions: InstructionWithSigners[];
     closeInstructions: InstructionWithSigners[];
@@ -140,5 +144,5 @@ export declare class PythState {
     static decode(buf: Buffer, offset?: number): [PythState, number];
 }
 export declare class PythOracle {
-    static fetch(oracleParams: OracleSettings, accountInfos: AccountInfo<Buffer>[], solPrice?: OraclePrice, usdPrice?: OraclePrice): OraclePrice;
+    static fetch(oracleParams: OracleSettings, accountInfos: AccountInfo<Buffer>[], wsolPrice?: OraclePrice, usdcPrice?: OraclePrice): OraclePrice;
 }

package/dist/src/states/oracles/pythOracle.js

@@ -20,6 +20,7 @@ exports.buildFreshVaultPythPriceOverrides = buildFreshVaultPythPriceOverrides;
 exports.getRandomTipAccount = getRandomTipAccount;
 exports.buildJitoTipInstruction = buildJitoTipInstruction;
 exports.getPythPriceFeedAccountAddress = getPythPriceFeedAccountAddress;
+exports.buildCloseEncodedVaaInstruction = buildCloseEncodedVaaInstruction;
 exports.parsePriceFeedMessage = parsePriceFeedMessage;
 exports.parseAccumulatorUpdateData = parseAccumulatorUpdateData;
 exports.getSizeOfTransaction = getSizeOfTransaction;
@@ -72,17 +73,19 @@ function fetchHermesPythPrices(priceFeedIds) {
         return result;
     });
 }
-function buildPythOraclePriceFromHermesPriceData(oracleParams, priceData, solPrice, usdPrice) {
+function buildPythOraclePriceFromHermesPriceData(oracleParams, priceData, wsolPrice, usdcPrice) {
     var _a;
+    let quoteDecimals = (oracleParams.quote == oracle_1.Quote.Usdc) ? constants_1.USDC_DECIMALS : ((oracleParams.quote == oracle_1.Quote.Wsol) ? constants_1.WSOL_DECIMALS : 0);
     let pr = new decimal_js_1.default(priceData.price.toString())
-        .mul(decimal_js_1.default.pow(10, priceData.expo - oracleParams.tokenDecimals));
+        .mul(decimal_js_1.default.pow(10, priceData.expo - oracleParams.tokenDecimals + quoteDecimals));
     let ema = new decimal_js_1.default(((_a = priceData.emaPrice) !== null && _a !== void 0 ? _a : priceData.price).toString())
-        .mul(decimal_js_1.default.pow(10, priceData.expo - oracleParams.tokenDecimals));
+        .mul(decimal_js_1.default.pow(10, priceData.expo - oracleParams.tokenDecimals + quoteDecimals));
     let cf = new decimal_js_1.default(priceData.conf.toString())
-        .mul(decimal_js_1.default.pow(10, priceData.expo - oracleParams.tokenDecimals));
+        .mul(decimal_js_1.default.pow(10, priceData.expo - oracleParams.tokenDecimals + quoteDecimals));
     const lastUpdateTimestamp = priceData.publishTime;
-    let quotePrice = (oracleParams.quote === oracle_1.Quote.Usdc) ? usdPrice :
-        ((oracleParams.quote === oracle_1.Quote.Wsol) ? solPrice : new oracle_2.OraclePrice(new decimal_js_1.default(1), new decimal_js_1.default(0), 0));
+    let quotePrice = (oracleParams.quote === oracle_1.Quote.Usdc) ? usdcPrice :
+        ((oracleParams.quote === oracle_1.Quote.Wsol) ? wsolPrice :
+            new oracle_2.OraclePrice(new decimal_js_1.default(1), new decimal_js_1.default(0), 0));
     pr = pr.mul(quotePrice.price);
     ema = ema.mul(quotePrice.price);
     cf = cf.mul(quotePrice.price);
@@ -711,7 +714,7 @@ class PythState {
 }
 exports.PythState = PythState;
 class PythOracle {
-    static fetch(oracleParams, accountInfos, solPrice, usdPrice) {
+    static fetch(oracleParams, accountInfos, wsolPrice, usdcPrice) {
         //@ts-ignore
         let state = null;
         try {
@@ -729,7 +732,7 @@ class PythOracle {
             publishTime: parseInt(state.priceMessage.publishTime.toString()),
             emaPrice: state.priceMessage.emaPrice.toString(),
             emaConf: state.priceMessage.emaConf.toString(),
-        }, solPrice !== null && solPrice !== void 0 ? solPrice : new oracle_2.OraclePrice(new decimal_js_1.default(1), new decimal_js_1.default(0), 0), usdPrice !== null && usdPrice !== void 0 ? usdPrice : new oracle_2.OraclePrice(new decimal_js_1.default(1), new decimal_js_1.default(0), 0));
+        }, wsolPrice !== null && wsolPrice !== void 0 ? wsolPrice : new oracle_2.OraclePrice(new decimal_js_1.default(1), new decimal_js_1.default(0), 0), usdcPrice !== null && usdcPrice !== void 0 ? usdcPrice : new oracle_2.OraclePrice(new decimal_js_1.default(1), new decimal_js_1.default(0), 0));
     }
 }
 exports.PythOracle = PythOracle;

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

@@ -115,6 +115,6 @@ export declare class RaydiumCPMMOracle {
      * - SELL: delta_quote_out = netQuote * delta_base / (netBase + delta_base)
      */
     static calculateMaxPriceImpactForMinLiquidity(oracleParams: OracleSettings, netBase: Decimal, netQuote: Decimal, spotPriceUsd: Decimal, quotePrice: OraclePrice): Decimal;
-    static fetch(oracleParams: OracleSettings, accountInfos: AccountInfo<Buffer>[], solPrice: OraclePrice, usdPrice: OraclePrice): OraclePrice;
+    static fetch(oracleParams: OracleSettings, accountInfos: AccountInfo<Buffer>[], wsolPrice: OraclePrice, usdcPrice: OraclePrice): OraclePrice;
 }
 export {};

package/dist/src/states/oracles/raydiumCpmmOracle.js

@@ -462,7 +462,7 @@ class RaydiumCPMMOracle {
         const maxImpact = decimal_js_1.default.max(impactBuy, impactSell);
         return maxImpact.mul(new decimal_js_1.default(10000)); // Convert to bps
     }
-    static fetch(oracleParams, accountInfos, solPrice, usdPrice) {
+    static fetch(oracleParams, accountInfos, wsolPrice, usdcPrice) {
         const poolStateInfo = accountInfos[0];
         const vault0Info = accountInfos[1];
         const vault1Info = accountInfos[2];
@@ -473,8 +473,9 @@ class RaydiumCPMMOracle {
         const [decodedObservationState, ____] = ObservationState.decode(observationStateInfo.data, 8);
         const currentTime = new bn_js_1.default(Math.floor(Date.now() / 1000));
         // Determine quote oracle
-        let quotePrice = (oracleParams.quote === oracle_1.Quote.Usdc) ? usdPrice :
-            ((oracleParams.quote === oracle_1.Quote.Wsol) ? solPrice : new oracle_2.OraclePrice(new decimal_js_1.default(1), new decimal_js_1.default(0), 0));
+        let quotePrice = (oracleParams.quote === oracle_1.Quote.Usdc) ? usdcPrice :
+            ((oracleParams.quote === oracle_1.Quote.Wsol) ? wsolPrice :
+                new oracle_2.OraclePrice(new decimal_js_1.default(1), new decimal_js_1.default(0), 0));
         // Get spot price with reserves
         const { netBase, netQuote, spotPrice } = this.getSpotPriceWithReserves(decodedPoolState, decodedVault0State, decodedVault1State, oracleParams.side, quotePrice);
         // Get TWAP prices

package/dist/test.js

@@ -521,13 +521,13 @@ function testStates() {
                     symmetryLimitOrderFeeBps: 0,
                     symmetryFeesExtraData: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,],
                     bountyMint: new web3_js_1.PublicKey("So11111111111111111111111111111111111111112"),
-                    minBountyForVaultAutomation: new anchor_1.BN(200 * 50 * 10 ** 3),
-                    bountyBondAmount: new anchor_1.BN(5 * 50 * 10 ** 3),
+                    minBountyForVaultAutomation: new anchor_1.BN(2000 * 5000),
+                    bountyBondAmount: new anchor_1.BN(20 * 5000),
                     bountyPerTask: {
-                        minBounty: new anchor_1.BN(10 * 50 * 10 ** 3),
-                        maxBounty: new anchor_1.BN(20 * 50 * 10 ** 3),
-                        minBountyUntil: new anchor_1.BN(1),
-                        maxBountyAfter: new anchor_1.BN(101),
+                        minBounty: new anchor_1.BN(20 * 5000),
+                        maxBounty: new anchor_1.BN(50 * 5000),
+                        minBountyUntil: new anchor_1.BN(10),
+                        maxBountyAfter: new anchor_1.BN(40),
                     },
                     bountyPerPriceUpdateTaskDivisor: new anchor_1.BN(3),
                     minRemainingValue: { high: new anchor_1.BN(0), low: new anchor_1.BN("1844674407370955161") },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symmetry-hq/sdk",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Symmetry V3 SDK",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/src/states/oracles/oracle.ts

@@ -6,7 +6,7 @@ import { AccountInfo, AddressLookupTableAccount, PublicKey } from '@solana/web3.
 import { HUNDRED_PERCENT_BPS } from '../../constants';
 import { Fraction, fractionToDecimal } from '../../layouts/fraction';
 import {
-    MAX_ACCOUNTS_PER_ORACLE, OracleAggregator, OracleData, OracleSettings, OracleType
+    OracleAggregator, OracleData, OracleType,
 } from '../../layouts/oracle';
 import { U32_MAX } from './constants';
 import { PythOracle } from './pythOracle';
@@ -79,8 +79,8 @@ export class PriceAggregator{
         oracleAggregator: OracleAggregator,
         lutAccounts: AddressLookupTableAccount[],
         accountInfoMap: Map<string, AccountInfo<Buffer> | null>,
-        solPrice: OraclePrice,
-        usdPrice: OraclePrice,
+        wsolPrice: OraclePrice,
+        usdcPrice: OraclePrice,
         pythPriceOverrides?: Map<string, OraclePrice>,
     ): OraclePrice {
         let validated: boolean = true;
@@ -93,15 +93,11 @@ export class PriceAggregator{
             const settings = oracleData.oracleSettings;
 
             let loadedAccounts: AccountInfo<Buffer>[] = [];
-            let firstLoadedPubkey: PublicKey | undefined;
             for (let j = 0; j < settings.numRequiredAccounts; j++) {
                 const lutId = oracleData.accountsToLoadLutIds[j];
                 const lutIdx = oracleData.accountsToLoadLutIndices[j];
                 const pubkey = lutAccounts[lutId].state.addresses[lutIdx];
                 const account = accountInfoMap.get(pubkey.toBase58());
-                if (!firstLoadedPubkey) {
-                    firstLoadedPubkey = pubkey;
-                }
                 // @ts-ignore
                 loadedAccounts.push(account);
             }
@@ -127,17 +123,16 @@ export class PriceAggregator{
             let result = (() => {
                 switch (settings.oracleType) {
                     case OracleType.Pyth:
-                        if (firstLoadedPubkey) {
-                            const override = pythPriceOverrides?.get(firstLoadedPubkey.toBase58());
-                            if (override) {
-                                return override;
-                            }
-                        }
-                        return PythOracle.fetch(settings, loadedAccounts, solPrice, usdPrice);
+                        const lutId = oracleData.accountsToLoadLutIds[0];
+                        const lutIdx = oracleData.accountsToLoadLutIndices[0];
+                        const pubkey = lutAccounts[lutId].state.addresses[lutIdx];
+                        const override = pythPriceOverrides?.get(pubkey.toBase58());
+                        const price = PythOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
+                        return (override ? override : price);
                     case OracleType.RaydiumClmm:
-                        return RaydiumCLMMOracle.fetch(settings, loadedAccounts, solPrice, usdPrice);
+                        return RaydiumCLMMOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
                     case OracleType.RaydiumCpmm:
-                        return RaydiumCPMMOracle.fetch(settings, loadedAccounts, solPrice, usdPrice);
+                        return RaydiumCPMMOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
                     default:
                         throw new Error(`Invalid oracle type: ${settings.oracleType}`);
                 }

package/src/states/oracles/pythOracle.ts

@@ -7,7 +7,7 @@ import {
     SystemProgram, Transaction, TransactionInstruction, TransactionMessage, VersionedTransaction
 } from '@solana/web3.js';
 
-import { HUNDRED_PERCENT_BPS, PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT, PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT } from '../../constants';
+import { HUNDRED_PERCENT_BPS, PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT, PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT, USDC_DECIMALS, WSOL_DECIMALS } from '../../constants';
 import { OracleSettings, OracleType, PYTH_USDC_ORACLE_SETTINGS, PYTH_WSOL_ORACLE_SETTINGS, Quote } from '../../layouts/oracle';
 import { TxBatchData, TxData } from '../../txUtils';
 import { HERMES_PUBLIC_ENDPOINT, SOLANA_DEVNET_ENDPOINT } from './constants';
@@ -87,20 +87,25 @@ export async function fetchHermesPythPrices(priceFeedIds: string[]): Promise<Map
 export function buildPythOraclePriceFromHermesPriceData(
     oracleParams: OracleSettings,
     priceData: HermesPythPriceData,
-    solPrice: OraclePrice,
-    usdPrice: OraclePrice,
+    wsolPrice: OraclePrice,
+    usdcPrice: OraclePrice,
 ): OraclePrice {
+    let quoteDecimals =
+        (oracleParams.quote == Quote.Usdc) ? USDC_DECIMALS : (
+        (oracleParams.quote == Quote.Wsol) ? WSOL_DECIMALS : 0);
+
     let pr = new Decimal(priceData.price.toString())
-        .mul(Decimal.pow(10, priceData.expo - oracleParams.tokenDecimals));
+        .mul(Decimal.pow(10, priceData.expo - oracleParams.tokenDecimals + quoteDecimals));
     let ema = new Decimal((priceData.emaPrice ?? priceData.price).toString())
-        .mul(Decimal.pow(10, priceData.expo - oracleParams.tokenDecimals));
+        .mul(Decimal.pow(10, priceData.expo - oracleParams.tokenDecimals + quoteDecimals));
     let cf = new Decimal(priceData.conf.toString())
-        .mul(Decimal.pow(10, priceData.expo - oracleParams.tokenDecimals));
+        .mul(Decimal.pow(10, priceData.expo - oracleParams.tokenDecimals + quoteDecimals));
     const lastUpdateTimestamp = priceData.publishTime;
-    
+
     let quotePrice =
-    (oracleParams.quote === Quote.Usdc) ? usdPrice :
-    ((oracleParams.quote === Quote.Wsol) ? solPrice : new OraclePrice(new Decimal(1), new Decimal(0), 0));
+        (oracleParams.quote === Quote.Usdc) ? usdcPrice :
+        ((oracleParams.quote === Quote.Wsol) ? wsolPrice :
+        new OraclePrice(new Decimal(1), new Decimal(0), 0));
 
     pr = pr.mul(quotePrice.price);
     ema = ema.mul(quotePrice.price);
@@ -490,7 +495,7 @@ function buildVerifyEncodedVaaV1Instruction(
 /**
  * Build closeEncodedVaa instruction
  */
-function buildCloseEncodedVaaInstruction(
+export function buildCloseEncodedVaaInstruction(
     writeAuthority: PublicKey,
     encodedVaa: PublicKey,
     wormholeProgramId: PublicKey = DEFAULT_WORMHOLE_PROGRAM_ID
@@ -976,8 +981,8 @@ export class PythOracle {
     static fetch(
         oracleParams: OracleSettings,
         accountInfos: AccountInfo<Buffer>[],
-        solPrice?: OraclePrice,
-        usdPrice?: OraclePrice,
+        wsolPrice?: OraclePrice,
+        usdcPrice?: OraclePrice,
     ): OraclePrice {
         //@ts-ignore
         let state: PythState = null;
@@ -999,8 +1004,8 @@ export class PythOracle {
                 emaPrice: state.priceMessage.emaPrice.toString(),
                 emaConf: state.priceMessage.emaConf.toString(),
             },
-            solPrice ?? new OraclePrice(new Decimal(1), new Decimal(0), 0),
-            usdPrice ?? new OraclePrice(new Decimal(1), new Decimal(0), 0),
+            wsolPrice ?? new OraclePrice(new Decimal(1), new Decimal(0), 0),
+            usdcPrice ?? new OraclePrice(new Decimal(1), new Decimal(0), 0),
         );
     }
 

package/src/states/oracles/raydiumCpmmOracle.ts

@@ -667,8 +667,8 @@ export class RaydiumCPMMOracle {
     static fetch(
         oracleParams: OracleSettings,
         accountInfos: AccountInfo<Buffer>[],
-        solPrice: OraclePrice,
-        usdPrice: OraclePrice,
+        wsolPrice: OraclePrice,
+        usdcPrice: OraclePrice,
     ): OraclePrice {
         const poolStateInfo = accountInfos[0];
         const vault0Info = accountInfos[1];
@@ -684,8 +684,9 @@ export class RaydiumCPMMOracle {
 
         // Determine quote oracle
         let quotePrice =
-        (oracleParams.quote === Quote.Usdc) ? usdPrice :
-        ((oracleParams.quote === Quote.Wsol) ? solPrice : new OraclePrice(new Decimal(1), new Decimal(0), 0));
+            (oracleParams.quote === Quote.Usdc) ? usdcPrice :
+            ((oracleParams.quote === Quote.Wsol) ? wsolPrice :
+            new OraclePrice(new Decimal(1), new Decimal(0), 0));
 
         // Get spot price with reserves
         const { netBase, netQuote, spotPrice } = this.getSpotPriceWithReserves(

package/test.ts

@@ -1,13 +1,15 @@
-import { Connection, Keypair, PublicKey } from "@solana/web3.js";
+import { ComputeBudgetProgram, Connection, Keypair, PublicKey } from "@solana/web3.js";
 import { BN, Wallet } from "@coral-xyz/anchor";
 import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
-import { Vault, Intent, RebalanceIntent, SymmetryCore, TaskContext, KeeperMonitor } from "./src";
+import { Vault, Intent, RebalanceIntent, SymmetryCore, TaskContext, KeeperMonitor, isRebalanceRequired } from "./src";
 import { AddOrEditTokenInput, UpdateWeightsInput, MakeDirectSwapInput } from "./src";
 import { EditCreatorSettings, EditManagerSettings, EditFeeSettings, EditScheduleSettings, EditAutomationSettings, EditLpSettings, EditMetadataSettings, EditDepositsSettings, EditForceRebalanceSettings, EditCustomRebalanceSettings, EditAddTokenSettings, EditUpdateWeightsSettings, EditMakeDirectSwapSettings } from "./src";
 import { getRebalanceIntentPda } from "./src/instructions/pda";
-import { PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT } from "./src/constants";
+import { COMPUTE_UNITS, PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT } from "./src/constants";
 import { getJupTokenLedgerAndSwapInstructions } from "./src/jup";
 import { getSwapPairs } from "./src/states/intents/rebalanceIntent";
+import { buildCloseEncodedVaaInstruction } from "./src/states/oracles/pythOracle";
+import { prepareTxPayloadBatchSequence, prepareVersionedTxs, TxBatchData } from "./src/txUtils";
 
 
 let kp = Array.from(Keypair.generate().secretKey);
@@ -565,13 +567,13 @@ async function testStates() {
                 symmetryFeesExtraData: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,],
 
                 bountyMint: new PublicKey("So11111111111111111111111111111111111111112"),
-                minBountyForVaultAutomation: new BN(200 * 50 * 10 ** 3),
-                bountyBondAmount: new BN(5 * 50 * 10 ** 3),
+                minBountyForVaultAutomation: new BN(2000 * 5000),
+                bountyBondAmount: new BN(20 * 5000),
                 bountyPerTask: {
-                    minBounty: new BN(10 * 50 * 10 ** 3),
-                    maxBounty: new BN(20 * 50 * 10 ** 3),
-                    minBountyUntil: new BN(1),
-                    maxBountyAfter: new BN(101),
+                    minBounty: new BN(20 * 5000),
+                    maxBounty: new BN(50 * 5000),
+                    minBountyUntil: new BN(10),
+                    maxBountyAfter: new BN(40),
                 },
                 bountyPerPriceUpdateTaskDivisor: new BN(3),
                 minRemainingValue: {high: new BN(0), low: new BN("1844674407370955161")},