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

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,25 +15,38 @@ 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),
         });
         console.log(x);
-        let baskets = yield sdk.fetchAllBaskets();
+        let baskets = yield sdk.fetchAllBaskets([]);
         console.log(baskets.map(basket => basket.ownAddress.toBase58()));
-        let intents = yield sdk.fetchAllIntents();
+        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()));
+        let rebalanceIntents = yield sdk.fetchAllRebalanceIntents([]);
+        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.2",
+  "version": "0.0.4",
   "description": "Symmetry Baskets V3 SDK",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/src/index.ts

@@ -14,9 +14,9 @@ import { Basket } from './layouts/basket';
 import { Fraction } from './layouts/fraction';
 import { EditData, HostFees, Intent, MetadataParams, TaskType } from './layouts/intents/intent';
 import { RebalanceIntent } from './layouts/intents/rebalanceIntent';
-import { fetchBasket, fetchBaskets } from './states/basket';
-import { fetchIntents } from './states/intents/intent';
-import { fetchRebalanceIntents } from './states/intents/rebalanceIntent';
+import { BasketFilter, fetchBasket, fetchBaskets } from './states/basket';
+import { fetchIntents, IntentFilter } from './states/intents/intent';
+import { fetchRebalanceIntents, RebalanceIntentFilter } from './states/intents/rebalanceIntent';
 import { prepareV0Transactions, sendV0Transactions, signedVersionedTxs, VersionedTxs, Wallet } from './txUtils';
 
 export const COMPUTE_UNITS = 1_000_000;
@@ -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,
@@ -62,18 +62,24 @@ export class BasketsSdk {
         return basketState;
     }
 
-    async fetchAllBaskets(): Promise<Basket[]> {
-        const baskets = await fetchBaskets(this.sdkParams.connection, []);
+    async fetchAllBaskets(
+        filters: BasketFilter[],
+    ): Promise<Basket[]> {
+        const baskets = await fetchBaskets(this.sdkParams.connection, filters);
         return baskets;
     }
 
-    async fetchAllIntents(): Promise<Intent[]> {
-        const intents = await fetchIntents(this.sdkParams.connection, []);
+    async fetchAllIntents(
+        filters: IntentFilter[],
+    ): Promise<Intent[]> {
+        const intents = await fetchIntents(this.sdkParams.connection, filters);
         return intents;
     }
 
-    async fetchAllRebalanceIntents(): Promise<RebalanceIntent[]> {
-        const rebalanceIntents = await fetchRebalanceIntents(this.sdkParams.connection, []);
+    async fetchAllRebalanceIntents(
+        filters: RebalanceIntentFilter[],
+    ): Promise<RebalanceIntent[]> {
+        const rebalanceIntents = await fetchRebalanceIntents(this.sdkParams.connection, filters);
         return rebalanceIntents;
     }
 
@@ -258,3 +264,13 @@ export class BasketsSdk {
     }
 
 }
+
+
+export {
+    Basket,
+    BasketFilter,
+    Intent,
+    IntentFilter,
+    RebalanceIntent,
+    RebalanceIntentFilter
+}

package/src/instructions/automation/rebalanceSwap.ts

@@ -1,10 +1,10 @@
 import { TransactionInstruction } from "@solana/web3.js";
 import { PublicKey } from "@solana/web3.js";
 import { getAta, getRebalanceIntentPda } from "../pda";
-import { SYSTEM_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/native/system";
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { BN } from "@coral-xyz/anchor";
 import { BASKETS_V3_PROGRAM_ID } from "../../constants";
+import { SystemProgram } from "@solana/web3.js";
 
 
 
@@ -39,7 +39,7 @@ export function rebalanceSwapIx(
         { pubkey: keeperToATA, isWritable: true, isSigner: false },
         { pubkey: basketFromATA, isWritable: true, isSigner: false },
         { pubkey: basketToATA, isWritable: true, isSigner: false },
-        { pubkey: SYSTEM_PROGRAM_ID, isWritable: false, isSigner: false },
+        { pubkey: SystemProgram.programId, isWritable: false, isSigner: false },
         { pubkey: TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
         { pubkey: TOKEN_2022_PROGRAM_ID, isWritable: false, isSigner: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },

package/src/instructions/management/addBounty.ts

@@ -1,5 +1,4 @@
 import { BN } from '@coral-xyz/anchor';
-import { SYSTEM_PROGRAM_ID } from '@coral-xyz/anchor/dist/cjs/native/system';
 import {
     ASSOCIATED_TOKEN_PROGRAM_ID,
     TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID
@@ -42,7 +41,7 @@ export function addBountyIx(params: {
         { pubkey: bountyVault, isSigner: false, isWritable: true },
         { pubkey: bountyVaultAta, isSigner: false, isWritable: true },
         { pubkey: globalConfig, isSigner: false, isWritable: false },
-        { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },

package/src/instructions/management/admin.ts

@@ -1,5 +1,4 @@
 import { BN, Program } from '@coral-xyz/anchor';
-import { SYSTEM_PROGRAM_ID } from '@coral-xyz/anchor/dist/cjs/native/system';
 import { array, publicKey, struct, u16, u64, u8 } from '@coral-xyz/borsh';
 import {
     PublicKey, SystemProgram, SYSVAR_RENT_PUBKEY, TransactionInstruction
@@ -27,7 +26,7 @@ export function createGlobalConfigIx(params: {
     const keys = [
       { pubkey: admin, isSigner: true, isWritable: true },
       { pubkey: globalConfig, isSigner: false, isWritable: true },
-      { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false },
+      { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
       { pubkey: SYSVAR_RENT_PUBKEY, isSigner: false, isWritable: false },
     ];
 

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/instructions/management/edit.ts

@@ -4,9 +4,9 @@ import { TransactionInstruction } from "@solana/web3.js";
 import { BASKETS_V3_PROGRAM_ID } from "../../constants";
 import { getAta, getBountyVaultPda, getGlobalConfigPda, getIntentPda, getMetadataAccount, METADATA_PROGRAM_ID, serializeString } from "../pda";
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
-import { SYSTEM_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/native/system";
 import { AutomationSettings, AutomationSettingsLayout, FeeSettings, FeeSettingsLayout, LpSettings, LpSettingsLayout, ManagerSettings, ManagerSettingsLayout, MetadataSettings, MetadataSettingsLayout, ScheduleSettings, ScheduleSettingsLayout } from "../../layouts/config";
 import { BN } from "@coral-xyz/anchor";
+import { SystemProgram } from "@solana/web3.js";
 
 const EDIT_PRIVATE_BASKET_SETTINGS_DISCRIMINATOR = Buffer.from([202,54,138,17,3,104,128,229]);
 const CREATE_EDIT_BASKET_INTENT_DISCRIMINATOR = Buffer.from([82, 150, 58, 227, 153, 129, 20, 30]);
@@ -177,7 +177,7 @@ export function createEditBasketIntentIx(params: {
         { pubkey: managerBountyATA, isSigner: false, isWritable: true },
         { pubkey: bountyVault, isSigner: false, isWritable: true },
         { pubkey: bountyVaultATA, isSigner: false, isWritable: true },
-        { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
@@ -230,7 +230,7 @@ export function editBasketIx(params: {
         { pubkey: managerBountyATA, isSigner: false, isWritable: true },
         { pubkey: bountyVault, isSigner: false, isWritable: true },
         { pubkey: bountyVaultATA, isSigner: false, isWritable: true },
-        { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },

package/src/instructions/management/luts.ts

@@ -1,5 +1,4 @@
 import { BN, Program } from '@coral-xyz/anchor';
-import { SYSTEM_PROGRAM_ID } from '@coral-xyz/anchor/dist/cjs/native/system';
 import { PublicKey, SystemProgram, TransactionInstruction } from '@solana/web3.js';
 import { ADDRESS_LOOKUP_TABLE_PROGRAM_ID, BASKETS_V3_PROGRAM_ID } from '../../constants';
 import { getLookupTableInfoAccount } from '../pda';
@@ -48,7 +47,7 @@ export function createBasketLookupTablesInstruction(params: {
       { pubkey: newTempLookupTableInfo0, isSigner: false, isWritable: true },
       { pubkey: newTempLookupTableInfo1, isSigner: false, isWritable: true },
       { pubkey: ADDRESS_LOOKUP_TABLE_PROGRAM_ID, isSigner: false, isWritable: false },
-      { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false },
+      { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
     ];
 
   return new TransactionInstruction({
@@ -72,7 +71,7 @@ export function extendBasketLookupTablesIx(
       { pubkey: params.tempLookupTable0, isWritable: true, isSigner: false },
       { pubkey: params.tempLookupTable1, isWritable: true, isSigner: false },
       { pubkey: ADDRESS_LOOKUP_TABLE_PROGRAM_ID, isWritable: false, isSigner: false },
-      { pubkey: SYSTEM_PROGRAM_ID, isWritable: false, isSigner: false },
+      { pubkey: SystemProgram.programId, isWritable: false, isSigner: false },
     ];
 
     return new TransactionInstruction({
@@ -100,7 +99,7 @@ export function overwriteBasketLookupTablesIx(
       { pubkey: params.tempLookupTable1, isWritable: true, isSigner: false },
       { pubkey: params.activeLookupTable0, isWritable: true, isSigner: false },
       { pubkey: params.activeLookupTable1, isWritable: true, isSigner: false },
-      { pubkey: SYSTEM_PROGRAM_ID, isWritable: false, isSigner: false },
+      { pubkey: SystemProgram.programId, isWritable: false, isSigner: false },
     ];
 
     return new TransactionInstruction({
@@ -123,7 +122,7 @@ export function closeDeactivatedLookupTableIx(params: {
       { pubkey: params.lookupTable, isWritable: true, isSigner: false },
       { pubkey: lookupTableInfo, isWritable: true, isSigner: false },
       { pubkey: ADDRESS_LOOKUP_TABLE_PROGRAM_ID, isWritable: false, isSigner: false },
-      { pubkey: SYSTEM_PROGRAM_ID, isWritable: false, isSigner: false },
+      { pubkey: SystemProgram.programId, isWritable: false, isSigner: false },
     ];
 
     return new TransactionInstruction({

package/src/instructions/user/deposit.ts

@@ -3,8 +3,8 @@ import { BN } from "@coral-xyz/anchor";
 import { BASKETS_V3_PROGRAM_ID } from "../../constants";
 import { getAta, getBasketFeesPda, getBasketTokenMintPda, getBountyVaultPda, getGlobalConfigPda, getRebalanceIntentPda, getRentPayerPda } from "../pda";
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
-import { SYSTEM_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/native/system";
 import { TransactionInstruction } from "@solana/web3.js";
+import { SystemProgram } from "@solana/web3.js";
 
 const CREATE_USER_REBALANCE_INTENT_ACCOUNT = Buffer.from([212, 23, 1, 46, 192, 87, 74, 196]);
 const RESIZE_REBALANCE_INTENT_HANDLER = Buffer.from([71, 204, 243, 183, 209, 118, 111, 94]);
@@ -33,7 +33,7 @@ export function createUserRebalanceIntentIx(params: {
         { pubkey: globalConfig, isSigner: false, isWritable: true},
         { pubkey: SYSVAR_INSTRUCTIONS_PUBKEY, isSigner: false, isWritable: false},
         { pubkey: SYSVAR_RENT_PUBKEY, isSigner: false, isWritable: false},
-        { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false}
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false}
     ];
 
     const data = CREATE_USER_REBALANCE_INTENT_ACCOUNT;
@@ -112,7 +112,7 @@ export function depositStateIx(
         { pubkey: buyerBountyAta, isSigner: false, isWritable: true },
         { pubkey: bountyVault, isSigner: false, isWritable: true },
         { pubkey: bountyVaultAta, isSigner: false, isWritable: true },
-        { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         // { pubkey: rebalanceIntent, isSigner: false, isWritable: true } // remaining accounts
@@ -149,7 +149,7 @@ export function depositTokensIx(params: {
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-        { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
     ];
 
     // remaining accounts
@@ -223,7 +223,7 @@ export function mintBasketIx(params: {
         { pubkey: TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
         { pubkey: TOKEN_2022_PROGRAM_ID, isWritable: false, isSigner: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
-        { pubkey: SYSTEM_PROGRAM_ID, isWritable: false, isSigner: false },
+        { pubkey: SystemProgram.programId, isWritable: false, isSigner: false },
     ];
 
     return new TransactionInstruction({

package/src/instructions/user/withdraw.ts

@@ -3,8 +3,8 @@ import { BASKETS_V3_PROGRAM_ID } from "../../constants";
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { BN } from "@coral-xyz/anchor";
 import { getAta, getBasketTokenMintPda, getBountyVaultPda, getGlobalConfigPda, getRebalanceIntentPda, getRentPayerPda } from "../pda";
-import { SYSTEM_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/native/system";
 import { TransactionInstruction } from "@solana/web3.js";
+import { SystemProgram } from "@solana/web3.js";
 
 
 const CREATE_WITHDRAW_STATE_DISCRIMINATOR = Buffer.from([161, 45, 253, 59, 110, 240, 65, 3]);
@@ -61,7 +61,7 @@ export function createWithdrawStateIx(params: {
         { pubkey: sellerBountyAta, isSigner: false, isWritable: true },
         { pubkey: bountyVault, isSigner: false, isWritable: true },
         { pubkey: bountyVaultAta, isSigner: false, isWritable: true },
-        { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: rebalanceIntent, isSigner: false, isWritable: false } // remaining accounts
@@ -100,7 +100,7 @@ export function redeemTokensIx(
         { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-        { pubkey: SYSTEM_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
     ];
 
     // remaining accounts

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'),