@symmetry-hq/temp-v3-sdk 0.0.3 → 0.0.4

package/dist/src/index.d.ts

@@ -12,7 +12,7 @@ export declare const COMPUTE_UNITS = 1000000;
 export declare const PRIORITY_FEE = 100000;
 export declare const JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
 export declare const MAX_JUPITER_ACCOUNTS = 35;
-export declare class BasketsSdk {
+export declare class SymmetryCore {
     private sdkParams;
     constructor(params: {
         connection: Connection;
@@ -54,3 +54,4 @@ export declare class BasketsSdk {
         wallet: Wallet;
     }): Promise<TransactionSignature[]>;
 }
+export { Basket, BasketFilter, Intent, IntentFilter, RebalanceIntent, RebalanceIntentFilter };

package/dist/src/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasketsSdk = exports.MAX_JUPITER_ACCOUNTS = exports.JUPITER_API_KEY = exports.PRIORITY_FEE = exports.COMPUTE_UNITS = void 0;
+exports.SymmetryCore = exports.MAX_JUPITER_ACCOUNTS = exports.JUPITER_API_KEY = exports.PRIORITY_FEE = exports.COMPUTE_UNITS = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
@@ -24,7 +24,7 @@ exports.COMPUTE_UNITS = 1000000;
 exports.PRIORITY_FEE = 100000;
 exports.JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
 exports.MAX_JUPITER_ACCOUNTS = 35;
-class BasketsSdk {
+class SymmetryCore {
     constructor(params) {
         var _a, _b, _c, _d;
         this.sdkParams = {
@@ -196,4 +196,4 @@ class BasketsSdk {
         });
     }
 }
-exports.BasketsSdk = BasketsSdk;
+exports.SymmetryCore = SymmetryCore;

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

@@ -63,8 +63,8 @@ function createBasketIx(params) {
         Buffer.from(seed),
         Buffer.from(new anchor_1.BN(slot).toArray("le", 8)),
         host.toBuffer(),
-        Buffer.from(startPrice.numerator.toArray("le", 8)),
-        Buffer.from(startPrice.exponent.toArray("le", 8)),
+        Buffer.from(startPrice.high.toArray("le", 8)),
+        Buffer.from(startPrice.low.toArray("le", 8)),
         hostFeesBuffer,
         (0, pda_1.serializeString)(metadataParams.name),
         (0, pda_1.serializeString)(metadataParams.symbol),

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

@@ -1,8 +1,8 @@
-import { BN } from "@coral-xyz/anchor";
-import { PublicKey } from "@solana/web3.js";
-import { OracleAggregator } from "./oracle";
-import { Fraction } from "./fraction";
-import { BasketSettings } from "./config";
+import { BN } from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+import { BasketSettings } from './config';
+import { Fraction } from './fraction';
+import { OracleAggregator } from './oracle';
 export declare const MAX_SUPPORTED_TOKENS_PER_BASKET: number;
 export interface BasketFees {
     symmetryFees: BN;
@@ -23,6 +23,11 @@ export interface Asset {
     oracleAggregator: OracleAggregator;
 }
 export declare const AssetLayout: any;
+export interface Metadata {
+    symbol: string;
+    name: string;
+    uri: string;
+}
 export interface Basket {
     version: number;
     seedArray: number[];
@@ -37,5 +42,6 @@ export interface Basket {
     writeVersion: BN;
     numTokens: number;
     composition: Asset[];
+    metadata?: Metadata;
 }
 export declare const BasketLayout: any;

package/dist/src/layouts/basket.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasketLayout = exports.AssetLayout = exports.LookupTablesLayout = exports.BasketFeesLayout = exports.MAX_SUPPORTED_TOKENS_PER_BASKET = void 0;
 const borsh_1 = require("@coral-xyz/borsh");
-const oracle_1 = require("./oracle");
-const fraction_1 = require("./fraction");
 const config_1 = require("./config");
+const fraction_1 = require("./fraction");
+const oracle_1 = require("./oracle");
 exports.MAX_SUPPORTED_TOKENS_PER_BASKET = 100;
 ;
 exports.BasketFeesLayout = (0, borsh_1.struct)([

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

@@ -10,7 +10,6 @@ export declare enum BasketType {
     Private = 0,
     Public = 1
 }
-export declare const BasketTypeLayout: any;
 export interface ScheduleSettings {
     cycleDuration: BN;
     depositsStart: BN;

package/dist/src/layouts/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GlobalConfigLayout = exports.BasketSettingsLayout = exports.MetadataSettingsLayout = exports.LpSettingsLayout = exports.AutomationSettingsLayout = exports.ManagerSettingsLayout = exports.FeeSettingsLayout = exports.ScheduleSettingsLayout = exports.BasketTypeLayout = exports.BasketType = exports.MAX_URI_LENGTH = exports.MAX_NAME_LENGTH = exports.MAX_SYMBOL_LENGTH = exports.MAX_MANAGERS_PER_BASKET = void 0;
+exports.GlobalConfigLayout = exports.BasketSettingsLayout = exports.MetadataSettingsLayout = exports.LpSettingsLayout = exports.AutomationSettingsLayout = exports.ManagerSettingsLayout = exports.FeeSettingsLayout = exports.ScheduleSettingsLayout = exports.BasketType = exports.MAX_URI_LENGTH = exports.MAX_NAME_LENGTH = exports.MAX_SYMBOL_LENGTH = exports.MAX_MANAGERS_PER_BASKET = void 0;
 const borsh_1 = require("@coral-xyz/borsh");
 const fraction_1 = require("./fraction");
 const bounty_1 = require("./intents/bounty");
@@ -14,9 +14,6 @@ var BasketType;
     BasketType[BasketType["Public"] = 1] = "Public";
 })(BasketType || (exports.BasketType = BasketType = {}));
 ;
-exports.BasketTypeLayout = (0, borsh_1.struct)([
-    (0, borsh_1.u8)('basketType'),
-]);
 ;
 exports.ScheduleSettingsLayout = (0, borsh_1.struct)([
     (0, borsh_1.u64)('cycleDuration'),
@@ -30,6 +27,7 @@ exports.ScheduleSettingsLayout = (0, borsh_1.struct)([
 ]);
 ;
 exports.FeeSettingsLayout = (0, borsh_1.struct)([
+    (0, borsh_1.u64)('modificationDelay'),
     (0, borsh_1.u16)('hostDepositFeeBps'),
     (0, borsh_1.u16)('hostManagementFeeBps'),
     (0, borsh_1.u16)('hostPerformanceFeeBps'),
@@ -41,7 +39,6 @@ exports.FeeSettingsLayout = (0, borsh_1.struct)([
     (0, borsh_1.u16)('managersPerformanceFeeBps'),
     (0, borsh_1.u16)('basketDepositFeeBps'),
     (0, borsh_1.u16)('basketWithdrawFeeBps'),
-    (0, borsh_1.u64)('modificationDelay'),
 ]);
 exports.ManagerSettingsLayout = (0, borsh_1.struct)([
     (0, borsh_1.array)((0, borsh_1.publicKey)(), exports.MAX_MANAGERS_PER_BASKET, 'managers'),
@@ -76,7 +73,7 @@ exports.MetadataSettingsLayout = (0, borsh_1.struct)([
 exports.BasketSettingsLayout = (0, borsh_1.struct)([
     (0, borsh_1.publicKey)('creator'),
     (0, borsh_1.publicKey)('host'),
-    exports.BasketTypeLayout.replicate('basketType'),
+    (0, borsh_1.u8)('basketType'),
     fraction_1.FractionLayout.replicate('startPrice'),
     (0, borsh_1.u64)('activeRebalance'),
     (0, borsh_1.u64)('activeDeposits'),

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

@@ -1,6 +1,6 @@
 import { BN } from "@coral-xyz/anchor";
 export interface Fraction {
-    numerator: BN;
-    exponent: BN;
+    high: BN;
+    low: BN;
 }
 export declare const FractionLayout: any;

package/dist/src/layouts/fraction.js

@@ -4,6 +4,6 @@ exports.FractionLayout = void 0;
 const borsh_1 = require("@coral-xyz/borsh");
 ;
 exports.FractionLayout = (0, borsh_1.struct)([
-    (0, borsh_1.u64)('numerator'),
-    (0, borsh_1.u64)('exponent'),
+    (0, borsh_1.u64)('high'),
+    (0, borsh_1.u64)('low'),
 ]);

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

@@ -10,9 +10,9 @@ export declare const BountyScheduleLayout: any;
 export interface Bounty {
     bountyDepositor: PublicKey;
     bountyMint: PublicKey;
-    bountyTotal: BN;
-    bountyLeft: BN;
     bountyPerPriceUpdateTask: BountySchedule;
     bountyPerTask: BountySchedule;
+    bountyTotal: BN;
+    bountyLeft: BN;
 }
 export declare const BountyLayout: any;

package/dist/src/layouts/intents/bounty.js

@@ -12,8 +12,8 @@ exports.BountyScheduleLayout = (0, borsh_1.struct)([
 exports.BountyLayout = (0, borsh_1.struct)([
     (0, borsh_1.publicKey)('bountyDepositor'),
     (0, borsh_1.publicKey)('bountyMint'),
+    exports.BountyScheduleLayout.replicate('bountyPerPriceUpdateTask'),
+    exports.BountyScheduleLayout.replicate('bountyPerTask'),
     (0, borsh_1.u64)('bountyTotal'),
     (0, borsh_1.u64)('bountyLeft'),
-    exports.BountyScheduleLayout.replicate('bountyPerPriceUpdateTask'),
-    exports.BountyScheduleLayout.replicate('bountyPerTask')
 ]);

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

@@ -10,15 +10,6 @@ export declare enum IntentStatus {
     Reverted = 2,
     Completed = 3
 }
-export interface ParsedIntent {
-    manager: PublicKey;
-    status: IntentStatus;
-    activationTimestamp: BN;
-    basket: PublicKey;
-    bounty: Bounty;
-    taskType: TaskType;
-    taskData: EditData;
-}
 export interface Intent {
     manager: PublicKey;
     status: IntentStatus;
@@ -27,6 +18,8 @@ export interface Intent {
     bounty: Bounty;
     taskType: TaskType;
     taskData: number[];
+    parsedTaskData?: EditData;
+    ownAddress?: PublicKey;
 }
 export declare const IntentLayout: any;
 export interface HostFees {

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

@@ -16,7 +16,6 @@ var IntentStatus;
 })(IntentStatus || (exports.IntentStatus = IntentStatus = {}));
 ;
 ;
-;
 exports.IntentLayout = (0, borsh_1.struct)([
     (0, borsh_1.publicKey)('manager'),
     (0, borsh_1.u8)('status'),

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

@@ -2,7 +2,7 @@ import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { Fraction } from "../fraction";
 import { Bounty } from "./bounty";
-import { OraclePrice } from "../../states/oracles/oracle";
+import { OraclePriceOnChain } from "../oracle";
 export declare enum RebalanceType {
     Deposit = 0,
     Withdraw = 1,
@@ -23,7 +23,7 @@ export interface TokenAuction {
     mint: PublicKey;
     amount: BN;
     targetAmount: BN;
-    price: OraclePrice;
+    price: OraclePriceOnChain;
     keepToken: number;
 }
 export declare const TokenAuctionLayout: any;
@@ -52,5 +52,6 @@ export interface RebalanceIntent {
     finishPriceUpdateTask: TaskCompletion;
     mintBasketTask: TaskCompletion;
     tokenSettlementTasks: TaskCompletion[];
+    ownAddress?: PublicKey;
 }
 export declare const RebalanceIntentLayout: any;

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

@@ -2,14 +2,28 @@ import { BN } from "@coral-xyz/anchor";
 import { Fraction } from "./fraction";
 export declare const MAX_ORACLES_PER_TOKEN = 4;
 export declare const MAX_ACCOUNTS_PER_ORACLE = 4;
-export interface OraclePrice {
+export interface OraclePriceOnChain {
     price: Fraction;
     conf: Fraction;
     updateTime: BN;
 }
 export declare const OraclePriceLayout: any;
+export declare enum OracleType {
+    Example = 0,
+    Pyth = 1,
+    RaydiumCllm = 2,
+    RaydiumCpmm = 3
+}
+export declare enum Quote {
+    Usdc = 0,
+    Wsol = 1
+}
+export declare enum Side {
+    Base = 0,
+    Quote = 1
+}
 export interface OracleSettings {
-    oracleType: number;
+    oracleType: OracleType;
     numRequiredAccounts: number;
     weight: number;
     isRequired: number;
@@ -21,8 +35,8 @@ export interface OracleSettings {
     tokenDecimals: number;
     twapSecondsAgo: BN;
     twapSecondarySecondsAgo: BN;
-    quote: number;
-    side: number;
+    quote: Quote;
+    side: Side;
 }
 export declare const OracleSettingsLayout: any;
 export interface OracleData {

package/dist/src/layouts/oracle.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OracleAggregatorLayout = exports.OracleDataLayout = exports.OracleSettingsLayout = exports.OraclePriceLayout = exports.MAX_ACCOUNTS_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = void 0;
+exports.OracleAggregatorLayout = exports.OracleDataLayout = exports.OracleSettingsLayout = exports.Side = exports.Quote = exports.OracleType = exports.OraclePriceLayout = exports.MAX_ACCOUNTS_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = void 0;
 const borsh_1 = require("@coral-xyz/borsh");
 const fraction_1 = require("./fraction");
 exports.MAX_ORACLES_PER_TOKEN = 4;
@@ -11,6 +11,26 @@ exports.OraclePriceLayout = (0, borsh_1.struct)([
     fraction_1.FractionLayout.replicate('conf'),
     (0, borsh_1.u64)('updateTime'),
 ]);
+var OracleType;
+(function (OracleType) {
+    OracleType[OracleType["Example"] = 0] = "Example";
+    OracleType[OracleType["Pyth"] = 1] = "Pyth";
+    OracleType[OracleType["RaydiumCllm"] = 2] = "RaydiumCllm";
+    OracleType[OracleType["RaydiumCpmm"] = 3] = "RaydiumCpmm";
+})(OracleType || (exports.OracleType = OracleType = {}));
+;
+var Quote;
+(function (Quote) {
+    Quote[Quote["Usdc"] = 0] = "Usdc";
+    Quote[Quote["Wsol"] = 1] = "Wsol";
+})(Quote || (exports.Quote = Quote = {}));
+;
+var Side;
+(function (Side) {
+    Side[Side["Base"] = 0] = "Base";
+    Side[Side["Quote"] = 1] = "Quote";
+})(Side || (exports.Side = Side = {}));
+;
 exports.OracleSettingsLayout = (0, borsh_1.struct)([
     (0, borsh_1.u8)('oracleType'),
     (0, borsh_1.u8)('numRequiredAccounts'),

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

@@ -1,5 +1,5 @@
-import { Connection, PublicKey } from "@solana/web3.js";
-import { Basket } from "../layouts/basket";
+import { Connection, PublicKey } from '@solana/web3.js';
+import { Basket } from '../layouts/basket';
 export declare function decodeBasket(dataWithoutDiscriminator: Buffer): Basket;
 export declare function fetchBasket(connection: Connection, basketAddress: PublicKey): Promise<Basket>;
 export interface BasketFilter {

package/dist/src/states/basket.js

@@ -12,11 +12,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeBasket = decodeBasket;
 exports.fetchBasket = fetchBasket;
 exports.fetchBaskets = fetchBaskets;
-const basket_1 = require("../layouts/basket");
 const constants_1 = require("../constants");
+const basket_1 = require("../layouts/basket");
 function decodeBasket(dataWithoutDiscriminator) {
     let basket = basket_1.BasketLayout.decode(dataWithoutDiscriminator);
-    return basket;
+    let metadataSettings = basket.settings.metadataSettings;
+    let metadata = {
+        symbol: Buffer.from(metadataSettings.symbol.slice(0, metadataSettings.symbolLength)).toString(),
+        name: Buffer.from(metadataSettings.name.slice(0, metadataSettings.nameLength)).toString(),
+        uri: Buffer.from(metadataSettings.uri.slice(0, metadataSettings.uriLength)).toString()
+    };
+    basket.composition = basket.composition.slice(0, basket.numTokens);
+    return Object.assign(Object.assign({}, basket), { metadata: metadata });
 }
 function fetchBasket(connection, basketAddress) {
     return __awaiter(this, void 0, void 0, function* () {

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

@@ -1,12 +1,7 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { Intent, ParsedIntent } from '../../layouts/intents/intent';
-/**
- * Decode an Intent account buffer.
- * Returns ParsedIntent.
- */
-export declare function decodeIntent(intent: Intent): ParsedIntent;
+import { Intent } from '../../layouts/intents/intent';
+export declare function decodeIntent(dataWithoutDiscriminator: Buffer, ownAddress?: PublicKey): Intent;
 export declare function fetchIntent(connection: Connection, intent: PublicKey): Promise<Intent>;
-export declare function fetchParsedIntent(connection: Connection, intent: PublicKey): Promise<ParsedIntent>;
 export interface IntentFilter {
     filterType: "basket" | "owner";
     filterValue: PublicKey;

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

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeIntent = decodeIntent;
 exports.fetchIntent = fetchIntent;
-exports.fetchParsedIntent = fetchParsedIntent;
 exports.fetchIntents = fetchIntents;
 const constants_1 = require("../../constants");
 const intent_1 = require("../../layouts/intents/intent");
@@ -33,29 +32,26 @@ const taskLayoutMap = new Map([
 // Decode taskData buffer for a given task type; returns decoded object or raw Buffer on failure
 function decodeTaskDataForType(taskType, taskData) {
     const layout = taskLayoutMap.get(taskType);
+    console.log(layout);
     return layout.decode(taskData);
 }
 ;
-/**
- * Decode an Intent account buffer.
- * Returns ParsedIntent.
- */
-function decodeIntent(intent) {
-    let parsedTaskData = decodeTaskDataForType(intent.taskType, intent.taskData);
-    return Object.assign(Object.assign({}, intent), { taskData: parsedTaskData });
+function decodeIntent(dataWithoutDiscriminator, ownAddress) {
+    let intent = intent_1.IntentLayout.decode(dataWithoutDiscriminator);
+    console.log(intent.taskData);
+    console.log(intent.taskType);
+    // let parsedTaskData = decodeTaskDataForType(intent.taskType, intent.taskData);
+    // console.log(parsedTaskData);
+    return Object.assign(Object.assign({}, intent), { 
+        // parsedTaskData: parsedTaskData,
+        ownAddress: ownAddress });
 }
 function fetchIntent(connection, intent) {
     return __awaiter(this, void 0, void 0, function* () {
         const intentAi = yield connection.getAccountInfo(intent);
         if (!intentAi)
             throw new Error('Basket intent not found');
-        return intent_1.IntentLayout.decode(intentAi.data.slice(8));
-    });
-}
-function fetchParsedIntent(connection, intent) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const intentState = yield fetchIntent(connection, intent);
-        return decodeIntent(intentState);
+        return decodeIntent(intentAi.data.slice(8), intent);
     });
 }
 function fetchIntents(connection, filters) {
@@ -84,7 +80,7 @@ function fetchIntents(connection, filters) {
             filters: accountFilters,
             encoding: 'base64'
         });
-        const rebalanceIntents = accounts.map(account => intent_1.IntentLayout.decode(account.account.data.slice(8)));
+        const rebalanceIntents = accounts.map(account => decodeIntent(account.account.data.slice(8), account.pubkey));
         return rebalanceIntents;
     });
 }

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

@@ -1,5 +1,6 @@
 import { Connection, PublicKey } from "@solana/web3.js";
 import { RebalanceIntent } from "../../layouts/intents/rebalanceIntent";
+export declare function decodeRebalanceIntent(dataWithoutDiscriminator: Buffer, ownAddress?: PublicKey): RebalanceIntent;
 export declare function fetchRebalanceIntent(connection: Connection, rebalanceIntent: PublicKey): Promise<RebalanceIntent>;
 export interface RebalanceIntentFilter {
     filterType: "basket" | "owner";

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

@@ -9,17 +9,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeRebalanceIntent = decodeRebalanceIntent;
 exports.fetchRebalanceIntent = fetchRebalanceIntent;
 exports.fetchRebalanceIntents = fetchRebalanceIntents;
+const web3_js_1 = require("@solana/web3.js");
 const rebalanceIntent_1 = require("../../layouts/intents/rebalanceIntent");
 const constants_1 = require("../../constants");
+function decodeRebalanceIntent(dataWithoutDiscriminator, ownAddress) {
+    let rebalanceIntent = rebalanceIntent_1.RebalanceIntentLayout.decode(dataWithoutDiscriminator);
+    let numTokens = constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET - 1;
+    while (rebalanceIntent.tokens[numTokens].mint.equals(web3_js_1.PublicKey.default))
+        numTokens--;
+    rebalanceIntent.tokens = rebalanceIntent.tokens.slice(0, numTokens + 1);
+    rebalanceIntent.priceUpdateTasks = rebalanceIntent.priceUpdateTasks.slice(0, numTokens + 1);
+    rebalanceIntent.tokenSettlementTasks = rebalanceIntent.tokenSettlementTasks.slice(0, numTokens + 1);
+    return Object.assign(Object.assign({}, rebalanceIntent), { ownAddress: ownAddress });
+}
 function fetchRebalanceIntent(connection, rebalanceIntent) {
     return __awaiter(this, void 0, void 0, function* () {
         const rebalanceIntentAi = yield connection.getAccountInfo(rebalanceIntent);
         if (!rebalanceIntentAi) {
             throw new Error("Rebalance intent not found");
         }
-        return rebalanceIntent_1.RebalanceIntentLayout.decode(rebalanceIntentAi.data.slice(8));
+        return decodeRebalanceIntent(rebalanceIntentAi.data.slice(8), rebalanceIntent);
     });
 }
 function fetchRebalanceIntents(connection, filters) {
@@ -48,7 +60,7 @@ function fetchRebalanceIntents(connection, filters) {
             filters: accountFilters,
             encoding: 'base64'
         });
-        const rebalanceIntents = accounts.map(account => rebalanceIntent_1.RebalanceIntentLayout.decode(account.account.data.slice(8)));
+        const rebalanceIntents = accounts.map(account => decodeRebalanceIntent(account.account.data.slice(8), account.pubkey));
         return rebalanceIntents;
     });
 }

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

@@ -28,10 +28,10 @@ export declare class OraclePrice {
     price: Decimal;
     conf: Decimal;
     updateTime: BN;
-    mid: Decimal;
-    low: Decimal;
-    high: Decimal;
     constructor(price: Decimal, conf: Decimal, updateTime: BN);
+    getMid(): Decimal;
+    getLow(): Decimal;
+    getHigh(): Decimal;
 }
 export declare class OracleResult {
     price: OraclePrice | null;

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

@@ -53,9 +53,6 @@ class OraclePrice {
         this.price = new decimal_js_1.default(price);
         this.conf = new decimal_js_1.default(conf);
         this.updateTime = updateTime;
-        this.mid = this.price;
-        this.low = this.price.sub(this.conf);
-        this.high = this.price.add(this.conf);
         let zero_Decimal = new decimal_js_1.default(0);
         if (this.price.lte(zero_Decimal))
             throw new Error("price should be more than 0");
@@ -64,6 +61,15 @@ class OraclePrice {
         if (this.updateTime.lte(0))
             throw new Error("update time should be more than 0");
     }
+    getMid() {
+        return this.price;
+    }
+    getLow() {
+        return this.price.sub(this.conf);
+    }
+    getHigh() {
+        return this.price.add(this.conf);
+    }
 }
 exports.OraclePrice = OraclePrice;
 class OracleResult {
@@ -133,7 +139,7 @@ class OracleAggregator {
             for (let i = 0; i < this.oracles.length; i++) {
                 try {
                     let result = yield this.oracles[i].fetch();
-                    if (result.ok()) {
+                    if (result.ok() && result.price !== null) {
                         prices.push(result.price);
                         weights.push(new decimal_js_1.default(this.oracles[i].weight));
                     }
@@ -154,7 +160,7 @@ class OracleAggregator {
             let frac3 = new decimal_js_1.default(3);
             prices.map((price, i) => {
                 var _a, _b, _c;
-                allPrices.push((_a = price === null || price === void 0 ? void 0 : price.mid) !== null && _a !== void 0 ? _a : null, (_b = price === null || price === void 0 ? void 0 : price.low) !== null && _b !== void 0 ? _b : null, (_c = price === null || price === void 0 ? void 0 : price.high) !== null && _c !== void 0 ? _c : null);
+                allPrices.push((_a = price === null || price === void 0 ? void 0 : price.getMid()) !== null && _a !== void 0 ? _a : null, (_b = price === null || price === void 0 ? void 0 : price.getLow()) !== null && _b !== void 0 ? _b : null, (_c = price === null || price === void 0 ? void 0 : price.getHigh()) !== null && _c !== void 0 ? _c : null);
                 let w = weights[i].div(frac3);
                 allWeights.push(w, w, w);
             });

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

@@ -2,14 +2,16 @@ import Decimal from 'decimal.js';
 import { BN } from '@coral-xyz/anchor';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { Oracle, OracleResult } from './oracle';
-declare enum Side {
+export declare enum Side {
     Base = 0,
     Quote = 1
 }
-declare enum Quote {
+export declare const SideLayout: any;
+export declare enum Quote {
     Usdc = 0,
     Wsol = 1
 }
+export declare const QuoteLayout: any;
 declare class Observation {
     timestamp: BN;
     cumT0Price: BN;

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

@@ -12,23 +12,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RaydiumCPMMOracle = void 0;
+exports.RaydiumCPMMOracle = exports.QuoteLayout = exports.Quote = exports.SideLayout = exports.Side = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const oracle_1 = require("./oracle");
+const borsh_1 = require("@coral-xyz/borsh");
 const CPMM_PROGRAM_ID = new web3_js_1.PublicKey("CPMMoo8L3F4NbTegBCKVNunggL7H1ZpdTHKxQB5qKP1C");
 const DEV_CPMM_PROGRAM_ID = new web3_js_1.PublicKey("DRaycpLY18LhpbydsBWbVJtxpNv9oXPgjRSfpF2bWpYb");
 var Side;
 (function (Side) {
     Side[Side["Base"] = 0] = "Base";
     Side[Side["Quote"] = 1] = "Quote";
-})(Side || (Side = {}));
+})(Side || (exports.Side = Side = {}));
+exports.SideLayout = (0, borsh_1.struct)([
+    (0, borsh_1.u8)('side'),
+]);
 var Quote;
 (function (Quote) {
     Quote[Quote["Usdc"] = 0] = "Usdc";
     Quote[Quote["Wsol"] = 1] = "Wsol";
-})(Quote || (Quote = {}));
+})(Quote || (exports.Quote = Quote = {}));
+exports.QuoteLayout = (0, borsh_1.struct)([
+    (0, borsh_1.u8)('quote'),
+]);
 class Observation {
     constructor(params) {
         this.timestamp = params.timestamp;

package/dist/test.js

@@ -15,14 +15,14 @@ const anchor_1 = require("@coral-xyz/anchor");
 let connection = new web3_js_1.Connection("https://api.devnet.solana.com");
 function testStates() {
     return __awaiter(this, void 0, void 0, function* () {
-        let sdk = new src_1.BasketsSdk({
+        let sdk = new src_1.SymmetryCore({
             connection: connection,
         });
         console.log("SDK created");
         let x = yield sdk.createBasketTx({
             creator: web3_js_1.PublicKey.default,
             host: web3_js_1.PublicKey.default,
-            startPrice: { exponent: new anchor_1.BN(1), numerator: new anchor_1.BN(1) },
+            startPrice: { high: new anchor_1.BN(0), low: new anchor_1.BN(Math.floor((1 << 64) / 10)) },
             hostFees: { hostDepositFeeBps: 0, hostManagementFeeBps: 0, hostPerformanceFeeBps: 0 },
             metadataParams: { name: "Test Basket", symbol: "TB", uri: "https://test.com" },
             metadataModificationDelay: new anchor_1.BN(0),
@@ -33,7 +33,20 @@ function testStates() {
         let intents = yield sdk.fetchAllIntents([]);
         console.log(intents.map(intent => intent.manager.toBase58()));
         let rebalanceIntents = yield sdk.fetchAllRebalanceIntents([]);
-        console.log(rebalanceIntents.map(rebalanceIntent => rebalanceIntent.owner.toBase58()));
+        console.log(rebalanceIntents.map(rebalanceIntent => {
+            var _a;
+            return {
+                owner: rebalanceIntent.owner.toBase58(),
+                basket: rebalanceIntent.basket.toBase58(),
+                ownAddress: (_a = rebalanceIntent.ownAddress) === null || _a === void 0 ? void 0 : _a.toBase58(),
+            };
+        }));
+        rebalanceIntents.forEach(rebalanceIntent => {
+            console.log("--------------------------------");
+            console.log(rebalanceIntent.tokens[0].price, rebalanceIntent.tokens[0].price);
+        });
+        // console.log(baskets[0]);
+        // console.log(baskets[0].composition[0].oracleAggregator.oracles[0].oracleSettings);
     });
 }
 testStates();

package/package.json

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

package/src/index.ts

@@ -25,7 +25,7 @@ export const JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
 export const MAX_JUPITER_ACCOUNTS = 35;
 
 
-export class BasketsSdk {
+export class SymmetryCore {
 
     private sdkParams: {
         payer: PublicKey,
@@ -264,3 +264,13 @@ export class BasketsSdk {
     }
 
 }
+
+
+export {
+    Basket,
+    BasketFilter,
+    Intent,
+    IntentFilter,
+    RebalanceIntent,
+    RebalanceIntentFilter
+}

package/src/instructions/management/createBasket.ts

@@ -108,8 +108,8 @@ export function createBasketIx(params: {
         Buffer.from(seed),
         Buffer.from(new BN(slot).toArray("le", 8)),
         host.toBuffer(),
-        Buffer.from(startPrice.numerator.toArray("le", 8)),
-        Buffer.from(startPrice.exponent.toArray("le", 8)),
+        Buffer.from(startPrice.high.toArray("le", 8)),
+        Buffer.from(startPrice.low.toArray("le", 8)),
         hostFeesBuffer,
         serializeString(metadataParams.name),
         serializeString(metadataParams.symbol),

package/src/layouts/basket.ts

@@ -1,10 +1,11 @@
 
-import { BN } from "@coral-xyz/anchor";
-import { PublicKey } from "@solana/web3.js";
+import { BN } from '@coral-xyz/anchor';
 import { array, publicKey, str, struct, u128, u16, u64, u8 } from '@coral-xyz/borsh';
-import { OracleAggregator, OracleAggregatorLayout } from "./oracle";
-import { Fraction, FractionLayout } from "./fraction";
-import { BasketSettings, BasketSettingsLayout } from "./config";
+import { PublicKey } from '@solana/web3.js';
+
+import { BasketSettings, BasketSettingsLayout } from './config';
+import { Fraction, FractionLayout } from './fraction';
+import { OracleAggregator, OracleAggregatorLayout } from './oracle';
 
 export const MAX_SUPPORTED_TOKENS_PER_BASKET: number = 100;
 
@@ -46,6 +47,12 @@ export const AssetLayout = struct<Asset>([
     OracleAggregatorLayout.replicate('oracleAggregator'),
 ]);
 
+export interface Metadata {
+    symbol: string,
+    name: string,
+    uri: string
+}   
+
 export interface Basket {
     version: number; // u8
     seedArray: number[]; // length 16
@@ -63,6 +70,7 @@ export interface Basket {
     writeVersion: BN; // u64
     numTokens: number; // u8
     composition: Asset[]; // length MAX_SUPPORTED_TOKENS_PER_BASKET
+    metadata?: Metadata
 };
 
 export const BasketLayout = struct<Basket>([

package/src/layouts/config.ts

@@ -14,10 +14,6 @@ export enum BasketType {
     Public = 1,
 };
 
-export const BasketTypeLayout = struct<BasketType>([
-    u8('basketType'),
-]);
-
 export interface ScheduleSettings {
     cycleDuration: BN; // u64 
     depositsStart: BN; // u64
@@ -56,6 +52,7 @@ export interface FeeSettings {
 };
 
 export const FeeSettingsLayout = struct<FeeSettings>([
+    u64('modificationDelay'),
     u16('hostDepositFeeBps'),
     u16('hostManagementFeeBps'),
     u16('hostPerformanceFeeBps'),
@@ -67,7 +64,6 @@ export const FeeSettingsLayout = struct<FeeSettings>([
     u16('managersPerformanceFeeBps'),
     u16('basketDepositFeeBps'),
     u16('basketWithdrawFeeBps'),
-    u64('modificationDelay'),
 ]);
 
 export interface ManagerSettings {
@@ -175,7 +171,7 @@ export const BasketSettingsLayout = struct<BasketSettings>([
     publicKey('creator'),
     publicKey('host'),
   
-    BasketTypeLayout.replicate('basketType'),
+    u8('basketType'),
     FractionLayout.replicate('startPrice'),
   
     u64('activeRebalance'),

package/src/layouts/fraction.ts

@@ -2,11 +2,11 @@ import { BN } from "@coral-xyz/anchor";
 import { array, publicKey, str, struct, u128, u16, u64, u8 } from '@coral-xyz/borsh';
 
 export interface Fraction {
-    numerator: BN; // u64 -> BN
-    exponent: BN; // u64 -> BN
+    high: BN; // u64 -> BN
+    low: BN; // u64 -> BN
 };
 
 export const FractionLayout = struct<Fraction>([
-    u64('numerator'),
-    u64('exponent'),
+    u64('high'),
+    u64('low'),
 ]);

package/src/layouts/intents/bounty.ts

@@ -19,17 +19,17 @@ export const BountyScheduleLayout = struct<BountySchedule>([
 export interface Bounty {
     bountyDepositor: PublicKey;
     bountyMint: PublicKey;
-    bountyTotal: BN; // u64
-    bountyLeft: BN; // u64
     bountyPerPriceUpdateTask: BountySchedule;
     bountyPerTask: BountySchedule;
+    bountyTotal: BN; // u64
+    bountyLeft: BN; // u64
 }
   
   export const BountyLayout = struct<Bounty>([
     publicKey('bountyDepositor'),
     publicKey('bountyMint'),
+    BountyScheduleLayout.replicate('bountyPerPriceUpdateTask'),
+    BountyScheduleLayout.replicate('bountyPerTask'),
     u64('bountyTotal'),
     u64('bountyLeft'),
-    BountyScheduleLayout.replicate('bountyPerPriceUpdateTask'),
-    BountyScheduleLayout.replicate('bountyPerTask')
 ]);

package/src/layouts/intents/intent.ts

@@ -15,16 +15,6 @@ export enum IntentStatus {
     Completed,
 };
 
-export interface ParsedIntent {
-    manager: PublicKey;
-    status : IntentStatus;
-    activationTimestamp: BN; // u64
-    basket: PublicKey;
-    bounty: Bounty;
-    taskType: TaskType;
-    taskData: EditData;
-};
-
 export interface Intent {
     manager: PublicKey;
     status : IntentStatus;
@@ -33,6 +23,8 @@ export interface Intent {
     bounty: Bounty;
     taskType: TaskType;
     taskData: number[]; // length of 600
+    parsedTaskData?: EditData;
+    ownAddress?: PublicKey;
 };
 
 export const IntentLayout = struct<Intent>([

package/src/layouts/intents/rebalanceIntent.ts

@@ -3,8 +3,7 @@ import { PublicKey } from "@solana/web3.js";
 import { array, publicKey, str, struct, u128, u16, u64, u8 } from '@coral-xyz/borsh';
 import { Fraction, FractionLayout } from "../fraction";
 import { Bounty, BountyLayout } from "./bounty";
-import { OraclePrice } from "../../states/oracles/oracle";
-import { OraclePriceLayout } from "../oracle";
+import { OraclePriceLayout, OraclePriceOnChain } from "../oracle";
 import { MAX_SUPPORTED_TOKENS_PER_BASKET } from "../basket";
 
 export enum RebalanceType {
@@ -34,7 +33,7 @@ export interface TokenAuction {
     mint: PublicKey;
     amount: BN; // u64
     targetAmount: BN; // u64
-    price: OraclePrice;
+    price: OraclePriceOnChain;
     keepToken: number; // u8
 };
 
@@ -82,6 +81,8 @@ export interface RebalanceIntent {
     mintBasketTask: TaskCompletion;
 
     tokenSettlementTasks: TaskCompletion[]; // MAX_SUPPORTED_TOKENS_PER_BASKET
+
+    ownAddress?: PublicKey;
 };
 
 

package/src/layouts/oracle.ts

@@ -5,22 +5,39 @@ import { Fraction, FractionLayout } from "./fraction";
 export const MAX_ORACLES_PER_TOKEN = 4;
 export const MAX_ACCOUNTS_PER_ORACLE = 4;
 
-export interface OraclePrice {
+export interface OraclePriceOnChain {
     price: Fraction;
     conf: Fraction;
     updateTime: BN; // u64
 };
 
-export const OraclePriceLayout = struct<OraclePrice>([
+export const OraclePriceLayout = struct<OraclePriceOnChain>([
     FractionLayout.replicate('price'),
     FractionLayout.replicate('conf'),
     u64('updateTime'),
 ]);
 
 
+export enum OracleType {
+    Example = 0,
+    Pyth = 1,
+    RaydiumCllm = 2,
+    RaydiumCpmm = 3,
+};
+
+export enum Quote {
+    Usdc = 0,
+    Wsol = 1,
+};
+
+export enum Side {
+    Base = 0,
+    Quote = 1,
+};
+
 export interface OracleSettings {
     // type of the oracle (Pyth, CP swap, ...)
-    oracleType: number; // u8
+    oracleType: OracleType; // u8
     numRequiredAccounts: number; // u8
     // weight used in aggregation
     weight: number; // u16
@@ -40,8 +57,8 @@ export interface OracleSettings {
     // Special parameters specific to Raydium 
     twapSecondsAgo: BN; // u64, primary twap window in seconds
     twapSecondarySecondsAgo: BN; // u64, secondary twap window - to check volatility
-    quote: number; // u8, 1 = USDC, 2 = WSOL
-    side: number; // 0 = base, 1 = quote
+    quote: Quote; // u8, 1 = USDC, 2 = WSOL
+    side: Side; // 0 = base, 1 = quote
 }
 
 export const OracleSettingsLayout = struct<OracleSettings>([

package/src/states/basket.ts

@@ -1,11 +1,20 @@
-import { Connection, GetProgramAccountsFilter, GetProgramAccountsResponse, PublicKey } from "@solana/web3.js";
-import { AssetLayout, Basket, BasketLayout, LookupTablesLayout } from "../layouts/basket";
-import { BASKETS_V3_PROGRAM_ID } from "../constants";
+import {
+    Connection, GetProgramAccountsFilter, GetProgramAccountsResponse, PublicKey
+} from '@solana/web3.js';
 
+import { BASKETS_V3_PROGRAM_ID } from '../constants';
+import { AssetLayout, Basket, BasketLayout, LookupTablesLayout } from '../layouts/basket';
 
 export function decodeBasket(dataWithoutDiscriminator: Buffer): Basket {
-    let basket = BasketLayout.decode(dataWithoutDiscriminator);
-    return basket;
+    let basket: Basket = BasketLayout.decode(dataWithoutDiscriminator);
+    let metadataSettings = basket.settings.metadataSettings;
+    let metadata = {
+        symbol: Buffer.from(metadataSettings.symbol.slice(0, metadataSettings.symbolLength)).toString(),
+        name: Buffer.from(metadataSettings.name.slice(0, metadataSettings.nameLength)).toString(),
+        uri: Buffer.from(metadataSettings.uri.slice(0, metadataSettings.uriLength)).toString()
+    }
+    basket.composition = basket.composition.slice(0, basket.numTokens);
+    return {...basket, metadata: metadata};
 }
 
 export async function fetchBasket(

package/src/states/intents/intent.ts

@@ -1,9 +1,7 @@
-import { BN } from '@coral-xyz/anchor';
-import { array, publicKey, struct, u16, u32, u64, u8 } from '@coral-xyz/borsh';
 import { Connection, PublicKey } from '@solana/web3.js';
 
 import { BASKETS_V3_PROGRAM_ID } from '../../constants';
-import { AddTokenDelayLayout, AddTokenLayout, Intent, IntentLayout, IntentStatus, ManagerSettingsWithAuthorityBitmasksLayout, ParsedIntent, SwapLayout, TaskType, UpdateWeightsDelayLayout, UpdateWeightsLayout } from '../../layouts/intents/intent';
+import { AddTokenDelayLayout, AddTokenLayout, Intent, IntentLayout, ManagerSettingsWithAuthorityBitmasksLayout, SwapLayout, TaskType, UpdateWeightsDelayLayout, UpdateWeightsLayout } from '../../layouts/intents/intent';
 import { MetadataSettingsLayout, AutomationSettingsLayout, FeeSettingsLayout, LpSettingsLayout, ScheduleSettingsLayout } from '../../layouts/config';
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 import { GetProgramAccountsResponse } from '@solana/web3.js';
@@ -30,19 +28,21 @@ function decodeTaskDataForType(
     taskData: number[]
 ): any {
     const layout = taskLayoutMap.get(taskType);
+    console.log(layout);
     return layout.decode(taskData);
 };
 
 
-/**
- * Decode an Intent account buffer.
- * Returns ParsedIntent.
- */
-export function decodeIntent(intent: Intent): ParsedIntent {
-    let parsedTaskData = decodeTaskDataForType(intent.taskType, intent.taskData);
+export function decodeIntent(dataWithoutDiscriminator: Buffer, ownAddress?: PublicKey): Intent {
+    let intent: Intent = IntentLayout.decode(dataWithoutDiscriminator);
+    console.log(intent.taskData);
+    console.log(intent.taskType);
+    // let parsedTaskData = decodeTaskDataForType(intent.taskType, intent.taskData);
+    // console.log(parsedTaskData);
     return {
         ...intent,
-        taskData: parsedTaskData,
+        // parsedTaskData: parsedTaskData,
+        ownAddress: ownAddress,
     };
 }
 
@@ -54,15 +54,7 @@ export async function fetchIntent(
         intent
     );
     if (!intentAi) throw new Error('Basket intent not found');
-    return IntentLayout.decode(intentAi.data.slice(8));
-}
-
-export async function fetchParsedIntent(
-    connection: Connection,
-    intent: PublicKey,
-): Promise<ParsedIntent>{
-    const intentState: Intent = await fetchIntent(connection, intent);
-    return decodeIntent(intentState);
+    return decodeIntent(intentAi.data.slice(8), intent);
 }
 
 export interface IntentFilter {
@@ -101,7 +93,7 @@ export async function fetchIntents(
             }
         );
     const rebalanceIntents: Intent[] = accounts.map(account => 
-        IntentLayout.decode(account.account.data.slice(8))
+        decodeIntent(account.account.data.slice(8), account.pubkey)
     );
     return rebalanceIntents;
 }

package/src/states/intents/rebalanceIntent.ts

@@ -1,9 +1,21 @@
 import { Connection, GetProgramAccountsResponse, PublicKey } from "@solana/web3.js";
 import { RebalanceIntent, RebalanceIntentLayout } from "../../layouts/intents/rebalanceIntent";
 import { GetProgramAccountsFilter } from "@solana/web3.js";
-import { BASKETS_V3_PROGRAM_ID } from "../../constants";
+import { BASKETS_V3_PROGRAM_ID, MAX_SUPPORTED_TOKENS_PER_BASKET } from "../../constants";
 
 
+export function decodeRebalanceIntent(dataWithoutDiscriminator: Buffer, ownAddress?: PublicKey): RebalanceIntent {
+    let rebalanceIntent: RebalanceIntent = RebalanceIntentLayout.decode(dataWithoutDiscriminator);
+    
+    let numTokens = MAX_SUPPORTED_TOKENS_PER_BASKET - 1;
+    while (rebalanceIntent.tokens[numTokens].mint.equals(PublicKey.default))
+        numTokens--;
+    rebalanceIntent.tokens = rebalanceIntent.tokens.slice(0, numTokens + 1);
+    rebalanceIntent.priceUpdateTasks = rebalanceIntent.priceUpdateTasks.slice(0, numTokens + 1);
+    rebalanceIntent.tokenSettlementTasks = rebalanceIntent.tokenSettlementTasks.slice(0, numTokens + 1);
+    return {...rebalanceIntent, ownAddress: ownAddress};
+}
+
 export async function fetchRebalanceIntent(
     connection: Connection,
     rebalanceIntent: PublicKey,
@@ -12,7 +24,7 @@ export async function fetchRebalanceIntent(
     if (!rebalanceIntentAi) {
         throw new Error("Rebalance intent not found");
     }
-    return RebalanceIntentLayout.decode(rebalanceIntentAi.data.slice(8));
+    return decodeRebalanceIntent(rebalanceIntentAi.data.slice(8), rebalanceIntent);
 }
 
 export interface RebalanceIntentFilter {
@@ -51,7 +63,7 @@ export async function fetchRebalanceIntents(
             }
         );
     const rebalanceIntents: RebalanceIntent[] = accounts.map(account => 
-        RebalanceIntentLayout.decode(account.account.data.slice(8))
+        decodeRebalanceIntent(account.account.data.slice(8), account.pubkey)
     );
     return rebalanceIntents;
 }

package/src/states/oracles/oracle.ts

@@ -43,23 +43,27 @@ export class OraclePrice {
     price: Decimal;
     conf: Decimal;
     updateTime: BN;
-    mid: Decimal;
-    low: Decimal;
-    high: Decimal;
 
     constructor(price: Decimal, conf: Decimal, updateTime: BN){
         this.price = new Decimal(price);
         this.conf = new Decimal(conf);
         this.updateTime = updateTime;
-        this.mid = this.price;
-        this.low = this.price.sub(this.conf);
-        this.high = this.price.add(this.conf);
 
         let zero_Decimal = new Decimal(0);
         if(this.price.lte(zero_Decimal)) throw new Error("price should be more than 0");
         if(this.conf.lt(zero_Decimal)) throw new Error("confidence can't be negative");
         if(this.updateTime.lte(0)) throw new Error("update time should be more than 0");
     }
+
+    getMid(): Decimal {
+        return this.price;
+    }
+    getLow(): Decimal {
+        return this.price.sub(this.conf);
+    }
+    getHigh(): Decimal {
+        return this.price.add(this.conf);
+    }
 }
 
 export class OracleResult {
@@ -136,13 +140,13 @@ export class OracleAggregator{
     }
     async fetch(): Promise<OracleResult> {
         console.log("Fetching price from oracle aggregator");
-        let prices: (OraclePrice | null)[] = Array(0);
+        let prices: OraclePrice[]  = Array(0);
         let weights: Decimal[] = Array(0);
 
         for(let i = 0; i< this.oracles.length; i++){
             try {
                 let result = await this.oracles[i].fetch();
-                if(result.ok()){
+                if(result.ok() && result.price !== null){
                     prices.push(result.price);
                     weights.push(new Decimal(this.oracles[i].weight));
                 }
@@ -163,7 +167,7 @@ export class OracleAggregator{
         let allWeights: Decimal[] = Array(0);
         let frac3: Decimal = new Decimal(3);
         prices.map((price, i) => {
-            allPrices.push(price?.mid ?? null , price?.low ?? null , price?.high ?? null);
+            allPrices.push(price?.getMid() ?? null , price?.getLow() ?? null , price?.getHigh() ?? null);
             let w = weights[i].div(frac3);
             allWeights.push(w,w,w);
         });

package/src/states/oracles/raydiumCpmmOracle.ts

@@ -4,20 +4,29 @@ import { BN } from '@coral-xyz/anchor';
 import { Connection, PublicKey } from '@solana/web3.js';
 
 import { ErrorCode, Oracle, OracleErrors, OraclePrice, OracleResult } from './oracle';
+import { struct, u8 } from '@coral-xyz/borsh';
 
 const CPMM_PROGRAM_ID = new PublicKey("CPMMoo8L3F4NbTegBCKVNunggL7H1ZpdTHKxQB5qKP1C");
 const DEV_CPMM_PROGRAM_ID = new PublicKey("DRaycpLY18LhpbydsBWbVJtxpNv9oXPgjRSfpF2bWpYb");
 
-enum Side {
+export enum Side {
     Base,
     Quote,
 }
 
-enum Quote {
+export const SideLayout = struct<Side>([
+    u8('side'),
+]);
+
+export enum Quote {
     Usdc,
     Wsol,
 }
 
+export const QuoteLayout = struct<Quote>([
+    u8('quote'),
+]);
+
 class Observation {
     timestamp: BN; // u64
     cumT0Price: BN; // u128

package/test.ts

@@ -1,30 +1,43 @@
 import { Connection, PublicKey } from "@solana/web3.js";
-import { BasketsSdk } from "./src";
+import { SymmetryCore, Basket, } from "./src";
 import { BN } from "@coral-xyz/anchor";
 
 
 let connection = new Connection("https://api.devnet.solana.com");
 
 async function testStates() {
-    let sdk = new BasketsSdk({
+    let sdk = new SymmetryCore({
         connection: connection as any,
     });
     console.log("SDK created");
     let x = await sdk.createBasketTx({
         creator: PublicKey.default,
         host: PublicKey.default,
-        startPrice: {exponent: new BN(1), numerator: new BN(1)},
+        startPrice: {high: new BN(0), low: new BN(Math.floor((1 << 64) / 10))},
         hostFees: {hostDepositFeeBps: 0, hostManagementFeeBps: 0, hostPerformanceFeeBps: 0},
         metadataParams: { name: "Test Basket", symbol: "TB", uri: "https://test.com" },
         metadataModificationDelay: new BN(0),
     });
     console.log(x);
-    let baskets = await sdk.fetchAllBaskets([]);
+    let baskets: Basket[] = await sdk.fetchAllBaskets([]);
     console.log(baskets.map(basket => basket.ownAddress.toBase58()));
     let intents = await sdk.fetchAllIntents([]);
     console.log(intents.map(intent => intent.manager.toBase58()));
-    let rebalanceIntents = await sdk.fetchAllRebalanceIntents([]);
-    console.log(rebalanceIntents.map(rebalanceIntent => rebalanceIntent.owner.toBase58()));
+    let rebalanceIntents = await sdk.fetchAllRebalanceIntents([
+    ]);
+    console.log(rebalanceIntents.map(rebalanceIntent => {
+        return {
+            owner: rebalanceIntent.owner.toBase58(),
+            basket: rebalanceIntent.basket.toBase58(),
+            ownAddress: rebalanceIntent.ownAddress?.toBase58(),
+        };
+    }));
+    rebalanceIntents.forEach(rebalanceIntent => {
+        console.log("--------------------------------");
+        console.log(rebalanceIntent.tokens[0].price, rebalanceIntent.tokens[0].price);
+    });
+    // console.log(baskets[0]);
+    // console.log(baskets[0].composition[0].oracleAggregator.oracles[0].oracleSettings);
 }
 
 testStates();