@symmetry-hq/sdk 1.0.2 → 1.0.4

package/dist/src/index.d.ts

@@ -3,11 +3,12 @@ import { getJupTokenLedgerAndSwapInstructions } from './jup';
 import { Basket, FormattedAccumulatedFees, FormattedAddTokenSettings, FormattedAsset, FormattedAutomationSettings, FormattedBasket, FormattedCreatorSettings, FormattedCustomRebalanceSettings, FormattedDepositsSettings, FormattedFeeSettings, FormattedForceRebalanceSettings, FormattedLookupTables, FormattedLpSettings, FormattedMakeDirectSwapSettings, FormattedManagersSettings, FormattedMetadataSettings, FormattedOracle, FormattedOracleAggregator, FormattedOracleSettings, FormattedScheduleSettings, FormattedUpdateWeightsSettings, WithdrawBasketFees } from './layouts/basket';
 import { FormattedGlobalConfig, GlobalConfig } from './layouts/config';
 import { AddOrEditTokenInput, EditAddTokenSettings, EditAutomationSettings, EditCreatorSettings, EditCustomRebalanceSettings, EditDepositsSettings, EditFeeSettings, EditForceRebalanceSettings, EditLpSettings, EditMakeDirectSwapSettings, EditManagerSettings, EditMetadataSettings, EditScheduleSettings, EditUpdateWeightsSettings, FormattedBounty, FormattedBountySchedule, FormattedIntent, FormattedIntentStatus, FormattedTaskType, Intent, MakeDirectSwapInput, OracleInput, Settings, TaskContext, TaskType, UpdateWeightsInput } from './layouts/intents/intent';
-import { FormattedOraclePrice, FormattedRebalanceAction, FormattedRebalanceIntent, FormattedRebalanceType, FormattedTaskCompletion, FormattedTokenAuction, MintData, PriceUpdatesData, RebalanceIntent, AuctionData, RedeemData, DepositData, ClaimBountyData, UIRebalanceIntent } from './layouts/intents/rebalanceIntent';
+import { AuctionData, ClaimBountyData, DepositData, FormattedOraclePrice, FormattedRebalanceAction, FormattedRebalanceIntent, FormattedRebalanceType, FormattedTaskCompletion, FormattedTokenAuction, MintData, PriceUpdatesData, RebalanceIntent, RedeemData, UIRebalanceIntent } from './layouts/intents/rebalanceIntent';
 import { FormattedOracleType } from './layouts/oracle';
 import { BasketFilter } from './states/basket';
 import { IntentFilter } from './states/intents/intent';
-import { getSwapPairs, isRebalanceRequired, RebalanceIntentFilter } from './states/intents/rebalanceIntent';
+import { getSwapPairs, RebalanceIntentFilter, isRebalanceRequired } from './states/intents/rebalanceIntent';
+import { OraclePrice } from './states/oracles/oracle';
 import { WithdrawBasketFeesFilter } from './states/withdrawBasketFees';
 import { BasketCreationTx, TxPayloadBatchSequence, VersionedTxs, Wallet } from './txUtils';
 export declare class SymmetryCore {
@@ -90,6 +91,19 @@ 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.
@@ -382,6 +396,18 @@ export declare class SymmetryCore {
         keeper: string;
         intent: string;
     }): Promise<TxPayloadBatchSequence>;
+    /**
+     * Executes an existing make-direct-swap basket intent.
+     * Builds the flash swap batch first and then executes the intent once the
+     * basket balances have been updated by the swap.
+     */
+    executeDirectSwapIntentTx(params: {
+        keeper: string;
+        intent: string;
+        jup_token_ledger_ix?: TransactionInstruction;
+        jup_swap_ix: TransactionInstruction;
+        jup_address_lookup_table_addresses?: PublicKey[];
+    }): Promise<TxPayloadBatchSequence>;
     /**
      * Cancels a basket intent. Basket intent account will get closed.
      * @param {Object} params - The parameters for the basket intent.

package/dist/src/index.js

@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RebalanceHandler = exports.KeeperMonitor = exports.isRebalanceRequired = exports.getSwapPairs = exports.getJupTokenLedgerAndSwapInstructions = exports.TaskType = exports.SymmetryCore = void 0;
-const decimal_js_1 = __importDefault(require("decimal.js"));
 const bn_js_1 = __importDefault(require("bn.js"));
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
@@ -44,8 +44,8 @@ const intent_2 = require("./states/intents/intent");
 const rebalanceIntent_3 = require("./states/intents/rebalanceIntent");
 Object.defineProperty(exports, "getSwapPairs", { enumerable: true, get: function () { return rebalanceIntent_3.getSwapPairs; } });
 Object.defineProperty(exports, "isRebalanceRequired", { enumerable: true, get: function () { return rebalanceIntent_3.isRebalanceRequired; } });
-const withdrawBasketFees_1 = require("./states/withdrawBasketFees");
 const pythOracle_1 = require("./states/oracles/pythOracle");
+const withdrawBasketFees_1 = require("./states/withdrawBasketFees");
 const txUtils_1 = require("./txUtils");
 class SymmetryCore {
     /**
@@ -193,6 +193,84 @@ 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.
@@ -866,6 +944,74 @@ class SymmetryCore {
             return txPayloadBatchSequence;
         });
     }
+    /**
+     * Executes an existing make-direct-swap basket intent.
+     * Builds the flash swap batch first and then executes the intent once the
+     * basket balances have been updated by the swap.
+     */
+    executeDirectSwapIntentTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const keeper = new web3_js_1.PublicKey(params.keeper);
+            const intent = yield this.fetchIntent(params.intent);
+            if (intent.taskType !== intent_1.TaskType.MakeDirectSwap) {
+                throw new Error('Intent is not a make_direct_swap intent');
+            }
+            const taskData = (_a = intent.formatted) === null || _a === void 0 ? void 0 : _a.task_data;
+            if (!taskData) {
+                throw new Error('Make direct swap intent is missing decoded task data');
+            }
+            const flashParams = {
+                keeper,
+                basket: intent.basket,
+                rebalanceIntent: undefined,
+                intent: intent.ownAddress,
+                mintIn: new web3_js_1.PublicKey(taskData.from_token_mint),
+                mintOut: new web3_js_1.PublicKey(taskData.to_token_mint),
+                amountIn: new bn_js_1.default(taskData.amount_from),
+                amountOut: new bn_js_1.default(taskData.amount_to),
+                mode: undefined,
+            };
+            const ixWithdraw = (0, flashSwap_1.flashWithdrawIx)(flashParams);
+            const ixDeposit = (0, flashSwap_1.flashDepositIx)(flashParams);
+            const executeIx = (0, edit_1.executeEditBasketIntentIx)({
+                basket: intent.basket,
+                intent: intent.ownAddress,
+                editType: intent.taskType,
+                manager: intent.manager,
+                bountyMint: intent.bounty.bountyMint,
+                keeper,
+                basketMint: undefined,
+            });
+            const flashInstructions = [
+                (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(keeper, (0, pda_1.getAta)(keeper, flashParams.mintIn), keeper, flashParams.mintIn),
+                (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(keeper, (0, pda_1.getAta)(keeper, flashParams.mintOut), keeper, flashParams.mintOut),
+            ];
+            if (params.jup_token_ledger_ix) {
+                flashInstructions.push(params.jup_token_ledger_ix);
+            }
+            flashInstructions.push(ixWithdraw, params.jup_swap_ix, ixDeposit, web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }), web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }));
+            const txBatchData = { batches: [
+                    [{
+                            payer: keeper,
+                            instructions: flashInstructions,
+                            lookupTables: (_b = params.jup_address_lookup_table_addresses) !== null && _b !== void 0 ? _b : [],
+                        }],
+                    [{
+                            payer: keeper,
+                            instructions: [
+                                executeIx,
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        }],
+                ] };
+            const versionedTxs = yield (0, txUtils_1.prepareVersionedTxs)(this.sdkParams.connection, txBatchData);
+            const txPayloadBatchSequence = (0, txUtils_1.prepareTxPayloadBatchSequence)(txBatchData, versionedTxs);
+            return txPayloadBatchSequence;
+        });
+    }
     /**
      * Cancels a basket intent. Basket intent account will get closed.
      * @param {Object} params - The parameters for the basket intent.

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

@@ -67,7 +67,7 @@ function editPrivateBasketSettingsIx(params) {
     });
 }
 function createEditBasketIntentIx(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const { manager, basket, intent, intentSeedArray, editType, editData, activationTimestamp, expirationTimestamp, minBounty, maxBounty, tokenProgram, } = params;
     let globalConfig = (0, pda_1.getGlobalConfigPda)();
     let bountyVault = (0, pda_1.getBountyVaultPda)();
@@ -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: oracle_1.Quote.Wsol,
+                        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,
                         side: oracle_1.Side.Base,
                     },
                     accountsToLoadLutIds: new Array(oracle_1.MAX_ACCOUNTS_PER_ORACLE).fill(0),
@@ -342,7 +342,7 @@ function createEditBasketIntentIx(params) {
             const weights = updateWeightsData.token_weights.slice(0, constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET);
             while (weights.length < constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET)
                 weights.push({ mint: '', weight_bps: 0 });
-            let tokenMintsHash = (_c = updateWeightsData.token_mints_hash) !== null && _c !== void 0 ? _c : (0, basket_1.computeTokenMintsHash)(basket.composition.slice(0, basket.numTokens)
+            let tokenMintsHash = (_e = updateWeightsData.token_mints_hash) !== null && _e !== void 0 ? _e : (0, basket_1.computeTokenMintsHash)(basket.composition.slice(0, basket.numTokens)
                 .filter((asset) => asset.active === 1)
                 .map((asset) => asset.mint.toBase58()));
             let updateWeights = {

package/dist/src/jup.d.ts

@@ -17,6 +17,7 @@ export declare function getJupQuote(params: {
     swapMode: "exact_in" | "exact_out" | "ioc";
     apiKey: string;
     maxJupAccounts: number;
+    slippageBps?: number;
 }): Promise<{
     mode: string;
     inputMint: string;

package/dist/src/jup.js

@@ -29,8 +29,17 @@ function getJupQuote(params) {
             '&outputMint=' + params.basketMintIn.toBase58() +
             '&amount=' + (params.swapMode == "exact_in" ? params.basketAmountIn : params.basketAmountOut) +
             '&swapMode=' + (params.swapMode == "exact_in" ? "ExactOut" : "ExactIn") +
-            '&maxAccounts=' + params.maxJupAccounts;
-        let res = yield fetch(reqUrl, options).then(res => res.json());
+            '&maxAccounts=' + params.maxJupAccounts +
+            (params.slippageBps !== undefined ? '&slippageBps=' + params.slippageBps : '');
+        let response = yield fetch(reqUrl, options);
+        if (!response.ok) {
+            const body = yield response.text().catch(() => '');
+            throw new Error(`Jupiter quote error ${response.status}: ${body}`);
+        }
+        let res = yield response.json();
+        if (res.error) {
+            throw new Error(`Jupiter quote error: ${typeof res.error === 'string' ? res.error : JSON.stringify(res.error)}`);
+        }
         return res;
     });
 }
@@ -51,30 +60,27 @@ function getJupSwapInstructions(params) {
             },
             body: JSON.stringify(body),
         };
-        let res = yield fetch(reqUrl, options).then(res => res.json());
+        let response = yield fetch(reqUrl, options);
+        if (!response.ok) {
+            const body = yield response.text().catch(() => '');
+            throw new Error(`Jupiter swap-instructions error ${response.status}: ${body}`);
+        }
+        let res = yield response.json();
+        if (res.error) {
+            throw new Error(`Jupiter swap-instructions error: ${typeof res.error === 'string' ? res.error : JSON.stringify(res.error)}`);
+        }
         return res;
     });
 }
 function getJupTokenLedgerAndSwapInstructions(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        try {
-            let quoteResponse = yield getJupQuote(params);
-            let swapInstructions = yield getJupSwapInstructions(Object.assign(Object.assign({}, params), { quoteResponse }));
-            return {
-                tokenLedgerInstruction: processJupInstruction(swapInstructions.tokenLedgerInstruction),
-                swapInstruction: processJupInstruction(swapInstructions.swapInstruction),
-                addressLookupTableAddresses: swapInstructions.addressLookupTableAddresses.map((a) => new web3_js_1.PublicKey(a)),
-                quoteResponse: quoteResponse,
-            };
-        }
-        catch (e) {
-            console.log("Error getting Jup Instructions:", params.basketMintOut.toBase58(), params.basketMintIn.toBase58(), params.basketAmountOut);
-            return {
-                tokenLedgerInstruction: undefined,
-                swapInstruction: undefined,
-                addressLookupTableAddresses: [],
-                quoteResponse: undefined,
-            };
-        }
+        let quoteResponse = yield getJupQuote(params);
+        let swapInstructions = yield getJupSwapInstructions(Object.assign(Object.assign({}, params), { quoteResponse }));
+        return {
+            tokenLedgerInstruction: processJupInstruction(swapInstructions.tokenLedgerInstruction),
+            swapInstruction: processJupInstruction(swapInstructions.swapInstruction),
+            addressLookupTableAddresses: swapInstructions.addressLookupTableAddresses.map((a) => new web3_js_1.PublicKey(a)),
+            quoteResponse: quoteResponse,
+        };
     });
 }

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

@@ -24,7 +24,6 @@ export interface FormattedLookupTables {
     }[];
 }
 export interface FormattedOracleSettings extends OracleInput {
-    quote: string;
     side: string;
 }
 export interface FormattedOracle {

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

@@ -1,7 +1,7 @@
 import BN from 'bn.js';
 import { PublicKey } from '@solana/web3.js';
 import { Bounty } from './bounty';
-import { FormattedOracleType } from '../oracle';
+import { FormattedOracleType, FormattedQuote } from '../oracle';
 export type FormattedIntentStatus = "not_active" | "active" | "reverted" | "completed";
 export declare const INTENT_STATUS_STRINGS: Map<number, FormattedIntentStatus>;
 export type FormattedTaskType = "unknown" | "edit_creator" | "edit_manager_settings" | "edit_fee_settings" | "edit_schedule_settings" | "edit_automation_settings" | "edit_lp_settings" | "edit_metadata_settings" | "edit_deposits_settings" | "edit_force_rebalance_settings" | "edit_custom_rebalance_settings" | "edit_add_token_delay" | "edit_update_weights_delay" | "edit_make_direct_swap_delay" | "add_token" | "update_weights" | "make_direct_swap";
@@ -183,6 +183,7 @@ export interface OracleInput {
     token_decimals: number;
     twap_seconds_ago: number;
     twap_secondary_seconds_ago: number;
+    quote: FormattedQuote;
 }
 export interface AddOrEditTokenInput {
     token_mint: string;

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

@@ -4,6 +4,8 @@ export declare const MAX_ORACLES_PER_TOKEN = 4;
 export declare const MAX_ACCOUNTS_PER_ORACLE = 4;
 export type FormattedOracleType = "pyth" | "raydium_clmm" | "raydium_cpmm" | "switchboard" | "example";
 export declare const ORACLE_TYPES_STRINGS: Map<number, FormattedOracleType>;
+export type FormattedQuote = "usdc" | "wsol" | "usd";
+export declare const QUOTES_STRINGS: Map<number, FormattedQuote>;
 export interface OraclePriceOnChain {
     price: Fraction;
     conf: Fraction;
@@ -19,7 +21,8 @@ export declare enum OracleType {
 }
 export declare enum Quote {
     Usdc = 0,
-    Wsol = 1
+    Wsol = 1,
+    Usd = 2
 }
 export declare enum Side {
     Base = 0,

package/dist/src/layouts/oracle.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.PYTH_USDC_ORACLE_SETTINGS = exports.PYTH_WSOL_ORACLE_SETTINGS = exports.DEFAULT_ORACLE_SETTINGS = exports.OracleAggregatorLayout = exports.OracleDataLayout = exports.OracleSettingsLayout = exports.Side = exports.Quote = exports.OracleType = exports.OraclePriceLayout = exports.ORACLE_TYPES_STRINGS = exports.MAX_ACCOUNTS_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = void 0;
+exports.PYTH_USDC_ORACLE_SETTINGS = exports.PYTH_WSOL_ORACLE_SETTINGS = exports.DEFAULT_ORACLE_SETTINGS = exports.OracleAggregatorLayout = exports.OracleDataLayout = exports.OracleSettingsLayout = exports.Side = exports.Quote = exports.OracleType = exports.OraclePriceLayout = exports.QUOTES_STRINGS = exports.ORACLE_TYPES_STRINGS = exports.MAX_ACCOUNTS_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = void 0;
 const bn_js_1 = __importDefault(require("bn.js"));
 const borsh_1 = require("@coral-xyz/borsh");
 const fraction_1 = require("./fraction");
@@ -17,6 +17,11 @@ exports.ORACLE_TYPES_STRINGS = new Map([
     [3, "switchboard"],
     [255, "example"],
 ]);
+exports.QUOTES_STRINGS = new Map([
+    [0, "usdc"],
+    [1, "wsol"],
+    [2, "usd"],
+]);
 ;
 exports.OraclePriceLayout = (0, borsh_1.struct)([
     fraction_1.FractionLayout.replicate('price'),
@@ -36,6 +41,7 @@ var Quote;
 (function (Quote) {
     Quote[Quote["Usdc"] = 0] = "Usdc";
     Quote[Quote["Wsol"] = 1] = "Wsol";
+    Quote[Quote["Usd"] = 2] = "Usd";
 })(Quote || (exports.Quote = Quote = {}));
 ;
 var Side;
@@ -80,8 +86,8 @@ exports.DEFAULT_ORACLE_SETTINGS = {
     numRequiredAccounts: 1,
     weight: constants_1.HUNDRED_PERCENT_BPS,
     isRequired: 1,
-    confThreshBps: 100, // TODO: 1% ??
-    volatilityThreshBps: 50000,
+    confThreshBps: 200, // TODO: 1% ??
+    volatilityThreshBps: 200,
     maxSlippageBps: 1000,
     minLiquidity: new bn_js_1.default(0),
     stalenessThresh: new bn_js_1.default(120),
@@ -89,7 +95,7 @@ exports.DEFAULT_ORACLE_SETTINGS = {
     tokenDecimals: constants_1.WSOL_DECIMALS,
     twapSecondsAgo: new bn_js_1.default(0),
     twapSecondarySecondsAgo: new bn_js_1.default(0),
-    quote: Quote.Wsol,
+    quote: Quote.Usd,
     side: Side.Base,
 };
 exports.PYTH_WSOL_ORACLE_SETTINGS = Object.assign(Object.assign({}, exports.DEFAULT_ORACLE_SETTINGS), { tokenDecimals: constants_1.WSOL_DECIMALS });

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

@@ -1,5 +1,6 @@
 import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
 import { Basket } from '../layouts/basket';
+import { OraclePrice } from './oracles/oracle';
 export declare function computeTokenMintsHash(mints: string[]): number[];
 export declare function addFieldsToBasket(basket: Basket): Basket;
 export declare function addLutsToBaskets(connection: Connection, baskets: Basket[]): Promise<Basket[]>;
@@ -11,4 +12,6 @@ export interface BasketFilter {
 }
 export declare function fetchBaskets(connection: Connection, filter?: BasketFilter): Promise<Basket[]>;
 export declare function fetchBasketOracleAccountInfos(connection: Connection, basket: Basket): Promise<Map<string, AccountInfo<Buffer> | null>>;
+export declare function loadBasketPriceFromOracleAccountInfosWithPythPriceOverrides(basket: Basket, oracleAccountInfos: Map<string, AccountInfo<Buffer> | null>, pythPriceOverrides?: Map<string, OraclePrice>): Basket;
+export declare function loadBasketPriceWithPythPriceOverrides(basket: Basket, connection: Connection, pythPriceOverrides?: Map<string, OraclePrice>): Promise<Basket>;
 export declare function loadBasketPrice(basket: Basket, connection: Connection): Promise<Basket>;

package/dist/src/states/basket.js

@@ -19,18 +19,20 @@ exports.fetchBasket = fetchBasket;
 exports.fetchBasketsMultiple = fetchBasketsMultiple;
 exports.fetchBaskets = fetchBaskets;
 exports.fetchBasketOracleAccountInfos = fetchBasketOracleAccountInfos;
+exports.loadBasketPriceFromOracleAccountInfosWithPythPriceOverrides = loadBasketPriceFromOracleAccountInfosWithPythPriceOverrides;
+exports.loadBasketPriceWithPythPriceOverrides = loadBasketPriceWithPythPriceOverrides;
 exports.loadBasketPrice = loadBasketPrice;
-const decimal_js_1 = __importDefault(require("decimal.js"));
 const crypto_1 = require("crypto");
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("../constants");
 const basket_1 = require("../layouts/basket");
+const fraction_1 = require("../layouts/fraction");
 const oracle_1 = require("../layouts/oracle");
 const txUtils_1 = require("../txUtils");
 const oracle_2 = require("./oracles/oracle");
 const pythOracle_1 = require("./oracles/pythOracle");
 const raydiumClmmOracle_1 = require("./oracles/raydiumClmmOracle");
-const fraction_1 = require("../layouts/fraction");
 // export async function computeTokenMintsHash(mints: string[]): Promise<Buffer> {
 //     let hashBuffer = new Uint8Array(32)
 //     for (const mint of mints) {
@@ -453,6 +455,35 @@ function fetchBasketOracleAccountInfos(connection, basket) {
         return baseInfos;
     });
 }
+function loadBasketPriceFromOracleAccountInfosWithPythPriceOverrides(basket, oracleAccountInfos, pythPriceOverrides) {
+    var _a, _b;
+    const solPrice = (_a = pythPriceOverrides === null || pythPriceOverrides === void 0 ? void 0 : pythPriceOverrides.get(constants_1.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT.toBase58())) !== null && _a !== void 0 ? _a : pythOracle_1.PythOracle.fetch(oracle_1.PYTH_WSOL_ORACLE_SETTINGS, //@ts-ignore
+    [oracleAccountInfos.get(constants_1.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT.toBase58())]);
+    const usdcPrice = (_b = pythPriceOverrides === null || pythPriceOverrides === void 0 ? void 0 : pythPriceOverrides.get(constants_1.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT.toBase58())) !== null && _b !== void 0 ? _b : pythOracle_1.PythOracle.fetch(oracle_1.PYTH_USDC_ORACLE_SETTINGS, //@ts-ignore
+    [oracleAccountInfos.get(constants_1.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT.toBase58())]);
+    let totalValue = new decimal_js_1.default(0);
+    for (let i = 0; i < basket.numTokens; i++) {
+        const oraclePrice = oracle_2.PriceAggregator.fetch(basket.composition[i].oracleAggregator, //@ts-ignore
+        [basket.lutPubkeys[0], basket.lutPubkeys[1]], oracleAccountInfos, solPrice, usdcPrice, pythPriceOverrides);
+        let amount = new decimal_js_1.default(basket.composition[i].amount.toString());
+        const value = oraclePrice.price.mul(amount);
+        basket.composition[i].price = oraclePrice;
+        basket.composition[i].value = value;
+        totalValue = totalValue.add(value);
+    }
+    basket.tvl = totalValue;
+    let supplyOutstanding = new decimal_js_1.default(basket.supplyOutstanding.toString());
+    if (supplyOutstanding.gt(new decimal_js_1.default(0))) {
+        basket.price = totalValue.div(supplyOutstanding);
+    }
+    return basket;
+}
+function loadBasketPriceWithPythPriceOverrides(basket, connection, pythPriceOverrides) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const oracleAccountInfos = yield fetchBasketOracleAccountInfos(connection, basket);
+        return loadBasketPriceFromOracleAccountInfosWithPythPriceOverrides(basket, oracleAccountInfos, pythPriceOverrides);
+    });
+}
 function loadBasketPrice(basket, connection) {
     return __awaiter(this, void 0, void 0, function* () {
         let oracleAccountInfos = yield fetchBasketOracleAccountInfos(connection, basket);

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

@@ -176,7 +176,7 @@ function decodeTaskDataForType(intent) {
                 conf_thresh_bps: oracleAggregator.confThreshBps,
                 conf_multiplier: (0, fraction_1.fractionToDecimal)(oracleAggregator.confMultiplier).toNumber(),
                 oracles: oracleAggregator.oracles.slice(0, oracleAggregator.numOracles).map(oracle => {
-                    var _a;
+                    var _a, _b;
                     return ({
                         oracle_type: (_a = oracle_1.ORACLE_TYPES_STRINGS.get(oracle.oracleSettings.oracleType)) !== null && _a !== void 0 ? _a : "example",
                         account_lut_id: oracle.accountsToLoadLutIds[0],
@@ -194,6 +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",
                     });
                 }),
             };

package/dist/src/states/intents/rebalanceIntent.d.ts

@@ -40,4 +40,4 @@ export declare function getSwapPairs(rebalanceIntent: RebalanceIntent, basket: B
     outAmount: number;
     value: number;
 }[];
-export declare function isRebalanceRequired(rebalanceIntent: RebalanceIntent, basket: Basket): boolean;
+export declare function isRebalanceRequired(basket: Basket, connection: Connection): Promise<boolean>;