@symmetry-hq/sdk 1.0.18 → 1.0.20

package/dist/instructions/management/edit.js

@@ -356,14 +356,25 @@ function createEditVaultIntentIx(params) {
             break;
         case intent_1.TaskType.UpdateWeights: { // 15 - 202
             const updateWeightsData = editData;
-            const weights = updateWeightsData.token_weights.slice(0, constants_1.MAX_SUPPORTED_TOKENS_PER_VAULT);
-            while (weights.length < constants_1.MAX_SUPPORTED_TOKENS_PER_VAULT)
-                weights.push({ mint: '', weight_bps: 0 });
+            const weights = updateWeightsData.token_weights;
             let tokenMintsHash = (_e = updateWeightsData.token_mints_hash) !== null && _e !== void 0 ? _e : (0, basket_1.computeTokenMintsHash)(vault.composition.slice(0, vault.numTokens)
                 .filter((asset) => asset.active === 1)
                 .map((asset) => asset.mint.toBase58()));
+            let tokenWeights = [];
+            for (let i = 0; i < constants_1.MAX_SUPPORTED_TOKENS_PER_VAULT; i++) {
+                if (i >= vault.numTokens || vault.composition[i].active === 0) {
+                    tokenWeights.push(0);
+                    continue;
+                }
+                let mint = vault.composition[i].mint.toBase58();
+                let weight = 0;
+                for (let j = 0; j < weights.length; j++)
+                    if (weights[j].mint === mint)
+                        weight = weights[j].weight_bps;
+                tokenWeights.push(weight);
+            }
             let updateWeights = {
-                tokenWeights: weights.map((weight) => weight.weight_bps),
+                tokenWeights: tokenWeights,
                 tokenMintsHash: tokenMintsHash,
             };
             config_1.UpdateWeightsLayout.encode(updateWeights, editDataBuf);

package/dist/layouts/oracle.d.ts

@@ -2,7 +2,7 @@ import BN from 'bn.js';
 import { Fraction } from './fraction';
 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 type FormattedOracleType = "pyth" | "raydium_clmm" | "raydium_cpmm" | "lst" | "example";
 export declare const ORACLE_TYPES_STRINGS: Map<number, FormattedOracleType>;
 export type FormattedQuote = "usdc" | "wsol" | "usd";
 export declare const QUOTES_STRINGS: Map<number, FormattedQuote>;
@@ -16,7 +16,7 @@ export declare enum OracleType {
     Pyth = 0,
     RaydiumClmm = 1,
     RaydiumCpmm = 2,
-    SwitchBoard = 3,
+    Lst = 3,
     Example = 4
 }
 export declare enum Quote {

package/dist/layouts/oracle.js

@@ -14,7 +14,7 @@ exports.ORACLE_TYPES_STRINGS = new Map([
     [0, "pyth"],
     [1, "raydium_clmm"],
     [2, "raydium_cpmm"],
-    [3, "switchboard"],
+    [3, "lst"],
     [255, "example"],
 ]);
 exports.QUOTES_STRINGS = new Map([
@@ -33,7 +33,7 @@ var OracleType;
     OracleType[OracleType["Pyth"] = 0] = "Pyth";
     OracleType[OracleType["RaydiumClmm"] = 1] = "RaydiumClmm";
     OracleType[OracleType["RaydiumCpmm"] = 2] = "RaydiumCpmm";
-    OracleType[OracleType["SwitchBoard"] = 3] = "SwitchBoard";
+    OracleType[OracleType["Lst"] = 3] = "Lst";
     OracleType[OracleType["Example"] = 4] = "Example";
 })(OracleType || (exports.OracleType = OracleType = {}));
 ;

package/dist/states/oracles/lstOracle.d.ts

@@ -0,0 +1,18 @@
+import BN from 'bn.js';
+import { AccountInfo, PublicKey } from '@solana/web3.js';
+import { OracleSettings } from '../../layouts/oracle';
+import { OraclePrice } from './oracle';
+export declare class StakePool {
+    poolMint: PublicKey;
+    lamports: BN;
+    supply: BN;
+    constructor(params: {
+        poolMint: PublicKey;
+        lamports: BN;
+        supply: BN;
+    });
+    static decode(buf: Buffer, offset?: number): StakePool;
+}
+export declare class LstOracle {
+    static fetch(oracleParams: OracleSettings, accountInfos: AccountInfo<Buffer>[], wsolPrice: OraclePrice, usdcPrice: OraclePrice): OraclePrice;
+}

package/dist/states/oracles/lstOracle.js

@@ -0,0 +1,58 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LstOracle = exports.StakePool = void 0;
+const bn_js_1 = __importDefault(require("bn.js"));
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("../../constants");
+const oracle_1 = require("../../layouts/oracle");
+const oracle_2 = require("./oracle");
+// stake pool program IDs (mainnet)
+const STAKE_POOL_PROGRAM_ID = new web3_js_1.PublicKey("SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy");
+const SANCTUM_STAKE_POOL_PROGRAM_ID = new web3_js_1.PublicKey("SP12tWFxD9oJsVWNavTTBZvMbA6gkAmxtVgxdqvyvhY");
+class StakePool {
+    constructor(params) {
+        this.poolMint = params.poolMint;
+        this.lamports = params.lamports;
+        this.supply = params.supply;
+    }
+    static decode(buf, offset = 0) {
+        let poolMint = new web3_js_1.PublicKey(buf.subarray(162, 162 + 32));
+        let lamports = new bn_js_1.default(buf.subarray(258, 258 + 8), "le");
+        let supply = new bn_js_1.default(buf.subarray(266, 266 + 8), "le");
+        return new StakePool({
+            poolMint,
+            lamports,
+            supply,
+        });
+    }
+}
+exports.StakePool = StakePool;
+class LstOracle {
+    static fetch(oracleParams, accountInfos, wsolPrice, usdcPrice) {
+        //@ts-ignore
+        let state = null;
+        try {
+            const stateAi = accountInfos[0];
+            const parsedState = StakePool.decode(stateAi.data, 8);
+            state = parsedState;
+        }
+        catch (error) {
+            return new oracle_2.OraclePrice(new decimal_js_1.default(0), new decimal_js_1.default(0), 0);
+        }
+        let price = new decimal_js_1.default(state.lamports.toString())
+            .div(new decimal_js_1.default(state.supply.toString()));
+        let quoteDecimals = (oracleParams.quote == oracle_1.Quote.Usdc) ? constants_1.USDC_DECIMALS : ((oracleParams.quote == oracle_1.Quote.Wsol) ? constants_1.WSOL_DECIMALS : 0);
+        price = price.mul(decimal_js_1.default.pow(10, quoteDecimals - oracleParams.tokenDecimals));
+        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));
+        price = price.mul(quotePrice.price);
+        let conf = price.mul(new decimal_js_1.default(oracleParams.confThreshBps)).div(new decimal_js_1.default(constants_1.HUNDRED_PERCENT_BPS));
+        return new oracle_2.OraclePrice(price, conf, Date.now(), true);
+    }
+}
+exports.LstOracle = LstOracle;

package/dist/states/oracles/oracle.js

@@ -12,6 +12,7 @@ const constants_2 = require("./constants");
 const pythOracle_1 = require("./pythOracle");
 const raydiumClmmOracle_1 = require("./raydiumClmmOracle");
 const raydiumCpmmOracle_1 = require("./raydiumCpmmOracle");
+const lstOracle_1 = require("./lstOracle");
 class OraclePrice {
     constructor(price, conf, updateTime, validated) {
         this.price = price;
@@ -101,6 +102,8 @@ class PriceAggregator {
                         return raydiumClmmOracle_1.RaydiumCLMMOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
                     case oracle_1.OracleType.RaydiumCpmm:
                         return raydiumCpmmOracle_1.RaydiumCPMMOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
+                    case oracle_1.OracleType.Lst:
+                        return lstOracle_1.LstOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
                     default:
                         throw new Error(`Invalid oracle type: ${settings.oracleType}`);
                 }

package/package.json

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

package/src/instructions/management/edit.ts

@@ -442,16 +442,27 @@ export function createEditVaultIntentIx(params: {
 
         case TaskType.UpdateWeights: { // 15 - 202
             const updateWeightsData = (editData as UpdateWeightsInput);
-            const weights = updateWeightsData.token_weights.slice(0, MAX_SUPPORTED_TOKENS_PER_VAULT);
-            while (weights.length < MAX_SUPPORTED_TOKENS_PER_VAULT) weights.push({ mint: '', weight_bps: 0 });
-
+            const weights = updateWeightsData.token_weights;
             let tokenMintsHash = updateWeightsData.token_mints_hash ?? computeTokenMintsHash(
                 vault.composition.slice(0, vault.numTokens)
                     .filter((asset) => asset.active === 1)
                     .map((asset) => asset.mint.toBase58())
             );
+            let tokenWeights = [];
+            for (let i = 0; i < MAX_SUPPORTED_TOKENS_PER_VAULT; i++) {
+                if (i >= vault.numTokens || vault.composition[i].active === 0) {
+                    tokenWeights.push(0);
+                    continue;
+                }
+                let mint = vault.composition[i].mint.toBase58();
+                let weight = 0;
+                for (let j = 0; j < weights.length; j++)
+                    if (weights[j].mint === mint)
+                        weight = weights[j].weight_bps;
+                tokenWeights.push(weight);
+            }
             let updateWeights: UpdateWeights = {
-                tokenWeights: weights.map((weight) => weight.weight_bps),
+                tokenWeights: tokenWeights,
                 tokenMintsHash: tokenMintsHash,
             }
             UpdateWeightsLayout.encode(updateWeights, editDataBuf);

package/src/layouts/oracle.ts

@@ -7,12 +7,12 @@ import { HUNDRED_PERCENT_BPS, USDC_DECIMALS, WSOL_DECIMALS } from '../constants'
 export const MAX_ORACLES_PER_TOKEN = 4;
 export const MAX_ACCOUNTS_PER_ORACLE = 4;
 
-export type FormattedOracleType = "pyth" | "raydium_clmm" | "raydium_cpmm" | "switchboard" | "example";
+export type FormattedOracleType = "pyth" | "raydium_clmm" | "raydium_cpmm" | "lst" | "example";
 export const ORACLE_TYPES_STRINGS: Map<number, FormattedOracleType> = new Map([
     [0, "pyth"],
     [1, "raydium_clmm"],
     [2, "raydium_cpmm"],
-    [3, "switchboard"],
+    [3, "lst"],
     [255, "example"],
 ]);
 
@@ -40,7 +40,7 @@ export enum OracleType {
     Pyth = 0,
     RaydiumClmm = 1,
     RaydiumCpmm = 2,
-    SwitchBoard = 3,
+    Lst = 3,
     Example = 4,
 };
 

package/src/states/oracles/lstOracle.ts

@@ -0,0 +1,78 @@
+import BN from 'bn.js';
+import Decimal from 'decimal.js';
+import { AccountInfo, PublicKey } from '@solana/web3.js';
+
+import { HUNDRED_PERCENT_BPS, USDC_DECIMALS, WSOL_DECIMALS } from '../../constants';
+import { OracleSettings, OracleType, Quote } from '../../layouts/oracle';
+import { OraclePrice } from './oracle';
+
+// stake pool program IDs (mainnet)
+const STAKE_POOL_PROGRAM_ID = new PublicKey("SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy");
+const SANCTUM_STAKE_POOL_PROGRAM_ID = new PublicKey("SP12tWFxD9oJsVWNavTTBZvMbA6gkAmxtVgxdqvyvhY");
+
+export class StakePool {
+    poolMint: PublicKey;
+    lamports: BN; // u64
+    supply: BN;  // u64
+
+    constructor(params: {
+        poolMint: PublicKey,
+        lamports: BN,
+        supply: BN,
+    }) {
+        this.poolMint = params.poolMint;
+        this.lamports = params.lamports;
+        this.supply = params.supply;
+    }
+
+    static decode(buf: Buffer, offset: number = 0): StakePool {
+        let poolMint = new PublicKey(buf.subarray(162, 162 + 32));
+        let lamports = new BN(buf.subarray(258, 258 + 8), "le");
+        let supply = new BN(buf.subarray(266, 266 + 8), "le");
+
+        return new StakePool({
+            poolMint,
+            lamports,
+            supply,
+        })
+    }
+}
+
+export class LstOracle {
+    
+    static fetch(
+        oracleParams: OracleSettings,
+        accountInfos: AccountInfo<Buffer>[],
+        wsolPrice: OraclePrice,
+        usdcPrice: OraclePrice,
+    ): OraclePrice {
+        //@ts-ignore
+        let state: StakePool = null;
+        try {
+            const stateAi = accountInfos[0];
+            const parsedState = StakePool.decode(stateAi.data, 8);
+            state = parsedState;
+        } catch (error) {
+            return new OraclePrice(new Decimal(0), new Decimal(0), 0);
+        }
+
+        let price = new Decimal(state.lamports.toString())
+            .div(new Decimal(state.supply.toString()));
+
+        let quoteDecimals =
+            (oracleParams.quote == Quote.Usdc) ? USDC_DECIMALS : (
+            (oracleParams.quote == Quote.Wsol) ? WSOL_DECIMALS : 0);
+        price = price.mul(Decimal.pow(10, quoteDecimals - oracleParams.tokenDecimals));
+
+        let quotePrice =
+            (oracleParams.quote === Quote.Usdc) ? usdcPrice :
+            ((oracleParams.quote === Quote.Wsol) ? wsolPrice :
+            new OraclePrice(new Decimal(1), new Decimal(0), 0));
+        price = price.mul(quotePrice.price);
+
+        let conf = price.mul(new Decimal(oracleParams.confThreshBps)).div(new Decimal(HUNDRED_PERCENT_BPS));
+
+        return new OraclePrice(price, conf, Date.now(), true);
+    }
+    
+}

package/src/states/oracles/oracle.ts

@@ -15,6 +15,7 @@ import {
     RaydiumCLMMOracle
 } from './raydiumClmmOracle';
 import { RaydiumCPMMOracle } from './raydiumCpmmOracle';
+import { LstOracle } from './lstOracle';
 
 export class OraclePrice {
     price: Decimal;
@@ -134,6 +135,8 @@ export class PriceAggregator{
                         return RaydiumCLMMOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
                     case OracleType.RaydiumCpmm:
                         return RaydiumCPMMOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
+                    case OracleType.Lst:
+                        return LstOracle.fetch(settings, loadedAccounts, wsolPrice, usdcPrice);
                     default:
                         throw new Error(`Invalid oracle type: ${settings.oracleType}`);
                 }

package/test.ts

@@ -322,7 +322,7 @@ async function testStates() {
 
     if (tests.addOrEditToken) {
         let add_token: AddOrEditTokenInput = {
-            token_mint: "XsoCS1TfEyfFhfvj8EtZ528L3CaKBDBRqRapnBbDF2W",
+            token_mint: "J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn",
             active: true,
             min_oracles_thresh: 1,
             min_conf_bps: 50,
@@ -330,14 +330,14 @@ async function testStates() {
             conf_multiplier: 1,
             oracles: [
                 {
-                    oracle_type: "raydium_clmm",
+                    oracle_type: "lst",
                     account_lut_id: 0,
                     account_lut_index: 0,
-                    account: "6truu3rZuiB9rKQg4VYC3Dt3QwV7DgwGqXrYUcrvnDDE",
+                    account: "Jito4APyf642JPZPx3hGc6WWJ8zPKtRbRs4P815Awbb",
                     weight_bps: 5000,
                     is_required: false,
-                    conf_thresh_bps: 200,
-                    volatility_thresh_bps: 200,
+                    conf_thresh_bps: 100,
+                    volatility_thresh_bps: 100,
                     max_slippage_bps: 100,
                     min_liquidity: 0,
                     staleness_thresh: 120,
@@ -348,10 +348,10 @@ async function testStates() {
                     quote_token: "wsol",
                 },
                 {
-                    oracle_type: "raydium_clmm",
+                    oracle_type: "pyth",
                     account_lut_id: 0,
                     account_lut_index: 0,
-                    account: "4pCZCVEiYyT4efNdXUdL2tJF8VGMgiMXrZWq6FiNXhRw",
+                    account: "AxaxyeDT8JnWERSaTKvFXvPKkEdxnamKSqpWbsSjYg1g",
                     weight_bps: 5000,
                     is_required: false,
                     conf_thresh_bps: 200,
@@ -363,7 +363,7 @@ async function testStates() {
                     token_decimals: 9,
                     twap_seconds_ago: 50,
                     twap_secondary_seconds_ago: 100,
-                    quote_token: "wsol",
+                    quote_token: "usd",
                 },
             ],
         };
@@ -377,11 +377,24 @@ async function testStates() {
             token_weights: [
                 {
                     mint: "So11111111111111111111111111111111111111112",
-                    weight_bps: 100,
+                    weight_bps: 2000,
                 },
-            ],
-            token_mints_hash: [
-                0, 0, 0, 0,
+                {
+                    mint: "cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij",
+                    weight_bps: 2500,
+                },
+                {
+                    mint: "XsoCS1TfEyfFhfvj8EtZ528L3CaKBDBRqRapnBbDF2W",
+                    weight_bps: 2500,
+                },
+                {
+                    mint: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+                    weight_bps: 1000,
+                },
+                {
+                    mint: "J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn",
+                    weight_bps: 2000,
+                }
             ],
         };
         let tx = await sdk.updateWeightsTx(task_context, update_weights);