@symmetry-hq/sdk 1.0.5 → 1.0.7

package/dist/src/index.d.ts

@@ -7,8 +7,7 @@ import { AuctionData, ClaimBountyData, DepositData, FormattedOraclePrice, Format
 import { FormattedOracleType } from './layouts/oracle';
 import { BasketFilter } from './states/basket';
 import { IntentFilter } from './states/intents/intent';
-import { getSwapPairs, RebalanceIntentFilter, isRebalanceRequired } from './states/intents/rebalanceIntent';
-import { OraclePrice } from './states/oracles/oracle';
+import { getSwapPairs, isRebalanceRequired, RebalanceIntentFilter } from './states/intents/rebalanceIntent';
 import { WithdrawBasketFeesFilter } from './states/withdrawBasketFees';
 import { BasketCreationTx, TxPayloadBatchSequence, VersionedTxs, Wallet } from './txUtils';
 export declare class SymmetryCore {
@@ -91,19 +90,6 @@ export declare class SymmetryCore {
      * @returns {Promise<Basket>} The basket with the price.
     */
     loadBasketPrice(basket: Basket): Promise<Basket>;
-    loadBasketPriceWithPythPriceOverrides(params: {
-        basket: Basket;
-        pyth_price_overrides?: Map<string, OraclePrice>;
-    }): Promise<Basket>;
-    /**
-     * Checks whether a basket currently meets the automation rebalance trigger.
-     * Uses the existing basket pricing flow.
-    */
-    isBasketRebalanceRequired(params: {
-        basket: string | Basket;
-        pyth_price_overrides?: Map<string, OraclePrice>;
-    }): Promise<boolean>;
-    private computeBasketRebalanceRequiredFromPricedBasket;
     /**
      * Fetches an intent by its public key.
      * @param {string} intentPubkey - The public key of the intent.

package/dist/src/index.js

@@ -193,84 +193,6 @@ class SymmetryCore {
             return yield (0, basket_1.loadBasketPrice)(basket, this.sdkParams.connection);
         });
     }
-    loadBasketPriceWithPythPriceOverrides(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, basket_1.loadBasketPriceWithPythPriceOverrides)(params.basket, this.sdkParams.connection, params.pyth_price_overrides);
-        });
-    }
-    /**
-     * Checks whether a basket currently meets the automation rebalance trigger.
-     * Uses the existing basket pricing flow.
-    */
-    isBasketRebalanceRequired(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let basket = typeof params.basket === 'string'
-                ? yield this.fetchBasket(params.basket)
-                : params.basket;
-            if (!((_a = basket.formatted) === null || _a === void 0 ? void 0 : _a.automation_settings.enabled) && basket.settings.automation.allowAutomation !== 1) {
-                return false;
-            }
-            if (params.pyth_price_overrides && params.pyth_price_overrides.size > 0) {
-                basket = yield this.loadBasketPriceWithPythPriceOverrides({
-                    basket,
-                    pyth_price_overrides: params.pyth_price_overrides,
-                });
-            }
-            else {
-                basket = yield this.loadBasketPrice(basket);
-            }
-            return this.computeBasketRebalanceRequiredFromPricedBasket(basket);
-        });
-    }
-    computeBasketRebalanceRequiredFromPricedBasket(basket) {
-        var _a, _b, _c;
-        const basketTvl = (_a = basket.tvl) !== null && _a !== void 0 ? _a : basket.composition
-            .slice(0, basket.numTokens)
-            .reduce((sum, asset) => {
-            var _a, _b, _c;
-            const value = (_c = (_a = asset.value) !== null && _a !== void 0 ? _a : (_b = asset.price) === null || _b === void 0 ? void 0 : _b.getMid().mul(new decimal_js_1.default(asset.amount.toString()))) !== null && _c !== void 0 ? _c : new decimal_js_1.default(0);
-            return sum.add(value);
-        }, new decimal_js_1.default(0));
-        if (!basketTvl.isFinite() || basketTvl.lte(0)) {
-            return false;
-        }
-        const weightSum = basket.composition
-            .slice(0, basket.numTokens)
-            .reduce((sum, asset) => sum + asset.weight, 0);
-        if (weightSum <= 0) {
-            return false;
-        }
-        const requiredRelBps = new decimal_js_1.default(basket.settings.automation.rebalanceActivationThresholdRelBps);
-        const requiredAbsBps = new decimal_js_1.default(basket.settings.automation.rebalanceActivationThresholdAbsBps);
-        const bountyMint = basket.settings.bountyMint;
-        const hundredPercentBps = new decimal_js_1.default(10000);
-        for (const asset of basket.composition.slice(0, basket.numTokens)) {
-            if (asset.mint.equals(bountyMint)) {
-                continue;
-            }
-            const tokenPrice = (_b = asset.price) === null || _b === void 0 ? void 0 : _b.getMid();
-            if (!tokenPrice || !tokenPrice.isFinite() || tokenPrice.lte(0)) {
-                continue;
-            }
-            const tokenValue = (_c = asset.value) !== null && _c !== void 0 ? _c : tokenPrice.mul(new decimal_js_1.default(asset.amount.toString()));
-            const targetValue = basketTvl.mul(asset.weight).div(weightSum);
-            const valueDiff = tokenValue.sub(targetValue).abs();
-            if (valueDiff.eq(0)) {
-                continue;
-            }
-            const maxValue = decimal_js_1.default.max(tokenValue, targetValue);
-            if (!maxValue.isFinite() || maxValue.lte(0)) {
-                continue;
-            }
-            const relBps = valueDiff.div(maxValue).mul(hundredPercentBps);
-            const absBps = valueDiff.div(basketTvl).mul(hundredPercentBps);
-            if (relBps.gte(requiredRelBps) && absBps.gte(requiredAbsBps)) {
-                return true;
-            }
-        }
-        return false;
-    }
     /**
      * Fetches an intent by its public key.
      * @param {string} intentPubkey - The public key of the intent.
@@ -1866,13 +1788,41 @@ class SymmetryCore {
         return __awaiter(this, void 0, void 0, function* () {
             let keeper = new web3_js_1.PublicKey(params.keeper);
             let rebalanceIntent = (yield this.fetchRebalanceIntent(params.rebalance_intent)).chain_data;
+            const tokensWithBalance = rebalanceIntent.tokens.filter(token => token.amount.gt(new bn_js_1.default(0)));
+            const ownerIsKeeper = rebalanceIntent.owner.equals(keeper);
+            let redeemableTokenMints = tokensWithBalance.map(token => token.mint);
+            if (!ownerIsKeeper && tokensWithBalance.length > 0) {
+                const mintInfos = yield this.sdkParams.connection.getMultipleAccountsInfo(tokensWithBalance.map(token => token.mint));
+                const ataChecks = tokensWithBalance.map((token, index) => {
+                    const mintInfo = mintInfos[index];
+                    if (!mintInfo) {
+                        throw new Error(`Mint account not found for redeem token ${token.mint.toBase58()}`);
+                    }
+                    let tokenProgram;
+                    if (mintInfo.owner.equals(spl_token_1.TOKEN_PROGRAM_ID) || mintInfo.owner.equals(spl_token_1.TOKEN_2022_PROGRAM_ID)) {
+                        tokenProgram = mintInfo.owner;
+                    }
+                    else {
+                        throw new Error(`Unsupported token program for redeem token ${token.mint.toBase58()}: ${mintInfo.owner.toBase58()}`);
+                    }
+                    return {
+                        mint: token.mint,
+                        ata: (0, pda_1.getAta)(rebalanceIntent.owner, token.mint, tokenProgram),
+                    };
+                });
+                const ataInfos = yield this.sdkParams.connection.getMultipleAccountsInfo(ataChecks.map(item => item.ata));
+                redeemableTokenMints = ataChecks
+                    .filter((_, index) => ataInfos[index] !== null)
+                    .map(item => item.mint);
+                if (redeemableTokenMints.length === 0) {
+                    const blockedMints = ataChecks.map(item => item.mint.toBase58()).join(', ');
+                    throw new Error(`NoRedeemableTokens: owner ${rebalanceIntent.owner.toBase58()} has no ATA for remaining tokens [${blockedMints}]`);
+                }
+            }
             let batchSize = 7;
             let ixs = [];
-            for (let batchStart = 0; batchStart < rebalanceIntent.tokens.length; batchStart += batchSize) {
-                let tokenMints = [];
-                for (let i = batchStart; i < rebalanceIntent.tokens.length && i < batchStart + batchSize; i++)
-                    if (rebalanceIntent.tokens[i].amount.gt(new bn_js_1.default(0)))
-                        tokenMints.push(rebalanceIntent.tokens[i].mint);
+            for (let batchStart = 0; batchStart < redeemableTokenMints.length; batchStart += batchSize) {
+                let tokenMints = redeemableTokenMints.slice(batchStart, batchStart + batchSize);
                 if (tokenMints.length > 0) {
                     ixs.push((0, withdraw_1.redeemTokensIx)({
                         keeper: keeper,

package/dist/src/instructions/management/claimFees.js

@@ -8,7 +8,7 @@ const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("../../constants");
 const pda_1 = require("../pda");
 const WITHDRAW_FEES_DISCRIMINATOR = Buffer.from([159, 222, 146, 66, 254, 108, 55, 51]);
-const CLAIM_FEE_TOKENS_FROM_BASKET_DISCRIMINATOR = Buffer.from([53, 109, 220, 141, 193, 193, 13, 32]);
+const CLAIM_FEE_TOKENS_FROM_BASKET_DISCRIMINATOR = Buffer.from([53, 109, 220, 141, 110, 5, 193, 32]);
 function withdrawFeesIx(params) {
     let { claimer, basketTokenMint, feeType } = params;
     let basket = (0, pda_1.getBasketState)(basketTokenMint);

package/dist/src/instructions/management/edit.js

@@ -268,7 +268,7 @@ function createEditBasketIntentIx(params) {
                     oracleSettings: {
                         oracleType: (_b = (_a = [...oracle_1.ORACLE_TYPES_STRINGS.entries()].find(([, name]) => name === addTokenData.oracles[i].oracle_type)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : 255,
                         numRequiredAccounts: 0,
-                        weight: addTokenData.oracles[i].weight,
+                        weight: addTokenData.oracles[i].weight_bps,
                         isRequired: addTokenData.oracles[i].is_required ? 1 : 0,
                         confThreshBps: addTokenData.oracles[i].conf_thresh_bps,
                         volatilityThreshBps: addTokenData.oracles[i].volatility_thresh_bps,
@@ -279,7 +279,7 @@ function createEditBasketIntentIx(params) {
                         tokenDecimals: addTokenData.oracles[i].token_decimals,
                         twapSecondsAgo: new bn_js_1.default(addTokenData.oracles[i].twap_seconds_ago),
                         twapSecondarySecondsAgo: new bn_js_1.default(addTokenData.oracles[i].twap_secondary_seconds_ago),
-                        quote: (_d = (_c = [...oracle_1.QUOTES_STRINGS.entries()].find(([, name]) => name === addTokenData.oracles[i].quote)) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : oracle_1.Quote.Usd,
+                        quote: (_d = (_c = [...oracle_1.QUOTES_STRINGS.entries()].find(([, name]) => name === addTokenData.oracles[i].quote_token)) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : oracle_1.Quote.Usd,
                         side: oracle_1.Side.Base,
                     },
                     accountsToLoadLutIds: new Array(oracle_1.MAX_ACCOUNTS_PER_ORACLE).fill(0),

package/dist/src/layouts/basket.d.ts

@@ -107,6 +107,7 @@ export interface FormattedBasket {
     active_withdraws: number;
     active_managements: number;
     last_automation_execution_timestamp: number;
+    creation_timestamp: number;
     creator_settings: FormattedCreatorSettings;
     manager_settings: FormattedManagersSettings;
     fee_settings: FormattedFeeSettings;

package/dist/src/layouts/config.d.ts

@@ -190,6 +190,7 @@ export interface BasketSettings {
     makeDirectSwapLastUpdateTimestamp: BN;
     makeDirectSwapIntentAuthorityBitmask: number;
     extraData: BN[];
+    creationTimestamp: BN;
 }
 export declare const BasketSettingsLayout: any;
 export interface FormattedGlobalConfig {

package/dist/src/layouts/config.js

@@ -190,7 +190,8 @@ exports.BasketSettingsLayout = (0, borsh_1.struct)([
     (0, borsh_1.u64)('makeDirectSwapDelay'),
     (0, borsh_1.u64)('makeDirectSwapLastUpdateTimestamp'),
     (0, borsh_1.u16)('makeDirectSwapIntentAuthorityBitmask'),
-    (0, borsh_1.array)((0, borsh_1.u64)(), 32, 'extraData'),
+    (0, borsh_1.array)((0, borsh_1.u64)(), 31, 'extraData'),
+    (0, borsh_1.u64)('creationTimestamp'),
 ]);
 exports.GlobalConfigLayout = (0, borsh_1.struct)([
     (0, borsh_1.publicKey)('admin'),

package/dist/src/layouts/intents/intent.d.ts

@@ -172,7 +172,7 @@ export interface OracleInput {
     account_lut_id: number;
     account_lut_index: number;
     account: string;
-    weight: number;
+    weight_bps: number;
     is_required: boolean;
     conf_thresh_bps: number;
     volatility_thresh_bps: number;
@@ -183,7 +183,7 @@ export interface OracleInput {
     token_decimals: number;
     twap_seconds_ago: number;
     twap_secondary_seconds_ago: number;
-    quote: FormattedQuote;
+    quote_token: FormattedQuote;
 }
 export interface AddOrEditTokenInput {
     token_mint: string;

package/dist/src/states/basket.js

@@ -228,7 +228,7 @@ function addFieldsToBasket(basket) {
                         account_lut_index: oracle.accountsToLoadLutIndices[0],
                         account: lookup_tables.active[oracle.accountsToLoadLutIds[0]].contents[oracle.accountsToLoadLutIndices[0]],
                         num_required_accounts: oracle.oracleSettings.numRequiredAccounts,
-                        weight: oracle.oracleSettings.weight,
+                        weight_bps: oracle.oracleSettings.weight,
                         is_required: oracle.oracleSettings.isRequired == 1 ? true : false,
                         conf_thresh_bps: oracle.oracleSettings.confThreshBps,
                         volatility_thresh_bps: oracle.oracleSettings.volatilityThreshBps,
@@ -239,7 +239,7 @@ function addFieldsToBasket(basket) {
                         token_decimals: oracle.oracleSettings.tokenDecimals,
                         twap_seconds_ago: parseInt(oracle.oracleSettings.twapSecondsAgo.toString()),
                         twap_secondary_seconds_ago: parseInt(oracle.oracleSettings.twapSecondarySecondsAgo.toString()),
-                        quote: (_b = oracle_1.QUOTES_STRINGS.get(oracle.oracleSettings.quote)) !== null && _b !== void 0 ? _b : "usd",
+                        quote_token: (_b = oracle_1.QUOTES_STRINGS.get(oracle.oracleSettings.quote)) !== null && _b !== void 0 ? _b : "usd",
                         side: oracle.oracleSettings.side == 0 ? "base" : "quote",
                     },
                     accounts_to_load_lut_ids: oracle.accountsToLoadLutIds.map(id => id),
@@ -271,6 +271,7 @@ function addFieldsToBasket(basket) {
         active_withdraws: parseInt(basket.settings.activeWithdraws.toString()),
         active_managements: parseInt(basket.settings.activeManagements.toString()),
         last_automation_execution_timestamp: parseInt(basket.settings.lastAutomationExecutionTimestamp.toString()),
+        creation_timestamp: parseInt(basket.settings.creationTimestamp.toString()),
         creator_settings: creator_settings,
         manager_settings: manager_settings,
         fee_settings: fee_settings,

package/dist/src/states/intents/intent.js

@@ -183,7 +183,7 @@ function decodeTaskDataForType(intent) {
                         account_lut_index: oracle.accountsToLoadLutIndices[0],
                         account: "",
                         num_required_accounts: oracle.oracleSettings.numRequiredAccounts,
-                        weight: oracle.oracleSettings.weight,
+                        weight_bps: oracle.oracleSettings.weight,
                         is_required: oracle.oracleSettings.isRequired == 1 ? true : false,
                         conf_thresh_bps: oracle.oracleSettings.confThreshBps,
                         volatility_thresh_bps: oracle.oracleSettings.volatilityThreshBps,
@@ -194,7 +194,7 @@ function decodeTaskDataForType(intent) {
                         token_decimals: oracle.oracleSettings.tokenDecimals,
                         twap_seconds_ago: parseInt(oracle.oracleSettings.twapSecondsAgo.toString()),
                         twap_secondary_seconds_ago: parseInt(oracle.oracleSettings.twapSecondarySecondsAgo.toString()),
-                        quote: (_b = oracle_1.QUOTES_STRINGS.get(oracle.oracleSettings.quote)) !== null && _b !== void 0 ? _b : "usd",
+                        quote_token: (_b = oracle_1.QUOTES_STRINGS.get(oracle.oracleSettings.quote)) !== null && _b !== void 0 ? _b : "usd",
                     });
                 }),
             };

package/dist/src/states/intents/rebalanceIntent.js

@@ -27,6 +27,7 @@ const txUtils_1 = require("../../txUtils");
 const bn_js_1 = __importDefault(require("bn.js"));
 const basket_1 = require("../basket");
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const pythOracle_1 = require("../oracles/pythOracle");
 function computeRebalanceIntentBountyAmount(rebalance_type, num_tokens, bounty_bond, bounty_per_task, bounty_per_price_update_task_max) {
     let num_tasks = 0;
     num_tasks += 1; // FinishPriceUpdates;
@@ -684,6 +685,10 @@ function isRebalanceRequired(basket, connection) {
     return __awaiter(this, void 0, void 0, function* () {
         if (basket.settings.automation.allowAutomation !== 1)
             return false;
+        if (parseInt(basket.settings.activeRebalance.toString()) > 0)
+            return false;
+        if (parseInt(basket.settings.bountyBalance.toString()) == 0)
+            return false;
         let cycleTimestamp = new bn_js_1.default(0);
         let currentTimestamp = new bn_js_1.default(Math.floor(Date.now() / 1000));
         if (basket.settings.schedule.cycleStartTime.gt(currentTimestamp))
@@ -698,7 +703,10 @@ function isRebalanceRequired(basket, connection) {
             .add(basket.settings.automation.rebalanceActivationCooldown);
         if (nextRebalanceTimestamp.gte(currentTimestamp))
             return false;
-        basket = yield (0, basket_1.loadBasketPrice)(basket, connection);
+        const pythPriceOverrides = yield (0, pythOracle_1.buildFreshBasketPythPriceOverrides)(basket, connection);
+        basket = pythPriceOverrides.size > 0
+            ? yield (0, basket_1.loadBasketPriceWithPythPriceOverrides)(basket, connection, pythPriceOverrides)
+            : yield (0, basket_1.loadBasketPrice)(basket, connection);
         let basketTvl = new decimal_js_1.default(0);
         let weightSum = 0;
         for (let i = 0; i < basket.numTokens; i++) {

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

@@ -62,13 +62,15 @@ class PriceAggregator {
             const oracleData = agg.oracles[i];
             const settings = oracleData.oracleSettings;
             let loadedAccounts = [];
-            let loadedAccountPubkeys = [];
+            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());
-                loadedAccountPubkeys.push(pubkey);
+                if (!firstLoadedPubkey) {
+                    firstLoadedPubkey = pubkey;
+                }
                 // @ts-ignore
                 loadedAccounts.push(account);
             }
@@ -93,8 +95,8 @@ class PriceAggregator {
             let result = (() => {
                 switch (settings.oracleType) {
                     case oracle_1.OracleType.Pyth:
-                        if (loadedAccountPubkeys.length > 0) {
-                            const override = pythPriceOverrides === null || pythPriceOverrides === void 0 ? void 0 : pythPriceOverrides.get(loadedAccountPubkeys[0].toBase58());
+                        if (firstLoadedPubkey) {
+                            const override = pythPriceOverrides === null || pythPriceOverrides === void 0 ? void 0 : pythPriceOverrides.get(firstLoadedPubkey.toBase58());
                             if (override) {
                                 return override;
                             }

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

@@ -4,6 +4,7 @@ import { AccountInfo, Connection, Keypair, PublicKey, TransactionInstruction } f
 import { OracleSettings } from '../../layouts/oracle';
 import { TxBatchData } from '../../txUtils';
 import { OraclePrice } from './oracle';
+import { Basket } from '../../layouts/basket';
 export interface HermesPythPriceData {
     price: string | number;
     conf: string | number;
@@ -24,6 +25,7 @@ export declare function parseVerificationLevel(buf: Buffer, offset: number): {
     level: VerificationLevel;
     size: number;
 };
+export declare function buildFreshBasketPythPriceOverrides(basket: Basket, connection: Connection): Promise<Map<string, OraclePrice>>;
 export declare const TIP_ACCOUNTS: string[];
 export declare function getRandomTipAccount(): PublicKey;
 export declare function buildJitoTipInstruction(payer: PublicKey, lamports: number): TransactionInstruction;

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

@@ -16,6 +16,7 @@ exports.PythOracle = exports.PythState = exports.PriceFeedMessage = exports.TIP_
 exports.fetchHermesPythPrices = fetchHermesPythPrices;
 exports.buildPythOraclePriceFromHermesPriceData = buildPythOraclePriceFromHermesPriceData;
 exports.parseVerificationLevel = parseVerificationLevel;
+exports.buildFreshBasketPythPriceOverrides = buildFreshBasketPythPriceOverrides;
 exports.getRandomTipAccount = getRandomTipAccount;
 exports.buildJitoTipInstruction = buildJitoTipInstruction;
 exports.getPythPriceFeedAccountAddress = getPythPriceFeedAccountAddress;
@@ -131,6 +132,77 @@ function parseVerificationLevel(buf, offset) {
         throw new Error(`Unknown verification level: ${discr}`);
     }
 }
+function buildFreshBasketPythPriceOverrides(basket, connection) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const uniqueAccounts = new Map();
+        const settingsByAccount = new Map();
+        const addPythAccount = (pubkey, settings) => {
+            const key = pubkey.toBase58();
+            if (!uniqueAccounts.has(key)) {
+                uniqueAccounts.set(key, pubkey);
+            }
+            if (!settingsByAccount.has(key)) {
+                settingsByAccount.set(key, settings);
+            }
+        };
+        for (let i = 0; i < basket.numTokens; i++) {
+            const agg = basket.composition[i].oracleAggregator;
+            for (let j = 0; j < agg.numOracles; j++) {
+                const oracleData = agg.oracles[j];
+                if (oracleData.oracleSettings.oracleType !== oracle_1.OracleType.Pyth) {
+                    continue;
+                }
+                const lutId = oracleData.accountsToLoadLutIds[0];
+                const lutIdx = oracleData.accountsToLoadLutIndices[0];
+                const pubkey = (_b = (_a = basket.lutPubkeys) === null || _a === void 0 ? void 0 : _a[lutId]) === null || _b === void 0 ? void 0 : _b.state.addresses[lutIdx];
+                if (!pubkey) {
+                    continue;
+                }
+                addPythAccount(pubkey, oracleData.oracleSettings);
+            }
+        }
+        addPythAccount(constants_1.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT, oracle_1.PYTH_WSOL_ORACLE_SETTINGS);
+        addPythAccount(constants_1.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT, oracle_1.PYTH_USDC_ORACLE_SETTINGS);
+        if (uniqueAccounts.size === 0) {
+            return new Map();
+        }
+        const { feedIds, feedIdToAccount } = yield fetchFeedIdsFromAccounts(connection, Array.from(uniqueAccounts.values()));
+        const hermesPrices = yield fetchHermesPythPrices(feedIds);
+        const unitQuotePrice = new oracle_2.OraclePrice(new decimal_js_1.default(1), new decimal_js_1.default(0), 0, true);
+        const wsolAccountKey = constants_1.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT.toBase58();
+        const usdcAccountKey = constants_1.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT.toBase58();
+        let wsolPrice = unitQuotePrice;
+        let usdcPrice = unitQuotePrice;
+        for (const [feedId, account] of feedIdToAccount.entries()) {
+            const accountKey = account.toBase58();
+            const hermesPrice = hermesPrices.get(feedId);
+            if (!hermesPrice) {
+                continue;
+            }
+            if (accountKey === wsolAccountKey) {
+                wsolPrice = buildPythOraclePriceFromHermesPriceData(oracle_1.PYTH_WSOL_ORACLE_SETTINGS, hermesPrice, unitQuotePrice, unitQuotePrice);
+            }
+            else if (accountKey === usdcAccountKey) {
+                usdcPrice = buildPythOraclePriceFromHermesPriceData(oracle_1.PYTH_USDC_ORACLE_SETTINGS, hermesPrice, unitQuotePrice, unitQuotePrice);
+            }
+        }
+        const overrides = new Map();
+        for (const [feedId, hermesPrice] of hermesPrices.entries()) {
+            const account = feedIdToAccount.get(feedId);
+            if (!account) {
+                continue;
+            }
+            const accountKey = account.toBase58();
+            const settings = settingsByAccount.get(accountKey);
+            if (!settings) {
+                continue;
+            }
+            overrides.set(accountKey, buildPythOraclePriceFromHermesPriceData(settings, hermesPrice, wsolPrice, usdcPrice));
+        }
+        return overrides;
+    });
+}
 // Pyth program IDs (mainnet)
 const DEFAULT_RECEIVER_PROGRAM_ID = new web3_js_1.PublicKey("rec5EKMGg6MxZYaMdyBfgwp4d5rB9T1VQH5pJv5LtFJ");
 const DEFAULT_PUSH_ORACLE_PROGRAM_ID = new web3_js_1.PublicKey("pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT");

package/dist/test.js

@@ -49,7 +49,7 @@ function testStates() {
         console.log("Total intents: ", (yield sdk.fetchAllIntents()).length);
         console.log("Total rebalance intents: ", (yield sdk.fetchAllRebalanceIntents()).length);
         console.log("Total withdraw basket fees: ", (yield sdk.fetchAllWithdrawBasketFees()).length);
-        let basket = yield sdk.fetchBasket("GrBFFvtdRL25o7gcRnV1kGvz1Qc7iscUmDp1ZvyBSyUa");
+        let basket = yield sdk.fetchBasket("C2SpNsmPB91ne4JdQRYZZdTJXkMLWyHfMSaZCS9nB33J");
         basket = yield sdk.loadBasketPrice(basket);
         // let ri =(await sdk.fetchAllRebalanceIntents())[0];
         // ri = await sdk.fetchRebalanceIntent(ri.formatted_data.pubkey);
@@ -298,7 +298,7 @@ function testStates() {
                         account_lut_id: 0,
                         account_lut_index: 0,
                         account: constants_1.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT.toBase58(),
-                        weight: 100,
+                        weight_bps: 10000,
                         is_required: true,
                         conf_thresh_bps: 200,
                         volatility_thresh_bps: 200,
@@ -309,7 +309,7 @@ function testStates() {
                         token_decimals: 9,
                         twap_seconds_ago: 100,
                         twap_secondary_seconds_ago: 100,
-                        quote: "usd",
+                        quote_token: "usd",
                     },
                 ],
             };
@@ -480,7 +480,7 @@ function testStates() {
         if (tests.claimTokenFeesFromBasket) {
             let tx = yield sdk.claimTokenFeesFromBasketTx({
                 claimer: wallet.publicKey.toBase58(),
-                withdrawBasketFees: new web3_js_1.PublicKey("").toBase58(),
+                withdrawBasketFees: new web3_js_1.PublicKey("CiX2zEUhWRwirCwsfst49PeFoQXTthcjxj8YnFoYGQ4Y").toBase58(),
             });
             let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
             console.log(res);
@@ -506,17 +506,17 @@ function testStates() {
                     maxWithdrawFeeBps: 1000,
                     maxManagementFeeBps: 2000,
                     maxPerformanceFeeBps: 2000,
-                    symmetryFeeCollector: new web3_js_1.PublicKey("UserevMsvU5K9u6iW7DT9XJVyVLpmfDCEAfXixBbE7R"),
-                    symmetryDepositFeeBps: 10,
-                    symmetryDepositFeeShareBps: 50,
-                    symmetryWithdrawFeeBps: 50,
-                    symmetryWithdrawFeeShareBps: 50,
-                    symmetryManagementFeeBps: 50,
-                    symmetryManagementFeeShareBps: 50,
-                    symmetryPerformanceFeeBps: 50,
-                    symmetryPerformanceFeeShareBps: 50,
-                    symmetryTradeFeeBps: 50,
-                    symmetryLimitOrderFeeBps: 50,
+                    symmetryFeeCollector: new web3_js_1.PublicKey("9A5V7smsUMRNNzvrawbDx3ZexZR3LY1bcEUXUiMJ2bxk"),
+                    symmetryDepositFeeBps: 0,
+                    symmetryDepositFeeShareBps: 0,
+                    symmetryWithdrawFeeBps: 0,
+                    symmetryWithdrawFeeShareBps: 0,
+                    symmetryManagementFeeBps: 0,
+                    symmetryManagementFeeShareBps: 0,
+                    symmetryPerformanceFeeBps: 0,
+                    symmetryPerformanceFeeShareBps: 0,
+                    symmetryTradeFeeBps: 0,
+                    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"),
                     minBountyForBasketAutomation: new anchor_1.BN(200 * 50 * 10 ** 3),

package/package.json

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

package/src/index.ts

@@ -68,7 +68,7 @@ import {
 import { FormattedOracleType, OracleType } from './layouts/oracle';
 import {
     BasketFilter, computeTokenMintsHash, fetchBasket, fetchBaskets, fetchBasketsMultiple,
-    loadBasketPrice, loadBasketPriceWithPythPriceOverrides
+    loadBasketPrice
 } from './states/basket';
 import { fetchGlobalConfig } from './states/config';
 import {
@@ -76,9 +76,8 @@ import {
 } from './states/intents/intent';
 import {
     computeRebalanceIntentBountyAmount, fetchRebalanceIntent, fetchRebalanceIntents,
-    fetchRebalanceIntentsMultiple, getSwapPairs, RebalanceIntentFilter, isRebalanceRequired
+    fetchRebalanceIntentsMultiple, getSwapPairs, isRebalanceRequired, RebalanceIntentFilter
 } from './states/intents/rebalanceIntent';
-import { OraclePrice } from './states/oracles/oracle';
 import { buildPythPriceFeedUpdateIxs, fetchFeedIdsFromAccounts } from './states/oracles/pythOracle';
 import {
     fetchWithdrawBasketFees, fetchWithdrawBasketFeesList, fetchWithdrawBasketFeesMultiple,
@@ -238,101 +237,6 @@ export class SymmetryCore {
         return await loadBasketPrice(basket, this.sdkParams.connection);
     }
 
-    async loadBasketPriceWithPythPriceOverrides(params: {
-        basket: Basket,
-        pyth_price_overrides?: Map<string, OraclePrice>,
-    }): Promise<Basket> {
-        return await loadBasketPriceWithPythPriceOverrides(
-            params.basket,
-            this.sdkParams.connection,
-            params.pyth_price_overrides,
-        );
-    }
-
-    /**
-     * Checks whether a basket currently meets the automation rebalance trigger.
-     * Uses the existing basket pricing flow.
-    */
-    async isBasketRebalanceRequired(params: {
-        basket: string | Basket,
-        pyth_price_overrides?: Map<string, OraclePrice>,
-    }): Promise<boolean> {
-        let basket = typeof params.basket === 'string'
-            ? await this.fetchBasket(params.basket)
-            : params.basket;
-
-        if (!basket.formatted?.automation_settings.enabled && basket.settings.automation.allowAutomation !== 1) {
-            return false;
-        }
-
-        if (params.pyth_price_overrides && params.pyth_price_overrides.size > 0) {
-            basket = await this.loadBasketPriceWithPythPriceOverrides({
-                basket,
-                pyth_price_overrides: params.pyth_price_overrides,
-            });
-        } else {
-            basket = await this.loadBasketPrice(basket);
-        }
-
-        return this.computeBasketRebalanceRequiredFromPricedBasket(basket);
-    }
-
-    private computeBasketRebalanceRequiredFromPricedBasket(basket: Basket): boolean {
-        const basketTvl = basket.tvl ?? basket.composition
-            .slice(0, basket.numTokens)
-            .reduce((sum, asset) => {
-                const value = asset.value ?? asset.price?.getMid().mul(new Decimal(asset.amount.toString())) ?? new Decimal(0);
-                return sum.add(value);
-            }, new Decimal(0));
-
-        if (!basketTvl.isFinite() || basketTvl.lte(0)) {
-            return false;
-        }
-
-        const weightSum = basket.composition
-            .slice(0, basket.numTokens)
-            .reduce((sum, asset) => sum + asset.weight, 0);
-        if (weightSum <= 0) {
-            return false;
-        }
-
-        const requiredRelBps = new Decimal(basket.settings.automation.rebalanceActivationThresholdRelBps);
-        const requiredAbsBps = new Decimal(basket.settings.automation.rebalanceActivationThresholdAbsBps);
-        const bountyMint = basket.settings.bountyMint;
-        const hundredPercentBps = new Decimal(10_000);
-
-        for (const asset of basket.composition.slice(0, basket.numTokens)) {
-            if (asset.mint.equals(bountyMint)) {
-                continue;
-            }
-
-            const tokenPrice = asset.price?.getMid();
-            if (!tokenPrice || !tokenPrice.isFinite() || tokenPrice.lte(0)) {
-                continue;
-            }
-
-            const tokenValue = asset.value ?? tokenPrice.mul(new Decimal(asset.amount.toString()));
-            const targetValue = basketTvl.mul(asset.weight).div(weightSum);
-            const valueDiff = tokenValue.sub(targetValue).abs();
-            if (valueDiff.eq(0)) {
-                continue;
-            }
-
-            const maxValue = Decimal.max(tokenValue, targetValue);
-            if (!maxValue.isFinite() || maxValue.lte(0)) {
-                continue;
-            }
-
-            const relBps = valueDiff.div(maxValue).mul(hundredPercentBps);
-            const absBps = valueDiff.div(basketTvl).mul(hundredPercentBps);
-            if (relBps.gte(requiredRelBps) && absBps.gte(requiredAbsBps)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     /**
      * Fetches an intent by its public key.
      * @param {string} intentPubkey - The public key of the intent.
@@ -2088,13 +1992,48 @@ export class SymmetryCore {
     }): Promise<TxPayloadBatchSequence> {
         let keeper = new PublicKey(params.keeper);
         let rebalanceIntent: RebalanceIntent = (await this.fetchRebalanceIntent(params.rebalance_intent)).chain_data;
+        const tokensWithBalance = rebalanceIntent.tokens.filter(token => token.amount.gt(new BN(0)));
+        const ownerIsKeeper = rebalanceIntent.owner.equals(keeper);
+
+        let redeemableTokenMints = tokensWithBalance.map(token => token.mint);
+        if (!ownerIsKeeper && tokensWithBalance.length > 0) {
+            const mintInfos = await this.sdkParams.connection.getMultipleAccountsInfo(tokensWithBalance.map(token => token.mint));
+            const ataChecks = tokensWithBalance.map((token, index) => {
+                const mintInfo = mintInfos[index];
+                if (!mintInfo) {
+                    throw new Error(`Mint account not found for redeem token ${token.mint.toBase58()}`);
+                }
+
+                let tokenProgram: PublicKey;
+                if (mintInfo.owner.equals(TOKEN_PROGRAM_ID) || mintInfo.owner.equals(TOKEN_2022_PROGRAM_ID)) {
+                    tokenProgram = mintInfo.owner;
+                } else {
+                    throw new Error(`Unsupported token program for redeem token ${token.mint.toBase58()}: ${mintInfo.owner.toBase58()}`);
+                }
+
+                return {
+                    mint: token.mint,
+                    ata: getAta(rebalanceIntent.owner, token.mint, tokenProgram),
+                };
+            });
+
+            const ataInfos = await this.sdkParams.connection.getMultipleAccountsInfo(ataChecks.map(item => item.ata));
+            redeemableTokenMints = ataChecks
+                .filter((_, index) => ataInfos[index] !== null)
+                .map(item => item.mint);
+
+            if (redeemableTokenMints.length === 0) {
+                const blockedMints = ataChecks.map(item => item.mint.toBase58()).join(', ');
+                throw new Error(
+                    `NoRedeemableTokens: owner ${rebalanceIntent.owner.toBase58()} has no ATA for remaining tokens [${blockedMints}]`
+                );
+            }
+        }
+
         let batchSize = 7;
         let ixs: TransactionInstruction[] = [];
-        for (let batchStart = 0; batchStart < rebalanceIntent.tokens.length; batchStart += batchSize) {
-            let tokenMints: PublicKey[] = [];
-            for (let i = batchStart; i < rebalanceIntent.tokens.length && i < batchStart + batchSize; i++)
-                if (rebalanceIntent.tokens[i].amount.gt(new BN(0)))
-                    tokenMints.push(rebalanceIntent.tokens[i].mint);
+        for (let batchStart = 0; batchStart < redeemableTokenMints.length; batchStart += batchSize) {
+            let tokenMints = redeemableTokenMints.slice(batchStart, batchStart + batchSize);
             if (tokenMints.length > 0) {
                 ixs.push(
                     redeemTokensIx({
@@ -2106,6 +2045,7 @@ export class SymmetryCore {
                 );
             }
         }
+
         let txBatchData: TxBatchData = {batches: [ixs.map(ix => ({
             payer: keeper,
             instructions: [

package/src/instructions/management/claimFees.ts

@@ -10,7 +10,7 @@ import {
 
 const WITHDRAW_FEES_DISCRIMINATOR = Buffer.from([159, 222, 146, 66, 254, 108, 55, 51]);
 
-const CLAIM_FEE_TOKENS_FROM_BASKET_DISCRIMINATOR = Buffer.from([53, 109, 220, 141, 193, 193, 13, 32]);
+const CLAIM_FEE_TOKENS_FROM_BASKET_DISCRIMINATOR = Buffer.from([53, 109, 220, 141, 110, 5, 193, 32]);
 
 export function withdrawFeesIx(params: {
     claimer: PublicKey,

package/src/instructions/management/edit.ts

@@ -350,7 +350,7 @@ export function createEditBasketIntentIx(params: {
                     oracleSettings: {
                         oracleType: [...ORACLE_TYPES_STRINGS.entries()].find(([, name]) => name === addTokenData.oracles[i].oracle_type)?.[0] ?? 255,
                         numRequiredAccounts: 0,
-                        weight: addTokenData.oracles[i].weight,
+                        weight: addTokenData.oracles[i].weight_bps,
                         isRequired: addTokenData.oracles[i].is_required ? 1 : 0,
                         confThreshBps: addTokenData.oracles[i].conf_thresh_bps,
                         volatilityThreshBps: addTokenData.oracles[i].volatility_thresh_bps,
@@ -361,7 +361,7 @@ export function createEditBasketIntentIx(params: {
                         tokenDecimals: addTokenData.oracles[i].token_decimals,
                         twapSecondsAgo: new BN(addTokenData.oracles[i].twap_seconds_ago),
                         twapSecondarySecondsAgo: new BN(addTokenData.oracles[i].twap_secondary_seconds_ago),
-                        quote: [...QUOTES_STRINGS.entries()].find(([, name]) => name === addTokenData.oracles[i].quote)?.[0] ?? Quote.Usd,
+                        quote: [...QUOTES_STRINGS.entries()].find(([, name]) => name === addTokenData.oracles[i].quote_token)?.[0] ?? Quote.Usd,
                         side: Side.Base,
                     },
                     accountsToLoadLutIds: new Array(MAX_ACCOUNTS_PER_ORACLE).fill(0),

package/src/layouts/basket.ts

@@ -102,6 +102,7 @@ export interface FormattedBasket {
     active_withdraws: number;
     active_managements: number;
     last_automation_execution_timestamp: number;
+    creation_timestamp: number;
     creator_settings: FormattedCreatorSettings;
     manager_settings: FormattedManagersSettings;
     fee_settings: FormattedFeeSettings;

package/src/layouts/config.ts

@@ -350,6 +350,7 @@ export interface BasketSettings {
     makeDirectSwapIntentAuthorityBitmask: number; // u16,
 
     extraData: BN[]; // [u64; 32],
+    creationTimestamp: BN; // u64,
 }
 
 export const BasketSettingsLayout = struct<BasketSettings>([
@@ -420,7 +421,8 @@ export const BasketSettingsLayout = struct<BasketSettings>([
     u64('makeDirectSwapLastUpdateTimestamp'),
     u16('makeDirectSwapIntentAuthorityBitmask'),
   
-    array(u64(), 32, 'extraData'),
+    array(u64(), 31, 'extraData'),
+    u64('creationTimestamp'),
 ]);
 
 

package/src/layouts/intents/intent.ts

@@ -265,7 +265,7 @@ export interface OracleInput {
     account_lut_id: number,
     account_lut_index: number,
     account: string,
-    weight: number,
+    weight_bps: number,
     is_required: boolean,
     conf_thresh_bps: number,
     volatility_thresh_bps: number,
@@ -276,7 +276,7 @@ export interface OracleInput {
     token_decimals: number,
     twap_seconds_ago: number,
     twap_secondary_seconds_ago: number,
-    quote: FormattedQuote,
+    quote_token: FormattedQuote,
 }
 
 export interface AddOrEditTokenInput {

package/src/states/basket.ts

@@ -226,7 +226,7 @@ export function addFieldsToBasket(basket: Basket): Basket {
                     account_lut_index: oracle.accountsToLoadLutIndices[0],
                     account: lookup_tables.active[oracle.accountsToLoadLutIds[0]].contents[oracle.accountsToLoadLutIndices[0]],
                     num_required_accounts: oracle.oracleSettings.numRequiredAccounts,
-                    weight: oracle.oracleSettings.weight,
+                    weight_bps: oracle.oracleSettings.weight,
                     is_required: oracle.oracleSettings.isRequired == 1 ? true : false,
                     conf_thresh_bps: oracle.oracleSettings.confThreshBps,
                     volatility_thresh_bps: oracle.oracleSettings.volatilityThreshBps,
@@ -237,7 +237,7 @@ export function addFieldsToBasket(basket: Basket): Basket {
                     token_decimals: oracle.oracleSettings.tokenDecimals,
                     twap_seconds_ago: parseInt(oracle.oracleSettings.twapSecondsAgo.toString()),
                     twap_secondary_seconds_ago: parseInt(oracle.oracleSettings.twapSecondarySecondsAgo.toString()),
-                    quote: QUOTES_STRINGS.get(oracle.oracleSettings.quote) ?? "usd",
+                    quote_token: QUOTES_STRINGS.get(oracle.oracleSettings.quote) ?? "usd",
                     side: oracle.oracleSettings.side == 0 ? "base" : "quote",
                 },
                 accounts_to_load_lut_ids: oracle.accountsToLoadLutIds.map(id => id),
@@ -270,6 +270,7 @@ export function addFieldsToBasket(basket: Basket): Basket {
         active_withdraws: parseInt(basket.settings.activeWithdraws.toString()),
         active_managements: parseInt(basket.settings.activeManagements.toString()),
         last_automation_execution_timestamp: parseInt(basket.settings.lastAutomationExecutionTimestamp.toString()),
+        creation_timestamp: parseInt(basket.settings.creationTimestamp.toString()),
         creator_settings: creator_settings,
         manager_settings: manager_settings,
         fee_settings: fee_settings,

package/src/states/intents/intent.ts

@@ -170,7 +170,7 @@ function decodeTaskDataForType(intent: Intent): Settings {
                     account_lut_index: oracle.accountsToLoadLutIndices[0],
                     account: "",
                     num_required_accounts: oracle.oracleSettings.numRequiredAccounts,
-                    weight: oracle.oracleSettings.weight,
+                    weight_bps: oracle.oracleSettings.weight,
                     is_required: oracle.oracleSettings.isRequired == 1 ? true : false,
                     conf_thresh_bps: oracle.oracleSettings.confThreshBps,
                     volatility_thresh_bps: oracle.oracleSettings.volatilityThreshBps,
@@ -181,7 +181,7 @@ function decodeTaskDataForType(intent: Intent): Settings {
                     token_decimals: oracle.oracleSettings.tokenDecimals,
                     twap_seconds_ago: parseInt(oracle.oracleSettings.twapSecondsAgo.toString()),
                     twap_secondary_seconds_ago: parseInt(oracle.oracleSettings.twapSecondarySecondsAgo.toString()),
-                    quote: QUOTES_STRINGS.get(oracle.oracleSettings.quote) ?? "usd",
+                    quote_token: QUOTES_STRINGS.get(oracle.oracleSettings.quote) ?? "usd",
                 })),
             }
             return add_token_input;

package/src/states/intents/rebalanceIntent.ts

@@ -7,8 +7,9 @@ import { getMultipleAccountsInfoBatched } from "../../txUtils";
 import BN from "bn.js";
 import { Basket, FormattedBasket } from "../../layouts/basket";
 import { OraclePriceOnChain } from "../../layouts/oracle";
-import { fetchBasket, loadBasketPrice } from "../basket";
+import { fetchBasket, loadBasketPrice, loadBasketPriceWithPythPriceOverrides } from "../basket";
 import Decimal from "decimal.js";
+import { buildFreshBasketPythPriceOverrides } from "../oracles/pythOracle";
 
 export function computeRebalanceIntentBountyAmount(
     rebalance_type: RebalanceType,
@@ -756,6 +757,8 @@ export async function isRebalanceRequired(
     connection: Connection,
 ): Promise<boolean> {
     if (basket.settings.automation.allowAutomation !== 1) return false;
+    if (parseInt(basket.settings.activeRebalance.toString()) > 0) return false;
+    if (parseInt(basket.settings.bountyBalance.toString()) == 0) return false;
     let cycleTimestamp = new BN(0);
     let currentTimestamp = new BN(Math.floor(Date.now() / 1000));
     if (basket.settings.schedule.cycleStartTime.gt(currentTimestamp))
@@ -773,7 +776,10 @@ export async function isRebalanceRequired(
     if (nextRebalanceTimestamp.gte(currentTimestamp))
         return false;
 
-    basket = await loadBasketPrice(basket, connection);
+    const pythPriceOverrides = await buildFreshBasketPythPriceOverrides(basket, connection);
+    basket = pythPriceOverrides.size > 0
+        ? await loadBasketPriceWithPythPriceOverrides(basket, connection, pythPriceOverrides)
+        : await loadBasketPrice(basket, connection);
     let basketTvl = new Decimal(0);
     let weightSum = 0;
     for (let i = 0; i < basket.numTokens; i++) {

package/src/states/oracles/oracle.ts

@@ -93,13 +93,15 @@ export class PriceAggregator{
             const settings = oracleData.oracleSettings;
 
             let loadedAccounts: AccountInfo<Buffer>[] = [];
-            let loadedAccountPubkeys: PublicKey[] = [];
+            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());
-                loadedAccountPubkeys.push(pubkey);
+                if (!firstLoadedPubkey) {
+                    firstLoadedPubkey = pubkey;
+                }
                 // @ts-ignore
                 loadedAccounts.push(account);
             }
@@ -125,8 +127,8 @@ export class PriceAggregator{
             let result = (() => {
                 switch (settings.oracleType) {
                     case OracleType.Pyth:
-                        if (loadedAccountPubkeys.length > 0) {
-                            const override = pythPriceOverrides?.get(loadedAccountPubkeys[0].toBase58());
+                        if (firstLoadedPubkey) {
+                            const override = pythPriceOverrides?.get(firstLoadedPubkey.toBase58());
                             if (override) {
                                 return override;
                             }

package/src/states/oracles/pythOracle.ts

@@ -7,11 +7,12 @@ import {
     SystemProgram, Transaction, TransactionInstruction, TransactionMessage, VersionedTransaction
 } from '@solana/web3.js';
 
-import { HUNDRED_PERCENT_BPS } from '../../constants';
-import { OracleSettings, Quote } from '../../layouts/oracle';
+import { HUNDRED_PERCENT_BPS, PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT, PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT } 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';
 import { OraclePrice } from './oracle';
+import { Basket } from '../../layouts/basket';
 
 export interface HermesPythPriceData {
     price: string | number;
@@ -157,6 +158,107 @@ export function parseVerificationLevel(buf: Buffer, offset: number): { level: Ve
     }
 }
 
+export async function buildFreshBasketPythPriceOverrides(
+    basket: Basket,
+    connection: Connection,
+): Promise<Map<string, OraclePrice>> {
+    const uniqueAccounts = new Map<string, PublicKey>();
+    const settingsByAccount = new Map<string, typeof PYTH_WSOL_ORACLE_SETTINGS>();
+
+    const addPythAccount = (pubkey: PublicKey, settings: typeof PYTH_WSOL_ORACLE_SETTINGS) => {
+        const key = pubkey.toBase58();
+        if (!uniqueAccounts.has(key)) {
+            uniqueAccounts.set(key, pubkey);
+        }
+        if (!settingsByAccount.has(key)) {
+            settingsByAccount.set(key, settings);
+        }
+    };
+
+    for (let i = 0; i < basket.numTokens; i++) {
+        const agg = basket.composition[i].oracleAggregator;
+        for (let j = 0; j < agg.numOracles; j++) {
+            const oracleData = agg.oracles[j];
+            if (oracleData.oracleSettings.oracleType !== OracleType.Pyth) {
+                continue;
+            }
+
+            const lutId = oracleData.accountsToLoadLutIds[0];
+            const lutIdx = oracleData.accountsToLoadLutIndices[0];
+            const pubkey = basket.lutPubkeys?.[lutId]?.state.addresses[lutIdx];
+            if (!pubkey) {
+                continue;
+            }
+
+            addPythAccount(pubkey, oracleData.oracleSettings);
+        }
+    }
+
+    addPythAccount(PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT, PYTH_WSOL_ORACLE_SETTINGS);
+    addPythAccount(PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT, PYTH_USDC_ORACLE_SETTINGS);
+
+    if (uniqueAccounts.size === 0) {
+        return new Map();
+    }
+
+    const { feedIds, feedIdToAccount } = await fetchFeedIdsFromAccounts(
+        connection,
+        Array.from(uniqueAccounts.values()),
+    );
+    const hermesPrices = await fetchHermesPythPrices(feedIds);
+
+    const unitQuotePrice = new OraclePrice(new Decimal(1), new Decimal(0), 0, true);
+    const wsolAccountKey = PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT.toBase58();
+    const usdcAccountKey = PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT.toBase58();
+    let wsolPrice = unitQuotePrice;
+    let usdcPrice = unitQuotePrice;
+
+    for (const [feedId, account] of feedIdToAccount.entries()) {
+        const accountKey = account.toBase58();
+        const hermesPrice = hermesPrices.get(feedId);
+        if (!hermesPrice) {
+            continue;
+        }
+
+        if (accountKey === wsolAccountKey) {
+            wsolPrice = buildPythOraclePriceFromHermesPriceData(
+                PYTH_WSOL_ORACLE_SETTINGS,
+                hermesPrice,
+                unitQuotePrice,
+                unitQuotePrice,
+            );
+        } else if (accountKey === usdcAccountKey) {
+            usdcPrice = buildPythOraclePriceFromHermesPriceData(
+                PYTH_USDC_ORACLE_SETTINGS,
+                hermesPrice,
+                unitQuotePrice,
+                unitQuotePrice,
+            );
+        }
+    }
+
+    const overrides = new Map<string, OraclePrice>();
+    for (const [feedId, hermesPrice] of hermesPrices.entries()) {
+        const account = feedIdToAccount.get(feedId);
+        if (!account) {
+            continue;
+        }
+
+        const accountKey = account.toBase58();
+        const settings = settingsByAccount.get(accountKey);
+        if (!settings) {
+            continue;
+        }
+
+        overrides.set(
+            accountKey,
+            buildPythOraclePriceFromHermesPriceData(settings, hermesPrice, wsolPrice, usdcPrice),
+        );
+    }
+
+    return overrides;
+}
+
 // Pyth program IDs (mainnet)
 const DEFAULT_RECEIVER_PROGRAM_ID = new PublicKey("rec5EKMGg6MxZYaMdyBfgwp4d5rB9T1VQH5pJv5LtFJ");
 const DEFAULT_PUSH_ORACLE_PROGRAM_ID = new PublicKey("pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT");

package/test.ts

@@ -47,7 +47,7 @@ async function testStates() {
     console.log("Total rebalance intents: ", (await sdk.fetchAllRebalanceIntents()).length);
     console.log("Total withdraw basket fees: ", (await sdk.fetchAllWithdrawBasketFees()).length);
 
-    let basket = await sdk.fetchBasket("GrBFFvtdRL25o7gcRnV1kGvz1Qc7iscUmDp1ZvyBSyUa");
+    let basket = await sdk.fetchBasket("C2SpNsmPB91ne4JdQRYZZdTJXkMLWyHfMSaZCS9nB33J");
     basket = await sdk.loadBasketPrice(basket);
     // let ri =(await sdk.fetchAllRebalanceIntents())[0];
     // ri = await sdk.fetchRebalanceIntent(ri.formatted_data.pubkey);
@@ -327,7 +327,7 @@ async function testStates() {
                     account_lut_id: 0,
                     account_lut_index: 0,
                     account: PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT.toBase58(),
-                    weight: 100,
+                    weight_bps: 10000,
                     is_required: true,
                     conf_thresh_bps: 200,
                     volatility_thresh_bps: 200,
@@ -338,7 +338,7 @@ async function testStates() {
                     token_decimals: 9,
                     twap_seconds_ago: 100,
                     twap_secondary_seconds_ago: 100,
-                    quote: "usd",
+                    quote_token: "usd",
                 },
             ],
         };
@@ -518,7 +518,7 @@ async function testStates() {
     if (tests.claimTokenFeesFromBasket) {
         let tx = await sdk.claimTokenFeesFromBasketTx({
             claimer: wallet.publicKey.toBase58(),
-            withdrawBasketFees: new PublicKey("").toBase58(),
+            withdrawBasketFees: new PublicKey("CiX2zEUhWRwirCwsfst49PeFoQXTthcjxj8YnFoYGQ4Y").toBase58(),
         });
         let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
         console.log(res);
@@ -549,17 +549,17 @@ async function testStates() {
                 maxManagementFeeBps: 2000,
                 maxPerformanceFeeBps: 2000,
 
-                symmetryFeeCollector: new PublicKey("UserevMsvU5K9u6iW7DT9XJVyVLpmfDCEAfXixBbE7R"),
-                symmetryDepositFeeBps: 10,
-                symmetryDepositFeeShareBps: 50,
-                symmetryWithdrawFeeBps: 50,
-                symmetryWithdrawFeeShareBps: 50,
-                symmetryManagementFeeBps: 50,
-                symmetryManagementFeeShareBps: 50,
-                symmetryPerformanceFeeBps: 50,
-                symmetryPerformanceFeeShareBps: 50,
-                symmetryTradeFeeBps: 50,
-                symmetryLimitOrderFeeBps: 50,
+                symmetryFeeCollector: new PublicKey("9A5V7smsUMRNNzvrawbDx3ZexZR3LY1bcEUXUiMJ2bxk"),
+                symmetryDepositFeeBps: 0,
+                symmetryDepositFeeShareBps: 0,
+                symmetryWithdrawFeeBps: 0,
+                symmetryWithdrawFeeShareBps: 0,
+                symmetryManagementFeeBps: 0,
+                symmetryManagementFeeShareBps: 0,
+                symmetryPerformanceFeeBps: 0,
+                symmetryPerformanceFeeShareBps: 0,
+                symmetryTradeFeeBps: 0,
+                symmetryLimitOrderFeeBps: 0,
                 symmetryFeesExtraData: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,],
 
                 bountyMint: new PublicKey("So11111111111111111111111111111111111111112"),